Changeset 10260 for code

Timestamp:

Feb 6, 2015, 11:03:00 PM (10 years ago)

Author:

landauf

Message:

merged the latest changes from pickupsFS14 to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/levels/jump.oxw (modified) (2 diffs)
• data/overlays/jumpHUD.oxo (modified) (3 diffs)
• src/modules/jump/Jump.cc (modified) (1 diff)
• src/modules/jump/Jump.h (modified) (2 diffs)
• src/modules/jump/JumpBoots.cc (modified) (2 diffs)
• src/modules/jump/JumpBoots.h (modified) (1 diff)
• src/modules/jump/JumpFigure.cc (modified) (10 diffs)
• src/modules/jump/JumpFigure.h (modified) (3 diffs)
• src/modules/jump/JumpItem.h (modified) (2 diffs)
• src/modules/jump/JumpPropeller.cc (modified) (2 diffs)
• src/modules/jump/JumpPropeller.h (modified) (1 diff)
• src/modules/jump/JumpRocket.cc (modified) (2 diffs)
• src/modules/jump/JumpRocket.h (modified) (1 diff)
• src/modules/jump/JumpScore.cc (modified) (3 diffs)
• src/modules/jump/JumpScore.h (modified) (2 diffs)
• src/modules/jump/JumpShield.cc (modified) (2 diffs)
• src/modules/jump/JumpShield.h (modified) (1 diff)

code/trunk/data/levels/jump.oxw

@@ -243 +243 @@
             <Model position="0,0,-1000" mesh="JumpPlatform06.mesh" scale="1" />
             <Model position="0,0,-1000" mesh="JumpProjectile.mesh" scale="1" />
-            <Model position="0,0,-1000" mesh="JumpFigure.mesh" scale="1" />
             <Model position="0,0,-1000" mesh="JumpEnemy1.mesh" scale="1" />
             <Model position="0,0,-1000" mesh="JumpEnemy2.mesh" scale="1" />
@@ -250 +249 @@
             <Model position="0,0,-1000" mesh="JumpSpring.mesh" scale="1" />
             <Model position="0,0,-1000" mesh="JumpRocket.mesh" scale="1" />
+            <Model position="0,0,-1000" mesh="JumpPropeller.mesh" scale="1" />
+            <Model position="0,0,-1000" mesh="JumpBoots.mesh" scale="1" />
+            <Model position="0,0,-1000" mesh="JumpShield.mesh" scale="1" />
           </attached>
         </JumpCenterpoint>

code/trunk/data/overlays/jumpHUD.oxo

@@ -1 +1 @@
 <Template name="JumpHUD">
   <OverlayGroup name="JumpHUD" scale = "1, 1">
+
     <JumpScore
      position  = "0.5, 0.05"
@@ -9 +10 @@
      align     = "center"
      showScore = true
+     showFuel = false
+     showMessages = false
+    />
+
+    <JumpScore
+     position  = "0.1, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.05
+     colour    = "1.0, 0.5, 0.0, 1.0"
+     align     = "left"
+     showScore = false
+     showFuel = true
      showMessages = false
     />
@@ -21 +35 @@
      gameOverText = "GAME OVER"
      showScore = false
+     showFuel = false
      showMessages = true
     />    
 
+  <HUDBar
+     name          = "SpeedBar1"
+     background    = "Orxonox/BarBackground"
+     size          = "0.35, 0.05"
+     position      = "0.0 , 1.0 "
+     pickpoint     = "0, 1"
+     correctaspect = false
+
+     initialvalue = 50
+
+     >
+      <BarColour position = 0.0 colour = "0.7,0.5,0.2" />
+      <BarColour position = 0.5 colour = "0.2,0.7,0.2" />
+      <BarColour position = 1.0 colour = "0.7,0.2,0.2" />
+    </HUDBar>
+
   </OverlayGroup>
 </Template>

code/trunk/src/modules/jump/Jump.cc

