mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-04 09:59:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/FXAA

Browse Source 
# Conflicts:
#	include/openspace/rendering/framebufferrenderer.h
#	include/openspace/rendering/renderer.h
#	src/rendering/framebufferrenderer.cpp
This commit is contained in:
Alexander Bock
2019-08-20 14:47:01 +02:00
parent 6202b31ec3 2806935c64
commit aa3ac0e3f2
13 changed files with 163 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/rendering/renderer.h
+1 -1
View File
@@ -55,7 +55,7 @@ public:
virtual void setValue(float value) = 0;
virtual void setSaturation(float sat) = 0;
virtual void enableFXAA(bool enable) = 0;
virtual void disableHDR(bool disable) = 0;
virtual void setDisableHDR(bool disable) = 0;
/**
* Set raycasting uniforms on the program object, and setup raycasting.