Commit Graph

687 Commits

Author SHA1 Message Date
Joakim Kilby
f43cc08dfb added presync function for engine 2015-02-10 11:34:33 +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
Joakim Kilby
32a56085d9 Added a delta time member variable to openspace engine and changed how dt is calculated.
it is now averaged over two frames instead of being just dt between two frames. This gives more stability
2015-02-09 13:52:00 +01:00
Joakim Kilby
36bfe79eb4 Merge branch 'feature/dome' into develop 2015-02-09 10:47:15 +01:00
Alexander Bock
3a18d0c763 More fixed for RenderableStars
Added screenshot button for F4
2015-02-09 08:35:06 +01:00
Joakim Kilby
f4081de263 Commented out all references to the index array, all indexes were subsequent so theres no need for an index array.
The array was also created wrongly so rendering was faulty in the dome.
Also changed condition for when to update trail to check if oldtime is smaller than time. Oldtime is now initialized to float max
2015-02-06 13:41:11 +01:00
Joakim Kilby
737a5082fa MouseController created is now of the type OrbitalMouseController 2015-02-06 11:23:04 +01:00
Joakim Kilby
fe0cd2c130 Added call to update of MouseController in update function.
Added distance and orbit functions.
modified setRotation function to actually set rotation of camera (was empty)
2015-02-06 11:22:34 +01:00
Joakim Kilby
f7171e1936 Added update function for all mouse controller objects.
Added OrbitalMouseController class
2015-02-06 11:21:02 +01:00
Joakim Kilby
ad58c73eba Hotfix of cluster functionality. Solved an issue where syncronization of camera data may occur before the camera object has been initialized on nodes. 2015-02-03 10:55:08 +01:00
Alexander Bock
20de1169b5 First small fix with RenderableStars 2015-01-23 09:53:41 +01:00
Alexander Bock
9350172c5a Updated Openspace-data 2015-01-21 15:43:07 +01:00
Alexander Bock
8ebd2e4d71 More code cleanup of RenderableFieldlines 2015-01-21 15:13:16 +01:00
Alexander Bock
f752221772 Added Vec4Property to imgui 2015-01-21 15:12:54 +01:00
Alexander Bock
d6a02140ea More RenderableFieldlines code cleanup 2015-01-21 01:44:56 +01:00
Alexander Bock
1a66df3336 More RenderableFieldlines code cleanup 2015-01-21 00:54:02 +01:00
Alexander Bock
f72d151c6c Initial changes to RenderableFieldlines 2015-01-21 00:42:33 +01:00
Alexander Bock
4a44905f48 Add additional check for GUI shader compilation 2015-01-21 00:41:18 +01:00
Alexander Bock
8b26d6abf6 Add include to please Jenkins 2015-01-20 22:05:16 +01:00
Alexander Bock
32b2c4942f Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-01-20 21:54:34 +01:00
Alexander Bock
ec8c5b7132 Revert automatic gui compilation 2015-01-20 21:54:08 +01:00
Alexander Bock
16518dbc96 Allow renderablefieldlines to load a passed file instead of requiring loading through Lua 2015-01-20 21:32:46 +01:00
Joakim Kilby
4b40e88843 Activated imgui compilation on default 2015-01-14 14:39:55 +01:00
jonasstrandstedt
6b164f0b36 Added camera offset support 2015-01-06 12:43:16 +01:00
Alexander Bock
6adb5f8994 Merge branch 'git-ghoul' into develop 2014-12-20 00:24:49 +01:00
Alexander Bock
b2c216c2b6 New module file 2014-12-20 00:15:02 +01:00
Alexander Bock
55a3c43db4 Move imgui file to its own folder 2014-12-18 17:21:20 +01:00
Alexander Bock
e45813dd91 Add stepping value into Property description 2014-12-18 13:46:18 +01:00
Alexander Bock
7cd1374cdb Added description for OptionProperty 2014-12-17 18:52:01 +01:00
Alexander Bock
6336ee998a Added description for SelectionProperty 2014-12-17 18:47:30 +01:00
Alexander Bock
7181a8f9da Remove test code 2014-12-17 18:19:06 +01:00
Alexander Bock
618f3ab930 Add description for numerical properties 2014-12-17 18:18:34 +01:00
Alexander Bock
72adb770f7 Set the correct default values for MatrixProperties 2014-12-17 18:18:12 +01:00
Alexander Bock
5a7a518bad Remove cppcheck warnings 2014-12-16 21:54:53 +01:00
Alexander Bock
c9a3080c48 Updated ghoul repository 2014-12-16 20:09:00 +01:00
Jonas Strandstedt
00338cce67 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-16 19:10:00 +01:00
Jonas Strandstedt
b81133e381 Removes most of Visual Studio warnings 2014-12-16 19:09:32 +01:00
Jonas Strandstedt
6ad4d0743e Updated to most recent ghoul 2014-12-16 18:28:55 +01:00
Alexander Bock
f7c2398b3d Update to newest ghoul version 2014-12-16 16:35:08 +01:00
Jonas Strandstedt
0d519f6789 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-16 11:38:15 +01:00
Jonas Strandstedt
73c123dc69 Updated to latest Ghoul. 2014-12-16 11:37:46 +01:00
Alexander Bock
734ce03d72 Changed the deinitialization of renderable from the destructorto the scenegraphnode 2014-12-15 20:51:00 +01:00
Jonas Strandstedt
81574ff905 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-15 17:11:58 +01:00
Jonas Strandstedt
bf0a8291d6 Updated to the most recent Ghoul
- Using new VertexBufferObject in PowerScaledSphere as a test case.
2014-12-15 17:10:43 +01:00
Alexander Bock
5dac3926a1 Apply Ghoul changes 2014-12-14 02:33:50 +01:00
Alexander Bock
9dea69d675 Empty commit to get a new HEAD 2014-12-12 23:16:55 +01:00
Alexander Bock
38aacc05a7 removing spice source files in preparation for the big purge 2014-12-12 23:01:20 +01:00
Jonas Strandstedt
eb7488318a Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-12 14:55:48 +01:00
Jonas Strandstedt
56e3851b8f Renamed CPUCapabilitiesComponent to GeneralCapabilitiesComponent 2014-12-12 14:55:16 +01:00