Commit Graph

626 Commits

Author SHA1 Message Date
Jonas Strandstedt 122aec83b1 Windows fix after memory leak fixes 2014-12-11 14:12:01 +01:00
jonasstrandstedt 7b2b81ed54 Fix memory leaks and proper deinitialization 2014-12-11 10:13:10 +01:00
jonasstrandstedt 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
jonasstrandstedt 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
jonasstrandstedt 179f6edd9d Added warning for SceneGraphNodes that were not loaded 2014-12-10 15:38:22 +01:00
jonasstrandstedt 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
jonasstrandstedt 6c870e47d7 Fixed path for LogFactory 2014-12-10 13:06:00 +01:00
Alexander Bock 81c930461f Only do cotire on non-linux systems (as Jenkins complains) 2014-12-10 01:24:33 +01:00
Alexander Bock 967ecfeb79 Enable cotire on default 2014-12-10 01:18:24 +01:00
Alexander Bock 3ff33ad209 Update openspace-data reference 2014-12-10 00:59:56 +01:00
Alexander Bock 2883eaf254 Enable Gui integration of SelectionPropertys 2014-12-10 00:55:51 +01:00
Alexander Bock c3bb233d29 Moved shadercode of constellationbounds 2014-12-10 00:27:35 +01:00
Alexander Bock 6d4ac1fe49 Add a new include path to the base shader folder
Move the RenderableStars shaders into a separate folder
2014-12-10 00:22:41 +01:00
Alexander Bock fe73550b55 Add a TriggerProperty that fires a single event when a value is passed 2014-12-09 23:31:05 +01:00
Michal Marcinkowski 759756ccb4 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
Conflicts:
	src/properties/optionproperty.cpp
2014-12-09 14:12:13 -05:00
Alexander Bock f201d4a622 Fix return-value-optimization errors 2014-12-09 19:39:16 +01:00
Alexander Bock 7226b23cc0 Fixing doxygen warnings 2014-12-09 19:11:49 +01:00
Alexander Bock 82c42cb97a General code cleanup 2014-12-09 18:36:23 +01:00
Alexander Bock 61ec72d9a0 Merge branch 'feature/performancemeasuring' into develop 2014-12-09 16:13:54 +01:00
Alexander Bock 2c36b35ab1 Store less performance records, do not leak memory in GUI 2014-12-09 16:10:03 +01:00
Alexander Bock 01e71f2fc0 More work on performance measuring in imgui 2014-12-09 15:49:54 +01:00
Jonas Strandstedt 6346f4fd98 Using new Ghoul CMake command for shared library copying 2014-12-09 13:16:09 +01:00
Jonas Strandstedt e87fa3fe0f Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-09 10:58:31 +01:00
Jonas Strandstedt 669ff45289 Added multi-line ScreenLog support 2014-12-09 10:57:55 +01:00
Michal Marcinkowski b40ec16f1c intermediate commit 2014-12-08 20:44:58 -05:00
Alexander Bock 90eac194dc Initial work on performance measuring 2014-12-09 01:41:42 +01:00
Alexander Bock 31191106fc Rebind keys to toggle GUI with F1 key 2014-12-08 20:26:13 +01:00
Alexander Bock d8f7bb746a Started cleaning OpenSpaceEngine 2014-12-08 18:30:18 +01:00
Alexander Bock ad9ba2404d Merge branch 'gui' into develop 2014-12-08 12:58:32 +01:00
Alexander Bock e72515ab77 Update ghoul version 2014-12-08 12:50:12 +01:00
Alexander Bock 7f8fa6add3 Remove warning in Windows 2014-12-08 12:44:29 +01:00
Alexander Bock 56e1187ee7 Always create the GUI element but make it switchable via scripting 2014-12-08 12:41:31 +01:00
Alexander Bock 9cd435f3e3 Fix imgui configuration definition 2014-12-07 00:39:16 +01:00
Alexander Bock 2c85d53164 Made GUI optional 2014-12-06 18:33:11 +01:00
Alexander Bock 40415a2eee Updated GUI names 2014-12-06 17:51:39 +01:00
Alexander Bock 7fc33948ca Remove error logging from PowerScaledSphere 2014-12-06 17:51:25 +01:00
Alexander Bock afa2d4d6a9 More work on GUI elements
Create GUI for some Properties
2014-12-06 17:20:59 +01:00
Alexander Bock 4e65aaafe2 Add method to get fully qualified id to Propertys 2014-12-06 17:19:25 +01:00
Alexander Bock 9a9c0c0237 Give PropertyOwner a field to remember its owner 2014-12-06 17:18:49 +01:00
Alexander Bock 8719f98a23 Allow access to minimum/maximum values of NumericalPropertys 2014-12-06 17:18:05 +01:00
Alexander Bock 98aeeb7d13 Merge branch 'develop' into gui 2014-12-06 12:51:26 +01:00
Alexander Bock 4f688a537e Add typedef for TemplateProperty 2014-12-06 12:51:11 +01:00
Alexander Bock 0854aa5bcb Added imgui library 2014-12-06 12:48:56 +01:00
Alexander Bock 0a0543cc94 More callbacks implemented 2014-12-06 12:46:52 +01:00
Alexander Bock 9f7e1581de Allow unique input to the GUI
Move GUI from RenderEngine to OpenSpace engine
2014-12-06 12:33:06 +01:00
Alexander Bock a253ca3441 Merge branch 'develop' into gui 2014-12-06 02:25:04 +01:00
Alexander Bock 58b814e6f2 Updated the cloc language definition 2014-12-06 01:56:30 +01:00
Alexander Bock d4072a7002 Updating Ghoul version 2014-12-06 01:30:03 +01:00
Alexander Bock bf08b075a4 Try fixing Jenkins build 2014-12-06 01:29:54 +01:00
Alexander Bock 4ffb5cb0d3 Update cloc language definition 2014-12-06 01:19:57 +01:00