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

Timestamp:

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

Author:

fvultier

Message:

 

File:

• code/branches/pickupsFS14/src/modules/jump/JumpFigure.cc (modified) (13 diffs)

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

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Fabien Vultier
  *   Co-authors:
  *      ...
@@ -29 +29 @@
 /**
     @file JumpFigure.cc
-    @brief Implementation of the JumpFigure class.
+    @brief This class represents your figure when you play the minigame. Here the movement of the figure, activating items, ... are handled.
 */
 
@@ -41 +41 @@
     RegisterClass(JumpFigure);
 
-    /**
-    @brief
-        Constructor. Registers and initializes the object.
-    */
     JumpFigure::JumpFigure(Context* context) : ControllableEntity(context)
     {
         RegisterObject(JumpFigure);
 
+                // initialize variables
         leftHand_ = NULL;
         rightHand_ = NULL;
-
         fieldHeight_ = 0;
         fieldWidth_ = 0;
-
         jumpSpeed_ = 0.0;
         handSpeed_ = 0.0;
@@ -62 +57 @@
         propellerPos_ = 0.0;
         bootsPos_ = 0.0;
-
-        moveUpPressed = false;
-        moveDownPressed = false;
-        moveLeftPressed = false;
-        moveDownPressed = false;
-        firePressed = false;
-        fireSignal = false;
-        timeSinceLastFire = 0.0;
-
-        gravityAcceleration = 8.0;
+        moveUpPressed_ = false;
+        moveDownPressed_ = false;
+        moveLeftPressed_ = false;
+        moveDownPressed_ = false;
+        firePressed_ = false;
+        fireSignal_ = false;
+        timeSinceLastFire_ = 0.0;
+        gravityAcceleration_ = 8.0;
         mouseFactor_ = 75.0;
-        maxFireRate = 0.3;
-
+        maxFireRate_ = 0.3;
         handAngle_ = 0.0;
         animateHands_ = false;
         turnUp_ = false;
-
         rocketActive_ = false;
         propellerActive_ = false;
@@ -85 +76 @@
         rocketSpeed_ = 0.0;
         propellerSpeed_ = 0.0;
-
         dead_ = false;
     }
 
-    /**
-    @brief
-        Method to create a JumpCenterpoint through XML.
-    */
     void JumpFigure::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
@@ -110 +96 @@
     }
 
-    /**
-    @brief
-        Is called each tick.
-        Moves the bat.
-    @param dt
-        The time since last tick.
-    */
     void JumpFigure::tick(float dt)
     {
         SUPER(JumpFigure, tick, dt);
 
-        // If the bat is controlled (but not over the network).
         if (hasLocalController())
         {
-                timeSinceLastFire += dt;
+                timeSinceLastFire_ += dt;
 
                 // Move up/down
@@ -138 +116 @@
                 else
                 {
-                        velocity.z -= gravityAcceleration;
+                        velocity.z -= gravityAcceleration_;
                 }
 
@@ -174 +152 @@
                 if (dead_ == false)
                 {
-                        velocity.x = -mouseFactor_*horizontalSpeed;
+                        velocity.x = -mouseFactor_*horizontalSpeed_;
                 }
                 else
@@ -182 +160 @@
 
                 // Cheats
-                if (moveUpPressed == true)
-                {
-                        velocity.z = 200.0f;
-                        moveUpPressed = false;
+                /*if (moveUpPressed_ == true)
+                {
+                        velocity.z = 400.0f;
+                        moveUpPressed_ = false;
                         dead_ = false;
                 }
-                if (moveDownPressed == true)
-                {
-                        moveDownPressed = false;
-                }
+                if (moveDownPressed_ == true)
+                {
+                        moveDownPressed_ = false;
+                }*/
 
                 setVelocity(velocity);
 
 
-                if (firePressed && timeSinceLastFire >= maxFireRate)
-                {
-                                firePressed = false;
-                                timeSinceLastFire = 0.0;
-                                fireSignal = true;
-                                //orxout() << "fired signal set" << endl;
+                if (firePressed_ && timeSinceLastFire_ >= maxFireRate_)
+                {
+                                firePressed_ = false;
+                                timeSinceLastFire_ = 0.0;
+                                fireSignal_ = true;
                 }
         }
@@ -218 +195 @@
 
         // Reset key variables
-        moveUpPressed = false;
-        moveDownPressed = false;
-        moveLeftPressed = false;
-        moveDownPressed = false;
-        firePressed = false;
+        moveUpPressed_ = false;
+        moveDownPressed_ = false;
+        moveLeftPressed_ = false;
+        moveDownPressed_ = false;
+        firePressed_ = false;
     }
 
@@ -365 +342 @@
     }
 
-    /**
-    @briefhandPosition_
-        Overloaded the function to steer the bat up and down.
-    @param value
-        A vector whose first component is the inverse direction in which we want to steer the bat.
-    */
     void JumpFigure::moveFrontBack(const Vector2& value)
     {
         if (value.x > 0)
         {
-                //orxout() << "up pressed" << endl;
-                moveUpPressed = true;
-                moveDownPressed = false;
+                moveUpPressed_ = true;
+                moveDownPressed_ = false;
         }
         else
         {
-                //orxout() << "down pressed" << endl;
-                moveUpPressed = false;
-                moveDownPressed = true;
-        }
-    }
-
-    /**
-    @brief
-        Overloaded the function to steer the bat up and down.
-    @param value
-        A vector whose first component is the direction in which we wnat to steer the bat.
-    */
+                moveUpPressed_ = false;
+                moveDownPressed_ = true;
+        }
+    }
+
     void JumpFigure::moveRightLeft(const Vector2& value)
     {
         if (value.x > 0)
         {
-                moveLeftPressed = false;
-                moveRightPressed = true;
+                moveLeftPressed_ = false;
+                moveRightPressed_ = true;
         }
         else
         {
-                moveLeftPressed = true;
-                moveRightPressed = false;
+                moveLeftPressed_ = true;
+                moveRightPressed_ = false;
         }
     }
@@ -409 +372 @@
     void JumpFigure::rotateYaw(const Vector2& value)
     {
-        horizontalSpeed = value.x;
+        horizontalSpeed_ = value.x;
     }
 
@@ -426 +389 @@
     void JumpFigure::fire(unsigned int firemode)
     {
-        //SUPER(JumpFigure, fire, firemode);
+
     }
 
     void JumpFigure::fired(unsigned int firemode)
     {
-        //SUPER(JumpFigure, fired, firemode);
-        firePressed = true;
+        firePressed_ = true;
     }
 }