@needle-tools/engine 2.36.0-pre → 2.38.0-pre

package/src/engine/engine_addressables.ts

@@ -5,7 +5,7 @@ import { Context } from "./engine_setup";
 import { Group, Object3D, Scene } from "three";
 import { processNewScripts } from "./engine_mainloop_utils";
 import { InstantiateEvent, registerPrefabProvider, syncInstantiate } from "./engine_networking_instantiate";
-import { download } from "./engine_web_api";
+import { download, hash } from "./engine_web_api";
 import { getLoader } from "./engine_gltf";
 import { SourceIdentifier } from "./engine_types";
 import { destroy, instantiate, InstantiateOptions } from "./engine_gameobject";
@@ -51,11 +51,11 @@ export class AssetReference {
 
     static getOrCreate(sourceId: SourceIdentifier, uri: string, context: Context): AssetReference {
         const fullPath = getPath(sourceId, uri);
-        if(debug) console.log("GetOrCreate Addressable from", sourceId, uri, "FinalPath=", fullPath);
+        if (debug) console.log("GetOrCreate Addressable from", sourceId, uri, "FinalPath=", fullPath);
         const addressables = context.addressables;
         const existing = addressables.findAssetReference(fullPath);
         if (existing) return existing;
-        const ref = new AssetReference(fullPath);
+        const ref = new AssetReference(fullPath, context.hash);
         addressables.registerAssetReference(ref);
         return ref;
     }
@@ -63,6 +63,7 @@ export class AssetReference {
     get asset(): any {
         return this._glbRoot ?? this._asset;
     }
+
     protected set asset(val: any) {
         this._asset = val;
     }
@@ -70,7 +71,7 @@ export class AssetReference {
     private _loading?: PromiseLike<any>;
 
     get uri(): string {
-        return this._uri!;
+        return this._uri;
     }
 
     get rawAsset(): any { return this._asset; }
@@ -80,11 +81,20 @@ export class AssetReference {
     private _uri: string;
     private _progressListeners: ProgressCallback[] = [];
 
+    private _hash?: string;
+    private _hashedUri: string;
+
     private _isLoadingRawBinary: boolean = false;
     private _rawBinary?: ArrayBuffer | null;
 
-    constructor(uri: string) {
+    constructor(uri: string, hash?: string) {
         this._uri = uri;
+        this._hash = hash;
+        if (uri.includes("?v="))
+            this._hashedUri = uri;
+        else
+            this._hashedUri = hash ? uri + "?v=" + hash : uri;
+
         registerPrefabProvider(this._uri, this.onResolvePrefab.bind(this));
     }
 
@@ -120,8 +130,8 @@ export class AssetReference {
         if (this._isLoadingRawBinary) return null;
         if (this._rawBinary !== undefined) return this._rawBinary;
         this._isLoadingRawBinary = true;
-        if (debug) console.log("Preload", this.uri);
-        const res = await download(this.uri, p => {
+        if (debug) console.log("Preload", this._hashedUri);
+        const res = await download(this._hashedUri, p => {
             this.raiseProgressEvent(p);
         });
         this._rawBinary = res?.buffer ?? null;
@@ -148,7 +158,7 @@ export class AssetReference {
         }
         else {
             if (debug) console.log("Load async", this.uri);
-            this._loading = getLoader().loadSync(context, this.uri, null, true, prog => {
+            this._loading = getLoader().loadSync(context, this._hashedUri, null, true, prog => {
                 this.raiseProgressEvent(prog);
             });
         }

package/src/engine/engine_element.ts

@@ -133,7 +133,8 @@ export class EngineElement extends HTMLElement implements INeedleEngineComponent
         if (srcAttributeValue) src = srcAttributeValue;
 
         const alias = this.getAttribute("alias");
-        this._context = new Context({ name: src, domElement: this, alias: alias });
+        const hash = this.getAttribute("hash");
+        this._context = new Context({ name: src, domElement: this, alias: alias, hash: hash ?? undefined });
         this._watcher = new EngineElementSourceFileWatcher(this.getAttribute("id") ?? alias ?? "", this._context);
 
         if (src && src.length > 0) {
@@ -234,7 +235,7 @@ export class EngineElement extends HTMLElement implements INeedleEngineComponent
     }
 
     static get observedAttributes() {
-        return ["src", "loadstart", "progress", "loadfinished", "dracoDecoderPath", "dracoDecoderType", "ktx2DecoderPath"];
+        return ["hash", "src", "loadstart", "progress", "loadfinished", "dracoDecoderPath", "dracoDecoderType", "ktx2DecoderPath"];
     }
 
     attributeChangedCallback(name: string, _oldValue: string, newValue: string) {

package/src/engine/engine_element_overlay.ts

@@ -73,11 +73,12 @@ export class AROverlayHandler {
             return element;
         }
         if (element.children) {
-            // @ts-ignore
-            for (const ch of element.children) {
+            for (let i = 0; i < element.children.length; i++) {
+                const ch = element.children[i] as HTMLElement;
                 if (!ch || !ch.classList) continue;
-                if (ch.classList.contains(arContainerClassName))
+                if (ch.classList.contains(arContainerClassName)) {
                     return ch;
+                }
             }
         }
 

package/src/engine/engine_gameobject.ts

@@ -8,6 +8,7 @@ import { getParam, tryFindObject } from "./engine_utils";
 import { apply } from "../engine-components/js-extensions/Object3D";
 import { InstancingUtil } from "./engine_instancing";
 import { activeInHierarchyFieldName } from "./engine_constants";
+import { assign } from "./engine_serialization_core";
 
 const debug = getParam("debuggetcomponent");
 
@@ -61,9 +62,9 @@ export function isActiveSelf(go: Object3D): boolean {
     return go[$isActive] && visible;
 }
 
-export function setActive(go:Object3D, active:boolean, setVisible = true){
+export function setActive(go: Object3D, active: boolean, setVisible = true) {
     go[$isActive] = active;
-    if(setVisible) go.visible = active;
+    if (setVisible) go.visible = active;
 }
 
 export function isActiveInHierarchy(go: Object3D): boolean {
@@ -319,12 +320,11 @@ function internalInstantiate(
         for (let i = 0; i < components.length; i++) {
             const comp = components[i];
             const copy = Object.create(comp);
-            Object.assign(copy, comp);
+            assign(copy, comp);
             newComponents.push(copy);
             copy.gameObject = clone;
             // copy.transform = clone;
             componentsList.push(copy);
-
         }
     }
 

package/src/engine/engine_input.ts

@@ -147,6 +147,10 @@ export class Input extends EventTarget {
         if (i >= this._mouseWheelChanged.length) return false;
         return this._mouseWheelChanged[i];
     }
+    getMouseWheelDeltaY(i: number = 0): number {
+        if (i >= this._mouseWheelDeltaY.length) return 0;
+        return this._mouseWheelDeltaY[i];
+    }
     getPointerEvent(i: number): Event | undefined {
         if (i >= this._pointerEvent.length) return undefined;
         return this._pointerEvent[i] ?? undefined;
@@ -169,6 +173,7 @@ export class Input extends EventTarget {
     private _pointerIds: number[] = [];
     private _pointerTypes: string[] = [""];
     private _mouseWheelChanged: boolean[] = [false];
+    private _mouseWheelDeltaY: number[] = [0];
     private _pointerEvent: Event[] = [];
 
     getKeyDown(): string | null {
@@ -269,11 +274,12 @@ export class Input extends EventTarget {
             this._pointerClick[i] = false;
         for (let i = 0; i < this._pointerDoubleClick.length; i++)
             this._pointerDoubleClick[i] = false;
-        for (const pt of this._pointerPositionsDelta) {
+        for (const pt of this._pointerPositionsDelta)
             pt.set(0, 0);
-        }
         for (let i = 0; i < this._mouseWheelChanged.length; i++)
             this._mouseWheelChanged[i] = false;
+        for (let i = 0; i < this._mouseWheelDeltaY.length; i++)
+            this._mouseWheelDeltaY[i] = 0;
     }
 
 
@@ -307,9 +313,12 @@ export class Input extends EventTarget {
         this.onDispatchEvent(InputEvents.KeyUp, new KeyEventArgs(evt));
     }
 
-    private onMouseWheel(_evt) {
+    private onMouseWheel(evt: WheelEvent) {
+        if (this._mouseWheelDeltaY.length <= 0) this._mouseWheelDeltaY.push(0);
         if (this._mouseWheelChanged.length <= 0) this._mouseWheelChanged.push(false);
         this._mouseWheelChanged[0] = true;
+        const current = this._mouseWheelDeltaY[0];
+        this._mouseWheelDeltaY[0] = current + evt.deltaY;
     }
 
     private onTouchMove(_evt) {