Needle Engine 3.5.11-beta

Files changed (7) hide show

plugins/vite/reload.js +4 -4
src/engine/api.ts +1 -1
src/engine-components/Component.ts +16 -13
src/engine/engine_hot_reload.ts +5 -5
src/engine/engine_license.ts +1 -0
src/engine/engine_typestore.ts +14 -1
src/engine-components/TransformGizmo.ts +1 -1

plugins/vite/reload.js CHANGED Viewed

@@ -274,7 +274,7 @@
     // this code injects a register call into the component method
     const code = `
-import { register, unregister } from "./engine/engine_hot_reload";
+import { registerHotReloadType as register, unregisterHotReloadType as unregister } from "./engine/engine_hot_reload";
 import { Component as ComponentType } from "./engine-components/Component";
 const prototype = ComponentType.prototype;
@@ -334,14 +334,14 @@
 // ${HOT_RELOAD_START_MARKER}
 // Inserted by needle reload plugin (vite)
-import { applyChanges } from "${importPath}";
+import { applyHMRChanges } from "${importPath}";
 //@ts-ignore
 if (import.meta.hot) {
     //@ts-ignore
-    import.meta.hot.accept((newModule) => {
+    import.meta.hot.accept((newModule, oldModule) => {
         if (newModule) {
-            const success = applyChanges(newModule);
+            const success = applyHMRChanges(newModule, oldModule);
             if(success === false){
                 //@ts-ignore
                 import.meta.hot.invalidate()

src/engine/api.ts CHANGED Viewed

@@ -44,7 +44,7 @@
 export * from "./engine_web_api";
 export * from "./engine_utils";
-export { TypeStore } from "./engine_typestore";
+export { TypeStore, registerType } from "./engine_typestore";
 export { InstancingUtil } from "./engine_instancing";
 export { validate, prefix } from "./engine_util_decorator"

src/engine-components/Component.ts CHANGED Viewed

@@ -185,7 +185,7 @@
      * @param go component to move the component to
      * @param instance component to move to the GO
      */
-    public static addComponent(go: IGameObject | Object3D, instance: Component): void {
+    public static addComponent<T extends IComponent>(go: IGameObject | Object3D, instance: T) {
         return this.moveComponent(go, instance);
     }
@@ -194,24 +194,24 @@
      * @param go component to move the component to
      * @param instance component to move to the GO
      */
-    public static moveComponent(go: IGameObject | Object3D, instance: Component): void {
-        moveComponentInstance(go, instance as any);
+    public static moveComponent<T extends IComponent>(go: IGameObject | Object3D, instance: T) {
+        return moveComponentInstance(go, instance);
     }
     /** Removes a component from its object
      * @param instance component to remove
      */
-    public static removeComponent(instance: Component): Component {
+    public static removeComponent<T extends IComponent>(instance: T): T {
         removeComponent(instance.gameObject, instance as any);
         return instance;
     }
-    public static getOrAddComponent<T>(go: IGameObject | Object3D, typeName: ConstructorConcrete<T>): T {
+    public static getOrAddComponent<T extends IComponent>(go: IGameObject | Object3D, typeName: ConstructorConcrete<T>): T {
         return getOrAddComponent<any>(go, typeName);
     }
     /** Gets a component on the provided object */
-    public static getComponent<T>(go: IGameObject | Object3D | null, typeName: Constructor<T> | null): T | null {
+    public static getComponent<T extends IComponent>(go: IGameObject | Object3D | null, typeName: Constructor<T> | null): T | null {
         if (go === null) return null;
         // if names are minified we could also use the type store and work with strings everywhere
         // not ideal, but I dont know a good/sane way to do this otherwise
@@ -220,7 +220,7 @@
         return getComponent(go, typeName as any);
     }
-    public static getComponents<T>(go: IGameObject | Object3D | null, typeName: Constructor<T>, arr: T[] | null = null): T[] {
+    public static getComponents<T extends IComponent>(go: IGameObject | Object3D | null, typeName: Constructor<T>, arr: T[] | null = null): T[] {
         if (go === null) return arr ?? [];
         return getComponents(go, typeName, arr);
     }
@@ -230,29 +230,29 @@
         return res as GameObject | Component | null | undefined;
     }
-    public static findObjectOfType<T>(typeName: Constructor<T>, context?: Context | Object3D, includeInactive: boolean = true): T | null {
+    public static findObjectOfType<T extends IComponent>(typeName: Constructor<T>, context?: Context | Object3D, includeInactive: boolean = true): T | null {
         return findObjectOfType(typeName, context ?? Context.Current, includeInactive);
     }
-    public static findObjectsOfType<T>(typeName: Constructor<T>, context?: Context | Object3D): Array<T> {
+    public static findObjectsOfType<T extends IComponent>(typeName: Constructor<T>, context?: Context | Object3D): Array<T> {
         const arr = [];
         findObjectsOfType(typeName, arr, context);
         return arr;
     }
-    public static getComponentInChildren<T>(go: IGameObject | Object3D, typeName: Constructor<T>): T | null {
+    public static getComponentInChildren<T extends IComponent>(go: IGameObject | Object3D, typeName: Constructor<T>): T | null {
         return getComponentInChildren(go, typeName);
     }
-    public static getComponentsInChildren<T>(go: IGameObject | Object3D, typeName: Constructor<T>, arr: T[] | null = null): Array<T> {
+    public static getComponentsInChildren<T extends IComponent>(go: IGameObject | Object3D, typeName: Constructor<T>, arr: T[] | null = null): Array<T> {
         return getComponentsInChildren<T>(go, typeName, arr ?? undefined) as T[]
     }
-    public static getComponentInParent<T>(go: IGameObject | Object3D, typeName: Constructor<T>): T | null {
+    public static getComponentInParent<T extends IComponent>(go: IGameObject | Object3D, typeName: Constructor<T>): T | null {
         return getComponentInParent(go, typeName);
     }
-    public static getComponentsInParent<T>(go: IGameObject | Object3D, typeName: Constructor<T>, arr: Array<T> | null = null): Array<T> {
+    public static getComponentsInParent<T extends IComponent>(go: IGameObject | Object3D, typeName: Constructor<T>, arr: Array<T> | null = null): Array<T> {
         return getComponentsInParent(go, typeName, arr);
     }
@@ -307,6 +307,9 @@
     }
     get name(): string {
+        if (this.gameObject?.name) {
+            return this.gameObject.name;
+        }
         return this.gameObject?.userData.name;
     }
     private __name?: string;

src/engine/engine_hot_reload.ts CHANGED Viewed

@@ -33,7 +33,7 @@
     return isApplyingChanges;
 }
-export function register(instance: object) {
+export function registerHotReloadType(instance: object) {
     if (isApplyingChanges) return;
     const type = instance.constructor;
     const name = type.name;
@@ -45,7 +45,7 @@
     }
 }
-export function unregister(instance: object) {
+export function unregisterHotReloadType(instance: object) {
     if (isApplyingChanges) return;
     const type = instance.constructor;
     const name = type.name;
@@ -81,10 +81,10 @@
 }
-export function applyChanges(newModule): boolean {
+export function applyHMRChanges(newModule): boolean {
     if (debug)
-        console.log("Hot Reload - apply changes");
+        console.log("[HMR] Apply changes", newModule, Object.keys(newModule));
     reloadPageOnHotReloadError();
@@ -96,6 +96,7 @@
             const typeToUpdate = TypeStore.get(key);
             if (!typeToUpdate) {
+                if(debug) console.log("[HMR] Type not found: " + key)
                 continue;
             }
             const newType = newModule[key];
@@ -194,4 +195,3 @@
     return true;
 }

src/engine/engine_license.ts CHANGED Viewed

@@ -142,6 +142,7 @@
         font-weight: 300;
         transition: all 0.1s ease-in-out !important;
         pointer-events: all;
+        overflow: hidden;
     }
     ${selector}:hover {

src/engine/engine_typestore.ts CHANGED Viewed

@@ -20,4 +20,17 @@
 export const $BuiltInTypeFlag = Symbol("BuiltInType");
-export const TypeStore = new _TypeStore();
+export const TypeStore = new _TypeStore();
+/**
+ * add to a class declaration to automatically register it to the TypeStore (required for HMR right now)
+ *
+ * `@registerType`
+ *
+ * `export class MyType extends Behaviour { ... }`
+ */
+export const registerType = function (constructor: Function) {
+    if (!TypeStore.get(constructor.name))
+        TypeStore.add(constructor.name, constructor);
+}

src/engine-components/TransformGizmo.ts CHANGED Viewed

@@ -4,7 +4,7 @@
 import * as params from "../engine/engine_default_parameters";
 import { Mesh, MathUtils, EventListener } from "three";
 import { TransformControls } from "three/examples/jsm/controls/TransformControls";
-import { OrbitControls } from "three/examples/jsm/controls/OrbitControls";
+import { OrbitControls } from "./OrbitControls";
 export class TransformGizmo extends Behaviour {