sll

[psychlops/silverlight.git] / dev4 / Shader / Gabor.fx

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