From 16341312faaf2367613b7b6753da996b04dc912e Mon Sep 17 00:00:00 2001 From: HifiExperiments Date: Wed, 6 Dec 2023 15:59:36 -0800 Subject: [PATCH] let's try this?? --- .../gpu-gl-common/src/gpu/gl/GLBackendTransform.cpp | 2 +- .../entityProperties/html/js/entityProperties.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLBackendTransform.cpp b/libraries/gpu-gl-common/src/gpu/gl/GLBackendTransform.cpp index 03c2b17a0e..b27175a545 100644 --- a/libraries/gpu-gl-common/src/gpu/gl/GLBackendTransform.cpp +++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackendTransform.cpp @@ -113,7 +113,7 @@ void GLBackend::TransformStageState::preUpdate(size_t commandIndex, const Stereo Transform result; glm::mat4 correction = _correction.correctionInverse; if (_mirrorViewCorrection) { - correction = glm::scale(glm::mat4(), glm::vec3(-1.0f, 1.0f, 1.0f)) * correction; + correction = correction * glm::scale(glm::mat4(), glm::vec3(-1.0f, 1.0f, 1.0f)); } _view.mult(result, _view, correction); if (_skybox) { diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js index 77e43fe829..b509168262 100644 --- a/scripts/system/create/entityProperties/html/js/entityProperties.js +++ b/scripts/system/create/entityProperties/html/js/entityProperties.js @@ -127,11 +127,6 @@ const GROUPS = [ }, propertyID: "billboardMode", }, - { - label: "Render With Zones", - type: "multipleZonesSelection", - propertyID: "renderWithZones", - }, { label: "Mirror Mode", type: "dropdown", @@ -147,6 +142,11 @@ const GROUPS = [ type: "string", propertyID: "portalExitID", showPropertyRule: { "mirrorMode": "portal" }, + }, + { + label: "Render With Zones", + type: "multipleZonesSelection", + propertyID: "renderWithZones", } ] },