Changeset 3277

Timestamp:

01/15/09 04:52:43 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• VisibilitySolutionConverter.vcproj (modified) (1 diff)
• VisibilitySolutionConverter/VisibilitySolutionConverter.cpp (modified) (5 diffs)
• VisibilitySolutionConverter/VisibilitySolutionConverter.h (modified) (2 diffs)
• default.env (modified) (3 diffs)
• src/chcdemo.cpp (modified) (1 diff)

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

@@ -154 +154 @@
                                 AdditionalLibraryDirectories="libs\Zlib\lib; lib\$(ConfigurationName)"
                                 IgnoreDefaultLibraryNames="libCMT"
-                                GenerateDebugInformation="true"
+                                GenerateDebugInformation="false"
                                 SubSystem="1"
                                 LargeAddressAware="2"

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

@@ -231 +231 @@
 
         //if (!LoadSolution(bvhInputFilename))
-        if (!LoadSolutionTest(bvhInputFilename))
+        if (!LoadSolution(bvhInputFilename))
         {
                 cerr << "could not read solution file" << endl;
@@ -270 +270 @@
 bool VisibilitySolutionConverter::ReadScene(const string &filename)
 {
+        /*
         VertexArray vertices;
         VertexArray normals;
@@ -278 +279 @@
                 ConstructBvhObjects(vertices, normals, texCoords);
                 return true;
-        }
+        }*/
+
+        vector<CHCDemoEngine::Triangle3 *> triangles;
+
+        if (ReadObjSimple(filename, triangles)) 
+        {
+                ConstructBvhObjects2(triangles);
+                return true;
+        }
+
+        /*for (size_t i = 0; i < triangles.size(); ++ i)
+        delete triangles[i];
+        */
 
         return false;
@@ -417 +430 @@
 
         bool alphaTestEnabled = false;
-        //bool cullFaceEnabled = true;
-        bool cullFaceEnabled = false;
+        bool cullFaceEnabled = true;
+        //bool cullFaceEnabled = false;
 
         str.write(reinterpret_cast<char *>(&alphaTestEnabled), sizeof(bool));
@@ -929 +942 @@
         return true;
 }
+
+
+bool VisibilitySolutionConverter::ReadObjSimple(const string &filename,
+                                                                                                vector<CHCDemoEngine::Triangle3 *> &triangles
+                                                                                                ) 
+{
+        FILE *file;
+
+        if ((file = fopen(filename.c_str(), "r")) == NULL) return false;
+        
+        VertexArray vertices;
+
+        int line = 0;
+        const int len = 10000;
+        char str[len];
+
+        const string binFilename = ReplaceSuffix(filename, ".obj", ".bn");
+
+        cout << "binary dump " << binFilename << " not available, loading ascii obj" << endl;
+
+        while (fgets(str, len, file) != NULL)
+        {
+                if (line % 500000 == 0)
+                        cout << line << " " << str;
+
+                ++ line;
+
+                switch (str[0])
+                {
+                case 'v': // vertex or normal
+                        {
+                                float x, y, z;
+
+                                sscanf(str + 1, "%f %f %f", &x, &y, &z);
+                                CHCDemoEngine::Vector3 v = CHCDemoEngine::Vector3(x, -z, y) * sScale;
+                                vertices.push_back(v);
+
+                                if (vertices.size() == 3)
+                                {
+                                        CHCDemoEngine::Triangle3 *tri = 
+                                                new CHCDemoEngine::Triangle3(vertices[0], vertices[1], vertices[2]);
+
+                                        triangles.push_back(tri);
+                                        vertices.clear();
+                                }
+                                break;
+                        }
+                default:
+                        // throw away line
+                        break;
+                }
+        }
+
+        fclose(file);
+
+        return !triangles.empty();
+}
+
+
+void VisibilitySolutionConverter::ConstructBvhObjects2(const vector<CHCDemoEngine::Triangle3 *> &triangles)
+{
+        CHCDemoEngine::AxisAlignedBox3 testBox;
+        testBox.Initialize();
+
+        for (size_t i = 0; i < triangles.size(); ++ i)
+        {
+                testBox.Include(triangles[i]->mVertices[0]);
+                testBox.Include(triangles[i]->mVertices[1]);
+                testBox.Include(triangles[i]->mVertices[2]);
+        }
+
+        cout << "geometry bounds: " << testBox << endl;
+
+        mGeometry.reserve(mBvhLeaves.size());
+        mNumShapes = (int)mBvhLeaves.size();
+
+        VertexArray _vertices;  
+        VertexArray _normals;
+        vector<TexCoord> _texCoords;
+
+        int total = 0;
+        for (size_t i = 0; i < mBvhLeaves.size(); ++ i)
+        {
+                BvhLeaf *node = mBvhLeaves[i];
+                const int size = node->last - node->first + 1;
+
+                total += size;
+
+                if (i % 1000 == 0)
+                        cout << "o " << i << " " << size << " " << total << endl;
+
+                _vertices.clear();
+                _normals.clear();
+                _texCoords.clear();
+
+                //cout << "vtx: " << size << endl;
+                for (int j = node->first; j <= node->last; ++ j)
+                {
+                        const int idx = mGlobalTriangleIds[j];
+
+                        //cout << "idx: " << 3 * mGlobalTriangleIds[j] << " j " << j << " " << vertices.size()<< endl;
+                        for (int k = 0; k < 3; ++ k)
+                        {
+                                _vertices.push_back(triangles[idx]->mVertices[k]);
+                        }
+
+                        const CHCDemoEngine::Vector3 n = triangles[idx]->GetNormal();
+
+                        _normals.push_back(n);
+                        _normals.push_back(n);
+                        _normals.push_back(n);
+
+                        delete triangles[idx];
+                }
+
+                LoadShape(_vertices, _normals, _texCoords);
+                
+                // we store geometry in our bvh => change first and last pointer
+                // from triangles to geometry
+                node->first = (int)mGeometry.size() - 1;
+                node->last = (int)mGeometry.size() - 1;
+
+                //_vertices.clear();
+                //_normals.clear();
+                //_texCoords.clear();
+        }
+}

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

@@ -15 +15 @@
 
 class ogzstream;
-
 struct BvhInterior;
 
@@ -140 +139 @@
 
 
+        bool ReadObjSimple(const std::string &filename,
+                std::vector<CHCDemoEngine::Triangle3 *> &triangles);
+
+        void ConstructBvhObjects2(const std::vector<CHCDemoEngine::Triangle3 *> &triangles);
+
+
+
         //////////////////////////////////
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -9 +9 @@
 #filename=vienna_full_hp
 #bvhname=vienna_full_hp
-#filename=newvienna
-#bvhname=newvienna
-filename=pompeii/pompeii_full
+filename=tryvienna
+bvhname=tryvienna
+filename=mypompeii
+bvhname=mypompeii
+#filename=pompeii/pompeii_full
 #filename=pompeii/pompeii_part
-filename=city
-bvhname=city
+#filename=city
+#bvhname=city
 useLODs=1
 # shadow map size
@@ -29 +31 @@
 
 # if using pvs, this specifies the name of the visibility solutin
-visibilitySolution=vienna_full-8x3-pgv
+#visibilitySolution=vienna_full-8x3-pgv
+visibilitySolution=mypompeii-1x1-pgv
+
 viewCellsScaleFactor=1.0f
 useSkylightForIllum=1
@@ -58 +62 @@
 camPosition=483.398f 242.364f 186.078f
 # pompeii view point
-#camPosition=1300.0f -2500.0f 10.0f
+camPosition=1300.0f -2500.0f 10.0f
 # pompeii problematic
 #camPosition=627.003 -1725.33 25.2

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

@@ -599 +599 @@
         //LoadModel("sibenik.dem", dynamicObjects);
 
-        if (1) LoadPompeiiScene();
+        if (0) LoadPompeiiScene();
 
 #if 0