mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 21:18:32 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
ed93372c8b552bb2e29227b28cc3a538b47273cf
OpenSpace/include/openspace/flare
T
History
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
..
Animator.h
Merge branch 'develop' into OpenCLWrapper
2014-04-07 14:38:21 -04:00
BrickManager.h
Merge branch 'develop' into OpenCLWrapper
2014-04-07 14:38:21 -04:00
CLManager.h
Merge branch 'develop' into OpenCLWrapper
2014-04-07 14:38:21 -04:00
CLProgram.h
Merge branch 'develop' into OpenCLWrapper
2014-04-07 14:38:21 -04:00
Config.h
Merge branch 'develop' into OpenCLWrapper
2014-04-07 14:38:21 -04:00
flare.h
Merge branch 'develop' into VolumeRaycasterAsRenderable
2014-04-23 10:28:41 -04:00
KernelConstants.h
Merge branch 'develop' into OpenCLWrapper
2014-04-07 14:38:21 -04:00
MappingKey.h
Merge branch 'develop' into OpenCLWrapper
2014-04-07 14:38:21 -04:00
Raycaster.h
Merge branch 'develop' into OpenCLWrapper
2014-04-07 14:38:21 -04:00
Renderer.h
Merge branch 'develop' into OpenCLWrapper
2014-04-07 14:38:21 -04:00
Timer.h
Merge branch 'develop' into OpenCLWrapper
2014-04-07 14:38:21 -04:00
TransferFunction.h
Merge branch 'develop' into OpenCLWrapper
2014-04-07 14:38:21 -04:00
TSP.h
Merge branch 'develop' into OpenCLWrapper
2014-04-07 14:38:21 -04:00
Utils.h
Merge branch 'develop' into OpenCLWrapper
2014-04-07 14:38:21 -04:00