Changeset 7370 in orxonox.OLD for trunk/src/lib

Timestamp:

Apr 26, 2006, 1:31:01 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: drawLists/tickLists are used, and made some TiXmlElement to const TiXmlElement, also fixed some bugs in the loadWorldEntities-functions from Gameworld and SipleGameMenu

Location:

trunk/src/lib

Files:

• collision_detection/cd_engine.cc (modified) (2 diffs)
• data/data_tank.h (modified) (1 diff)
• graphics/graphics_engine.cc (modified) (1 diff)
• graphics/graphics_engine.h (modified) (1 diff)

trunk/src/lib/collision_detection/cd_engine.cc

@@ -106 +106 @@
 //}
 
-void CDEngine::checkCollisions(std::list<WorldEntity*>& list1, std::list<WorldEntity*>& list2)
+void CDEngine::checkCollisions(ObjectManager::EntityList& list1, ObjectManager::EntityList& list2)
 {
   BVTree* tree;
-  std::list<WorldEntity*>::iterator entity1, entity2, pre1, pre2;
+  ObjectManager::EntityList::iterator entity1, entity2, pre1, pre2;
   PRINTF(3)("checking for collisions\n");
 
@@ -195 +195 @@
 
 
-void CDEngine::drawBV(const std::list<WorldEntity*>& drawList ) const
-{
-  std::list<WorldEntity*>::const_iterator entity;
+void CDEngine::drawBV(const ObjectManager::EntityList& drawList ) const
+{
+  ObjectManager::EntityList::const_iterator entity;
   for (entity = drawList.begin(); entity != drawList.end(); entity++)
     if ((*entity)->isVisible())

trunk/src/lib/data/data_tank.h

@@ -25 +25 @@
     virtual ErrorMessage init() {}
     /** loads the data into the DataTank @param root is the xml root parameter for for loadParams() connection */
-    virtual ErrorMessage loadData(TiXmlElement* root = NULL) {}
+    virtual ErrorMessage loadData(const TiXmlElement* root = NULL) {}
     /** unloads the data again from the DataTank */
     virtual ErrorMessage unloadData() {}

trunk/src/lib/graphics/graphics_engine.cc

@@ -584 +584 @@
       dynamic_cast<GraphicsEffect*>(*it)->draw();
   }
-}
-
-void GraphicsEngine::draw(const std::list<WorldEntity*>& drawList ) const
-{
-  std::list<WorldEntity*>::const_iterator entity;
-  for (entity = drawList.begin(); entity != drawList.end(); entity++)
-    if ((*entity)->isVisible())
-      (*entity)->draw();
 }
 

trunk/src/lib/graphics/graphics_engine.h

@@ -69 +69 @@
     void tick(float dt);
     void draw() const;
-    void draw(const std::list<WorldEntity*>& drawList) const;
     void displayFPS(bool display);