fixed major bug with metrics (thx to nightfox696)

m10914 · Jan 2, 2014 · b1b9425 · b1b9425
1 parent 9b39d5f
commit b1b9425
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/SMAA/SMAA.cs b/SMAA/SMAA.cs
@@ -4,7 +4,7 @@
 public class SMAA : MonoBehaviour
 {
 	public bool ApplyEffect;
-	public int State = 3;
+	public int State = 1;
 	public int Passes = 1;
 
 	private Texture2D black;
@@ -42,6 +42,8 @@ void OnRenderImage(RenderTexture source, RenderTexture destination)
 	{
 		Graphics.Blit(black, destination);
 
+		Vector4 metrics = new Vector4(1 / (float)Screen.width, 1 / (float)Screen.height, Screen.width, Screen.height);
+
 		if (this.ApplyEffect)
 		{
 			if (State == 1)
@@ -53,6 +55,7 @@ void OnRenderImage(RenderTexture source, RenderTexture destination)
 				mat.SetTexture("areaTex", GameObject.Find("TextureGenerator").GetComponent<AreaTexture>().alphaTex);
 				mat.SetTexture("luminTex", GameObject.Find("TextureGenerator").GetComponent<AreaTexture>().luminTex);
 				mat.SetTexture("searchTex", GameObject.Find("TextureGenerator").GetComponent<SearchTexture>().alphaTex);
+				mat.SetVector("SMAA_RT_METRICS", metrics);
 
 				var rt = RenderTexture.GetTemporary(Screen.width, Screen.height, 0);
 
@@ -67,6 +70,7 @@ void OnRenderImage(RenderTexture source, RenderTexture destination)
 				mat.SetTexture("luminTex", GameObject.Find("TextureGenerator").GetComponent<AreaTexture>().luminTex);
 				mat.SetTexture("searchTex", GameObject.Find("TextureGenerator").GetComponent<SearchTexture>().alphaTex);
 				mat.SetTexture("_SrcTex", source);
+				mat.SetVector("SMAA_RT_METRICS", metrics);
 
 				var rt = RenderTexture.GetTemporary(Screen.width, Screen.height, 0);
 				var rt2 = RenderTexture.GetTemporary(Screen.width, Screen.height, 0);

diff --git a/SMAA/SMAAshader.shader b/SMAA/SMAAshader.shader
@@ -5,6 +5,7 @@
 		areaTex ("area texture", 2D) = "white" {}
 		luminTex ("lumin texture", 2D) = "white" {}
 		searchTex ("search texture", 2D) = "white" {}
+		SMAA_RT_METRICS ("rt metrics", Vector) = (0,0,0,0)
 	}
 	SubShader {
 		Tags { "RenderType"="Opaque" }
@@ -38,14 +39,15 @@
 			#pragma target 3.0
 
 			#define mad(a, b, c) (a * b + c)
-			#define SMAA_RT_METRICS float4(1.0 / 1280.0, 1.0 / 720.0, 1280.0, 720.0)
+			//#define SMAA_RT_METRICS float4(1.0 / 1280.0, 1.0 / 720.0, 1280.0, 720.0)
 			#define SMAA_THRESHOLD 0.05
 			#define SMAA_MAX_SEARCH_STEPS 32
 			#define SMAA_MAX_SEARCH_STEPS_DIAG 16
 			#define SMAA_CORNER_ROUNDING 25
 			#define SMAA_LOCAL_CONTRAST_ADAPTATION_FACTOR 2.0
 
 			sampler2D _MainTex;
+			float4 SMAA_RT_METRICS;
 
 			struct vertOUT
 			{
@@ -162,7 +164,7 @@
 			#pragma glsl
 
 			#define mad(a, b, c) (a * b + c)
-			#define SMAA_RT_METRICS float4(1.0 / 1280.0, 1.0 / 720.0, 1280.0, 720.0)
+			//#define SMAA_RT_METRICS float4(1.0 / 1280.0, 1.0 / 720.0, 1280.0, 720.0)
 			#define SMAA_THRESHOLD 0.05
 			#define SMAA_MAX_SEARCH_STEPS 32
 			#define SMAA_MAX_SEARCH_STEPS_DIAG 16
@@ -179,6 +181,7 @@
 			sampler2D areaTex;
 			sampler2D searchTex;
 			sampler2D luminTex;
+			float4 SMAA_RT_METRICS;
 
 //--------------------------------------------------------
 // S M A A   framework
@@ -567,7 +570,7 @@ float2 SMAADetectVerticalCornerPattern(float2 weights, float2 texcoord, float2 d
 			#pragma glsl
 
 			#define mad(a, b, c) (a * b + c)
-			#define SMAA_RT_METRICS float4(1.0 / 1280.0, 1.0 / 720.0, 1280.0, 720.0)
+			//#define SMAA_RT_METRICS float4(1.0 / 1280.0, 1.0 / 720.0, 1280.0, 720.0)
 			#define SMAA_THRESHOLD 0.05
 			#define SMAA_MAX_SEARCH_STEPS 32
 			#define SMAA_MAX_SEARCH_STEPS_DIAG 16
@@ -576,6 +579,7 @@ float2 SMAADetectVerticalCornerPattern(float2 weights, float2 texcoord, float2 d
 
 			sampler2D _MainTex;
 			sampler2D _SrcTex;
+			float4 SMAA_RT_METRICS;
 
 //-------------------------------------------------
 // S M A A  framework
@@ -672,14 +676,15 @@ void SMAAMovc(float4 cond, inout float4 variable, float4 value) {
 			#pragma glsl
 
 			#define mad(a, b, c) (a * b + c)
-			#define SMAA_RT_METRICS float4(1.0 / 1280.0, 1.0 / 720.0, 1280.0, 720.0)
+			//#define SMAA_RT_METRICS float4(1.0 / 1280.0, 1.0 / 720.0, 1280.0, 720.0)
 			#define SMAA_THRESHOLD 0.05
 			#define SMAA_MAX_SEARCH_STEPS 32
 			#define SMAA_MAX_SEARCH_STEPS_DIAG 16
 			#define SMAA_CORNER_ROUNDING 25
 			#define SMAA_LOCAL_CONTRAST_ADAPTATION_FACTOR 2.0
 
 			sampler2D _MainTex;
+			float4 SMAA_RT_METRICS;
 
 			struct vertOUT
 			{

diff --git a/TestScene/Assets/SMAA/SMAA.cs b/TestScene/Assets/SMAA/SMAA.cs
@@ -42,6 +42,8 @@ void OnRenderImage(RenderTexture source, RenderTexture destination)
 	{
 		Graphics.Blit(black, destination);
 
+		Vector4 metrics = new Vector4(1 / (float)Screen.width, 1 / (float)Screen.height, Screen.width, Screen.height);
+
 		if (this.ApplyEffect)
 		{
 			if (State == 1)
@@ -53,6 +55,7 @@ void OnRenderImage(RenderTexture source, RenderTexture destination)
 				mat.SetTexture("areaTex", GameObject.Find("TextureGenerator").GetComponent<AreaTexture>().alphaTex);
 				mat.SetTexture("luminTex", GameObject.Find("TextureGenerator").GetComponent<AreaTexture>().luminTex);
 				mat.SetTexture("searchTex", GameObject.Find("TextureGenerator").GetComponent<SearchTexture>().alphaTex);
+				mat.SetVector("SMAA_RT_METRICS", metrics);
 
 				var rt = RenderTexture.GetTemporary(Screen.width, Screen.height, 0);
 
@@ -67,6 +70,7 @@ void OnRenderImage(RenderTexture source, RenderTexture destination)
 				mat.SetTexture("luminTex", GameObject.Find("TextureGenerator").GetComponent<AreaTexture>().luminTex);
 				mat.SetTexture("searchTex", GameObject.Find("TextureGenerator").GetComponent<SearchTexture>().alphaTex);
 				mat.SetTexture("_SrcTex", source);
+				mat.SetVector("SMAA_RT_METRICS", metrics);
 
 				var rt = RenderTexture.GetTemporary(Screen.width, Screen.height, 0);
 				var rt2 = RenderTexture.GetTemporary(Screen.width, Screen.height, 0);

diff --git a/TestScene/Assets/SMAA/SMAAshader.shader b/TestScene/Assets/SMAA/SMAAshader.shader
@@ -5,6 +5,7 @@
 		areaTex ("area texture", 2D) = "white" {}
 		luminTex ("lumin texture", 2D) = "white" {}
 		searchTex ("search texture", 2D) = "white" {}
+		SMAA_RT_METRICS ("rt metrics", Vector) = (0,0,0,0)
 	}
 	SubShader {
 		Tags { "RenderType"="Opaque" }
@@ -38,14 +39,15 @@
 			#pragma target 3.0
 
 			#define mad(a, b, c) (a * b + c)
-			#define SMAA_RT_METRICS float4(1.0 / 1280.0, 1.0 / 720.0, 1280.0, 720.0)
+			//#define SMAA_RT_METRICS float4(1.0 / 1280.0, 1.0 / 720.0, 1280.0, 720.0)
 			#define SMAA_THRESHOLD 0.05
 			#define SMAA_MAX_SEARCH_STEPS 32
 			#define SMAA_MAX_SEARCH_STEPS_DIAG 16
 			#define SMAA_CORNER_ROUNDING 25
 			#define SMAA_LOCAL_CONTRAST_ADAPTATION_FACTOR 2.0
 
 			sampler2D _MainTex;
+			float4 SMAA_RT_METRICS;
 
 			struct vertOUT
 			{
@@ -162,7 +164,7 @@
 			#pragma glsl
 
 			#define mad(a, b, c) (a * b + c)
-			#define SMAA_RT_METRICS float4(1.0 / 1280.0, 1.0 / 720.0, 1280.0, 720.0)
+			//#define SMAA_RT_METRICS float4(1.0 / 1280.0, 1.0 / 720.0, 1280.0, 720.0)
 			#define SMAA_THRESHOLD 0.05
 			#define SMAA_MAX_SEARCH_STEPS 32
 			#define SMAA_MAX_SEARCH_STEPS_DIAG 16
@@ -179,6 +181,7 @@
 			sampler2D areaTex;
 			sampler2D searchTex;
 			sampler2D luminTex;
+			float4 SMAA_RT_METRICS;
 
 //--------------------------------------------------------
 // S M A A   framework
@@ -567,7 +570,7 @@ float2 SMAADetectVerticalCornerPattern(float2 weights, float2 texcoord, float2 d
 			#pragma glsl
 
 			#define mad(a, b, c) (a * b + c)
-			#define SMAA_RT_METRICS float4(1.0 / 1280.0, 1.0 / 720.0, 1280.0, 720.0)
+			//#define SMAA_RT_METRICS float4(1.0 / 1280.0, 1.0 / 720.0, 1280.0, 720.0)
 			#define SMAA_THRESHOLD 0.05
 			#define SMAA_MAX_SEARCH_STEPS 32
 			#define SMAA_MAX_SEARCH_STEPS_DIAG 16
@@ -576,6 +579,7 @@ float2 SMAADetectVerticalCornerPattern(float2 weights, float2 texcoord, float2 d
 
 			sampler2D _MainTex;
 			sampler2D _SrcTex;
+			float4 SMAA_RT_METRICS;
 
 //-------------------------------------------------
 // S M A A  framework
@@ -672,14 +676,15 @@ void SMAAMovc(float4 cond, inout float4 variable, float4 value) {
 			#pragma glsl
 
 			#define mad(a, b, c) (a * b + c)
-			#define SMAA_RT_METRICS float4(1.0 / 1280.0, 1.0 / 720.0, 1280.0, 720.0)
+			//#define SMAA_RT_METRICS float4(1.0 / 1280.0, 1.0 / 720.0, 1280.0, 720.0)
 			#define SMAA_THRESHOLD 0.05
 			#define SMAA_MAX_SEARCH_STEPS 32
 			#define SMAA_MAX_SEARCH_STEPS_DIAG 16
 			#define SMAA_CORNER_ROUNDING 25
 			#define SMAA_LOCAL_CONTRAST_ADAPTATION_FACTOR 2.0
 
 			sampler2D _MainTex;
+			float4 SMAA_RT_METRICS;
 
 			struct vertOUT
 			{