Changeset 11984 for code/branches/3DPacman_FS18/src

Timestamp:

May 24, 2018, 2:25:15 PM (7 years ago)

Author:

dreherm

Message:

Added level info

Location:

code/branches/3DPacman_FS18/src/modules/pacman

Files:

• Pacman.cc (modified) (17 diffs)
• PacmanGelb.cc (modified) (2 diffs)
• PacmanGelb.h (modified) (2 diffs)

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

@@ -21 +21 @@
  *
  *   Author:
- *      Florian Zinggeler
+ *      Marc Dreher
  *   Co-authors:
  *      ...
@@ -34 +34 @@
 #include "Pacman.h"
 #include "core/CoreIncludes.h"
-//Test
 
 namespace orxonox
@@ -52 +51 @@
     void Pacman::levelUp()
     {
+        //Reset each object
         for(PacmanPointSphere* nextsphere : ObjectList<PacmanPointSphere>()){
                 nextsphere->resetPacmanPointSphere();
@@ -60 +60 @@
         }
 
+        //Level up ghosts
         for(PacmanGhost* nextghost : ObjectList<PacmanGhost>()){
             nextghost->levelupvelo(); 
         }
+        //Reset ghosts and player
         this->posreset();
 
+        //Increase maximum of points and level
         totallevelpoint = ObjectList<PacmanPointSphere>().size() + totallevelpoint;
         level++;
@@ -77 +80 @@
         SUPER(Pacman, tick, dt);
 
+        //Needed for gameover
         if(deathtime != 0){
             dead(dt);
         }
 
+        //ingame loop
         else{
 
-        if(afraid){
-        timer = timer - dt;
-            if(timer<=0){
-                setNormal();
-            }
-        }
-
-
-        int i = 0;
-        for(PacmanGhost* nextghost : ObjectList<PacmanGhost>()){
-            ghosts[i] = nextghost;
-            i++;
-        }
-
-        player = this->getPlayer();
-        if (player != nullptr)
-        {
-            currentPosition = player->getWorldPosition();
-        }
-
-
-        bcolli = false;
-        for(int nrghost = 0; (nrghost<8) && (!bcolli); ++nrghost){
-            bcolli = collis(ghosts[nrghost]->getPosition(), currentPosition);
-            //orxout() << "GHOST" << nrghost << ghosts[nrghost]->getPosition() << endl;
-        }
-
-        if(bcolli){
-          this->catched(dt);
-        }
-
-        i = 0;
-        for(PacmanPointSphere* nextsphere : ObjectList<PacmanPointSphere>()){
-            if(collis(nextsphere->getPosition(), currentPosition)){
-                takePoint(nextsphere);
-            }
-        }
-
-        for(PacmanPointAfraid* next : ObjectList<PacmanPointAfraid>()){
-            if(next->taken(currentPosition)){
-                setAfraid();
-            }
-        }
+            //Register ghosts
+            int i = 0;
+            for(PacmanGhost* nextghost : ObjectList<PacmanGhost>()){
+                ghosts[i] = nextghost;
+                i++;
+            }
+
+            //Switch ghost to not-catchable, if timer is zero
+            if(afraid){
+                timer = timer - dt;
+                if(timer<=0){
+                    setNormal();
+                }
+            }
+
+            //Get position of player
+            player = this->getPlayer();
+            if (player != nullptr)
+            {
+                currentPosition = player->getWorldPosition();
+            }
+
+            //Check for collision with ghosts
+            bcolli = false;
+            for(int nrghost = 0; (nrghost<8) && (!bcolli); ++nrghost){
+                bcolli = collis(ghosts[nrghost]->getPosition(), currentPosition);
+            }
+
+            if(bcolli){
+                this->catched(dt);
+            }
+
+            //Check for collision with PointSpheres and PacmanPointAfraid
+            i = 0;
+            for(PacmanPointSphere* nextsphere : ObjectList<PacmanPointSphere>()){
+                if(collis(nextsphere->getPosition(), currentPosition))
+                 takePoint(nextsphere);
+            }
+
+            for(PacmanPointAfraid* next : ObjectList<PacmanPointAfraid>()){
+                if(next->taken(currentPosition))
+                  setAfraid();
+            }
 
         } 
@@ -131 +136 @@
     }
 
-
+    //Check for collisions between to objects (compare float numbers)
     bool Pacman::collis(Vector3 one, Vector3 other){
         if((abs(one.x-other.x)<10) && (abs(one.y-other.y)<10) && (abs(one.z-other.z)<10))
@@ -138 +143 @@
     }
 
