Changeset 7368 in orxonox.OLD for trunk/src/util

Timestamp:

Apr 25, 2006, 11:37:59 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some renamings, and GameWorldData now has lists for what EntityLists should be drawed/ticked/collided(not yet implemented).

Location:

trunk/src/util

Files:

• object_manager.cc (modified) (1 diff)
• object_manager.h (modified) (3 diffs)

trunk/src/util/object_manager.cc

@@ -105 +105 @@
 
 /**
- * returns a new List with a list of WorldEntities of distance Radius from center
- */
-std::list<WorldEntity*>* ObjectManager::distanceFromObject(const PNode& center, float radius, ClassID classID)
+ * @returns a new List with a list of WorldEntities of distance Radius from center
+ */
+void ObjectManager::distanceFromObject(EntityList& entities, const PNode& center, float radius, ClassID classID)
 {
   const std::list<BaseObject*>* objectList = ClassList::getList(classID);
   if (objectList != NULL)
   {
-    std::list<WorldEntity*>* newList = new std::list<WorldEntity*>;
 
     list<BaseObject*>::const_iterator node;
     for (node = objectList->begin(); node != objectList->end(); node++)
       if ((dynamic_cast<PNode*>(*node)->getAbsCoor() - center.getAbsCoor()).len() < radius)
-        newList->push_back(dynamic_cast<WorldEntity*>(*node));
-    return newList;
-  }
-  return NULL;
+        entities.push_back(dynamic_cast<WorldEntity*>(*node));
+  }
 }
 

trunk/src/util/object_manager.h

@@ -67 +67 @@
 
 //! A powerfull handler for the Object (WorldEntities) in the World.
-class ObjectManager : public BaseObject {
+class ObjectManager : public BaseObject
+{
+public:
+  typedef std::list<WorldEntity*> EntityList;      //!< A type definition to make it easy to use EntityLists.
 
- public:
-   ObjectManager();
-   virtual ~ObjectManager();
+  ObjectManager();
+  virtual ~ObjectManager();
 
   void flush();
@@ -79 +81 @@
 
 
-  std::list<WorldEntity*>& getObjectList(OM_LIST listNumber) { return this->objectLists[listNumber]; }
-  const std::list<WorldEntity*>& getObjectList(OM_LIST listNumber) const { return this->objectLists[listNumber]; }
+  /** @returns the List (listnumber) of objects. @param listNumber the List to get. */
+  EntityList& getObjectList(OM_LIST listNumber) { return this->objectLists[listNumber]; }
+  /** @returns a constant LIST of Objects. @param listNumber the objectList to returns */
+  const EntityList& getObjectList(OM_LIST listNumber) const { return this->objectLists[listNumber]; }
 
-  static std::list<WorldEntity*>* distanceFromObject(const PNode& center, float radius, ClassID classID);
+  static void distanceFromObject(EntityList& entities, const PNode& center, float radius, ClassID classID);
 
   void debug(OM_LIST omList, unsigned int level = 0) const;
@@ -90 +94 @@
   static const char* OMListToString(OM_LIST omList);
 
- private:
-  const std::list<BaseObject>*            pNodeList;
+private:
+  const std::list<BaseObject>*            pNodeList;                //!< The List of PNodes.
 
-
-  std::list<WorldEntity*>                 objectLists[OM_SIZE];
+  EntityList                              objectLists[OM_SIZE];     //!< The ObjectLists.
 
   static const char*                      objectManagerListNames[]; //!< Names of all the lists