8f924f7696
added serialize, deserialize, post sync and pre sync functions for script engine
2015-02-17 11:58:03 +01:00
1cfabe6a2d
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT
2015-02-17 08:25:09 +01:00
52e51b76bf
added initializedata struct
...
It is so far empty but will be used later on for initialization
2015-02-17 08:19:07 +01:00
7286ba3ded
Added Autocompletion for the LuaConsole (TAB/Shift+TAB)
2015-02-17 00:43:11 +01:00
69e0213e79
Added ability to disable shading for RenderablePlanet renderables
2015-02-16 19:23:23 +01:00
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
3c4aec0082
Modularize RenderablePlane shader
2015-02-15 23:55:13 +01:00
86b754f313
Clean up of LuaConsole class
2015-02-15 17:56:07 +01:00
55f7b0fc03
Move 'keys' file from interaction to util
2015-02-15 17:55:44 +01:00
f583eaee2a
Started cleanup work on LuaConsole, moved Clipboard functions into Ghoul
2015-02-14 11:37:29 +01:00
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
0de499b643
Jenkins compile fix
2015-02-13 10:15:58 +01:00
e39f3adc18
Merge remote-tracking branch 'origin/develop' into feature/updateSGCT
2015-02-12 14:58:54 +01:00
2b83c19baa
commit to be able to merge
2015-02-12 14:58:40 +01:00
31ec399faa
More changes on RenderableTrail
2015-02-10 20:18:20 +01:00
fd4d6562ad
First cleanup of RenderableTrails
2015-02-10 16:19:12 +01:00
f43cc08dfb
added presync function for engine
2015-02-10 11:34:33 +01:00
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
bb8f7b91ec
Final changes on RenderableStars
2015-02-10 08:55:26 +01:00
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
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
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
f7171e1936
Added update function for all mouse controller objects.
...
Added OrbitalMouseController class
2015-02-06 11:21:02 +01:00
8ebd2e4d71
More code cleanup of RenderableFieldlines
2015-01-21 15:13:16 +01:00
f752221772
Added Vec4Property to imgui
2015-01-21 15:12:54 +01:00
d6a02140ea
More RenderableFieldlines code cleanup
2015-01-21 01:44:56 +01:00
f72d151c6c
Initial changes to RenderableFieldlines
2015-01-21 00:42:33 +01:00
6b164f0b36
Added camera offset support
2015-01-06 12:43:16 +01:00
55a3c43db4
Move imgui file to its own folder
2014-12-18 17:21:20 +01:00
e45813dd91
Add stepping value into Property description
2014-12-18 13:46:18 +01:00
7cd1374cdb
Added description for OptionProperty
2014-12-17 18:52:01 +01:00
6336ee998a
Added description for SelectionProperty
2014-12-17 18:47:30 +01:00
618f3ab930
Add description for numerical properties
2014-12-17 18:18:34 +01:00
5a7a518bad
Remove cppcheck warnings
2014-12-16 21:54:53 +01:00
734ce03d72
Changed the deinitialization of renderable from the destructorto the scenegraphnode
2014-12-15 20:51:00 +01:00
bf0a8291d6
Updated to the most recent Ghoul
...
- Using new VertexBufferObject in PowerScaledSphere as a test case.
2014-12-15 17:10:43 +01:00
6360a5f66a
Add methods for generating Property descriptions
2014-12-12 14:47:08 +01:00
93a34fa985
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2014-12-12 11:00:26 +01:00
37a59f3f09
Removed assertions from renderable constructors
...
- Removed assertions from RenderableFieldlines constructor
- Removed assertions from RenderableFov constructor, the variables wasn't
even used.
- Removed assertions from RenderablePath constructor
- Fixed missing delete[] is RenderableSphericalGrid
- Removed assertions from RenderableTrail constructor, added glDelete*
functions
- Removed assertions from RenderablevolumeGL constructor
2014-12-12 10:59:28 +01:00
119b1eb335
Started work to produce descriptive output for Properties in preparation for GUI generation
2014-12-11 23:41:31 +01:00
e70b663dc3
Add log.html to the list of ignored files
...
Enable capability to disable on-screen info text
2014-12-11 18:09:19 +01:00
9e61d3ac94
Fixes for RenderableFov
2014-12-11 17:16:41 +01:00
da4fa44c03
Continued work on memory leaks and proper isReady usage
2014-12-11 16:48:49 +01:00
dc21196f70
Removed RenderableEphemeris
2014-12-11 16:45:02 +01:00
122aec83b1
Windows fix after memory leak fixes
2014-12-11 14:12:01 +01:00
7b2b81ed54
Fix memory leaks and proper deinitialization
2014-12-11 10:13:10 +01:00
01361307f6
Update ghoul reference
...
- Added destructor to OpenSpaceEngine to deallocate SyncBuffer
- Changed texture reading to avoid memory leak
2014-12-10 20:57:41 +01:00
81caf96d72
Started working on Renderables
...
- Making sure isReady is properly set
- Making sure initialization is done correctly
- Making sure deinitialization is done correctly
2014-12-10 19:43:38 +01:00
179f6edd9d
Added warning for SceneGraphNodes that were not loaded
2014-12-10 15:38:22 +01:00
302e642c1c
Dependency system for OpenSpace Modules
...
When loading the SceneGraph for the first time all modules are loaded
into a map and the parent dependency to another map. After all modules
and ScenegraphNodes have been loaded into the map, each module is loaded
in dependency order starting from the root node.
2014-12-10 14:35:08 +01:00
Joakim Kilby