Commit Graph

251 Commits

Author SHA1 Message Date
Jonas Strandstedt
5c666a0175 Further work on removing assertions from constructors 2014-12-12 11:46:10 +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
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
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
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
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
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
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
afa2d4d6a9 More work on GUI elements
Create GUI for some Properties
2014-12-06 17:20:59 +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
bf08b075a4 Try fixing Jenkins build 2014-12-06 01:29:54 +01:00
Alexander Bock
a03523aa4f First version of imgui integration 2014-12-06 00:32:17 +01:00
Alexander Bock
4e4de3f40e Changing the hardcoded bv-color map to a transfer function based map 2014-12-05 22:58:14 +01:00
Alexander Bock
d3e16a0437 Apply changes to texture reading 2014-12-05 21:01:54 +01:00
Alexander Bock
a0e927da14 Renamed Lua function printImage to takeScreenshot
Fixed takeScreenshot to actually take a screenshot
2014-12-05 16:14:30 +01:00
Alexander Bock
50076e4640 Fixing the flickering of the star rendering (#66) 2014-12-05 14:13:37 +01:00
Alexander Bock
2b79b85124 Started bugfix for renderable stars flickering bug 2014-12-05 11:56:43 +01:00
Alexander Bock
5497f25725 Added the selection property to the RenderableConstellationBounds 2014-12-04 23:05:51 +01:00
Alexander Bock
da80fc7251 Merge branch 'feature/constallationbounds' into develop 2014-12-04 19:19:50 +01:00
Alexander Bock
fe9db28310 Finished with current version of ConstellationBounds 2014-12-04 19:12:31 +01:00
Alexander Bock
3f35b0a948 More optimizations for RenderableConstellationBounds 2014-12-04 18:37:15 +01:00
Alexander Bock
38b1c00d3d Fix RenderableConstellationBounds name
Make rendering more efficient
2014-12-04 18:05:13 +01:00
Alexander Bock
b2cb6fb584 Change some more code in preparation of the new SGCT version 2014-12-04 16:28:49 +01:00
Alexander Bock
5d168c18e5 First working version 2014-12-04 00:55:25 +01:00
Alexander Bock
1a590f83e0 Initial commit of constallation bounds 2014-12-04 00:18:37 +01:00
Jonas Strandstedt
4ff9f08473 Changes to conform to new ghoul ProgramObject::Build interface 2014-12-03 16:30:25 +01:00
Jonas Strandstedt
f7b2bc12e0 Added billboard support for RenderablePlane 2014-12-03 14:48:50 +01:00
Jonas Strandstedt
a5e122b822 Improved the Lua documentation
- Lua documentation now needs a string giving the arguments list.
- When generating documentation first prints the command list and then prints
  the documentation for each command.
- Supports fixed max line length (set to 80)
- Uses four blank spaces as padding (easily replacable)
2014-12-03 14:13:53 +01:00
Alexander Bock
56e9892c56 Remove warnings from RenderEngine 2014-12-03 00:18:15 +01:00
Alexander Bock
eb6641a87b Updated Spice reference
Updated Ghoul reference
Added possible check-point for dome mismatch in rendering
2014-12-02 23:12:10 +01:00
Hans-Christian Helltegen
fd614efb71 Merge fix 2014-12-02 09:19:34 +01:00
Hans-Christian Helltegen
5b1b8694dc Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/geometryfieldlines 2014-12-01 16:40:01 +01:00
Hans-Christian Helltegen
834612469c Finalized the billboard rendering. Code cleanup 2014-12-01 16:27:30 +01:00
Alexander Bock
20c96f00e8 More cleanup of RenderableStars, enable rendering of Speed variable 2014-11-28 15:57:14 +01:00
Alexander Bock
4de8071efe Force all Renderables to declare an 'isReady' function to circumvent assertion triggers when a crucial element of initialization fails
Fix velocity in RenderableStars
2014-11-28 01:41:26 +01:00
Alexander Bock
2c3723a778 Fix a situation where a failed shader would trigger an assert in RenderablePlane 2014-11-27 23:43:06 +01:00
Alexander Bock
82491bf89b More work on cleaning up / extending RenderableStars 2014-11-27 23:42:32 +01:00