fix(C3DTilesLayer): updateStyle works with new style API

gchoqueux · Oct 11, 2024 · a4f0d22 · a4f0d22
1 parent cb96727
commit a4f0d22
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/src/Layer/C3DTilesLayer.js b/src/Layer/C3DTilesLayer.js
@@ -143,7 +143,7 @@ class C3DTilesLayer extends GeometryLayer {
         }
 
         /** @type {Style} */
-        this._style = config.style || null;
+        this.style = config.style || null;
 
         /** @type {Map<string, THREE.MeshStandardMaterial>} */
         this.#fillColorMaterialsBuffer = new Map();
@@ -386,21 +386,16 @@ class C3DTilesLayer extends GeometryLayer {
                     if (c3DTileFeature.object3d != object3d) {
                         continue;// this feature do not belong to object3d
                     }
+
+                    this._style.context.setGeometry({
+                        properties: c3DTileFeature,
+                    });
+
                     /** @type {THREE.Color} */
-                    let color = null;
-                    if (typeof this._style.fill.color === 'function') {
-                        color = new THREE.Color(this._style.fill.color(c3DTileFeature));
-                    } else {
-                        color = new THREE.Color(this._style.fill.color);
-                    }
+                    const color = new THREE.Color(this._style.fill.color);
 
                     /** @type {number} */
-                    let opacity = null;
-                    if (typeof this._style.fill.opacity === 'function') {
-                        opacity = this._style.fill.opacity(c3DTileFeature);
-                    } else {
-                        opacity = this._style.fill.opacity;
-                    }
+                    const opacity = this._style.fill.opacity;
 
                     const materialId = color.getHexString() + opacity;
 
@@ -464,7 +459,13 @@ class C3DTilesLayer extends GeometryLayer {
     }
 
     set style(value) {
-        this._style = value;
+        if (value instanceof Style) {
+            this._style = value;
+        } else if (!value) {
+            this._style = null;
+        } else {
+            this._style = new Style(value);
+        }
         this.updateStyle();
     }
 

diff --git a/src/Utils/gui/C3DTilesStyle.js b/src/Utils/gui/C3DTilesStyle.js
@@ -1,4 +1,3 @@
-import Style from 'Core/Style';
 import { C3DTILES_LAYER_EVENTS } from 'Layer/C3DTilesLayer';
 import Widget from './Widget';
 
@@ -221,12 +220,12 @@ class C3DTilesStyle extends Widget {
                 }
 
                 // set style
-                c3DTilesLayer.style = new Style({
+                c3DTilesLayer.style = {
                     fill: {
                         color: fillColorFunction,
                         opacity: fillOpacityFunction,
                     },
-                });
+                };
             });
         });