@xeokit/xeokit-sdk 2.4.0-alpha-78 → 2.4.0-alpha-79

package/dist/xeokit-sdk.es.js

@@ -11510,7 +11510,7 @@ class Annotation extends Marker {
 }
 
 const tempVec3a$D = math.vec3();
-const tempVec3b$r = math.vec3();
+const tempVec3b$q = math.vec3();
 const tempVec3c$m = math.vec3();
 
 /**
@@ -11996,7 +11996,7 @@ class AnnotationsPlugin extends Plugin {
                 this.error("Param 'pickResult' does not have both worldPos and worldNormal");
             } else {
                 const normalizedWorldNormal = math.normalizeVec3(pickResult.worldNormal, tempVec3a$D);
-                const offsetVec = math.mulVec3Scalar(normalizedWorldNormal, this._surfaceOffset, tempVec3b$r);
+                const offsetVec = math.mulVec3Scalar(normalizedWorldNormal, this._surfaceOffset, tempVec3b$q);
                 const offsetWorldPos = math.addVec3(pickResult.worldPos, offsetVec, tempVec3c$m);
                 worldPos = offsetWorldPos;
                 entity = pickResult.entity;
@@ -19881,14 +19881,14 @@ class CustomProjection extends Component {
 }
 
 const tempVec3$7 = math.vec3();
-const tempVec3b$q = math.vec3();
+const tempVec3b$p = math.vec3();
 const tempVec3c$l = math.vec3();
 const tempVec3d$f = math.vec3();
 const tempVec3e$8 = math.vec3();
 const tempVec3f$2 = math.vec3();
 const tempVec4a$d = math.vec4();
 const tempVec4b$c = math.vec4();
-const tempVec4c$9 = math.vec4();
+const tempVec4c$2 = math.vec4();
 const tempMat = math.mat4();
 const tempMatb = math.mat4();
 const eyeLookVec = math.vec3();
@@ -20194,7 +20194,7 @@ class Camera extends Component {
     orbitYaw(angleInc) {
         let lookEyeVec = math.subVec3(this._eye, this._look, tempVec3$7);
         math.rotationMat4v(angleInc * 0.0174532925, this._gimbalLock ? this._worldUp : this._up, tempMat);
-        lookEyeVec = math.transformPoint3(tempMat, lookEyeVec, tempVec3b$q);
+        lookEyeVec = math.transformPoint3(tempMat, lookEyeVec, tempVec3b$p);
         this.eye = math.addVec3(this._look, lookEyeVec, tempVec3c$l); // Set eye position as 'look' plus 'eye' vector
         this.up = math.transformPoint3(tempMat, this._up, tempVec3d$f); // Rotate 'up' vector
     }
@@ -20212,7 +20212,7 @@ class Camera extends Component {
             }
         }
         let eye2 = math.subVec3(this._eye, this._look, tempVec3$7);
-        const left = math.cross3Vec3(math.normalizeVec3(eye2, tempVec3b$q), math.normalizeVec3(this._up, tempVec3c$l));
+        const left = math.cross3Vec3(math.normalizeVec3(eye2, tempVec3b$p), math.normalizeVec3(this._up, tempVec3c$l));
         math.rotationMat4v(angleInc * 0.0174532925, left, tempMat);
         eye2 = math.transformPoint3(tempMat, eye2, tempVec3d$f);
         this.up = math.transformPoint3(tempMat, this._up, tempVec3e$8);
@@ -20227,7 +20227,7 @@ class Camera extends Component {
     yaw(angleInc) {
         let look2 = math.subVec3(this._look, this._eye, tempVec3$7);
         math.rotationMat4v(angleInc * 0.0174532925, this._gimbalLock ? this._worldUp : this._up, tempMat);
-        look2 = math.transformPoint3(tempMat, look2, tempVec3b$q);
+        look2 = math.transformPoint3(tempMat, look2, tempVec3b$p);
         this.look = math.addVec3(look2, this._eye, tempVec3c$l);
         if (this._gimbalLock) {
             this.up = math.transformPoint3(tempMat, this._up, tempVec3d$f);
@@ -20247,7 +20247,7 @@ class Camera extends Component {
             }
         }
         let look2 = math.subVec3(this._look, this._eye, tempVec3$7);
-        const left = math.cross3Vec3(math.normalizeVec3(look2, tempVec3b$q), math.normalizeVec3(this._up, tempVec3c$l));
+        const left = math.cross3Vec3(math.normalizeVec3(look2, tempVec3b$p), math.normalizeVec3(this._up, tempVec3c$l));
         math.rotationMat4v(angleInc * 0.0174532925, left, tempMat);
         this.up = math.transformPoint3(tempMat, this._up, tempVec3f$2);
         look2 = math.transformPoint3(tempMat, look2, tempVec3d$f);
@@ -20264,7 +20264,7 @@ class Camera extends Component {
         const vec = [0, 0, 0];
         let v;
         if (pan[0] !== 0) {
-            const left = math.cross3Vec3(math.normalizeVec3(eye2, []), math.normalizeVec3(this._up, tempVec3b$q));
+            const left = math.cross3Vec3(math.normalizeVec3(eye2, []), math.normalizeVec3(this._up, tempVec3b$p));
             v = math.mulVec3Scalar(left, pan[0]);
             vec[0] += v[0];
             vec[1] += v[1];
@@ -20293,7 +20293,7 @@ class Camera extends Component {
      */
     zoom(delta) {
         const vec = math.subVec3(this._eye, this._look, tempVec3$7);
-        const lenLook = Math.abs(math.lenVec3(vec, tempVec3b$q));
+        const lenLook = Math.abs(math.lenVec3(vec, tempVec3b$p));
         const newLenLook = Math.abs(lenLook + delta);
         if (newLenLook < 0.5) {
             return;
@@ -20754,7 +20754,7 @@ class Camera extends Component {
     projectWorldPos(worldPos) {
         const _worldPos = tempVec4a$d;
         const viewPos = tempVec4b$c;
-        const screenPos = tempVec4c$9;
+        const screenPos = tempVec4c$2;
         _worldPos[0] = worldPos[0];
         _worldPos[1] = worldPos[1];
         _worldPos[2] = worldPos[2];
@@ -25963,7 +25963,7 @@ class LinesMaterial extends Material {
 }
 
 const tempVec3a$B = math.vec3();
-const tempVec3b$p = math.vec3();
+const tempVec3b$o = math.vec3();
 const tempMat4a$f = math.mat4();
 
 /**
@@ -26041,7 +26041,7 @@ function frustumIntersectsAABB3(frustum, aabb) {
     let ret = Frustum.INSIDE;
 
     const min = tempVec3a$B;
-    const max = tempVec3b$p;
+    const max = tempVec3b$o;
 
     min[0] = aabb[0];
     min[1] = aabb[1];
@@ -48422,7 +48422,7 @@ class LineSet extends Component {
 
 const tempVec3$5 = math.vec3();
 const tempVec3a$u = math.vec3();
-const tempVec3b$o = math.vec3();
+const tempVec3b$n = math.vec3();
 const tempVec3c$k = math.vec3();
 
 /**
@@ -49103,7 +49103,7 @@ class BCFViewpointsPlugin extends Plugin {
                 const bitmap_type = e.bitmap_type || "jpg"; // "jpg" | "png"
                 const bitmap_data = e.bitmap_data; // base64
                 let location = xyzObjectToArray(e.location, tempVec3a$u);
-                let normal = xyzObjectToArray(e.normal, tempVec3b$o);
+                let normal = xyzObjectToArray(e.normal, tempVec3b$n);
                 let up = xyzObjectToArray(e.up, tempVec3c$k);
                 let height = e.height || 1;
                 if (!bitmap_type) {
@@ -52179,7 +52179,7 @@ CameraPathAnimation.PLAYING = 2;
 CameraPathAnimation.PLAYING_TO = 3;
 
 const tempVec3$3 = math.vec3();
-const tempVec3b$n = math.vec3();
+const tempVec3b$m = math.vec3();
 math.vec3();
 const zeroVec$2 = math.vec3([0, -1, 0]);
 const tempQuat = math.vec4([0, 0, 0, 1]);
@@ -52607,7 +52607,7 @@ class ImagePlane extends Component {
             const dist = -math.dotVec3(negDir, tempVec3$3);
 
             math.normalizeVec3(negDir);
-            math.mulVec3Scalar(negDir, dist, tempVec3b$n);
+            math.mulVec3Scalar(negDir, dist, tempVec3b$m);
             math.vec3PairToQuaternion(zeroVec$2, dir, tempQuat);
 
             this._node.quaternion = tempQuat;
@@ -55326,7 +55326,7 @@ const edgesDefaultColor = new Float32Array([0, 0, 0, 1]);
 
 const tempVec4 = math.vec4();
 const tempVec3a$s = math.vec3();
-const tempVec3b$m = math.vec3();
+math.vec3();
 const tempVec3c$j = math.vec3();
 const tempMat4a$e = math.mat4();
 
@@ -55770,22 +55770,24 @@ class VBOSceneModelRenderer {
 
         this._matricesUniformBlockBufferData.set(rotationMatrixConjugate, 0);
 
-        if (origin || position[0] !== 0 || position[1] !== 0 || position[2] !== 0) {
-            const layerOrigin = tempVec3b$m;
-            if (origin) {
+        const gotOrigin = (origin[0] !== 0 || origin[1] !== 0 || origin[2] !== 0);
+        const gotPosition = (position[0] !== 0 || position[1] !== 0 || position[2] !== 0);
+        if (gotOrigin || gotPosition) {
+            const rtcOrigin = tempVec3a$s;
+            if (gotOrigin) {
                 const rotatedOrigin = math.transformPoint3(rotationMatrix, origin, tempVec3c$j);
-                layerOrigin[0] = rotatedOrigin[0];
-                layerOrigin[1] = rotatedOrigin[1];
-                layerOrigin[2] = rotatedOrigin[2];
+                rtcOrigin[0] = rotatedOrigin[0];
+                rtcOrigin[1] = rotatedOrigin[1];
+                rtcOrigin[2] = rotatedOrigin[2];
             } else {
-                layerOrigin[0] = 0;
-                layerOrigin[1] = 0;
-                layerOrigin[2] = 0;
-            }
-            layerOrigin[0] += position[0];
-            layerOrigin[1] += position[1];
-            layerOrigin[2] += position[2];
-            this._matricesUniformBlockBufferData.set(createRTCViewMat(viewMatrix, layerOrigin, tempMat4a$e), offset += mat4Size);
+                rtcOrigin[0] = 0;
+                rtcOrigin[1] = 0;
+                rtcOrigin[2] = 0;
+            }
+            rtcOrigin[0] += position[0];
+            rtcOrigin[1] += position[1];
+            rtcOrigin[2] += position[2];
+            this._matricesUniformBlockBufferData.set(createRTCViewMat(viewMatrix, rtcOrigin, tempMat4a$e), offset += mat4Size);
         } else {
             this._matricesUniformBlockBufferData.set(viewMatrix, offset += mat4Size);
         }
@@ -59353,7 +59355,7 @@ class SnapBatchingDepthBufInitRenderer {
         gl.uniformMatrix4fv(this._uWorldMatrix, false, rotationMatrixConjugate);
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
         gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix);
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             const logDepthBufFC = 2.0 / (Math.log(frameCtx.pickZFar + 1.0) / Math.LN2); // TODO: Far from pick project matrix?
             gl.uniform1f(this._uLogDepthBufFC, logDepthBufFC);
         }
@@ -59423,7 +59425,7 @@ class SnapBatchingDepthBufInitRenderer {
         this._aPosition = program.getAttribute("position");
         this._aOffset = program.getAttribute("offset");
         this._aFlags = program.getAttribute("flags");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             this._uLogDepthBufFC = program.getLocation("logDepthBufFC");
         }
         this._uCameraEyeRtc = program.getLocation("uCameraEyeRtc");
@@ -59478,7 +59480,7 @@ class SnapBatchingDepthBufInitRenderer {
         src.push("uniform vec3 uCameraEyeRtc;");
         src.push("uniform vec2 snapVectorA;");
         src.push("uniform vec2 snapInvVectorAB;");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("uniform float logDepthBufFC;");
             src.push("out float vFragDepth;");
             src.push("out float isPerspective;");
@@ -59519,7 +59521,7 @@ class SnapBatchingDepthBufInitRenderer {
         src.push("clipPos.xy = remapClipPos(clipPos.xy);");
         src.push("clipPos.z += 0.0001;"); // small Z offset
         src.push("clipPos.xyzw *= tmp;");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
@@ -59543,7 +59545,7 @@ class SnapBatchingDepthBufInitRenderer {
         src.push("precision mediump float;");
         src.push("precision mediump int;");
         src.push("#endif");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("in float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("in float vFragDepth;");
@@ -59574,7 +59576,7 @@ class SnapBatchingDepthBufInitRenderer {
             src.push("      if (dist > 0.0) { discard; }");
             src.push("  }");
         }
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("outCoords = ivec4(relativeToOriginPosition.xyz*coordinateScaler.xyz, -layerNumber);");
@@ -59698,7 +59700,7 @@ class SnapBatchingDepthRenderer {
         gl.uniformMatrix4fv(this._uWorldMatrix, false, rotationMatrixConjugate);
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
         gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix);
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             const logDepthBufFC = 2.0 / (Math.log(frameCtx.pickZFar + 1.0) / Math.LN2); // TODO: Far from pick project matrix?
             gl.uniform1f(this._uLogDepthBufFC, logDepthBufFC);
         }
@@ -59779,7 +59781,7 @@ class SnapBatchingDepthRenderer {
         this._aOffset = program.getAttribute("offset");
         this._aFlags = program.getAttribute("flags");
 
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             this._uLogDepthBufFC = program.getLocation("logDepthBufFC");
         }
 
@@ -59835,7 +59837,7 @@ class SnapBatchingDepthRenderer {
         src.push("uniform vec3 uCameraEyeRtc;"); 
         src.push("uniform vec2 snapVectorA;"); 
         src.push("uniform vec2 snapInvVectorAB;"); 
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("uniform float logDepthBufFC;");
             src.push("out float vFragDepth;");
             src.push("bool isPerspectiveMatrix(mat4 m) {");
@@ -59877,7 +59879,7 @@ class SnapBatchingDepthRenderer {
         src.push("clipPos.xyzw /= tmp;");
         src.push("clipPos.xy = remapClipPos(clipPos.xy);");
         src.push("clipPos.xyzw *= tmp;");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
            src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
@@ -59902,7 +59904,7 @@ class SnapBatchingDepthRenderer {
         src.push("precision mediump float;");
         src.push("precision mediump int;");
         src.push("#endif");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("in float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("in float vFragDepth;");
@@ -59933,7 +59935,7 @@ class SnapBatchingDepthRenderer {
             src.push("      if (dist > 0.0) { discard; }");
             src.push("  }");
         }
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("outCoords = ivec4(relativeToOriginPosition.xyz*coordinateScaler.xyz, layerNumber);");
@@ -60024,8 +60026,8 @@ const tempMat4$1 = math.mat4();
 const tempMat4b = math.mat4();
 const tempVec4a$c = math.vec4([0, 0, 0, 1]);
 const tempVec4b$b = math.vec4([0, 0, 0, 1]);
-const tempVec4c$8 = math.vec4([0, 0, 0, 1]);
-const tempOBB3$2 = math.OBB3();
+math.vec4([0, 0, 0, 1]);
+math.OBB3();
 
 const tempVec3a$p = math.vec3();
 const tempVec3b$j = math.vec3();
@@ -60098,7 +60100,7 @@ class TrianglesBatchingLayer {
             flagsBuf: null,
             indicesBuf: null,
             edgeIndicesBuf: null,
-            positionsDecodeMatrix:null,
+            positionsDecodeMatrix: null,
             uvDecodeMatrix: null,
             textureSet: cfg.textureSet,
             pbrSupported: false // Set in #finalize if we have enough to support quality rendering
@@ -60184,7 +60186,6 @@ class TrianglesBatchingLayer {
      * @param cfg.roughness Roughness factor [0..255]
      * @param cfg.opacity Opacity [0..255]
      * @param [cfg.meshMatrix] Flat float 4x4 matrix
-     * @param [cfg.sceneModelMatrix] Flat float 4x4 matrix
      * @param cfg.worldAABB Flat float AABB World-space AABB
      * @param cfg.pickColor Quantized pick color
      * @returns {number} Portion ID
@@ -60210,7 +60211,6 @@ class TrianglesBatchingLayer {
         const roughness = cfg.roughness;
         const opacity = cfg.opacity;
         const meshMatrix = cfg.meshMatrix;
-        const sceneModelMatrix = cfg.sceneModelMatrix;
         const worldAABB = cfg.worldAABB;
         const pickColor = cfg.pickColor;
 
@@ -60245,12 +60245,6 @@ class TrianglesBatchingLayer {
             worldAABB[4] = max[1];
             worldAABB[5] = max[2];
 
-            if (sceneModelMatrix) {
-                math.AABB3ToOBB3(worldAABB, tempOBB3$2);
-                math.transformOBB3(sceneModelMatrix, tempOBB3$2);
-                math.OBB3ToAABB3(tempOBB3$2, worldAABB);
-            }
-
         } else {
 
             if (!positions) {
@@ -60282,13 +60276,7 @@ class TrianglesBatchingLayer {
                     buffer.positions[i + 2] = tempVec4b$b[2];
 
                     math.expandAABB3Point3(this._modelAABB, tempVec4b$b);
-
-                    if (sceneModelMatrix) {
-                        math.transformPoint4(sceneModelMatrix, tempVec4b$b, tempVec4c$8);
-                        math.expandAABB3Point3(worldAABB, tempVec4c$8);
-                    } else {
-                        math.expandAABB3Point3(worldAABB, tempVec4b$b);
-                    }
+                    math.expandAABB3Point3(worldAABB, tempVec4b$b);
                 }
 
             } else {
@@ -60300,13 +60288,7 @@ class TrianglesBatchingLayer {
                     tempVec4a$c[2] = buffer.positions[i + 2];
 
                     math.expandAABB3Point3(this._modelAABB, tempVec4a$c);
-
-                    if (sceneModelMatrix) {
-                        math.transformPoint4(sceneModelMatrix, tempVec4a$c, tempVec4b$b);
-                        math.expandAABB3Point3(worldAABB, tempVec4b$b);
-                    } else {
-                        math.expandAABB3Point3(worldAABB, tempVec4a$c);
-                    }
+                    math.expandAABB3Point3(worldAABB, tempVec4a$c);
                 }
             }
         }
@@ -60936,7 +60918,7 @@ class TrianglesBatchingLayer {
             offset = portion.indicesBaseIndex;
         }
 
-        return { count, offset }
+        return {count, offset}
     }
 
     // ---------------------- COLOR RENDERING -----------------------------------
@@ -64495,7 +64477,7 @@ class SnapInstancingDepthBufInitRenderer {
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
         gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix);
 
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             const logDepthBufFC = 2.0 / (Math.log(frameCtx.pickZFar + 1.0) / Math.LN2);
             gl.uniform1f(this._uLogDepthBufFC, logDepthBufFC);
         }
@@ -64590,7 +64572,7 @@ class SnapInstancingDepthBufInitRenderer {
         this._aModelMatrixCol0 = program.getAttribute("modelMatrixCol0");
         this._aModelMatrixCol1 = program.getAttribute("modelMatrixCol1");
         this._aModelMatrixCol2 = program.getAttribute("modelMatrixCol2");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             this._uLogDepthBufFC = program.getLocation("logDepthBufFC");
         }
         this._uCameraEyeRtc = program.getLocation("uCameraEyeRtc");
@@ -64649,7 +64631,7 @@ class SnapInstancingDepthBufInitRenderer {
         src.push("uniform vec3 uCameraEyeRtc;");
         src.push("uniform vec2 snapVectorA;");
         src.push("uniform vec2 snapInvVectorAB;");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("uniform float logDepthBufFC;");
             src.push("out float vFragDepth;");
             src.push("bool isPerspectiveMatrix(mat4 m) {");
@@ -64691,7 +64673,7 @@ class SnapInstancingDepthBufInitRenderer {
         src.push("clipPos.xy = remapClipPos(clipPos.xy);");
         src.push("clipPos.z += 0.0001;"); // small Z offset
         src.push("clipPos.xyzw *= tmp;");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
@@ -64715,7 +64697,7 @@ class SnapInstancingDepthBufInitRenderer {
         src.push("precision mediump float;");
         src.push("precision mediump int;");
         src.push("#endif");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("in float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("in float vFragDepth;");
@@ -64746,7 +64728,7 @@ class SnapInstancingDepthBufInitRenderer {
             src.push("if (dist > 0.0) { discard; }");
             src.push("}");
         }
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("outCoords = ivec4(relativeToOriginPosition.xyz*coordinateScaler.xyz, -layerNumber);");
@@ -64869,7 +64851,7 @@ class SnapInstancingDepthRenderer {
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
         gl.uniformMatrix4fv(this._uWorldMatrix, false, rotationMatrixConjugate);
         gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix);
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             const logDepthBufFC = 2.0 / (Math.log(frameCtx.pickZFar + 1.0) / Math.LN2); // TODO: Far from pick project matrix
             gl.uniform1f(this._uLogDepthBufFC, logDepthBufFC);
         }
@@ -64957,7 +64939,7 @@ class SnapInstancingDepthRenderer {
         this._aModelMatrixCol0 = program.getAttribute("modelMatrixCol0");
         this._aModelMatrixCol1 = program.getAttribute("modelMatrixCol1");
         this._aModelMatrixCol2 = program.getAttribute("modelMatrixCol2");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             this._uLogDepthBufFC = program.getLocation("logDepthBufFC");
         }
         this._uCameraEyeRtc = program.getLocation("uCameraEyeRtc"); 
@@ -65016,7 +64998,7 @@ class SnapInstancingDepthRenderer {
         src.push("uniform vec3 uCameraEyeRtc;"); 
         src.push("uniform vec2 snapVectorA;"); 
         src.push("uniform vec2 snapInvVectorAB;"); 
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("uniform float logDepthBufFC;");
             src.push("out float vFragDepth;");
             src.push("bool isPerspectiveMatrix(mat4 m) {");
@@ -65057,7 +65039,7 @@ class SnapInstancingDepthRenderer {
         src.push("clipPos.xyzw /= tmp;");
         src.push("clipPos.xy = remapClipPos(clipPos.xy);");
         src.push("clipPos.xyzw *= tmp;");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
@@ -65082,7 +65064,7 @@ class SnapInstancingDepthRenderer {
         src.push("precision mediump float;");
         src.push("precision mediump int;");
         src.push("#endif");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("in float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("in float vFragDepth;");
@@ -65113,7 +65095,7 @@ class SnapInstancingDepthRenderer {
             src.push("if (dist > 0.0) { discard; }");
             src.push("}");
         }
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("outCoords = ivec4(relativeToOriginPosition.xyz*coordinateScaler.xyz, layerNumber);");
@@ -65204,7 +65186,7 @@ const tempUint8Vec4$2 = new Uint8Array(4);
 const tempFloat32$2 = new Float32Array(1);
 const tempVec4a$b = math.vec4([0, 0, 0, 1]);
 const tempVec4b$a = math.vec4([0, 0, 0, 1]);
-const tempVec4c$7 = math.vec4([0, 0, 0, 1]);
+math.vec4([0, 0, 0, 1]);
 const tempVec3fa$2 = new Float32Array(3);
 
 const tempVec3a$m = math.vec3();
@@ -65347,7 +65329,6 @@ class TrianglesInstancingLayer {
      * @param cfg.roughness Roughness factor [0..255]
      * @param cfg.opacity Opacity [0..255].
      * @param cfg.meshMatrix Flat float 4x4 matrix.
-     * @param [cfg.sceneModelMatrix] Flat float 4x4 matrix.
      * @param [cfg.worldMatrix] Flat float 4x4 matrix.
      * @param cfg.worldAABB Flat float AABB.
      * @param cfg.pickColor Quantized pick color
@@ -65360,7 +65341,6 @@ class TrianglesInstancingLayer {
         const roughness = cfg.roughness;
         const opacity = cfg.opacity !== null && cfg.opacity !== undefined ? cfg.opacity : 255;
         const meshMatrix = cfg.meshMatrix;
-        const sceneModelMatrix = cfg.sceneModelMatrix;
         const worldAABB = cfg.aabb;
         const pickColor = cfg.pickColor;
 
@@ -65444,12 +65424,7 @@ class TrianglesInstancingLayer {
             tempVec4a$b[2] = positions[i + 2];
             math.transformPoint4(positionsDecodeMatrix, tempVec4a$b, tempVec4b$a);
             math.transformPoint4(meshMatrix, tempVec4b$a, tempVec4a$b);
-            if (sceneModelMatrix) {
-                math.transformPoint4(sceneModelMatrix, tempVec4a$b, tempVec4c$7);
-                math.expandAABB3Point3(worldAABB, tempVec4c$7);
-            } else {
                 math.expandAABB3Point3(worldAABB, tempVec4a$b);
-            }
         }
 
         if (this._state.origin) {
@@ -66689,8 +66664,8 @@ class LinesBatchingBuffer {
 
 const tempVec4a$a = math.vec4([0, 0, 0, 1]);
 const tempVec4b$9 = math.vec4([0, 0, 0, 1]);
-const tempVec4c$6 = math.vec4([0, 0, 0, 1]);
-const tempOBB3$1 = math.OBB3();
+math.vec4([0, 0, 0, 1]);
+math.OBB3();
 
 /**
  * @private
@@ -66791,7 +66766,6 @@ class LinesBatchingLayer {
      * @param cfg.color Quantized RGB color [0..255,0..255,0..255,0..255]
      * @param cfg.opacity Opacity [0..255]
      * @param [cfg.meshMatrix] Flat float 4x4 matrix
-     * @param [cfg.worldMatrix] Flat float 4x4 matrix
      * @param cfg.worldAABB Flat float AABB World-space AABB
      * @param cfg.pickColor Quantized pick color
      * @returns {number} Portion ID
@@ -66808,7 +66782,6 @@ class LinesBatchingLayer {
         const color = cfg.color;
         const opacity = cfg.opacity;
         const meshMatrix = cfg.meshMatrix;
-        const worldMatrix = cfg.worldMatrix;
         const worldAABB = cfg.worldAABB;
         cfg.pickColor;
 
@@ -66843,12 +66816,6 @@ class LinesBatchingLayer {
             worldAABB[4] = max[1];
             worldAABB[5] = max[2];
 
-            if (worldMatrix) {
-                math.AABB3ToOBB3(worldAABB, tempOBB3$1);
-                math.transformOBB3(worldMatrix, tempOBB3$1);
-                math.OBB3ToAABB3(tempOBB3$1, worldAABB);
-            }
-
         } else {
 
             if (!positions) {
@@ -66880,13 +66847,7 @@ class LinesBatchingLayer {
                     buffer.positions[i + 2] = tempVec4b$9[2];
 
                     math.expandAABB3Point3(this._modelAABB, tempVec4b$9);
-
-                    if (worldMatrix) {
-                        math.transformPoint4(worldMatrix, tempVec4b$9, tempVec4c$6);
-                        math.expandAABB3Point3(worldAABB, tempVec4c$6);
-                    } else {
-                        math.expandAABB3Point3(worldAABB, tempVec4b$9);
-                    }
+                    math.expandAABB3Point3(worldAABB, tempVec4b$9);
                 }
 
             } else {
@@ -66898,13 +66859,7 @@ class LinesBatchingLayer {
                     tempVec4a$a[2] = buffer.positions[i + 2];
 
                     math.expandAABB3Point3(this._modelAABB, tempVec4a$a);
-
-                    if (worldMatrix) {
-                        math.transformPoint4(worldMatrix, tempVec4a$a, tempVec4b$9);
-                        math.expandAABB3Point3(worldAABB, tempVec4b$9);
-                    } else {
-                        math.expandAABB3Point3(worldAABB, tempVec4a$a);
-                    }
+                    math.expandAABB3Point3(worldAABB, tempVec4a$a);
                 }
             }
         }
@@ -67783,7 +67738,7 @@ const tempFloat32$1 = new Float32Array(1);
 
 const tempVec4a$9 = math.vec4([0, 0, 0, 1]);
 const tempVec4b$8 = math.vec4([0, 0, 0, 1]);
-const tempVec4c$5 = math.vec4([0, 0, 0, 1]);
+math.vec4([0, 0, 0, 1]);
 
 const tempVec3fa$1 = new Float32Array(3);
 
@@ -67895,7 +67850,6 @@ class LinesInstancingLayer {
      * @param cfg.color Color [0..255,0..255,0..255]
      * @param cfg.opacity Opacity [0..255].
      * @param cfg.meshMatrix Flat float 4x4 matrix.
-     * @param [cfg.worldMatrix] Flat float 4x4 matrix.
      * @param cfg.aabb Flat float AABB.
      * @returns {number} Portion ID.
      */
@@ -67904,7 +67858,6 @@ class LinesInstancingLayer {
         const color = cfg.color;
         const opacity = cfg.opacity;
         const meshMatrix = cfg.meshMatrix;
-        const worldMatrix = cfg.worldMatrix;
         const worldAABB = cfg.aabb;
 
         if (this._finalized) {
@@ -67954,12 +67907,7 @@ class LinesInstancingLayer {
             tempVec4a$9[1] = obb[i + 1];
             tempVec4a$9[2] = obb[i + 2];
             math.transformPoint4(meshMatrix, tempVec4a$9, tempVec4b$8);
-            if (worldMatrix) {
-                math.transformPoint4(worldMatrix, tempVec4b$8, tempVec4c$5);
-                math.expandAABB3Point3(worldAABB, tempVec4c$5);
-            } else {
-                math.expandAABB3Point3(worldAABB, tempVec4b$8);
-            }
+            math.expandAABB3Point3(worldAABB, tempVec4b$8);
         }
 
         if (this._state.origin) {
@@ -69297,8 +69245,8 @@ const tempVec3a$l = math.vec4();
 const tempVec3b$f = math.vec4();
 const tempVec4a$8 = math.vec4([0, 0, 0, 1]);
 const tempVec4b$7 = math.vec4([0, 0, 0, 1]);
-const tempVec4c$4 = math.vec4([0, 0, 0, 1]);
-const tempOBB3 = math.OBB3();
+math.vec4([0, 0, 0, 1]);
+math.OBB3();
 
 /**
  * @private
@@ -69406,7 +69354,6 @@ class PointsBatchingLayer {
      * @param [cfg.colors] Flat float colors array.
      * @param cfg.color Float RGB color [0..1,0..1,0..1]
      * @param [cfg.meshMatrix] Flat float 4x4 matrix
-     * @param [cfg.worldMatrix] Flat float 4x4 matrix
      * @param cfg.worldAABB Flat float AABB World-space AABB
      * @param cfg.pickColor Quantized pick color
      * @returns {number} Portion ID
@@ -69423,7 +69370,6 @@ class PointsBatchingLayer {
         const colorsCompressed = cfg.colorsCompressed;
         const colors = cfg.colors;
         const meshMatrix = cfg.meshMatrix;
-        const worldMatrix = cfg.worldMatrix;
         const worldAABB = cfg.worldAABB;
         const pickColor = cfg.pickColor;
 
@@ -69455,12 +69401,6 @@ class PointsBatchingLayer {
             worldAABB[4] = max[1];
             worldAABB[5] = max[2];
 
-            if (worldMatrix) {
-                math.AABB3ToOBB3(worldAABB, tempOBB3);
-                math.transformOBB3(worldMatrix, tempOBB3);
-                math.OBB3ToAABB3(tempOBB3, worldAABB);
-            }
-
             numVerts = positionsCompressed.length / 3;
 
         } else {
@@ -69493,13 +69433,7 @@ class PointsBatchingLayer {
                     buffer.positions[i + 2] = tempVec4b$7[2];
 
                     math.expandAABB3Point3(this._modelAABB, tempVec4b$7);
-
-                    if (worldMatrix) {
-                        math.transformPoint4(worldMatrix, tempVec4b$7, tempVec4c$4);
-                        math.expandAABB3Point3(worldAABB, tempVec4c$4);
-                    } else {
                         math.expandAABB3Point3(worldAABB, tempVec4b$7);
-                    }
                 }
 
             } else {
@@ -69511,17 +69445,9 @@ class PointsBatchingLayer {
                     tempVec4a$8[2] = buffer.positions[i + 2];
 
                     math.expandAABB3Point3(this._modelAABB, tempVec4a$8);
-
-                    if (worldMatrix) {
-                        math.transformPoint4(worldMatrix, tempVec4a$8, tempVec4b$7);
-                        math.expandAABB3Point3(worldAABB, tempVec4b$7);
-                    } else {
                         math.expandAABB3Point3(worldAABB, tempVec4a$8);
-                    }
                 }
             }
-
-
         }
 
         if (this._state.origin) {
@@ -71252,7 +71178,7 @@ const tempUint8Vec4 = new Uint8Array(4);
 const tempFloat32 = new Float32Array(1);
 const tempVec4a$7 = math.vec4([0, 0, 0, 1]);
 const tempVec4b$6 = math.vec4([0, 0, 0, 1]);
-const tempVec4c$3 = math.vec4([0, 0, 0, 1]);
+math.vec4([0, 0, 0, 1]);
 const tempVec3fa = new Float32Array(3);
 
 /**
@@ -71363,7 +71289,6 @@ class PointsInstancingLayer {
     createPortion(cfg) {
 
         const meshMatrix = cfg.meshMatrix;
-        const worldMatrix = cfg.worldMatrix;
         const worldAABB = cfg.aabb;
         const pickColor = cfg.pickColor;
 
@@ -71409,12 +71334,7 @@ class PointsInstancingLayer {
             tempVec4a$7[1] = obb[i + 1];
             tempVec4a$7[2] = obb[i + 2];
             math.transformPoint4(meshMatrix, tempVec4a$7, tempVec4b$6);
-            if (worldMatrix) {
-                math.transformPoint4(worldMatrix, tempVec4b$6, tempVec4c$3);
-                math.expandAABB3Point3(worldAABB, tempVec4c$3);
-            } else {
-                math.expandAABB3Point3(worldAABB, tempVec4b$6);
-            }
+            math.expandAABB3Point3(worldAABB, tempVec4b$6);
         }
 
         if (this._state.origin) {
@@ -74994,7 +74914,7 @@ class TrianglesDataTextureEdgesColorRenderer {
         const viewMatrix = camera.viewMatrix;
         
         if (!this._program) {
-            this._allocate(dataTextureLayer);
+            this._allocate();
             if (this.errors) {
                 return;
             }
@@ -75123,7 +75043,6 @@ class TrianglesDataTextureEdgesColorRenderer {
 
         this._uRenderPass = program.getLocation("renderPass");
         this._uSceneModelWorldMatrix = program.getLocation("sceneModelWorldMatrix");
-        this._uWorldMatrix = program.getLocation("worldMatrix");
         this._uViewMatrix = program.getLocation("viewMatrix");
         this._uProjMatrix = program.getLocation("projMatrix");
         this._uSectionPlanes = [];
@@ -75142,13 +75061,13 @@ class TrianglesDataTextureEdgesColorRenderer {
             this._uLogDepthBufFC = program.getLocation("logDepthBufFC");
         }
 
-        this._uTexturePerObjectIdPositionsDecodeMatrix = "uTexturePerObjectIdPositionsDecodeMatrix"; 
-        this._uTexturePerObjectIdColorsAndFlags = "uTexturePerObjectIdColorsAndFlags"; 
-        this._uTexturePerVertexIdCoordinates = "uTexturePerVertexIdCoordinates"; 
-        this._uTexturePerPolygonIdEdgeIndices = "uTexturePerPolygonIdEdgeIndices"; 
+        this._uTexturePerObjectIdPositionsDecodeMatrix = "uTexturePerObjectIdPositionsDecodeMatrix";
+        this._uTexturePerObjectIdColorsAndFlags = "uTexturePerObjectIdColorsAndFlags";
+        this._uTexturePerVertexIdCoordinates = "uTexturePerVertexIdCoordinates";
+        this._uTexturePerPolygonIdEdgeIndices = "uTexturePerPolygonIdEdgeIndices";
         this._uTexturePerEdgeIdPortionIds = "uTexturePerEdgeIdPortionIds";
-        this._uTextureModelMatrices = "uTextureModelMatrices"; 
-        this._uTexturePerObjectIdOffsets = "uTexturePerObjectIdOffsets"; 
+        this._uTextureModelMatrices = "uTextureModelMatrices";
+        this._uTexturePerObjectIdOffsets = "uTexturePerObjectIdOffsets";
     }
 
     _bindProgram() {
@@ -75179,7 +75098,7 @@ class TrianglesDataTextureEdgesColorRenderer {
         const clipping = sectionPlanesState.sectionPlanes.length > 0;
         const src = [];
         src.push("#version 300 es");
-        src.push("// Batched geometry edges drawing vertex shader");
+        src.push("// TrianglesDataTextureEdgesColorRenderer");
 
         src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
         src.push("precision highp float;");
@@ -75197,20 +75116,18 @@ class TrianglesDataTextureEdgesColorRenderer {
 
         src.push("uniform int renderPass;");
 
-        if (scene.entityOffsetsEnabled) {
-            src.push("in vec3 offset;");
-        }
+        if (scene.entityOffsetsEnabled) ;
 
         src.push("uniform mat4 sceneModelWorldMatrix;");
         src.push("uniform mat4 viewMatrix;");
         src.push("uniform mat4 projMatrix;");
 
-        src.push("uniform highp sampler2D uTexturePerObjectIdPositionsDecodeMatrix;"); 
-        src.push("uniform lowp usampler2D uTexturePerObjectIdColorsAndFlags;"); 
-        src.push("uniform highp sampler2D uTexturePerObjectIdOffsets;"); 
-        src.push("uniform mediump usampler2D uTexturePerVertexIdCoordinates;"); 
-        src.push("uniform highp usampler2D uTexturePerPolygonIdEdgeIndices;"); 
-        src.push("uniform mediump usampler2D uTexturePerEdgeIdPortionIds;"); 
+        src.push("uniform highp sampler2D uTexturePerObjectIdPositionsDecodeMatrix;");
+        src.push("uniform lowp usampler2D uTexturePerObjectIdColorsAndFlags;");
+        src.push("uniform highp sampler2D uTexturePerObjectIdOffsets;");
+        src.push("uniform mediump usampler2D uTexturePerVertexIdCoordinates;");
+        src.push("uniform highp usampler2D uTexturePerPolygonIdEdgeIndices;");
+        src.push("uniform mediump usampler2D uTexturePerEdgeIdPortionIds;");
         src.push("uniform highp sampler2D uTextureModelMatrices;");
 
       //  src.push("uniform vec4 color;");
@@ -75246,19 +75163,19 @@ class TrianglesDataTextureEdgesColorRenderer {
         src.push("ivec2 objectIndexCoords = ivec2(objectIndex % 512, objectIndex / 512);");
 
         // get flags & flags2
-        src.push("uvec4 flags = texelFetch (uTexturePerObjectIdColorsAndFlags, ivec2(objectIndexCoords.x*8+2, objectIndexCoords.y), 0);"); 
-        src.push("uvec4 flags2 = texelFetch (uTexturePerObjectIdColorsAndFlags, ivec2(objectIndexCoords.x*8+3, objectIndexCoords.y), 0);"); 
-        
+        src.push("uvec4 flags = texelFetch (uTexturePerObjectIdColorsAndFlags, ivec2(objectIndexCoords.x*8+2, objectIndexCoords.y), 0);");
+        src.push("uvec4 flags2 = texelFetch (uTexturePerObjectIdColorsAndFlags, ivec2(objectIndexCoords.x*8+3, objectIndexCoords.y), 0);");
+
         // flags.z = NOT_RENDERED | EDGES_COLOR_OPAQUE | EDGES_COLOR_TRANSPARENT | EDGES_HIGHLIGHTED | EDGES_XRAYED | EDGES_SELECTED
         // renderPass = EDGES_COLOR_OPAQUE | EDGES_COLOR_TRANSPARENT
-        
+
         src.push(`if (int(flags.z) != renderPass) {`);
         src.push("   gl_Position = vec4(3.0, 3.0, 3.0, 1.0);"); // Cull vertex
         src.push("   return;"); // Cull vertex
         src.push("} else {");
 
         // get vertex base
-        src.push("ivec4 packedVertexBase = ivec4(texelFetch (uTexturePerObjectIdColorsAndFlags, ivec2(objectIndexCoords.x*8+4, objectIndexCoords.y), 0));"); 
+        src.push("ivec4 packedVertexBase = ivec4(texelFetch (uTexturePerObjectIdColorsAndFlags, ivec2(objectIndexCoords.x*8+4, objectIndexCoords.y), 0));");
 
         src.push("ivec4 packedEdgeIndexBaseOffset = ivec4(texelFetch (uTexturePerObjectIdColorsAndFlags, ivec2(objectIndexCoords.x*8+6, objectIndexCoords.y), 0));");
 
@@ -75269,21 +75186,21 @@ class TrianglesDataTextureEdgesColorRenderer {
 
         src.push("ivec3 vertexIndices = ivec3(texelFetch(uTexturePerPolygonIdEdgeIndices, ivec2(h_index, v_index), 0));");
         src.push("ivec3 uniqueVertexIndexes = vertexIndices + (packedVertexBase.r << 24) + (packedVertexBase.g << 16) + (packedVertexBase.b << 8) + packedVertexBase.a;");
-        
+
         src.push("int indexPositionH = uniqueVertexIndexes[gl_VertexID % 2] & 4095;");
         src.push("int indexPositionV = uniqueVertexIndexes[gl_VertexID % 2] >> 12;");
 
         src.push("mat4 positionsDecodeMatrix = mat4 (texelFetch (uTexturePerObjectIdPositionsDecodeMatrix, ivec2(objectIndexCoords.x*4+0, objectIndexCoords.y), 0), texelFetch (uTexturePerObjectIdPositionsDecodeMatrix, ivec2(objectIndexCoords.x*4+1, objectIndexCoords.y), 0), texelFetch (uTexturePerObjectIdPositionsDecodeMatrix, ivec2(objectIndexCoords.x*4+2, objectIndexCoords.y), 0), texelFetch (uTexturePerObjectIdPositionsDecodeMatrix, ivec2(objectIndexCoords.x*4+3, objectIndexCoords.y), 0));");
 
         // get flags & flags2
-        src.push("uvec4 flags = texelFetch (uTexturePerObjectIdColorsAndFlags, ivec2(objectIndexCoords.x*8+2, objectIndexCoords.y), 0);"); 
-        src.push("uvec4 flags2 = texelFetch (uTexturePerObjectIdColorsAndFlags, ivec2(objectIndexCoords.x*8+3, objectIndexCoords.y), 0);"); 
-        
+        src.push("uvec4 flags = texelFetch (uTexturePerObjectIdColorsAndFlags, ivec2(objectIndexCoords.x*8+2, objectIndexCoords.y), 0);");
+        src.push("uvec4 flags2 = texelFetch (uTexturePerObjectIdColorsAndFlags, ivec2(objectIndexCoords.x*8+3, objectIndexCoords.y), 0);");
+
         // get position
         src.push("vec3 position = vec3(texelFetch(uTexturePerVertexIdCoordinates, ivec2(indexPositionH, indexPositionV), 0));");
 
         // get color
-        src.push("uvec4 color = texelFetch (uTexturePerObjectIdColorsAndFlags, ivec2(objectIndexCoords.x*8+0, objectIndexCoords.y), 0);"); 
+        src.push("uvec4 color = texelFetch (uTexturePerObjectIdColorsAndFlags, ivec2(objectIndexCoords.x*8+0, objectIndexCoords.y), 0);");
 
         src.push(`if (color.a == 0u) {`);
         src.push("   gl_Position = vec4(3.0, 3.0, 3.0, 1.0);"); // Cull vertex
@@ -75295,7 +75212,7 @@ class TrianglesDataTextureEdgesColorRenderer {
         // get XYZ offset
         src.push("vec4 offset = vec4(texelFetch (uTexturePerObjectIdOffsets, objectIndexCoords, 0).rgb, 0.0);");
 
-        src.push("worldPosition.xyz = worldPosition.xyz + offset.xyz;");
+      //  src.push("worldPosition.xyz = worldPosition.xyz + offset.xyz;");
 
         src.push("      vec4 viewPosition  = viewMatrix * worldPosition; ");
 
@@ -75324,10 +75241,7 @@ class TrianglesDataTextureEdgesColorRenderer {
         const clipping = sectionPlanesState.sectionPlanes.length > 0;
         const src = [];
         src.push ('#version 300 es');
-        src.push("// Batched geometry edges drawing fragment shader");
-        if (scene.logarithmicDepthBufferEnabled) {
-            src.push("#extension GL_EXT_frag_depth : enable");
-        }
+        src.push("// TrianglesDataTextureEdgesColorRenderer");
         src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
         src.push("precision highp float;");
         src.push("precision highp int;");
@@ -75365,6 +75279,7 @@ class TrianglesDataTextureEdgesColorRenderer {
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled) {
+         //   src.push("gl_FragDepth = log2( vFragDepth ) * logDepthBufFC * 0.5;");
             src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("   outColor            = vColor;");
@@ -76382,7 +76297,7 @@ class TrianglesDataTextureSnapDepthRenderer {
         gl.uniformMatrix4fv(this._uSceneModelWorldMatrix, false, rotationMatrixConjugate);
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
         gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix);
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             const logDepthBufFC = 2.0 / (Math.log(frameCtx.pickZFar + 1.0) / Math.LN2);
             gl.uniform1f(this._uLogDepthBufFC, logDepthBufFC);
         }
@@ -76462,7 +76377,7 @@ class TrianglesDataTextureSnapDepthRenderer {
                 dir: program.getLocation("sectionPlaneDir" + i)
             });
         }
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             this._uLogDepthBufFC = program.getLocation("logDepthBufFC");
         }
         this._uTexturePerObjectIdPositionsDecodeMatrix = "uTexturePerObjectIdPositionsDecodeMatrix";
@@ -76535,7 +76450,7 @@ class TrianglesDataTextureSnapDepthRenderer {
 
         src.push("vec3 positions[3];");
 
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("uniform float logDepthBufFC;");
             src.push("out float vFragDepth;");
             src.push("bool isPerspectiveMatrix(mat4 m) {");
@@ -76609,7 +76524,7 @@ class TrianglesDataTextureSnapDepthRenderer {
         src.push("clipPos.xy = remapClipPos(clipPos.xy);");
         src.push("clipPos.xyzw *= tmp;");
         src.push("vViewPosition = clipPos;");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
@@ -76635,7 +76550,7 @@ class TrianglesDataTextureSnapDepthRenderer {
         src.push("precision mediump float;");
         src.push("precision mediump int;");
         src.push("#endif");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("in float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("in float vFragDepth;");
@@ -76666,7 +76581,7 @@ class TrianglesDataTextureSnapDepthRenderer {
             src.push("      if (dist > 0.0) { discard; }");
             src.push("  }");
         }
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("outCoords = ivec4(relativeToOriginPosition.xyz * uCoordinateScaler.xyz, uLayerNumber);");
@@ -76692,7 +76607,6 @@ const tempVec3c$6 = math.vec3();
 const tempVec3d$3 = math.vec3();
 const tempVec3e = math.vec3();
 const tempMat4a$2 = math.mat4();
-
 /**
  * @private
  */
@@ -76796,7 +76710,7 @@ class TrianglesDataTextureSnapDepthBufInitRenderer {
         gl.uniformMatrix4fv(this._uSceneWorldModelMatrix, false, rotationMatrixConjugate);
         gl.uniformMatrix4fv(this._uViewMatrix, false, rtcViewMatrix);
         gl.uniformMatrix4fv(this._uProjMatrix, false, camera.projMatrix);
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             const logDepthBufFC = 2.0 / (Math.log(frameCtx.pickZFar + 1.0) / Math.LN2);
             gl.uniform1f(this._uLogDepthBufFC, logDepthBufFC);
         }
@@ -76875,7 +76789,7 @@ class TrianglesDataTextureSnapDepthBufInitRenderer {
                 dir: program.getLocation("sectionPlaneDir" + i)
             });
         }
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             this._uLogDepthBufFC = program.getLocation("logDepthBufFC");
         }
         this._uTexturePerObjectIdPositionsDecodeMatrix = "uTexturePerObjectIdPositionsDecodeMatrix";
@@ -76947,7 +76861,7 @@ class TrianglesDataTextureSnapDepthBufInitRenderer {
 
         src.push("vec3 positions[3];");
 
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("uniform float logDepthBufFC;");
             src.push("out float vFragDepth;");
             src.push("out float isPerspective;");
@@ -77058,7 +76972,7 @@ class TrianglesDataTextureSnapDepthBufInitRenderer {
         src.push("clipPos.xy = remapClipPos(clipPos.xy);");
         src.push("clipPos.z += 0.0001;"); // small Z offset
         src.push("clipPos.xyzw *= tmp;");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("vFragDepth = 1.0 + clipPos.w;");
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
@@ -77082,7 +76996,7 @@ class TrianglesDataTextureSnapDepthBufInitRenderer {
         src.push("precision mediump float;");
         src.push("precision mediump int;");
         src.push("#endif");
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("in float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("in float vFragDepth;");
@@ -77113,7 +77027,7 @@ class TrianglesDataTextureSnapDepthBufInitRenderer {
             src.push("      if (dist > 0.0) { discard; }");
             src.push("  }");
         }
-        if (scene.logarithmicDepthBufferEnabled) {
+        {
             src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("outCoords = ivec4(relativeToOriginPosition.xyz * uCoordinateScaler.xyz, - uLayerNumber);");
@@ -80409,7 +80323,7 @@ const MAX_OBJECT_UPDATES_IN_FRAME_WITHOUT_BATCHED_UPDATE = 10;
 
 const tempVec4a$5 = math.vec4([0, 0, 0, 1]);
 const tempVec4b$5 = math.vec4([0, 0, 0, 1]);
-const tempVec4c$2 = math.vec4([0, 0, 0, 1]);
+math.vec4([0, 0, 0, 1]);
 const tempUint8Array4 = new Uint8Array(4);
 const tempFloat32Array3 = new Float32Array(3);
 
@@ -80547,8 +80461,7 @@ class TrianglesDataTextureLayer {
      * @param portionCfg.metallic Metalness factor [0..255]
      * @param portionCfg.roughness Roughness factor [0..255]
      * @param portionCfg.opacity Opacity [0..255]
-     * @param [portionCfg.meshMatrix] Flat float 4x4 matrix
-     * @param [portionCfg.sceneModelMatrix] Flat float 4x4 matrix
+     * @param [portionCfg.meshMatrix] Flat float 4x4 matrix - transforms the portion within the coordinate system that's local to the SceneModel
      * @param portionCfg.worldAABB Flat float AABB World-space AABB
      * @param portionCfg.pickColor Quantized pick color
      * @returns {number} Portion ID
@@ -80700,7 +80613,6 @@ class TrianglesDataTextureLayer {
         const colors = portionCfg.colors;
         const opacity = portionCfg.opacity;
         const meshMatrix = portionCfg.meshMatrix;
-        const sceneModelMatrix = portionCfg.sceneModelMatrix;
         const pickColor = portionCfg.pickColor;
         const buffer = this._buffer;
         const state = this._state;
@@ -80708,7 +80620,8 @@ class TrianglesDataTextureLayer {
         buffer.perObjectPositionsDecodeMatrices.push(portionCfg.positionsDecodeMatrix);
         buffer.perObjectInstancePositioningMatrices.push(meshMatrix || DEFAULT_MATRIX$1);
 
-        if (meshMatrix || sceneModelMatrix) { // TODO: optimize for identity scene model matrix
+        if (meshMatrix) { // NB: SceneModel world matrix is used in shaders and SceneModelMesh.aabb
+
             if (!bucketGeometry.obb) {
                 bucketGeometry.obb = math.AABB3ToOBB3(bucketGeometry.aabb);
             }
@@ -80721,12 +80634,7 @@ class TrianglesDataTextureLayer {
                 if (meshMatrix) {
                     math.transformPoint4(meshMatrix, tempVec4a$5, tempVec4b$5);
                 }
-                if (sceneModelMatrix) {
-                    math.transformPoint4(sceneModelMatrix, tempVec4b$5, tempVec4c$2);
-                    math.expandAABB3Point3(subPortionAABB, tempVec4c$2);
-                } else {
-                    math.expandAABB3Point3(subPortionAABB, tempVec4b$5);
-                }
+                math.expandAABB3Point3(subPortionAABB, tempVec4b$5);
             }
         } else {
             math.expandAABB3(subPortionAABB, bucketGeometry.aabb);
@@ -80826,10 +80734,6 @@ class TrianglesDataTextureLayer {
         return subPortionId;
     }
 
-    // updatePickCameratexture(pickViewMatrix, pickCameraMatrix) {
-    //     this._dataTextureState.texturePickCameraMatrices.updateViewMatrix(pickViewMatrix, pickCameraMatrix);
-    // }
-
     /**
      * Builds data textures from the appended geometries and loads them into the GPU.
      *
@@ -81560,6 +81464,13 @@ class TrianglesDataTextureLayer {
     // ---------------------- EDGES RENDERING -----------------------------------
 
     drawEdgesColorOpaque(renderFlags, frameCtx) {
+        if (this.model.scene.logarithmicDepthBufferEnabled) {
+            if (!this.model.scene._loggedWarning) {
+                console.log("Edge enhancement for SceneModel data texture layers currently disabled with logarithmic depth buffer");
+                this.model.scene._loggedWarning = true;
+            }
+            return;
+        }
         if (this._numCulledLayerPortions === this._numPortions || this._numVisibleLayerPortions === 0 || this._numEdgesLayerPortions === 0) {
             return;
         }
@@ -83220,6 +83131,7 @@ class SceneModel extends Component {
     _setWorldMatrixDirty() {
         this._matrixDirty = true;
     }
+
     _setLocalAABBDirty() {
         for (let i = 0, len = this._entityList.length; i < len; i++) {
             this._entityList[i]._setLocalAABBDirty(); // Entities need to rebuild their Local AABBs from their Mesh's local AABBs
@@ -83234,7 +83146,7 @@ class SceneModel extends Component {
             this._entityList[i]._setWorldAABBDirty(); // Entities need to retransform their World AABBs by SceneModel's worldMatrix
         }
     }
-    
+
     /**
      * Gets the SceneModel's World matrix.
      *
@@ -84272,14 +84184,10 @@ class SceneModel extends Component {
         const instancing = (cfg.geometryId !== undefined);
         const batching = !instancing;
 
-        cfg.sceneModelMatrix = this._matrixNonIdentity ? this._matrix : null;
-
         if (batching) {
 
             // Batched geometry
 
-            const useDTX = !!this._dtxEnabled;
-
             if (cfg.primitive === undefined || cfg.primitive === null) {
                 cfg.primitive = "triangles";
             }
@@ -84312,6 +84220,8 @@ class SceneModel extends Component {
                 return null;
             }
 
+            const useDTX = (!!this._dtxEnabled && (cfg.primitive === "triangles" || cfg.primitive === "solid" || cfg.primitive === "surface"));
+
             cfg.origin = cfg.origin ? math.addVec3(this._origin, cfg.origin, math.vec3()) : this._origin;
 
             // MATRIX - optional for batching
@@ -84454,7 +84364,7 @@ class SceneModel extends Component {
                 cfg.meshMatrix = math.composeMat4(position, DEFAULT_QUATERNION, scale, math.mat4());
             }
 
-            const useDTX = !!this._dtxEnabled; // Data textures - disabled by default for now
+            const useDTX = (!!this._dtxEnabled && (cfg.geometry.primitive === "triangles" || cfg.geometry.primitive === "solid" || cfg.geometry.primitive === "surface"));
 
             if (useDTX) {
 
@@ -84980,6 +84890,15 @@ class SceneModel extends Component {
         if (this.scene.lod.enabled) {
             this._lodManager = this.scene.lod.getLODManager(this);
         }
+
+        this._viewMatrixDirty = true;
+        this._matrixDirty = true;
+        this._aabbDirty = true;
+
+        this._setWorldMatrixDirty();
+        this._setWorldAABBDirty();
+        
+        this.position = this._position;
     }
 
     /** @private */
@@ -98730,9 +98649,9 @@ class Viewer {
      * @param {Boolean} [cfg.alphaDepthMask=true] Whether writing into the depth buffer is enabled or disabled when rendering transparent objects.
      * @param {Boolean} [cfg.entityOffsetsEnabled=false] Whether to enable {@link Entity#offset}. For best performance, only set this ````true```` when you need to use {@link Entity#offset}.
      * @param {Boolean} [cfg.pickSurfacePrecisionEnabled=false] Whether to enable full-precision accuracy when surface picking with {@link Scene#pick}. Note that when ````true````, this configuration will increase the amount of browser memory used by the Viewer. The ````pickSurfacePrecision```` option for ````Scene#pick```` only works if this is set ````true````.
-     * @param {Boolean} [cfg.logarithmicDepthBufferEnabled=true] Whether to enable logarithmic depth buffer. When this is true,
+     * @param {Boolean} [cfg.logarithmicDepthBufferEnabled=false] Whether to enable logarithmic depth buffer. When this is true,
      * you can set huge values for {@link Perspective#far} and {@link Ortho#far}, to push the far clipping plane back so
-     * that it does not clip huge models. Enabling this also allows snap-picking to work more accurately when the model is far from the viewpoint.
+     * that it does not clip huge models.
      * @param {Boolean} [cfg.colorTextureEnabled=true] Whether to enable base color texture rendering.
      * @param {Boolean} [cfg.pbrEnabled=false] Whether to enable physically-based rendering.
      * @param {LocaleService} [cfg.localeService=null] Optional locale-based translation service.
@@ -98794,7 +98713,7 @@ class Viewer {
             alphaDepthMask: (cfg.alphaDepthMask !== false),
             entityOffsetsEnabled: (!!cfg.entityOffsetsEnabled),
             pickSurfacePrecisionEnabled: (!!cfg.pickSurfacePrecisionEnabled),
-            logarithmicDepthBufferEnabled: (cfg.logarithmicDepthBufferEnabled !== false),
+            logarithmicDepthBufferEnabled: (!!cfg.logarithmicDepthBufferEnabled),
             pbrEnabled: (!!cfg.pbrEnabled),
             lodEnabled: (!!cfg.lodEnabled),
             vfcCulling: (!!cfg.vfcEnabled),