@needle-tools/engine 3.5.10-beta → 3.5.12-beta

package/src/engine-components/Component.ts

@@ -185,7 +185,7 @@ export abstract class GameObject extends Object3D implements Object3D, IGameObje
      * @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 @@ export abstract class GameObject extends Object3D implements Object3D, IGameObje
      * @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 @@ export abstract class GameObject extends Object3D implements Object3D, IGameObje
         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 @@ export abstract class GameObject extends Object3D implements Object3D, IGameObje
         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 @@ export class Component implements IComponent, EventTarget {
     }
 
     get name(): string {
+        if (this.gameObject?.name) {
+            return this.gameObject.name;
+        }
         return this.gameObject?.userData.name;
     }
     private __name?: string;

package/src/engine-components/OrbitControls.ts

@@ -87,7 +87,9 @@ export class OrbitControls extends Behaviour implements ICameraController {
             if (camGo && !this.setFromTargetPosition()) {
                 if (this.debugLog)
                     console.log("NO TARGET");
-                const forward = new Vector3(0, 0, -10).applyMatrix4(camGo.cam.matrixWorld);
+                const worldPosition = getWorldPosition(camGo.cam);
+                const distanceToCenter = worldPosition.length();
+                const forward = new Vector3(0, 0, -distanceToCenter).applyMatrix4(camGo.cam.matrixWorld);
                 this.setTarget(forward, true);
             }
         }

package/src/engine-components/TransformGizmo.ts

@@ -4,7 +4,7 @@ import { serializable } from "../engine/engine_serialization_decorator";
 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 {
 

package/src/engine-components/export/usdz/extensions/behavior/Behaviour.ts

@@ -11,6 +11,7 @@ export interface UsdzBehaviour {
     afterSerialize?(ext: BehaviorExtension, context: IContext): void;
 }
 
+/** internal USDZ behaviours extension */
 export class BehaviorExtension implements IUSDExporterExtension {
 
     get extensionName(): string {