@lovelace_lol/embody 0.0.10 → 0.0.11

package/dist/three/annotations/DPthree3DMarkers.d.ts

@@ -72,6 +72,7 @@ export declare class DPthree3DMarkers {
     private zoomThreshold;
     private autoCollapseThreshold;
     private lastCameraDistance;
+    private markerLayoutDirty;
     private visibilityAnimationActive;
     private readonly visibilityAnimationScheduler;
     private visibilityAnimationStates;
@@ -247,7 +248,7 @@ export declare class DPthree3DMarkers {
     private refreshLaterality;
     /**
      * Apply zoom-based scaling to all markers, lines, and labels.
-     * Only called when crossing the zoom threshold (not every frame).
+     * Runs on zoom threshold crossings and when marker geometry changes.
      */
     private applyZoomScale;
     setVisible(visible: boolean): void;

package/dist/three.js

@@ -1206,6 +1206,7 @@ var DPthree3DMarkers = class {
     // Calculated from model size - collapse expanded regions when zoomed out
     __publicField(this, "lastCameraDistance", -1);
     // Cache to avoid unnecessary checks
+    __publicField(this, "markerLayoutDirty", false);
     __publicField(this, "visibilityAnimationActive", false);
     __publicField(this, "visibilityAnimationScheduler", new AnimationFrameTaskScheduler());
     __publicField(this, "visibilityAnimationStates", []);
@@ -1369,6 +1370,8 @@ var DPthree3DMarkers = class {
         return;
       }
       this.separateOverlappingMarkers(annotationCameraCore);
+      this.markerLayoutDirty = true;
+      this.update();
       console.log(`[3DMarkers] loadRegions complete. Created markers for:`, Array.from(this.markerMeshes.keys()));
       console.log(`[3DMarkers] lineEndpoints:`, Array.from(this.lineEndpoints.keys()));
       console.log(`[3DMarkers] resolvedStyles:`, Array.from(this.resolvedStyles.keys()));
@@ -1840,6 +1843,12 @@ var DPthree3DMarkers = class {
     this.markerTargetVisibility.set(region.name, !startHidden && !region.isFallback);
     this.markerAngleGateVisibility.delete(region.name);
     this.markerViewportVisibility.set(region.name, true);
+    this.markerLayoutDirty = true;
+    if (this.visibilityAnimationActive) {
+      this.setMarkerObjectsVisible(region.name, false, false);
+    } else {
+      this.update();
+    }
   }
   /**
    * Embody Rust owns endpoint layout; the Three adapter applies the returned positions
@@ -2455,7 +2464,7 @@ var DPthree3DMarkers = class {
     const dy = this.camera.position.y - this.modelCenter.y;
     const dz = this.camera.position.z - this.modelCenter.z;
     const cameraDistance = Math.sqrt(dx * dx + dy * dy + dz * dz);
-    const distanceChanged = this.lastCameraDistance < 0 || Math.abs(cameraDistance - this.lastCameraDistance) > this.lastCameraDistance * 0.02;
+    const distanceChanged = this.markerLayoutDirty || this.lastCameraDistance < 0 || Math.abs(cameraDistance - this.lastCameraDistance) > this.lastCameraDistance * 0.02;
     if (distanceChanged) {
       const previousDistance = this.lastCameraDistance;
       this.lastCameraDistance = cameraDistance;
@@ -2466,22 +2475,27 @@ var DPthree3DMarkers = class {
         sphere.scale.setScalar(clampedScale);
       }
       const shouldBeZoomedIn = cameraDistance < this.zoomThreshold;
-      if (shouldBeZoomedIn !== this.isZoomedIn) {
+      const zoomChanged = shouldBeZoomedIn !== this.isZoomedIn;
+      if (this.markerLayoutDirty || zoomChanged) {
         this.isZoomedIn = shouldBeZoomedIn;
-        this.applyZoomScale(shouldBeZoomedIn ? ZOOMED_IN_LINE_SCALE : 1);
+        this.applyZoomScale(
+          shouldBeZoomedIn ? ZOOMED_IN_LINE_SCALE : 1,
+          zoomChanged || shouldBeZoomedIn
+        );
       }
       const crossedAutoCollapseThreshold = previousDistance >= 0 && previousDistance <= this.autoCollapseThreshold && cameraDistance > this.autoCollapseThreshold;
       if (crossedAutoCollapseThreshold) {
         this.collapseAllRegions();
       }
     }
-    const cameraMoved = !this.hasCameraAngleUpdateSnapshot || this.lastCameraAngleUpdatePosition.distanceToSquared(this.camera.position) > 1e-4 || 1 - Math.abs(this.lastCameraAngleUpdateQuaternion.dot(this.camera.quaternion)) > 1e-5;
+    const cameraMoved = this.markerLayoutDirty || !this.hasCameraAngleUpdateSnapshot || this.lastCameraAngleUpdatePosition.distanceToSquared(this.camera.position) > 1e-4 || 1 - Math.abs(this.lastCameraAngleUpdateQuaternion.dot(this.camera.quaternion)) > 1e-5;
     if (!cameraMoved) {
       return;
     }
     this.lastCameraAngleUpdatePosition.copy(this.camera.position);
     this.lastCameraAngleUpdateQuaternion.copy(this.camera.quaternion);
     this.hasCameraAngleUpdateSnapshot = true;
+    this.markerLayoutDirty = false;
     const cameraAngle = getModelLocalOrbitAngle(this.model, this.modelCenter, this.camera.position);
     for (const [name, sphere] of this.markerMeshes) {
       const markerAngle = sphere.userData.cameraAngle;
@@ -2519,14 +2533,16 @@ var DPthree3DMarkers = class {
   }
   /**
    * Apply zoom-based scaling to all markers, lines, and labels.
-   * Only called when crossing the zoom threshold (not every frame).
+   * Runs on zoom threshold crossings and when marker geometry changes.
    */
-  applyZoomScale(scaleFactor) {
+  applyZoomScale(scaleFactor, scaleSpheres = true) {
     const isZoomed = scaleFactor < 1;
     const sphereScaleFactor = isZoomed ? ZOOMED_IN_SPHERE_SCALE : 1;
     const labelScaleFactor = isZoomed ? ZOOMED_IN_LABEL_SCALE : 1;
-    for (const sphere of this.markerMeshes.values()) {
-      sphere.scale.setScalar(sphereScaleFactor);
+    if (scaleSpheres) {
+      for (const sphere of this.markerMeshes.values()) {
+        sphere.scale.setScalar(sphereScaleFactor);
+      }
     }
     for (const line of this.lineMeshes.values()) {
       const material = line.material;
@@ -2630,6 +2646,10 @@ var DPthree3DMarkers = class {
         object.visible = true;
         this.setObjectOpacity(object, opacity * itemOpacityFactor);
       }
+      const name = state.label?.object.userData.annotation;
+      if (typeof name === "string" && !this.updateMarkerLineLayout(name)) {
+        this.setMarkerObjectsVisible(name, false, false);
+      }
     }
   }
   restoreVisibilityAnimationStates(states) {
@@ -2815,6 +2835,8 @@ var DPthree3DMarkers = class {
     this.stopVisibilityAnimation(true);
     if (visible) {
       this.markerGroup.visible = true;
+      this.markerLayoutDirty = true;
+      this.update();
     }
     this.visibilityAnimationStates = this.captureVisibilityAnimationStates();
     if (this.visibilityAnimationStates.length === 0) {
@@ -2877,6 +2899,7 @@ var DPthree3DMarkers = class {
     this.markerAngleGateVisibility.clear();
     this.markerViewportVisibility.clear();
     this.soloedMarker = null;
+    this.markerLayoutDirty = false;
     this.hasCameraAngleUpdateSnapshot = false;
   }
   // ============ SOLO MODE ============