epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix possible NREs in RenderAsync in VoxelRenderer.cs

Browse Source
This commit is contained in:
abcdefg30
2016-06-08 18:36:22 +02:00
parent ad9fac57a3
commit aa53ff2b29
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Graphics/VoxelRenderer.cs
View File

@@ -94,6 +94,8 @@ namespace OpenRA.Graphics
var invShadowTransform = Util.MatrixInverse(shadowTransform); var invShadowTransform = Util.MatrixInverse(shadowTransform);
var cameraTransform = Util.MakeFloatMatrix(camera.AsMatrix()); var cameraTransform = Util.MakeFloatMatrix(camera.AsMatrix());
var invCameraTransform = Util.MatrixInverse(cameraTransform); var invCameraTransform = Util.MatrixInverse(cameraTransform);
if (invCameraTransform == null)
throw new InvalidOperationException("Failed to invert the cameraTransform matrix during RenderAsync.");
// Sprite rectangle // Sprite rectangle
var tl = new float2(float.MaxValue, float.MaxValue); var tl = new float2(float.MaxValue, float.MaxValue);
@@ -199,9 +201,12 @@ namespace OpenRA.Graphics
{ {
var rd = v.Voxel.RenderData(i); var rd = v.Voxel.RenderData(i);
var t = v.Voxel.TransformationMatrix(i, frame); var t = v.Voxel.TransformationMatrix(i, frame);
var it = Util.MatrixInverse(t);
if (it == null)
throw new InvalidOperationException("Failed to invert the transformed matrix of frame {0} during RenderAsync.".F(i));
// Transform light vector from shadow -> world -> limb coords // Transform light vector from shadow -> world -> limb coords
var lightDirection = ExtractRotationVector(Util.MatrixMultiply(Util.MatrixInverse(t), lightTransform)); var lightDirection = ExtractRotationVector(Util.MatrixMultiply(it, lightTransform));
Render(rd, Util.MatrixMultiply(transform, t), lightDirection, Render(rd, Util.MatrixMultiply(transform, t), lightDirection,
lightAmbientColor, lightDiffuseColor, color.TextureMidIndex, normals.TextureMidIndex); lightAmbientColor, lightDiffuseColor, color.TextureMidIndex, normals.TextureMidIndex);