Changeset 3127 for GTP/trunk/App/Demos

Timestamp:

11/14/08 17:22:49 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• VboFormatConverter/VboFormatConverter.cpp (modified) (4 diffs)
• VboFormatConverter/VboFormatConverter.h (modified) (1 diff)
• src/Bvh.cpp (modified) (1 diff)
• src/Geometry.cpp (modified) (4 diffs)
• src/RenderState.cpp (modified) (3 diffs)
• src/ResourceManager.cpp (modified) (4 diffs)
• src/ResourceManager.h (modified) (3 diffs)
• src/chcdemo.cpp (modified) (3 diffs)

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

@@ -19 +19 @@
                 delete [] mGeometry[i]->mVertices;
                 delete [] mGeometry[i]->mNormals;
+                delete [] mGeometry[i]->mTangents;
                 delete [] mGeometry[i]->mTexcoords;
 
@@ -83 +84 @@
         geom->mVertices = new SimpleVec[numElements];
         geom->mNormals = new SimpleVec[numElements];
+        geom->mTangents = new SimpleVec[numElements];
         geom->mTexcoords = new Texcoord[numElements];
 
@@ -105 +107 @@
                 geom->mNormals[line] = normal;
                 geom->mTexcoords[line] = tex;
+                geom->mTangents[line] = tangent;
 
                 ++ line;
@@ -125 +128 @@
         str.write(reinterpret_cast<char *>(geom->mVertices), sizeof(SimpleVec) * vertexCount);
         str.write(reinterpret_cast<char *>(geom->mNormals), sizeof(SimpleVec) * vertexCount);
+        str.write(reinterpret_cast<char *>(geom->mTangents), sizeof(SimpleVec) * vertexCount);
 
         int texCoordCount = geom->mTexcoordCount;

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

@@ -32 +32 @@
                 SimpleVec *mVertices;
                 SimpleVec *mNormals;
+                SimpleVec *mTangents;
                 Texcoord *mTexcoords;
 

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

@@ -1508 +1508 @@
         mRoot->mLast = (int)mGeometrySize - 1;
 
-        cout<<"f: " << mRoot->mFirst<< " l: " <<mRoot->mLast << endl;
+        //cout<<"f: " << mRoot->mFirst<< " l: " <<mRoot->mLast << endl;
         // add static root on left subtree
         mRoot->mFront = mStaticRoot;

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

@@ -15 +15 @@
 #endif
 
+using namespace std;
 
 namespace CHCDemoEngine 
@@ -66 +67 @@
 
         if (mTexCoords) dataSize += mNumVertices * 2;
-        
         if (mTangents) dataSize += mNumVertices * 3;
 
@@ -82 +82 @@
         {
                 for (int i = 0; i < mNumVertices; ++ i)
-                        ((Vector3 *)data)[mNumVertices * 3 + i] = mTangents[i];
+                        ((Vector3 *)data)[mNumVertices * 2 + i] = mTangents[i];
+
+                for (int i = 0; i < 3; ++ i)
+                        cout << ((Vector3 *)data)[mNumVertices * 2 + i] << " ";
 
                 currentPData += mNumVertices * 3;
@@ -129 +132 @@
 void Geometry::Render(RenderState *state)
 {
+        if (mHasTangents)
+                glEnableClientState(GL_COLOR_ARRAY);
+
         if (state->GetCurrentVboId() != mVboId)
         {
                 glBindBufferARB(GL_ARRAY_BUFFER_ARB, mVboId);
                 
-                if (mHasTexture)
-                        glTexCoordPointer(2, GL_FLOAT, 0, (char *)NULL + 2 * mNumVertices * sizeof(Vector3));
+                int currentPointer;
 
                 glNormalPointer(GL_FLOAT, 0, (char *)NULL + mNumVertices * sizeof(Vector3));
+
+                if (mHasTangents)
+                {
+                        glColorPointer(3, GL_FLOAT, 0, (char *)NULL + mNumVertices * sizeof(Vector3));
+                        currentPointer = mNumVertices * 3 * sizeof(Vector3);
+                }
+                else
+                        currentPointer = mNumVertices * 2 * sizeof(Vector3);
+
+                if (mHasTexture)
+                        glTexCoordPointer(2, GL_FLOAT, 0, (char *)NULL + currentPointer);
 
                 glVertexPointer(3, GL_FLOAT, 0, (char *)NULL);  
 
                 state->SetCurrentVboId(mVboId);
+
         }
 
         // don't render first degenerate index
         glDrawArrays(GL_TRIANGLES, 0, mNumVertices);
+
+        if (mHasTangents)
+                glDisableClientState(GL_COLOR_ARRAY);
 }
 

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

@@ -130 +130 @@
                 static Technique queryTech = GetQueryTechnique();
                 SetState(&queryTech);
+
+                glDisableClientState(GL_NORMAL_ARRAY);
+        }
+        else
+        {
+                glEnableClientState(GL_NORMAL_ARRAY);
         }
 
