Code

New MegaMol Camera#213

Code

Merged

tobiasrau merged 148 commits intoUniStuttgart-VISUS:master-devUniStuttgart-VISUS/megamol:master-devfrom schatzkn:newcamschatzkn/megamol-dev:newcamCopy head branch name to clipboardJul 12, 2019

+25,868-1,024

Commits

Commits on Aug 8, 2018

• added new dummy View3D module

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  eb1df96

• implemented some additonal methods

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  2b72203

• made the new view visible to the configurator

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  16686f4

Commits on Aug 10, 2018

• incorporated all necessary files of christophs camera and all necessary libraries (glm)

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  046e926

• namespace galore

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  ab32a5f

• remove unnecessary includes

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  ab9489a

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  70982ff

• added .inl files to the VS solution

  

  Karsten Schatz

  committed
  d5a243a

Commits on Aug 13, 2018

• Added new call files

  

  Karsten Schatz

  committed
  943d664

Commits on Aug 15, 2018

• fixed several template-related compile errors

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  4062cb4

Commits on Aug 20, 2018

• propagated changes for a working arcball

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  e897219

• added renderer dummy for a new CartoonTesssellationRenderer#

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  8a0e3f1

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  6ba33bf

• added shader program for the bounding box

  

  Karsten Schatz

  committed
  5c8f126

Commits on Aug 21, 2018

• Connection of new rendering modules now possible, but not functional

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  1ff36e0

Commits on Aug 24, 2018

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  533d3a5

Commits on Aug 25, 2018

• removed Watermark functionality from new View3D

  

  Karsten Schatz

  committed
  3ed8e1b

• Removed frozen values from new View3D

  

  Karsten Schatz

  committed
  d3124c7

• removed remainders of the old camera from the new view

  

  Karsten Schatz

  committed
  f172c8f

Commits on Aug 28, 2018

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  5403e44

Commits on Aug 29, 2018

• Added OpenGL helper classes from invor/glowl. Currently not fitting to the rest of the code.

  

  Karsten Schatz

  committed
  0da6bee

• clang formatting of the new classes

  

  Karsten Schatz

  committed
  839564e

Commits on Aug 30, 2018

• namespace galore

  

  Karsten Schatz

  committed
  033868d

Commits on Aug 31, 2018

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  13ff455

• fixed missing <memory> include. Better include name tags

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  6c88912

• comment galore part I

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  39adb18

Commits on Sep 1, 2018

• Added all the comments

  

  Karsten Schatz

  committed
  d6f3bb4

Commits on Sep 2, 2018

• Renamed all relevant modules

  

  Karsten Schatz

  committed
  d34e721

Commits on Sep 4, 2018

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  10d9b42

• Added missing file from last commit

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  08b7578

• fixed renaming bug

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  66056f6

Commits on Sep 5, 2018

• renderer progress

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  2112e98

Commits on Sep 7, 2018

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  0d54c7e

Commits on Sep 10, 2018

• Fixed function count issue

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  f6efa5c

Commits on Sep 14, 2018

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  f566c20

Commits on Sep 17, 2018

• lazy init for Michaels FBO

  

  Karsten Schatz

  committed
  d6bff22

Commits on Sep 18, 2018

• added missing include

  

  Karsten Schatz

  committed
  fef6300

Commits on Sep 23, 2018

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  81f31b4

Commits on Sep 24, 2018

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  76142af

Commits on Oct 4, 2018

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  68f99ba

Commits on Oct 6, 2018

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  0d0feef

Commits on Oct 7, 2018

• fixed destruction issue in CinematicView

  

  Karsten Schatz

  committed
  af115b8

• made the new view compile again

  

  Karsten Schatz

  committed
  d36439d

• added a second version of the SimplestSphereRenderer to test the new view

  

  Karsten Schatz

  committed
  f3c666d

Commits on Oct 8, 2018

