mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 19:50:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed hack and fixed SGCT.

Browse Source
This commit is contained in:
Jonathas Costa
2020-06-05 17:15:54 -04:00
parent 2c1035f05d
commit fbd83c9e84
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/OpenSpace/ext/sgct

Submodule apps/OpenSpace/ext/sgct updated: 902ad00320...16b4804681

5
modules/base/shaders/grid_fs.glsl
View File

@@ -27,7 +27,6 @@
in float vs_screenSpaceDepth;
in vec4 vs_positionViewSpace;
flat in double vs_double_depth;
uniform vec4 gridColor;
uniform float opacity;
@@ -36,9 +35,7 @@ Fragment getFragment() {
Fragment frag;
frag.color = gridColor;
frag.color.a *= opacity;
// JCC: Temp solution for depth precision problems.
frag.depth = float(vs_double_depth);
//frag.depth = vs_screenSpaceDepth;
frag.depth = vs_screenSpaceDepth;
frag.gPosition = vs_positionViewSpace;
// There is no normal here

2
modules/base/shaders/grid_vs.glsl
View File

@@ -30,7 +30,6 @@ layout(location = 0) in vec3 in_position;
out float vs_screenSpaceDepth;
out vec4 vs_positionViewSpace;
flat out double vs_double_depth;
uniform dmat4 modelViewTransform;
uniform dmat4 projectionTransform;
@@ -40,7 +39,6 @@ void main() {
dvec4 positionClipSpace = projectionTransform * positionViewSpace;
vec4 positionScreenSpace = z_normalization(vec4(positionClipSpace));
vs_double_depth = positionClipSpace.w;
vs_screenSpaceDepth = float(positionClipSpace.w);
vs_positionViewSpace = vec4(positionViewSpace);