Changeset 3152

Timestamp:

11/21/08 09:19:15 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• VboFormatConverter/VboFormatConverter.cpp (modified) (2 diffs)
• src/ResourceManager.cpp (modified) (1 diff)
• src/chcdemo.cpp (modified) (1 diff)
• src/shaders/normalMapping.cg (modified) (1 diff)

GTP/trunk/App/Demos/Vis/FriendlyCulling/VboFormatConverter/VboFormatConverter.cpp

@@ -195 +195 @@
         {
                 // hack
-                const string texName("fischi_u1_v1.png");
+                const string texName("FischiNormalmap.png");
                 //const string texName("wood.jpg");
 
@@ -203 +203 @@
                 ofile.write(texName.c_str(), sizeof(char) * texnameSize);
 
-                int boundS = 1, boundT = 1;
-
+                // set boundary to repeat
+                int boundS = 1; int boundT = 1;
+                
                 ofile.write(reinterpret_cast<char *>(&boundS), sizeof(int));
                 ofile.write(reinterpret_cast<char *>(&boundT), sizeof(int));

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ResourceManager.cpp

@@ -367 +367 @@
         str.read(reinterpret_cast<char *>(&texCoordCount), sizeof(int));
 
+        cout<<"here3" << texCoordCount << endl;
         if (texCoordCount)
         {

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

@@ -471 +471 @@
         //-- load some dynamic stuff
 
-        //resourceManager->mUseNormalMapping = true;
+        resourceManager->mUseNormalMapping = true;
         //resourceManager->mUseNormalMapping = false;
 
-        //LoadModel("fisch.dem", dynamicObjects);
+        LoadModel("fisch.dem", dynamicObjects);
         //LoadModel("hbuddha.dem", dynamicObjects);
         //LoadModel("venusm.dem", dynamicObjects);

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/normalMapping.cg

@@ -160 +160 @@
         // as it is the inverse of a rotation matrix 
         float3x3 tangToWorldTrafo = transpose(float3x3(IN.tangent.xyz, IN.bitangent.xyz, IN.normal.xyz));
-        const float3 tangentSpaceNorm = tex2Dlod(normalMap, float4(IN.texCoord.xy, 0, 0)).xyz;
+        const float3 tangentSpaceNorm = normalize(tex2Dlod(normalMap, float4(IN.texCoord.xy, 0, 0)).xyz);
+        //const float3 tangentSpaceNorm = tex2D(normalMap, IN.texCoord.xy).xyz;
+
         pix.normal = mul(tangToWorldTrafo, tangentSpaceNorm);
-        pix.normal = tangentSpaceNorm;
+        //pix.color.xyz = tangentSpaceNorm;
+
         return pix;
 }