@needle-tools/engine 2.32.0-pre → 2.34.0-pre

package/{lib/engine-components/codegen/exports.js → src/engine-components/codegen/components.ts}

@@ -1,4 +1,5 @@
 // Export types
+export class __Ignore {}
 export { AlignmentConstraint } from "../AlignmentConstraint";
 export { Animation } from "../Animation";
 export { AnimationCurve } from "../AnimationCurve";
@@ -16,7 +17,6 @@ export { Collider } from "../Collider";
 export { SphereCollider } from "../Collider";
 export { BoxCollider } from "../Collider";
 export { InstantiateOptions } from "../Component";
-export { UnityObject } from "../ComponentExtensions";
 export { DeleteBox } from "../DeleteBox";
 export { Deletable } from "../DeleteBox";
 export { DeviceFlag } from "../DeviceFlag";
@@ -55,7 +55,6 @@ export { FieldWithDefault } from "../Renderer";
 export { Renderer } from "../Renderer";
 export { MeshRenderer } from "../Renderer";
 export { SkinnedMeshRenderer } from "../Renderer";
-export { InstancingUtil } from "../Renderer";
 export { RendererLightmap } from "../RendererLightmap";
 export { Rigidbody } from "../RigidBody";
 export { ScreenCapture } from "../ScreenCapture";
@@ -138,4 +137,3 @@ export { Rect } from "../ui/RectTransform";
 export { RectTransform } from "../ui/RectTransform";
 export { SpatialHtml } from "../ui/SpatialHtml";
 export { Text } from "../ui/Text";
-//# sourceMappingURL=exports.js.map

package/src/engine-components/js-extensions/Object3D.ts

@@ -0,0 +1,91 @@
+import { Object3D } from "three";
+import { Behaviour, Component, Constructor, ConstructorConcrete, GameObject } from "../Component";
+
+const decorated = Symbol("GameObject.decorated");
+
+// this is a fix to allow gameObject active animation be applied to a three object
+Object.defineProperty(Object3D.prototype, "activeSelf", {
+    get: function () {
+        return this.visible;
+    },
+    set: function (val: boolean | number) {
+        const state = typeof val === "number" ? val > 0.5 : val;
+        this.visible = state;
+    }
+});
+
+
+// do we still need this?
+Object3D.prototype["SetActive"] = function (active: boolean) {
+    this.visible = active;
+}
+
+Object3D.prototype["addNewComponent"] = function <T extends Behaviour>(type: ConstructorConcrete<T>) {
+    return GameObject.addNewComponent(this, type);
+}
+
+Object3D.prototype["removeComponent"] = function (inst: Component) {
+    return GameObject.removeComponent(inst);
+}
+
+Object3D.prototype["getOrAddComponent"] = function <T>(typeName: Constructor<T> | null): T {
+    return GameObject.getOrAddComponent(this, typeName);
+}
+
+Object3D.prototype["getComponent"] = function <T>(type: Constructor<T>) {
+    return GameObject.getComponent(this, type);
+}
+
+Object3D.prototype["getComponents"] = function <T>(type: Constructor<T>, arr?: []) {
+    return GameObject.getComponents(this, type, arr);
+}
+
+Object3D.prototype["getComponentInChildren"] = function <T>(type: Constructor<T>) {
+    return GameObject.getComponentInChildren(this, type);
+}
+
+Object3D.prototype["getComponentsInChildren"] = function <T>(type: Constructor<T>, arr?: []) {
+    return GameObject.getComponentsInChildren(this, type, arr);
+}
+
+Object3D.prototype["getComponentInParent"] = function <T>(type: Constructor<T>) {
+    return GameObject.getComponentInParent(this, type);
+}
+
+Object3D.prototype["getComponentsInParent"] = function <T>(type: Constructor<T>, arr?: []) {
+    return GameObject.getComponentsInParent(this, type, arr);
+}
+
+
+// used to decorate cloned object3D objects with the same added components defined above
+const extensions = Object.keys(Object3D.prototype);
+const descriptors = new Array<PropertyDescriptor | undefined>();
+for (let i = 0; i < extensions.length; i++) {
+    const key = extensions[i];
+    const descriptor = Object.getOwnPropertyDescriptor(Object3D.prototype, key);
+    if (descriptor) {
+        descriptors.push(descriptor);
+    }
+}
+
+export function apply(object: Object3D) {
+    if (object[decorated]) return;
+    object[decorated] = true;
+
+    // const prototype = object.constructor.prototype;
+
+    for (let i = 0; i < extensions.length; i++) {
+        const key = extensions[i];
+        const desc = descriptors[i];
+        if (desc) {
+            // if (prototype) {
+            //     const exists = Object.getOwnPropertyDescriptor(prototype, key);
+            //     if (exists) {
+            //         continue;
+            //     }
+            // }
+            // console.trace("DEFINE", object.name, key);
+            Object.defineProperty(object, key, desc);
+        }
+    }
+}

