From 9adbb42a6ced55fd4a27369f02f370a1c5e6d40d Mon Sep 17 00:00:00 2001 From: samcake Date: Fri, 28 Oct 2016 18:12:39 -0700 Subject: [PATCH] Fixing the skybox, still issues with the lights --- libraries/gpu/src/gpu/Transform.slh | 4 ++-- libraries/model/src/model/skybox.slv | 2 ++ libraries/render-utils/src/deferred_light_limited.slv | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/gpu/src/gpu/Transform.slh b/libraries/gpu/src/gpu/Transform.slh index 5ed14875cf..db7808e781 100644 --- a/libraries/gpu/src/gpu/Transform.slh +++ b/libraries/gpu/src/gpu/Transform.slh @@ -80,7 +80,7 @@ vec3 getEyeWorldPos() { bool cam_isStereo() { #ifdef GPU_TRANSFORM_IS_STEREO - return true; + return getTransformCamera()._stereoInfo.x > 0.0; #else return _camera._stereoInfo.x > 0.0; #endif @@ -89,7 +89,7 @@ bool cam_isStereo() { float cam_getStereoSide() { #ifdef GPU_TRANSFORM_IS_STEREO #ifdef GPU_TRANSFORM_STEREO_CAMERA - return float(_stereoSide); + return getTransformCamera()._stereoInfo.y; #else return _camera._stereoInfo.y; #endif diff --git a/libraries/model/src/model/skybox.slv b/libraries/model/src/model/skybox.slv index 5df1aa0a4a..6fd9532fa1 100755 --- a/libraries/model/src/model/skybox.slv +++ b/libraries/model/src/model/skybox.slv @@ -36,4 +36,6 @@ void main(void) { // Position is supposed to come in clip space gl_Position = vec4(inPosition.xy, 0.0, 1.0); + + <$transformStereoClipsSpace(cam, gl_Position)$> } diff --git a/libraries/render-utils/src/deferred_light_limited.slv b/libraries/render-utils/src/deferred_light_limited.slv index 0525509f0b..42ac1d6dfb 100644 --- a/libraries/render-utils/src/deferred_light_limited.slv +++ b/libraries/render-utils/src/deferred_light_limited.slv @@ -24,7 +24,7 @@ out vec4 _texCoord0; void main(void) { if (sphereParam.w != 0.0) { - + // standard transform TransformCamera cam = getTransformCamera(); TransformObject obj = getTransformObject();