Alexander Bock 67f0fb3c08 Merge branch 'develop' into solarsystem2 ...

Conflicts:
	.gitignore
	include/openspace/util/spicemanager.h
	shaders/star_fs.glsl
	src/engine/openspaceengine.cpp
	src/rendering/renderengine.cpp
	src/rendering/stars/renderablestars.cpp
	src/scenegraph/scenegraph.cpp
	src/scenegraph/scenegraphnode.cpp

2014-10-06 22:22:30 +02:00

..

ABuffer

PowerScaling modifications

2014-10-03 17:02:31 +02:00

PowerScaling

PowerScaling modifications

2014-10-03 17:02:31 +02:00

cubeFrag.glsl

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

cubeVert.glsl

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

ephemeris_fs.glsl

got renderable ephemeris working for larger deltas, problems with leap years though

2014-10-02 11:00:43 -04:00

ephemeris_vs.glsl

got renderable ephemeris working for larger deltas, problems with leap years though

2014-10-02 11:00:43 -04:00

exitpoints.frag

PowerScaling modifications

2014-10-03 17:02:31 +02:00

exitpoints.vert

PowerScaling modifications

2014-10-03 17:02:31 +02:00

grid_fs.glsl

PowerScaling modifications

2014-10-03 17:02:31 +02:00

grid_vs.glsl

PowerScaling modifications

2014-10-03 17:02:31 +02:00

pscstandard_fs.glsl

Merge branch 'develop' into solarsystem2

2014-10-06 22:22:30 +02:00

pscstandard_vs.glsl

Merge branch 'develop' into solarsystem2

2014-10-06 22:22:30 +02:00

quadFrag.glsl

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

quadVert.glsl

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

quadVertFlare.glsl

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

singlepassraycaster.frag

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

singlepassraycaster.gs

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

singlepassraycaster.vert

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

star_fs_points.glsl

some cleanup

2014-09-07 16:19:13 -04:00

star_fs.glsl

added some new classes for ephemeris rendering..

2014-10-06 15:30:13 -04:00

star_ge_points.glsl

some cleanup

2014-09-07 16:19:13 -04:00

star_ge.glsl

PowerScaling modifications

2014-10-03 17:02:31 +02:00

star_vs_points.glsl

Changes to the shaders, code cleanup and simplification. Eliminated lots of minor trivial bugs, should run smoothly.

2014-09-05 16:16:55 -04:00

star_vs.glsl

PowerScaling modifications

2014-10-03 17:02:31 +02:00

twopassraycaster.frag

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

twopassraycaster.vert

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00