Needle Engine 3.45.1-beta.1

Files changed (7) hide show

plugins/vite/poster-client.js +0 -1
src/engine-components/webxr/Avatar.ts +1 -1
src/engine/engine_gizmos.ts +1 -0
src/engine/engine_serialization_builtin_serializer.ts +1 -1
src/engine/engine_three_utils.ts +1 -0
src/engine-components/GroundProjection.ts +23 -2
src/engine-components/OrbitControls.ts +2 -3

plugins/vite/poster-client.js CHANGED Viewed

@@ -17,7 +17,6 @@
             await new Promise((resolve) => setTimeout(resolve, 200));
         const mimeType = "image/webp";
-        console.log("Generating poster...");
         const dataUrl = screenshot(context, width, height, mimeType);
         return dataUrl;

src/engine-components/webxr/Avatar.ts CHANGED Viewed

@@ -5,13 +5,13 @@
 import { serializable } from "../../engine/engine_serialization_decorator.js";
 import type { IGameObject } from "../../engine/engine_types.js";
 import { getParam, PromiseAllWithErrors } from "../../engine/engine_utils.js";
+import { setCustomVisibility } from "../../engine/js-extensions/Layers.js";
 import { NeedleXRController, type NeedleXREventArgs, NeedleXRSession, NeedleXRUtils } from "../../engine/xr/api.js";
 import { PlayerState } from "../../engine-components-experimental/networking/PlayerSync.js";
 import { Behaviour, GameObject } from "../Component.js";
 import { SyncedTransform } from "../SyncedTransform.js";
 import { AvatarMarker } from "./WebXRAvatar.js";
 import { XRFlag } from "./XRFlag.js";
-import { setCustomVisibility } from "../../engine/js-extensions/Layers.js";
 const debug = getParam("debugwebxr");

src/engine/engine_gizmos.ts CHANGED Viewed

@@ -379,6 +379,7 @@
         object.renderOrder = 999999;
         object[$cacheSymbol] = cache;
+        object["isGizmo"] = true;
         this.timedObjectsBuffer.push(object);
         // Ensure if duration is 0 it is rendered for one frame only

src/engine/engine_serialization_builtin_serializer.ts CHANGED Viewed

@@ -60,7 +60,7 @@
         super([Euler], "EulerSerializer");
     }
     onDeserialize(data: any, _context: SerializationContext) {
-        if (data === undefined || data === null) return;
+        if (data === undefined || data === null) return undefined;
         if (data.order) {
             return new Euler(data.x, data.y, data.z, data.order);
         }

src/engine/engine_three_utils.ts CHANGED Viewed

@@ -504,6 +504,7 @@
         if (obj instanceof GridHelper) allowExpanding = false;
         // ignore GroundProjectedEnv
         if (obj instanceof GroundedSkybox) allowExpanding = false;
+        if ((obj as any).isGizmo === true) allowExpanding = false;
         // // Ignore shadow catcher geometry
         if ((obj as Mesh).material instanceof ShadowMaterial) allowExpanding = false;
         // ONLY fit meshes

src/engine-components/GroundProjection.ts CHANGED Viewed

@@ -1,9 +1,10 @@
-import { Texture } from "three";
+import { Texture, Vector3 } from "three";
 import { GroundedSkybox as GroundProjection } from 'three/examples/jsm/objects/GroundedSkybox.js';
 import { serializable } from "../engine/engine_serialization_decorator.js";
 import { getParam, Watch as Watch } from "../engine/engine_utils.js";
 import { Behaviour } from "./Component.js";
+import { getBoundingBox, getWorldPosition, setWorldPosition } from "../engine/engine_three_utils.js";
 const debug = getParam("debuggroundprojection");
@@ -16,6 +17,12 @@
     applyOnAwake: boolean = false;
     /**
+     * When enabled the position of the projected environment will be adjusted to be centered in the scene (and ground level).
+     */
+    @serializable()
+    autoFit: boolean = true;
+    /**
      * Radius of the projection sphere. Set it large enough so the camera stays inside (make sure the far plane is also large enough)
      */
     @serializable()
@@ -93,19 +100,33 @@
             this._projection?.removeFromParent();
             return;
         }
+        const offset = .01;
         if (!this._projection || this.context.scene.environment !== this._lastEnvironment || this._height !== this._lastHeight || this._radius !== this._lastRadius) {
             if (debug)
                 console.log("Create/Update Ground Projection", this.context.scene.environment.name);
             this._projection?.removeFromParent();
             this._projection = new GroundProjection(this.context.scene.environment, this._height, this.radius);
-            this._projection.position.y = this._height - .0001;
+            this._projection.position.y = this._height - offset;
         }
         this._lastEnvironment = this.context.scene.environment;
         this._lastHeight = this._height;
         this._lastRadius = this._radius;
         if (!this._projection.parent)
             this.gameObject.add(this._projection);
+        if (this.autoFit) {
+            // TODO: should also update the radius (?)
+            this._projection.updateWorldMatrix(true, true);
+            const scenebounds = getBoundingBox(this.context.scene.children, [this._projection]);
+            let floor_y = scenebounds.min.y;
+            const wp = getWorldPosition(this._projection);
+            wp.x = scenebounds.min.x + (scenebounds.max.x - scenebounds.min.x) * .5;
+            wp.y = floor_y + this._height - offset;
+            wp.z = scenebounds.min.z + (scenebounds.max.z - scenebounds.min.z) * .5;
+            setWorldPosition(this._projection, wp);
+        }
         /* TODO realtime adjustments aren't possible anymore with GroundedSkybox (mesh generation)
         this.env.scale.setScalar(this._scale);
         this.env.radius = this._radius;

src/engine-components/OrbitControls.ts CHANGED Viewed

@@ -243,21 +243,18 @@
     private _afterHandleInputFn?: any;
     private _camera: Camera | null = null;
     private _syncedTransform?: SyncedTransform;
-    private _didStart = false;
     private _didSetTarget = 0;
     targetElement: HTMLElement | null = null;
     /** @internal */
     awake(): void {
-        this._didStart = false;
         this._didSetTarget = 0;
         this._startedListeningToKeyEvents = false;
     }
     /** @internal */
     start() {
-        this._didStart = true;
         this._eventSystem = EventSystem.get(this.context) ?? undefined;
         if (this._eventSystem) {
             this._afterHandleInputFn = this.afterHandleInput.bind(this);
@@ -547,6 +544,8 @@
         }
         if (this.autoFit) {
+            // we don't want to autofit again if the component is disabled and re-enabled
+            this.autoFit = false;
             this.fitCamera(this.scene.children, {
                 centerCamera: "y",
                 immediate: true,