Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

ftl
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

43e3f842

Commit 43e3f842 authored 4 years ago by Sebastian Hahta

Downloads
- Plain Diff

Merge branch 'aruco' into 'master'

aruco tags; headset position adjustment

See merge request nicolas.pope/ftl!340

parents 94280cb5 976ed621

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

applications/vision/src/main.cpp 1 addition, 1 deletion

applications/vision/src/main.cpp
components/operators/include/ftl/operators/detectandtrack.hpp 2 additions, 0 deletions

...onents/operators/include/ftl/operators/detectandtrack.hpp
components/operators/src/aruco.cpp 47 additions, 32 deletions

components/operators/src/aruco.cpp
components/rgbd-sources/include/ftl/rgbd/camera.hpp 10 additions, 10 deletions

components/rgbd-sources/include/ftl/rgbd/camera.hpp
components/rgbd-sources/src/camera.cpp 12 additions, 7 deletions

components/rgbd-sources/src/camera.cpp
components/rgbd-sources/src/sources/stereovideo/rectification.cpp 2 additions, 2 deletions

...ts/rgbd-sources/src/sources/stereovideo/rectification.cpp
components/streams/src/renderers/openvr_render.cpp 5 additions, 0 deletions

components/streams/src/renderers/openvr_render.cpp

with 79 additions and 52 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment