Commit Graph

147 Commits

Author SHA1 Message Date
Alexander Bock
a6ebddb8eb Updated copyright header in all files 2015-02-17 14:20:03 +01:00
Alexander Bock
862bfd6947 Making most includes in openspaceengine into forward declarations 2015-02-17 10:36:18 +01:00
Alexander Bock
d96dc3884c Added properties to change the appearance of stars 2015-02-17 09:31:58 +01:00
Alexander Bock
f87fd42075 Merge remote-tracking branch 'origin/feature/milkyway' into develop 2015-02-17 09:22:43 +01:00
Joakim Kilby
1cfabe6a2d Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT 2015-02-17 08:25:09 +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
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
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
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
Joakim Kilby
f43cc08dfb added presync function for engine 2015-02-10 11:34:33 +01:00
Alexander Bock
bb8f7b91ec Final changes on RenderableStars 2015-02-10 08:55:26 +01:00
Alexander Bock
8ebd2e4d71 More code cleanup of RenderableFieldlines 2015-01-21 15:13:16 +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
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
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
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
01e71f2fc0 More work on performance measuring in imgui 2014-12-09 15:49:54 +01:00
Alexander Bock
90eac194dc Initial work on performance measuring 2014-12-09 01:41:42 +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
5497f25725 Added the selection property to the RenderableConstellationBounds 2014-12-04 23:05:51 +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
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
f7b2bc12e0 Added billboard support for RenderablePlane 2014-12-03 14:48:50 +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
43d542293a More work in progress on RenderableStars
- Made the shader a private object not instantiated by scenegraph
- Started enabling coloring by velocity
- Code cleanup
2014-11-27 03:08:40 +01:00
Alexander Bock
e8de5edb45 Have RenderableStars cache the full Speck file
Enable basic slicing of the data
2014-11-27 02:26:43 +01:00
Alexander Bock
fc1dcfabc8 Some more changes to the RenderableStars class 2014-11-26 16:36:02 +01:00
Alexander Bock
b4f6070642 Started cleanup of RenderableStars class 2014-11-25 19:15:59 +01:00
Hans-Christian Helltegen
337ce2dd92 Added support for rendering fieldlines as textured view-aligned billboards 2014-11-24 17:18:55 +01:00