michal 08a97d9e68 Merge branch 'develop' into solarsystem2 ...

Conflicts:
	scripts/default_startup.lua
	src/rendering/renderablewavefrontobject.cpp

2014-10-23 11:45:24 -04:00

..

ABuffer

Added ABuffer reinitialization

2014-10-17 14:50:40 +02:00

generated

begin merge with develop

2014-10-23 11:37:22 -04: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

Fixed Ephimeris rendering to use PSC correctly

2014-10-08 15:54:09 +02:00

ephemeris_vs.glsl

Fixed Ephimeris rendering to use PSC correctly

2014-10-08 15:54:09 +02: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

Fixed model oriantation

2014-10-21 12:49:39 -04:00

grid_vs.glsl

PowerScaling modifications

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

plane_fs.glsl

Added RenderablePlane

2014-10-10 15:18:16 +02:00

plane_vs.glsl

Added RenderablePlane

2014-10-10 15:18:16 +02:00

pscstandard_fs.glsl

fixed renderabletrail class to suit for all different delta times, tropical orbits etc etc. lot of stuff to do with precision and set time intervals (pain in the ass). works clockwork.

2014-10-20 16:00:38 -04:00

pscstandard_vs.glsl

new class - renderabletrail - will later be renamed and current replace renderableephemeris.

2014-10-07 18:44:14 -04: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

Fixed blending for stars default framebuffer rendering

2014-10-08 13:43:43 +02: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