@needle-tools/engine 2.40.0-pre → 2.41.0-pre

package/src/engine-components/Light.ts

@@ -1,6 +1,6 @@
 import { Behaviour, GameObject } from "./Component";
 import * as THREE from "three";
-import { getParam } from "../engine/engine_utils";
+import { getParam, isMobileDevice } from "../engine/engine_utils";
 import { setWorldPositionXYZ } from "../engine/engine_three_utils";
 import { FrameEvent } from "../engine/engine_setup";
 import { serializeable } from "../engine/engine_serialization_decorator";
@@ -8,6 +8,7 @@ import { Color, DirectionalLight, OrthographicCamera } from "three";
 import { WebXR, WebXREvent } from "./WebXR";
 import { WebARSessionRoot } from "./WebARSessionRoot";
 import { ILight } from "../engine/engine_types";
+import { Mathf } from "../engine/engine_math";
 
 // https://threejs.org/examples/webgl_shadowmap_csm.html
 
@@ -87,6 +88,7 @@ export class Light extends Behaviour implements ILight {
 
     @serializeable()
     private type: LightType = 0;
+
     public range: number = 1;
     public spotAngle: number = 1;
     public innerSpotAngle: number = 1;
@@ -137,7 +139,8 @@ export class Light extends Behaviour implements ILight {
     set shadows(val: LightShadows) {
         this._shadows = val;
         if (this.light) {
-            this.light.castShadow = val === LightShadows.Hard || val === LightShadows.Soft;
+            this.light.castShadow = val !== LightShadows.None;
+            this.updateShadowSoftHard();
         }
     }
     get shadows(): LightShadows { return this._shadows; }
@@ -284,9 +287,9 @@ export class Light extends Behaviour implements ILight {
     }
 
     createLight() {
-        if (this.light) return;
-        let lightAlreadyCreated = this.selfIsLight;
-        if (lightAlreadyCreated) {
+        const lightAlreadyCreated = this.selfIsLight;
+
+        if (lightAlreadyCreated && !this.light) {
             this.light = this.gameObject as unknown as THREE.Light;
 
             switch (this.type) {
@@ -295,7 +298,7 @@ export class Light extends Behaviour implements ILight {
                     break;
             }
         }
-        else {
+        else if(!this.light) {
             switch (this.type) {
                 case LightType.Directional:
                     // console.log(this);
@@ -339,7 +342,7 @@ export class Light extends Behaviour implements ILight {
         }
 
 
-        if (this.light !== undefined) {
+        if (this.light) {
             this._intensity = this.light.intensity;
 
             if (this.shadows !== LightShadows.None) {
@@ -356,6 +359,9 @@ export class Light extends Behaviour implements ILight {
                 this.light.shadow.mapSize.width = 2048;
                 this.light.shadow.mapSize.height = 2048;
             }
+            // this.light.shadow.needsUpdate = true;
+            // console.log(this.light.shadow.mapSize);
+            // return;
 
             if (debug)
                 console.log("Override shadow bias?", this._overrideShadowBiasSettings, this.shadowBias, this.shadowNormalBias);
@@ -370,7 +376,8 @@ export class Light extends Behaviour implements ILight {
                 this.light.shadow.normalBias = this.shadowNormalBias * .0001;
             }
 
-            // console.log(this.light.shadow, this);
+            this.updateShadowSoftHard();
+
             const cam = this.light.shadow.camera as THREE.OrthographicCamera;
             cam.near = this.shadowNearPlane;
             // use shadow distance that was set explictly (if any)
@@ -399,6 +406,8 @@ export class Light extends Behaviour implements ILight {
                 cam.top *= sy;
                 cam.bottom *= sy;
             }
+
+
             this.light.shadow.needsUpdate = true;
             if (debug)
                 this.context.scene.add(new THREE.CameraHelper(cam));
@@ -425,6 +434,28 @@ export class Light extends Behaviour implements ILight {
         }
     }
 
+    static allowChangingRendererShadowMapType: boolean = true;
+
+    private updateShadowSoftHard() {
+        if (!this.light) return;
+        if (this.shadows === LightShadows.Soft) {
+            const radius = this.light.shadow.mapSize.width / 1024 * 5;
+            const samples = Mathf.clamp(Math.round(radius), 2, 10);
+            this.light.shadow.radius = radius;
+            this.light.shadow.blurSamples = samples;
+            if (isMobileDevice()) {
+                this.light.shadow.radius *= .5;
+                this.light.shadow.blurSamples = Math.floor(this.light.shadow.blurSamples * .5);
+            }
+            if (Light.allowChangingRendererShadowMapType)
+                this.context.renderer.shadowMap.type = THREE.VSMShadowMap;
+        }
+        else {
+            this.light.shadow.radius = 1;
+            this.light.shadow.blurSamples = 1;
+        }
+    }
+
     private setDirectionalLight(dirLight: DirectionalLight) {
         dirLight.add(dirLight.target);
         dirLight.target.position.set(0, 0, -1);