Commit Graph

43 Commits

Author SHA1 Message Date
Alexander Bock bc5eec4158 Merge branch 'develop' into feature/remote_redesign
Conflicts:
	src/util/spicemanager.cpp
2015-07-08 16:51:40 +02:00
Alexander Bock 2947a6f85a Introducing hack in ABuffer to make the backside of planetprojection not be transparent 2015-07-08 16:45:08 +02:00
Alexander Bock 9ef34a6e54 Only define the masks when using the single linked lists
Define uints using the proper constructors
2015-07-08 15:54:42 +02:00
Alexander Bock 1882bdaea3 One more minor code change 2015-07-07 18:27:22 +02:00
Alexander Bock 953e4c5161 Minor code change 2015-07-07 16:54:16 +02:00
Alexander Bock 8de6d9db05 Moving global blackout factor into RenderEngine
Cleanup of Abuffer implementations
2015-06-05 14:25:35 +02:00
Alexander Bock dc665639d5 Fixed crash with ABufferFixed implementation 2015-05-19 01:05:19 +02:00
Alexander Bock 11b0e98ec6 More changes to enable rendering on OS X 2015-04-28 19:32:21 +02:00
Alexander Bock b403513d63 Updated Spice version
More changes to make the application run
2015-04-28 15:07:58 +02:00
Alexander Bock f8116c0215 Change default blending function
Remove the rendering of our star
2015-02-24 14:29:05 +01:00
Jonas Strandstedt 31c76f3e3c Added key binding from Lua possible
- Possible to add key bindings from Lua possible. This calls Lua scripts
  from key commands.

 - Temporary fixed a small bug for volume rendering
2014-11-17 17:02:40 +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 1b6ad0f8d7 Faster more dynamic shader loading 2014-11-04 18:17:15 +01:00
Jonas Strandstedt a96e32badb Working OS X version 2014-10-31 15:37:03 +01:00
Jonas Strandstedt 83bebbd60f First OS X ABuffer implementation
- Not working.
2014-10-30 17:10:00 +01:00
Jonas Strandstedt 7ef5295bb7 Added ABuffer reinitialization
- Fixed so ABuffer reinitializes properly (could probably be optimized by
  not resizing of smaller than before)
- Now setting size properly from window dimensions
- SGCT side-by-side stereo working
2014-10-17 14:50:40 +02:00
Jonas Strandstedt 9a1b59a73e Intermediate commit 2014-10-10 11:29:16 +02:00
Jonas Strandstedt 3cad506b5b PowerScaling modifications
- Started working on PowerScaling with some initial changes
- Faking the stars by blending with the abuffer
- Changed texture filtering for planets, looks better in my opinion
2014-10-03 17:02:31 +02:00
Jonas Strandstedt e4a8e87098 Using new ghoul ProgramObject functionality
- Fixed risk of memory leak in SceneGraph (deleting shaders)
2014-10-01 15:30:39 +02:00
Jonas Strandstedt cc3f9ef34b Fixed ABuffer to update shader when Scengraph is updated 2014-09-29 13:03:58 +02:00
Alexander Bock ce10dea96e Fixed compile errors, probably finished merge 2014-09-13 11:45:49 +02:00
Jonas Strandstedt 258e62caa2 Cleaned up before beginning ABuffer dynamic impl.
- Added support for more keys in RenderableToggle
- Switched to Fixed ABuffer (needs to be fixed)
- Removed commented code
2014-07-24 16:12:37 -04:00
Jonas Strandstedt e99a98224c Working ABuffer
- Fixed the ABuffer rendering for intersecting volumes
- Added keyboard callback for toggling renderables
- Changed textures from ClampToBorder to ClampToEdge
- Fixed transferfunctions to clamp to edge instead of fade to black
2014-07-23 16:06:49 -04:00
Jonas Strandstedt e8ac32b830 Updated ghoul, initial volumes with different stepsize 2014-07-18 12:17:45 -04:00
Jonas Strandstedt bd38dd124e ABuffer bugfix, now supporting multiple (3+) volumes 2014-07-14 11:58:12 -04:00
Jonas Strandstedt 114af3fb5b Added an OpenSpace ShaderCreator
- Global shader settings can now be added.
- ShaderCreator builds the shader and stores a generated shader file
with all included source.
- Small TransferFunction bugfix
2014-07-10 15:22:57 -04:00
Jonas Strandstedt 576710f1ef Added fixed ABuffer implementation 2014-07-08 13:29:15 -04:00
Jonas Strandstedt 610d5d5427 Added variable stepsize for volumes
- When holding right mouse button the stepsize for volumes will be 1/5
- Added configuration files for ccmc lab
2014-07-01 10:01:54 -04:00
Jonas Strandstedt b6b6a7f51b Small jitterbug fix 2014-06-25 15:27:22 -04:00
Jonas Strandstedt 83205d6de1 Volume raycasting jittering
- Added jitter to volume rendering, reducing artefacts
- Added tracking of more shader files to update the resolve shader
2014-06-25 15:10:05 -04:00
Jonas Strandstedt 437f511f48 Cleaned up fragment shader in power scaling
- Added Licence to shaders
2014-06-25 10:21:06 -04:00
Jonas Strandstedt 633c95a44b Started work on Samplers having IDs 2014-06-24 14:45:08 -04:00
Jonas Strandstedt 3fe447274f Added intermediate ABuffer class to handle shader
- Refactored a lot of stuff
2014-06-23 16:59:19 -04:00
Jonas Strandstedt 6419f34b5a ABuffer working with small issues
- Pointing to bugfixed Ghoul
- Pointing to Ghoul with Linux file callback
- Fixed interaction distance control bug when moving to close
- Distance control with mouse wheel added
- Kameleonwrapper normalization based on histogram
- ABuffer seems to work with small issues
2014-06-18 10:34:40 -04:00
Jonas Strandstedt d5e6063670 Bugfixes
- Added support for volume caching
- Fixed bug when moving camera in the direction or the origin causing
position lock
- Fixed camera being to only being affected on SGCT_PRESS and
SGCT_REPEAT
2014-06-10 11:40:49 -04:00
Jonas Strandstedt 3fcb851b0f Merge branch 'feature/fieldlines' into feature/ABuffer
Conflicts:
	src/rendering/renderablevolumegl.cpp
2014-06-05 15:10:29 -04:00
Jonas Strandstedt f4dad8dc1c Intermediate ABuffer
- Raycasting works
- TODO: Mix raycasting with fragment list
- TODO: Fix PowerScaling
2014-06-05 13:18:22 -04:00
Jonas Strandstedt 08a8e2f3bb Intermediate ABuffer commit 2014-06-03 16:50:47 -04:00
Jonas Strandstedt 0a539caf41 Cleanup and removal of pscVolume shaders 2014-06-02 15:52:15 -04:00
Jonas Strandstedt 2c3f6396ec Intermedieate ABuffer, cleaning up shader loading 2014-06-02 14:51:56 -04:00
Jonas Strandstedt d2ccf6cdfb Intermediate ABuffer with ABufferStruct_t 2014-06-02 13:35:17 -04:00
Jonas Strandstedt 4379d27cbc Single Linked ABuffer implementation 2014-05-29 12:25:04 -04:00