react-three-game 0.0.107 → 0.0.109

package/dist/tools/prefabeditor/EditorTreeMenus.js

@@ -12,8 +12,8 @@ import { useEffect, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { createEmptyPrefab } from './prefab';
 import { menu } from './styles';
-import { useEditorContext } from './PrefabEditor';
-import { loadJson, saveJson } from './utils';
+import { useEditorContext } from './EditorContext';
+import { loadJson, loadJsonFile, saveJson, withBasePath } from './utils';
 function MenuPanel({ children, style, }) {
     return (_jsx("div", { style: Object.assign(Object.assign(Object.assign({}, menu.container), { position: 'static' }), style), onClick: (e) => e.stopPropagation(), children: children }));
 }
@@ -80,8 +80,8 @@ export function TreeContextMenu({ contextMenu, onClose, children, }) {
             zIndex: 1000,
         }, onMouseLeave: onClose, onContextMenu: (e) => e.preventDefault(), children: children(contextMenu.nodeId, onClose) }), document.body);
 }
-export function FileMenu({ getPrefab, onReplacePrefab, onImportPrefab, onClose }) {
-    const { onScreenshot, onExportGLB } = useEditorContext();
+export function FileMenu({ getPrefab, onReplacePrefab, onImportPrefab, onImportPackedPrefab, onClose }) {
+    const { basePath, onScreenshot, onExportGLB } = useEditorContext();
     const handleNew = () => {
         onReplacePrefab(createEmptyPrefab());
         onClose();
@@ -98,10 +98,22 @@ export function FileMenu({ getPrefab, onReplacePrefab, onImportPrefab, onClose }
         onClose();
     };
     const handleImport = () => __awaiter(this, void 0, void 0, function* () {
-        const loaded = yield loadJson();
+        const loaded = yield loadJsonFile();
         if (!loaded)
             return;
-        onImportPrefab(loaded);
+        try {
+            const manifest = yield fetch(withBasePath(basePath, '/prefabs/manifest.json')).then(r => r.json());
+            const matched = manifest.find(entry => entry.endsWith(`/${loaded.filename}`) || entry === `/${loaded.filename}`);
+            if (matched) {
+                onImportPackedPrefab(matched);
+                onClose();
+                return;
+            }
+        }
+        catch (_a) {
+            // manifest not available, fall through to full import
+        }
+        onImportPrefab(loaded.prefab);
         onClose();
     });
     return (_jsxs(MenuPanel, { style: { overflow: 'visible' }, children: [_jsxs(MenuSubmenu, { label: "File", children: [_jsx(MenuItemButton, { onClick: handleNew, children: "New Prefab" }), _jsx(MenuItemButton, { onClick: handleOpen, children: "Open Prefab" }), _jsx(MenuItemButton, { onClick: handleImport, children: "Import Prefab" }), _jsx(MenuItemButton, { onClick: handleSave, children: "Save Prefab" })] }), _jsxs(MenuSubmenu, { label: "Export", children: [_jsx(MenuItemButton, { onClick: () => { onExportGLB === null || onExportGLB === void 0 ? void 0 : onExportGLB(); onClose(); }, children: "GLB" }), _jsx(MenuItemButton, { onClick: () => { onScreenshot === null || onScreenshot === void 0 ? void 0 : onScreenshot(); onClose(); }, children: "PNG" })] })] }));

package/dist/tools/prefabeditor/EditorUI.js

@@ -14,7 +14,7 @@ import { useState } from 'react';
 import EditorTree from './EditorTree';
 import { canAddComponentToNode, getAllComponentDefs, getNextComponentKey } from './components/ComponentRegistry';
 import { createComponentData } from './prefab';
-import { useEditorRef } from './PrefabEditor';
+import { useEditorRef } from './EditorContext';
 import { base, colors, inspector, componentCard } from './styles';
 import { usePrefabStore } from './prefabStore';
 function EditorUI({ selectedId, setSelectedId, getPrefab, onReplacePrefab, onImportPrefab, basePath, onUndo, onRedo, canUndo, canRedo }) {

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

@@ -6,6 +6,7 @@ export type ContactEventPayload = {
     targetEntityId?: string | null;
     targetNodeId?: string | null;
     targetObject?: unknown;
+    collisionNormal?: [number, number, number];
     event?: unknown;
 };
 export type ClickEventPayload = {

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

@@ -1,43 +1,11 @@
-import GameCanvas from "../../shared/GameCanvas";
 import type { Prefab } from "./types";
-import { PrefabEditorMode, type Scene } from "./PrefabRoot";
-import type { ExportGLBOptions } from "./utils";
-export declare function isAbsoluteAssetPath(path: string): boolean;
+import { GameCanvas, PrefabEditorMode } from "../../viewer";
+import { type PrefabEditorRef } from "./EditorContext";
+export { isExternalPath as isAbsoluteAssetPath } from "./utils";
 export declare function resolvePrefabAssetPath(basePath: string, file: string): string;
 export declare function getPrefabAssetRef(assetRef: string, folder: "models" | "textures" | "sound"): string;
-export interface PrefabEditorRef extends Scene {
-    save: () => Prefab;
-    load: (prefab: Prefab, options?: {
-        resetHistory?: boolean;
-        notifyChange?: boolean;
-    }) => void;
-    undo: () => void;
-    redo: () => void;
-    screenshot: () => void;
-    exportGLB: (options?: ExportGLBOptions) => Promise<ArrayBuffer | undefined>;
-    exportGLBData: () => Promise<ArrayBuffer | undefined>;
-    clearSelection: () => Promise<void>;
-}
-export type { PrefabNode } from "./PrefabRoot";
-export interface EditorContextType {
-    mode: PrefabEditorMode;
-    setMode: (mode: PrefabEditorMode) => void;
-    transformMode: "translate" | "rotate" | "scale";
-    setTransformMode: (mode: "translate" | "rotate" | "scale") => void;
-    scaleSnap: number;
-    setScaleSnap: (resolution: number) => void;
-    positionSnap: number;
-    setPositionSnap: (resolution: number) => void;
-    rotationSnap: number;
-    setRotationSnap: (resolution: number) => void;
-    onFocusNode?: (nodeId: string) => void;
-    onScreenshot?: () => void;
-    onExportGLB?: () => void;
-}
-export declare const EditorContext: import("react").Context<EditorContextType | null>;
-export declare const EditorRefContext: import("react").Context<PrefabEditorRef | null>;
-export declare function useEditorContext(): EditorContextType;
-export declare function useEditorRef(): PrefabEditorRef;
+export type { EditorContextType, PrefabEditorRef } from "./EditorContext";
+export { EditorContext, EditorRefContext, useEditorContext, useEditorRef } from "./EditorContext";
 export interface PrefabEditorProps {
     basePath?: string;
     initialPrefab?: Prefab;

package/dist/tools/prefabeditor/PrefabEditor.js

@@ -9,17 +9,18 @@ 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 GameCanvas from "../../shared/GameCanvas";
-import { useCallback, useEffect, useMemo, useRef, useState, forwardRef, useImperativeHandle, createContext, useContext } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState, forwardRef, useImperativeHandle } from "react";
 import { BoxHelper } from "three";
 import { findComponentEntry } from "./types";
-import { PrefabEditorMode, PrefabRoot } from "./PrefabRoot";
+import { GameCanvas, PrefabRoot, PrefabEditorMode, SceneContext, createImageNode, createModelNode, denormalizePrefab } from "../../viewer";
 import EditorUI from "./EditorUI";
 import { base, toolbar } from "./styles";
-import { computeParentWorldMatrix, decompose, exportGLB as exportGLBFile, exportGLBData, focusCameraOnObject, regenerateIds } from "./utils";
+import { computeParentWorldMatrix, decompose, exportGLB as exportGLBFile, exportGLBData, focusCameraOnObject, isExternalPath, regenerateIds, withBasePath } from "./utils";
 import { loadDroppedAssets } from "../dragdrop";
-import { denormalizePrefab, createImageNode, createModelNode, createNode } from './prefab';
+import { createNode } from './prefab';
 import { createPrefabStore, PrefabStoreProvider } from "./prefabStore";
+import { decomposeModelToPrefabNodes, hasCollisionMeshConventions } from "./modelPrefab";
+import { EditorContext, EditorRefContext } from "./EditorContext";
 function isObjectAttachedToRoot(root, object) {
     if (!root || !object)
         return false;
@@ -31,18 +32,12 @@ function isObjectAttachedToRoot(root, object) {
     }
     return false;
 }
-export function isAbsoluteAssetPath(path) {
-    return (path.startsWith("data:") ||
-        path.startsWith("http://") ||
-        path.startsWith("https://"));
-}
+export { isExternalPath as isAbsoluteAssetPath } from "./utils";
 export function resolvePrefabAssetPath(basePath, file) {
-    if (isAbsoluteAssetPath(file))
-        return file;
-    return file.startsWith("/") ? `${basePath}${file}` : `${basePath}/${file}`;
+    return withBasePath(basePath, file);
 }
 export function getPrefabAssetRef(assetRef, folder) {
-    return isAbsoluteAssetPath(assetRef) ? assetRef : `${folder}/${assetRef}`;
+    return isExternalPath(assetRef) ? assetRef : `${folder}/${assetRef}`;
 }
 function SelectionHelper({ object }) {
     const objectRef = useRef(null);
@@ -53,22 +48,7 @@ function SelectionHelper({ object }) {
     useHelper(helperTarget, BoxHelper, "cyan");
     return null;
 }
-export const EditorContext = createContext(null);
-export const EditorRefContext = createContext(null);
-export function useEditorContext() {
-    const context = useContext(EditorContext);
-    if (!context) {
-        throw new Error("useEditorContext must be used within EditorContext.Provider");
-    }
-    return context;
-}
-export function useEditorRef() {
-    const editorRef = useContext(EditorRefContext);
-    if (!editorRef) {
-        throw new Error("useEditorRef must be used within PrefabEditor");
-    }
-    return editorRef;
-}
+export { EditorContext, EditorRefContext, useEditorContext, useEditorRef } from "./EditorContext";
 const MAX_HISTORY_LENGTH = 50;
 const HISTORY_DEBOUNCE_MS = 500;
 const DEFAULT_PREFAB = {
@@ -76,7 +56,7 @@ const DEFAULT_PREFAB = {
     name: "New Prefab",
     root: createNode('Root', {}, { id: 'root' })
 };
-const PrefabEditor = forwardRef(({ basePath, initialPrefab, mode: initialMode = PrefabEditorMode.Edit, onChange, showUI = true, enableWindowDrop = true, canvasProps, uiPlugins, children }, ref) => {
+const PrefabEditor = forwardRef(({ basePath = "", initialPrefab, mode: initialMode = PrefabEditorMode.Edit, onChange, showUI = true, enableWindowDrop = true, canvasProps, uiPlugins, children }, ref) => {
     const [mode, setMode] = useState(initialMode);
     const [selectedId, setSelectedId] = useState(null);
     const [transformMode, setTransformMode] = useState("translate");
@@ -344,7 +324,23 @@ const PrefabEditor = forwardRef(({ basePath, initialPrefab, mode: initialMode =
                 onModelLoaded: (model, filename, file) => {
                     const path = getPrefabAssetRef(filename, 'models');
                     scene === null || scene === void 0 ? void 0 : scene.addModel(path, model);
-                    add(createModelNode(path, file.name.replace(/\.[^.]+$/, '')));
+                    const modelName = file.name.replace(/\.[^.]+$/, '');
+                    const modelIdPrefix = modelName.replace(/[^\w-]+/g, '-') || 'model';
+                    if (hasCollisionMeshConventions(model)) {
+                        const textureRefs = new Map();
+                        const decomposed = decomposeModelToPrefabNodes(model, {
+                            idPrefix: modelIdPrefix,
+                            getTexturePath: (texture, usage) => {
+                                const key = `embedded/${modelIdPrefix}/${usage}/${texture.uuid}`;
+                                textureRefs.set(key, texture);
+                                return key;
+                            },
+                        });
+                        textureRefs.forEach((texture, path) => scene === null || scene === void 0 ? void 0 : scene.addTexture(path, texture));
+                        add(Object.assign(Object.assign({}, decomposed), { name: modelName || decomposed.name }));
+                        return;
+                    }
+                    add(createModelNode(path, modelName));
                 },
                 onTextureLoaded: (texture, filename, file) => {
                     const path = getPrefabAssetRef(filename, 'textures');
@@ -368,6 +364,7 @@ const PrefabEditor = forwardRef(({ basePath, initialPrefab, mode: initialMode =
             return getRoot();
         },
         mode,
+        basePath,
         get: getNode,
         getObject,
         getHandle,
@@ -382,7 +379,7 @@ const PrefabEditor = forwardRef(({ basePath, initialPrefab, mode: initialMode =
         addModel: (path, model) => { var _a; return (_a = prefabRootRef.current) === null || _a === void 0 ? void 0 : _a.addModel(path, model); },
         addTexture: (path, texture) => { var _a; return (_a = prefabRootRef.current) === null || _a === void 0 ? void 0 : _a.addTexture(path, texture); },
         addSound: (path, sound) => { var _a; return (_a = prefabRootRef.current) === null || _a === void 0 ? void 0 : _a.addSound(path, sound); },
-    }), [add, duplicate, getHandle, getModel, getNode, getObject, getRoot, mode, move, remove, replace, replaceNode, update]);
+    }), [add, basePath, duplicate, getHandle, getModel, getNode, getObject, getRoot, mode, move, remove, replace, replaceNode, update]);
     const editorRefValue = useMemo(() => (Object.assign(Object.assign({}, sceneValue), { save: getPrefab, load: loadPrefab, undo,
         redo, screenshot: handleScreenshot, exportGLB: handleExportGLB, exportGLBData: handleExportGLBData, clearSelection })), [clearSelection, getPrefab, handleExportGLB, handleExportGLBData, handleScreenshot, loadPrefab, redo, sceneValue, undo]);
     useImperativeHandle(ref, () => editorRefValue, [editorRefValue]);
@@ -392,8 +389,9 @@ const PrefabEditor = forwardRef(({ basePath, initialPrefab, mode: initialMode =
         canvasRef.current = state.gl.domElement;
         (_a = canvasProps === null || canvasProps === void 0 ? void 0 : canvasProps.onCreated) === null || _a === void 0 ? void 0 : _a.call(canvasProps, state);
     }, [canvasProps]);
-    return _jsx(PrefabStoreProvider, { store: prefabStore, children: _jsx(EditorRefContext.Provider, { value: editorRefValue, children: _jsxs(EditorContext.Provider, { value: {
+    return _jsx(PrefabStoreProvider, { store: prefabStore, children: _jsx(EditorRefContext.Provider, { value: editorRefValue, children: _jsx(EditorContext.Provider, { value: {
                     mode,
+                    basePath,
                     setMode: updateMode,
                     transformMode,
                     setTransformMode,
@@ -406,16 +404,16 @@ const PrefabEditor = forwardRef(({ basePath, initialPrefab, mode: initialMode =
                     onFocusNode: isEditMode ? handleFocusNode : undefined,
                     onScreenshot: handleScreenshot,
                     onExportGLB: handleExportGLB
-                }, children: [_jsxs(GameCanvas, Object.assign({ camera: { position: [0, 5, 15] } }, canvasProps, { onCreated: handleCanvasCreated, onPointerMissed: isEditMode
-                            ? (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);
+                }, children: _jsxs(SceneContext.Provider, { value: sceneValue, children: [_jsxs(GameCanvas, Object.assign({ camera: { position: [0, 5, 15] } }, canvasProps, { onCreated: handleCanvasCreated, onPointerMissed: isEditMode
+                                ? (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);
                                 }
-                                (_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: [content, isEditMode ? _jsx(SelectionHelper, { object: transformObject }) : null, isEditMode && (_jsxs(_Fragment, { children: [_jsx(MapControls, { ref: controlsRef, enableDamping: false, makeDefault: true }), transformObject && (_jsx(TransformControls, { ref: transformControlsRef, object: transformObject, mode: transformMode, space: transformMode === "translate" ? "world" : "local", onObjectChange: handleTransformChange, translationSnap: positionSnap > 0 ? positionSnap : undefined, rotationSnap: rotationSnap > 0 ? rotationSnap : undefined, scaleSnap: scaleSnap > 0 ? scaleSnap : undefined }, `transform-${selectedId}-${transformMode}-${positionSnap}-${rotationSnap}-${scaleSnap}`))] }))] })), showUI && (_jsxs(_Fragment, { children: [_jsxs("div", { style: toolbar.panel, children: [_jsx("button", { type: "button", style: base.btn, onClick: toggleMode, children: isEditMode ? "▶" : "⏸" }), uiPlugins] }), isEditMode && (_jsx(EditorUI, { selectedId: selectedId, setSelectedId: setSelection, getPrefab: getPrefab, onReplacePrefab: (prefab) => loadPrefab(prefab, { resetHistory: true }), onImportPrefab: importPrefab, basePath: basePath, onUndo: undo, onRedo: redo, canUndo: historyIndex > 0, canRedo: historyIndex < history.length - 1 }))] }))] }) }) });
+                                : canvasProps === null || canvasProps === void 0 ? void 0 : canvasProps.onPointerMissed, children: [content, isEditMode ? _jsx(SelectionHelper, { object: transformObject }) : null, isEditMode && (_jsxs(_Fragment, { children: [_jsx(MapControls, { ref: controlsRef, enableDamping: false, makeDefault: true }), transformObject && (_jsx(TransformControls, { ref: transformControlsRef, object: transformObject, mode: transformMode, space: transformMode === "translate" ? "world" : "local", onObjectChange: handleTransformChange, translationSnap: positionSnap > 0 ? positionSnap : undefined, rotationSnap: rotationSnap > 0 ? rotationSnap : undefined, scaleSnap: scaleSnap > 0 ? scaleSnap : undefined }, `transform-${selectedId}-${transformMode}-${positionSnap}-${rotationSnap}-${scaleSnap}`))] }))] })), showUI && (_jsxs(_Fragment, { children: [_jsxs("div", { style: toolbar.panel, children: [_jsx("button", { type: "button", style: base.btn, onClick: toggleMode, children: isEditMode ? "▶" : "⏸" }), uiPlugins] }), isEditMode && (_jsx(EditorUI, { selectedId: selectedId, setSelectedId: setSelection, getPrefab: getPrefab, onReplacePrefab: (prefab) => loadPrefab(prefab, { resetHistory: true }), onImportPrefab: importPrefab, 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

@@ -1,34 +1,11 @@
 import { Matrix4 } from "three";
-import type { Object3D, Texture } from "three";
-import type { ThreeEvent } from "@react-three/fiber";
+import type { Object3D } from "three";
+import { type ThreeEvent } from "@react-three/fiber";
 import type { GameObject as GameObjectType, Prefab } from "./types";
 import type { LoadedModels } from "../dragdrop";
 import type { PrefabStoreApi } from "./prefabStore";
-export declare enum PrefabEditorMode {
-    Edit = "edit",
-    Play = "play"
-}
-export type PrefabNode = Omit<GameObjectType, "children">;
-export interface Scene {
-    root: Object3D | null;
-    mode: PrefabEditorMode;
-    get(id: string): GameObjectType | null;
-    getObject(id: string): Object3D | null;
-    getHandle<T = unknown>(id: string, kind: string): T | null;
-    getModel(path: string): Object3D | null;
-    add(node: GameObjectType, parentId?: string): GameObjectType;
-    update(id: string, fn: (node: PrefabNode) => PrefabNode): void;
-    replaceNode(id: string, node: GameObjectType): void;
-    remove(id: string): void;
-    duplicate(id: string): string | null;
-    move(draggedId: string, targetId: string, position: "before" | "inside"): void;
-    replace(prefab: Prefab): void;
-    addModel(path: string, model: Object3D): void;
-    addTexture(path: string, texture: Texture): void;
-    addSound(path: string, sound: AudioBuffer): void;
-}
-export declare const SceneContext: import("react").Context<Scene | null>;
-export declare function useScene(): Scene;
+import { type Scene } from "./SceneContext";
+export type { Scene };
 export interface PrefabRootProps {
     editMode?: boolean;
     data?: Prefab;
@@ -53,5 +30,6 @@ interface RendererProps {
     editMode?: boolean;
     parentMatrix?: Matrix4;
     isVisible?: boolean;
+    basePath?: string;
 }
 export default PrefabRoot;