@@ -1271 +1271 @@
     }
 
+    float Jump::getFuel() const
+    {
+        if (this->figure_ != NULL)
+        {
+            if (this->figure_->rocketActive_ != NULL)
+            {
+                return this->figure_->rocketActive_->getFuelState();
+            }
+            else if (this->figure_->propellerActive_ != NULL)
+            {
+                return this->figure_->propellerActive_->getFuelState();
+            }
+            else if (this->figure_->shieldActive_ != NULL)
+            {
+                return this->figure_->shieldActive_->getFuelState();
+            }
+            else if (this->figure_->bootsActive_ != NULL)
+            {
+                return this->figure_->bootsActive_->getFuelState();
+            }
+        }
+
+        return 0.0;
+    }
+
     bool Jump::getDead(PlayerInfo* player) const
     {

code/trunk/src/modules/jump/Jump.h

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Fabien Vultier
  *   Co-authors:
  *      ...
@@ -49 +49 @@
             virtual void spawnPlayer(PlayerInfo* player);
             int getScore(PlayerInfo* player) const;
+            float getFuel() const;
             bool getDead(PlayerInfo* player) const;
             void setCenterpoint(JumpCenterpoint* center)

code/trunk/src/modules/jump/JumpBoots.cc

@@ -52 +52 @@
         RegisterObject(JumpBoots);
 
-        fuel_ = 3.0;
+        initialFuel_ = 3.0;
+        fuel_ = initialFuel_;
         attachedToFigure_ = false;
 
@@ -102 +103 @@
         attachedToFigure_ = figure_->StartBoots(this);
     }
+
+    float JumpBoots::getFuelState()
+    {
+        return fuel_/initialFuel_;
+    }
 }

code/trunk/src/modules/jump/JumpBoots.h

@@ -45 +45 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void touchFigure();
+            virtual float getFuelState();
         protected:
             float stretch_;
             float fuel_;
+            float initialFuel_;
     };
 }

code/trunk/src/modules/jump/JumpFigure.cc

@@ -70 +70 @@
         animateHands_ = false;
         turnUp_ = false;
-        rocketActive_ = false;
-        propellerActive_ = false;
-        bootsActive_ = false;
-        shieldActive_ = false;
+        rocketActive_ = NULL;
+        propellerActive_ = NULL;
+        bootsActive_ = NULL;
+        shieldActive_ = NULL;
         rocketSpeed_ = 0.0;
         propellerSpeed_ = 0.0;
@@ -106 +106 @@
             // Move up/down
             Vector3 velocity = getVelocity();
-            if (rocketActive_ == true)
+            if (rocketActive_ != NULL)
             {
                 velocity.z = rocketSpeed_;
             }
