@needle-tools/engine 3.3.0-alpha → 3.5.0-alpha

package/src/engine/engine_context.ts

@@ -1,7 +1,8 @@
-import { BufferGeometry, Camera, Clock, Color, DepthTexture, Group, 
-	Material, NearestFilter, NoToneMapping, Object3D, PCFSoftShadowMap, 
-	PerspectiveCamera, RGBAFormat, Scene, sRGBEncoding, 
-	Texture, WebGLRenderer, WebGLRenderTarget 
+import {
+	BufferGeometry, Camera, Clock, Color, DepthTexture, Group,
+	Material, NearestFilter, NoToneMapping, Object3D, PCFSoftShadowMap,
+	PerspectiveCamera, RGBAFormat, Scene, sRGBEncoding,
+	Texture, WebGLRenderer, WebGLRenderTarget
 } from 'three'
 import { Input } from './engine_input';
 import { Physics } from './engine_physics';
@@ -27,6 +28,7 @@ import { PlayerViewManager } from './engine_playerview';
 import { CoroutineData, ICamera, IComponent, IContext, ILight } from "./engine_types"
 import { destroy, foreachComponent } from './engine_gameobject';
 import { ContextEvent, ContextRegistry } from './engine_context_registry';
+import { delay } from './engine_utils';
 // import { createCameraWithOrbitControl } from '../engine-components/CameraUtils';
 
 
@@ -251,8 +253,8 @@ export class Context implements IContext {
 			this.isManagedExternally = true;
 		}
 		else {
-			this.renderer = new WebGLRenderer({ 
-				antialias: true 
+			this.renderer = new WebGLRenderer({
+				antialias: true
 			});
 
 			// some tonemapping other than "NONE" is required for adjusting exposure with EXR environments
@@ -346,12 +348,13 @@ export class Context implements IContext {
 			camera.updateProjectionMatrix();
 	}
 
-	onCreate(buildScene?: (context: Context, loadingOptions?: LoadingOptions) => Promise<void>, opts?: LoadingOptions) {
+	async onCreate(buildScene?: (context: Context, loadingOptions?: LoadingOptions) => Promise<void>, opts?: LoadingOptions) {
 		if (this._isCreated) {
 			console.warn("Context already created");
 			return null;
 		}
 		this._isCreated = true;
+        await delay(1);
 		return this.internalOnCreate(buildScene, opts);
 	}
 
@@ -498,8 +501,8 @@ export class Context implements IContext {
 
 	private async internalOnCreate(buildScene?: (context: Context, opts?: LoadingOptions) => Promise<void>, opts?: LoadingOptions) {
 
-		// TODO: we could configure if we need physics
-		await this.physics.createWorld();
+		Context.Current = this;
+		await ContextRegistry.dispatchCallback(ContextEvent.ContextCreationStart, this);
 
 		// load and create scene
 		let prepare_succeeded = true;
@@ -512,7 +515,7 @@ export class Context implements IContext {
 			console.error(err);
 			prepare_succeeded = false;
 		}
-		if (!prepare_succeeded) return;
+		if (!prepare_succeeded) return false;
 
 		this.internalOnUpdateVisible();
 
@@ -523,6 +526,9 @@ export class Context implements IContext {
 
 		Context.Current = this;
 
+		// TODO: we could configure if we need physics
+		// await this.physics.engine?.initialize();
+
 		// Setup
 		Context.Current = this;
 		for (let i = 0; i < this.new_scripts.length; i++) {
@@ -609,13 +615,13 @@ export class Context implements IContext {
 		if (debug)
 			logHierarchy(this.scene, true);
 
-		ContextRegistry.dispatchCallback(ContextEvent.ContextCreated, this);
+		return ContextRegistry.dispatchCallback(ContextEvent.ContextCreated, this);
 	}
 
 	private _accumulatedTime = 0;
 	private _framerateClock = new Clock();
 
-	private render(_, frame : XRFrame) {
+	private render(_, frame: XRFrame) {
 		this._xrFrame = frame;
 
 		this._currentFrameEvent = FrameEvent.Undefined;
@@ -627,7 +633,7 @@ export class Context implements IContext {
 			}
 			this._accumulatedTime = 0;
 		}
-		
+
 		this._stats?.begin();
 
 		Context.Current = this;
@@ -696,16 +702,19 @@ export class Context implements IContext {
 		this.executeCoroutines(FrameEvent.LateUpdate);
 		if (this.onHandlePaused()) return;
 
-		const physicsSteps = 1;
-		const dt = this.time.deltaTime / physicsSteps;
-		for (let i = 0; i < physicsSteps; i++) {
-			this._currentFrameEvent = FrameEvent.PrePhysicsStep;
-			this.executeCoroutines(FrameEvent.PrePhysicsStep);
-			this.physics.step(dt);
-			this._currentFrameEvent = FrameEvent.PostPhysicsStep;
-			this.executeCoroutines(FrameEvent.PostPhysicsStep);
+		if (this.physics.engine) {
+			const physicsSteps = 1;
+			const dt = this.time.deltaTime / physicsSteps;
+			for (let i = 0; i < physicsSteps; i++) {
+				this._currentFrameEvent = FrameEvent.PrePhysicsStep;
+				this.executeCoroutines(FrameEvent.PrePhysicsStep);
+				this.physics.engine.step(dt);
+				this._currentFrameEvent = FrameEvent.PostPhysicsStep;
+				this.executeCoroutines(FrameEvent.PostPhysicsStep);
+			}
+			this.physics.engine.postStep();
 		}
-		this.physics.postStep();
+		
 		if (this.onHandlePaused()) return;
 
 		if (this.isVisibleToUser) {
@@ -781,7 +790,7 @@ export class Context implements IContext {
 		this.renderRequiredTextures();
 		// if (camera === this.mainCameraComponent?.cam) {
 		// 	if (this.mainCameraComponent.activeTexture) {
-				
+
 		// 	}
 		// }
 		if (this.composer && !this.isInXR) {

package/src/engine/engine_context_registry.ts

@@ -1,8 +1,10 @@
-import { IContext } from "./engine_types";
+import { IComponent, IContext } from "./engine_types";
 
 export enum ContextEvent {
     /** called when the context is registered to the registry, the context is not fully initialized at this point */
     ContextRegistered = "ContextRegistered",
+    /** called before the first glb is loaded, can be used to initialize physics engine, is awaited */
+    ContextCreationStart = "ContextCreationStart",
     ContextCreated = "ContextCreated",
     ContextDestroyed = "ContextDestroyed",
     MissingCamera = "MissingCamera",
@@ -13,11 +15,11 @@ export type ContextEventArgs = {
     context: IContext;
 }
 
-export type ContextCallback = (evt: ContextEventArgs) => void;
+export type ContextCallback = (evt: ContextEventArgs) => void | Promise<any> | IComponent;
 
 export class ContextRegistry {
 
-    static get Current(): IContext{
+    static get Current(): IContext {
         return globalThis["NeedleEngine.Context.Current"]
     }
     static set Current(ctx: IContext) {
@@ -51,10 +53,15 @@ export class ContextRegistry {
         this._callbacks[evt].splice(index, 1);
     }
 
-    static dispatchCallback(evt: ContextEvent, context:IContext) {
-        if (!this._callbacks[evt]) return;
+    static dispatchCallback(evt: ContextEvent, context: IContext) {
+        if (!this._callbacks[evt]) return true;
         const args = { event: evt, context }
-        this._callbacks[evt].forEach(cb => cb(args));
+        const promises = new Array<Promise<any>>();
+        this._callbacks[evt].forEach(cb => {
+            const res = cb(args)
+            if (res instanceof Promise) promises.push(res);
+        });
+        return Promise.all(promises);
     }
 
     static addContextCreatedCallback(callback: ContextCallback) {

package/src/engine/engine_element.ts

@@ -164,6 +164,7 @@ export class NeedleEngineHTMLElement extends HTMLElement implements INeedleEngin
             return;
         }
 
+
         this._previousSrc = src;
 
         // Set the source attribute so codegen doesnt try to re-assign it again and we communicate to the outside which root files are being loaded
@@ -221,7 +222,7 @@ export class NeedleEngineHTMLElement extends HTMLElement implements INeedleEngin
                     if (!url.includes(".glb") && !url.includes(".gltf")) {
                         const warning = `Needle Engine: found suspicious src "${url}"`;
                         console.warn(warning);
-                        if(isLocalNetwork()) showBalloonWarning(warning);
+                        if (isLocalNetwork()) showBalloonWarning(warning);
                     }
                     const fileName = getNameFromUrl(url);
                     const progress: LoadingProgressArgs = {

package/src/engine/engine_element_loading.ts

@@ -73,7 +73,7 @@ export class EngineLoadingView implements ILoadingViewHandler {
     }
 
     onLoadingBegin(message?: string) {
-        if (debug) console.log("Begin Loading")
+        if (debug) console.warn("Begin Loading")
         if (!this._loadingElement) {
             for (let i = 0; i < this._element.children.length; i++) {
                 const el = this._element.children[i] as HTMLElement;
@@ -98,9 +98,8 @@ export class EngineLoadingView implements ILoadingViewHandler {
     }
 
     onLoadingUpdate(progress: LoadingProgressArgs | ProgressEvent | number, message?: string) {
-        // if the element has no parent we want to add it
         if (!this._loadingElement?.parentElement) {
-            this.onLoadingBegin(message);
+            return;
         }
         // console.log(callback.name, callback.progress.loaded / callback.progress.total, callback.index + "/" + callback.count);
         let total01 = 0;

package/src/engine/engine_gameobject.ts

@@ -163,8 +163,9 @@ export function foreachComponent(instance: Object3D, cb: ForEachComponentCallbac
     return internalForEachComponent(instance, cb, recursive);
 }
 
-export function* foreachComponentEnumerator<T extends IComponent>(instance: Object3D, type?: Constructor<T>, includeChildren: boolean = false): Generator<T> {
+export function* foreachComponentEnumerator<T extends IComponent>(instance: Object3D, type?: Constructor<T>, includeChildren: boolean = false, maxLevel: number = 999, _currentLevel: number = 0): Generator<T> {
     if (!instance?.userData.components) return;
+    if (_currentLevel > maxLevel) return;
     for (const comp of instance.userData.components) {
         if (type && comp?.isComponent === true && comp instanceof type) {
             yield comp;
@@ -175,7 +176,7 @@ export function* foreachComponentEnumerator<T extends IComponent>(instance: Obje
     }
     if (includeChildren === true) {
         for (const ch of instance.children) {
-            yield* foreachComponentEnumerator(ch, type, true);
+            yield* foreachComponentEnumerator(ch, type, true, maxLevel, _currentLevel + 1);
         }
     }
 }

package/src/engine/engine_input.ts

@@ -2,7 +2,7 @@ import { Vector2 } from 'three';
 import { showBalloonMessage, showBalloonWarning } from './debug/debug';
 import { assign } from './engine_serialization_core';
 import { Context } from './engine_setup';
-import { Vec2 } from './engine_types';
+import { IInput, Vec2 } from './engine_types';
 import { getParam } from './engine_utils';
 
 const debug = getParam("debuginput");
@@ -52,7 +52,7 @@ export enum PointerType {
 //     }
 // }
 
-export class Input extends EventTarget {
+export class Input extends EventTarget implements IInput {
 
     _doubleClickTimeThreshold = .2;
     _longPressTimeThreshold = 1;