Changeset 3237

Timestamp:

01/01/09 23:49:53 (16 years ago)

Author:

mattausch

Message:

debug version

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.sln (modified) (2 diffs)
• src/ResourceManager.cpp (modified) (5 diffs)
• src/ResourceManager.h (modified) (3 diffs)
• src/chcdemo.cpp (modified) (4 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/FriendlyCulling.sln

@@ -12 +12 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VboFormatConverter", "VboFormatConverter.vcproj", "{93A522E1-76F0-4D46-9C97-30DC2DDB531B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IrradianceMapping", "IrradianceMapping.vcproj", "{91680C49-A358-48AE-A02C-66CB884B7D7F}"
-        ProjectSection(ProjectDependencies) = postProject
-                {03661866-4093-4B02-B26A-028EA91AF023} = {03661866-4093-4B02-B26A-028EA91AF023}
-        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisibilitySolutionConverter", "VisibilitySolutionConverter.vcproj", "{A07AEF7C-5A28-4881-AE56-F9C5FFA3FEC4}"
@@ -42 +37 @@
                 {93A522E1-76F0-4D46-9C97-30DC2DDB531B}.Release|Win32.ActiveCfg = Release|Win32
                 {93A522E1-76F0-4D46-9C97-30DC2DDB531B}.Release|Win32.Build.0 = Release|Win32
-                {91680C49-A358-48AE-A02C-66CB884B7D7F}.Debug|Win32.ActiveCfg = Debug|Win32
-                {91680C49-A358-48AE-A02C-66CB884B7D7F}.Debug|Win32.Build.0 = Debug|Win32
-                {91680C49-A358-48AE-A02C-66CB884B7D7F}.Release|Win32.ActiveCfg = Release|Win32
-                {91680C49-A358-48AE-A02C-66CB884B7D7F}.Release|Win32.Build.0 = Release|Win32
                 {A07AEF7C-5A28-4881-AE56-F9C5FFA3FEC4}.Debug|Win32.ActiveCfg = Debug|Win32
                 {A07AEF7C-5A28-4881-AE56-F9C5FFA3FEC4}.Debug|Win32.Build.0 = Debug|Win32

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

@@ -196 +196 @@
 
 
-void ResourceManager::LoadTextures(igzstream &str)
+int ResourceManager::LoadTextures(igzstream &str)
 {
         int numTextures;
@@ -228 +228 @@
         }
 
-        cout << "loaded " << (int)mTextureTable.size() << " textures" << endl;
-}
-
-// mtt todo_ split that up
-void ResourceManager::LoadShapes(igzstream &str)
+        return numTextures;
+}
+
+// todo: split up geometry and materials!!
+int ResourceManager::LoadShapes(igzstream &str)
 {
         int numShapes;
@@ -249 +249 @@
         }
 
-        cout << "loaded " << (int)mGeometryTable.size() << " shapes" << endl;
+        return numShapes;
 }
 
@@ -393 +393 @@
 
 
-void ResourceManager::LoadSceneEntities(igzstream &str, 
-                                                                                SceneEntityContainer &entities)
+int ResourceManager::LoadSceneEntities(igzstream &str, 
+                                                                           SceneEntityContainer &entities)
 {
         int entityCount;
@@ -411 +411 @@
         }
 
-        cout << "loaded " << entityCount << " scene entities" << endl;
-}
-
-
-bool ResourceManager::Load(const std::string &filename,
-                                                   SceneEntityContainer &entities)
+        return entityCount;
+}
+
+
+int ResourceManager::Load(const std::string &filename,
+                                                  SceneEntityContainer &entities)
 {
         igzstream istr(filename.c_str());
         
         if (!istr.is_open())
-                return false;
+                return 0;
 
         cout << "loading textures" << endl;
         
         // load the texture table
-        LoadTextures(istr);
+        int numTextures = LoadTextures(istr);
+
+        cout << "loaded " << numTextures << " textures" << endl;
 
         cout << "loading shapes (geometry + materials)" << endl;
 
         // load the shapees
-        LoadShapes(istr);
+        int numShapes = LoadShapes(istr);
+
+        cout << "loaded " << (int)mGeometryTable.size() << " shapes" << endl;
 
         cout << "loading scene entites" << endl;
-        LoadSceneEntities(istr, entities);
-        
+        
+        int numEntities = LoadSceneEntities(istr, entities);
+        
+        cout << "loaded " << numEntities << " scene entities" << endl;
+
         cout << "bin loading finished" << endl;
 
-        // clean up
+        // clean up temporary tables
         mTextureTable.clear();
         mGeometryTable.clear();
         mMaterialTable.clear();
 
-        return true;
+        return numEntities;
 }
 

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

@@ -32 +32 @@
 public:
 
-        /** Loads a model
+        /** Loads a scene containing of several scene entities. the entities are added to
+                the previously loaded entities. Returns the number of entities in the
+                scene.
         */
-        bool Load(const std::string &filename, SceneEntityContainer &geometry);
+        int Load(const std::string &filename, SceneEntityContainer &geometry);
         /** Returns number of scene entities loaded with this manager.
         */
@@ -60 +62 @@
         Material *CreateMaterial();
 
+        /////////////////
+
         /// giant hack: set this to true if the geometry to load has tangent data for normal mapping
         bool mUseNormalMapping;
@@ -75 +79 @@
         ~ResourceManager();
 
-        void LoadTextures(igzstream &str);
-        void LoadShapes(igzstream &str);
-        void LoadSceneEntities(igzstream &str, SceneEntityContainer &entities);
+        int LoadTextures(igzstream &str);
+        int LoadShapes(igzstream &str);
+        int LoadSceneEntities(igzstream &str, SceneEntityContainer &entities);
 
         SceneEntity *LoadSceneEntity(igzstream &str);

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

@@ -335 +335 @@
 void PrepareRenderQueue();
 /// loads the specified model
-void LoadModel(const string &model, SceneEntityContainer &entities);
+int LoadModel(const string &model, SceneEntityContainer &entities);
 
 inline float KeyRotationAngle() { return keyRotation * elapsedTime * 1e-3f; }
@@ -578 +578 @@
 
 
-        LoadModel("vienna_full_hp.dem", dynamicObjects);
-        dynamicObjects.back()->GetTransform()->SetMatrix(transl);
+        int cityEntities = LoadModel("vienna_full_hp.dem", dynamicObjects);
+        
+        for (int i = (int)dynamicObjects.size() - cityEntities; i < (int)dynamicObjects.size(); ++ i)
+                dynamicObjects[i]->GetTransform()->SetMatrix(transl);
 
 
@@ -2408 +2410 @@
 
 
-void LoadModel(const string &model, SceneEntityContainer &entities)
+int LoadModel(const string &model, SceneEntityContainer &entities)
 {
         const string filename = string(model_path + model);
 
+        int numEntities = 0;
+
         cout << "\nloading model " << filename << endl;
-        if (resourceManager->Load(filename, entities))
+
+        if (numEntities = resourceManager->Load(filename, entities))
         {
                 cout << "model " << filename << " successfully loaded" << endl;
@@ -2424 +2429 @@
                 exit(0);
         }
+
+        return numEntities;
 }