Changeset 10452 for code/branches/presentationFS15/src/modules/objects

Timestamp:

May 21, 2015, 4:26:39 PM (9 years ago)

Author:

maxima

Message:

Towerdefense merged to Presentation

Location:

code/branches/presentationFS15

Files:

• . (modified) (1 prop)
• src/modules/objects/Turret.cc (modified) (1 diff)
• src/modules/objects/Turret.h (modified) (1 diff)
• src/modules/objects/controllers/TurretController.cc (modified) (2 diffs)

code/branches/presentationFS15/src/modules/objects/Turret.cc

@@ -223 +223 @@
         XMLPortParam(Turret, "maxYaw", setMaxYaw, getMaxYaw, xmlelement, mode);
         XMLPortParam(Turret, "maxPitch", setMaxPitch, getMaxPitch, xmlelement, mode);
+        XMLPortParam(Turret, "rotationThrust", setRotationThrust, getRotationThrust, xmlelement, mode);
     }
 

code/branches/presentationFS15/src/modules/objects/Turret.h

@@ -102 +102 @@
                 { return this->maxYaw_; }
 
+            inline void setRotationThrust(float rotationthrust)
+                { this->rotationThrust_ = rotationthrust; }
+
+            inline float getRotationThrust()
+                { return this->rotationThrust_; }
+
         protected:
             Vector3 startDir_; //!< The initial facing direction, in local coordinates.

code/branches/presentationFS15/src/modules/objects/controllers/TurretController.cc

@@ -104 +104 @@
         {
             Pawn* entity = orxonox_cast<Pawn*>(*it);
-            if (!entity || FormationController::sameTeam(this->getControllableEntity(), entity, this->getGametype()))
+            if (!entity || FormationController::sameTeam(turret, entity, this->getGametype()))
                 continue;
             tempScore = turret->isInRange(entity);
@@ -196 +196 @@
             if(this->isLookingAtTargetNew(Degree(5).valueRadians()))
             {
+
                 this->getControllableEntity()->fire(0);
             }