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
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
909350faaa
Develop merge
2014-04-11 15:45:53 -04:00
2599268fd3
Merge branch 'develop' into OpenCLWrapper
...
Conflicts:
ext/ghoul
src/engine/openspaceengine.cpp
2014-04-07 14:38:21 -04:00
62f01683ca
Single-pass raycaster work. Still doesnt work
2014-03-26 16:20:45 -04:00
658ae13d96
Added flare to OpenSpace
2014-03-19 16:41:12 -04:00
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
9ed82165f0
Moved volume reader to its own class. Seperated singlepass and twopass raycasters
2014-03-05 21:32:39 +00:00
779bdbe5d2
Merged with develop
2014-02-28 23:16:35 +00:00
986c7a764f
Improved twopass raycaster. Started working on singlepassraycaster
2014-02-28 21:41:56 +00:00
53140a1fcd
Poor mans ray-casting works, added a function for reading .raw files
2014-02-27 23:26:32 +00:00
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
Hans-Christian Helltegen