Alexander Bock aa3ac0e3f2 Merge branch 'master' into feature/FXAA ...

# Conflicts:
#	include/openspace/rendering/framebufferrenderer.h
#	include/openspace/rendering/renderer.h
#	src/rendering/framebufferrenderer.cpp

2019-08-20 14:47:01 +02:00

..

abuffer

Copyright header cleanup

2019-05-16 16:56:56 -06:00

framebuffer

Merge branch 'master' into feature/FXAA

2019-08-20 14:47:01 +02:00

PowerScaling

Feature/new stars rendering (#784)

2019-05-17 01:16:17 +02:00

blending.glsl

Copyright header cleanup

2019-05-16 16:56:56 -06:00

floatoperations.glsl

Copyright header cleanup

2019-05-16 16:56:56 -06:00

fragment.glsl

Added flag for disable LDR to HDR for true HDR color values.

2019-08-15 14:46:44 -04:00

hdr.glsl

Some smaller fixes

2019-08-20 10:04:20 +02:00

rand.glsl

Copyright header cleanup

2019-05-16 16:56:56 -06:00

render.frag

refactor abuffer and add msaa support. volumes temporarily disabled.

2016-02-02 11:30:27 +01:00