-            else if (propellerActive_ == true)
+            else if (propellerActive_ != NULL)
             {
                 velocity.z = propellerSpeed_;
@@ -207 +207 @@
         {
             Vector3 velocity = getVelocity();
-            velocity.z = (bootsActive_ ? 1.2f*jumpSpeed_ : jumpSpeed_);
+            if (bootsActive_ == NULL)
+            {
+                velocity.z = 1.2f*jumpSpeed_;
+            }
+            else
+            {
+                velocity.z = jumpSpeed_;
+            }
             setVelocity(velocity);
-
             animateHands_ = true;
             handAngle_ = 0.0;
@@ -228 +234 @@
     void JumpFigure::CollisionWithEnemy(JumpEnemy* enemy)
     {
-        if (rocketActive_ == false && propellerActive_ == false && shieldActive_ == false)
+        if (rocketActive_ == NULL && propellerActive_ == NULL && shieldActive_ == NULL)
         {
             dead_ = true;
@@ -236 +242 @@
     bool JumpFigure::StartRocket(JumpRocket* rocket)
     {
-        if (rocketActive_ == false && propellerActive_ == false && bootsActive_ == false)
+        if (rocketActive_ == NULL && propellerActive_ == NULL && bootsActive_ == NULL)
         {
             attach(rocket);
             rocket->setPosition(0.0, rocketPos_, 0.0);
             rocket->setVelocity(0.0, 0.0, 0.0);
-            rocketActive_ = true;
+            rocketActive_ = rocket;
 
             return true;
@@ -255 +261 @@
         detach(rocket);
         rocket->destroy();
-        rocketActive_ = false;
+        rocketActive_ = NULL;
     }
 
     bool JumpFigure::StartPropeller(JumpPropeller* propeller)
     {
-        if (rocketActive_ == false && propellerActive_ == false && bootsActive_ == false)
+        if (rocketActive_ == NULL && propellerActive_ == NULL && bootsActive_ == NULL)
         {
             attach(propeller);
             propeller->setPosition(0.0, 0.0, propellerPos_);
             propeller->setVelocity(0.0, 0.0, 0.0);
-            propellerActive_ = true;
+            propellerActive_ = propeller;
 
             return true;
@@ -279 +285 @@
         detach(propeller);
         propeller->destroy();
-        propellerActive_ = false;
+        propellerActive_ = NULL;
     }
 
     bool JumpFigure::StartBoots(JumpBoots* boots)
     {
-        if (rocketActive_ == false && propellerActive_ == false && bootsActive_ == false)
+        if (rocketActive_ == NULL && propellerActive_ == NULL && bootsActive_ == NULL)
         {
             attach(boots);
             boots->setPosition(0.0, 0.0, bootsPos_);
             boots->setVelocity(0.0, 0.0, 0.0);
-            bootsActive_ = true;
+            bootsActive_ = boots;
 
             return true;
@@ -303 +309 @@
         detach(boots);
         boots->destroy();
-        bootsActive_ = false;
+        bootsActive_ = NULL;
     }
 
@@ -313 +319 @@
             shield->setPosition(0.0, 0.0, propellerPos_);
             shield->setVelocity(0.0, 0.0, 0.0);
-            shieldActive_ = true;
+            shieldActive_ = shield;
 
             return true;
@@ -327 +333 @@
         detach(shield);
         shield->destroy();
-        shieldActive_ = false;
+        shieldActive_ = NULL;
     }
 

code/trunk/src/modules/jump/JumpFigure.h

@@ -31 +31 @@
 
 #include "jump/JumpPrereqs.h"
-
 #include "worldentities/ControllableEntity.h"
 
@@ -119 +118 @@
 
             bool fireSignal_;
-            bool rocketActive_;
-            bool propellerActive_;
             bool dead_;
+
+            JumpRocket* rocketActive_;
+            JumpPropeller* propellerActive_;
+            JumpBoots* bootsActive_;
+            JumpShield* shieldActive_;
         private:
             std::string modelLeftHand_;
@@ -149 +151 @@
             bool animateHands_;
             bool turnUp_;
-            bool bootsActive_;
-            bool shieldActive_;
             float rocketSpeed_;
             float propellerSpeed_;

code/trunk/src/modules/jump/JumpItem.h

@@ -53 +53 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void setProperties(float newLeftBoundary, float newRightBoundary, float newLowerBoundary, float newUpperBoundary, float newHSpeed, float newVSpeed);
-            virtual void setFigure(WeakPtr<JumpFigure> bats); //!< Set the bats for the ball.
+            virtual void setFigure(WeakPtr<JumpFigure> bats);
             virtual void touchFigure();
 
@@ -74 +74 @@
 
         protected:
-            float fieldWidth_; //!< The width of the playing field.
-            float fieldHeight_; //!< The height of the playing field.
-            WeakPtr<JumpFigure> figure_; //!< An array with the two bats.
+            float fieldWidth_;
+            float fieldHeight_;
+            WeakPtr<JumpFigure> figure_;
             float height_;
             float width_;

code/trunk/src/modules/jump/JumpPropeller.cc

@@ -52 +52 @@
         RegisterObject(JumpPropeller);
 
-        fuel_ = 3.0;
+        initialFuel_ = 3.0;
+        fuel_ = initialFuel_;
         attachedToFigure_ = false;
 
@@ -106 +107 @@
         }
     }
+
+    float JumpPropeller::getFuelState()
+    {
+        return fuel_/initialFuel_;
+    }
 }

code/trunk/src/modules/jump/JumpPropeller.h

@@ -47 +47 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void touchFigure();
+            virtual float getFuelState();
         protected:
             float stretch_;
             float fuel_;
+            float initialFuel_;
     };
 }

code/trunk/src/modules/jump/JumpRocket.cc

@@ -49 +49 @@
         RegisterObject(JumpRocket);
 
-        fuel_ = 3.0;
+        initialFuel_ = 3.0;
+        fuel_ = initialFuel_;
         attachedToFigure_ = false;
 
@@ -99 +100 @@
         attachedToFigure_ = figure_->StartRocket(this);
     }
