Commit Graph

19 Commits

Author SHA1 Message Date
Joakim Kilby
7c7b4f1f97 Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/dome 2015-02-17 14:41:02 +01:00
Alexander Bock
a6ebddb8eb Updated copyright header in all files 2015-02-17 14:20:03 +01:00
Joakim Kilby
5b3742961e added function for getting un-synchronized position of the camera (only meant to be used on master for calculation of camera matrix and position) 2015-02-17 13:29:45 +01:00
Joakim Kilby
aa66bdeaa4 added synced versions of shared variables and modified set/get methods to adress the right versions of variables 2015-02-17 11:58:57 +01:00
Joakim Kilby
c6b358488b changed sync variables for camera and time classes.
added a boolean _timeJumped which is synced and set to true whenever setTime is called.
(Note this is never set to false afterwards unless a call is made to setTimeJumped( bool ) with value false)
2015-02-13 11:02:35 +01:00
Joakim Kilby
2b83c19baa commit to be able to merge 2015-02-12 14:58:40 +01:00
Joakim Kilby
a8abfa74bd Added proper synchronization for mouse controller and camera.
Camera class now contains three instances of synched variables. a local copy changed on master. a shared copy only used for sharing in serialize/deserialize. and finally a synched copy never written to except in post sync
2015-02-10 11:34:12 +01:00
Joakim Kilby
47ed14b8d6 Added serialize / deserialize functions for camera.
Added proper mutex protected shared versions of synced variables for camera class.
Added a post sync function for camera class  (and a call to it in render engine post sync function)
2015-02-09 14:50:56 +01:00
Jonas Strandstedt
a7da4d84cc Added SyncBuffer class
- Added SyncBuffer class for easy and effecient synchronization
- Small changes to Camera class
- Forward declared a few classes to minimize dependencies
2014-10-22 16:37:54 +02:00
Alexander Bock
98d6e7138a Second try to fix the camera 2014-10-08 10:30:50 +02:00
Alexander Bock
bedc894064 Removing Jenkins warnings 2014-09-26 17:53:18 +02:00
michal
b1851e5313 Added geometry shader for halos and separate shader for points. Parsecs->m conversion works and added test-data to datafolder. 2014-08-28 23:04:27 -04:00
michal
8f3bcdeb54 WIP3: problems with texture coordinates, needs fix. 2014-08-26 19:26:09 -04:00
Alexander Bock
40a2cb1068 Renamed psc to powerscaledcoordinate and pss to powerscaledscalar 2014-05-11 14:32:42 +02:00
Alexander Bock
283a55f4de Included commented out version of new camera class
adapted RenderableVolume to use ModulePath
2014-05-05 00:04:00 +02:00
Alexander Bock
56f22d79c3 Some work towards multi-pipe 2014-05-04 18:35:23 +02:00
Alexander Bock
8a7bcc0036 Cleanup of Camera class 2014-05-04 17:06:35 +02:00
Hans-Christian Helltegen
a9e6291313 More trackball and camera work. Interaction is restricted to rotation around y 2014-05-02 11:59:23 -04:00
Jonas Strandstedt
89eeae62d0 Restructuring for OpenSpace tests
- Moved all OpenSpace headers to separate include directory
- Added OpenSpaceTests binary with OPENSPACE_HAVE_TESTS define
- Added CMake setting of BASE_DIR
- Added OpenSpace initial tests for SceneGraph and SceneGraphNodes
- Added OpenSpace initial tests for psc and pss
- Restructured OpenSpace so no GL functions are called in constructors
to make the classes testable

- Todo: Make the base dir possible to set through command line argument
and configuration file
2014-03-19 14:57:10 -04:00