Joakim Kilby
a3ff828e91
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT
...
Conflicts:
src/engine/openspaceengine.cpp
2015-02-16 08:33:01 +01:00
Alexander Bock
3c4aec0082
Modularize RenderablePlane shader
2015-02-15 23:55:13 +01:00
Alexander Bock
e1c8b63c09
Fixing a crash with RenderableTrails when time is set manually
2015-02-15 23:04:09 +01:00
Alexander Bock
13c48242df
Update of Ghoul repository
2015-02-15 18:47:11 +01:00
Alexander Bock
86b754f313
Clean up of LuaConsole class
2015-02-15 17:56:07 +01:00
Alexander Bock
55f7b0fc03
Move 'keys' file from interaction to util
2015-02-15 17:55:44 +01:00
Alexander Bock
5d8cc4e04b
Updated Ghoul version
2015-02-15 16:58:47 +01:00
Alexander Bock
b61157b49e
Updated Ghoul version
2015-02-14 11:41:55 +01:00
Alexander Bock
f583eaee2a
Started cleanup work on LuaConsole, moved Clipboard functions into Ghoul
2015-02-14 11:37:29 +01:00
Alexander Bock
c57285c34f
Fix of RenderableTrail
2015-02-14 10:52:17 +01:00
Alexander Bock
8df0e5dc3f
Some more renderablestar changes
2015-02-14 10:48:16 +01:00
Alexander Bock
2e11d247d2
Remove a crash where ScriptManager was deinitialized wrongly
2015-02-14 10:41:54 +01:00
Joakim Kilby
03b8688595
added functionality to change camera orientation when the focus node changes
2015-02-13 11:46:19 +01:00
Alexander Bock
b3a867198c
Jenkins compile fix, removing double language definition
2015-02-13 11:23:51 +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
Alexander Bock
59f3ec6372
Jenkins compile fix, removing double language definition
2015-02-13 10:50:02 +01:00
Alexander Bock
a784985652
Jenkins compile fix
2015-02-13 10:24:52 +01:00
Alexander Bock
0de499b643
Jenkins compile fix
2015-02-13 10:15:58 +01:00
Joakim Kilby
e39f3adc18
Merge remote-tracking branch 'origin/develop' into feature/updateSGCT
2015-02-12 14:58:54 +01:00
Joakim Kilby
2b83c19baa
commit to be able to merge
2015-02-12 14:58:40 +01:00
Alexander Bock
31ec399faa
More changes on RenderableTrail
2015-02-10 20:18:20 +01:00
Alexander Bock
fd4d6562ad
First cleanup of RenderableTrails
2015-02-10 16:19:12 +01:00
Alexander Bock
338d8fb63b
Cleaning up of stars shader
2015-02-10 16:18:46 +01:00
Joakim Kilby
b2df005dfe
changed how a position is read from default script.
2015-02-10 11:35:50 +01:00
Joakim Kilby
7c2f2f0972
added call to presync method for render engine. remove locking of mutex for interaction handler. (why was this made? it has no effect)
2015-02-10 11:35:24 +01:00
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
Alexander Bock
bb8f7b91ec
Final changes on RenderableStars
2015-02-10 08:55:26 +01:00
Alexander Bock
a8a688398c
More fixes on RenderableStars
2015-02-09 18:06:01 +01:00
Alexander Bock
7d6792eba0
Temporary increase in interaction speed until setting is implemented
2015-02-09 17:35:58 +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