• newcam progress

  

  Karsten Schatz

  committed
  8796fb1

Commits on Oct 9, 2018

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  e71a7e3

Commits on Oct 15, 2018

• added new abstractView class

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  8596b56

Commits on Oct 30, 2018

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  3a77523

Commits on Nov 1, 2018

• incorporated christophs new interaction

  

  Karsten Schatz

  committed
  bd18d36

Commits on Nov 24, 2018

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  162c9b0

• Fixed compilation errors using the new camera

  

  Karsten Schatz

  committed
  51c5ee6

Commits on Nov 29, 2018

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  a4d9d71

• fixed glm include issues with new core CMakeLists.txt

  

  Karsten Schatz

  committed
  c3cf587

• introduced new namespace for the new stuff

  

  Karsten Schatz

  committed
  1b4b3de

Commits on Dec 8, 2018

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  c5ced74

Commits on Dec 9, 2018

• Added camera class stub.

  Show description for b765a81
  

  Karsten Schatz

  committed
  b765a81

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  941dd80

Commits on Dec 18, 2018

• camera stuff

  

  Karsten Schatz

  committed
  622c3b8

Commits on Dec 22, 2018

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  b38076e

Commits on Dec 27, 2018

• Added missing camera functions

  

  Karsten Schatz

  committed
  5dba192

Commits on Dec 31, 2018

• added new class for bounding boxes

  

  Karsten Schatz

  committed
  48cad65

Commits on Jan 3, 2019

• clipping plane computation

  

  Karsten Schatz

  committed
  dc5af49

Commits on Jan 8, 2019

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  7d474d3

Commits on Jan 28, 2019

• Renaming of RenderOutput

  

  Karsten Schatz

  committed
  9ba8ab2

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  cf3406c

Commits on Jan 29, 2019

• Integrated camera state into rendering call. DOES NOT COMPILE because of missing constant exports

  

  Karsten Schatz

  committed
  802236a

Commits on Jan 30, 2019

• Fixed dll export error for static class members

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  b532145

Commits on Jan 31, 2019

• Camera parameters are now propagated to the renderers

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  f605a85

Commits on Feb 1, 2019

• Call propagation progress

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  6d4245a

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  authored and

  Karsten Schatz

  committed
  c66be7c

Commits on Feb 5, 2019

• Revamped callback structure of the RendererModule to allow chained renderers

  

  Karsten Schatz

  committed
  b6d4f93

Commits on Feb 6, 2019

• Passthrough of camera values to the renderer works

  

  schatzkn

  committed
  8d92b35

Commits on Feb 8, 2019

• Merge remote-tracking branch 'upstream/master-dev' into newcam_progress

  

  schatzkn

  committed
  246a597

Commits on Feb 17, 2019

• fixed camera state transfer

  

  schatzkn

  committed
  05cc79e

Commits on Feb 19, 2019

• view frustum top is now above its bottom

  

  schatzkn

  committed
  21125b6

Commits on Feb 24, 2019

• Merge remote-tracking branch 'upstream/master-dev' into newcam_progress

  

  schatzkn

  committed
  390ecbf

Commits on Feb 25, 2019

• MegaMol does not close anymore when pressing 'q'

  

  schatzkn

  committed
  0d7963a

• Keyboard camera interaction revamped

  Show description for c517fd0
  

  schatzkn

  committed
  c517fd0

• First images work

  Show description for 2bf2f09
  

  schatzkn

  committed
  2bf2f09

• Merge remote-tracking branch 'origin/newcam_progress' into newcam_progress

  

  schatzkn

  committed
  608a188

• Added dummy BoundingBoxRenderer

  Show description for a9fabe2
  

  schatzkn

  committed
  a9fabe2

Commits on Feb 26, 2019

• Removed unnecessary Cursor2D

  

  schatzkn

  committed
  1a73e2f

• Revert "Removed unnecessary Cursor2D"

  Show description for cf48cc6
  

  schatzkn

  committed
  cf48cc6

