Merge pull request #1579 from Kurtil/fix/markerPosition

[FIX] marker occlusion
xeokit · Jul 17, 2024 · 19529a6 · 19529a6
2 parents 08fe285 + ad86022
commit 19529a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/viewer/scene/webgl/occlusion/OcclusionLayer.js b/src/viewer/scene/webgl/occlusion/OcclusionLayer.js
@@ -99,7 +99,7 @@ class OcclusionLayer {
         for (let i = 0; i < this.numMarkers; i++) {
             if (this.markerList[i]) {
                 const marker = this.markerList[i];
-                const worldPos = marker.worldPos;
+                const worldPos = marker.rtcPos;
                 this.positions[j++] = worldPos[0];
                 this.positions[j++] = worldPos[1];
                 this.positions[j++] = worldPos[2];

diff --git a/src/viewer/scene/webgl/occlusion/OcclusionTester.js b/src/viewer/scene/webgl/occlusion/OcclusionTester.js
@@ -332,10 +332,7 @@ class OcclusionTester {
                 continue;
             }
 
-            // The `origin` has been changed from `occlusionLayer.origin` to `[ 0, 0, 0 ]`
-            // because OcclusionLayer markers' transformation is being applied through the
-            // OcclusionLayer::positions array. See XEOK-33
-            const origin = [ 0, 0, 0 ];
+            const origin = occlusionLayer.origin;
 
             gl.uniformMatrix4fv(this._uViewMatrix, false, createRTCViewMat(camera.viewMatrix, origin));