Changeset 6142 in orxonox.OLD for trunk/src/util/state.h

Timestamp:

Dec 16, 2005, 7:13:57 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merge the ObjectManager to the trunk
merged with command:
svn merge -r6082:HEAD objectmanager/ ../trunk/

conflicts resolution was easy this time
but specially merged the world to network_world

File:

• trunk/src/util/state.h (modified) (4 diffs)

trunk/src/util/state.h

@@ -10 +10 @@
 class PNode;
 class WorldEntity;
-template<class T> class tList;
-//template<class T> class tStack;
+class ObjectManager;
 
 //! handles states about orxonox's most importatn objects
@@ -22 +21 @@
 
  public:
-  // CAMERA //
+   //////////////
+   /// CAMERA ///
+   //////////////
   /** @param camera the PNode to the Camera, @param cameraTarget the PNode to the Camera's target */
   static void setCamera(const PNode* camera, const PNode* cameraTarget);
@@ -30 +31 @@
   static inline const PNode* getCameraTarget() { return State::cameraTarget; };
 
-  // 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; };
+  //////////////////////
+  /// OBJECT-MANAGER ///
+  //////////////////////
+  /** @param objectManager the new Current ObjectManager */
+  static inline void setObjectManager(ObjectManager* objectManager) { State::objectManager = objectManager; };
+  /** @returns the current ObjectManager. */
+  static inline ObjectManager* getObjectManager() { return State::objectManager; };
+
+  /////////////////////////
+  /// WORLD_ENTITY_LIST ///
+  /////////////////////////
 
  private:
@@ -42 +49 @@
   static const PNode*           cameraTarget;       //!< A reference to the cameraTarget
   static PNode*                 nullParent;         //!< A reference to the Null-PNode.
+  static ObjectManager*         objectManager;      //!< A referenct to the current ObjectManager
 
-  static tList<WorldEntity>*    worldEntityList;    //!< The List of the worldEntities
-
-  //tStack<
 };