mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-26 14:08:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/NewAtmosphere

Browse Source 
# Conflicts:
#	src/rendering/renderengine.cpp
This commit is contained in:
Alexander Bock
2017-10-24 15:30:22 -04:00
parent a5bcae6d67 a599516f2c
commit 50fd9309ba
84 changed files with 1634 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shaders/framebuffer/exitframebuffer.frag
-1
View File
@@ -24,7 +24,6 @@
#version __CONTEXT__
#include "floatoperations.glsl"
#include <#{fragmentPath}>
shaders/framebuffer/inside.glsl
-1
View File
@@ -22,7 +22,6 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
void getEntry(inout vec3 entryPos, inout float entryDepth) {
entryPos = cameraPosInRaycaster;
entryDepth = 0;