Changeset 3268 for GTP

Timestamp:

01/11/09 22:54:05 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• Converter/ObjConverter2.cpp (modified) (8 diffs)
• Converter/main.cpp (modified) (1 diff)
• MainApp.vcproj (modified) (1 diff)
• default.env (modified) (2 diffs)
• src/BvhConstructor.cpp (modified) (2 diffs)
• src/SceneEntity.cpp (modified) (2 diffs)
• src/SkyPreetham.cpp (modified) (1 diff)
• src/chcdemo.cpp (modified) (3 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter/ObjConverter2.cpp

@@ -128 +128 @@
                                 for (int j = 0; j < 3; ++ j)
                                 {
-                                        if (tIndices[idx[j]] >= (int)texcoords.size())
-                                                cerr << "error: texcoord indices exceed array size " << texcoords.size() << " " << tIndices[idx[j]] << endl;
+                                        //if (tIndices[idx[j]] >= (int)texcoords.size())
+                                                //cerr << "error: texcoord indices exceed array size " << texcoords.size() << " " << tIndices[idx[j]] << endl;
                                         const int tidx = min((int)texcoords.size() - 1, tIndices[idx[j]]);
 
@@ -240 +240 @@
         vector<string>::const_iterator it, it_end = filenames.end();
 
+        ofstream outstr("mydebug.log");
+
         for (it = filenames.begin(); it != it_end; ++ it)
         {
@@ -245 +247 @@
 
                 cout << "\n==================\n loading file " << filename << endl;
+
+                outstr << "loading file: " << filename << endl;
+                outstr << flush;
 
                 if (!ReadFile(filename))
@@ -253 +258 @@
         }
 
-        cout << "\n*******************\n writing file " << outputFilename << endl;
+        cout << "\n*******************\nwriting file " << outputFilename << endl;
 
         if (!WriteFile(outputFilename))
@@ -385 +390 @@
                                 {
                                         cerr << "loading material library failed" << endl;
-                                        exit(0);
+                                        return false;
                                 }
                         }
@@ -538 +543 @@
         }
 
+        ofile.close();
+
         return true;
 }
@@ -545 +552 @@
 {
         FILE *file;
-
         if ((file = fopen(matFileName.c_str(), "r")) == NULL) return false;
         
@@ -610 +616 @@
         }
 
+        fclose(file);
+
         return true;
 }

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

@@ -31 +31 @@
 #else
         
-        //const int numFiles = 879;
-        const int numFiles = 10;
+        const int numFiles = 879;
+        //const int numFiles = 300;
 
         vector<string> filenames;
         const string base(model_path + argv[1]);
 
+        char filename[100];
+
         for (int i = 0; i < numFiles; ++ i)
         {
-                char filename[100];
                 sprintf(filename, "%s%s%d%s", base.c_str(), ".b", i, ".obj");
                 filenames.push_back(filename);
         }
+
+        //cout << "press any key" << std::cin.get();
 
         if (!converter.Convert2(filenames, model_path + argv[2]))

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

@@ -155 +155 @@
                                 IgnoreAllDefaultLibraries="false"
                                 IgnoreDefaultLibraryNames="LIBCMT"
-                                GenerateDebugInformation="true"
+                                GenerateDebugInformation="false"
                                 SubSystem="1"
                                 LargeAddressAware="2"

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

@@ -8 +8 @@
 
 filename=vienna_full_hp
+filename=procedural_pompeii_area6_hires/pompeii
 #filename=city
 useLODs=1
@@ -47 +48 @@
 
 # initial camera position
-camPosition=483.398f 242.364f 186.078f
+#camPosition=483.398f 242.364f 186.078f
+camPosition=1300.0f -2500.0f 10.0f
+
 # initial camera orientation
 camDirection=1 0 0

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

@@ -130 +130 @@
                 // no split could be achieved => just halve number of objects
                 split = (leaf->mLast + leaf->mFirst) / 2;
-                cerr << "no reduction " << leaf->CountPrimitives() << " " << leaf->mFirst << " " << leaf->mLast << endl;
+                //cerr << "no reduction " << leaf->CountPrimitives() << " " << leaf->mFirst << " " << leaf->mLast << endl;
         }
 
@@ -185 +185 @@
         BvhLeaf *l = new BvhLeaf(NULL);
         
-        l->mBox = SceneEntity::ComputeBoundingBox(mEntities + mFirst, mFirst - mLast + 1);
-
         l->mFirst = mFirst;
         l->mLast = mLast;
+
+        cout << "constructing bvh from "  << l->mFirst << " to " << l->mLast << endl;
+
+        l->mBox = SceneEntity::ComputeBoundingBox(mEntities + mFirst, mLast - mFirst + 1);
         l->mArea = l->mBox.SurfaceArea();
         
-        cout << "constructing bvh from "  << l->mFirst << " to " << l->mLast << endl;
-
         root = SubdivideLeaf(l, 0);
 

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

@@ -187 +187 @@
         AxisAlignedBox3 box;
         
-        if (!numEntities)
+        if (numEntities <= 0)
         {       // no box => just initialize
                 box.Initialize();
@@ -209 +209 @@
         AxisAlignedBox3 box;
         
-        if (!entities.empty())
+        if (entities.empty())
         {       // no box => just initialize
                 box.Initialize();

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

@@ -109 +109 @@
 
         // scale the sky dome so no intersection with the scene is visible
-        //const float scaleFactor = 80.0f;
-        const float scaleFactor = 500.0f;
+        const float scaleFactor = 80.0f;
+        //const float scaleFactor = 500.0f;
 
         position.z -= 3.0f * scaleFactor;

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

@@ -587 +587 @@
         //LoadModel("sibenik.dem", dynamicObjects);
 
-        LoadModel("procedural_pompeii_area6_hires/pompeii.dem", dynamicObjects);
-
+        //LoadModel("procedural_pompeii_area6_hires/pompeii.dem", dynamicObjects);
+/*
         AxisAlignedBox3 box;
         box.Initialize();
@@ -603 +603 @@
 
         cout << "pompeii bb:\n" << box << endl;
-
+*/
 #if 0
         const Vector3 sceneCenter(470.398f, 240.364f, 181.7f);
@@ -645 +645 @@
 
         BvhFactory bvhFactory;
-        //bvh = bvhFactory.Create(bvh_filename, staticObjects, dynamicObjects, maxDepthForTestingChildren);
+#if 1
         bvh = bvhFactory.Create(staticObjects, dynamicObjects, maxDepthForTestingChildren);
+#else
+        bvh = bvhFactory.Create(bvh_filename, staticObjects, dynamicObjects, maxDepthForTestingChildren);
+#endif
 
         if (!bvh)