Needle Engine 3.2.15-alpha

Files changed (3) hide show

src/engine/engine_license.ts +12 -25
src/engine-components/SceneSwitcher.ts +28 -3
src/engine-components/export/usdz/USDZExporter.ts +7 -2

src/engine/engine_license.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { getParam } from "./engine_utils";
+import { getParam, isMobileDevice } from "./engine_utils";
 import { ContextEvent, ContextRegistry } from "./engine_context_registry";
 import { IContext } from "./engine_types";
 import { logoSVG } from "./assets";
@@ -31,8 +31,8 @@
 const licenseElementIdentifier = "needle-license-element";
-const licenseDuration = 15000;
-const licenseDelay = 500;
+const licenseDuration = 5000;
+const licenseDelay = 200;
 function onNonCommercialVersionDetected(ctx: IContext) {
     setTimeout(() => insertNonCommercialUseHint(ctx), 2000);
@@ -62,7 +62,8 @@
     const textElement = document.createElement("div");
     textElement.classList.add("text");
-    textElement.innerHTML = "Needle Engine<br/><span class=\"non-commercial\">Non Commercial</span>";
+    // if (!isMobileDevice())
+    //     textElement.innerHTML = "Needle Engine<br/><span class=\"non-commercial\">Non Commercial</span>";
     licenseElement.appendChild(textElement);
     licenseElement.title = "Needle Engine — non commercial version";
@@ -157,11 +158,11 @@
         animation-delay: ${licenseDelay / 1000}s;
         animation-easing: ease-in-out;
         mix-blend-mode: difference;
-        color: rgb(40, 40, 40);
+        color: rgb(0, 0, 0);
         mix-blend-mode: difference;
         line-height: 1em;
         margin-left: -3px;
-        text-shadow: 0 0 2px rgba(200,200,200, .3);
+        text-shadow: 0 0 2px rgba(200,200,200, .5);
     }
     ${selector} .text .non-commercial {
@@ -175,30 +176,16 @@
             transform: translate(0px, 10px);
             pointer-events: none;
         }
-        1% {
-            transform: translate(0, -5px);
-            opacity: 1;
-        }
-        2% {
-            transform: translate(0, 2.5px);
-        }
-        3% {
+        8% {
             transform: translate(0, 0px);
             pointer-events: all;
+            opacity: 1;
+            transform: scale(1.1)
         }
-        4% {
+        20% {
             transform: scale(1)
         }
-        4.5% {
-            transform: scale(1.3)
-        }
-        6% {
-            transform: scale(1.32)
-        }
-        7% {
-            transform: scale(1)
-        }
-        98% {
+        90% {
             opacity: 1;
             pointer-events: all;
             transform: scale(1)

src/engine-components/SceneSwitcher.ts CHANGED Viewed

@@ -186,8 +186,33 @@
         return this.select(this._currentIndex - 1);
     }
-    select(index: number): Promise<boolean> {
-        if (debug) console.log("select", index)
+    select(index: number | string): Promise<boolean> {
+        if (debug) console.log("select", index);
+        if(typeof index === "object"){
+            // If a user tries to reference a scene object in a UnityEvent and invoke select(obj)
+            // Then the object will be serialized as a object { guid : ... } or with the index json pointer
+            // This case is not supported right now. Object references in the editor must not be scene references
+            console.warn("Switching to \"" + index + "\" might not work. Please either use an index or a AssetReference (not a scene reference)");
+        }
+        if (typeof index === "string") {
+            // If the parameter is a string we try to resolve the scene by its uri
+            // it's either already known in the scenes array
+            // or we create/get a new AssetReference and try to switch to that
+            const scene = this.scenes?.find(s => s.uri === index);
+            if (!scene) {
+                // Ok the scene is unknown to the scene switcher
+                // we create a new asset reference (or get an existing one)
+                // And switch to that. With this we can not modify the history
+                // Until the scene switcher can store the uri in the history instead of the index
+                const reference = AssetReference.getOrCreate(this.sourceId ?? "", index, this.context);
+                return this.switchScene(reference);
+            }
+            if (scene) index = this.scenes.indexOf(scene);
+            else return couldNotLoadScenePromise;
+        }
         if (!this.scenes?.length) return couldNotLoadScenePromise;
         if (index < 0) {
             if (this.clamp) return couldNotLoadScenePromise;
@@ -225,7 +250,7 @@
                 GameObject.add(scene.asset, this.gameObject);
                 if (this.useSceneLighting)
                     this.context.sceneLighting.enable(scene)
-                if (this.useHistory) {
+                if (this.useHistory && index >= 0) {
                     // save the loaded scene as an url parameter
                     if (this.queryParameterName?.length)
                         setParamWithoutReload(this.queryParameterName, index.toString(), this.useHistory);

src/engine-components/export/usdz/USDZExporter.ts CHANGED Viewed

@@ -12,6 +12,7 @@
 import { isDevEnvironment, showBalloonMessage, showBalloonWarning } from "../../../engine/debug/debug";
 import { Context } from "../../../engine/engine_setup";
 import { WebARSessionRoot } from "../../webxr/WebARSessionRoot";
+import { hasProLicense } from "../../../engine/engine_license";
 const debug = getParam("debugusdz");
@@ -36,6 +37,9 @@
     @serializable()
     autoExportAnimations: boolean = false;
+    @serializable()
+    exportFileName?: string;
     @serializable(QuickLookOverlay)
     overlay?: QuickLookOverlay;
@@ -130,8 +134,9 @@
         const eventArgs = { self: this, exporter: exporter, extensions: extensions, object: this.objectToExport };
         this.dispatchEvent(new CustomEvent("before-export", { detail: eventArgs }))
-        let name = "needle";
+        let name = this.exportFileName ?? this.objectToExport?.name ?? this.name;
         if (debug) name += "-" + getFormattedDate();
+        else if (!hasProLicense()) name = name + " - Made with Needle";
         //@ts-ignore
         exporter.debug = debug;
@@ -151,7 +156,7 @@
         // see https://developer.apple.com/documentation/arkit/adding_an_apple_pay_button_or_a_custom_action_in_ar_quick_look
         const overlay = this.buildQuicklookOverlay();
-        console.log(overlay);
+        if(debug) console.log(overlay);
         const callToAction = overlay.callToAction ? encodeURIComponent(overlay.callToAction) : "";
         const checkoutTitle = overlay.checkoutTitle ? encodeURIComponent(overlay.checkoutTitle) : "";
         const checkoutSubtitle = overlay.checkoutSubtitle ? encodeURIComponent(overlay.checkoutSubtitle) : "";