From 34ca17563f3a84a99f2c08b7b5d1f41bba9235b2 Mon Sep 17 00:00:00 2001 From: Sebastian Piwell Date: Fri, 11 Mar 2016 18:51:10 -0500 Subject: [PATCH] Occlussion for fisheye and singel_two_win --- modules/base/shaders/screnspace_vs.glsl | 2 +- src/rendering/renderengine.cpp | 1 + src/rendering/screenspacerenderable.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/base/shaders/screnspace_vs.glsl b/modules/base/shaders/screnspace_vs.glsl index e27c368331..26c3df8876 100644 --- a/modules/base/shaders/screnspace_vs.glsl +++ b/modules/base/shaders/screnspace_vs.glsl @@ -37,5 +37,5 @@ out vec4 vs_position; void main(){ vs_st = in_st; vs_position = ViewProjectionMatrix*ModelTransform*in_position; - gl_Position = vec4(vs_position.xy, 0, 1); + gl_Position = vec4(vs_position.xy, 0, vs_position.w); } \ No newline at end of file diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index 00f7e33085..82a60e37bd 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -207,6 +207,7 @@ bool RenderEngine::initialize() { ghoul::io::TextureReader::ref().addReader(std::make_shared()); registerScreenSpaceRenderable(std::make_shared("${OPENSPACE_DATA}/test2.jpg")); + registerScreenSpaceRenderable(std::make_shared("${OPENSPACE_DATA}/test3.jpg")); return true; } diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp index ee193ca0fb..c749c0447c 100644 --- a/src/rendering/screenspacerenderable.cpp +++ b/src/rendering/screenspacerenderable.cpp @@ -28,7 +28,7 @@ namespace openspace { ScreenSpaceRenderable::ScreenSpaceRenderable(std::string texturePath) : _enabled("enabled", "Is Enabled", true) , _flatScreen("flatScreen", "Flat Screen", true) - , _position("position", "Position", glm::vec3(0,0,0),glm::vec3(-2,-2, -1),glm::vec3(2, 2, 0)) + , _position("position", "Position", glm::vec3(0,0,-2),glm::vec3(-2,-2, -1),glm::vec3(2, 2, 0)) , _scale("scale", "Scale" , 0.5, 0, 1) , _texturePath("texturePath", "Texture path", texturePath) , _quad(0)