package/src/engine-components/ui/EventSystem.ts

@@ -75,9 +75,13 @@ export class EventSystem extends Behaviour {
         }
     }
 
+    private _selectStartFn?: any;
+    private _selectEndFn?: any;
+    private _selectUpdateFn?: any;
+
     onEnable(): void {
 
-        WebXRController.addEventListener(ControllerEvents.SelectStart, (ctrl, args: { grab: THREE.Object3D | null }) => {
+        this._selectStartFn ??= (ctrl, args: { grab: THREE.Object3D | null }) => {
             if (!args.grab) return;
             MeshUIHelper.resetLastSelected();
             const opts = new PointerEventData();
@@ -88,11 +92,9 @@ export class EventSystem extends Behaviour {
             opts.isClicked = false;
             if (args.grab && !this.handleEvents(args.grab, opts)) {
                 args.grab = null;
-            }
-        });
-
-        const controllerRcOpts = new RaycastOptions();
-        WebXRController.addEventListener(ControllerEvents.SelectEnd, (ctrl, args: { grab: THREE.Object3D }) => {
+            };
+        }
+        this._selectEndFn ??= (ctrl, args: { grab: THREE.Object3D }) => {
             if (!args.grab) return;
             const opts = new PointerEventData();
             opts.inputSource = ctrl;
@@ -101,23 +103,30 @@ export class EventSystem extends Behaviour {
             opts.isPressed = ctrl.selectionPressed;
             opts.isClicked = ctrl.selectionClick;
             this.handleEvents(args.grab, opts);
-        });
+        };
 
-        WebXRController.addEventListener(ControllerEvents.Update, (_ctrl: WebXRController) => {
+        const controllerRcOpts = new RaycastOptions();
+        this._selectUpdateFn ??= (_ctrl: WebXRController) => {
             controllerRcOpts.ray = _ctrl.getRay();
             const rc = this.performRaycast(controllerRcOpts);
             if (!rc) return;
             const opts = new PointerEventData();
             opts.inputSource = _ctrl;
             this.handleIntersections(rc, opts);
-        });
+        };
+
+        WebXRController.addEventListener(ControllerEvents.SelectStart, this._selectStartFn);
+        WebXRController.addEventListener(ControllerEvents.SelectEnd, this._selectEndFn);
+        WebXRController.addEventListener(ControllerEvents.Update, this._selectUpdateFn);
 
         this.context.pre_update_callbacks.push(this.onBeforeUpdate.bind(this));
         this.context.input.addEventListener(InputEvents.PointerDown, this.onPointerDown.bind(this));
     }
 
     onDisable(): void {
-        // TODO: unsubscribe from controller events
+        WebXRController.removeEventListener(ControllerEvents.SelectStart, this._selectStartFn);
+        WebXRController.removeEventListener(ControllerEvents.SelectEnd, this._selectEndFn);
+        WebXRController.removeEventListener(ControllerEvents.Update, this._selectUpdateFn);
     }
 
     onPointerDown() {

package/src/needle-engine.ts

@@ -1,15 +1,16 @@
 import "./engine/engine_element";
 import "./engine/engine_setup";
+import * as Components from "./engine-components/codegen/components";
 // import "./engine/engine_mainloop";
 // import "./engine-components/DomOverlay";
 
 export { GameObject, Behaviour } from "./engine-components/Component";
 export { serializeable } from "./engine/engine_serialization_decorator";
 export { Collision } from "./engine/engine_physics";
-export * from "./engine-components/codegen/exports";
-
+export * from "./engine-components/codegen/components";
 
 
+export * from "./engine-components/js-extensions/Object3D";
 
 // make accessible for external javascript
 import { Context } from "./engine/engine_setup";
@@ -21,7 +22,6 @@ function registerGlobal(obj: object) {
     }
 }
 import * as Component from "./engine-components/Component";
-import * as Components from "./engine-components/codegen/exports";
 registerGlobal(Component);
 registerGlobal(Components);
 

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

@@ -1,2 +0,0 @@
-export declare class UnityObject {
-}

package/lib/engine-components/ComponentExtensions.js

@@ -1,3 +0,0 @@
-export class UnityObject {
-}
-//# sourceMappingURL=ComponentExtensions.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"ComponentExtensions.js","sourceRoot":"","sources":["../../../engine-components/ComponentExtensions.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,WAAW;CAEvB"}

package/lib/engine-components/codegen/exports.js.map

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

package/src/engine-components/ComponentExtensions.ts

@@ -1,7 +0,0 @@
-import * as THREE from 'three';
-import {GameObject, Behaviour} from "./Component"
-
-
-export class UnityObject {
-
-}