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

58f473b9

Commit 58f473b9 authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'master' into feature/133/ilw

parents 4b77a0d5 59cd828f

No related branches found

No related tags found

1 merge request!109Resolves #173 remove voxel code

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

applications/groupview/src/main.cpp 21 additions, 11 deletions

applications/groupview/src/main.cpp
applications/reconstruct/src/voxel_scene.cpp 4 additions, 2 deletions

applications/reconstruct/src/voxel_scene.cpp
components/rgbd-sources/include/ftl/rgbd/frame.hpp 2 additions, 1 deletion

components/rgbd-sources/include/ftl/rgbd/frame.hpp
components/rgbd-sources/include/ftl/rgbd/frameset.hpp 32 additions, 0 deletions

components/rgbd-sources/include/ftl/rgbd/frameset.hpp
components/rgbd-sources/include/ftl/rgbd/group.hpp 2 additions, 16 deletions

components/rgbd-sources/include/ftl/rgbd/group.hpp
components/rgbd-sources/src/group.cpp 16 additions, 8 deletions

components/rgbd-sources/src/group.cpp
components/rgbd-sources/src/streamer.cpp 6 additions, 5 deletions

components/rgbd-sources/src/streamer.cpp

with 83 additions and 43 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