@@ -219 +225 @@
         {
                 mTexturesEnabled = false;
-
-                //if (!tech->GetFragmentProgram())
-                        glDisable(GL_TEXTURE_2D);
+                glDisable(GL_TEXTURE_2D);
 
                 glDisableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -229 +233 @@
                 mTexturesEnabled = true;
 
-                //if (!tech->GetFragmentProgram())
-                        glEnable(GL_TEXTURE_2D);
-
+                glEnable(GL_TEXTURE_2D);
                 glEnableClientState(GL_TEXTURE_COORD_ARRAY);
         }

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

@@ -39 +39 @@
 ResourceManager::ResourceManager()
 { 
+        mUseNormalMapping = false;
 }
 
@@ -289 +290 @@
         static ShaderProgram *sDefaultVertexProgramMrt = ShaderManager::GetSingleton()->GetShaderProgram("defaultVertexMrt");
 
+        static ShaderProgram *sNormalMappingVertexProgramMrt = ShaderManager::GetSingleton()->GetShaderProgram("normalMappingVertexMrt");
+        static ShaderProgram *sNormalMappingFragmentProgramMrt = ShaderManager::GetSingleton()->GetShaderProgram("normalMappingFragmentMrt");
+
         Technique *deferred = new Technique(*tech);
 
@@ -343 +347 @@
         str.read(reinterpret_cast<char *>(normals), sizeof(Vector3) * vertexCount);
 
+        Vector3 *tangents;
+
+        if (mUseNormalMapping)
+        {
+                tangents = new Vector3[vertexCount];
+                str.read(reinterpret_cast<char *>(tangents), sizeof(Vector3) * vertexCount);
+        }
+        else
+        {
+                tangents = NULL;
+        }
+
         int texCoordCount;
         str.read(reinterpret_cast<char *>(&texCoordCount), sizeof(int));
@@ -356 +372 @@
         }
 
-        return new Geometry(vertices, normals, texcoords, vertexCount, true, NULL);
-        //return new Geometry(vertices, normals, texcoords, vertexCount, false);
+        const bool delGeometry = false;
+        return new Geometry(vertices, normals, texcoords, vertexCount, delGeometry, tangents);
 }
 

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

@@ -58 +58 @@
 
 
+        bool mUseNormalMapping;
+
 protected:
         
@@ -76 +78 @@
         Geometry *LoadGeometry(igzstream &str);
 
+
         std::map<int, Texture *> mTextureTable;
         std::map<int, Material *> mMaterialTable;
@@ -90 +93 @@
         TransformContainer mTrafos;
         ShapeContainer mShapes;
-        //LODContainer mLODs;
+        
         /// the scene entities
         SceneEntityContainer mSceneEntities;

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

@@ -471 +471 @@
         //-- load some dynamic stuff
 
-        //LoadModel("fisch.dem", dynamicObjects);
-        LoadModel("hbuddha.dem", dynamicObjects);
+        resourceManager->mUseNormalMapping = true;
+        //resourceManager->mUseNormalMapping = false;
+
+        LoadModel("fisch.dem", dynamicObjects);
+        
+        resourceManager->mUseNormalMapping = false;
+        //LoadModel("hbuddha.dem", dynamicObjects);
         buddha = dynamicObjects.back();
         
@@ -1996 +2001 @@
         }
 
+
         /////////////////
         //-- reset gl renderState before the final visible objects pass
@@ -2115 +2121 @@
         const string filename = string(model_path + model);
 
+        cout << "\nloading model " << filename << endl;
         if (resourceManager->Load(filename, entities))
-                cout << "model " << filename << " loaded" << endl;
+                cout << "model " << filename << " successfully loaded" << endl;
         else
         {