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

package/lib/engine-components/Camera.js

@@ -12,6 +12,7 @@ import { serializeable } from "../engine/engine_serialization_decorator";
 import { RGBAColor } from "./js-extensions/RGBAColor";
 import { PerspectiveCamera } from "three";
 import { XRSessionMode } from "../engine/engine_setup";
+import { showBalloonMessage } from "../engine/debug/debug";
 export var ClearFlags;
 (function (ClearFlags) {
     ClearFlags[ClearFlags["Skybox"] = 1] = "Skybox";
@@ -111,6 +112,9 @@ export class Camera extends Behaviour {
         }
         this.applyClearFlagsIfIsActiveCamera();
     }
+    onDisable() {
+        this.context.removeCamera(this);
+    }
     buildCamera() {
         if (this._cam)
             return;
@@ -149,6 +153,8 @@ export class Camera extends Behaviour {
         }
     }
     applyClearFlagsIfIsActiveCamera() {
+        if (debug)
+            showBalloonMessage("apply Camera clear flags");
         if (this._cam && this.context.mainCameraComponent === this) {
             switch (this._clearFlags) {
                 case ClearFlags.Skybox:
@@ -184,12 +190,21 @@ export class Camera extends Behaviour {
         if (!session)
             return false;
         const environmentBlendMode = session.environmentBlendMode;
+        if (debug)
+            showBalloonMessage("Environment blend mode: " + environmentBlendMode + " on " + navigator.userAgent);
         const transparent = environmentBlendMode === 'additive' || environmentBlendMode === 'alpha-blend';
-        // workaround for Quest 2 returning opaque when it should be alpha-blend
-        // check user agent if this is the Quest browser and return true if so
-        if (environmentBlendMode === "opaque" && navigator.userAgent?.includes("OculusBrowser")) {
-            if (this.context.xrSessionMode === XRSessionMode.ImmersiveAR)
-                return true;
+        if (this.context.xrSessionMode === XRSessionMode.ImmersiveAR) {
+            if (environmentBlendMode === "opaque") {
+                // workaround for Quest 2 returning opaque when it should be alpha-blend
+                // check user agent if this is the Quest browser and return true if so
+                if (navigator.userAgent?.includes("OculusBrowser")) {
+                    return true;
+                }
+                // Mozilla WebXR Viewer
+                else if (navigator.userAgent?.includes("Mozilla") && navigator.userAgent?.includes("Mobile WebXRViewer/v2")) {
+                    return true;
+                }
+            }
         }
         return transparent;
     }

package/lib/engine-components/Camera.js.map

@@ -1 +1 @@
-{"version":3,"file":"Camera.js","sourceRoot":"","sources":["../../../engine-components/Camera.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Camera.js","sourceRoot":"","sources":["../../../engine-components/Camera.ts"],"names":[],"mappings":"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"}

package/lib/engine-components/CharacterController.d.ts

@@ -0,0 +1,31 @@
+import { Vector3 } from "three";
+import { Collision } from "../engine/engine_types";
+import { Behaviour } from "./Component";
+import { Rigidbody } from "./RigidBody";
+import { Animator } from "./Animator";
+export declare class CharacterController extends Behaviour {
+    center: Vector3;
+    radius: number;
+    height: number;
+    private _rigidbody;
+    get rigidbody(): Rigidbody;
+    onEnable(): void;
+    move(vec: Vector3): void;
+    private _activeGroundCollisions;
+    onCollisionEnter(col: Collision): void;
+    onCollisionExit(col: Collision): void;
+    get isGrounded(): boolean;
+}
+export declare class CharacterControllerInput extends Behaviour {
+    controller?: CharacterController;
+    movementSpeed: number;
+    rotationSpeed: number;
+    jumpForce: number;
+    animator?: Animator;
+    private _currentSpeed;
+    private _currentAngularSpeed;
+    private _temp;
+    private _jumpCount;
+    update(): void;
+    private _raycastOptions;
+}

package/lib/engine-components/CharacterController.js

@@ -0,0 +1,167 @@
+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;
+};
+import { Ray, Vector3 } from "three";
+import { Mathf } from "../engine/engine_math";
+import { serializeable } from "../engine/engine_serialization";
+import { CapsuleCollider } from "./Collider";
+import { Behaviour } from "./Component";
+import { Rigidbody } from "./RigidBody";
+import { Animator } from "./Animator";
+import { RaycastOptions } from "../engine/engine_physics";
+import { getWorldPosition } from "../engine/engine_three_utils";
+export class CharacterController extends Behaviour {
+    center = new Vector3(0, 0, 0);
+    radius = .5;
+    height = 2;
+    _rigidbody = null;
+    get rigidbody() {
+        if (this._rigidbody)
+            return this._rigidbody;
+        this._rigidbody = this.gameObject.getComponent(Rigidbody);
+        if (!this._rigidbody)
+            this._rigidbody = this.gameObject.addNewComponent(Rigidbody);
+        return this.rigidbody;
+    }
+    onEnable() {
+        let rb = this.rigidbody;
+        let collider = this.gameObject.getComponent(CapsuleCollider);
+        if (!collider)
+            collider = this.gameObject.addNewComponent(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;
+        // TODO: this doesnt work yet
+        // setInterval(()=>{
+        //     this.rigidbody.isKinematic = !this.rigidbody.isKinematic;
+        //     console.log(this.rigidbody.isKinematic);
+        // }, 1000)
+    }
+    move(vec) {
+        this.gameObject.position.add(vec);
+    }
+    _activeGroundCollisions = new Set();
+    onCollisionEnter(col) {
+        for (const contact of col.contacts) {
+            // console.log(contact.normal);
+            if (contact.normal.y > .1) {
+                this._activeGroundCollisions.add(col);
+                break;
+            }
+        }
+    }
+    onCollisionExit(col) {
+        this._activeGroundCollisions.delete(col);
+    }
+    get isGrounded() { return this._activeGroundCollisions.size > 0; }
+}
+__decorate([
+    serializeable(Vector3)
+], CharacterController.prototype, "center", void 0);
+__decorate([
+    serializeable()
+], CharacterController.prototype, "radius", void 0);
+__decorate([
+    serializeable()
+], CharacterController.prototype, "height", void 0);
+export class CharacterControllerInput extends Behaviour {
+    controller;
+    movementSpeed = 2;
+    rotationSpeed = 2;
+    jumpForce = 1;
+    animator;
+    _currentSpeed = new Vector3(0, 0, 0);
+    _currentAngularSpeed = new Vector3(0, 0, 0);
+    _temp = new Vector3(0, 0, 0);
+    _jumpCount = 0;
+    update() {
+        if (this.controller?.isGrounded) {
+            this._jumpCount = 0;
+            this.animator?.SetBool("doubleJump", false);
+        }
+        const forward = this.context.input.isKeyPressed("w");
+        const backward = this.context.input.isKeyPressed("s");
+        const rotateLeft = this.context.input.isKeyPressed("a");
+        const rotateRight = this.context.input.isKeyPressed("d");
+        const jump = this.context.input.isKeyDown(" ");
+        // if (jumpDown) this._jumpDownTime = this.context.time.time;
+        // const jumpUp = this.context.input.isKeyUp(" ");
+        const step = forward ? 1 : 0 + backward ? -1 : 0;
+        this._currentSpeed.z += step * this.movementSpeed * this.context.time.deltaTime;
+        // if (!this.controller || this.controller.isGrounded)
+        this.animator?.SetBool("running", step != 0);
+        this.animator?.SetBool("jumping", this.controller?.isGrounded === true && jump);
+        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);
+        const rotation = rotateLeft ? 1 : 0 + rotateRight ? -1 : 0;
+        this._currentAngularSpeed.y += 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;
+        if (this.controller && jump && this.jumpForce > 0) {
+            let canJump = this.controller?.isGrounded;
+            if (!this.controller?.isGrounded && this._jumpCount === 1) {
+                canJump = true;
+                this.animator?.SetBool("doubleJump", true);
+            }
+            if (canJump) {
+                this._jumpCount += 1;
+                // TODO: factor in mass
+                const rb = this.controller.rigidbody;
+                // const fullJumpHoldLength = .1;
+                const factor = this._jumpCount === 2 ? 2 : 1; // Mathf.clamp((this.context.time.time - this._jumpDownTime), 0, fullJumpHoldLength) / fullJumpHoldLength;
+                rb.applyImpulse(new Vector3(0, 1, 0).multiplyScalar(this.jumpForce * factor));
+            }
+        }
+        if (this.controller) {
+            // TODO: should probably raycast to the ground or check if we're still in the jump animation
+            const verticalSpeed = this.controller?.rigidbody.getVelocity().y;
+            if (verticalSpeed < -1) {
+                if (!this._raycastOptions.ray)
+                    this._raycastOptions.ray = new Ray();
+                this._raycastOptions.ray.origin.copy(getWorldPosition(this.gameObject));
+                this._raycastOptions.ray.direction.set(0, -1, 0);
+                const currentLayer = this.layer;
+                this.gameObject.layers.disableAll();
+                this.gameObject.layers.set(2);
+                const hits = this.context.physics.raycast(this._raycastOptions);
+                this.gameObject.layers.set(currentLayer);
+                if ((hits.length && hits[0].distance > 2 || verticalSpeed < -10)) {
+                    this.animator?.SetBool("falling", true);
+                }
+            }
+            else
+                this.animator?.SetBool("falling", false);
+        }
+    }
+    _raycastOptions = new RaycastOptions();
+}
+__decorate([
+    serializeable(CharacterController)
+], CharacterControllerInput.prototype, "controller", void 0);
+__decorate([
+    serializeable()
+], CharacterControllerInput.prototype, "movementSpeed", void 0);
+__decorate([
+    serializeable()
+], CharacterControllerInput.prototype, "rotationSpeed", void 0);
+__decorate([
+    serializeable()
+], CharacterControllerInput.prototype, "jumpForce", void 0);
+__decorate([
+    serializeable(Animator)
+], CharacterControllerInput.prototype, "animator", void 0);
+//# sourceMappingURL=CharacterController.js.map

package/lib/engine-components/CharacterController.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CharacterController.js","sourceRoot":"","sources":["../../../engine-components/CharacterController.ts"],"names":[],"mappings":"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"}

package/lib/engine-components/Collider.d.ts

@@ -1,12 +1,11 @@
 import { Behaviour } from "./Component";
 import { Rigidbody } from "./RigidBody";
-import { Shape } from "cannon-es";
+import { Mesh, Vector3 } from "three";
 import { ICollider } from "../engine/engine_types";
 export declare class Collider extends Behaviour implements ICollider {
     get isCollider(): any;
     attachedRigidbody: Rigidbody | null;
     isTrigger: boolean;
-    protected _shape: Shape | null;
     awake(): void;
     start(): void;
     onEnable(): void;
@@ -14,11 +13,23 @@ export declare class Collider extends Behaviour implements ICollider {
 }
 export declare class SphereCollider extends Collider {
     radius: number;
-    center: THREE.Vector3;
+    center: Vector3;
     onEnable(): void;
 }
 export declare class BoxCollider extends Collider {
-    size: THREE.Vector3;
-    center: THREE.Vector3;
+    size: Vector3;
+    center: Vector3;
+    onEnable(): void;
+}
+export declare class MeshCollider extends Collider {
+    sharedMesh?: Mesh;
+    convex: boolean;
+    awake(): void;
+    onEnable(): void;
+}
+export declare class CapsuleCollider extends Collider {
+    center: Vector3;
+    radius: number;
+    height: number;
     onEnable(): void;
 }

package/lib/engine-components/Collider.js

@@ -7,25 +7,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { Behaviour } from "./Component";
 import { Rigidbody } from "./RigidBody";
 import { serializeable } from "../engine/engine_serialization_decorator";
-import { Vector3 } from "three";
-import { registerColliderProvider } from "../engine/engine_physics";
-import { getComponentInChildren } from "../engine/engine_components";
-class ColliderProvider {
-    getCollider(obj) {
-        return getComponentInChildren(obj, Collider);
-    }
-}
-registerColliderProvider(new ColliderProvider());
+import { Mesh, Vector3 } from "three";
 export class Collider extends Behaviour {
     get isCollider() {
         return true;
     }
     attachedRigidbody = null;
     isTrigger = false;
-    _shape = null;
     awake() {
         super.awake();
-        this._shape = null;
+        if (!this.attachedRigidbody)
+            this.attachedRigidbody = this.gameObject.getComponentInParent(Rigidbody);
     }
     start() {
         if (!this.attachedRigidbody)
@@ -37,8 +29,7 @@ export class Collider extends Behaviour {
             this.attachedRigidbody = this.gameObject.getComponentInParent(Rigidbody);
     }
     onDisable() {
-        if (this._shape) {
-        }
+        this.context.physics.removeBody(this);
     }
 }
 __decorate([
@@ -52,8 +43,7 @@ export class SphereCollider extends Collider {
     center = new Vector3(0, 0, 0);
     onEnable() {
         super.onEnable();
-        if (!this._shape)
-            this._shape = this.context.physics.addSphereCollider(this.gameObject, this.center, this.radius, this.attachedRigidbody);
+        this.context.physics.addSphereCollider(this, this.center, this.radius);
     }
 }
 __decorate([
@@ -67,8 +57,7 @@ export class BoxCollider extends Collider {
     center = new Vector3(0, 0, 0);
     onEnable() {
         super.onEnable();
-        if (!this._shape)
-            this._shape = this.context.physics.addBoxCollider(this.gameObject, this.isTrigger, this.center, this.size, this.attachedRigidbody);
+        this.context.physics.addBoxCollider(this, this.center, this.size);
     }
 }
 __decorate([
@@ -77,10 +66,43 @@ __decorate([
 __decorate([
     serializeable(Vector3)
 ], BoxCollider.prototype, "center", void 0);
-// export class MeshCollider extends Collider {
-//     onEnable() {
-//         if (this.enabled)
-//             this.context.physics.addMeshCollider(this.gameObject);
-//     }
-// }
+export class MeshCollider extends Collider {
+    sharedMesh;
+    convex = false;
+    awake() {
+        console.log(this);
+    }
+    onEnable() {
+        super.onEnable();
+        if (!this.sharedMesh?.isMesh) {
+            // HACK using the renderer mesh
+            if (this.gameObject instanceof Mesh) {
+                this.sharedMesh = this.gameObject;
+            }
+        }
+        if (this.sharedMesh?.isMesh)
+            this.context.physics.addMeshCollider(this, this.sharedMesh, this.convex);
+    }
+}
+__decorate([
+    serializeable()
+], MeshCollider.prototype, "convex", void 0);
+export class CapsuleCollider extends Collider {
+    center = new Vector3(0, 0, 0);
+    radius = .5;
+    height = 2;
+    onEnable() {
+        super.onEnable();
+        this.context.physics.addCapsuleCollider(this, this.center, this.height, this.radius);
+    }
+}
+__decorate([
+    serializeable(Vector3)
+], CapsuleCollider.prototype, "center", void 0);
+__decorate([
+    serializeable()
+], CapsuleCollider.prototype, "radius", void 0);
+__decorate([
+    serializeable()
+], CapsuleCollider.prototype, "height", void 0);
 //# sourceMappingURL=Collider.js.map

package/lib/engine-components/Collider.js.map

@@ -1 +1 @@
-{"version":3,"file":"Collider.js","sourceRoot":"","sources":["../../../engine-components/Collider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Collider.js","sourceRoot":"","sources":["../../../engine-components/Collider.ts"],"names":[],"mappings":"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"}

package/lib/engine-components/Component.d.ts

@@ -1,7 +1,7 @@
 import * as THREE from "three";
 import { Context, FrameEvent } from "../engine/engine_setup";
 import { Object3D } from "three";
-import { ConstructorConcrete, SourceIdentifier, IComponent, IGameObject, Constructor, GuidsMap, Collision } from "../engine/engine_types";
+import { ConstructorConcrete, SourceIdentifier, IComponent, IGameObject, Constructor, GuidsMap, Collision, ICollider } from "../engine/engine_types";
 import { InstantiateOptions, HideFlags } from "../engine/engine_gameobject";
 declare abstract class GameObject extends THREE.Object3D implements THREE.Object3D, IGameObject {
     guid: string | undefined;
@@ -77,6 +77,7 @@ declare class Component implements IComponent, EventTarget {
     onEnable(): void;
     onDisable(): void;
     onDestroy(): void;
+    onValidate?(prop?: string): void;
     start?(): void;
     earlyUpdate?(): void;
     update?(): void;
@@ -85,11 +86,10 @@ declare class Component implements IComponent, EventTarget {
     onAfterRender?(): void;
     onCollisionEnter?(col: Collision): any;
     onCollisionExit?(col: Collision): any;
-    onCollisionExitRaw?(col: Collision): any;
     onCollisionStay?(col: Collision): any;
-    onTriggerEnter?(col: Collision): any;
-    onTriggerStay?(col: Collision): any;
-    onTriggerExit?(col: Collision): any;
+    onTriggerEnter?(col: ICollider): any;
+    onTriggerStay?(col: ICollider): any;
+    onTriggerExit?(col: ICollider): any;
     startCoroutine(routine: Generator, evt?: FrameEvent): Generator;
     stopCoroutine(routine: Generator, evt?: FrameEvent): void;
     get destroyed(): boolean;
@@ -100,6 +100,7 @@ declare class Component implements IComponent, EventTarget {
     protected __isEnabled: boolean | undefined;
     private __destroyed;
     get __internalDidAwakeAndStart(): boolean;
+    constructor();
     __internalNewInstanceCreated(): void;
     __internalAwake(): void;
     __internalStart(): void;
@@ -108,16 +109,6 @@ declare class Component implements IComponent, EventTarget {
     __internalDestroy(): void;
     get enabled(): boolean;
     set enabled(val: boolean);
-    constructor();
-    private _collisionExitRoutine;
-    private _collisions;
-    private _triggerExitRoutine;
-    private _triggerCollisions;
-    get collisionsCount(): number;
-    private __internalResetsCachedPhysicsData;
-    __internalHandleCollision(col: Collision, isTriggerCollision: boolean): void;
-    __internalHandleExitCollisionEvent(obj: Object3D, isTriggerCollision: boolean): void;
-    private __waitForCollisionExit;
     private static _worldPositionBuffer;
     private static _worldQuaternionBuffer;
     private static _worldEulerBuffer;