Needle Engine 3.10.1-beta

Files changed (5) hide show

src/engine-components/DragControls.ts +2 -0
src/engine/engine_element_loading.ts +31 -13
src/engine/engine_input.ts +1 -1
src/engine/engine_license.ts +12 -5
src/engine-components/SpatialTrigger.ts +3 -3

src/engine-components/DragControls.ts CHANGED Viewed

@@ -65,6 +65,8 @@
         this._dragDelta = new Vector2();
     }
+    // TODO: Update DragEventListener code
     addDragEventListener(type: DragEvents, cb: (ctrls: DragControls, args: SelectArgs) => void | Function) {
         switch (type) {
             case DragEvents.SelectStart:

src/engine/engine_element_loading.ts CHANGED Viewed

@@ -3,10 +3,11 @@
 import { LoadingProgressArgs } from "./engine_setup";
 import { getParam } from "./engine_utils";
 import { logoSVG } from "./assets"
-import { hasCommercialLicense, hasProLicense } from "./engine_license";
+import { hasCommercialLicense, hasProLicense, runtimeLicenseCheckPromise } from "./engine_license";
 const debug = getParam("debugloading");
 const debugRendering = getParam("debugloadingrendering");
+const debugLicense = getParam("debuglicense");
 declare type LoadingStyleOption = "dark" | "light";
@@ -16,10 +17,10 @@
 }
 export interface ILoadingViewHandler {
-    onLoadingBegin(message?: string);
+    onLoadingBegin(message?: string)
     onLoadingUpdate(progress: LoadingProgressArgs | number, message?: string);
     onLoadingFinished(message?: string);
-    setMessage(string:string);
+    setMessage(string: string);
 }
 let currentFileProgress = 0;
@@ -73,7 +74,7 @@
         this._loadingElementOptions = opts;
     }
-    onLoadingBegin(message?: string) {
+    async onLoadingBegin(message?: string) {
         const _element = this._element.shadowRoot || this._element;
         if (debug) console.warn("Begin Loading")
         if (!this._loadingElement) {
@@ -172,7 +173,7 @@
             this._loadingTextContainer.textContent = percent;
     }
-    private createLoadingElement(existing?: HTMLElement): HTMLElement {
+    private createLoadingElement(existing?: HTMLElement) {
         if (debug && !existing) console.log("Creating loading element");
         this._loadingElement = existing || document.createElement("div");
@@ -249,7 +250,7 @@
                 logo.src = customLogo;
             }
         }
-        this._loadingElement.appendChild(logo);
+        this._loadingElement.appendChild(logo);
         this._loadingElement.appendChild(loadingBarContainer);
@@ -301,14 +302,31 @@
             }
         }
-        if (!hasCommercialLicense()) {
-            const nonCommercialContainer = document.createElement("div");
-            nonCommercialContainer.style.paddingTop = ".6em";
-            nonCommercialContainer.style.fontSize = ".8em";
-            nonCommercialContainer.innerText = "NON COMMERCIAL";
-            this._loadingElement.appendChild(nonCommercialContainer);
-        }
+        this.handleRuntimeLicense(this._loadingElement);
         return this._loadingElement;
     }
+    private async handleRuntimeLicense(loadingElement: HTMLElement) {
+        // First check if we have a commercial license
+        let commercialLicense = hasCommercialLicense();
+        // if it's the case then we don't need to perform a runtime check
+        if (commercialLicense) return;
+        // Use the runtime license check
+        if (runtimeLicenseCheckPromise) {
+            if (debugLicense) console.log("Waiting for runtime license check");
+            await runtimeLicenseCheckPromise;
+            commercialLicense = hasCommercialLicense();
+        }
+        if (commercialLicense) return;
+        // If we don't have a commercial license, then we need to display our message
+        if (debugLicense) console.log("Loading UI has commercial license?", commercialLicense);
+        const nonCommercialContainer = document.createElement("div");
+        nonCommercialContainer.style.paddingTop = ".6em";
+        nonCommercialContainer.style.fontSize = ".8em";
+        nonCommercialContainer.innerText = "NON COMMERCIAL";
+        loadingElement.appendChild(nonCommercialContainer);
+    }
 }

src/engine/engine_input.ts CHANGED Viewed

@@ -532,7 +532,7 @@
                 const diff = (upTime - evt.source.timeStamp);
                 // on android touch up and mouse up have the exact same value
                 // but on iOS they are not the same but a few milliseconds apart
-                if (diff < 30) {
+                if (diff < 30 && diff > 0) {
                     // we received an UP event for a touch, ignore this DOWN event
                     if (debug) console.log("Ignoring mouse.down for touch.up");
                     return;

src/engine/engine_license.ts CHANGED Viewed

@@ -38,26 +38,33 @@
     sendUsageMessageToAnalyticsBackend();
 });
-let licenseCheckPromise: Promise<void>;
+export let runtimeLicenseCheckPromise: Promise<void>;
 async function checkLicense() {
+    // Only perform the runtime license check once
+    if (runtimeLicenseCheckPromise) return runtimeLicenseCheckPromise;
     if (NEEDLE_ENGINE_LICENSE_TYPE === "basic") {
         try {
             const licenseUrl = "https://engine.needle.tools/licensing/check";
             const res = await fetch(licenseUrl);
             if (debug) {
                 const text = await res.text();
-                console.log("\"" + text + "\"\n", res);
+                console.log("Response: \"" + text + "\"\n", res);
             }
             if (res.status === 200) {
+                if(debug) console.log("License check succeeded");
                 NEEDLE_ENGINE_LICENSE_TYPE = "pro";
             }
+            else {
+                if (debug) console.log("License check failed with status " + res.status);
+            }
         }
         catch (err) {
             if (debug) console.error("License check failed", err);
         }
     }
+    else if (debug) console.log("Runtime license check is skipped because license is already applied as \"" + NEEDLE_ENGINE_LICENSE_TYPE + "\"");
 }
-licenseCheckPromise = checkLicense();
+runtimeLicenseCheckPromise = checkLicense();
 async function showLicenseInfo(ctx: IContext) {
     try {
@@ -76,11 +83,11 @@
 const licenseDelay = 200;
 async function onNonCommercialVersionDetected(ctx: IContext) {
-    await licenseCheckPromise;
+    await runtimeLicenseCheckPromise;
     if (hasCommercialLicense()) return;
     logNonCommercialUse();
     ctx.domElement.addEventListener("ready", () => {
-        setTimeout(()=>{
+        setTimeout(() => {
             insertNonCommercialUseHint(ctx);
         }, 1000);
     });

src/engine-components/SpatialTrigger.ts CHANGED Viewed

@@ -63,17 +63,17 @@
     onEnterTrigger(trigger: SpatialTrigger): void {
         if(debug) console.log("ENTER TRIGGER", this.name, trigger.name, this, trigger);
         trigger.raiseOnEnterEvent(this);
-        this.onEnter?.invoke();
+        this.onEnter?.invoke(this, trigger);
     }
     onExitTrigger(trigger: SpatialTrigger): void {
         if(debug) console.log("EXIT TRIGGER", this.name, trigger.name, this, trigger);
         trigger.raiseOnExitEvent(this);
-        this.onExit?.invoke();
+        this.onExit?.invoke(this, trigger);
     }
     onStayTrigger(trigger: SpatialTrigger): void {
         trigger.raiseOnStayEvent(this);
-        this.onStay?.invoke();
+        this.onStay?.invoke(this, trigger);
     }
 }