+
+    float JumpRocket::getFuelState()
+    {
+        return fuel_/initialFuel_;
+    }
 }

code/trunk/src/modules/jump/JumpRocket.h

@@ -44 +44 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void touchFigure();
+            virtual float getFuelState();
         protected:
             float stretch_;
             float fuel_;
+            float initialFuel_;
     };
 }

code/trunk/src/modules/jump/JumpScore.cc

@@ -50 +50 @@
         owner_ = NULL;
         showScore_ = false;
+        showFuel_ = false;
         showMessages_ = false;
     }
@@ -63 +64 @@
 
         XMLPortParam(JumpScore, "showScore", setShowScore, getShowScore, xmlelement, mode);
+        XMLPortParam(JumpScore, "showFuel", setShowFuel, getShowFuel, xmlelement, mode);
         XMLPortParam(JumpScore, "showMessages", setShowMessages, getShowMessages, xmlelement, mode);
         XMLPortParam(JumpScore, "gameOverText", setGameOverText, getGameOverText, xmlelement, mode);
@@ -86 +88 @@
                         setCaption(str);
                     }
+                    else if (showFuel_ == true)
+                    {
+                        float fuel = owner_->getFuel();
+                        orxout() <<  fuel << endl;
+                        std::string str;
+
+                        if (fuel <= 0.0)
+                        {
+                            str = "";
+                        }
+                        else
+                        {
+                            str = multi_cast<std::string>(fuel);
+                        }
+                        setCaption(str);
+                    }
                     else if (showMessages_ == true)
                     {
-
                         setCaption(owner_->getDead(player_) == true ? gameOverText_ : "");
                     }

code/trunk/src/modules/jump/JumpScore.h

@@ -54 +54 @@
                 { return showScore_; }
 
+            void setShowFuel(const bool showFuel)
+                { showFuel_ = showFuel; }
+
+            const bool getShowFuel() const
+                { return showFuel_; }
+
             void setShowMessages(const bool showMessages)
                 { showMessages_ = showMessages; }
@@ -71 +77 @@
             WorldSound* scoreSound_;
             bool showScore_;
+            bool showFuel_;
             bool showMessages_;
             std::string gameOverText_;

code/trunk/src/modules/jump/JumpShield.cc

@@ -52 +52 @@
         RegisterObject(JumpShield);
 
-        fuel_ = 7.0;
+        initialFuel_ = 7.0;
+        fuel_ = initialFuel_;
         attachedToFigure_ = false;
 
@@ -102 +103 @@
         attachedToFigure_ = figure_->StartShield(this);
     }
+
+    float JumpShield::getFuelState()
+    {
+        return fuel_/initialFuel_;
+    }
 }

code/trunk/src/modules/jump/JumpShield.h

@@ -47 +47 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void touchFigure();
+            virtual float getFuelState();
         protected:
             float stretch_;
             float fuel_;
+            float initialFuel_;
     };
 }