Make sure a dynamic body is always owned

Hubs-Foundation · Dec 14, 2023 · 148c90e · 148c90e
1 parent a6f81a8
commit 148c90e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/bit-systems/behavior-graph/bindings/rigid-body.ts b/src/bit-systems/behavior-graph/bindings/rigid-body.ts
@@ -1,11 +1,15 @@
 import { HubsWorld } from "../../../app";
-import { EntityID } from "../../../bit-components";
-import { BodyParams, getBodyFromRigidBody } from "../../../inflators/rigid-body";
+import { EntityID, Rigidbody } from "../../../bit-components";
+import { BodyParams, Type, getBodyFromRigidBody } from "../../../inflators/rigid-body";
+import { takeSoftOwnership } from "../../../utils/take-soft-ownership";
 
 // TODO: Fix the type conversion.
 export function setRigidBody(world: HubsWorld, eid: number, params: Partial<BodyParams>) {
   const physicsSystem = APP.scene?.systems["hubs-systems"].physicsSystem;
   physicsSystem.updateRigidBody(eid, params);
+  if (Rigidbody.type[eid] === Type.DYNAMIC) {
+    takeSoftOwnership(world, eid);
+  }
 }
 export function getRigidBody(world: HubsWorld, eid: EntityID) {
   return getBodyFromRigidBody(eid);

diff --git a/src/systems/bit-physics.ts b/src/systems/bit-physics.ts
@@ -2,9 +2,10 @@ import { defineQuery, enterQuery, entityExists, exitQuery, hasComponent, Not } f
 import { Object3DTag, Rigidbody, PhysicsShape, AEntity, SceneRoot } from "../bit-components";
 import { getShapeFromPhysicsShape } from "../inflators/physics-shape";
 import { findAncestorWithComponent } from "../utils/bit-utils";
-import { getBodyFromRigidBody } from "../inflators/rigid-body";
+import { getBodyFromRigidBody, Type } from "../inflators/rigid-body";
 import { HubsWorld } from "../app";
 import { PhysicsSystem } from "./physics-system";
+import { takeSoftOwnership } from "../utils/take-soft-ownership";
 
 const rigidbodyQuery = defineQuery([Rigidbody, Object3DTag, Not(AEntity)]);
 const rigidbodyEnteredQuery = enterQuery(rigidbodyQuery);
@@ -27,6 +28,10 @@ export const physicsCompatSystem = (world: HubsWorld, physicsSystem: PhysicsSyst
     const body = getBodyFromRigidBody(eid);
     const bodyId = physicsSystem.addBody(obj, body);
     Rigidbody.bodyId[eid] = bodyId;
+
+    if (Rigidbody.type[eid] === Type.DYNAMIC) {
+      takeSoftOwnership(world, eid);
+    }
   });
 
   shapeEnterQuery(world).forEach(eid => {