fix: defer static/dynamic-body component set

arenaxr · May 23, 2024 · 00538cc · 00538cc
1 parent cad37e3
commit 00538cc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/constants/events.js b/src/constants/events.js
@@ -20,6 +20,7 @@ export const ARENA_EVENTS = Object.freeze({
     STARTPOS_LOADED: 'onarenastartposloaded',
     RUNTIME_MNGR_LOADED: 'onarenaruntimemanagerloaded',
     CV_INITIALIZED: 'onarenacvinitialized',
+    PHYSICS_LOADED: 'onarenaphysicsinitialized',
 });
 
 export const JITSI_EVENTS = Object.freeze({

diff --git a/src/systems/core/arena.js b/src/systems/core/arena.js
@@ -676,6 +676,7 @@ AFRAME.registerSystem('arena-scene', {
                     if (AFRAME.components['static-body']) {
                         clearInterval(physicsWait);
                         document.getElementById('groundPlane').setAttribute('static-body', 'type', 'static');
+                        this.events.emit(ARENA_EVENTS.PHYSICS_LOADED, true);
                     }
                 }, 10);
             }

diff --git a/src/systems/core/message-actions/create-update.js b/src/systems/core/message-actions/create-update.js
@@ -3,7 +3,7 @@
 /* global AFRAME, ARENA, THREE */
 
 import { ARENAUtils } from '../../../utils';
-import { ACTIONS } from '../../../constants';
+import { ACTIONS, ARENA_EVENTS } from '../../../constants';
 
 // default render order of objects; reserve 0 for occlusion
 const RENDER_ORDER = 1;
@@ -452,6 +452,18 @@ export default class CreateUpdate {
             // handle some special cases for attributes (e.g. attributes set directly to the THREE.js object);
             // default is to let aframe handle attributes directly
             switch (attribute) {
+                // Defer until physics is loaded. If it never loads...trigger load??
+                case 'static-body':
+                case 'dynamic-body':
+                    ARENA.events.addEventListener(ARENA_EVENTS.PHYSICS_LOADED, () => {
+                        if (value === null) {
+                            // if null, remove attribute
+                            entityEl.removeAttribute(attribute);
+                        } else {
+                            entityEl.setAttribute(attribute, value);
+                        }
+                    });
+                    break;
                 case 'rotation':
                     // rotation is set directly in the THREE.js object, for performance reasons
                     if (Object.hasOwn(value, 'w')) {