react-three-game 0.0.65 → 0.0.66

package/dist/tools/prefabeditor/InstanceProvider.js

@@ -129,9 +129,23 @@ function emitCollisionExit(sourceId, payload) {
         targetRigidBody: payload.other.rigidBody,
     });
 }
+function emitClick(sourceId, instanceId, event) {
+    gameEvents.emit('click', {
+        sourceEntityId: sourceId,
+        instanceEntityId: instanceId && instanceId !== sourceId ? instanceId : undefined,
+        point: [event.point.x, event.point.y, event.point.z],
+        button: event.button,
+        altKey: event.nativeEvent.altKey,
+        ctrlKey: event.nativeEvent.ctrlKey,
+        metaKey: event.nativeEvent.metaKey,
+        shiftKey: event.nativeEvent.shiftKey,
+    });
+}
 function instanceEquals(a, b) {
     return a.id === b.id &&
         a.sourceId === b.sourceId &&
+        a.clickable === b.clickable &&
+        a.locked === b.locked &&
         a.meshPath === b.meshPath &&
         arrayEquals(a.position, b.position) &&
         arrayEquals(a.rotation, b.rotation) &&
@@ -308,22 +322,30 @@ function InstancedRigidGroup({ group, modelKey, partCount, flatMeshes, onSelect,
     }, [group.instances]);
     // Handle click on instanced mesh in edit mode
     const handleClick = (e) => {
-        if (!editMode || !onSelect)
-            return;
-        e.stopPropagation();
-        // Get the instance index from the intersection
         const instanceId = e.instanceId;
-        if (instanceId !== undefined && group.instances[instanceId]) {
-            onSelect(group.instances[instanceId].sourceId);
+        const instance = instanceId !== undefined ? group.instances[instanceId] : undefined;
+        if (!instance)
+            return;
+        if (editMode) {
+            if (!onSelect || instance.locked)
+                return;
+            e.stopPropagation();
+            onSelect(instance.sourceId);
+            return;
         }
+        if (!instance.clickable)
+            return;
+        e.stopPropagation();
+        emitClick(instance.sourceId, instance.id, e);
     };
+    const shouldHandleClick = editMode || group.instances.some(inst => inst.clickable);
     // Add key to force remount when instance count changes significantly (helps with cleanup)
     const rigidBodyKey = `rb_${modelKey}_${group.instances.map(inst => `${inst.id}:${getPhysicsSignature(inst.physics)}`).join('|')}`;
     return (_jsx(InstancedRigidBodies, { ref: rigidBodiesRef, instances: instances, children: Array.from({ length: partCount }).map((_, i) => {
             const mesh = flatMeshes[`${modelKey}__${i}`];
             if (!mesh)
                 return null;
-            return (_jsx("instancedMesh", { ref: el => { meshRefs.current[i] = el; }, args: [mesh.geometry, mesh.material, group.instances.length], castShadow: true, receiveShadow: true, frustumCulled: false, onClick: editMode ? handleClick : undefined }, i));
+            return (_jsx("instancedMesh", { ref: el => { meshRefs.current[i] = el; }, args: [mesh.geometry, mesh.material, group.instances.length], castShadow: true, receiveShadow: true, frustumCulled: false, onClick: shouldHandleClick ? handleClick : undefined }, i));
         }) }, rigidBodyKey));
 }
 // Render non-physics instances using Merged (instancing without rigid bodies)
@@ -336,7 +358,10 @@ function NonPhysicsInstancedGroup({ modelKey, group, partCount, instancesMap, on
 function InstanceGroupItem({ instance, InstanceComponents, onSelect, registerRef, selectedId, editMode }) {
     const clickValid = useRef(false);
     const groupRef = useRef(null);
+    const isLocked = Boolean(instance.locked);
     const isSelected = selectedId === instance.id || selectedId === instance.sourceId;
+    const canSelect = editMode && !isLocked;
+    const canClick = !editMode && Boolean(instance.clickable);
     // Use BoxHelper when object is selected in edit mode
     useHelper(editMode && isSelected ? groupRef : null, BoxHelper, 'cyan');
     useEffect(() => {
@@ -345,13 +370,18 @@ function InstanceGroupItem({ instance, InstanceComponents, onSelect, registerRef
         registerRef === null || registerRef === void 0 ? void 0 : registerRef(instance.id, groupRef.current);
         return () => registerRef === null || registerRef === void 0 ? void 0 : registerRef(instance.id, null);
     }, [editMode, instance.id, registerRef]);
-    return (_jsx("group", { ref: groupRef, position: instance.position, rotation: instance.rotation, scale: instance.scale, onPointerDown: (e) => { e.stopPropagation(); clickValid.current = true; }, onPointerMove: () => { clickValid.current = false; }, onPointerUp: (e) => {
+    return (_jsx("group", { ref: groupRef, position: instance.position, rotation: instance.rotation, scale: instance.scale, onPointerDown: canSelect || canClick ? (e) => { e.stopPropagation(); clickValid.current = true; } : undefined, onPointerMove: canSelect || canClick ? () => { clickValid.current = false; } : undefined, onPointerUp: canSelect || canClick ? (e) => {
             if (clickValid.current) {
                 e.stopPropagation();
-                onSelect === null || onSelect === void 0 ? void 0 : onSelect(instance.sourceId);
+                if (editMode) {
+                    onSelect === null || onSelect === void 0 ? void 0 : onSelect(instance.sourceId);
+                }
+                else if (instance.clickable) {
+                    emitClick(instance.sourceId, instance.id, e);
+                }
             }
             clickValid.current = false;
-        }, children: InstanceComponents.map((Instance, i) => _jsx(Instance, {}, i)) }));
+        } : undefined, children: InstanceComponents.map((Instance, i) => _jsx(Instance, {}, i)) }));
 }
 // Hook to check if an instance exists
 export function useInstanceCheck(id) {
@@ -360,19 +390,21 @@ export function useInstanceCheck(id) {
     return (_a = ctx === null || ctx === void 0 ? void 0 : ctx.hasInstance(id)) !== null && _a !== void 0 ? _a : false;
 }
 // GameInstance component: registers an instance for batch rendering (renders nothing itself)
-export const GameInstance = React.forwardRef(({ id, sourceId, modelUrl, position, rotation, scale, physics = undefined, }, ref) => {
+export const GameInstance = React.forwardRef(({ id, sourceId, clickable = false, modelUrl, locked = false, position, rotation, scale, physics = undefined, }, ref) => {
     const ctx = useContext(GameInstanceContext);
     const addInstance = ctx === null || ctx === void 0 ? void 0 : ctx.addInstance;
     const removeInstance = ctx === null || ctx === void 0 ? void 0 : ctx.removeInstance;
     const instance = useMemo(() => ({
         id,
         sourceId: sourceId !== null && sourceId !== void 0 ? sourceId : id,
+        clickable,
+        locked,
         meshPath: modelUrl,
         position,
         rotation,
         scale,
         physics,
-    }), [id, sourceId, modelUrl, JSON.stringify(position), JSON.stringify(rotation), JSON.stringify(scale), getPhysicsSignature(physics)]);
+    }), [id, sourceId, clickable, locked, modelUrl, JSON.stringify(position), JSON.stringify(rotation), JSON.stringify(scale), getPhysicsSignature(physics)]);
     useEffect(() => {
         if (!addInstance || !removeInstance)
             return;

package/dist/tools/prefabeditor/PrefabEditor.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { MapControls, TransformControls } from "@react-three/drei";
 import GameCanvas from "../../shared/GameCanvas";
 import { useState, useRef, useEffect, forwardRef, useImperativeHandle } from "react";
 import PrefabRoot from "./PrefabRoot";
@@ -15,7 +16,7 @@ import { Physics } from "@react-three/rapier";
 import EditorUI from "./EditorUI";
 import { base, toolbar } from "./styles";
 import { EditorContext } from "./EditorContext";
-import { createImageNode, createModelNode, exportGLB as exportSceneGLB, exportGLBData, insertNode } from "./utils";
+import { computeParentWorldMatrix, createImageNode, createModelNode, decompose, exportGLB as exportSceneGLB, exportGLBData, findNode, focusCameraOnObject, insertNode, updateNode } from "./utils";
 import { loadFiles } from "../dragdrop";
 const DEFAULT_PREFAB = {
     id: "prefab-default",
@@ -40,29 +41,57 @@ const PrefabEditor = forwardRef(({ basePath, initialPrefab, physics = true, onPr
     const [rotationSnap, setRotationSnap] = useState(Math.PI / 4);
     const [history, setHistory] = useState([loadedPrefab]);
     const [historyIndex, setHistoryIndex] = useState(0);
+    const [selectedObject, setSelectedObject] = useState(null);
     const throttleRef = useRef(null);
     const lastDataRef = useRef(JSON.stringify(loadedPrefab));
     const prefabRootRef = useRef(null);
     const canvasRef = useRef(null);
+    const controlsRef = useRef(null);
     const onPrefabChangeRef = useRef(onPrefabChange);
     const pendingPrefabChangeRef = useRef(null);
     const [injectedModels, setInjectedModels] = useState({});
     const [injectedTextures, setInjectedTextures] = useState({});
-    useEffect(() => {
-        onPrefabChangeRef.current = onPrefabChange;
-    }, [onPrefabChange]);
+    onPrefabChangeRef.current = onPrefabChange;
+    const setSelection = (nodeId) => {
+        var _a, _b;
+        const nextNode = nodeId ? findNode(loadedPrefab.root, nodeId) : null;
+        if (nextNode === null || nextNode === void 0 ? void 0 : nextNode.locked) {
+            return;
+        }
+        setSelectedId(nodeId);
+        setSelectedObject(nodeId ? (_b = (_a = prefabRootRef.current) === null || _a === void 0 ? void 0 : _a.getObject(nodeId)) !== null && _b !== void 0 ? _b : null : null);
+    };
+    const toggleEditMode = () => {
+        setEditMode(prev => {
+            const next = !prev;
+            if (!next) {
+                setSelectedId(null);
+                setSelectedObject(null);
+            }
+            return next;
+        });
+    };
+    const setSelectedIdState = (value) => {
+        setSelection(typeof value === 'function' ? value(selectedId) : value);
+    };
     const replacePrefab = (prefab, options) => {
         if (throttleRef.current)
             clearTimeout(throttleRef.current);
         lastDataRef.current = JSON.stringify(prefab);
         pendingPrefabChangeRef.current = (options === null || options === void 0 ? void 0 : options.notifyChange) === false ? null : prefab;
-        setSelectedId(null);
+        setSelection(null);
         setInjectedModels({});
         setInjectedTextures({});
         setHistory([prefab]);
         setHistoryIndex(0);
         setLoadedPrefab(prefab);
     };
+    const setPrefab = (prefab) => {
+        if (selectedId && !findNode(prefab.root, selectedId)) {
+            setSelection(null);
+        }
+        updatePrefab(prefab);
+    };
     useEffect(() => {
         if (initialPrefab)
             replacePrefab(initialPrefab, { notifyChange: false });
@@ -90,7 +119,7 @@ const PrefabEditor = forwardRef(({ basePath, initialPrefab, physics = true, onPr
             return Object.assign(Object.assign({}, prev), { root: insertNode(prev.root, node, options === null || options === void 0 ? void 0 : options.parentId) });
         });
         if ((options === null || options === void 0 ? void 0 : options.select) !== false) {
-            setSelectedId(node.id);
+            setSelection(node.id);
         }
         return node;
     };
@@ -115,6 +144,8 @@ const PrefabEditor = forwardRef(({ basePath, initialPrefab, physics = true, onPr
     const undo = () => historyIndex > 0 && applyHistory(historyIndex - 1);
     const redo = () => historyIndex < history.length - 1 && applyHistory(historyIndex + 1);
     useEffect(() => {
+        if (!editMode)
+            return;
         const handleKeyDown = (e) => {
             if (!(e.ctrlKey || e.metaKey))
                 return;
@@ -129,7 +160,7 @@ const PrefabEditor = forwardRef(({ basePath, initialPrefab, physics = true, onPr
         };
         window.addEventListener('keydown', handleKeyDown);
         return () => window.removeEventListener('keydown', handleKeyDown);
-    }, [historyIndex, history]);
+    }, [editMode, historyIndex, history]);
     useEffect(() => {
         const currentStr = JSON.stringify(loadedPrefab);
         if (currentStr === lastDataRef.current)
@@ -165,7 +196,7 @@ const PrefabEditor = forwardRef(({ basePath, initialPrefab, physics = true, onPr
     const clearSelection = () => __awaiter(void 0, void 0, void 0, function* () {
         if (!selectedId)
             return;
-        setSelectedId(null);
+        setSelection(null);
         yield new Promise(resolve => {
             requestAnimationFrame(() => {
                 requestAnimationFrame(() => resolve());
@@ -190,11 +221,31 @@ const PrefabEditor = forwardRef(({ basePath, initialPrefab, physics = true, onPr
     });
     const handleFocusNode = (nodeId) => {
         var _a;
-        (_a = prefabRootRef.current) === null || _a === void 0 ? void 0 : _a.focusNode(nodeId);
+        const object = (_a = prefabRootRef.current) === null || _a === void 0 ? void 0 : _a.getObject(nodeId);
+        const controls = controlsRef.current;
+        const camera = controls === null || controls === void 0 ? void 0 : controls.object;
+        if (!object || !controls || !camera)
+            return;
+        focusCameraOnObject(object, camera, controls.target, () => { var _a; return (_a = controls.update) === null || _a === void 0 ? void 0 : _a.call(controls); });
+    };
+    const handleTransformChange = () => {
+        var _a;
+        if (!selectedId)
+            return;
+        const object = (_a = prefabRootRef.current) === null || _a === void 0 ? void 0 : _a.getObject(selectedId);
+        if (!object)
+            return;
+        const parentWorld = computeParentWorldMatrix(loadedPrefab.root, selectedId);
+        const local = parentWorld.clone().invert().multiply(object.matrixWorld);
+        const { position, rotation, scale } = decompose(local);
+        updatePrefab(prev => (Object.assign(Object.assign({}, prev), { root: updateNode(prev.root, selectedId, node => (Object.assign(Object.assign({}, node), { components: Object.assign(Object.assign({}, node.components), { transform: {
+                        type: "Transform",
+                        properties: { position, rotation, scale },
+                    } }) }))) })));
     };
     // --- Drag & drop files to add nodes ---
     useEffect(() => {
-        if (!enableWindowDrop)
+        if (!enableWindowDrop || !editMode)
             return;
         function handleDragOver(e) {
             e.preventDefault();
@@ -227,21 +278,22 @@ const PrefabEditor = forwardRef(({ basePath, initialPrefab, physics = true, onPr
             window.removeEventListener('dragover', handleDragOver);
             window.removeEventListener('drop', handleDrop);
         };
-    }, [enableWindowDrop]);
+    }, [editMode, enableWindowDrop]);
     useImperativeHandle(ref, () => ({
         screenshot: handleScreenshot,
         exportGLB: handleExportGLB,
         exportGLBData: handleExportGLBData,
         clearSelection,
         prefab: loadedPrefab,
-        setPrefab: replacePrefab,
+        setPrefab,
         replacePrefab,
         addModel,
         addTexture,
         rootRef: prefabRootRef
-    }), [loadedPrefab]);
-    const content = (_jsxs(_Fragment, { children: [_jsx("ambientLight", { intensity: 1.5 }), _jsx("gridHelper", { args: [10, 10], position: [0, -1, 0] }), _jsx(PrefabRoot, { ref: prefabRootRef, data: loadedPrefab, editMode: editMode, onPrefabChange: updatePrefab, selectedId: selectedId, onSelect: setSelectedId, basePath: basePath, injectedModels: injectedModels, injectedTextures: injectedTextures }), children] }));
+    }));
+    const content = (_jsxs(_Fragment, { children: [_jsx("ambientLight", { intensity: 1.5 }), _jsx("gridHelper", { args: [10, 10], position: [0, -1, 0] }), _jsx(PrefabRoot, { ref: prefabRootRef, data: loadedPrefab, editMode: editMode, selectedId: selectedId, onSelect: setSelection, onSelectedObjectChange: editMode ? setSelectedObject : undefined, onFocusNode: editMode ? handleFocusNode : undefined, basePath: basePath, injectedModels: injectedModels, injectedTextures: injectedTextures }), children] }));
     return _jsxs(EditorContext.Provider, { value: {
+            editMode,
             transformMode,
             setTransformMode,
             snapResolution,
@@ -250,10 +302,19 @@ const PrefabEditor = forwardRef(({ basePath, initialPrefab, physics = true, onPr
             setPositionSnap,
             rotationSnap,
             setRotationSnap,
-            onFocusNode: handleFocusNode,
+            onFocusNode: editMode ? handleFocusNode : undefined,
             onScreenshot: handleScreenshot,
             onExportGLB: handleExportGLB
-        }, children: [_jsx(GameCanvas, Object.assign({ camera: { position: [0, 5, 15] }, canvasRef: canvasRef }, canvasProps, { children: physics ? (_jsx(Physics, { debug: editMode, paused: editMode, children: content })) : content })), showUI && (_jsxs(_Fragment, { children: [_jsxs("div", { style: toolbar.panel, children: [_jsx("button", { style: base.btn, onClick: () => setEditMode(!editMode), children: editMode ? "▶" : "⏸" }), uiPlugins] }), _jsx(EditorUI, { prefabData: loadedPrefab, setPrefabData: updatePrefab, selectedId: selectedId, setSelectedId: setSelectedId, basePath: basePath, onUndo: undo, onRedo: redo, canUndo: historyIndex > 0, canRedo: historyIndex < history.length - 1 })] }))] });
+        }, children: [_jsxs(GameCanvas, Object.assign({ camera: { position: [0, 5, 15] }, canvasRef: canvasRef }, canvasProps, { onPointerMissed: editMode
+                    ? (event) => {
+                        var _a, _b, _c, _d;
+                        const button = (_c = (_a = event.button) !== null && _a !== void 0 ? _a : (_b = event.sourceEvent) === null || _b === void 0 ? void 0 : _b.button) !== null && _c !== void 0 ? _c : 0;
+                        if (button === 0 && selectedId) {
+                            setSelection(null);
+                        }
+                        (_d = canvasProps === null || canvasProps === void 0 ? void 0 : canvasProps.onPointerMissed) === null || _d === void 0 ? void 0 : _d.call(canvasProps, event);
+                    }
+                    : canvasProps === null || canvasProps === void 0 ? void 0 : canvasProps.onPointerMissed, children: [physics ? (_jsx(Physics, { debug: editMode, paused: editMode, children: content })) : content, editMode && (_jsxs(_Fragment, { children: [_jsx(MapControls, { ref: controlsRef, makeDefault: true }), selectedObject && (_jsx(TransformControls, { object: selectedObject, mode: transformMode, space: "local", onObjectChange: handleTransformChange, translationSnap: positionSnap > 0 ? positionSnap : undefined, rotationSnap: rotationSnap > 0 ? rotationSnap : undefined, scaleSnap: snapResolution > 0 ? snapResolution : undefined }, `transform-${transformMode}-${positionSnap}-${rotationSnap}-${snapResolution}`))] }))] })), showUI && (_jsxs(_Fragment, { children: [_jsxs("div", { style: toolbar.panel, children: [_jsx("button", { style: base.btn, onClick: toggleEditMode, children: editMode ? "▶" : "⏸" }), uiPlugins] }), editMode && (_jsx(EditorUI, { prefabData: loadedPrefab, setPrefabData: updatePrefab, selectedId: selectedId, setSelectedId: setSelectedIdState, basePath: basePath, onUndo: undo, onRedo: redo, canUndo: historyIndex > 0, canRedo: historyIndex < history.length - 1 }))] }))] });
 });
 PrefabEditor.displayName = "PrefabEditor";
 export default PrefabEditor;

package/dist/tools/prefabeditor/PrefabRoot.d.ts

@@ -4,15 +4,17 @@ import { Prefab, GameObject as GameObjectType } from "./types";
 export interface PrefabRootRef {
     root: Group | null;
     rigidBodyRefs: Map<string, any>;
+    getObject: (nodeId: string) => Object3D | null;
     focusNode: (nodeId: string) => void;
 }
 export declare const PrefabRoot: import("react").ForwardRefExoticComponent<{
     editMode?: boolean;
     data: Prefab;
-    onPrefabChange?: (data: Prefab) => void;
     selectedId?: string | null;
     onSelect?: (id: string | null) => void;
     onClick?: (event: ThreeEvent<PointerEvent>, entity: GameObjectType) => void;
+    onSelectedObjectChange?: (object: Object3D | null) => void;
+    onFocusNode?: (nodeId: string) => void;
     basePath?: string;
     injectedModels?: Record<string, Object3D>;
     injectedTextures?: Record<string, Texture>;

package/dist/tools/prefabeditor/PrefabRoot.js

@@ -8,25 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { MapControls, TransformControls, useHelper } from "@react-three/drei";
-import { forwardRef, useCallback, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react";
-import { BoxHelper, Euler, Matrix4, Quaternion, SRGBColorSpace, TextureLoader, Vector3, } from "three";
-import { getComponent, registerComponent, getNonComposableKeys } from "./components/ComponentRegistry";
+import { useHelper } from "@react-three/drei";
+import { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react";
+import { BoxHelper, Euler, Matrix4, Quaternion, Vector3, } from "three";
+import { getComponent, registerComponent } from "./components/ComponentRegistry";
 import components from "./components";
-import { loadModel } from "../dragdrop";
+import { loadModel, loadTexture } from "../dragdrop";
 import { GameInstance, GameInstanceProvider, getRepeatAxesFromModelProperties, useInstanceCheck } from "./InstanceProvider";
-import { focusCameraOnObject, updateNode } from "./utils";
-import { EditorContext } from "./EditorContext";
+import { decompose } from "./utils";
 components.forEach(registerComponent);
 const IDENTITY = new Matrix4();
-export const PrefabRoot = forwardRef(({ editMode, data, onPrefabChange, selectedId, onSelect, onClick, basePath = "", injectedModels = {}, injectedTextures = {} }, ref) => {
-    var _a, _b, _c, _d;
-    // optional editor context
-    const editorContext = useContext(EditorContext);
-    const transformMode = (_a = editorContext === null || editorContext === void 0 ? void 0 : editorContext.transformMode) !== null && _a !== void 0 ? _a : "translate";
-    const snapResolution = (_b = editorContext === null || editorContext === void 0 ? void 0 : editorContext.snapResolution) !== null && _b !== void 0 ? _b : 0;
-    const positionSnap = (_c = editorContext === null || editorContext === void 0 ? void 0 : editorContext.positionSnap) !== null && _c !== void 0 ? _c : 0.5;
-    const rotationSnap = (_d = editorContext === null || editorContext === void 0 ? void 0 : editorContext.rotationSnap) !== null && _d !== void 0 ? _d : Math.PI / 4;
+export const PrefabRoot = forwardRef(({ editMode, data, selectedId, onSelect, onClick, onSelectedObjectChange, onFocusNode, basePath = "", injectedModels = {}, injectedTextures = {} }, ref) => {
     // prefab root state
     const [models, setModels] = useState({});
     const [textures, setTextures] = useState({});
@@ -34,28 +26,21 @@ export const PrefabRoot = forwardRef(({ editMode, data, onPrefabChange, selected
     const failedTextures = useRef(new Set());
     const objectRefs = useRef({});
     const rigidBodyRefs = useRef(new Map());
-    const [selectedObject, setSelectedObject] = useState(null);
     const rootRef = useRef(null);
-    const controlsRef = useRef(null);
     const availableModels = useMemo(() => (Object.assign(Object.assign({}, models), injectedModels)), [models, injectedModels]);
     const availableTextures = useMemo(() => (Object.assign(Object.assign({}, textures), injectedTextures)), [textures, injectedTextures]);
     useImperativeHandle(ref, () => ({
         root: rootRef.current,
         rigidBodyRefs: rigidBodyRefs.current,
-        focusNode: (nodeId) => {
-            const object = objectRefs.current[nodeId];
-            const controls = controlsRef.current;
-            const camera = controls === null || controls === void 0 ? void 0 : controls.object;
-            if (!object || !controls || !camera)
-                return;
-            focusCameraOnObject(object, camera, controls.target, () => { var _a; return (_a = controls.update) === null || _a === void 0 ? void 0 : _a.call(controls); });
-        }
-    }), []);
+        getObject: (nodeId) => { var _a; return (_a = objectRefs.current[nodeId]) !== null && _a !== void 0 ? _a : null; },
+        focusNode: (nodeId) => onFocusNode === null || onFocusNode === void 0 ? void 0 : onFocusNode(nodeId),
+    }), [onFocusNode]);
     const registerRef = useCallback((id, obj) => {
         objectRefs.current[id] = obj;
-        if (id === selectedId)
-            setSelectedObject(obj);
-    }, [selectedId]);
+        if (id === selectedId) {
+            onSelectedObjectChange === null || onSelectedObjectChange === void 0 ? void 0 : onSelectedObjectChange(obj);
+        }
+    }, [onSelectedObjectChange, selectedId]);
     const registerRigidBodyRef = useCallback((id, rb) => {
         rigidBodyRefs.current.set(id, rb);
     }, []);
@@ -68,25 +53,6 @@ export const PrefabRoot = forwardRef(({ editMode, data, onPrefabChange, selected
         };
         return () => { console.error = originalError; };
     }, []);
-    useEffect(() => {
-        var _a;
-        setSelectedObject(selectedId ? (_a = objectRefs.current[selectedId]) !== null && _a !== void 0 ? _a : null : null);
-    }, [selectedId]);
-    const onTransformChange = () => {
-        if (!selectedId || !onPrefabChange)
-            return;
-        const obj = objectRefs.current[selectedId];
-        if (!obj)
-            return;
-        const parentWorld = computeParentWorldMatrix(data.root, selectedId);
-        const local = parentWorld.clone().invert().multiply(obj.matrixWorld);
-        const { position, rotation, scale } = decompose(local);
-        const root = updateNode(data.root, selectedId, node => (Object.assign(Object.assign({}, node), { components: Object.assign(Object.assign({}, node.components), { transform: {
-                    type: "Transform",
-                    properties: { position, rotation, scale },
-                } }) })));
-        onPrefabChange(Object.assign(Object.assign({}, data), { root }));
-    };
     useEffect(() => {
         const modelsToLoad = new Set();
         const texturesToLoad = new Set();
@@ -112,7 +78,6 @@ export const PrefabRoot = forwardRef(({ editMode, data, onPrefabChange, selected
                 setModels(m => (Object.assign(Object.assign({}, m), { [file]: model })));
             }
         }));
-        const loader = new TextureLoader();
         texturesToLoad.forEach(file => {
             if (availableTextures[file] || loading.current.has(file) || failedTextures.current.has(file))
                 return;
@@ -123,17 +88,18 @@ export const PrefabRoot = forwardRef(({ editMode, data, onPrefabChange, selected
                 : file.startsWith("/")
                     ? `${basePath}${file}`
                     : `${basePath}/${file}`;
-            loader.load(path, tex => {
-                tex.colorSpace = SRGBColorSpace;
-                setTextures(t => (Object.assign(Object.assign({}, t), { [file]: tex })));
-            }, undefined, (err) => {
-                console.warn(`Failed to load texture: ${path}`, err);
+            void loadTexture(path).then(result => {
+                if (result.success && result.texture) {
+                    setTextures(t => (Object.assign(Object.assign({}, t), { [file]: result.texture })));
+                    return;
+                }
+                console.warn(`Failed to load texture: ${path}`, result.error);
                 loading.current.delete(file);
                 failedTextures.current.add(file);
             });
         });
     }, [data, availableModels, availableTextures, basePath]);
-    return (_jsxs("group", { ref: rootRef, children: [_jsx(GameInstanceProvider, { models: availableModels, selectedId: selectedId, editMode: editMode, onSelect: editMode ? onSelect : undefined, registerRef: registerRef, children: _jsx(GameObjectRenderer, { gameObject: data.root, selectedId: selectedId, onSelect: editMode ? onSelect : undefined, onClick: onClick, registerRef: registerRef, registerRigidBodyRef: registerRigidBodyRef, loadedModels: availableModels, loadedTextures: availableTextures, editMode: editMode, parentMatrix: IDENTITY }) }), editMode && (_jsxs(_Fragment, { children: [_jsx(MapControls, { ref: controlsRef, makeDefault: true }), selectedObject && (_jsx(TransformControls, { object: selectedObject, mode: transformMode, space: "local", onObjectChange: onTransformChange, translationSnap: positionSnap > 0 ? positionSnap : undefined, rotationSnap: rotationSnap > 0 ? rotationSnap : undefined, scaleSnap: snapResolution > 0 ? snapResolution : undefined }, `transform-${transformMode}-${positionSnap}-${rotationSnap}-${snapResolution}`))] }))] }));
+    return (_jsx("group", { ref: rootRef, children: _jsx(GameInstanceProvider, { models: availableModels, selectedId: selectedId, editMode: editMode, onSelect: editMode ? onSelect : undefined, registerRef: registerRef, children: _jsx(GameObjectRenderer, { gameObject: data.root, selectedId: selectedId, onSelect: editMode ? onSelect : undefined, onClick: onClick, registerRef: registerRef, registerRigidBodyRef: registerRigidBodyRef, loadedModels: availableModels, loadedTextures: availableTextures, editMode: editMode, parentMatrix: IDENTITY }) }) }));
 });
 export function GameObjectRenderer(props) {
     var _a, _b, _c;
@@ -162,12 +128,14 @@ function isPhysicsProps(v) {
     return (v === null || v === void 0 ? void 0 : v.type) === "fixed" || (v === null || v === void 0 ? void 0 : v.type) === "dynamic" || (v === null || v === void 0 ? void 0 : v.type) === "kinematicPosition" || (v === null || v === void 0 ? void 0 : v.type) === "kinematicVelocity";
 }
 function InstancedNode({ gameObject, parentMatrix = IDENTITY, editMode, registerRef, selectedId: _selectedId, onSelect, onClick }) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const localTransform = getNodeTransformProps(gameObject);
-    const physicsProps = isPhysicsProps((_b = (_a = gameObject.components) === null || _a === void 0 ? void 0 : _a.physics) === null || _b === void 0 ? void 0 : _b.properties)
-        ? (_d = (_c = gameObject.components) === null || _c === void 0 ? void 0 : _c.physics) === null || _d === void 0 ? void 0 : _d.properties
+    const isLocked = Boolean(gameObject.locked);
+    const clickable = Object.values((_a = gameObject.components) !== null && _a !== void 0 ? _a : {}).some(component => (component === null || component === void 0 ? void 0 : component.type) === 'Click');
+    const physicsProps = isPhysicsProps((_c = (_b = gameObject.components) === null || _b === void 0 ? void 0 : _b.physics) === null || _c === void 0 ? void 0 : _c.properties)
+        ? (_e = (_d = gameObject.components) === null || _d === void 0 ? void 0 : _d.physics) === null || _e === void 0 ? void 0 : _e.properties
         : undefined;
-    const modelUrl = (_g = (_f = (_e = gameObject.components) === null || _e === void 0 ? void 0 : _e.model) === null || _f === void 0 ? void 0 : _f.properties) === null || _g === void 0 ? void 0 : _g.filename;
+    const modelUrl = (_h = (_g = (_f = gameObject.components) === null || _f === void 0 ? void 0 : _f.model) === null || _g === void 0 ? void 0 : _g.properties) === null || _h === void 0 ? void 0 : _h.filename;
     const instances = useMemo(() => buildRepeatedInstances(gameObject, parentMatrix, modelUrl, physicsProps), [gameObject, modelUrl, parentMatrix, physicsProps]);
     const groupRef = useRef(null);
     const clickValid = useRef(false);
@@ -178,22 +146,23 @@ function InstancedNode({ gameObject, parentMatrix = IDENTITY, editMode, register
         }
     }, [gameObject.id, registerRef, editMode]);
     if (editMode) {
-        return (_jsxs(_Fragment, { children: [_jsx("group", { ref: groupRef, position: localTransform.position, rotation: localTransform.rotation, scale: localTransform.scale, onPointerDown: (e) => { e.stopPropagation(); clickValid.current = true; }, onPointerMove: () => { clickValid.current = false; }, onPointerUp: (e) => {
+        return (_jsxs(_Fragment, { children: [_jsx("group", { ref: groupRef, position: localTransform.position, rotation: localTransform.rotation, scale: localTransform.scale, onPointerDown: isLocked ? undefined : (e) => { e.stopPropagation(); clickValid.current = true; }, onPointerMove: isLocked ? undefined : () => { clickValid.current = false; }, onPointerUp: isLocked ? undefined : (e) => {
                         if (clickValid.current) {
                             e.stopPropagation();
                             onSelect === null || onSelect === void 0 ? void 0 : onSelect(gameObject.id);
                             onClick === null || onClick === void 0 ? void 0 : onClick(e, gameObject);
                         }
                         clickValid.current = false;
-                    }, children: _jsx("mesh", { visible: false, children: _jsx("boxGeometry", { args: [0.01, 0.01, 0.01] }) }) }), instances.map(instance => (_jsx(GameInstance, { id: instance.id, sourceId: gameObject.id, modelUrl: instance.modelUrl, position: instance.position, rotation: instance.rotation, scale: instance.scale, physics: instance.physics }, instance.id)))] }));
+                    }, children: _jsx("mesh", { visible: false, children: _jsx("boxGeometry", { args: [0.01, 0.01, 0.01] }) }) }), instances.map(instance => (_jsx(GameInstance, { id: instance.id, sourceId: gameObject.id, clickable: clickable, modelUrl: instance.modelUrl, position: instance.position, rotation: instance.rotation, scale: instance.scale, locked: isLocked, physics: instance.physics }, instance.id)))] }));
     }
-    return (_jsx(_Fragment, { children: instances.map(instance => (_jsx(GameInstance, { id: instance.id, sourceId: gameObject.id, modelUrl: instance.modelUrl, position: instance.position, rotation: instance.rotation, scale: instance.scale, physics: instance.physics }, instance.id))) }));
+    return (_jsx(_Fragment, { children: instances.map(instance => (_jsx(GameInstance, { id: instance.id, sourceId: gameObject.id, clickable: clickable, modelUrl: instance.modelUrl, position: instance.position, rotation: instance.rotation, scale: instance.scale, locked: isLocked, physics: instance.physics }, instance.id))) }));
 }
 function StandardNode({ gameObject, selectedId, onSelect, onClick, registerRef, registerRigidBodyRef, loadedModels, loadedTextures, editMode, parentMatrix = IDENTITY, }) {
     var _a, _b, _c, _d, _e;
     const groupRef = useRef(null);
     const helperRef = useRef(null);
     const clickValid = useRef(false);
+    const isLocked = Boolean(gameObject.locked);
     const isSelected = selectedId === gameObject.id;
     const stillInstanced = useInstanceCheck(gameObject.id);
     useHelper(editMode && isSelected ? helperRef : null, BoxHelper, "cyan");
@@ -235,26 +204,22 @@ function StandardNode({ gameObject, selectedId, onSelect, onClick, registerRef,
             loadedTextures,
             editMode,
         });
-    const inner = (_jsx("group", { onPointerDown: editMode ? onDown : undefined, onPointerMove: editMode ? () => (clickValid.current = false) : undefined, onPointerUp: editMode ? onUp : undefined, children: renderCompositionNode(gameObject, renderCtx, parentMatrix, childNodes) }));
+    const inner = (_jsx("group", { onPointerDown: editMode && !isLocked ? onDown : undefined, onPointerMove: editMode && !isLocked ? () => (clickValid.current = false) : undefined, onPointerUp: editMode && !isLocked ? onUp : undefined, children: renderCompositionNode(gameObject, renderCtx, parentMatrix, childNodes) }));
     if (editMode) {
         return (_jsxs(_Fragment, { children: [_jsx("group", { ref: groupRef, position: transform.position, rotation: transform.rotation, scale: transform.scale, children: _jsx("mesh", { visible: false, children: _jsx("boxGeometry", { args: [0.01, 0.01, 0.01] }) }) }), _jsx("group", { ref: helperRef, position: transform.position, rotation: transform.rotation, scale: transform.scale, children: inner }), hasPhysics && (physicsDef === null || physicsDef === void 0 ? void 0 : physicsDef.View) ? (_jsx(physicsDef.View, { properties: physics.properties, position: transform.position, rotation: transform.rotation, scale: transform.scale, editMode: editMode, nodeId: gameObject.id, registerRigidBodyRef: registerRigidBodyRef, children: inner }, physicsKey)) : null] }));
     }
     if (hasPhysics && (physicsDef === null || physicsDef === void 0 ? void 0 : physicsDef.View)) {
         return (_jsx(physicsDef.View, { properties: physics.properties, position: transform.position, rotation: transform.rotation, scale: transform.scale, editMode: editMode, nodeId: gameObject.id, registerRigidBodyRef: registerRigidBodyRef, children: inner }, physicsKey));
     }
-    return (_jsx("group", { ref: groupRef, position: transform.position, rotation: transform.rotation, scale: transform.scale, onPointerDown: onDown, onPointerMove: () => (clickValid.current = false), onPointerUp: onUp, children: inner }));
-}
-const CHILD_HOST_COMPONENT_TYPES = new Set(["Environment"]);
-function isChildHostType(type) {
-    return CHILD_HOST_COMPONENT_TYPES.has(type);
+    return (_jsx("group", { ref: groupRef, position: transform.position, rotation: transform.rotation, scale: transform.scale, children: inner }));
 }
 function getChildHostComponents(gameObject) {
     var _a;
     return Object.entries((_a = gameObject.components) !== null && _a !== void 0 ? _a : {}).flatMap(([key, comp]) => {
-        if (!(comp === null || comp === void 0 ? void 0 : comp.type) || !isChildHostType(comp.type))
+        if (!(comp === null || comp === void 0 ? void 0 : comp.type))
             return [];
         const def = getComponent(comp.type);
-        if (!(def === null || def === void 0 ? void 0 : def.View))
+        if (!(def === null || def === void 0 ? void 0 : def.View) || def.nonComposable)
             return [];
         return { key, View: def.View, properties: comp.properties };
     });
@@ -327,16 +292,6 @@ function buildRepeatedInstances(gameObject, parentMatrix, modelUrl, physics) {
     }
     return instances;
 }
-function decompose(m) {
-    const p = new Vector3(), q = new Quaternion(), s = new Vector3();
-    m.decompose(p, q, s);
-    const e = new Euler().setFromQuaternion(q);
-    return {
-        position: [p.x, p.y, p.z],
-        rotation: [e.x, e.y, e.z],
-        scale: [s.x, s.y, s.z],
-    };
-}
 function getNodeTransformProps(node) {
     var _a, _b, _c, _d, _e;
     const t = (_b = (_a = node === null || node === void 0 ? void 0 : node.components) === null || _a === void 0 ? void 0 : _a.transform) === null || _b === void 0 ? void 0 : _b.properties;
@@ -346,20 +301,6 @@ function getNodeTransformProps(node) {
         scale: (_e = t === null || t === void 0 ? void 0 : t.scale) !== null && _e !== void 0 ? _e : [1, 1, 1],
     };
 }
-function computeParentWorldMatrix(root, targetId) {
-    let result = null;
-    const visit = (node, parent) => {
-        var _a;
-        if (node.id === targetId) {
-            result = parent.clone();
-            return;
-        }
-        const world = parent.clone().multiply(compose(node));
-        (_a = node.children) === null || _a === void 0 ? void 0 : _a.forEach(c => !result && visit(c, world));
-    };
-    visit(root, IDENTITY);
-    return result !== null && result !== void 0 ? result : IDENTITY;
-}
 function renderCompositionSubtree(gameObject, ctx, parentMatrix = IDENTITY) {
     if (!gameObject || gameObject.disabled)
         return null;
@@ -374,9 +315,7 @@ function renderHostedChildren(gameObject, ctx, parentMatrix) {
 }
 function renderCompositionNode(gameObject, ctx, parentMatrix, childNodes) {
     const ownContent = renderNodeOwnContent(gameObject, ctx, parentMatrix);
-    const siblingContent = renderNodeSiblingComponents(gameObject, ctx, parentMatrix);
-    const subtree = _jsxs(_Fragment, { children: [ownContent, siblingContent, childNodes] });
-    return wrapWithChildHosts(gameObject, ctx, parentMatrix, subtree);
+    return wrapWithChildHosts(gameObject, ctx, parentMatrix, _jsxs(_Fragment, { children: [ownContent, childNodes] }));
 }
 function renderNodeOwnContent(gameObject, ctx, parentMatrix) {
     var _a, _b, _c, _d;
@@ -412,28 +351,6 @@ function renderNodeOwnContent(gameObject, ctx, parentMatrix) {
     }
     return core;
 }
-function renderNodeSiblingComponents(gameObject, ctx, parentMatrix) {
-    var _a;
-    const contextProps = {
-        loadedModels: ctx.loadedModels,
-        loadedTextures: ctx.loadedTextures,
-        editMode: ctx.editMode,
-        isSelected: ctx.selectedId === gameObject.id,
-        nodeId: gameObject.id,
-        parentMatrix,
-        registerRef: ctx.registerRef,
-    };
-    return Object.entries((_a = gameObject.components) !== null && _a !== void 0 ? _a : {})
-        .filter(([key]) => !getNonComposableKeys().includes(key))
-        .flatMap(([key, comp]) => {
-        if (!(comp === null || comp === void 0 ? void 0 : comp.type) || isChildHostType(comp.type))
-            return [];
-        const def = getComponent(comp.type);
-        if (!(def === null || def === void 0 ? void 0 : def.View))
-            return [];
-        return _jsx(def.View, Object.assign({ properties: comp.properties }, contextProps), key);
-    });
-}
 function wrapWithChildHosts(gameObject, ctx, parentMatrix, subtree) {
     const contextProps = {
         loadedModels: ctx.loadedModels,

package/dist/tools/prefabeditor/components/CameraComponent.js

@@ -34,7 +34,7 @@ function CameraComponentView({ properties, editMode, isSelected }) {
             cameraHelper.update();
         }
     });
-    return (_jsxs(_Fragment, { children: [_jsx(PerspectiveCamera, { ref: (instance) => setCamera(instance), makeDefault: !editMode, fov: fov, near: near, zoom: zoom, far: far }), editMode && isSelected && cameraHelper && (_jsx("primitive", { object: cameraHelper })), editMode && !isSelected ? (_jsxs("mesh", { children: [_jsx("boxGeometry", { args: [0.34, 0.22, 0.18] }), _jsx("meshBasicMaterial", { color: "#22d3ee", wireframe: true })] })) : null] }));
+    return (_jsxs(_Fragment, { children: [_jsx(PerspectiveCamera, { ref: (instance) => setCamera(instance), makeDefault: !editMode, fov: fov, near: near, zoom: zoom, far: far }), editMode && isSelected && cameraHelper && (_jsx("primitive", { object: cameraHelper })), editMode ? (_jsxs("group", { children: [_jsxs("mesh", { children: [_jsx("boxGeometry", { args: [0.3, 0.3, 0.5] }), _jsx("meshBasicMaterial", { color: '#22d3ee', wireframe: true })] }), _jsxs("mesh", { position: [0, 0, -0.25], rotation: [Math.PI / 2, 0, 0], children: [_jsx("coneGeometry", { args: [0.08, 0.16, 16] }), _jsx("meshBasicMaterial", { color: '#22d3ee', wireframe: true })] })] })) : null] }));
 }
 const CameraComponent = {
     name: 'Camera',

package/dist/tools/prefabeditor/components/ClickComponent.d.ts

@@ -0,0 +1,3 @@
+import { Component } from './ComponentRegistry';
+declare const ClickComponent: Component;
+export default ClickComponent;