@xeokit/xeokit-sdk 2.3.0-beta-15 → 2.3.0-beta-16

package/dist/xeokit-sdk.cjs.js

@@ -15999,22 +15999,6 @@ const Renderer = function (scene, options) {
                     gl.depthMask(false);
                 }
 
-                // Transparent X-ray edges
-
-                if (xrayEdgesTransparentBinLen > 0) {
-                    for (i = 0; i < xrayEdgesTransparentBinLen; i++) {
-                        xrayEdgesTransparentBin[i].drawEdgesXRayed(frameCtx);
-                    }
-                }
-
-                // Transparent X-ray fill
-
-                if (xrayedFillTransparentBinLen > 0) {
-                    for (i = 0; i < xrayedFillTransparentBinLen; i++) {
-                        xrayedFillTransparentBin[i].drawSilhouetteXRayed(frameCtx);
-                    }
-                }
-
                 // Transparent color edges
 
                 if (normalFillTransparentBinLen > 0 || normalEdgesTransparentBinLen > 0) {
@@ -16035,6 +16019,23 @@ const Renderer = function (scene, options) {
                         drawable.drawColorTransparent(frameCtx);
                     }
                 }
+
+                // Transparent X-ray edges
+
+                if (xrayEdgesTransparentBinLen > 0) {
+                    for (i = 0; i < xrayEdgesTransparentBinLen; i++) {
+                        xrayEdgesTransparentBin[i].drawEdgesXRayed(frameCtx);
+                    }
+                }
+
+                // Transparent X-ray fill
+
+                if (xrayedFillTransparentBinLen > 0) {
+                    for (i = 0; i < xrayedFillTransparentBinLen; i++) {
+                        xrayedFillTransparentBin[i].drawSilhouetteXRayed(frameCtx);
+                    }
+                }
+
                 gl.disable(gl.BLEND);
                 if (!alphaDepthMask) {
                     gl.depthMask(true);
@@ -46506,29 +46507,29 @@ function transformAndOctEncodeNormals(worldNormalMatrix, normals, lenNormals, co
 function octEncodeNormals(normals) { // http://jcgt.org/published/0003/02/01/
     const lenNormals = normals.length;
     const compressedNormals = new Int8Array(lenNormals);
-    let oct, best, currentCos, bestCos;
+    let oct, dec, best, currentCos, bestCos;
     for (let i = 0; i < lenNormals; i += 3) {
         // Test various combinations of ceil and floor to minimize rounding errors
         best = oct = octEncodeNormal(normals, i, "floor", "floor");
-        octDecodeVec2(oct);
-        currentCos = bestCos = dot(normals, i);
+        dec = octDecodeVec2(oct);
+        currentCos = bestCos = dot(normals, i, dec);
         oct = octEncodeNormal(normals, i, "ceil", "floor");
-        octDecodeVec2(oct);
-        currentCos = dot(normals, i);
+        dec = octDecodeVec2(oct);
+        currentCos = dot(normals, i, dec);
         if (currentCos > bestCos) {
             best = oct;
             bestCos = currentCos;
         }
         oct = octEncodeNormal(normals, i, "floor", "ceil");
-        octDecodeVec2(oct);
-        currentCos = dot(normals, i);
+        dec = octDecodeVec2(oct);
+        currentCos = dot(normals, i, dec);
         if (currentCos > bestCos) {
             best = oct;
             bestCos = currentCos;
         }
         oct = octEncodeNormal(normals, i, "ceil", "ceil");
-        octDecodeVec2(oct);
-        currentCos = dot(normals, i);
+        dec = octDecodeVec2(oct);
+        currentCos = dot(normals, i, dec);
         if (currentCos > bestCos) {
             best = oct;
             bestCos = currentCos;
@@ -46602,8 +46603,8 @@ function octDecodeVec2(oct) { // Decode an oct-encoded normal
 /**
  * @private
  */
-function dot(p, vec3) { // Dot product of a normal in an array against a candidate decoding
-    return p[0] * vec3[0] + p[1] * vec3[1] + p[2] * vec3[2];
+function dot(array, i, vec3) {
+    return array[i] * vec3[0] + array[i + 1] * vec3[1] + array[i + 2] * vec3[2];
 }
 
 const tempMat4$2 = math.mat4();

package/dist/xeokit-sdk.es.js

@@ -15995,22 +15995,6 @@ const Renderer = function (scene, options) {
                     gl.depthMask(false);
                 }
 
-                // Transparent X-ray edges
-
-                if (xrayEdgesTransparentBinLen > 0) {
-                    for (i = 0; i < xrayEdgesTransparentBinLen; i++) {
-                        xrayEdgesTransparentBin[i].drawEdgesXRayed(frameCtx);
-                    }
-                }
-
-                // Transparent X-ray fill
-
-                if (xrayedFillTransparentBinLen > 0) {
-                    for (i = 0; i < xrayedFillTransparentBinLen; i++) {
-                        xrayedFillTransparentBin[i].drawSilhouetteXRayed(frameCtx);
-                    }
-                }
-
                 // Transparent color edges
 
                 if (normalFillTransparentBinLen > 0 || normalEdgesTransparentBinLen > 0) {
@@ -16031,6 +16015,23 @@ const Renderer = function (scene, options) {
                         drawable.drawColorTransparent(frameCtx);
                     }
                 }
+
+                // Transparent X-ray edges
+
+                if (xrayEdgesTransparentBinLen > 0) {
+                    for (i = 0; i < xrayEdgesTransparentBinLen; i++) {
+                        xrayEdgesTransparentBin[i].drawEdgesXRayed(frameCtx);
+                    }
+                }
+
+                // Transparent X-ray fill
+
+                if (xrayedFillTransparentBinLen > 0) {
+                    for (i = 0; i < xrayedFillTransparentBinLen; i++) {
+                        xrayedFillTransparentBin[i].drawSilhouetteXRayed(frameCtx);
+                    }
+                }
+
                 gl.disable(gl.BLEND);
                 if (!alphaDepthMask) {
                     gl.depthMask(true);
@@ -46502,29 +46503,29 @@ function transformAndOctEncodeNormals(worldNormalMatrix, normals, lenNormals, co
 function octEncodeNormals(normals) { // http://jcgt.org/published/0003/02/01/
     const lenNormals = normals.length;
     const compressedNormals = new Int8Array(lenNormals);
-    let oct, best, currentCos, bestCos;
+    let oct, dec, best, currentCos, bestCos;
     for (let i = 0; i < lenNormals; i += 3) {
         // Test various combinations of ceil and floor to minimize rounding errors
         best = oct = octEncodeNormal(normals, i, "floor", "floor");
-        octDecodeVec2(oct);
-        currentCos = bestCos = dot(normals, i);
+        dec = octDecodeVec2(oct);
+        currentCos = bestCos = dot(normals, i, dec);
         oct = octEncodeNormal(normals, i, "ceil", "floor");
-        octDecodeVec2(oct);
-        currentCos = dot(normals, i);
+        dec = octDecodeVec2(oct);
+        currentCos = dot(normals, i, dec);
         if (currentCos > bestCos) {
             best = oct;
             bestCos = currentCos;
         }
         oct = octEncodeNormal(normals, i, "floor", "ceil");
-        octDecodeVec2(oct);
-        currentCos = dot(normals, i);
+        dec = octDecodeVec2(oct);
+        currentCos = dot(normals, i, dec);
         if (currentCos > bestCos) {
             best = oct;
             bestCos = currentCos;
         }
         oct = octEncodeNormal(normals, i, "ceil", "ceil");
-        octDecodeVec2(oct);
-        currentCos = dot(normals, i);
+        dec = octDecodeVec2(oct);
+        currentCos = dot(normals, i, dec);
         if (currentCos > bestCos) {
             best = oct;
             bestCos = currentCos;
@@ -46598,8 +46599,8 @@ function octDecodeVec2(oct) { // Decode an oct-encoded normal
 /**
  * @private
  */
-function dot(p, vec3) { // Dot product of a normal in an array against a candidate decoding
-    return p[0] * vec3[0] + p[1] * vec3[1] + p[2] * vec3[2];
+function dot(array, i, vec3) {
+    return array[i] * vec3[0] + array[i + 1] * vec3[1] + array[i + 2] * vec3[2];
 }
 
 const tempMat4$2 = math.mat4();