@needle-tools/engine 2.33.0-pre → 2.35.0-pre

package/src/engine/{engine_components.js → engine_components.ts}

@@ -1,55 +1,59 @@
-import { activeInHierarchyFieldName } from './engine_constants';
-import { removeScriptFromContext } from './engine_mainloop_utils';
-import { Context } from './engine_setup';
-import * as main from "../engine/engine_mainloop_utils";
-import { getParam } from './engine_utils';
+import { Object3D } from "three";
+import { Constructor, ConstructorConcrete, IComponent as Component, IComponent, IGameObject } from "./engine_types";
+import { Context, registerComponent } from "./engine_setup";
+import { getParam } from "./engine_utils";
+import { removeScriptFromContext, updateActiveInHierarchyWithoutEventCall } from "./engine_mainloop_utils";
+import { activeInHierarchyFieldName } from "./engine_constants";
 
 const debug = getParam("debuggetcomponent");
 
+
 function tryGetObject(obj) {
-    if(obj === null || obj === undefined) return obj;
-    if(obj.isObject3D) return obj;
+    if (obj === null || obj === undefined) return obj;
+    if (obj.isObject3D) return obj;
     // handle threejs intersection object
     if (obj.object && obj.object.isObject3D) return obj.object;
     return obj;
 }
 
-export function registerComponent(script, context) {
-    if (!script) return;
-    const new_scripts = context?.new_scripts ?? Context.Current.new_scripts;
-    if (!new_scripts.includes(script)) {
-        new_scripts.push(script);
-    }
-}
 
