Merge branch 'main_v1' into release-1.74

playcanvas · Sep 17, 2024 · 794058f · 794058f
2 parents f7fa3ef + f268583
commit 794058f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/examples/src/examples/graphics/lights-baked.example.mjs b/examples/src/examples/graphics/lights-baked.example.mjs
@@ -69,7 +69,6 @@ for (let i = 0; i < 40; i++) {
 const ground = new pc.Entity();
 ground.addComponent('render', {
     castShadows: false,
-    castShadowsLightmap: false,
     lightmapped: true,
     type: 'plane',
     material: material

diff --git a/src/framework/lightmapper/bake-light.js b/src/framework/lightmapper/bake-light.js
@@ -21,7 +21,7 @@ class BakeLight {
 
         if (this.scene.clusteredLightingEnabled) {
             // if clustered shadows are disabled, disable them on the light
-            light.castShadows = light.castShadows && lightingParams.shadowsEnabled;
+            light.castShadows = light.bakeShadows && lightingParams.shadowsEnabled;
         }
 
         // bounds for non-directional light

diff --git a/src/scene/light.js b/src/scene/light.js
@@ -443,6 +443,10 @@ class Light {
         return this._castShadows && this._mask !== MASK_BAKE && this._mask !== 0;
     }
 
+    get bakeShadows() {
+        return this._castShadows && this._mask === MASK_BAKE;
+    }
+
     set shadowResolution(value) {
         if (this._shadowResolution !== value) {
             if (this._type === LIGHTTYPE_OMNI) {