Changeset 3153

Timestamp:

11/21/08 17:43:49 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• VboFormatConverter/VboFormatConverter.cpp (modified) (4 diffs)
• VboFormatConverter/main.cpp (modified) (1 diff)
• src/Geometry.cpp (modified) (4 diffs)
• src/RenderState.cpp (modified) (1 diff)
• src/ResourceManager.cpp (modified) (2 diffs)
• src/chcdemo.cpp (modified) (2 diffs)
• src/shaders/deferred.cg (modified) (1 diff)
• src/shaders/normalMapping.cg (modified) (8 diffs)

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

@@ -82 +82 @@
         // convert the triangles to geometry
         geom->mVertexCount = numElements;
+        geom->mTexcoordCount = numElements;
+
         geom->mVertices = new SimpleVec[numElements];
         geom->mNormals = new SimpleVec[numElements];
@@ -94 +96 @@
         {
                 sscanf(str, "%f %f %f %f %f %f %f %f %f %f %f", 
-                       &vtx.x, &vtx.z, &vtx.y, 
-                           &normal.x, &normal.z, &normal.y, 
+                       &vtx.x, &vtx.y, &vtx.z, 
+                           &normal.x, &normal.y, &normal.z, 
                            &tex.first, &tex.second,
                            &tangent.x, &tangent.y, &tangent.z);
 
                 const float scale = 0.05f;
-                vtx.x *= scale;
-                vtx.y *= scale;
-                vtx.z *= scale;
-
-                geom->mVertices[line] = vtx;
-                geom->mNormals[line] = normal;
+                
+                geom->mVertices[line].x = vtx.x * scale;
+                geom->mVertices[line].y = vtx.z * scale;
+                geom->mVertices[line].z = vtx.y * scale;
+        
+                geom->mNormals[line].x = normal.x;
+                geom->mNormals[line].y = normal.z;
+                geom->mNormals[line].z = normal.y;
+
+                geom->mTangents[line].x = tangent.x;
+                geom->mTangents[line].y = tangent.z;
+                geom->mTangents[line].z = tangent.y;
+
                 geom->mTexcoords[line] = tex;
-                geom->mTangents[line] = tangent;
-
+
+                static int dummy = 0;
+
+                if (dummy ++ < 5) cout << "tangent: " << geom->mTangents[line] << endl;
                 ++ line;
         }
@@ -134 +145 @@
 
         if (texCoordCount)
+        {
                 str.write(reinterpret_cast<char *>(geom->mTexcoords), sizeof(float) * texCoordCount * 2);
-        
+        }
+
 
         ///////
@@ -163 +176 @@
 
                 ambient.x = ambient.y = ambient.z = 0.2f;
-                diffuse.x = diffuse.y = diffuse.z = 1.0f;
+                diffuse.x = 0.7f; diffuse.y = 0.4f; diffuse.z = 0.2f;
                 spec.x   = spec.y   = spec.z   =  .0f;
                 emm = spec;

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

@@ -22 +22 @@
                 exit(0);
         }
-
+        
+        std::cin.get();
         cout << "conversion successful" << endl;
 

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

