endset_three_editor 0.10.10 → 0.10.12

package/dist/three-editor.es.js

@@ -5298,18 +5298,18 @@ function el(r) {
     -((r.clientY - e.top) / e.height) * 2 + 1
   ), n = new O.Raycaster();
   n.setFromCamera(t, C.camera);
-  const s = [];
-  C.scene.traverse((o) => {
-    (o.userData.isMovable || o.userData.type === "lightHelper") && s.push(o);
-  });
-  const i = n.intersectObjects(s);
-  if (i.length === 0) return null;
-  for (const o of i) {
-    const a = Pn(o.object);
-    if (a !== C.selectedObject)
-      return a;
+  const s = [], i = (a) => {
+    a.isTransformControlsRoot || ((a.userData.isMovable || a.userData.type === "lightHelper") && s.push(a), a.children.forEach(i));
+  };
+  i(C.scene);
+  const o = n.intersectObjects(s);
+  if (o.length === 0) return null;
+  for (const a of o) {
+    const l = Pn(a.object);
+    if (l !== C.selectedObject)
+      return l;
   }
-  return Pn(i[0].object);
+  return Pn(o[0].object);
 }
 function Pn(r) {
   var t;
@@ -5837,27 +5837,30 @@ async function wl(r, e = "edit", t, n, s, i, o) {
   const a = Cl(r);
   if (a) {
     const m = await new ai().parseAsync(a, ""), A = m.scene || ((l = m.scenes) == null ? void 0 : l[0]), I = (c = C.scene) == null ? void 0 : c.environment;
-    if (C.scene = A, !A.children.some((w) => w.type === "AmbientLight"))
+    if (C.scene = A, !A.children.some((f) => f.type === "AmbientLight"))
       if (i) {
-        const w = new O.AmbientLight(i.color, i.intensity);
-        w.name = i.name || "环境光", w.visible = i.visible ?? !0, i.position && w.position.fromArray(i.position), A.add(w);
+        const f = new O.AmbientLight(i.color, i.intensity);
+        f.name = i.name || "环境光", f.visible = i.visible ?? !0, i.position && f.position.fromArray(i.position), A.add(f);
       } else
         hi(A);
     if (I)
       C.scene.environment = I, C.scene.environmentIntensity = 1;
     else if (C.renderer) {
-      const w = Jt(C.renderer);
-      w && (C.scene.environment = w, C.scene.environmentIntensity = 1);
+      const f = Jt(C.renderer);
+      f && (C.scene.environment = f, C.scene.environmentIntensity = 1);
     }
     if (!C.scene.environment && C.renderer) {
-      const w = Jt(C.renderer);
-      w ? (C.scene.environment = w, C.scene.environmentIntensity = 1, console.warn("[导入] 原环境贴图不可用，已重新生成")) : console.error("[导入] 环境贴图生成失败，场景将没有 IBL 间接光照，模型会偏暗");
-    }
-    bi(A), A.traverse((w) => {
-      w.type !== "AmbientLight" && w.userData.type !== "lightHelper" && w.userData.type !== "initFloor" && (w.userData.isMovable = !0);
-      const f = w.material;
-      w.userData.isWater && f && !f.uniforms && !w.userData.waterSpeed && (w.userData.waterSpeed = { x: 5e-4, y: 5e-4 });
-    });
+      const f = Jt(C.renderer);
+      f ? (C.scene.environment = f, C.scene.environmentIntensity = 1, console.warn("[导入] 原环境贴图不可用，已重新生成")) : console.error("[导入] 环境贴图生成失败，场景将没有 IBL 间接光照，模型会偏暗");
+    }
+    bi(A);
+    const w = (f) => {
+      if (f.isTransformControlsRoot) return;
+      f.type !== "AmbientLight" && f.userData.type !== "lightHelper" && f.userData.type !== "initFloor" && (f.userData.isMovable = !0);
+      const h = f.material;
+      f.userData.isWater && h && !h.uniforms && !f.userData.waterSpeed && (f.userData.waterSpeed = { x: 5e-4, y: 5e-4 }), f.children.forEach(w);
+    };
+    w(A);
   } else {
     const m = typeof r == "string" ? JSON.parse(r) : r, I = new O.ObjectLoader().parse(m);
     if (I.type === "Scene") {