react-three-game 0.0.24 → 0.0.25

package/dist/tools/prefabeditor/InstanceProvider.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { createContext, useContext, useMemo, useRef, useState, useEffect, useCallback } from "react";
 import { Merged } from '@react-three/drei';
 import { InstancedRigidBodies } from "@react-three/rapier";
-import { Mesh, Matrix4 } from "three";
+import { Mesh, Matrix4, Quaternion, Vector3 } from "three";
 // --- Helpers ---
 const tupleEqual = (a, b) => a.length === b.length && a.every((v, i) => v === b[i]);
 const instanceChanged = (a, b) => {
@@ -91,14 +91,34 @@ export function GameInstanceProvider({ children, models, onSelect, registerRef }
             })] }));
 }
 // --- Physics Instances ---
-// InstancedRigidBodies handles position/rotation/scale via the instances prop.
-// We pass scale in instances and let the library manage matrix updates.
+// InstancedRigidBodies manages position/rotation from physics simulation.
+// We apply scale once when instances change via useEffect.
 function PhysicsInstances({ instances, physicsType, modelKey, partCount, meshParts }) {
-    // InstancedRigidBodies expects { key, position, rotation, scale }
-    const rigidBodyInstances = useMemo(() => instances.map(({ id, position, rotation, scale }) => ({ key: id, position, rotation, scale })), [instances]);
+    const meshRefs = useRef([]);
+    // InstancedRigidBodies needs position/rotation (scale handled separately)
+    const rigidBodyInstances = useMemo(() => instances.map(({ id, position, rotation }) => ({ key: id, position, rotation })), [instances]);
+    // Apply scale when instances change
+    useEffect(() => {
+        const matrix = new Matrix4();
+        const pos = new Vector3();
+        const quat = new Quaternion();
+        const scl = new Vector3();
+        meshRefs.current.forEach(mesh => {
+            if (!mesh)
+                return;
+            instances.forEach((inst, i) => {
+                mesh.getMatrixAt(i, matrix);
+                matrix.decompose(pos, quat, scl);
+                scl.set(...inst.scale);
+                matrix.compose(pos, quat, scl);
+                mesh.setMatrixAt(i, matrix);
+            });
+            mesh.instanceMatrix.needsUpdate = true;
+        });
+    }, [instances]);
     return (_jsx(InstancedRigidBodies, { instances: rigidBodyInstances, type: physicsType, colliders: physicsType === 'fixed' ? 'trimesh' : 'hull', children: Array.from({ length: partCount }, (_, i) => {
             const mesh = meshParts[`${modelKey}__${i}`];
-            return mesh ? (_jsx("instancedMesh", { args: [mesh.geometry, mesh.material, instances.length], frustumCulled: false, castShadow: true, receiveShadow: true }, i)) : null;
+            return mesh ? (_jsx("instancedMesh", { ref: el => { meshRefs.current[i] = el; }, args: [mesh.geometry, mesh.material, instances.length], frustumCulled: false, castShadow: true, receiveShadow: true }, i)) : null;
         }) }));
 }
 // --- Static Instances (non-physics) ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-three-game",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "description": "Batteries included React Three Fiber game engine",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/tools/prefabeditor/InstanceProvider.tsx

@@ -1,7 +1,7 @@
 import React, { createContext, useContext, useMemo, useRef, useState, useEffect, useCallback } from "react";
 import { Merged } from '@react-three/drei';
 import { InstancedRigidBodies, RigidBodyProps } from "@react-three/rapier";
-import { Mesh, Matrix4, Object3D } from "three";
+import { Mesh, Matrix4, Object3D, Quaternion, Vector3, InstancedMesh } from "three";
 
 // --- Types ---
 export type InstanceData = {
@@ -164,8 +164,8 @@ export function GameInstanceProvider({
 }
 
 // --- Physics Instances ---
-// InstancedRigidBodies handles position/rotation/scale via the instances prop.
-// We pass scale in instances and let the library manage matrix updates.
+// InstancedRigidBodies manages position/rotation from physics simulation.
+// We apply scale once when instances change via useEffect.
 function PhysicsInstances({
     instances,
     physicsType,
@@ -179,12 +179,35 @@ function PhysicsInstances({
     partCount: number;
     meshParts: Record<string, Mesh>;
 }) {
-    // InstancedRigidBodies expects { key, position, rotation, scale }
+    const meshRefs = useRef<(InstancedMesh | null)[]>([]);
+
+    // InstancedRigidBodies needs position/rotation (scale handled separately)
     const rigidBodyInstances = useMemo(() =>
-        instances.map(({ id, position, rotation, scale }) => ({ key: id, position, rotation, scale })),
+        instances.map(({ id, position, rotation }) => ({ key: id, position, rotation })),
         [instances]
     );
 
+    // Apply scale when instances change
+    useEffect(() => {
+        const matrix = new Matrix4();
+        const pos = new Vector3();
+        const quat = new Quaternion();
+        const scl = new Vector3();
+
+        meshRefs.current.forEach(mesh => {
+            if (!mesh) return;
+
+            instances.forEach((inst, i) => {
+                mesh.getMatrixAt(i, matrix);
+                matrix.decompose(pos, quat, scl);
+                scl.set(...inst.scale);
+                matrix.compose(pos, quat, scl);
+                mesh.setMatrixAt(i, matrix);
+            });
+            mesh.instanceMatrix.needsUpdate = true;
+        });
+    }, [instances]);
+
     return (
         <InstancedRigidBodies
             instances={rigidBodyInstances}
@@ -196,6 +219,7 @@ function PhysicsInstances({
                 return mesh ? (
                     <instancedMesh
                         key={i}
+                        ref={el => { meshRefs.current[i] = el; }}
                         args={[mesh.geometry, mesh.material, instances.length]}
                         frustumCulled={false}
                         castShadow