-export const removeComponent = function (go, componentInstance) {
+export function removeComponent(go: Object3D, componentInstance: IComponent) {
     if (!go) return;
     if (!go.userData.components) return;
     const index = go.userData.components.indexOf(componentInstance);
     if (index < 0) return;
+    //@ts-ignore
     componentInstance.gameObject = null;
     go.userData.components.splice(index, 1);
 }
 
-const addNewComponentInstance = function (componentInstance, obj, callAwake = true) {
+export function getOrAddComponent<T extends IComponent>(go: Object3D, typeName: ConstructorConcrete<T>): T {
+    const comp = getComponent(typeName, go);
+    if (comp) return comp;
+    const newInstance = new typeName();
+    return addNewComponentInstance(go, newInstance) as unknown as T;
+}
+
+export function addNewComponentInstance<T extends IComponent>(obj: Object3D, componentInstance: T, callAwake = true): IComponent {
     if (!obj.userData) obj.userData = {};
     if (!obj.userData.components) obj.userData.components = [];
     obj.userData.components.push(componentInstance);
-    componentInstance.gameObject = obj;
+    componentInstance.gameObject = obj as IGameObject;
     // componentInstance.transform = obj;
     registerComponent(componentInstance);
     try {
         if (componentInstance.__internalAwake && callAwake) {
-            main.updateActiveInHierarchyWithoutEventCall(obj);
+            updateActiveInHierarchyWithoutEventCall(obj);
             componentInstance.__internalAwake();
         }
     }
     catch (err) {
         console.error(err);
     }
+    return componentInstance;
 }
 
-const moveComponentInstance = function (componentInstance, obj) {
+export function moveComponentInstance(componentInstance: IComponent, obj: Object3D) {
     if (componentInstance.gameObject === obj) return;
     // TODO: update raycast array
     if (componentInstance.gameObject && componentInstance.gameObject.userData.components) {
@@ -59,12 +63,12 @@ const moveComponentInstance = function (componentInstance, obj) {
     if (!obj.userData.components) obj.userData.components = [];
     else if (obj.userData.components.includes(componentInstance)) return;
     obj.userData.components.push(componentInstance);
-    componentInstance.gameObject = obj;
+    componentInstance.gameObject = obj as IGameObject;
     // componentInstance.transform = obj;
 }
 
 
-const destroyComponentInstance = function (componentInstance) {
+export function destroyComponentInstance(componentInstance: IComponent) {
     // console.log("destroy", componentInstance, componentInstance.onDestroy);
     // TODO: update raycast array
     if (componentInstance.gameObject && componentInstance.gameObject.userData.components) {
@@ -75,12 +79,13 @@ const destroyComponentInstance = function (componentInstance) {
     if (componentInstance.__internalDisable) componentInstance.__internalDisable();
     if (componentInstance.onDestroy) componentInstance.onDestroy();
     removeScriptFromContext(componentInstance, componentInstance.context ?? Context.Current);
-    componentInstance.__destroyed = true;
+    componentInstance.__internalDestroy();
+    //@ts-ignore
     componentInstance.gameObject = null;
     // console.log("destroyed", index, componentInstance);
 }
 
-const onGetComponent = function (componentType, obj, arr) {
+export function onGetComponent<T>(componentType: Constructor<T>, obj: Object3D, arr?: IComponent[]) {
     if (!(obj?.userData?.components)) return null;
     if (debug)
         console.log("FIND", componentType);
@@ -111,16 +116,16 @@ const onGetComponent = function (componentType, obj, arr) {
     return arr;
 }
 
-const getComponent = function (componentType, obj) {
-    return onGetComponent(componentType, obj, null);
+export function getComponent<T>(componentType: Constructor<T>, obj) {
+    return onGetComponent(componentType, obj);
 }
 
-const getComponents = function (componentType, obj, arr) {
+export function getComponents(componentType, obj, arr) {
     if (!arr) arr = [];
     return onGetComponent(componentType, obj, arr);
 }
 
-const getComponentInChildren = function (componentType, obj, includeInactive) {
+export function getComponentInChildren(componentType, obj, includeInactive?: boolean) {
     const res = getComponent(componentType, obj);
     if (includeInactive === false && res.enabled === false) return null;
     if (res) return res;
@@ -131,7 +136,7 @@ const getComponentInChildren = function (componentType, obj, includeInactive) {
     return null;
 }
 
-const getComponentsInChildren = function (componentType, obj, arr) {
+export function getComponentsInChildren<T extends IComponent>(componentType : Constructor<T>, obj : Object3D, arr?: T[]) {
     if (!arr) arr = [];
     getComponents(componentType, obj, arr);
     for (let i = 0; i < obj?.children?.length; i++) {
@@ -140,7 +145,7 @@ const getComponentsInChildren = function (componentType, obj, arr) {
     return arr;
 }
 
-const getComponentInParent = function (componentType, obj) {
+export function getComponentInParent(componentType, obj) {
     if (!obj) return null;
     if (Array.isArray(obj)) {
         for (let i = 0; i < obj.length; i++) {
@@ -156,14 +161,14 @@ const getComponentInParent = function (componentType, obj) {
     return getComponentInParent(componentType, obj.parent);
 }
 
-const getComponentsInParent = function (componentType, obj, arr) {
+export function getComponentsInParent(componentType, obj, arr) {
     if (!arr) arr = [];
     if (!obj) return arr;
     getComponents(componentType, obj, arr);
     return getComponentsInParent(componentType, obj.parent, arr);
 }
 
-const findObjectOfType = function (type, contextOrScene, includeInactive) {
+export function findObjectOfType(type, contextOrScene, includeInactive) {
     if (!type) return null;
     if (!contextOrScene) {
         contextOrScene = Context.Current;
@@ -183,7 +188,7 @@ const findObjectOfType = function (type, contextOrScene, includeInactive) {
     return null;
 }
 
-const findObjectsOfType = function (type, array, contextOrScene) {
+export function findObjectsOfType(type, array, contextOrScene) {
     if (!type) return array;
     if (!contextOrScene) {
         contextOrScene = Context.Current;
@@ -200,19 +205,4 @@ const findObjectsOfType = function (type, array, contextOrScene) {
         getComponentsInChildren(type, child, array);
     }
     return array;
-}
-
-
-export {
-    addNewComponentInstance,
-    moveComponentInstance,
-    destroyComponentInstance,
-    getComponent,
-    getComponents,
-    getComponentInChildren,
-    getComponentsInChildren,
-    getComponentInParent,
-    getComponentsInParent,
-    findObjectOfType,
-    findObjectsOfType,
 }

package/src/engine/engine_create_objects.ts

@@ -0,0 +1,27 @@
+import { PlaneGeometry, MeshBasicMaterial, DoubleSide, Mesh, Material } from "three"
+
+
+export enum PrimitiveType {
+    Quad = 0
+}
+
+export type ObjectOptions = {
+    name?: string,
+    material?: Material,
+}
+
+export class ObjectUtils {
+
+    static createPrimitive(type: PrimitiveType, opts?: ObjectOptions): Mesh {
+        let obj: Mesh;
+        switch (type) {
+            case PrimitiveType.Quad:
+                const geometry = new PlaneGeometry(1, 1, 1, 1);
+                const material = opts?.material ?? new MeshBasicMaterial({ color: 0xffffff });
+                obj = new Mesh(geometry, material);
+        }
+        if (opts?.name)
+            obj.name = opts.name;
+        return obj;
+    }
+} 

package/src/engine/engine_element.ts

@@ -1,11 +1,11 @@
 import { Context, build_scene_functions, LoadingOptions, LoadingProgressArgs } from "./engine_setup";
 import { AROverlayHandler, arContainerClassName } from "./engine_element_overlay";
 import { GameObject } from "../engine-components/Component";
-import { loadSync } from "./engine_scenetools";
 import { processNewScripts } from "./engine_mainloop_utils";
 import { calculateProgress01, EngineLoadingView, ILoadingViewHandler } from "./engine_element_loading";
 import { delay, getParam } from "./engine_utils";
 import { setDracoDecoderPath, setDracoDecoderType, setKtx2TranscoderPath } from "./engine_loaders";
+import { getLoader } from "../engine/engine_gltf";
 
 const debug = getParam("debugwebcomponent");
 
@@ -42,7 +42,7 @@ class EngineElementSourceFileWatcher {
 
         this.previousSource = newSource;
         Context.Current = this.context;
-        const res = await loadSync(this.context, newSource, this.getHashFromString(newSource));
+        const res = await getLoader().loadSync(this.context, newSource, this.getHashFromString(newSource), false);
         if (!isStartup)
             processNewScripts(this.context);
         const obj = res?.scene;