Changeset 10622 for code/trunk/src/modules/objects

Timestamp:

Oct 4, 2015, 3:45:56 PM (9 years ago)

Author:

landauf

Message:

merged branch presentationFS15merge back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/objects/ForceField.h (modified) (2 diffs)
• 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/trunk/src/modules/objects/ForceField.h

@@ -160 +160 @@
             const std::string& getMode(void); //!< Get the mode of the ForceField.
 
-        private:
             //! Strings to represent the modes.
             static const std::string modeTube_s;
@@ -166 +165 @@
             static const std::string modeInvertedSphere_s;
             static const std::string modeNewtonianGravity_s;
-
             static const std::string modeHomogen_s;
 
+        private:
             float velocity_; //!< The velocity of the ForceField.
             float radius_; //!< The radius of the ForceField.

code/trunk/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/trunk/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/trunk/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);
             }