Changeset 6134 in orxonox.OLD for branches/objectmanager/src/util

Timestamp:

Dec 16, 2005, 5:16:00 PM (18 years ago)

Author:

bensch

Message:

om: disected the old worldEntity list out.
removed GarbageCollector
minor updates

Location:

branches/objectmanager/src/util

Files:

• Makefile.am (modified) (2 diffs)
• garbage_collector.cc (deleted)
• garbage_collector.h (deleted)
• state.cc (modified) (1 diff)
• state.h (modified) (3 diffs)

branches/objectmanager/src/util/Makefile.am

@@ -7 +7 @@
                         object_manager.cc \
                         loading/factory.cc \
-                        garbage_collector.cc \
                         state.cc \
                         user_control.cc \
@@ -19 +18 @@
                         track/pilot_node.cc \
                         track/track_manager.cc \
-                        track/track_node.cc 
+                        track/track_node.cc
 
 noinst_HEADERS =        fast_factory.h \
                         object_manager.h \
-                        garbage_collector.h \
                         state.h \
                         user_control.h \

branches/objectmanager/src/util/state.cc

@@ -30 +30 @@
 
 ObjectManager* State::objectManager = NULL;
-tList<WorldEntity>* State::worldEntityList = NULL;
 
 /**

branches/objectmanager/src/util/state.h

@@ -10 +10 @@
 class PNode;
 class WorldEntity;
-template<class T> class tList;
 class ObjectManager;
 
@@ -43 +42 @@
   /// WORLD_ENTITY_LIST ///
   /////////////////////////
-  /** @param worldEntityList The World's List of WorldEntities */
-  static inline void setWorldEntityList(tList<WorldEntity>* worldEntityList) { State::worldEntityList = worldEntityList; };
-  /** @returns the List of WorldEntities */
-  static inline tList<WorldEntity>* getWorldEntityList() { return State::worldEntityList; };
 
  private:
@@ -56 +51 @@
   static ObjectManager*         objectManager;      //!< A referenct to the current ObjectManager
 
-  static tList<WorldEntity>*    worldEntityList;    //!< The List of the worldEntities
-
-  //tStack<
 };