Michal Marcinkowski f032b4e3b0 Merge branch 'develop' into solarsystem2 ...

Conflicts:
	.gitignore
	include/openspace/rendering/renderablefov.h
	src/CMakeLists.txt
	src/rendering/model/renderablemodel.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/rendering/renderabletrail.cpp
	src/util/factorymanager.cpp

2014-12-15 13:23:30 -05:00

..

ABuffer

Added key binding from Lua possible

2014-11-17 17:02:40 +01:00

modules

Moved shadercode of constellationbounds

2014-12-10 00:27:35 +01:00

PowerScaling

Changing the hardcoded bv-color map to a transfer function based map

2014-12-05 22:58:14 +01:00

cubeFrag.glsl

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

cubeVert.glsl

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

ephemeris_fs.glsl

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

ephemeris_vs.glsl

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

exitpoints.frag

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

exitpoints.vert

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

fieldline_fs.glsl

Finalized the billboard rendering. Code cleanup

2014-12-01 16:27:30 +01:00

fieldline_gs.glsl

Finalized the billboard rendering. Code cleanup

2014-12-01 16:27:30 +01:00

fieldline_vs.glsl

Added support for rendering fieldlines as textured view-aligned billboards

2014-11-24 17:18:55 +01:00

grid_fs.glsl

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

grid_vs.glsl

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

gui_fs.glsl

More work on GUI elements

2014-12-06 17:20:59 +01:00

gui_vs.glsl

More work on GUI elements

2014-12-06 17:20:59 +01:00

plane_fs.glsl

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

plane_vs.glsl

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

pointcloud_fs.glsl

Added ABuffer visualizer

2014-11-12 16:54:40 +01:00

pointcloud_vs.glsl

Added ABuffer visualizer

2014-11-12 16:54:40 +01:00

projectiveTexture_fs.glsl

intermediary commit.

2014-12-08 14:48:38 -05:00

projectiveTexture_vs.glsl

fixing stupid git mistake.

2014-11-28 17:15:13 -05:00

pscstandard_fs.glsl

fixing stupid git mistake.

2014-11-28 17:15:13 -05:00

pscstandard_vs.glsl

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

quadFrag.glsl

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

quadVert.glsl

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

quadVertFlare.glsl

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

singlepassraycaster.frag

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

singlepassraycaster.gs

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

singlepassraycaster.vert

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

twopassraycaster.frag

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00

twopassraycaster.vert

Faster more dynamic shader loading

2014-11-04 18:17:15 +01:00