@needle-tools/engine 3.16.0-beta → 3.16.2-beta

package/src/engine-components/CameraUtils.ts

@@ -1,7 +1,7 @@
 import { OrbitControls } from "./OrbitControls.js";
 import { addNewComponent, getOrAddComponent } from "../engine/engine_components.js";
 import { Object3D } from "three";
-import { ICamera } from "../engine/engine_types.js";
+import { ICamera, IContext } from "../engine/engine_types.js";
 import { RGBAColor } from "./js-extensions/RGBAColor.js";
 import { ContextEvent, ContextRegistry } from "../engine/engine_context_registry.js";
 import { getCameraController } from "../engine/engine_camera.js";
@@ -14,28 +14,35 @@ const debug = getParam("debugmissingcamera");
 ContextRegistry.registerCallback(ContextEvent.MissingCamera, (evt) => {
     if (debug) console.warn("Creating missing camera")
     const scene = evt.context.scene;
-    const srcId = "unknown";
 
     const cameraObject = new Object3D();
+    cameraObject.name = "Default Fallback Camera"
     scene.add(cameraObject);
 
     const camInstance = new Camera();
+    camInstance.sourceId = evt.files?.[0]?.src ?? "unknown"
+    // Set the clearFlags to a skybox
+    camInstance.clearFlags = 1;
+    camInstance.backgroundColor = new RGBAColor(0.5, 0.5, 0.5, 1);
+    camInstance.fieldOfView = 35;
+    // TODO: can we store the backgroundBlurriness in the gltf file somewhere except inside the camera?
+    // e.g. when we export a scene from blender without a camera in the scene
+    camInstance.backgroundBlurriness = .125; // same as in blender 0.5
     const cam = addNewComponent(cameraObject, camInstance, true) as ICamera;
-    cam.sourceId = srcId;
-    cam.clearFlags = 2;
-    cam.backgroundColor = new RGBAColor(0.5, 0.5, 0.5, 1);
-    cam.fieldOfView = 35;
 
     cameraObject.position.x = 0;
     cameraObject.position.y = 1;
     cameraObject.position.z = 2;
 
+
+    createDefaultCameraControls(evt.context, cam);
+
     return cam;
 });
 
 ContextRegistry.registerCallback(ContextEvent.ContextCreated, (evt) => {
     if (!evt.context.mainCamera) {
-        if(debug) console.log("Will not auto-fit because a default camera exists");
+        if (debug) console.log("Will not auto-fit because a default camera exists");
         return;
     }
 
@@ -47,27 +54,32 @@ ContextRegistry.registerCallback(ContextEvent.ContextCreated, (evt) => {
         // Check if something else already acts as a camera controller
         const existing = getCameraController(evt.context.mainCamera);
         if (existing?.isCameraController === true) {
-            if(debug) console.log("Will not auto-fit because a camera controller exists");
+            if (debug) console.log("Will not auto-fit because a camera controller exists");
             return;
         }
+        createDefaultCameraControls(evt.context);
+    }
+})
 
-        const cam = evt.context.mainCameraComponent;
-        const cameraObject = cam?.gameObject;
-        if (cameraObject) {
-            const orbit = getOrAddComponent(cameraObject, OrbitControls) as OrbitControls;
-            orbit.sourceId = "unknown";
-            const autoRotate = evt.context.domElement.getAttribute("auto-rotate");
-            orbit.autoRotate = autoRotate !== undefined && (autoRotate === "" || autoRotate === "true")
-            orbit.autoRotateSpeed = 0.5;
-            const ctx = evt.context;
-            const fitCamera = () => {
-                ctx.pre_render_callbacks.splice(ctx.pre_render_callbacks.indexOf(fitCamera), 1);
-                orbit.fitCamera();
-            }
-            ctx.pre_render_callbacks.push(fitCamera);
-        }
-        else {
-            console.warn("Missing camera object, can not add orbit controls")
+function createDefaultCameraControls(context: IContext, cam?: ICamera) {
+
+    cam = cam ?? context.mainCameraComponent;
+    const cameraObject = cam?.gameObject;
+    if (debug) console.log("Creating default camera controls", cam?.name)
+    if (cameraObject) {
+        const orbit = getOrAddComponent(cameraObject, OrbitControls) as OrbitControls;
+        orbit.sourceId = cam?.sourceId ?? "unknown";
+        const autoRotate = context.domElement.getAttribute("auto-rotate");
+        orbit.autoRotate = autoRotate !== undefined && (autoRotate === "" || autoRotate === "true")
+        orbit.autoRotateSpeed = 0.5;
+        const ctx = context;
+        const fitCamera = () => {
+            ctx.pre_render_callbacks.splice(ctx.pre_render_callbacks.indexOf(fitCamera), 1);
+            orbit.fitCamera();
         }
+        ctx.pre_render_callbacks.push(fitCamera);
+    }
+    else {
+        console.warn("Missing camera object, can not add orbit controls")
     }
-})
+}

package/src/engine-components/Renderer.ts

@@ -622,7 +622,8 @@ export class Renderer extends Behaviour implements IRenderer {
 
         if (material.envMapIntensity !== undefined) {
             const factor = this.hasLightmap ? Math.PI : 1;
-            material.envMapIntensity = Math.max(0, this.context.sceneLighting.environmentIntensity / factor);
+            const environmentIntensity = this.context.mainCameraComponent?.environmentIntensity ?? 1;
+            material.envMapIntensity = Math.max(0, environmentIntensity * this.context.sceneLighting.environmentIntensity / factor);
         }
         // if (this._reflectionProbe?.texture) {
         //     material.envMap = this._reflectionProbe.texture;