Emil Axelsson
7da999c332
Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor
...
Conflicts:
include/openspace/engine/openspaceengine.h
src/engine/openspaceengine.cpp
src/engine/settingsengine.cpp
src/engine/syncengine.cpp
src/interaction/interactionhandler.cpp
src/rendering/renderengine.cpp
src/scene/scene.cpp
src/scene/scenegraph.cpp
src/scene/scenegraphnode.cpp
tests/test_scenegraphloader.inl
2017-03-07 10:57:50 +01:00
Alexander Bock
23ea86949f
Updated check_style_guide to test for include guards and copyright
...
notices
- Fix include guards
- Fix copyright header indentation
- Update copyright years
2017-02-09 23:55:39 -05:00
Emil Axelsson
4751ce36c4
Refactor scene graph: Move scene loading to separate class.
2016-12-30 17:08:50 +01:00
Alexander Bock
d139dd2d22
Clean include guards in OpenSpace core
...
Remove unused files
2016-12-09 13:54:22 +01:00
Erik Broberg
ee0cc6d165
Remove explicit syncing in Time and Camera and let SyncEngine do the work
2016-09-15 17:03:46 -04:00
Erik Broberg
d287b08c51
Enable toggling use of doublebuffering for camera and time
2016-09-13 11:52:54 -04:00
Erik Broberg
5cb6d2cb05
Move camera and time serialization and deserialization to cpp-files
2016-09-12 14:05:26 -04:00
Erik Broberg
9c5deaba82
Use double buffering for time and camera syncing
2016-09-07 21:39:29 -04:00
Erik Broberg
3a887fef02
Remove non-descriptive preSync and postSync methods from Camera class
2016-09-03 21:02:30 -04:00
Erik Broberg
796f80e511
Remove local, shared, synced Camera members, and keep one source of truth
2016-09-03 20:54:21 -04:00
Erik Broberg
d4f635513d
Merge branch 'develop' into feature/globebrowsing
2016-08-17 19:53:28 -04:00
Alexander Bock
c93d882ea6
Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files)
...
Updating SGCT and Ghoul references
2016-08-17 16:26:14 +02:00
kbladin
a89f474502
Solve merge conflict and add properties for friction and interaction parameters.
2016-06-30 14:07:51 -04:00
Kalle Bladin
35a095c448
Change camera dictionary state representation to consider position, rotation and focus node.
2016-06-29 15:23:37 -04:00
Kalle Bladin
5807919ac7
Start changing camera write and restore functions.
2016-06-29 10:45:26 -04:00
Alexander Bock
a56ce8d3f5
Clang compile fixes
2016-06-29 16:40:20 +02:00
Kalle Bladin
e5ccf185cd
Remove rotation state variables from interaction mode and enable more freely local rotation.
2016-06-28 22:28:56 -04:00
Alexander Bock
824da2199f
Include file cleanup
2016-06-27 15:02:21 +02:00
Erik Broberg
7c0e80b866
Enable basic saving and restoring camera position between runs
2016-06-22 17:37:55 -04:00
Kalle Bladin
45e7c41690
Update camera to use double precition.
2016-06-05 21:27:20 -04:00
Kalle Bladin
d7278bfcc8
Update camera class.
2016-06-05 21:07:36 -04:00
Kalle Bladin
309c97098c
Changed interface of camera class
2016-05-20 16:09:35 -04:00
Kalle Bladin
3ff322c282
Clean up camera class
2016-05-20 12:03:05 -04:00
Kalle Bladin
74f190ef7e
More clean up in camera class.
2016-05-20 11:46:36 -04:00
Kalle Bladin
e057f60a18
Remove psc internally from camera class.
2016-05-20 10:31:33 -04:00
Kalle Bladin
1db9f2f60c
Clean up camera class.
2016-05-19 23:21:48 -04:00
Kalle Bladin
9dda48d44b
Remove functions setViewRotationMatrix and compileViewRotationMatrix from camera class.
2016-05-19 12:22:55 -04:00
Kalle Bladin
0215c63bab
Camera class compiles but missing implementation of two functions.
2016-05-19 11:29:31 -04:00
Alexander Bock
906470f28e
Untabify the rest of the source files
...
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock
877a4d1ba6
Updated copyright header
2016-02-05 17:43:21 +01:00
Emil Axelsson
d4ff8119d1
refactor abuffer and add msaa support. volumes temporarily disabled.
2016-02-02 11:30:27 +01:00
Joakim Kilby
74ab05ec37
rename of mutex
2015-06-17 08:39:49 +02:00
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
