X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=dev4%2FShader%2FGabor.fx;fp=dev4%2FShader%2FGabor.fx;h=5ec9fbf22d1d116b3f679a4f10898ed79da475f0;hb=2e368438f3f6c0a65f0883ad272b6f2d9b719dbc;hp=095d01fb15930c374799ce79a318de08ea0b81e7;hpb=6f8443d682c25aa44d9158e8728ced9dd54fa4ca;p=psychlops%2Fsilverlight.git

diff --git a/dev4/Shader/Gabor.fx b/dev4/Shader/Gabor.fx
index 095d01f..5ec9fbf 100644
--- a/dev4/Shader/Gabor.fx
+++ b/dev4/Shader/Gabor.fx
@@ -45,16 +45,15 @@ float rp(float2 uv)
 }
 
 float4 main(float2 uv : TEXCOORD) : COLOR
-//float4 main(float2 uv : VPOS ) : COLOR
 {
-	//float _r = rp(uv)*sigma*4.0;
-	//float env = exp( -(_r*_r) / 2.0 ) * alpha;
-	float _r = rp(uv)*8;
-	float env = exp( -(_r*_r) / (2.0) ) * alpha;
-
-	float _x = sin(orientation)*uv[0]-cos(orientation)*uv[1];
-	float l = 0.5+env*contrast*0.5*cos(frequency*_x + phase);
-	
-	float4 color = float4(l,l,l,1.0);
-	return color;
-}
+      float _r = rp(uv)*8;
+      float env = exp( -(_r*_r) / (2.0) ) * alpha;
+
+      float _x = sin(orientation)*uv[0]-cos(orientation)*uv[1];
+      float cl = 127.0/255.0+env*contrast*127.0/255.0*cos(frequency*_x + phase);
+      if(_r>3.2) if(abs(cl-127.0/255.0)<0.005) cl=127.0/255.0;
+      float l = cl;
+     
+      float4 color = float4(l,l,l,1.0);
+      return color;
+}
\ No newline at end of file