mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-20 20:09:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Depth working again

Browse Source
This commit is contained in:
Sebastian Piwell
2016-03-31 09:39:05 -04:00
parent 687b8551d2
commit a2fb30b432
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ghoul

Submodule ext/ghoul updated: 849cc67bdc...f31ddda5d7

4
modules/base/shaders/screnspace_fs.glsl
View File

@@ -32,6 +32,8 @@ in vec4 vs_position;
#include "fragment.glsl"
#include "PowerScaling/powerScaling_fs.hglsl"
Fragment getFragment(){
Fragment frag;
@@ -42,7 +44,7 @@ Fragment getFragment(){
if(frag.color.a == 0.0f){
discard;
}
frag.depth = depth;
frag.depth = denormalizeFloat(depth);
return frag;
}

2
src/rendering/screenspacerenderable.cpp
View File

@@ -30,7 +30,7 @@ ScreenSpaceRenderable::ScreenSpaceRenderable()
, _useFlatScreen("flatScreen", "Flat Screen", false)
, _euclideanPosition("euclideanPosition", "Euclidean coordinates", glm::vec2(0),glm::vec2(-4),glm::vec2(4))
, _sphericalPosition("sphericalPosition", "Spherical coordinates", glm::vec2(0),glm::vec2(-M_PI),glm::vec2(M_PI))
, _depth("depth", "Depth", 0, 0, 0)
, _depth("depth", "Depth", 0, 0, 1)
, _scale("scale", "Scale" , 0.5, 0, 2)
, _alpha("alpha", "Alpha" , 1, 0, 1)
, _quad(0)