Commit Graph

36 Commits

Author SHA1 Message Date
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
d378428dc4 Crude PowerScale implementations
- Added PowerScaling to RenderableVolumeGL and RenderableFieldlines
- Removed the use of volumeraycasterbox since it used FBO and textures
which was not used anymore.
- Added a simple box implementation to RenderableVolumeGL that can have
PowerScaled vertex positions

TODO: The #include command needs to be extended in some way since the
FieldLines passthrough shader can't access the PowerScaled includes in a
good way.
2014-06-26 15:25:49 -04:00
Jonas Strandstedt
adec1fc215 Moved powescaling shader funcitonality
- Added separete files for the power scaling algorithms
- Added shader tracking and updating for the new files
2014-06-25 16:44:07 -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
ec115030a4 Added ID for sampler 2014-06-24 15:29:31 -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
Hans-Christian Helltegen
1de2d2fea1 Merge branch 'develop' into VolumeRaycasterAsRenderable
Conflicts:
	config/sgct/single.xml
	include/openspace/engine/openspaceengine.h
	include/openspace/flare/flare.h
	include/openspace/rendering/volumeraycastersinglepass.h
	src/engine/openspaceengine.cpp
	src/flare/flare.cpp
	src/rendering/volumeraycaster.cpp
2014-04-23 10:28:41 -04:00
Jonas Strandstedt
30bda3fc97 Flare and Volumes in scenegraph
- Added new volumeraycaster classes
- Fixed many small warnings in OpenSpace
- Linked to updated Ghoul and Openspace-data

- TODO cleanup in volumeraycaster classes
- TODO Add an advanced volumeraycaster class to use during development
2014-04-14 16:41:57 -04:00
Hans-Christian Helltegen
909350faaa Develop merge 2014-04-11 15:45:53 -04:00
Jonas Strandstedt
2599268fd3 Merge branch 'develop' into OpenCLWrapper
Conflicts:
	ext/ghoul
	src/engine/openspaceengine.cpp
2014-04-07 14:38:21 -04:00
Hans-Christian Helltegen
62f01683ca Single-pass raycaster work. Still doesnt work 2014-03-26 16:20:45 -04:00
Hans-Christian Helltegen
658ae13d96 Added flare to OpenSpace 2014-03-19 16:41:12 -04:00
Jonas Strandstedt
b1eab2cf03 Finalized first draft for the SceneGraph
- Refactored several files
- Implemented PositionInformation subclasses
- Added standard shaders in the shader directory
- Removed SceneGraphLoader, now integrated in the SceneGraph

- TODO: Further testing and improvements to the PowerScale coordinate
system
2014-03-13 11:21:30 -04:00
Hans-Christian Helltegen
9ed82165f0 Moved volume reader to its own class. Seperated singlepass and twopass raycasters 2014-03-05 21:32:39 +00:00
Hans-Christian Helltegen
779bdbe5d2 Merged with develop 2014-02-28 23:16:35 +00:00
Hans-Christian Helltegen
986c7a764f Improved twopass raycaster. Started working on singlepassraycaster 2014-02-28 21:41:56 +00:00
Hans-Christian Helltegen
53140a1fcd Poor mans ray-casting works, added a function for reading .raw files 2014-02-27 23:26:32 +00:00
Hans-Christian Helltegen
cb2cb177b3 Added a class for volume ray-casting and FBO class to ghoul. Also added a (probably tempoary) shader map to root dir with some shaders. Updated .gitignore for some common files 2014-02-26 23:38:33 +00:00