ensure mounted when setting dirty to prevent false activate

Author: ashconnell

packages/website/verse/Object.js

@@ -48,9 +48,7 @@ export class Object extends Entity {
     this.quaternion = this.createNetworkProp('quaternion', new Quaternion().fromArray(props.quaternion || defaultQuaternion)) // prettier-ignore
     // this.quaternion.onChange = this.onQuaternionChange.bind(this)
 
-    this.root = new Nodes.group({
-      id: '$root',
-    })
+    this.root = new Nodes.group({ id: '$root' })
     this.root.position.copy(this.position.value)
     this.root.quaternion.copy(this.quaternion.value)
 
@@ -477,8 +475,8 @@ export class Object extends Entity {
         if (!node) return null
         return node.getProxy()
       },
-      create(data) {
-        const node = entity.createNode(data)
+      create(type) {
+        const node = entity.createNode({ type })
         return node.getProxy()
       },
       isAuthority() {
@@ -801,9 +799,7 @@ export class Object extends Entity {
     super.destroy()
     this.world.entities.setHot(this, false)
     this.nodes.forEach(node => {
-      if (node.mounted) {
-        node.unmount()
-      }
+      node.deactivate()
     })
     this.control?.release(false)
     this.control = null

packages/website/verse/extras/createColliderFactory.js

@@ -91,14 +91,14 @@ export function createColliderFactory(world, mesh) {
         actor = world.physics.physics.createRigidDynamic(transform)
         actor.setRigidBodyFlag(PHYSX.PxRigidBodyFlagEnum.eKINEMATIC, true)
         actor.setRigidBodyFlag(PHYSX.PxRigidBodyFlagEnum.eENABLE_CCD, false)
-      } else {
+      } else if (collision === 'static') {
         actor = world.physics.physics.createRigidStatic(transform)
       }
       actor.attachShape(shape)
       world.physics.scene.addActor(actor)
 
       let untrack
-      if (collision !== 'static') {
+      if (collision === 'dynamic') {
         untrack = world.physics.track(actor, node?.onPhysicsMovement)
       }
 

packages/website/verse/nodes/Box.js

@@ -131,13 +131,13 @@ export class Box extends Node {
         this.actor = this.ctx.world.physics.physics.createRigidDynamic(this.transform)
         this.actor.setRigidBodyFlag(PHYSX.PxRigidBodyFlagEnum.eKINEMATIC, true)
         this.actor.setRigidBodyFlag(PHYSX.PxRigidBodyFlagEnum.eENABLE_CCD, false)
-      } else {
+      } else if (this.collision === 'static') {
         this.actor = this.ctx.world.physics.physics.createRigidStatic(this.transform)
       }
       // this.actor.setMass(1)
       this.actor.attachShape(shape)
       this.ctx.world.physics.scene.addActor(this.actor)
-      if (this.collision !== 'static') {
+      if (this.collision === 'dynamic') {
         this.untrack = this.ctx.world.physics.track(this.actor, this.onPhysicsMovement)
       }
     }

packages/website/verse/nodes/Mesh.js

@@ -2,6 +2,8 @@ import { isBoolean } from 'lodash-es'
 
 import { Node } from './Node'
 
+const collisionTypes = ['static', 'kinematic', 'dynamic']
+
 const defaults = {
   visible: true,
   collision: null,
@@ -17,7 +19,13 @@ export class Mesh extends Node {
     this.model = data.model
 
     this.visible = isBoolean(data.visible) ? data.visible : defaults.visible
-    this.collision = data.collision || defaults.collision
+
+    // todo: we should validate all options because the old collision=true does weird shit now
+    // its best to only set if valid
+    this.collision = defaults.collision
+    if (collisionTypes.includes(data.collision)) {
+      this.collision = data.collision
+    }
     this.collisionLayer = data.collisionLayer || defaults.collisionLayer
 
     this.mesh = null

packages/website/verse/nodes/Node.js

@@ -131,6 +131,8 @@ export class Node {
   }
 
   setDirty() {
+    // if we haven't mounted no track
+    if (!this.mounted) return
     // if already dirty, either this or a parent is being tracked so we're good
     if (this.isDirty) return
     this.isDirty = true