Changeset 10111 for code/branches/pickupsFS14/src/modules/jump/JumpPlatformHMove.cc

Timestamp:

Nov 5, 2014, 4:06:09 PM (9 years ago)

Author:

fvultier

Message:

 

File:

• code/branches/pickupsFS14/src/modules/jump/JumpPlatformHMove.cc (modified) (8 diffs)

code/branches/pickupsFS14/src/modules/jump/JumpPlatformHMove.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Fabien Vultier
  *   Co-authors:
  *      ...
@@ -29 +29 @@
 /**
     @file JumpPlatformHMove.cc
-    @brief Implementation of the JumpPlatform class.
+    @brief This platform can move horizontally.
 */
 
 #include "JumpPlatformHMove.h"
-
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-
 #include "gametypes/Gametype.h"
-
 #include "JumpFigure.h"
-
 #include "sound/WorldSound.h"
 #include "core/XMLPort.h"
-
-#include "graphics/Backlight.h"
 
 namespace orxonox
@@ -50 +44 @@
     RegisterClass(JumpPlatformHMove);
 
-    /**
-    @brief
-        Constructor. Registers and initializes the object.
-    */
     JumpPlatformHMove::JumpPlatformHMove(Context* context) : JumpPlatform(context)
     {
@@ -61 +51 @@
     }
 
-    /**
-    @brief
-        Destructor.
-    */
     JumpPlatformHMove::~JumpPlatformHMove()
     {
@@ -70 +56 @@
     }
 
-    //xml port for loading sounds
     void JumpPlatformHMove::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
@@ -76 +61 @@
     }
 
-    /**
-    @brief
-        Is called every tick.
-        Handles the movement of the ball and its interaction with the boundaries and bats.
-    @param dt
-        The time since the last tick.
-    */
     void JumpPlatformHMove::tick(float dt)
     {
@@ -88 +66 @@
 
         // Get the current position, velocity and acceleration of the ball.
-        Vector3 position = this->getPosition();
-        Vector3 velocity = this->getVelocity();
+        Vector3 position = getPosition();
+        Vector3 velocity = getVelocity();
 
         if ((position.x < leftBoundary_ && velocity.x < 0) || (position.x > rightBoundary_ && velocity.x > 0))
 
         {
-                //orxout() << "refelected platformHMove at " << position.x << endl;
                 velocity.x = -velocity.x;
         }
 
         // Set the position, velocity and acceleration of the ball, if they have changed.
-        if (velocity != this->getVelocity())
-            this->setVelocity(velocity);
+        if (velocity != getVelocity())
+        {
+            setVelocity(velocity);
+        }
         if (position != this->getPosition())
-            this->setPosition(position);
+        {
+            setPosition(position);
+        }
     }
 
@@ -109 +90 @@
         leftBoundary_ = leftBoundary;
         rightBoundary_ = rightBoundary;
-
-        this->setVelocity(Vector3(speed,0,0));
-
+        setVelocity(Vector3(speed,0,0));
     }