@@ -82 +82 @@
         {
                 for (int i = 0; i < mNumVertices; ++ i)
+                {
+                        Vector3 tangent = Normalize(mTangents[i]);
+                        Vector3 normal =  Normalize(mNormals[i]);
+
+                        float dotProd = DotProd(tangent,normal);
+
+                        tangent -= normal * dotProd;
+                        tangent = Normalize(tangent);
+
+                        //mTangents[i] = tangent;
+                        mTangents[i] = Vector3(0,1,0);//tangent * 0.5f + Vector3(0.5f);
+                }
+
+                for (int i = 0; i < mNumVertices; ++ i)
                         ((Vector3 *)data)[mNumVertices * 2 + i] = mTangents[i];
 
@@ -111 +125 @@
         if (mTangents)
         {
+                cout << "dotprods: " << endl;
+
+                for (int i = 0; i < 1000; ++ i)
+                {
+                        //cout << mTangents[i] << " " << mNormals[i] << " " << DotProd(Normalize(mTangents[i]), Normalize(mNormals[i])) << endl;
+                        float d = fabs(DotProd(Normalize(mTangents[i]), Normalize(mNormals[i])));
+                        if (d > 0.01) cout << d << " ";
+                        //cout << d << " ";
+                }
+                cout << endl;
+        
                 glColorPointer(3, GL_FLOAT, 0, (char *)NULL + currentPVbo);
                 currentPVbo += mNumVertices * sizeof(Vector3);
@@ -133 +158 @@
 {
         if (mHasTangents)
+        {
+                cout<<"x";
                 glEnableClientState(GL_COLOR_ARRAY);
-
+        }
         if (state->GetCurrentVboId() != mVboId)
         {
@@ -145 +172 @@
                 if (mHasTangents)
                 {
-                        glColorPointer(3, GL_FLOAT, 0, (char *)NULL + mNumVertices * sizeof(Vector3));
+                        //glClientActiveTextureARB(GL_TEXTURE1_ARB);
+                        //glTexCoordPointer(2, GL_FLOAT, (char *)NULL + mNumVertices * sizeof(Vector3));
+
+                        glColorPointer(3, GL_FLOAT, 0, (char *)NULL + mNumVertices * 2 * sizeof(Vector3));
                         currentPointer = mNumVertices * 3 * sizeof(Vector3);
+                        //glClientActiveTextureARB(GL_TEXTURE0_ARB);
+
                 }
                 else

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

@@ -267 +267 @@
                 }
 
-                if (1)//frag != mCurrentFragmentProgram)
+                if (frag != mCurrentFragmentProgram)
                 {                       
                         mCurrentFragmentProgram = frag;

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

@@ -344 +344 @@
         if (str.eof()) return NULL;
 
-        //cout << "vertexcount: " << vertexCount << endl;
-
         vertices = new Vector3[vertexCount];
     str.read(reinterpret_cast<char *>(vertices), sizeof(Vector3) * vertexCount);
@@ -367 +365 @@
         str.read(reinterpret_cast<char *>(&texCoordCount), sizeof(int));
 
-        cout<<"here3" << texCoordCount << endl;
+
         if (texCoordCount)
         {

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

@@ -477 +477 @@
         //LoadModel("hbuddha.dem", dynamicObjects);
         //LoadModel("venusm.dem", dynamicObjects);
-        LoadModel("camel.dem", dynamicObjects);
+        //LoadModel("camel.dem", dynamicObjects);
         //LoadModel("toyplane2.dem", dynamicObjects);
         //LoadModel("elephal.dem", dynamicObjects);
@@ -485 +485 @@
         buddha = dynamicObjects.back();
         
-        cout << "here3 " << buddha->GetWorldCenter() << " " << buddha->GetBoundingBox().Center() << endl;
-
         const Vector3 sceneCenter(470.398f, 240.364f, 182.5f);
         

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

@@ -74 +74 @@
         // store scaled view vector so wie don't have to normalize for e.g., ssao
         OUT.color.w = color.w;// / length(IN.view);
-        
+        OUT.color = color;
         return OUT;
 }

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

@@ -19 +19 @@
         float4 texCoord: TEXCOORD0;    
 
-        float4 tangent: TEXCOORD6;  
          // eye position
         float4 eyePos: TEXCOORD1;
@@ -26 +25 @@
         float4 worldPos: TEXCOORD3;
         float4 oldWorldPos: TEXCOORD4;
-        float4 bitangent: TEXCOORD5;
+        float4 tangent: TEXCOORD5;  
+        float4 bitangent: TEXCOORD6;
 };
 
@@ -33 +33 @@
 struct fragin
 {
-        float4 tangent: TEXCOORD6;  
         float4 texCoord: TEXCOORD0;    
 
@@ -42 +41 @@
         float4 worldPos: TEXCOORD3;
         float4 oldWorldPos: TEXCOORD4;
-        float4 bitangent: TEXCOORD5;
+        float4 tangent: TEXCOORD5;  
+        float4 bitangent: TEXCOORD6;
 };
 
@@ -64 +64 @@
         vtxout OUT;
 
-        OUT.tangent = IN.color;
+        //float4 tangent =  float4(IN.color.xyz * 2.0f - 1.0f, 1.0f);
+        //float4 tangent = float4(1,0,0,1);
+        float4 tangent = IN.color;
+
+        //float4 tangent = IN.color;
         OUT.texCoord = IN.texCoord;
 
@@ -77 +81 @@
         // the normal has to be correctly transformed with the inverse transpose
         OUT.normal = mul(glstate.matrix.invtrans.modelview[0], IN.normal);
-        OUT.tangent = mul(glstate.matrix.invtrans.modelview[0], IN.color); 
+        OUT.tangent = tangent;//mul(glstate.matrix.invtrans.modelview[0], tangent); 
 
-        OUT.bitangent = float4(cross(IN.color.xyz, IN.normal.xyz), 1);
+        //OUT.bitangent = float4(cross(IN.color.xyz, IN.normal.xyz), 1);
+        //OUT.bitangent = float4(cross(OUT.tangent.xyz, OUT.normal.xyz), 1);
+        OUT.bitangent = float4(cross(OUT.normal.xyz, tangent.xyz), 1);
 
         return OUT;
@@ -89 +95 @@
 /*   Shader computing the MRT output for normal mapped geometry   */
 /******************************************************************/
+
+pixel frag(fragin IN,
+                   uniform float4x4 viewMatrix,
+                   uniform sampler2D normalMap: TEXUNIT0)
+{
+        pixel pix;
+        // hack: use comination of emmisive + diffuse (emmisive used as constant ambient term)
+        pix.color = glstate.material.diffuse + glstate.material.emission;
+        
+        // eye space depth
+        pix.color.w = length(IN.eyePos.xyz);
+        // the scene entity id
+        //pix.id = glstate.fog.color.xyz;
+        // the offset to the world pos from old frame
+        pix.offsVec = IN.oldWorldPos.xyz - IN.worldPos.xyz;
+
+        // compute tanget space in world space => transform basis vectors back into world space by
+        // multiplying with inverse view. since transforming normal with T means to 
+        // multiply with the inverse transpose of T, we multiple with 
+        // Transp(Inv(Inv(view))) = Transp(view)
+        float3 normal = mul(transpose(viewMatrix), IN.normal).xyz;
+        float3 tangent = mul(transpose(viewMatrix), IN.tangent).xyz;
+        float3 bitangent = mul(transpose(viewMatrix), IN.bitangent).xyz;
+
+        // compute tangent space - world space transform which is the transpose,
+        // 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 = 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.color.xyz = float3(abs(dot(tangent.xyz, normal.xyz)));
+        //pix.color.xyz = float3(abs(dot(normalize(IN.normal.xyz), normalize(IN.tangent.xyz))));
+        pix.color.xyz = float3(abs(dot(IN.normal.xyz, IN.tangent.xyz)));
+        //pix.color.xyz = normal.xyz;
+        pix.color.xyz = IN.tangent.xyz;
+
+        return pix;
+}
+
 
 
@@ -133 +179 @@
 }
 
-
-pixel frag(fragin IN,
-                   uniform float4x4 viewMatrix,
-                   uniform sampler2D normalMap: TEXUNIT0)
-{
-        pixel pix;
-        // hack: use comination of emmisive + diffuse (emmisive used as constant ambient term)
-        pix.color = glstate.material.diffuse + glstate.material.emission;
-        
-        // eye space depth
-        pix.color.w = length(IN.eyePos.xyz);
-        // the scene entity id
-        //pix.id = glstate.fog.color.xyz;
-        // the offset to the world pos from old frame
-        pix.offsVec = IN.oldWorldPos.xyz - IN.worldPos.xyz;
-
-        // compute tanget space in world space => transform basis vectors back into world space by
-        // multiplying with inverse view. since transforming normal with T means to 
-        // multiply with the inverse transpose of T, we multiple with 
-        // Transp(Inv(Inv(view))) = Transp(view)
-        float3 normal = mul(transpose(viewMatrix), IN.normal).xyz;
-        float3 tangent = mul(transpose(viewMatrix), IN.tangent).xyz;
-        float3 bitangent = mul(transpose(viewMatrix), IN.bitangent).xyz;
-
-        // compute tangent space - world space transform which is the transpose,
-        // 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 = 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.color.xyz = tangentSpaceNorm;
-
-        return pix;
-}