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

..

cubeFrag.glsl

Added flare to OpenSpace

2014-03-19 16:41:12 -04:00

cubeVert.glsl

Added flare to OpenSpace

2014-03-19 16:41:12 -04:00

exitpoints.frag

Improved twopass raycaster. Started working on singlepassraycaster

2014-02-28 21:41:56 +00:00

exitpoints.vert

Improved twopass raycaster. Started working on singlepassraycaster

2014-02-28 21:41:56 +00:00

pscstandard_fs.glsl

Finalized first draft for the SceneGraph

2014-03-13 11:21:30 -04:00

pscstandard_vs.glsl

Finalized first draft for the SceneGraph

2014-03-13 11:21:30 -04:00

quadFrag.glsl

Added flare to OpenSpace

2014-03-19 16:41:12 -04:00

quadVert.glsl

Flare and Volumes in scenegraph

2014-04-14 16:41:57 -04:00

quadVertFlare.glsl

Flare and Volumes in scenegraph

2014-04-14 16:41:57 -04:00

singlepassraycaster.frag

Single-pass raycaster work. Still doesnt work

2014-03-26 16:20:45 -04:00

singlepassraycaster.gs

Single-pass raycaster work. Still doesnt work

2014-03-26 16:20:45 -04:00

singlepassraycaster.vert

Single-pass raycaster work. Still doesnt work

2014-03-26 16:20:45 -04:00

twopassraycaster.frag

Single-pass raycaster work. Still doesnt work

2014-03-26 16:20:45 -04:00

twopassraycaster.vert

Improved twopass raycaster. Started working on singlepassraycaster

2014-02-28 21:41:56 +00:00