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

package/src/engine-components/SpringJoint.ts

@@ -1,45 +1,45 @@
-import { Behaviour, GameObject } from "./Component";
-import { Rigidbody } from "./RigidBody";
-import * as CANNON from 'cannon-es'
-import { Vector3 } from "three";
+// import { Behaviour, GameObject } from "./Component";
+// import { Rigidbody } from "./RigidBody";
+// import * as CANNON from 'cannon-es'
+// import { Vector3 } from "three";
 
-export class SpringJoint extends Behaviour {
-    anchor: Vector3 | null = null;
-    connectedBody: Rigidbody | null = null;
-    connectedAnchor: Vector3 | null = null;
-    spring: number = 10;
-    damper: number = .2;
+// export class SpringJoint extends Behaviour {
+//     anchor: Vector3 | null = null;
+//     connectedBody: Rigidbody | null = null;
+//     connectedAnchor: Vector3 | null = null;
+//     spring: number = 10;
+//     damper: number = .2;
 
-    private rb  : Rigidbody | null = null;
+//     private rb  : Rigidbody | null = null;
 
-    awake(): void {
-        this.rb = GameObject.getComponent(this.gameObject, Rigidbody);
-        if(!this.connectedBody || !this.connectedBody.body || !this.rb || !this.rb.body) return;
-        this.connectedBody.body.mass = Math.min(this.rb.body.mass*.99, this.connectedBody.body.mass);
-        const spring = new CANNON.Spring(this.rb.body, this.connectedBody.body, {
-            // localAnchorA: new CANNON.Vec3(-1, 1, 0),
-            // localAnchorB: new CANNON.Vec3(0, 0, 0),
-            // restLength: -.1,
-            // stiffness: 10,
-            // damping: .2,
-            restLength: 0.01,
-            stiffness: this.spring*.5,
-            damping: this.damper,
-            // localAnchorA: new CANNON.Vec3(this.anchor.x, this.anchor.y, this.anchor.z),
-            // localAnchorB: new CANNON.Vec3(
-            //     this.connectedAnchor.x,
-            //     this.connectedAnchor.y,
-            //     this.connectedAnchor.z
-            // ),
-        });
-        this.context.physics.addPostStepListener(_ => {
-            // const wp = this.connectedBody.worldPosition;
-            // console.log(wp.y, this.connectedBody.body.position.y, this.rb.body.position.y);
-            spring.applyForce();
-        });
-    }
+//     awake(): void {
+//         this.rb = GameObject.getComponent(this.gameObject, Rigidbody);
+//         if(!this.connectedBody || !this.connectedBody.body || !this.rb || !this.rb.body) return;
+//         this.connectedBody.body.mass = Math.min(this.rb.body.mass*.99, this.connectedBody.body.mass);
+//         const spring = new CANNON.Spring(this.rb.body, this.connectedBody.body, {
+//             // localAnchorA: new CANNON.Vec3(-1, 1, 0),
+//             // localAnchorB: new CANNON.Vec3(0, 0, 0),
+//             // restLength: -.1,
+//             // stiffness: 10,
+//             // damping: .2,
+//             restLength: 0.01,
+//             stiffness: this.spring*.5,
+//             damping: this.damper,
+//             // localAnchorA: new CANNON.Vec3(this.anchor.x, this.anchor.y, this.anchor.z),
+//             // localAnchorB: new CANNON.Vec3(
+//             //     this.connectedAnchor.x,
+//             //     this.connectedAnchor.y,
+//             //     this.connectedAnchor.z
+//             // ),
+//         });
+//         this.context.physics.addPostStepListener(_ => {
+//             // const wp = this.connectedBody.worldPosition;
+//             // console.log(wp.y, this.connectedBody.body.position.y, this.rb.body.position.y);
+//             spring.applyForce();
+//         });
+//     }
 
-    update(): void {
-        // console.log(this.worldPosition.y)
-    }
-}
+//     update(): void {
+//         // console.log(this.worldPosition.y)
+//     }
+// }

package/src/engine-components/VideoPlayer.ts

@@ -1,8 +1,7 @@
 import { Behaviour, GameObject } from "./Component";
 import * as THREE from "three";
-import { Material } from "material/Material";
 import { serializeable } from "../engine/engine_serialization_decorator";
