Changeset 2417 for GTP/trunk/App/Demos/Illum/Ogre/Media/materials

Timestamp:

06/06/07 19:19:29 (18 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPPathMap

Files:

• PathMap.material (modified) (1 diff)
• PathMapWeightCompute.hlsl (modified) (6 diffs)

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPPathMap/PathMap.material

@@ -166 +166 @@
         {  
                 filtering none   
+                texture MainLightPM_WEIGHT_MAP_ALL
+        }
+        texture_unit
+        {
+                filtering none   
+                texture MainLightPM_WEIGHT_MAP
         }
    }

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPPathMap/PathMapWeightCompute.hlsl

@@ -32 +32 @@
     vsOutputComputeWeights output = (vsOutputComputeWeights)0;
     output.pos = input.pos;
-    output.tex = (input.pos + 1.0) / 2.0;
+    output.tex = (input.pos.xy + 1.0) / 2.0;
     //output.tex = input.tex;
-   // output.tex.y = 1.0 - output.tex.y;
-    input.pos.y *= -1;
+    output.tex.y = 1.0 - output.tex.y;
+    //input.pos.y *= -1;
    
     return output;
@@ -95 +95 @@
 {
         float dataColumnWidth = 1.0 / (float)nRadionColumns;
-        int bushIndex = input.tex.x * 4096 + input.tex.y * nRadionColumns * 4096;
+/*      int bushIndex = input.tex.x * 4096 + input.tex.y * nRadionColumns * 4096;
         int werx = bushIndex % nRadionColumns;
         int wery = bushIndex / nRadionColumns;
         float3 pos = tex2D(radionSampler, float2((werx + 0.25) * dataColumnWidth, (wery  + 0.5) / 4096.0) ).xyz;
-        float3 dir = tex2D(radionSampler, float2((werx + 0.75) * dataColumnWidth, (wery  + 0.5) / 4096.0) ).xyz;
+        float3 dir = tex2D(radionSampler, float2((werx + 0.75) * dataColumnWidth, (wery  + 0.5) / 4096.0) ).xyz;*/
+        float3 pos = tex2D(radionSampler, float2(input.tex.x + 0.25 * dataColumnWidth, input.tex.y  + 0.5 / 4096.0) ).xyz;
+        float3 dir = tex2D(radionSampler, float2(input.tex.x + 0.75 * dataColumnWidth, input.tex.y  + 0.5 / 4096.0) ).xyz;
+//      float3 pos = tex2D(radionSampler, float2(0.25, input.tex.y  + 0.5 / 4096.0) ).xyz;
+//      float3 dir = tex2D(radionSampler, float2(0.75, input.tex.y  + 0.5 / 4096.0) ).xyz;
+        
         dir = normalize(dir);
         
@@ -115 +120 @@
         dist -= DIST_BIAS;
         visibility = (distNorm <= storedDist);
-          
-        visibility = 1.0 + 0.00001 * visibility;                
+        //visibility = visibility * 0.0000001 + 1.0;  
         visibility *=  1.0 / (lightAttenuation.y + dist * lightAttenuation.z + dist * dist * lightAttenuation.w);
         
         float4 ret = visibility * cosb * lightPower * lightColor;
+        
+        //ret = 0.00000001 * ret * nRadionColumns + (dist<25.0);//float4(pos,1);//input.tex.y * 4096.0;
         return ret;
 }
@@ -137 +143 @@
         for(int i = 0; i < entryPointCount; i++)
         {
-                
                 float dataColumnWidth = 1.0 / (float)nRadionColumns;
                 int werx = currentEntryPoint % nRadionColumns;
                 int wery = currentEntryPoint / nRadionColumns;
-                float2 coord1 = float2((werx + 0.5) * dataColumnWidth, (wery  + 0.5) / 4096.0);
+                float2 coord1 = float2((werx + 0.5) * dataColumnWidth, (wery  + 0.5) / 4096.0);         
                 float2 coord2 = coord1 + float2(0.25 * dataColumnWidth, 0);
+                
+                //coord1 = coord1 * 0.00000001 + float2(0.5, (currentEntryPoint + 0.5)/4096);
+                //coord2 = coord1 + float2(0.25, 0);
+                
                 float3 w = tex2Dlod(allWeightsSampler, float4(coord1, 0, 0)).rgb;
-                float radrad = tex2Dlod(radionSampler, float4(coord2, 0, 0)).a;         
+                float radrad = 1;// tex2Dlod(radionSampler, float4(coord2, 0, 0)).a;            
                 weight += w * radrad;           
                 clusterRad += radrad;
@@ -155 +164 @@
                 weight = 0;
    
-        return float4(weight, 1);
+        float4 ret = 0;
+        //if(abs(input.tex.x - 2*halfPixel*2)<halfPixel/2.0)
+                ret = float4(weight, 1);        
+        return ret;
 }
 
@@ -162 +174 @@
                                                  uniform float4x4 worldViewProj,
                                                  out float4 hPos:POSITION,
-                                                 out float2 texCoord: TEXCOORD0)
+                                                 out float3 texCoord: TEXCOORD0)
 {
-        hPos = mul(worldViewProj, position);
-        texCoord = color.xy;
+        hPos = mul(worldViewProj, float4(position.x,0,position.z,1));
+        texCoord = color.xyz;
+        texCoord = position.y;
 }
 
-float4 EntryPointDisplayPS(float2 texCoord : TEXCOORD0,
-                                                        uniform sampler2D weightTexture : register(s0)):COLOR0
+float4 EntryPointDisplayPS(float3 texCoord : TEXCOORD0,
+                                                        uniform sampler2D weightTexture : register(s0),
+                                                        uniform sampler2D clusterWeightTexture : register(s1)):COLOR0
 {
-        //return texCoord.y;
-        return texCoord.r;
+        float entryPointID = (256.0f * texCoord.r * 256.0f + 256.0f * texCoord.g + 0.5) / 4096.0f;
+        entryPointID = texCoord.x;
+        //return float4(texCoord, 1);
+        //return tex2D(clusterWeightTexture, float2(0.5, 1.0 - ((entryPointID + 0.5 )/ 4096.0)));
+        return tex2D(weightTexture, float2(0.5, ((entryPointID + 0.5 )/ 4096.0)));
+        //return abs(tex2D(weightTexture, float2(0.5, ((entryPointID + 0.5 )/ 4096.0))) - entryPointID);
+        return entryPointID;
 }