Merge pull request #42 from Unity-Technologies/LayeredLit

JulienIgnace-Unity · web-flow · commit 1eebdb869fd2 · 2016-12-13T10:04:54.000+01:00
Fixed the way Utilities.GetViewProjectionMatrix works when given the LookAt parameters so that it matches the camera.worldToCameraMatrix APIs (fixed skybox temporary Cubemap from being flipped)
diff --git a/Assets/ScriptableRenderLoop/HDRenderLoop/Utilities.cs b/Assets/ScriptableRenderLoop/HDRenderLoop/Utilities.cs
@@ -165,14 +165,19 @@ public static Matrix4x4 GetViewProjectionMatrix(Matrix4x4 worldToViewMatrix, Mat
             // The actual projection matrix used in shaders is actually massaged a bit to work across all platforms
             // (different Z value ranges etc.)
             var gpuProj = GL.GetGPUProjectionMatrix(projectionMatrix, false);
-            var gpuVP = gpuProj * worldToViewMatrix;
+            var gpuVP = gpuProj *  worldToViewMatrix * Matrix4x4.Scale(new Vector3(1.0f, 1.0f, -1.0f)); // Need to scale -1.0 on Z to match what is being done in the camera.wolrdToCameraMatrix API.
 
             return gpuVP;
         }
 
         public static Matrix4x4 GetViewProjectionMatrix(Camera camera)
         {
-            return GetViewProjectionMatrix(camera.worldToCameraMatrix, camera.projectionMatrix);
+			// The actual projection matrix used in shaders is actually massaged a bit to work across all platforms
+			// (different Z value ranges etc.)
+			var gpuProj = GL.GetGPUProjectionMatrix(camera.projectionMatrix, false);
+			var gpuVP = gpuProj * camera.worldToCameraMatrix;
+
+			return gpuVP;
         }
 
         public static Vector4 ComputeScreenSize(Camera camera)

Original file line number	Diff line number	Diff line change
`@@ -165,14 +165,19 @@ public static Matrix4x4 GetViewProjectionMatrix(Matrix4x4 worldToViewMatrix, Mat`
`165`	`165`	`// The actual projection matrix used in shaders is actually massaged a bit to work across all platforms`
`166`	`166`	`// (different Z value ranges etc.)`
`167`	`167`	`var gpuProj = GL.GetGPUProjectionMatrix(projectionMatrix, false);`
`168`		`- var gpuVP = gpuProj * worldToViewMatrix;`
	`168`	`+ var gpuVP = gpuProj * worldToViewMatrix * Matrix4x4.Scale(new Vector3(1.0f, 1.0f, -1.0f)); // Need to scale -1.0 on Z to match what is being done in the camera.wolrdToCameraMatrix API.`
`169`	`169`
`170`	`170`	`return gpuVP;`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`public static Matrix4x4 GetViewProjectionMatrix(Camera camera)`
`174`	`174`	`{`
`175`		`- return GetViewProjectionMatrix(camera.worldToCameraMatrix, camera.projectionMatrix);`
	`175`	`+ // The actual projection matrix used in shaders is actually massaged a bit to work across all platforms`
	`176`	`+ // (different Z value ranges etc.)`
	`177`	`+ var gpuProj = GL.GetGPUProjectionMatrix(camera.projectionMatrix, false);`
	`178`	`+ var gpuVP = gpuProj * camera.worldToCameraMatrix;`
	`179`	`+`
	`180`	`+ return gpuVP;`
`176`	`181`	`}`
`177`	`182`
`178`	`183`	`public static Vector4 ComputeScreenSize(Camera camera)`