Changeset 3012 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

Timestamp:

10/08/08 10:45:08 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp (modified) (4 diffs)

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

@@ -59 +59 @@
 /// the renderable scene geometry
 SceneEntityContainer sceneEntities;
+SceneEntityContainer sceneEntities2;
+
 // traverses and renders the hierarchy
 RenderTraverser *traverser = NULL;
@@ -440 +442 @@
         loader = new ResourceManager();
 
-        //const string filename("data/city/model/city.dem");
         const string filename = string(model_path + "city.dem");
 
         if (loader->Load(filename, sceneEntities))
-                cout << "scene " << filename << " loaded" << endl;
+                cout << "model " << filename << " loaded" << endl;
         else
         {
-                cerr << "loading scene " << filename << " failed" << endl;
+                cerr << "loading model " << filename << " failed" << endl;
                 CleanUp();
                 exit(0);
@@ -463 +464 @@
         }
         
-#if 0
-
-        int merged = 0;
-
-        SceneEntity *oldEnt = NULL;
-
-        cout << "merging entities .. " << endl;
-        SceneEntityContainer::const_iterator sit, sit_end = sceneEntities.end();
-
-        for (sit = sceneEntities.begin(); sit < sit_end; ++ sit)
-        {
-                SceneEntity *newEnt = (*sit);
-
-                if (!newEnt->GetTransform()->IsIdentity())
-                {
-                        sceneEntities2.push_back(newEnt);
-                        continue;
-                }
-
-                if (oldEnt)
-                {
-                        EntityMerger merger(newEnt, oldEnt);
-                        SceneEntity *ent = merger.Merge();
-
-                        sceneEntities2.push_back(ent);
-
-                        oldEnt = NULL;
-
-                        ++ merged;
-                }
-                else
-                {
-                        oldEnt = newEnt;
-                }
-        }
-
-        if (oldEnt && oldEnt->GetTransform()->IsIdentity())
-                sceneEntities2.push_back(oldEnt);
-
-        cout << "merged " << merged << " of " << (int)sceneEntities.size() << " entities " << endl;
-#endif
 
         // set far plane based on scene extent
@@ -1171 +1131 @@
                 // actually render the scene geometry using the specified algorithm
                 traverser->RenderScene();
-                //renderQueue->Apply();
         }