Commit Graph

134 Commits

Author SHA1 Message Date
Joakim Kilby e39f3adc18 Merge remote-tracking branch 'origin/develop' into feature/updateSGCT 2015-02-12 14:58:54 +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
Hans-Christian Helltegen 815fc3b348 Fixed depth, position, scale and shader issues with fieldlines. Added passthrough geometry shader 2014-11-21 10:37:01 +01:00
Jonas Strandstedt 8d2503b68e Added support for pixelData for ABuffer
- ABufferFixed should work but it doesn't. But the interface works at
  least.
- ABufferFixed works for normal rendering
- Removed position for ABuffer, it should make rendering much faster.

Todo:
- Figure out why the fetching of pixelData for ABufferFixed gives wrong
  result.
2014-11-13 15:41:10 +01:00
Jonas Strandstedt ba7a4a4a47 Added ABuffer visualizer
- First draft of the ABuffer visualizer renders a cube with all fragments
  from the single linked abuffer. Lua command to turn on is
  openspace.visualizeABuffer(true)
- Fixed LuaConsole to stop receiving input command after inputing command
- Fixed LuaConsole not to add command to history if it is identical to the
  most recent command.

 TODO:
 - Add support for dynamic and fixed abuffer
 - Scale the cube to match the window ratio
2014-11-12 16:54:40 +01:00
Jonas Strandstedt 46959b4801 Cleanup for KameleonWrapper
- Fixed so size and scale for RenderableVolumeGL can be deduced from model.
2014-11-11 13:43:38 +01:00
Jonas Strandstedt f85e18dc18 OS X now doesn't crash for volumes
- Fixed a few warnings
2014-11-05 17:11:27 +01:00
Jonas Strandstedt 15db56ff33 Removed unused file 2014-10-27 19:10:09 +01:00
Jonas Strandstedt 4bb9d8c800 Merge branch 'solarsystem2' into cleanup
Conflicts:
	src/util/factorymanager.cpp
2014-10-27 19:03:36 +01:00
Jonas Strandstedt ea3c5e8d11 More cleanup 2014-10-24 13:34:03 +02:00
michal d3ea503454 Fixes to the modelloader class 2014-10-23 20:11:49 -04:00
michal ecfc4ad79a reshaping the modelloader class to suit the overall design of openspace 2014-10-23 18:49:15 -04:00
michal 08a97d9e68 Merge branch 'develop' into solarsystem2
Conflicts:
	scripts/default_startup.lua
	src/rendering/renderablewavefrontobject.cpp
2014-10-23 11:45:24 -04:00
Jonas Strandstedt 5e410c6816 Removed unused files 2014-10-23 14:35:04 +02:00
Jonas Strandstedt a7da4d84cc Added SyncBuffer class
- Added SyncBuffer class for easy and effecient synchronization
- Small changes to Camera class
- Forward declared a few classes to minimize dependencies
2014-10-22 16:37:54 +02:00