-import { LinearFilter, Mesh, Object3D, RawShaderMaterial, ShaderMaterial, Texture, TextureLoader, Vector2, Vector4, VideoTexture } from "three";
+import { LinearFilter, Material, Mesh, Object3D, RawShaderMaterial, ShaderMaterial, Texture, TextureLoader, Vector2, Vector4, VideoTexture } from "three";
 import { awaitInput } from "../engine/engine_input_utils";
 import { getParam } from "../engine/engine_utils";
 import { Renderer } from "./Renderer";

package/src/engine-components/WebXR.ts

@@ -461,6 +461,7 @@ export class WebAR {
     private _webxr: WebXR;
 
     private reticle: Object3D | null = null;
+    private reticleParent: Object3D | null = null;
     private hitTestSource: XRHitTestSource | null = null;
     private reticleActive: boolean = true;
 
@@ -504,6 +505,7 @@ export class WebAR {
         const context = this.webxr.context;
         this.reticleActive = true;
         this.didPlaceARSessionRoot = false;
+        this.getAROverlayContainer();
 
         const deviceType = navigator.userAgent?.includes("OculusBrowser") ? ControllerType.PhysicalDevice : ControllerType.Touch;
         const controllerCount = deviceType === ControllerType.Touch ? 4 : 2;
@@ -535,9 +537,18 @@ export class WebAR {
             this.reticle.name = "AR Placement reticle";
             this.reticle.matrixAutoUpdate = false;
             this.reticle.visible = false;
+
+            // create AR reticle parent to allow WebXRSessionRoot to be translated, rotated or scaled
+            this.reticleParent = new Object3D();
+            this.reticleParent.name = "AR Reticle Parent";
+            this.reticleParent.matrixAutoUpdate = false;
+            this.reticleParent.add(this.reticle);
+            this.reticleParent.matrix.copy(this.sessionRoot.gameObject.matrixWorld);
+            
             if (this.webxr.scene) {
-                this.webxr.scene.add(this.reticle);
-                this.webxr.scene.visible = true;
+                this.context.scene.add(this.reticleParent);
+                // this.context.scene.add(this.reticle);
+                this.context.scene.visible = true;
             }
             else console.warn("Could not found WebXR Rig");
         }
@@ -553,10 +564,8 @@ export class WebAR {
         }
         else console.warn("No WebARSessionRoot found in scene")
 
-        if (this.arDomOverlay && this.arOverlayElement) {
-            const el = this.arOverlayElement as INeedleEngineComponent;
-            el.onEnterAR?.call(el, session, this.arOverlayElement);
-        }
+        const eng = this.context.domElement as INeedleEngineComponent;
+        eng?.onEnterAR?.call(eng, session, this.arOverlayElement!);
 
         this.context.mainCameraComponent?.applyClearFlagsIfIsActiveCamera();
     }

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

@@ -13,9 +13,13 @@ export { AxesHelper } from "../AxesHelper";
 export { BasicIKConstraint } from "../BasicIKConstraint";
 export { BoxHelperComponent } from "../BoxHelperComponent";
 export { Camera } from "../Camera";
+export { CharacterController } from "../CharacterController";
+export { CharacterControllerInput } from "../CharacterController";
 export { Collider } from "../Collider";
 export { SphereCollider } from "../Collider";
 export { BoxCollider } from "../Collider";
+export { MeshCollider } from "../Collider";
+export { CapsuleCollider } from "../Collider";
 export { DeleteBox } from "../DeleteBox";
 export { Deletable } from "../DeleteBox";
 export { DeviceFlag } from "../DeviceFlag";
@@ -38,8 +42,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 +66,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";

package/src/engine-components/dist/CharacterController.js

@@ -0,0 +1,123 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+exports.__esModule = true;
+exports.CharacterControllerInput = exports.CharacterController = void 0;
+var three_1 = require("three");
+var engine_math_1 = require("../engine/engine_math");
+var engine_serialization_1 = require("../engine/engine_serialization");
+var Collider_1 = require("./Collider");
+var Component_1 = require("./Component");
+var RigidBody_1 = require("./RigidBody");
+var CharacterController = /** @class */ (function (_super) {
+    __extends(CharacterController, _super);
+    function CharacterController() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.center = new three_1.Vector3(0, 0, 0);
+        _this.radius = .5;
+        _this.height = 2;
+        return _this;
+    }
+    CharacterController.prototype.onEnable = function () {
+        var rb = this.gameObject.getComponent(RigidBody_1.Rigidbody);
+        var collider = this.gameObject.getComponent(Collider_1.CapsuleCollider);
+        if (!rb)
+            rb = this.gameObject.addNewComponent(RigidBody_1.Rigidbody);
+        if (!collider)
+            collider = this.gameObject.addNewComponent(Collider_1.CapsuleCollider);
+        // rb.isKinematic = true;
+        collider.center.copy(this.center);
+        collider.radius = this.radius;
+        collider.height = this.height;
+        this.gameObject.rotation.x = 0;
+        this.gameObject.rotation.z = 0;
+        rb.lockRotationX = true;
+        rb.lockRotationY = true;
+        rb.lockRotationZ = true;
+    };
+    CharacterController.prototype.move = function (vec) {
+        this.gameObject.position.add(vec);
+    };
+    CharacterController.prototype.onCollisionEnter = function (col) {
+        // console.log(col);
+    };
+    CharacterController.prototype.onCollisionExit = function (col) {
+    };
+    CharacterController.prototype.isGrounded = function () {
+    };
+    __decorate([
+        engine_serialization_1.serializeable(three_1.Vector3)
+    ], CharacterController.prototype, "center");
+    __decorate([
+        engine_serialization_1.serializeable()
+    ], CharacterController.prototype, "radius");
+    __decorate([
+        engine_serialization_1.serializeable()
+    ], CharacterController.prototype, "height");
+    return CharacterController;
+}(Component_1.Behaviour));
+exports.CharacterController = CharacterController;
+var CharacterControllerInput = /** @class */ (function (_super) {
+    __extends(CharacterControllerInput, _super);
+    function CharacterControllerInput() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.movementSpeed = 2;
+        _this.rotationSpeed = 2;
+        _this.jumpHeight = 1;
+        _this._currentSpeed = new three_1.Vector3(0, 0, 0);
+        _this._currentAngularSpeed = new three_1.Vector3(0, 0, 0);
+        _this._temp = new three_1.Vector3(0, 0, 0);
+        return _this;
+    }
+    CharacterControllerInput.prototype.update = function () {
+        var forward = this.context.input.isKeyPressed("w");
+        var backward = this.context.input.isKeyPressed("s");
+        var rotateLeft = this.context.input.isKeyPressed("a");
+        var rotateRight = this.context.input.isKeyPressed("d");
+        var jump = this.context.input.isKeyPressed("space");
+        var step = forward ? 1 : 0 + backward ? -1 : 0;
+        this._currentSpeed.z += step * this.movementSpeed * this.context.time.deltaTime;
+        this._temp.copy(this._currentSpeed);
+        this._temp.applyQuaternion(this.gameObject.quaternion);
+        if (this.controller)
+            this.controller.move(this._temp);
+        else
+            this.gameObject.position.add(this._temp);
+        var rotation = rotateLeft ? 1 : 0 + rotateRight ? -1 : 0;
+        this._currentAngularSpeed.y += engine_math_1.Mathf.toRadians(rotation * this.rotationSpeed) * this.context.time.deltaTime;
+        this.gameObject.rotateY(this._currentAngularSpeed.y);
+        this._currentSpeed.multiplyScalar(1 - this.context.time.deltaTime * 10);
+        this._currentAngularSpeed.y *= 1 - this.context.time.deltaTime * 10;
+    };
+    __decorate([
+        engine_serialization_1.serializeable(CharacterController)
+    ], CharacterControllerInput.prototype, "controller");
+    __decorate([
+        engine_serialization_1.serializeable()
+    ], CharacterControllerInput.prototype, "movementSpeed");
+    __decorate([
+        engine_serialization_1.serializeable()
+    ], CharacterControllerInput.prototype, "rotationSpeed");
+    __decorate([
+        engine_serialization_1.serializeable()
+    ], CharacterControllerInput.prototype, "jumpHeight");
+    return CharacterControllerInput;
+}(Component_1.Behaviour));
+exports.CharacterControllerInput = CharacterControllerInput;