From bde75e9e516da4e8bfd5ef9b61c32e337d5be160 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Mon, 24 Aug 2015 17:36:21 -0700 Subject: [PATCH] AnimDebugDraw rendering works again. I had to port AnimDebugDraw shader to GLSL 4.1. --- libraries/render-utils/src/animdebugdraw.slf | 6 ++++-- libraries/render-utils/src/animdebugdraw.slv | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libraries/render-utils/src/animdebugdraw.slf b/libraries/render-utils/src/animdebugdraw.slf index aa34c9bfba..8a3aca055e 100644 --- a/libraries/render-utils/src/animdebugdraw.slf +++ b/libraries/render-utils/src/animdebugdraw.slf @@ -10,8 +10,10 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -varying vec4 varColor; +in vec4 _color; + +out vec4 _fragColor; void main(void) { - gl_FragColor = varColor; + _fragColor = _color; } diff --git a/libraries/render-utils/src/animdebugdraw.slv b/libraries/render-utils/src/animdebugdraw.slv index 68749ec7cc..f3117714b0 100644 --- a/libraries/render-utils/src/animdebugdraw.slv +++ b/libraries/render-utils/src/animdebugdraw.slv @@ -8,17 +8,19 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // +<@include gpu/Inputs.slh@> + <@include gpu/Transform.slh@> <$declareStandardTransform()$> -varying vec4 varColor; +out vec4 _color; void main(void) { // pass along the diffuse color - varColor = gl_Color; + _color = inColor.rgba; TransformCamera cam = getTransformCamera(); TransformObject obj = getTransformObject(); - <$transformModelToClipPos(cam, obj, gl_Vertex, gl_Position)$> + <$transformModelToClipPos(cam, obj, inPosition, gl_Position)$> }