Changeset 2498 for GTP/trunk/App

Timestamp:

07/03/07 11:03:46 (17 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/App/Demos/Illum/pathmap

Files:

• FlexVertex.cpp (modified) (1 diff)
• Mesh.cpp (modified) (1 diff)
• PathMap.exe (modified) (previous)
• SubMesh.cpp (modified) (1 diff)
• TriangleMesh.cpp (modified) (1 diff)
• computeWeights.fx (modified) (3 diffs)

GTP/trunk/App/Demos/Illum/pathmap/FlexVertex.cpp

@@ -17 +17 @@
 nTex(2)
 {
-        unsigned int ii[16] = {32, 40, 48, 56, 64, 72, 80, 88, 96, 104, 112, 120, 128, 136, 144, 152};
+        unsigned int ii[16] = {24, 32, 40, 48, 56, 64, 72, 80, 88, 96, 104, 112, 120, 128, 136, 144};
         for(int iu=0; iu<16; iu++)
                 texByteOffset[iu] = ii[iu];

GTP/trunk/App/Demos/Illum/pathmap/Mesh.cpp

@@ -63 +63 @@
                                                         &nSubsets,
                                                         &mesh);
+                materialNames = new wchar_t*[nSubsets+1];
+                materialNames[nSubsets] = NULL;
+                for(int mi=0; mi<nSubsets; mi++)
+                        materialNames[mi] = L::cloneW(L"noname");
         }
         if(hr != S_OK)

GTP/trunk/App/Demos/Illum/pathmap/SubMesh.cpp

@@ -70 +70 @@
         LPDIRECT3DDEVICE9 device = parent->pathMapEffect->device;
 
+        
         if(edgeCount)
         {
+                parent->pathMapEffect->effect->SetBool("bred", true);
+                parent->pathMapEffect->effect->CommitChanges();
                 device->SetStreamSource(0, parent->edgeVertexBuffer, 0, parent->mesh->GetNumBytesPerVertex());
                 device->DrawPrimitive(D3DPT_LINELIST, edgeStartIndex * 2, edgeCount);
+                parent->pathMapEffect->effect->SetBool("bred", false);
         }
 }

GTP/trunk/App/Demos/Illum/pathmap/TriangleMesh.cpp

@@ -23 +23 @@
 
         int pup = 0;
-        for(int p = 0; p < nMeshPatches; p++)
+        int p = 0;
+        for(p = 0; p < nMeshPatches; p++)
         {
                 meshPatches[p].vertexIndices[0] = indexBuffer[pup++];

GTP/trunk/App/Demos/Illum/pathmap/computeWeights.fx

@@ -31 +31 @@
     vsOutputComputeWeights output = (vsOutputComputeWeights)0;
     output.pos = input.pos;
-    output.tex = input.tex;
+    
+    output.tex = (input.pos + 1.0) / 2.0;
+    output.tex.y = 1.0 - output.tex.y;
+    
+    //output.tex = input.tex;
     return output;
 }
@@ -44 +48 @@
         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 diff = lightPos - pos;
         float dist2 = dot(diff, diff);
@@ -71 +75 @@
 //      if(ret > WEIGHTCUTOFF)
 //              ret = WEIGHTCUTOFF;
+        */
+        
+        
+        float3 diff = lightPos - pos;
+        float dist2 = dot(diff, diff);
+        if(dist2 < SAMPLECUTDIST2)
+                dist2 = SAMPLECUTDIST2;
+        diff = normalize(diff);
+        float cosa = max(dot(lightDir, -diff), 0);
+        float cosb = max(dot(dir, diff), 0);
+        float ret = pow(cosa, 9) * cosb / dist2;
+        return ret;
         
         return float4(ret, ret, ret, ret);