@needle-tools/engine 2.35.2-pre → 2.35.3-pre

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

@@ -1,19 +1,32 @@
+import { Object3D } from "three";
+import { Constructor } from "../../engine/engine_types";
 
-const handlers : Map<any, ApplyPrototypeExtension> = new Map();
+const handlers: Map<any, ApplyPrototypeExtension> = new Map();
 
-export function applyPrototypeExtensions(obj : any){
-    if(!obj) return;
-    const prototype = obj.prototype;
-    if(!prototype) return;
+export function applyPrototypeExtensions<T>(obj: any, prototype : Constructor<T>) {
+    if (!obj) return;
+    // const prototype = Object.getPrototypeOf(obj);
+    // console.log("TEST", prototype)
+    if (!prototype) {
+        console.warn("No prototype found", obj, obj.prototype, obj.constructor);
+        return;
+    }
     let handler = handlers.get(prototype);
-    if(!handler){
-        handler = createPrototypeExtensionHandler(prototype);
-        handlers.set(prototype, handler);
+    if (handler) {
+        // console.log("OK", prototype);
+        handler.apply(obj);
     }
-    handler.apply(obj);
+    // applyPrototypeExtensions(prototype);
+}
+
+export function registerPrototypeExtensions<T>(type: Constructor<T>) {
+    console.log("Register", type.prototype.constructor.name);
+    const handler = createPrototypeExtensionHandler(type.prototype);
+    handlers.set(type, handler);
 }
 
-function createPrototypeExtensionHandler(prototype: any) { 
+
+function createPrototypeExtensionHandler(prototype: any) {
     return new ApplyPrototypeExtension(prototype);
 }
 
@@ -31,9 +44,11 @@ class ApplyPrototypeExtension implements IApplyPrototypeExtension {
         this.$symbol = Symbol("prototype-extension");
         // used to decorate cloned object3D objects with the same added components defined above
         this.extensions = Object.keys(prototype);
+        // console.log(this.extensions);
         this.descriptors = new Array<PropertyDescriptor | undefined>();
         for (let i = 0; i < this.extensions.length; i++) {
             const key = this.extensions[i];
+            // console.log(key);
             const descriptor = Object.getOwnPropertyDescriptor(prototype, key);
             if (descriptor) {
                 this.descriptors.push(descriptor);
@@ -41,7 +56,7 @@ class ApplyPrototypeExtension implements IApplyPrototypeExtension {
         }
     }
 
-    apply(object: object): void {
+    apply(object: Object3D): void {
 
         if (object[this.$symbol]) return;
         object[this.$symbol] = true;
@@ -58,7 +73,7 @@ class ApplyPrototypeExtension implements IApplyPrototypeExtension {
                 //         continue;
                 //     }
                 // }
-                // console.trace("DEFINE", object.name, key);
+                // console.warn("DEFINE", object, key);
                 Object.defineProperty(object, key, desc);
             }
         }

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

@@ -1,4 +1,4 @@
-import { applyPrototypeExtensions } from "./ExtensionUtils";
+import { applyPrototypeExtensions, registerPrototypeExtensions } from "./ExtensionUtils";
 import { Object3D } from "three";
 import { Constructor, ConstructorConcrete, IComponent } from "../../engine/engine_types"
 import { IComponent as Component } from "../../engine/engine_types";
@@ -6,24 +6,12 @@ import { addNewComponentInstance, getComponent, getComponentInChildren, getCompo
 
 // used to decorate cloned object3D objects with the same added components defined above
 export function apply(object: Object3D) {
-    if (object && object.isObject3D === true)
-        applyPrototypeExtensions(object);
+    if (object && object.isObject3D === true) {
+        applyPrototypeExtensions(object, Object3D);
+    }
 }
 
 
-// this is a fix to allow gameObject active animation be applied to a three object
-if (!Object.getOwnPropertyDescriptor(Object3D.prototype, "activeSelf")) {
-    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) {
@@ -65,3 +53,22 @@ Object3D.prototype["getComponentInParent"] = function <T extends IComponent>(typ
 Object3D.prototype["getComponentsInParent"] = function <T>(type: Constructor<T>, arr?: []) {
     return getComponentsInParent(this, type, arr);
 }
+
+// this is a fix to allow gameObject active animation be applied to a three object
+if (!Object.getOwnPropertyDescriptor(Object3D.prototype, "activeSelf")) {
+    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 this after adding the component extensions
+registerPrototypeExtensions(Object3D);

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

@@ -1,17 +1,19 @@
-import { applyPrototypeExtensions } from "./ExtensionUtils";
+import { applyPrototypeExtensions, registerPrototypeExtensions } from "./ExtensionUtils";
 import { Mathf } from "../../engine/engine_math";
 import { Vector3 } from "three";
 
 export function apply(object: Vector3) {
     if (object && object.isVector3 === true) {
-        console.log(object);
-        applyPrototypeExtensions(object);
+        applyPrototypeExtensions(object, Vector3);
     }
 }
 
+
 Vector3.prototype["slerp"] = function (end: Vector3, t: number) {
     const len1 = this.length();
     const len2 = end.length();
     const targetLen = Mathf.lerp(len1, len2, t);
     return this.lerp(end, t).normalize().multiplyScalar(targetLen);
-}
+}
+
+registerPrototypeExtensions(Vector3);