Changeset 3236

Timestamp:

12/26/08 03:40:45 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• VisibilitySolutionConverter/VisibilitySolutionConverter.cpp (modified) (10 diffs)
• src/Bvh.cpp (modified) (1 diff)
• src/ResourceManager.cpp (modified) (1 diff)
• src/Shape.cpp (modified) (1 diff)
• src/chcdemo.cpp (modified) (1 diff)

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

@@ -363 +363 @@
         str.write(reinterpret_cast<char *>(geom->mNormals), sizeof(SimpleVec) * vertexCount);
 
-        int texCoordCount = geom->mTexcoordCount;
+        int texCoordCount = 0;//geom->mTexcoordCount;
         str.write(reinterpret_cast<char *>(&texCoordCount), sizeof(int));
 
@@ -374 +374 @@
         //-- texture
 
-#ifdef USE_TEXTURE
-        int texId = 0;
-#else
         int texId = -1;
-#endif
-
         str.write(reinterpret_cast<char *>(&texId), sizeof(int));
 
         bool alphaTestEnabled = false;
-        //bool cullFaceEnabled = false;
         bool cullFaceEnabled = true;
 
@@ -391 +385 @@
         // material
         bool hasMaterial = true;
-        //bool hasMaterial = false;
+        
         str.write(reinterpret_cast<char *>(&hasMaterial), sizeof(bool));
         
@@ -425 +419 @@
         
 
-        /////////
-        //-- write textures
-
-#ifdef USE_TEXTURE
-        int textureCount = 1;
-#else
         int textureCount = 0;
-#endif
         ofile.write(reinterpret_cast<char *>(&textureCount), sizeof(int));
-
-        if (textureCount > 0)
-        {
-                // hack
-                const string texName("wood.jpg");
-
-                int texnameSize = (int)texName.length() + 1;
-                ofile.write(reinterpret_cast<char *>(&texnameSize), sizeof(int));
-
-                ofile.write(texName.c_str(), sizeof(char) * texnameSize);
-
-                int boundS = 1, boundT = 1;
-
-                ofile.write(reinterpret_cast<char *>(&boundS), sizeof(int));
-                ofile.write(reinterpret_cast<char *>(&boundT), sizeof(int));
-        }
 
 
@@ -455 +426 @@
         //-- write shapes
 
-        ofile.write(reinterpret_cast<char *>(&mNumShapes), sizeof(int));
+        int numShapes = (int)mGeometry.size();
+        ofile.write(reinterpret_cast<char *>(&numShapes), sizeof(int));
 
         vector<Geometry *>::const_iterator it, it_end = mGeometry.end();
@@ -465 +437 @@
 
 
-        int entityCount = 1;
+        int entityCount = numShapes;
         ofile.write(reinterpret_cast<char *>(&entityCount), sizeof(int));
 
 
         //////////
-        //-- write single scene entity
-
-        // no transformation
-        bool hasTrafo = false;
-        ofile.write(reinterpret_cast<char *>(&hasTrafo), sizeof(bool));
-
-        // a dummy lod
-        int numLODs = 1;
-        ofile.write(reinterpret_cast<char *>(&numLODs), sizeof(int));
-
-        float dist = 0;
-        ofile.write(reinterpret_cast<char *>(&dist), sizeof(float));
-
-        ofile.write(reinterpret_cast<char *>(&mNumShapes), sizeof(int));
+        //-- write single scene entity for each shape
 
         // all shapes belong to this scene entity
