Changeset 3261 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Timestamp:

01/09/09 19:50:56 (15 years ago)

Author:

mattausch

Message:

worked on powerplant loading

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• BvhExporter.cpp (modified) (2 diffs)
• ObjExporter.cpp (added)
• ObjExporter.h (added)
• ResourceManager.cpp (modified) (1 diff)
• Texture.cpp (modified) (1 diff)
• Texture.h (modified) (1 diff)
• chcdemo.cpp (modified) (2 diffs)

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

@@ -78 +78 @@
 bool BvhExporter::Export(const string &filename, Bvh *bvh)
 {
-         cout << "Info: Exporting to file '" << filename.c_str() << "'" << endl;
+         cout << "Exporting bvh to file '" << filename.c_str() << "'" << endl;
   
          FILE *fw = fopen(filename.c_str(), "wb");
@@ -121 +121 @@
          }
 
+         cout << "writing " << (int)triangles.size() << " triangle ids ..." << endl;
+
          // export sorted triangle IDs
-         for (int i = 0; i < triangles.size(); ++i) 
+         for (int i = 0; i < (int)triangles.size(); ++i) 
          {
                  fwrite(&triangles[i], sizeof(int), 1, fw);
          }
 
+         cout << "writing bvh nodes ..." << endl;
+         
          SaveNode(bvh->GetStaticRoot(), fw);
          

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

@@ -383 +383 @@
         }
 
-        //const bool delGeometry = true;
-        const bool delGeometry = false;
+        const bool delGeometry = true;
+        //const bool delGeometry = false;
         return new Geometry(vertices, normals, texcoords, vertexCount, delGeometry, NULL);//tangents);
 }

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

@@ -54 +54 @@
                 mImage = malloc(GetByteSize());
 
-                Debug << "successfully loaded texture " << filename << " w " << mWidth << " h " << mHeight << endl;
+                Debug << "loaded texture " << filename << " w " << mWidth << " h " << mHeight << endl;
+                //cout  << "loaded texture " << filename << " w " << mWidth << " h " << mHeight << endl;
 
                 ilCopyPixels(0, 0, 0, mWidth, mHeight, 1, IL_RGBA, IL_UNSIGNED_BYTE, mImage);

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

@@ -22 +22 @@
 
 
-        /** Constructor loading texture from file
+        /** Constructor loading a texture from a file
         */
         Texture(const std::string &filename);

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

@@ -587 +587 @@
         //LoadModel("sibenik.dem", dynamicObjects);
 
+        LoadModel("procedural_pompeii_area6_hires/pompeii.dem", dynamicObjects);
+
+        AxisAlignedBox3 box;
+        box.Initialize();
+
+        const Vector3 offs(.0f, 3000.0f, 180);
+        //const Vector3 sceneCenter(470.398f, 240.364f, 180.3);
+        Matrix4x4 moffs = TranslationMatrix(offs);
+
+        for (size_t i = 0; i < dynamicObjects.size(); ++ i)
+        {
+                dynamicObjects[i]->GetTransform()->SetMatrix(moffs);
+                box.Include(dynamicObjects[i]->GetWorldBoundingBox());
+        }
+
+        cout << "pompeii bb:\n" << box << endl;
+
 #if 0
-        LoadModel("hbuddha.dem", dynamicObjects);
-
-        buddha = dynamicObjects.back();
-        
         const Vector3 sceneCenter(470.398f, 240.364f, 181.7f);
         //const Vector3 sceneCenter(470.398f, 240.364f, 180.3);
-        
         Matrix4x4 transl = TranslationMatrix(sceneCenter);
+        
+        LoadModel("hbuddha.dem", dynamicObjects);
+
+        buddha = dynamicObjects.back();
         buddha->GetTransform()->SetMatrix(transl);
 
@@ -646 +662 @@
 
 
-        ObjExporter().Export(model_path + "mycity.obj", bvh);
-        BvhExporter().Export(model_path + "mycity.bvh", bvh);
+        //ObjExporter().Export(model_path + "mycity.obj", bvh);
+        //BvhExporter().Export(model_path + "mycity.bvh", bvh);