shaderplaid

Signed-off-by: HOSOKAWA Kenchi <hskwk@users.sourceforge.jp>

diff --git a/dev4/Shader/Gabor.fx b/dev4/Shader/Gabor.fx
index e588bb6..095d01f 100644 (file)
--- a/dev4/Shader/Gabor.fx
+++ b/dev4/Shader/Gabor.fx
@@ -50,7 +50,7 @@ float4 main(float2 uv : TEXCOORD) : COLOR
        //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 = 1.0;//exp( -(_r*_r) / (2.0) ) * alpha;\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

diff --git a/dev4/Shader/Gabor.ps b/dev4/Shader/Gabor.ps
index 1d39b76..cdc54db 100644 (file)
Binary files a/dev4/Shader/Gabor.ps and b/dev4/Shader/Gabor.ps differ

diff --git a/dev4/Shader/Grating.fx b/dev4/Shader/Grating.fx
new file mode 100644 (file)
index 0000000..88d73b8
--- /dev/null
+++ b/dev4/Shader/Grating.fx
@@ -0,0 +1,43 @@
+/// <summary>Amplitude of Grating</summary>\r
+/// <minValue>0</minValue>\r
+/// <maxValue>1</maxValue>\r
+/// <defaultValue>1</defaultValue>\r
+float contrast : register(C1);\r
+\r
+/// <summary>Phase of Grating</summary>\r
+/// <minValue>0</minValue>\r
+/// <maxValue>100</maxValue>\r
+/// <defaultValue>100</defaultValue>\r
+float frequency: register(C2);\r
+\r
+/// <summary>Phase of Grating</summary>\r
+/// <minValue>0</minValue>\r
+/// <maxValue>6.283184</maxValue>\r
+/// <defaultValue>0</defaultValue>\r
+float phase: register(C3);\r
+\r
+/// <summary>Orientation of Grating</summary>\r
+/// <minValue>0</minValue>\r
+/// <maxValue>6.283184</maxValue>\r
+/// <defaultValue>0</defaultValue>\r
+float orientation: register(C4);\r
+\r
+\r
+float rp(float2 uv)\r
+{\r
+       const float2 Center = float2(0.5,0.5);\r
+       float2 dir = uv - Center; // vector from center to pixel\r
+       float dist = length(dir);\r
+       //dir /= dist;\r
+       return dist;\r
+}\r
+\r
+float4 main(float2 uv : TEXCOORD) : COLOR\r
+{\r
+       float _x = sin(orientation)*uv[0]-cos(orientation)*uv[1];\r
+       float l = 0.5\r
+                 + contrast*0.5*cos(frequency*_x + phase);\r
+       \r
+       float4 color = float4(l,l,l,1.0);\r
+       return color;\r
+}\r

diff --git a/dev4/Shader/Grating.ps b/dev4/Shader/Grating.ps
new file mode 100644 (file)
index 0000000..1d39b76
Binary files /dev/null and b/dev4/Shader/Grating.ps differ

diff --git a/dev4/Shader/Plaid.fx b/dev4/Shader/Plaid.fx
new file mode 100644 (file)
index 0000000..e8635d1
--- /dev/null
+++ b/dev4/Shader/Plaid.fx
@@ -0,0 +1,69 @@
+/// <summary>Amplitude of Grating</summary>\r
+/// <minValue>0</minValue>\r
+/// <maxValue>1</maxValue>\r
+/// <defaultValue>0.5</defaultValue>\r
+float contrast : register(C1);\r
+\r
+/// <summary>Phase of Grating</summary>\r
+/// <minValue>0</minValue>\r
+/// <maxValue>100</maxValue>\r
+/// <defaultValue>100</defaultValue>\r
+float frequency: register(C2);\r
+\r
+/// <summary>Phase of Grating</summary>\r
+/// <minValue>0</minValue>\r
+/// <maxValue>6.283184</maxValue>\r
+/// <defaultValue>0</defaultValue>\r
+float phase: register(C3);\r
+\r
+/// <summary>Orientation of Grating</summary>\r
+/// <minValue>0</minValue>\r
+/// <maxValue>6.283184</maxValue>\r
+/// <defaultValue>0</defaultValue>\r
+float orientation: register(C4);\r
+\r
+/// <summary>Amplitude of Grating2</summary>\r
+/// <minValue>0</minValue>\r
+/// <maxValue>1</maxValue>\r
+/// <defaultValue>0.5</defaultValue>\r
+float contrast2 : register(C5);\r
+\r
+/// <summary>Phase of Grating2</summary>\r
+/// <minValue>0</minValue>\r
+/// <maxValue>100</maxValue>\r
+/// <defaultValue>100</defaultValue>\r
+float frequency2: register(C6);\r
+\r
+/// <summary>Phase of Grating2</summary>\r
+/// <minValue>0</minValue>\r
+/// <maxValue>6.283184</maxValue>\r
+/// <defaultValue>0</defaultValue>\r
+float phase2: register(C7);\r
+\r
+/// <summary>Orientation of Grating2</summary>\r
+/// <minValue>0</minValue>\r
+/// <maxValue>6.283184</maxValue>\r
+/// <defaultValue>0.785398</defaultValue>\r
+float orientation2: register(C8);\r
+\r
+\r
+float rp(float2 uv)\r
+{\r
+       const float2 Center = float2(0.5,0.5);\r
+       float2 dir = uv - Center; // vector from center to pixel\r
+       float dist = length(dir);\r
+       //dir /= dist;\r
+       return dist;\r
+}\r
+\r
+float4 main(float2 uv : TEXCOORD) : COLOR\r
+{\r
+       float _x1 = sin(orientation)*uv[0]-cos(orientation)*uv[1];\r
+       float _x2 = sin(orientation2)*uv[0]-cos(orientation2)*uv[1];\r
+       float l = 0.5\r
+                 + contrast*0.5*cos(frequency*_x1 + phase)\r
+                 + contrast2*0.5*cos(frequency2*_x2 + phase2);\r
+       \r
+       float4 color = float4(l,l,l,1.0);\r
+       return color;\r
+}\r

diff --git a/dev4/Shader/Plaid.ps b/dev4/Shader/Plaid.ps
new file mode 100644 (file)
index 0000000..31eee86
Binary files /dev/null and b/dev4/Shader/Plaid.ps differ

diff --git a/test4/PsychlopsMain.cs b/test4/PsychlopsMain.cs
index 5fe3ea7..fe1a13a 100644 (file)
--- a/test4/PsychlopsMain.cs
+++ b/test4/PsychlopsMain.cs
@@ -1,4 +1,4 @@
-\r
+/*\r
 ///+ Prefix linkto BasicCode1\r
 //// Lines for set up Psychlops environment\r
 using Psychlops;\r
@@ -70,6 +70,7 @@ namespace PsychlopsSilverlightApp
        }\r
 \r
 }\r
+ * */\r
 \r
 \r
 /*\r
@@ -541,7 +542,7 @@ using Psychlops;
 */\r
 \r
 \r
-/*\r
+\r
 using Psychlops;\r
 //Position Bias Program\r
 namespace PsychlopsSilverlightApp\r
@@ -607,4 +608,3 @@ namespace PsychlopsSilverlightApp
         }\r
     }\r
 }\r
-*/
\ No newline at end of file