Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
May 24, 2006, 3:17:19 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the Changes from the water branche back to the trunk.

Location:
trunk/src/util
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/util/object_manager.cc

    r7370 r7785  
    6464    while(!this->objectLists[i].empty())
    6565      delete this->objectLists[i].front();
     66
     67  // delete reflectin list
     68  while( !this->reflectionList.empty())
     69    delete this->reflectionList.front();
    6670}
    6771
  • trunk/src/util/object_manager.h

    r7368 r7785  
    9494  static const char* OMListToString(OM_LIST omList);
    9595
     96
     97  void toReflectionList( WorldEntity* entity) { this->reflectionList.push_back(entity); }
     98  /** @returns the list of all reflected objects in the world */
     99  EntityList& getReflectionList() { return this->reflectionList; }
     100  /** @returns the static list of all reflected objects in the world */
     101  const EntityList& getReflectionList() const { return this->reflectionList; }
     102
     103
     104
     105
    96106private:
    97107  const std::list<BaseObject>*            pNodeList;                //!< The List of PNodes.
     
    100110
    101111  static const char*                      objectManagerListNames[]; //!< Names of all the lists
     112
     113  EntityList                              reflectionList;           //!< A list of all reflected objects in the world
    102114};
    103115
Note: See TracChangeset for help on using the changeset viewer.