Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ar_sandbox_lib
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

fc7d1bec

Commit fc7d1bec authored 4 years ago by simon.fanetti

Downloads
- Plain Diff

Merge branch 'camera' into 'master'

Camera

See merge request !1

parents 10e5c7ff 31c20bf9

No related branches found

No related tags found

Loading

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

app/SandboxSetup/beamerlocationgui.cpp 1 addition, 1 deletion

app/SandboxSetup/beamerlocationgui.cpp
app/SandboxSetup/beamerlocationgui.h 1 addition, 0 deletions

app/SandboxSetup/beamerlocationgui.h
app/SandboxSetup/croppingmask.cpp 4 additions, 0 deletions

app/SandboxSetup/croppingmask.cpp
app/SandboxSetup/initcamera.cpp 6 additions, 15 deletions

app/SandboxSetup/initcamera.cpp
app/SandboxSetup/initcamera.h 2 additions, 4 deletions

app/SandboxSetup/initcamera.h
inc/beamer.h 1 addition, 1 deletion

inc/beamer.h
inc/beamerProjection.h 9 additions, 4 deletions

inc/beamerProjection.h
inc/camera.h 20 additions, 15 deletions

inc/camera.h
inc/sandbox.h 7 additions, 2 deletions

inc/sandbox.h
inc/sandboxConfig.h 8 additions, 5 deletions

inc/sandboxConfig.h
src/components/beamer.cpp 6 additions, 8 deletions

src/components/beamer.cpp
src/components/beamerProjection.cpp 116 additions, 34 deletions

src/components/beamerProjection.cpp
src/components/camera.cpp 77 additions, 49 deletions

src/components/camera.cpp
src/lib/sandbox.cpp 18 additions, 37 deletions

src/lib/sandbox.cpp
src/lib/sandboxSetup.cpp 3 additions, 0 deletions

src/lib/sandboxSetup.cpp
src/tools/sandboxConfig.cpp 93 additions, 47 deletions

src/tools/sandboxConfig.cpp

with 372 additions and 222 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