Anton Arbring d3bf8eb7f7 Merge branch 'timeadjustments' into NewHorizonsMerge ...

Conflicts:
	CMakeLists.txt
	include/openspace/rendering/model/modelgeometry.h
	include/openspace/rendering/model/wavefrontgeometry.h
	include/openspace/rendering/planets/renderableplanetprojection.h
	include/openspace/util/imagesequencer.h
	scripts/default_startup.lua
	src/abuffer/abuffer.cpp
	src/rendering/model/renderablemodel.cpp
	src/rendering/model/wavefrontgeometry.cpp
	src/rendering/planets/renderableplanet.cpp
	src/rendering/planets/renderableplanetprojection.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderabletrail.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/spiceephemeris.cpp
	src/util/imagesequencer.cpp

2015-04-23 22:51:55 -04:00

..

ABuffer

Change default blending function

2015-02-24 14:27:45 +01:00

modules

Merge branch 'timeadjustments' into NewHorizonsMerge

2015-04-23 22:51:55 -04: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

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

fboPass_fs.glsl

Merge branch 'timeadjustments' into NewHorizonsMerge

2015-04-23 22:51:55 -04:00

fboPass_vs.glsl

Fix single side-by-side stereo configuration file

2015-04-07 00:08:53 +02:00

fov_fs.glsl

fov lines, check.

2015-02-18 19:41:56 -05:00

fov_vs.glsl

fov lines, check.

2015-02-18 19:41:56 -05: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

model_fs.glsl

Merge branch 'timeadjustments' into NewHorizonsMerge

2015-04-23 22:51:55 -04:00

model_vs.glsl

Merge branch 'timeadjustments' into NewHorizonsMerge

2015-04-23 22:51:55 -04:00

nighttexture_fs.glsl

Made night texture only be loaded if one exists, added new shader for planets with a night texture.

2015-04-22 15:41:55 -04:00

nighttexture_vs.glsl

Made night texture only be loaded if one exists, added new shader for planets with a night texture.

2015-04-22 15:41:55 -04: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

postFX_fs.glsl

created postFX functions in main and added a postFX pass to sgct engine to allow for a global fade after executing certain scripts.

2015-02-20 11:19:50 +01:00

postFX_vs.glsl

created postFX functions in main and added a postFX pass to sgct engine to allow for a global fade after executing certain scripts.

2015-02-20 11:19:50 +01:00

projectiveTexture_fs.glsl

Fix single side-by-side stereo configuration file

2015-04-07 00:08:53 +02:00

projectiveTexture_vs.glsl

Fix single side-by-side stereo configuration file

2015-04-07 00:08:53 +02:00

pscstandard_fs.glsl

Merge branch 'timeadjustments' into NewHorizonsMerge

2015-04-23 22:51:55 -04: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