• Auto stash before revert of "Removed unnecessary Cursor2D"

  

  schatzkn

  committed
  2e10a6f

• First prototype of arcball manipulation (horrible)

  Show description for 728fe87
  

  schatzkn

  committed
  728fe87

• Added dummy files for the rotate manipulator

  

  schatzkn

  committed
  5832aa4

• Prototype of rotate manipulator

  Show description for 1839553
  

  schatzkn

  committed
  1839553

Commits on Feb 27, 2019

• Fixed camera rotation

  Show description for 63e5146
  

  schatzkn

  committed
  63e5146

• Added config value for arcball

  Show description for c09fe43
  

  schatzkn

  committed
  c09fe43

• Smoother camera movement

  Show description for ec1b8be
  

  schatzkn

  committed
  ec1b8be

• Chained calls work now somewhat

  Show description for 5acdacb
  

  schatzkn

  committed
  5acdacb

• Included .inl files of the camera in the solution

  Show description for a165266
  

  schatzkn

  committed
  a165266

• Revamped structure of the BoundingBoxRenderer

  

  schatzkn

  committed
  14a4168

Commits on Feb 28, 2019

• Bounding box rendering works

  Show description for d225448
  

  schatzkn

  committed
  d225448

• Mouse-steered camera rotation

  

  schatzkn

  committed
  9e0314f

• Nested bounding boxes

  Show description for 6654c51
  

  schatzkn

  committed
  6654c51

• Removed bounding box rendering remainders from View3D_2

  

  schatzkn

  committed
  8488746

Commits on Mar 1, 2019

• Camera save feature

  Show description for 1f3c0cd
  

  schatzkn

  committed
  1f3c0cd

• Made the bounding box line smoothing optional

  

  schatzkn

  committed
  d1803fc

Commits on Mar 2, 2019

• Replaced c-style arrays with std::arrays to make serialization easier

  

  schatzkn

  committed
  30896d3

Commits on Mar 3, 2019

• Added nlohmann/json as dependency for json generation and parsing

  

  schatzkn

  committed
  867d912

Commits on Mar 4, 2019

• Merge remote-tracking branch 'upstream/master-dev' into newcam_progress

  

  Karsten Schatz

  committed
  c631261

• Fixes for the new key input paradigm

  

  Karsten Schatz

  committed
  fe97806

• Fixed key input paradigm for new camera related files

  

  Karsten Schatz

  committed
  10a37e4

• Merge remote-tracking branch 'upstream/master-dev' into newcam_progress

  

  Karsten Schatz

  committed
  e512486

• Smoother modkey pressing mechanism for View3D_2

  

  Karsten Schatz

  committed
  a641484

• Merge remote-tracking branch 'origin/newcam_progress' into newcam_progress

  

  schatzkn

  committed
  322ef75

Commits on Mar 5, 2019

• Method defintions for the CameraSerializer

  

  Karsten Schatz

  committed
  dc26cba

• Method defintions for the CameraSerializer

  

  Karsten Schatz

  committed
  2439a22

• Merge remote-tracking branch 'origin/newcam_progress' into newcam_progress

  

  Karsten Schatz

  committed
  4eecfc7

• Camera serialization

  

  Karsten Schatz

  committed
  cacd0e9

• Camera deserialization

  

  Karsten Schatz

  committed
  9fade97

• First non-trivial renderer compatible with new camera (lights missing)

  

  Karsten Schatz

  committed
  2bff88c

Commits on Mar 6, 2019

• Merge remote-tracking branch 'upstream/master-dev' into newcam_progress

  

  Karsten Schatz

  committed
  d7ff045

Commits on Mar 12, 2019

• Removed unnecessary stuff from View3D_2

  

  Karsten Schatz

  committed
  3a07e21

• Moved OSPRay light sources to the core.

  Show description for 6799080
  

  Karsten Schatz

  committed
  6799080

