Changeset 1993 for code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.h

Timestamp:

Oct 22, 2008, 5:25:01 AM (16 years ago)

Author:

landauf

Message:

added several new classes

File:

• code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.h (modified) (6 diffs)

code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -52 +52 @@
                 { return this->player_; }
 
+            inline void setDestroyWhenPlayerLeft(bool bDestroy)
+                { this->bDestroyWhenPlayerLeft_ = bDestroy; }
+            inline bool getDestroyWhenPlayerLeft() const
+                { return this->bDestroyWhenPlayerLeft_; }
+
             virtual void startLocalControl();
             virtual void stopLocalControl();
@@ -70 +75 @@
             virtual void switchCamera() {}
 
+            inline const Vector3& getVelocity() const
+                { return this->velocity_; }
+            inline const Vector3& getAcceleration() const
+                { return this->acceleration_; }
+            inline const std::string& getHudTemplate() const
+                { return this->hudtemplate_; }
+
         protected:
             using WorldEntity::setPosition;
@@ -75 +87 @@
             using WorldEntity::setOrientation;
             using WorldEntity::rotate;
+            using WorldEntity::yaw;
+            using WorldEntity::pitch;
+            using WorldEntity::roll;
             using WorldEntity::lookAt;
             using WorldEntity::setDirection;
@@ -91 +106 @@
             inline void setVelocity(float x, float y, float z)
                 { this->velocity_.x = x; this->velocity_.y = y; this->velocity_.z = z; }
-            inline const Vector3& getVelocity() const
-                { return this->velocity_; }
 
             inline void setAcceleration(const Vector3& acceleration)
@@ -98 +111 @@
             inline void setAcceleration(float x, float y, float z)
                 { this->acceleration_.x = x; this->acceleration_.y = y; this->acceleration_.z = z; }
-            inline const Vector3& getAcceleration() const
-                { return this->acceleration_; }
+
+            inline void setHudTemplate(const std::string& name)
+                { this->hudtemplate_ = name; }
 
         private:
-            inline void setHudTemplate(const std::string& name)
-                { this->hudtemplate_ = name; }
-            inline const std::string& getHudTemplate() const
-                { return this->hudtemplate_; }
-
             void overwrite();
             void processOverwrite();
@@ -139 +148 @@
             OverlayGroup* hud_;
             Camera* camera_;
+            bool bDestroyWhenPlayerLeft_;
     };
 }