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

Timestamp:

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

Author:

fvultier

Message:

 

File:

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

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

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Fabien Vultier
  *   Co-authors:
  *      ...
@@ -29 +29 @@
 /**
     @file JumpPlatformVMove.cc
-    @brief Implementation of the JumpPlatform class.
+    @brief This platform can move vertically.
 */
 
 #include "JumpPlatformVMove.h"
-
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-
 #include "gametypes/Gametype.h"
-
 #include "JumpFigure.h"
-
 #include "sound/WorldSound.h"
 #include "core/XMLPort.h"
@@ -48 +44 @@
     RegisterClass(JumpPlatformVMove);
 
-    /**
-    @brief
-        Constructor. Registers and initializes the object.
-    */
     JumpPlatformVMove::JumpPlatformVMove(Context* context) : JumpPlatform(context)
     {
@@ -59 +51 @@
     }
 
-    /**
-    @brief
-        Destructor.
-    */
     JumpPlatformVMove::~JumpPlatformVMove()
     {
@@ -68 +56 @@
     }
 
-    //xml port for loading sounds
     void JumpPlatformVMove::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
@@ -74 +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 JumpPlatformVMove::tick(float dt)
     {
@@ -86 +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.z < lowerBoundary_ && velocity.z < 0) || (position.z > upperBoundary_ && velocity.z > 0))
         {
-                //orxout() << "refelected platformVMove at " << position.z << endl;
                 velocity.z = -velocity.z;
         }
 
         // Set the position, velocity and acceleration of the ball, if they have changed.
-        if (velocity != this->getVelocity())
-            this->setVelocity(velocity);
-        if (position != this->getPosition())
-            this->setPosition(position);
+        if (velocity != getVelocity())
+        {
+            setVelocity(velocity);
+        }
+        if (position != getPosition())
+        {
+            setPosition(position);
+        }
     }
 
@@ -107 +90 @@
         upperBoundary_ = upperBoundary;
 
-        this->setVelocity(Vector3(0,0,speed));
+        setVelocity(Vector3(0,0,speed));
 
     }