Changeset 11979

Timestamp:

May 22, 2018, 1:04:40 PM (6 years ago)

Author:

dreherm

Message:

Debugged levelup

Location:

code/branches/3DPacman_FS18

Files:

• data/overlays/PacmanHUD.oxo (modified) (1 diff)
• src/modules/pacman/Pacman.cc (modified) (4 diffs)
• src/modules/pacman/Pacman.h (modified) (1 diff)
• src/modules/pacman/PacmanGelb.h (modified) (1 diff)
• src/modules/pacman/PacmanGhost.cc (modified) (4 diffs)
• src/modules/pacman/PacmanGhost.h (modified) (1 diff)
• src/modules/pacman/PacmanHUDinfo.cc (modified) (2 diffs)
• src/modules/pacman/PacmanHUDinfo.h (modified) (2 diffs)
• src/modules/pacman/PacmanPointAfraid.cc (modified) (1 diff)
• src/modules/pacman/PacmanPointSphere.cc (modified) (1 diff)

code/branches/3DPacman_FS18/data/overlays/PacmanHUD.oxo

@@ -58 +58 @@
     />
 
+    <PacmanHUDinfo
+     position  = "0.5, 0.5"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+
+     showlevel   = true
+    />
+
  </OverlayGroup>
 </Template>

code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc

@@ -64 +64 @@
         }
         this->posreset();
+
+        totallevelpoint = ObjectList<PacmanPointSphere>().size() + totallevelpoint;
+        level++;
     }
 
@@ -124 +127 @@
         }
 
-        }
-
-
-        
+        } 
 
     }
@@ -193 +193 @@
     }
 
+    int Pacman::getLevel(){
+        return level;
+    }
+
     void Pacman::posreset(){
         for(int i = 0; i<4; ++i){
@@ -202 +206 @@
     void Pacman::takePoint(PacmanPointSphere* taken){
         ++point;
-        if(point == totallevelpoint) this->levelUp();
+        if(point == totallevelpoint){ 
+            this->levelUp();
+            return;
+        }
         Vector3 postaken = taken->getPosition();
         postaken.y = -50;

code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h

@@ -87 +87 @@
             int getTimer();
             int getLives();
+            int getLevel();
 
 

code/branches/3DPacman_FS18/src/modules/pacman/PacmanGelb.h

@@ -59 +59 @@
 
                 // This function call adds a lift to the ship when it is rotating to make it's movement more "realistic" and enhance the feeling.
-                if (this->getLocalVelocity().z < 0 && std::abs(this->getLocalVelocity().z) < stallSpeed_)
-                this->moveRightLeft(-lift_ / 5.0f * value * sqrt(std::abs(this->getLocalVelocity().y)));
+                //if (this->getLocalVelocity().z < 0 && std::abs(this->getLocalVelocity().z) < stallSpeed_)
+                //this->moveRightLeft(-lift_ / 5.0f * value * sqrt(std::abs(this->getLocalVelocity().y)));
             };
             virtual void rotatePitch(const Vector2& value) override{};

code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc

@@ -117 +117 @@
         if(this->ismoving){
             if(!(abs(this->actuelposition.z-target_z)<0.5)) {
-                velocity = Vector3(0,0,-sgn(this->actuelposition.z-this->target_z)*2);
+                velocity = Vector3(0,0,-sgn(this->actuelposition.z-this->target_z));
                 move(dt, actuelposition, velocity);
             }    
             if(!(abs(this->actuelposition.x-target_x)<0.5)){
-                velocity = Vector3(-sgn(this->actuelposition.x-this->target_x)*2,0,0);
+                velocity = Vector3(-sgn(this->actuelposition.x-this->target_x),0,0);
                 move(dt, actuelposition, velocity);
             }
@@ -440 +440 @@
     void PacmanGhost::move(float dt, Vector3 actuelposition, Vector3 velocity){
         if(!dontmove){
-            this->setPosition(Vector3(actuelposition.x+20*velocity.x*dt,10,actuelposition.z+20*velocity.z*dt));
-        if((abs(abs(velocity.x)-2)<0.1) && (abs(velocity.z-0)<0.1))
+            this->setPosition(Vector3(actuelposition.x+speed*velocity.x*dt,10,actuelposition.z+speed*velocity.z*dt));
+        if((abs(abs(velocity.x)-1)<0.1) && (abs(velocity.z-0)<0.1))
             if(velocity.x<0){
                  this->setOrientation(Quaternion(Radian(-1.57), Vector3(0, 1, 0)));  
@@ -448 +448 @@
                  this->setOrientation(Quaternion(Radian(1.57), Vector3(0, 1, 0)));  
             }
-        if((abs(abs(velocity.z)-2)<0.1) && (abs(velocity.x-0)<0.1))
+        if((abs(abs(velocity.z)-1)<0.1) && (abs(velocity.x-0)<0.1))
             if(velocity.z<0){
                  this->setOrientation(Quaternion(Radian(3.14), Vector3(0, 1, 0)));  
@@ -485 +485 @@
 
     void PacmanGhost::levelupvelo(){
-        velocity.x = velocity.x + 2;
-        velocity.y = velocity.y + 2;
-        velocity.z = velocity.z + 2;
+        speed ++;
     }
 }

code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h

@@ -69 +69 @@
             Vector3 velocity;
             Vector3 oldvelocity = Vector3(2,0,0);
+            int speed = 20;
 
         private:

code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.cc

@@ -60 +60 @@
         XMLPortParam(PacmanHUDinfo, "showgameover",   setGameover,   getGameover,   xmlelement, mode).defaultValues(false);
         XMLPortParam(PacmanHUDinfo, "showlive",   setlive,   getlive,   xmlelement, mode).defaultValues(false);
+        XMLPortParam(PacmanHUDinfo, "showlevel",   setlevel,   getlevel,   xmlelement, mode).defaultValues(false);
        
     
@@ -102 +103 @@
             }
 
+            if(this->showlevel){
+                const std::string& live = "Level: "+multi_cast<std::string>(this->PacmanGame->getLevel());
+                setTextSize(0.03);
+                this->setCaption(live);
+            }
+
+
             if(death && !(this->showgameover)){
                 setTextSize(0.0);

code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.h

@@ -81 +81 @@
                 { return this->showlive; }
 
+            inline void setlevel(bool value){
+                this->showlevel = value;
+            }
+            inline int getlevel() const
+                { return this->showlevel; }
+
 
         private:
@@ -89 +95 @@
             bool showgameover;
             bool showlive;
+            bool showlevel;
             int messageID;
     };

code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.cc

@@ -85 +85 @@
 
     void PacmanPointAfraid::resetPacmanPointAfraid(){
+        resetposition = this->getPosition();
+        resetposition.y = 10;
         this->setPosition(resetposition);
     }

code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.cc

@@ -85 +85 @@
 
     void PacmanPointSphere::resetPacmanPointSphere(){
+        resetposition = this->getPosition();
+        resetposition.y = 10;
         this->setPosition(resetposition);
     }