Include RTC origin in WebGLRendererModel layer

xeokit · Mar 13, 2024 · c638f08 · c638f08
1 parent b13a701
commit c638f08
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/packages/webglrenderer/src/LayerParams.ts b/packages/webglrenderer/src/LayerParams.ts
@@ -13,5 +13,5 @@ export interface LayerParams { // Params for RendererLayer constructor
     primitive: number;
     layerIndex: number;
     textureSet?: RendererTextureSet;
-    origin?:FloatArrayParam;
+    origin:FloatArrayParam;
 }
diff --git a/packages/webglrenderer/src/WebGLRendererModel.ts b/packages/webglrenderer/src/WebGLRendererModel.ts
@@ -342,7 +342,7 @@ export class WebGLRendererModel extends Component implements RendererModel {
         if (!rendererTextureSet) {
             throw new SDKError("SceneTextureSet not found");
         }
-        const layer = this.#getLayer(textureSetId, mesh.geometry);
+        const layer = this.#getLayer(textureSetId, mesh);
         if (!layer) {
             return; // TODO
         }
@@ -381,11 +381,13 @@ export class WebGLRendererModel extends Component implements RendererModel {
         this.#numMeshes++;
     }
 
-    #getLayer(textureSetId: string, geometryCompressedParams: SceneGeometryCompressedParams): Layer | undefined {
-        const layerId = `${textureSetId}_${geometryCompressedParams.primitive}`;
+    #getLayer(textureSetId: string, mesh: SceneMesh): Layer | undefined {
+        const geometry = mesh.geometry;
+        const origin = mesh.origin;
+        const layerId = `${textureSetId}.${geometry.primitive}.${Math.round(origin[0])}.${Math.round(origin[1])}.${Math.round(origin[2])}`;
         let layer = this.#currentLayers[layerId];
         if (layer) {
-            if (layer.canCreateLayerMesh(geometryCompressedParams)) {
+            if (layer.canCreateLayerMesh(geometry)) {
                 return layer;
             } else {
                 layer.build();
@@ -400,22 +402,23 @@ export class WebGLRendererModel extends Component implements RendererModel {
                 return;
             }
         }
-        switch (geometryCompressedParams.primitive) {
+        switch (geometry.primitive) {
             case TrianglesPrimitive:
             case SolidPrimitive:
             case SurfacePrimitive:
                 layer = new TrianglesLayer(<LayerParams>{
                     gl: this.#renderContext.gl,
                     view: this.#view,
                     rendererModel: this,
-                    primitive: geometryCompressedParams.primitive,
+                    primitive: geometry.primitive,
                     textureSet,
-                    layerIndex: 0
+                    layerIndex: 0,
+                    origin
                 });
                 this.log(`Creating new TrianglesLayer`);
                 break;
             default:
-                this.error(`Primitive type not supported: ${geometryCompressedParams.primitive}`);
+                this.error(`Primitive type not supported: ${geometry.primitive}`);
                 return;
         }
         this.#layers[layerId] = layer;