Further small shadow rendering refactor + fix (playcanvas#3162)

mvaligursky · Martin Valigursky · web-flow · commit 2b5bf20edd76 · 2021-05-13T07:59:02.000-07:00
* moved shadow matrix to lightRenderData

* fix to cookie without shadows

* suggested refactor

Co-authored-by: Martin Valigursky &lt;mvaligursky@snapchat.com&gt;
diff --git a/src/scene/light.js b/src/scene/light.js
@@ -45,6 +45,8 @@ class LightRenderData {
         // camera used to cull / render the shadow map
         this.shadowCamera = ShadowRenderer.createShadowCamera(device, light._shadowType, light._type, face);
 
+        this.shadowMatrix = new Mat4();
+
         // face index, value is based on light type:
         // - spot: always 0
         // - omni: cubemap face, 0..5
@@ -134,7 +136,6 @@ class Light {
 
         // Shadow mapping resources
         this._shadowMap = null;
-        this._shadowMatrix = new Mat4();
         this._rendererParams = [];
 
         // Shadow mapping properties
@@ -146,6 +147,9 @@ class Light {
         this._isVsm = false;
         this._isPcf = true;
 
+        // cookie matrix (used in case the shadow mapping is disabled and so the shadow matrix cannot be used)
+        this._cookieMatrix = null;
+
         this._scene = null;
         this._node = null;
 
@@ -594,6 +598,13 @@ class Light {
         }
     }
 
+    get cookieMatrix() {
+        if (!this._cookieMatrix) {
+            this._cookieMatrix = new Mat4();
+        }
+        return this._cookieMatrix;
+    }
+
     get cookie() {
         return this._cookie;
     }
diff --git a/src/scene/renderer/forward-renderer.js b/src/scene/renderer/forward-renderer.js
@@ -622,15 +622,15 @@ class ForwardRenderer {
                     directional._normalOffsetBias;
 
                 this.lightShadowMapId[cnt].setValue(lightRenderData.shadowBuffer);
-                this.lightShadowMatrixId[cnt].setValue(directional._shadowMatrix.data);
+                this.lightShadowMatrixId[cnt].setValue(lightRenderData.shadowMatrix.data);
                 var params = directional._rendererParams;
                 params.length = 3;
                 params[0] = directional._shadowResolution;
                 params[1] = normalBias;
                 params[2] = bias;
                 this.lightShadowParamsId[cnt].setValue(params);
                 if (this.mainLight < 0) {
-                    this.lightShadowMatrixVsId[cnt].setValue(directional._shadowMatrix.data);
+                    this.lightShadowMatrixVsId[cnt].setValue(lightRenderData.shadowMatrix.data);
                     this.lightShadowParamsVsId[cnt].setValue(params);
                     directional._direction.normalize();
                     this.lightDirVs[cnt][0] = directional._direction.x;
@@ -730,6 +730,7 @@ class ForwardRenderer {
         this.lightDir[cnt][2] = spot._direction.z;
         this.lightDirId[cnt].setValue(this.lightDir[cnt]);
 
+        let cookieMatrix;
         if (spot.castShadows) {
             var bias;
             if (spot._isVsm) {
@@ -746,19 +747,22 @@ class ForwardRenderer {
             const lightRenderData = spot.getRenderData(null, 0);
             this.lightShadowMapId[cnt].setValue(lightRenderData.shadowBuffer);
 
-            this.lightShadowMatrixId[cnt].setValue(spot._shadowMatrix.data);
+            this.lightShadowMatrixId[cnt].setValue(lightRenderData.shadowMatrix.data);
             var params = spot._rendererParams;
             params.length = 4;
             params[0] = spot._shadowResolution;
             params[1] = normalBias;
             params[2] = bias;
             params[3] = 1.0 / spot.attenuationEnd;
             this.lightShadowParamsId[cnt].setValue(params);
+
+            cookieMatrix = lightRenderData.shadowMatrix;
         }
+
         if (spot._cookie) {
             this.lightCookieId[cnt].setValue(spot._cookie);
             if (!spot.castShadows) {
-                const cookieCam = ShadowRenderer.getSpotCookieCamera();
+                const cookieCam = ForwardRenderer.getSpotCookieCamera();
                 cookieCam.fov = spot._outerConeAngle * 2;
 
                 const cookieNode = cookieCam._node;
@@ -768,9 +772,11 @@ class ForwardRenderer {
 
                 shadowCamView.setTRS(cookieNode.getPosition(), cookieNode.getRotation(), Vec3.ONE).invert();
                 shadowCamViewProj.mul2(cookieCam.projectionMatrix, shadowCamView);
-                spot._shadowMatrix.mul2(ShadowRenderer.scaleShiftMatrix, shadowCamViewProj);
+
+                cookieMatrix = spot.cookieMatrix;
+                cookieMatrix.mul2(ShadowRenderer.scaleShiftMatrix, shadowCamViewProj);
             }
-            this.lightShadowMatrixId[cnt].setValue(spot._shadowMatrix.data);
+            this.lightShadowMatrixId[cnt].setValue(cookieMatrix.data);
             this.lightCookieIntId[cnt].setValue(spot.cookieIntensity);
             if (spot._cookieTransform) {
                 spot._cookieTransformUniform[0] = spot._cookieTransform.x;
diff --git a/src/scene/renderer/shadow-renderer.js b/src/scene/renderer/shadow-renderer.js
@@ -513,7 +513,7 @@ class ShadowRenderer {
                 if (type !== LIGHTTYPE_OMNI) {
                     shadowCamView.setTRS(shadowCamNode.getPosition(), shadowCamNode.getRotation(), Vec3.ONE).invert();
                     shadowCamViewProj.mul2(shadowCam.projectionMatrix, shadowCamView);
-                    light._shadowMatrix.mul2(ShadowRenderer.scaleShiftMatrix, shadowCamViewProj);
+                    lightRenderData.shadowMatrix.mul2(ShadowRenderer.scaleShiftMatrix, shadowCamViewProj);
                 }
 
                 forwardRenderer.setCamera(shadowCam, shadowCam.renderTarget, true, faceCount === 1);

Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ class ShadowRenderer {`
`513`	`513`	`if (type !== LIGHTTYPE_OMNI) {`
`514`	`514`	`shadowCamView.setTRS(shadowCamNode.getPosition(), shadowCamNode.getRotation(), Vec3.ONE).invert();`
`515`	`515`	`shadowCamViewProj.mul2(shadowCam.projectionMatrix, shadowCamView);`
`516`		`- light._shadowMatrix.mul2(ShadowRenderer.scaleShiftMatrix, shadowCamViewProj);`
	`516`	`+ lightRenderData.shadowMatrix.mul2(ShadowRenderer.scaleShiftMatrix, shadowCamViewProj);`
`517`	`517`	`}`
`518`	`518`
`519`	`519`	`forwardRenderer.setCamera(shadowCam, shadowCam.renderTarget, true, faceCount === 1);`