@needle-tools/engine 2.36.0-pre → 2.37.0-pre

package/src/engine-components/WebXRController.ts

@@ -2,12 +2,14 @@ import { BoxHelper, BufferGeometry, Color, Euler, Group, Intersection, Layers, L
 import { OculusHandModel } from 'three/examples/jsm/webxr/OculusHandModel.js';
 import { OculusHandPointerModel } from 'three/examples/jsm/webxr/OculusHandPointerModel.js';
 import { XRControllerModel, XRControllerModelFactory } from 'three/examples/jsm/webxr/XRControllerModelFactory.js';
+import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js'
 
 import { InstancingUtil } from "../engine/engine_instancing";
 import { Mathf } from "../engine/engine_math";
 import { RaycastOptions } from "../engine/engine_physics";
 import { getWorldPosition, getWorldQuaternion, setWorldPosition, setWorldQuaternion } from "../engine/engine_three_utils";
 import { getParam, getPath } from "../engine/engine_utils";
+import { addDracoAndKTX2Loaders } from "../engine/engine_loaders";
 
 import { Avatar_POI } from "./avatar/Avatar_Brain_LookAt";
 import { Behaviour, GameObject } from "./Component";
@@ -79,9 +81,14 @@ export class WebXRController extends Behaviour {
         ctrl.controllerGrip.add(ctrl.controllerModel);
 
         ctrl.hand = context.renderer.xr.getHand(index);
-        const hand = new OculusHandModel(ctrl.hand);
+
+        const loader = new GLTFLoader();
+        addDracoAndKTX2Loaders(loader, context);
         if (ctrl.webXR.handModelPath && ctrl.webXR.handModelPath !== "")
-            hand["path"] = "/" + getPath(owner.sourceId, ctrl.webXR.handModelPath);
+            loader.setPath("/" + getPath(owner.sourceId, ctrl.webXR.handModelPath));
+        //@ts-ignore
+        const hand = new OculusHandModel(ctrl.hand, loader);
+
         ctrl.hand.add(hand);
         ctrl.hand.traverse(x => x.layers.set(2));
 
@@ -738,7 +745,7 @@ export class WebXRController extends Behaviour {
 
         if (debug) {
             if (!this.closeGrabBoundingBoxHelper && overlapCenter) {
-                this.closeGrabBoundingBoxHelper = new BoxHelper( overlapCenter, 0xffff00 );
+                this.closeGrabBoundingBoxHelper = new BoxHelper(overlapCenter, 0xffff00);
                 this.scene.add(this.closeGrabBoundingBoxHelper);
             }
 
@@ -825,7 +832,7 @@ export class AttachedObject {
             return null;
         }
         else candidate = interactable.gameObject;
-        
+
 
         let objectToAttach = candidate;
         const sync = GameObject.getComponentInParent(candidate, SyncedTransform);
@@ -981,12 +988,11 @@ export class AttachedObject {
         this.sync = null;
 
 
-        // TODO: this doesnt work yet
+        // TODO: make throwing work again
         if (this.rigidbodies) {
             for (const rb of this.rigidbodies) {
                 rb.wakeUp();
-                if (!rb.smoothedVelocity) continue;
-                rb.setVelocity(rb.smoothedVelocity.x, rb.smoothedVelocity.y, rb.smoothedVelocity.z);
+                rb.setVelocity(rb.smoothedVelocity);
             }
         }
         this.rigidbodies = null;
@@ -1039,6 +1045,9 @@ export class AttachedObject {
     }
 
     public update() {
+        if (this.rigidbodies)
+            for (const rb of this.rigidbodies)
+                rb.resetVelocities();
         // TODO: add/use sync lost ownership event
         if (this.sync && this.controller && this.controller.context.connection.isInRoom) {
             const td = this.controller.context.time.time - this.grabTime;

package/src/engine-components/codegen/components.ts

@@ -16,6 +16,7 @@ export { Camera } from "../Camera";
 export { Collider } from "../Collider";
 export { SphereCollider } from "../Collider";
 export { BoxCollider } from "../Collider";
+export { MeshCollider } from "../Collider";
 export { DeleteBox } from "../DeleteBox";
 export { Deletable } from "../DeleteBox";
 export { DeviceFlag } from "../DeviceFlag";
@@ -38,8 +39,6 @@ export { Light } from "../Light";
 export { LODModel } from "../LODGroup";
 export { LODGroup } from "../LODGroup";
 export { LookAtConstraint } from "../LookAtConstraint";
-export { NavMesh } from "../NavMesh";
-export { NavMeshAgent } from "../NavMesh";
 export { NestedGltf } from "../NestedGltf";
 export { Networking } from "../Networking";
 export { OffsetConstraint } from "../OffsetConstraint";
@@ -64,7 +63,6 @@ export { SmoothFollow } from "../SmoothFollow";
 export { SpatialTriggerReceiver } from "../SpatialTrigger";
 export { SpatialTrigger } from "../SpatialTrigger";
 export { SpectatorCamera } from "../SpectatorCamera";
-export { SpringJoint } from "../SpringJoint";
 export { Sprite } from "../SpriteRenderer";
 export { SpriteRenderer } from "../SpriteRenderer";
 export { SyncedCamera } from "../SyncedCamera";