diff --git a/libraries/render-utils/src/Blendshape.slh b/libraries/render-utils/src/Blendshape.slh index 35effed2fb..c6ba6f8fd3 100644 --- a/libraries/render-utils/src/Blendshape.slh +++ b/libraries/render-utils/src/Blendshape.slh @@ -26,21 +26,19 @@ struct BlendshapeOffset { const float oneOver511 = 1.0 / 511.0; -vec3 unpackSnorm3x10_1x2(int packed) { - vec4 _unpacked = vec4( - clamp( float( bitfieldExtract(packed, 0, 10)) * oneOver511, -1.0, 1.0), - clamp( float( bitfieldExtract(packed, 10, 10)) * oneOver511, -1.0, 1.0), - clamp( float( bitfieldExtract(packed, 20, 10)) * oneOver511, -1.0, 1.0), - 0.0 +vec3 unpackSnorm3x10_1x2(int packedValue) { + return vec3( + clamp( float( bitfieldExtract(packedValue, 0, 10)) * oneOver511, -1.0, 1.0), + clamp( float( bitfieldExtract(packedValue, 10, 10)) * oneOver511, -1.0, 1.0), + clamp( float( bitfieldExtract(packedValue, 20, 10)) * oneOver511, -1.0, 1.0) ); - return _unpacked.xyz; } #if defined(GPU_GL410) layout(binding=0) uniform samplerBuffer blendshapeOffsetsBuffer; -vec2 gpu_unpackHalf2x16(uint packed) { - return unpackHalf2x16(packed); +vec2 gpu_unpackHalf2x16(uint packedValue) { + return unpackHalf2x16(packedValue); } BlendshapeOffset getBlendshapeOffset(int i) { diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 765651c626..50abaef01f 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -1633,7 +1633,7 @@ Blender::Blender(ModelPointer model, int blendNumber, const Geometry::WeakPointe } -//#define DEBUG_PACKED_BLENDSHAPE_OFFSET 1 +#define DEBUG_PACKED_BLENDSHAPE_OFFSET 1 void Blender::run() { QVector blendshapeOffsets; @@ -1678,15 +1678,6 @@ void Blender::run() { currentBlendshapeOffset.tangentOffsetAndSpare += blendshape.tangents.at(j) * normalCoefficient; } } - -#ifdef DEBUG_PACKED_BLENDSHAPE_OFFSET - if (glm::any(glm::greaterThan(glm::abs(currentBlendshapeOffset.normalOffsetAndSpare), glm::vec3(1.0f)))) { - currentBlendshapeOffset.normalOffsetAndSpare = glm::clamp(currentBlendshapeOffset.normalOffsetAndSpare, glm::vec3(-1.0f), glm::vec3(1.0f)); - } - if (glm::any(glm::greaterThan(glm::abs(currentBlendshapeOffset.tangentOffsetAndSpare), glm::vec3(1.0f)))) { - currentBlendshapeOffset.tangentOffsetAndSpare = glm::clamp(currentBlendshapeOffset.tangentOffsetAndSpare, glm::vec3(-1.0f), glm::vec3(1.0f)); - } -#endif } }); } diff --git a/scripts/developer/utilities/render/luci.js b/scripts/developer/utilities/render/luci.js index 005d96780a..cb5b01f9b2 100644 --- a/scripts/developer/utilities/render/luci.js +++ b/scripts/developer/utilities/render/luci.js @@ -81,10 +81,10 @@ function setDebugCursor(x, y) { - nx = (x / Window.innerWidth); - ny = 1.0 - ((y) / (Window.innerHeight - 32)); + nx = 2.0 * (x / Window.innerWidth) - 1.0; + ny = 1.0 - 2.0 * ((y) / (Window.innerHeight)); - Render.getConfig("RenderMainView").getConfig("Antialiasing").debugCursorTexcoord = { x: nx, y: ny }; + Render.getConfig("RenderMainView").getConfig("DebugDeferredBuffer").size = { x: nx, y: ny, z: 1.0, w: 1.0 }; }