Changeset 9016 for code/trunk/src/orxonox/worldentities

Timestamp:

Feb 15, 2012, 11:51:58 PM (13 years ago)

Author:

jo

Message:

Merging presentation2011 branch to trunk. Please check for possible bugs.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/ControllableEntity.cc (modified) (3 diffs)
• src/orxonox/worldentities/ControllableEntity.h (modified) (3 diffs)
• src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/FpsPlayer.h (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (2 diffs)

code/trunk/src/orxonox/worldentities/ControllableEntity.cc

@@ -74 +74 @@
         this->bMouseLook_ = false;
         this->mouseLookSpeed_ = 200;
-        this->bIsRocket_ = false;
 
         this->server_position_         = Vector3::ZERO;
@@ -88 +87 @@
         this->setPriority( Priority::VeryHigh );
         this->registerVariables();
+        this->team_ = -1;
     }
 
@@ -120 +120 @@
         SUPER(ControllableEntity, XMLPort, xmlelement, mode);
 
+        XMLPortParam(ControllableEntity, "team", setTeam, getTeam, xmlelement, mode).defaultValues(-1);
         XMLPortParam(ControllableEntity, "hudtemplate", setHudTemplate, getHudTemplate, xmlelement, mode);
         XMLPortParam(ControllableEntity, "camerapositiontemplate", setCameraPositionTemplate, getCameraPositionTemplate, xmlelement, mode);

code/trunk/src/orxonox/worldentities/ControllableEntity.h

@@ -163 +163 @@
                 { return this->target_.get(); }
             void setTargetInternal( uint32_t targetID );
-            inline bool getRocket() const
-                { return this-> bIsRocket_; }
+
+            inline void setTeam(int team)
+                { this->team_ = team; }
+            inline float getTeam() const
+                { return this->team_; }
 
         protected:
@@ -183 +186 @@
 
             Ogre::SceneNode* cameraPositionRootNode_;
-            bool bIsRocket_; //Workaround to see, if the controllable entity is a Rocket.
 
         private:
@@ -240 +242 @@
             CameraPosition* reverseCamera_;
             WeakPtr<WorldEntity> target_;
+
+            int team_ ; //<! teamnumber
     };
 }

code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc

@@ -270 +270 @@
     }
 
-    void FpsPlayer::boost() //acctually jump
+    void FpsPlayer::boost(bool bBoost) //acctually jump
     {
         if (this->isFloor_)

code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h

@@ -65 +65 @@
                 { return this->meshSrc_; }
 
-            void boost(); //acctually jump
+            void boost(bool bBoost); //acctually jump
 
             virtual void fire();

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -129 +129 @@
         XMLPortParam(Pawn, "reloadrate", setReloadRate, getReloadRate, xmlelement, mode).defaultValues(0);
         XMLPortParam(Pawn, "reloadwaittime", setReloadWaitTime, getReloadWaitTime, xmlelement, mode).defaultValues(1.0f);
+   
+        XMLPortParam ( RadarViewable, "RVName", setRVName, getRVName, xmlelement, mode );
     }
 
@@ -455 +457 @@
         SUPER(Pawn, changedActivity);
 
-        this->setRadarVisibility(this->isActive());
+        this->setRadarVisibility(this->isVisible());
     }
 

code/trunk/src/orxonox/worldentities/pawns/Pawn.h

@@ -53 +53 @@
             inline bool isAlive() const
                 { return this->bAlive_; }
+
 
             virtual void setHealth(float health);
@@ -194 +195 @@
                 { return NULL; }
 
+
             float health_;
             float maxHealth_;