Commit Graph

339 Commits

Author SHA1 Message Date
Alexander Bock 46b2d18c75 Merge branch 'develop' into feature/milkyway 2015-02-17 00:44:38 +01:00
Alexander Bock 7286ba3ded Added Autocompletion for the LuaConsole (TAB/Shift+TAB) 2015-02-17 00:43:11 +01:00
Alexander Bock 98aeeda24d Added support for variable transparency in RenderableSphere
Created own shaders for RenderableSphere
2015-02-16 23:16:06 +01:00
Alexander Bock bb5f6e1bca Renamed member variable of SimpleSphereGeometry from _planet to _sphere 2015-02-16 22:13:03 +01:00
Alexander Bock 17f6d376be Merge branch 'develop' into feature/milkyway 2015-02-16 21:03:36 +01:00
Alexander Bock 69e0213e79 Added ability to disable shading for RenderablePlanet renderables 2015-02-16 19:23:23 +01:00
Alexander Bock 3c4aec0082 Modularize RenderablePlane shader 2015-02-15 23:55:13 +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 f583eaee2a Started cleanup work on LuaConsole, moved Clipboard functions into Ghoul 2015-02-14 11:37:29 +01:00
Alexander Bock 0de499b643 Jenkins compile fix 2015-02-13 10:15:58 +01:00
Alexander Bock a837b59add First addition of RenderableSphere 2015-02-10 20:19:29 +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 bb8f7b91ec Final changes on RenderableStars 2015-02-10 08:55:26 +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
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 f72d151c6c Initial changes to RenderableFieldlines 2015-01-21 00:42:33 +01:00
jonasstrandstedt 6b164f0b36 Added camera offset support 2015-01-06 12:43:16 +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 618f3ab930 Add description for numerical properties 2014-12-17 18:18:34 +01:00
Alexander Bock 5a7a518bad Remove cppcheck warnings 2014-12-16 21:54:53 +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 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 6360a5f66a Add methods for generating Property descriptions 2014-12-12 14:47:08 +01:00
Jonas Strandstedt 93a34fa985 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-12 11:00:26 +01:00
Jonas Strandstedt 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
Alexander Bock 119b1eb335 Started work to produce descriptive output for Properties in preparation for GUI generation 2014-12-11 23:41:31 +01:00
Alexander Bock 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
Jonas Strandstedt 9e61d3ac94 Fixes for RenderableFov 2014-12-11 17:16:41 +01:00
Jonas Strandstedt da4fa44c03 Continued work on memory leaks and proper isReady usage 2014-12-11 16:48:49 +01:00
Jonas Strandstedt dc21196f70 Removed RenderableEphemeris 2014-12-11 16:45:02 +01:00
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
Alexander Bock 2883eaf254 Enable Gui integration of SelectionPropertys 2014-12-10 00:55:51 +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 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 2c36b35ab1 Store less performance records, do not leak memory in GUI 2014-12-09 16:10:03 +01:00