-        for (int i = 0; i < mNumShapes; ++ i)
-        {
+        for (int i = 0; i < numShapes; ++ i)
+        {
+                // no transformation
+                bool hasTrafo = false;
+                ofile.write(reinterpret_cast<char *>(&hasTrafo), sizeof(bool));
+
+                // a dummy lod
+                int numLODs = 1;
+                ofile.write(reinterpret_cast<char *>(&numLODs), sizeof(int));
+
+                float dist = 0;
+                ofile.write(reinterpret_cast<char *>(&dist), sizeof(float));
+
+                int shapesPerEnt = 1;
+                ofile.write(reinterpret_cast<char *>(&shapesPerEnt), sizeof(int));
+
                 int shapeId = i;
                 ofile.write(reinterpret_cast<char *>(&shapeId), sizeof(int));
@@ -501 +474 @@
 {
         cout << "vtx: " << vertices.size() << endl;
-/*      BvhNode n;
-        
-        mGlobalTriangleIds.clear();
-        for (size_t i = 0; i < vertices.size() / 3; ++ i)
-        {
-                mGlobalTriangleIds.push_back((int)i);
-        }
-
-        for (size_t i = 0; i < vertices.size() / 3; ++ i)
-                n.mTriangleIds.push_back((int)i);
-
-        mBvhNodes.push_back(n);
-*/
+
         for (size_t i = 0; i < mBvhNodes.size(); ++ i)
         {
@@ -540 +501 @@
                 }
 
-                LoadShape(_vertices, _normals, _texCoords);
+                if (!_vertices.empty())
+                {
+                        ++ mNumShapes;
+                        LoadShape(_vertices, _normals, _texCoords);
+                }
         }
 }
@@ -547 +512 @@
 bool VisibilitySolutionConverter::WriteBvh(const string &filename)
 {
-        ogzstream ofile(filename.c_str());
-
-        if (!ofile.is_open())
-                return false;
-        
-
-        /////////
-        //-- write textures
-
-#ifdef USE_TEXTURE
-        int textureCount = 1;
-#else
-        int textureCount = 0;
-#endif
-        ofile.write(reinterpret_cast<char *>(&textureCount), sizeof(int));
-
-        if (textureCount > 0)
-        {
-                // hack
-                const string texName("wood.jpg");
-
-                int texnameSize = (int)texName.length() + 1;
-                ofile.write(reinterpret_cast<char *>(&texnameSize), sizeof(int));
-
-                ofile.write(texName.c_str(), sizeof(char) * texnameSize);
-
-                int boundS = 1, boundT = 1;
-
-                ofile.write(reinterpret_cast<char *>(&boundS), sizeof(int));
-                ofile.write(reinterpret_cast<char *>(&boundT), sizeof(int));
-        }
-
-
-        ///////////
-        //-- write shapes
-
-        ofile.write(reinterpret_cast<char *>(&mNumShapes), sizeof(int));
-
-        vector<Geometry *>::const_iterator it, it_end = mGeometry.end();
-
-        for (it = mGeometry.begin(); it != it_end; ++ it)
-        {
-                WriteGeometry(ofile, *it);
-        }
-
-
-        int entityCount = 1;
-        ofile.write(reinterpret_cast<char *>(&entityCount), sizeof(int));
-
-
-        //////////
-        //-- write single scene entity
-
-        // no transformation
-        bool hasTrafo = false;
-        ofile.write(reinterpret_cast<char *>(&hasTrafo), sizeof(bool));
-
-        // a dummy lod
-        int numLODs = 1;
-        ofile.write(reinterpret_cast<char *>(&numLODs), sizeof(int));
-
-        float dist = 0;
-        ofile.write(reinterpret_cast<char *>(&dist), sizeof(float));
-
-        ofile.write(reinterpret_cast<char *>(&mNumShapes), sizeof(int));
-
-        // all shapes belong to this scene entity
-        for (int i = 0; i < mNumShapes; ++ i)
-        {
-                int shapeId = i;
-                ofile.write(reinterpret_cast<char *>(&shapeId), sizeof(int));
-        }
-
+        
         return true;
 }
@@ -648 +541 @@
                 int id;
                 fread(&id, sizeof(int), 1, fr);
-                mGlobalTriangleIds[i] = id;
+                mGlobalTriangleIds.push_back(id);
                 //triangles[i] = scene->triangles[id];
         }

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

@@ -267 +267 @@
         mVboId = -1;
         // bound the maximal depth of the dynamic branch
-        mMaxDepthForDynamicBranch = 10;
+        mMaxDepthForDynamicBranch = 1;
 }
 

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

@@ -109 +109 @@
                         int shapeId;
                         str.read(reinterpret_cast<char *>(&shapeId), sizeof(int));
+cout<<"x";
 
                         Geometry *geom = mGeometryTable[shapeId];
+cout<<"y";
+
                         Material *mat = mMaterialTable[shapeId];
-
+cout<<"z";
                         // create shape
                         Shape *shape = new Shape(geom, mat);
+cout<<"w";
+
                         mShapes.push_back(shape);
 

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

@@ -15 +15 @@
 mGeometry(geometry), 
 mMaterial(mat)
-{
+{       std::cout<<"i";
         mCenter = GetBoundingBox().Center();
+        std::cout<<"R";
 }
 

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

@@ -578 +578 @@
 
 
-        //LoadModel("vienna_full_hp.dem", dynamicObjects);
-        //dynamicObjects.back()->GetTransform()->SetMatrix(transl);
+        LoadModel("vienna_full_hp.dem", dynamicObjects);
+        dynamicObjects.back()->GetTransform()->SetMatrix(transl);