Changeset 7346 in orxonox.OLD for trunk/src/world_entities/playable.h

Timestamp:

Apr 19, 2006, 1:17:46 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: extreme cleanup in Playable

File:

• trunk/src/world_entities/playable.h (modified) (4 diffs)

trunk/src/world_entities/playable.h

@@ -27 +27 @@
 {
 public:
+  //! Defines the Playmode of an Entity.
   typedef enum {
-    Vertical         = 1,
-    Horizontal       = 2,
-    FromBehind       = 4,
-    Full3D           = 8,
+    Vertical         = 1,       //!< Vertical (seen from left or right/move in x-z)
+    Horizontal       = 2,       //!< Horizontal (seet from the top/move in x-y)
+    FromBehind       = 4,       //!< Seen from behind (move in z-y)
+    Full3D           = 8,       //!< Full featured 3D-mode. (move in all directions x-y-z)
   } Playmode;
 
@@ -40 +41 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  virtual void die();
-  virtual void respawn();
-
+  // Weapon and Pickups
   virtual bool pickup(PowerUp* powerUp);
-
   void addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);
   void removeWeapon(Weapon* weapon);
   void nextWeaponConfig();
   void previousWeaponConfig();
-
   inline WeaponManager& getWeaponManager() { return this->weaponMan; };
   void weaponConfigChanged();
 
 
+  // Player Settup
   bool setPlayer(Player* player);
   Player* getCurrentPlayer() const { return this->currentPlayer; };
+  /** @return a List of Events in PEV_* sytle */
+  inline const std::vector<int>& getEventList() { return this->events; };
 
+  // Camera and Playmode
   void attachCamera();
   void detachCamera();
@@ -63 +64 @@
   bool setPlaymode(Playable::Playmode playmode);
   Playable::Playmode getPlaymode() const { return this->playmode; };
+  virtual void setPlayDirection(const Quaternion& rot, float speed = 0.0f) = 0;
+  void setPlayDirection(float angle, float dirX, float dirY, float dirZ, float speed = 0.0f);
 
+  inline void setScore( int score ) { this->score = score; }
+  inline int  getScore() { return this->score; }
+
+
+  // WorldEntity Extensions
+  virtual void die();
+  virtual void respawn();
   virtual void collidesWith(WorldEntity* entity, const Vector& location);
   virtual void process(const Event &event);
-
   virtual void tick(float dt);
 
-  /** @return a List of Events in PEV_* sytle */
-  inline const std::vector<int>& getEventList() { return this->events; };
-
+  // NETWORK
   int       writeSync(const byte* data, int length, int sender);
   int       readSync(byte* data, int maxLength );
   bool      needsReadSync();
-
-
-  //
-  virtual void setStartDirection(const Quaternion& rot) = 0;
-  void setStartDirection(float angle, float dirX, float dirY, float dirZ) { this->setStartDirection(Quaternion(angle, Vector(dirX, dirY, dirZ))); }
-
-  inline void setScore( int score ) { this->score = score; }
-  inline int  getScore() { return this->score; }
 
 
@@ -91 +90 @@
   Playable();
 
+  // Player Setup
   virtual void enter() = 0;
   virtual void leave() = 0;
+  // Playmode
+  void setSupportedPlaymodes(short playmodes) { this->supportedPlaymodes = playmodes; };
+  virtual void enterPlaymode(Playable::Playmode playmode);
 
-  void setSupportedPlaymodes(short playmodes) { this->supportedPlaymodes = playmodes; };
-
+  // Events.
   void registerEvent(int eventType);
   void unregisterEvent(int eventType);