+    //Decrease live or resetghost
     void Pacman::catched(float dt){
 
-    if(!afraid) {
-        if(!lives){
+    if(!this->afraid) {
+        if(!this->lives){
           deathtime = 5;
           this->dead(dt);  
@@ -150 +156 @@
     else{
         for(int nrghost = 0; nrghost<8; ++nrghost){
-        bcolli = collis(ghosts[nrghost]->getPosition(), currentPosition);
-        if(bcolli) ghosts[nrghost]->resetGhost();
-        bcolli = false;
+            bcolli = collis(ghosts[nrghost]->getPosition(), currentPosition);
+            if(bcolli) ghosts[nrghost]->resetGhost();
+                bcolli = false;
         }
       }
     }
 
+    //Change ghost design (to afraid)
     void Pacman::setAfraid(){
 
@@ -172 +179 @@
     } 
 
+    //Change ghost design (to not afraid)
     void Pacman::setNormal(){
 
@@ -185 +193 @@
     } 
 
-    bool Pacman::getAfraid(){
-        return afraid;
-    }
-
-    int Pacman::getTimer(){
-        return timer;
-    }
-
-    int Pacman::getLevel(){
-        return level;
-    }
-
+    //Reset ghosts and plazer
     void Pacman::posreset(){
         for(int i = 0; i<4; ++i){
@@ -204 +201 @@
     }
 
+    //Collision with PointSphere
     void Pacman::takePoint(PacmanPointSphere* taken){
         ++point;
@@ -210 +208 @@
             return;
         }
+        //Set PointSphere under map
         Vector3 postaken = taken->getPosition();
         postaken.y = -50;
@@ -225 +224 @@
     }
 
+    //Getter
+    bool Pacman::getAfraid(){
+        return afraid;
+    }
+    //Getter
+    int Pacman::getTimer(){
+        return timer;
+    }
+    //Getter
+    int Pacman::getLevel(){
+        return level;
+    }
+    //Getter
     int Pacman::getPoints(){
         return point;
     }
-
+    //Getter
     int Pacman::getLives(){
         return lives;
     }
+    //Getter
+    bool Pacman::isdead(){
+        return death;
+    }
 
 
@@ -238 +254 @@
         Deathmatch::start();
 
+        //Hide afraided ghosts under map
         int i = 0;
         for(PacmanGhost* nextghost : ObjectList<PacmanGhost>()){
@@ -247 +264 @@
         }
 
+        //Set maximum of points of first level
         totallevelpoint = ObjectList<PacmanPointSphere>().size();
 
-    }
-
-    bool Pacman::isdead(){
-        return death;
     }
 
@@ -258 +272 @@
         death = true;
 
+        //if (Highscore::exists())
+          //  Highscore::getInstance().storeScore("3DPacman", this->getPoints(), this->playerInfo_);
+
         deathtime = deathtime-dt;
 
@@ -266 +283 @@
     void Pacman::end()
     {
-
-        /*
-        if (Highscore::exists())
-        {
-            //int score = this->getPoints();
-            //Highscore::getInstance().storeScore("3DPacman", score, this->playerInfo_);
-        }
-        */
         GSLevel::startMainMenu();
     }

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

@@ -21 +21 @@
  *
  *   Author:
- *      Florian Zinggeler
+ *      Marc Dreher
  *   Co-authors:
  *      ...
@@ -47 +47 @@
     {
         SUPER(PacmanGelb, tick, dt);
-        //bring player back to ground
-        actuelposition = this->getPosition();
+        actuelposition = this->getPosition(); //bring player back to ground
         actuelposition.y = 10;
         this->setPosition(actuelposition);
-        this->rotatePitch(Vector2(0, 0));
-
-        
     }
 }

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

@@ -21 +21 @@
  *
  *   Author:
- *      Florian Zinggeler
+ *      Marc Dreher
  *   Co-authors:
  *      ...
@@ -52 +52 @@
             virtual void tick(float dt);
 
-            //no rotation
+            //allow rotation in horizontal manner
             virtual void rotateYaw(const Vector2& value) override{
                 this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() + value.x);
-
                 Pawn::rotateYaw(value);
-
-                // 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)));
             };
+            
+            //forbid rotation in the vertical (doesn't work totally proper, see documentation)
             virtual void rotatePitch(const Vector2& value) override{};
 
         private:
             Vector3 actuelposition;
-            Quaternion actuelorient;
        
     };