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

Timestamp:

Jul 9, 2005, 12:48:50 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: state is no more singleton, but static class.
This is faster, and easier to handle, because one can just say State::getBLA() and not State::getInstance()→getBLA(); ——→>> less redundant

File:

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

orxonox/trunk/src/util/state.h

@@ -11 +11 @@
 // FORWARD DEFINITION
 class PNode;
+class WorldEntity;
+template<class T> class tList;
 
 //! A Singleton class, that handles some states about orxonox's objects
@@ -16 +18 @@
 
  public:
-  /** \returns a Pointer to the only object of this Class */
-  inline static State* getInstance() { if (!singletonRef) singletonRef = new State();  return singletonRef; };
+  // 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);
+  /** @returns a Pointer to the PNode of the Camera */
+  static inline const PNode* getCamera() { return State::camera; };
+  /** @returns a Pointer to the CameraTarget */
+  static inline const PNode* getCameraTarget() { return State::cameraTarget; };
 
-  virtual ~State();
-
-  void setCamera(const PNode* camera, const PNode* cameraTarget);
-  /** \returns a Pointer to the PNode of the Camera */
-  const PNode* getCamera() const { return this->camera; };
-  /** \returns a Pointer to the CameraTarget */
-  const PNode* getCameraTarget() const { return this->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; };
 
  private:
   State();
-  static State*       singletonRef;       //!< a reference to this class
 
-  const PNode*        camera;             //!< A reference to the camera
-  const PNode*        cameraTarget;       //!< a reference to the cameraTarget
+  static const PNode*           camera;             //!< A reference to the camera
+  static const PNode*           cameraTarget;       //!< a reference to the cameraTarget
+
+  static tList<WorldEntity>*    worldEntityList;    //!< The List of the worldEntities
 };