Changeset 2409

Timestamp:

06/05/07 14:26:25 (17 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• MORIA/troll.mesh.old (added)
• MORIA/troll.mesh.old.2 (added)
• MORIA/troll.skeleton.old (added)
• MORIA/trollvs.cg (modified) (1 diff)
• materials/GTPBasic/GTPBasicShading.hlsl (modified) (1 diff)
• materials/GTPEnvMap/GTPEnvMap.hlsl (modified) (1 diff)
• materials/GTPPathMap/PathMap.hlsl (modified) (1 diff)
• materials/GTPPathMap/PathMapWeightCompute.hlsl (modified) (5 diffs)

GTP/trunk/App/Demos/Illum/Ogre/Media/MORIA/trollvs.cg

@@ -27 +27 @@
         oPosition = mul(viewProjectionMatrix, blendPos);
         // transform normal
-        //oNormal = mul((float3x3)worldMatrix3x4Array[blendIdx], normal);
+        oNormal = mul((float3x3)worldMatrix3x4Array[blendIdx[0]], normal) * blendWgt[0];
+        oNormal += mul((float3x3)worldMatrix3x4Array[blendIdx[1]], normal) * blendWgt[1];
         //oTangent = mul((float3x3)worldMatrix3x4Array[blendIdx], tangent);
         oNormal = normalize(oNormal);

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPBasic/GTPBasicShading.hlsl

@@ -59 +59 @@
         float cosb = max(dot(IN.wNormal.xyz, diff), 0);
         
-        //color.rgb += pow(cosa, 9) * cosb / dist2 * lightPower1 * lightColor1;
-        color.rgb += cosb / dist2 * lightPower1 * lightColor1;
+        color.rgb += pow(cosa, 9) * cosb / dist2 * lightPower1 * lightColor1;
+        //color.rgb += cosb / dist2 * lightPower1 * lightColor1;
         
         }

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPEnvMap/GTPEnvMap.hlsl

@@ -128 +128 @@
         RR = R; 
         RR = Hit(cubePos, R, DistanceMap);
-        Color = readCubeMap(CubeMap, R);
+        Color = readCubeMap(CubeMap, RR);
         //Color = readDistanceCubeMap(DistanceMap, cubePos)/300.0;
         //return Color;

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

@@ -44 +44 @@
                 float2 prmTexPos = float2(
                         (texAtlas.x + (iCluster % prmAtlasTiles.x)) / prmAtlasTiles.x,
-                        1.0 - (texAtlas.y + (iCluster / prmAtlasTiles.x)) / prmAtlasTiles.y);// + atlasHalfPixel;
+                        1.0 - (texAtlas.y + (iCluster / prmAtlasTiles.x)) / prmAtlasTiles.y) + atlasHalfPixel;
 
                 float weightIndex = tex2D(clusterWeightIndexSampler, float2(((float)iCluster + 0.5) / clusterCount, 0.5)).r;

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

@@ -34 +34 @@
     output.tex = (input.pos + 1.0) / 2.0;
     //output.tex = input.tex;
-    output.tex.y = 1.0 - output.tex.y;
+   // output.tex.y = 1.0 - output.tex.y;
+    input.pos.y *= -1;
    
     return output;
@@ -44 +45 @@
 {
         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;
         dir = normalize(dir);
         
@@ -60 +63 @@
         float4 lightVPos = mul(lightViewProj, float4(pos,1));
                 
-        //if( lightVPos.z  > 0.0)
-        //{     
+        if( lightVPos.z  > 0.0)
+        {       
         lightVPos /= lightVPos.w;
-                //float d = length(lightVPos.xy);
+                float d = length(lightVPos.xy);
                 
-                //if(d <= 1.0)
+                if(d <= 1.0)
         {
                         float dist = dist / lightFarPlane;
@@ -73 +76 @@
                         visibility = dist < storedDist + DIST_BIAS;
                 }
-   // }
+    }
     //visibility = 1.0 - visibility;
-    visibility = 1.0 + 0.00001 * visibility;
-        float spotFalloff = (dot(-diff, normalize(lightDir)) - lightAngleCos) / (1.0 - lightAngleCos);
-        //spotFalloff = saturate(dot(normalize(pos - lightPos), normalize(lightDir))) + 0.0000000001 * lightAngleCos;
-        spotFalloff = 1.0 + spotFalloff * 0.000000001;
+    //visibility = 1.0 + 0.00001 * visibility;
+        //float spotFalloff = (dot(-diff, lightDir) - lightAngleCos) / (1.0 - lightAngleCos);
+        float spotFalloff = max( dot(-diff, lightDir), 0) + 0.0000000001 * lightAngleCos;
+        //spotFalloff = 1.0 + spotFalloff * 0.000000001;
         spotFalloff = pow(saturate(spotFalloff), spotLightFalloff);
                 
         visibility *= spotFalloff / (lightAttenuation.y + dist * lightAttenuation.z + dist2 * lightAttenuation.w);
         
-        float4 ret = visibility * cosb * lightPower * lightColor;
+        float4 ret = visibility * cosb  *  lightPower * lightColor;
         return ret;
 }
@@ -113 +116 @@
         visibility = (distNorm <= storedDist);
           
-        //visibility = 1.0 + 0.00001 * visibility;              
+        visibility = 1.0 + 0.00001 * visibility;                
         visibility *=  1.0 / (lightAttenuation.y + dist * lightAttenuation.z + dist * dist * lightAttenuation.w);