@kupcad/ui 0.1.7 → 0.1.8

package/src/viewer/viewer.js

@@ -43,6 +43,7 @@ import { disposeObject } from './dispose.js';
 import { axesOf, environmentOf } from './environment.js';
 import { faceAt } from './faces.js';
 import { HoverMark } from './hover-mark.js';
+import { intersectMeshes } from './hits.js';
 import { disposeScene, isDracoCompressed, sceneOf } from './model.js';
 import { CameraMove, MOTION_MS, sameDirection, unit } from './motion.js';
 import { RENDER_ORDER, SectionView } from './section.js';
@@ -124,7 +125,8 @@ export class Viewer extends EventTarget {
   #sectionView;
   #raycaster = new Raycaster();
   /** The selected part's edges, in the selection's colour. */
-  #selectionEdges = new LineBasicMaterial();
+  // See-through to three.js, as a drawing's outlines are, so a selected one keeps its order
+  #selectionEdges = new LineBasicMaterial({ transparent: true });
   /** What the pointer is over, marked. */
   #hoverMark = new HoverMark(LIGHT.selection);
   /** @type {SceneModel | null} */
@@ -305,7 +307,10 @@ export class Viewer extends EventTarget {
     }
     this.#model = built;
     if (built) {
-      for (const shape of built.shapes) shape.mesh.renderOrder = RENDER_ORDER.model;
+      // A drawing's shapes keep their own order (model.js); a section cuts solids alone
+      if (built.kind === '3d') {
+        for (const shape of built.shapes) shape.mesh.renderOrder = RENDER_ORDER.model;
+      }
       this.#content.add(built.root);
     }
     const dropped =
@@ -866,16 +871,15 @@ export class Viewer extends EventTarget {
     this.#camera.updateMatrixWorld();
     const pointer = new Vector2((x / this.#width) * 2 - 1, 1 - (y / this.#height) * 2);
     this.#raycaster.setFromCamera(pointer, this.#camera);
+    const solid = this.#model.shapes.filter((shape) => !shape.ghost);
     /** @type {Map<import('three').Object3D, Shape>} */
-    const solid = new Map();
-    for (const shape of this.#model.shapes) {
-      if (!shape.ghost) solid.set(shape.mesh, shape);
-    }
-    for (const hit of this.#raycaster.intersectObjects([...solid.keys()], false)) {
+    const shapeOf = new Map(solid.map((shape) => [shape.mesh, shape]));
+    const meshes = solid.map((shape) => shape.mesh);
+    for (const hit of intersectMeshes(this.#raycaster, meshes)) {
       if (this.#sectionView.clipping && this.#sectionView.plane.distanceToPoint(hit.point) < 0) {
         continue;
       }
-      const shape = /** @type {Shape} */ (solid.get(hit.object));
+      const shape = /** @type {Shape} */ (shapeOf.get(hit.object));
       return { shape, triangle: hit.faceIndex ?? null };
     }
     return null;