Commits on Mar 15, 2019

• Merge remote-tracking branch 'upstream/master-dev' into newcam_progress

  

  Karsten Schatz

  committed
  85eb234

Commits on Mar 16, 2019

• Usage of light sources in new renderers now possible

  Show description for 0dbf965
  

  Karsten Schatz

  committed
  0dbf965

Commits on Mar 23, 2019

• some arcball fixes

  

  Karsten Schatz

  committed
  9fad1ca

Commits on Apr 1, 2019

• Merge remote-tracking branch 'upstream/master-dev' into newcam_progress

  

  Karsten Schatz

  committed
  51f21f1

Commits on Apr 2, 2019

• GUIRenderer now capable of handling new render calls

  Show description for e6a1c64
  

  Karsten Schatz

  committed
  e6a1c64

• Merge remote-tracking branch 'upstream/master-dev' into newcam_progress

  

  Karsten Schatz

  committed
  8bfac8c

• Fixed merge error

  

  Karsten Schatz

  committed
  9db6ea4

Commits on Apr 3, 2019

• GUI renderer format

  

  Karsten Schatz

  committed
  333475f

• Fixed key handling with active GUI

  

  Karsten Schatz

  committed
  66b711f

• Fixed error handling in the CameraSerializer

  

  Karsten Schatz

  committed
  1c1e539

• Load & Store of camera into param string

  

  Karsten Schatz

  committed
  5519dab

Commits on Apr 4, 2019

• SphereColoringModule now using ColorParams instead of Vec4f

  

  Karsten Schatz

  committed
  784d2e5

Commits on Apr 5, 2019

• Correct movement of the arcball rotation center

  

  Karsten Schatz

  committed
  da1b690

Commits on Apr 7, 2019

• Merge remote-tracking branch 'upstream/master-dev' into newcam_progress

  

  Karsten Schatz

  committed
  e578ca8

Commits on Apr 17, 2019

• Merge remote-tracking branch 'upstream/master-dev' into newcam_progress

  

  Karsten Schatz

  committed
  e9f3c37

• Fixed error from last merge

  

  Karsten Schatz

  committed
  a5ddb93

Commits on May 2, 2019

• Merge remote-tracking branch 'upstream/master-dev' into newcam_progress

  

  Karsten Schatz

  committed
  c53819b

Commits on May 3, 2019

• Esc and Home button fix with no GUIRenderer attached

  

  Karsten Schatz

  committed
  99d7181

• CallLight is now correctly exposed again

  

  Karsten Schatz

  committed
  74d03a9

• New arcball structure

  

  Karsten Schatz

  committed
  55a5456

Commits on Jun 3, 2019

• Merge remote-tracking branch 'upstream/master-dev' into newcam_progress

  

  Karsten Schatz

  committed
  0c81a10

• OnRenderView no propagates the rendering call

  

  Karsten Schatz

  committed
  1d4b36f

Commits on Jun 25, 2019

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  f0e0850

Commits on Jun 26, 2019

• Fixed permissive- compile errors

  

  Karsten Schatz

  committed
  f1d1df6

Commits on Jun 28, 2019

• Deactivated console FPS message

  

  Karsten Schatz

  committed
  d1e69cb

• Fixed steering after camera loading

  

  Karsten Schatz

  committed
  33e4329

Commits on Jul 10, 2019

• Indentation

  

  Karsten Schatz

  committed
  5deeb04

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  6a49040

• Merge remote-tracking branch 'upstream/master-dev' into newcam

  

  Karsten Schatz

  committed
  50607b6

• Better arcball than before, fix later

  

  Karsten Schatz

  committed
  9d0ffe6

Commits on Jul 12, 2019

• Merge branch 'master-dev' into newcam

  tobiasrau

  committed
  7300130

• now compiles with gcc

  tobiasrau

  committed
  453f4a8