Changeset 11958

Timestamp:

May 13, 2018, 12:39:06 AM (6 years ago)

Author:

dreherm

Message:

HUD test 1

Location:

code/branches/3DPacman_FS18

Files:

• data/levels/3DPacman.oxw (modified) (1 diff)
• data/overlays/PacmanHUD.oxo (modified) (2 diffs)
• src/modules/pacman/CMakeLists.txt (modified) (1 diff)
• src/modules/pacman/Pacman.cc (modified) (2 diffs)
• src/modules/pacman/PacmanGhost.cc (modified) (1 diff)
• src/modules/pacman/PacmanGhost.h (modified) (2 diffs)
• src/modules/pacman/PacmanHUDinfo.cc (modified) (2 diffs)

code/branches/3DPacman_FS18/data/levels/3DPacman.oxw

@@ -8 +8 @@
 <?lua
   include("stats.oxo")
-  include("HUDTemplates3.oxo")
+  include("PacmanHUD.oxo")
   include("templates/lodInformation.oxt")
 ?>

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

@@ -1 @@
-<Template name="pacmanhud">
-  <OverlayGroup name = "pacmanhud" scale = "1, 1">
+<Template name="spectatorhud">
+  <OverlayGroup name = "spectator" scale = "1, 1">
   </OverlayGroup>
 </Template>
@@ -16 +16 @@
      showpoints     = true
     />
-
-    <PacmanHUDinfo
-     position  = "0.5, 0.5"
-     pickpoint = "0.0, 0.0"
-     font      = "ShareTechMono"
-     textsize  = 0.04
-     colour    = "1.0, 0.0, 0.0, 1.0"
-     align     = "center"
-
-     showmessage     = true
-     messageID = 0
-
-    />
-
-    <PacmanHUDinfo
-         position  = "0.5, 0.6"
-         pickpoint = "0.0, 0.0"
-         font      = "ShareTechMono"
-         textsize  = 0.04
-         colour    = "1.0, 1.0, 1.0, 1.0"
-         align     = "center"
-
-         showmessage     = true
-         messageID = 1
-    />
-    <PacmanHUDinfo
-     position  = "0.5, 0.65"
-     pickpoint = "0.0, 0.0"
-     font      = "ShareTechMono"
-     textsize  = 0.04
-     colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "center"
-
-     showmessage     = true
-     messageID = 2
-    />
-    <PacmanHUDinfo
-     position  = "0.5, 0.7"
-     pickpoint = "0.0, 0.0"
-     font      = "ShareTechMono"
-     textsize  = 0.04
-     colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "center"
-
-     showmessage     = true
-     messageID = 3
-
-    />
-
     
   </OverlayGroup>

code/branches/3DPacman_FS18/src/modules/pacman/CMakeLists.txt

@@ -5 +5 @@
   PacmanPointSphere.cc
   PacmanPointAfraid.cc
+  PacmanHUDinfo.cc
 )
 

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

@@ -55 +55 @@
     void Pacman::levelUp()
     {
-        this->end();
+        for(PacmanPointSphere* nextsphere : ObjectList<PacmanPointSphere>()){
+                nextsphere->resetPacmanPointSphere();
+        }
+
+        for(PacmanPointAfraid* next : ObjectList<PacmanPointAfraid>()){
+            next->resetPacmanPointAfraid();
+        }
+
+        for(PacmanGhost* nextghost : ObjectList<PacmanGhost>()){
+            nextghost->levelupvelo(); 
+        }
+        this->posreset();
     }
 
@@ -217 +228 @@
     void Pacman::end()
     {
-        /*
-        firstGame = false;
-        
-        //Set randomized deathmessages
-        if(point<7)         sDeathMessage = DeathMessage7[rand()%(DeathMessage7.size())];
-        else if(point<20)   sDeathMessage = DeathMessage20[rand()%(DeathMessage20.size())];
-        else if(point<30)   sDeathMessage = DeathMessage30[rand()%(DeathMessage30.size())];
-        else                sDeathMessage = DeathMessageover30[rand()%(DeathMessageover30.size())];
-        
-        //Update Highscore
-        if (Highscore::exists())
-        {
-            int score = this->getPoints();
-            Highscore::getInstance().storeScore("Pacman", score, this->getPlayer()->getPlayer());
-        }
-
-
+
+        /*
         if (Highscore::exists())
         {

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

@@ -466 +466 @@
     
     }
+
+    void levelupvelo(){
+        velocity.x = velocity.x + 2;
+        velocity.y = velocity.y + 2;
+        velocity.z = velocity.z + 2;
+    }
 }

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

@@ -56 +56 @@
             void setnewTarget(int firstdec, int seconddec, int thirddec, int fourthdec);
             void changewith(PacmanGhost* otherghost);
+            void levelupvelo();
 
             bool findpos(Vector3 one, Vector3 other);      
@@ -65 +66 @@
             bool ismoving = false;
             int target_x = 0; 
-            int target_z = 0; 
+            int target_z = 0;
+            Vector3 velocity;
 
         private:
             int decision = 0; //Gives the random which way information to the ghost.
-            Vector3 velocity;
             Vector3 resetposition = Vector3(0,10,15);
     };

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

@@ -65 +65 @@
         if (this->PacmanGame)
         {
-            if(not this->PacmanGame->isDead()){
                 if(this->bShowPoints_){
                     const std::string& points = "Score: "+multi_cast<std::string>(this->PacmanGame->getPoints());
@@ -71 +70 @@
                     this->setCaption(points);
                 }
-                else if(this->bShowMessage_){
-                    setTextSize(0);
-                }
-            }
-            else{
-                if(this->bShowPoints_){
-                    setTextSize(0);
-                }
-                else if(this->bShowMessage_){
-                    if(this->PacmanGame->firstGame){
-                        if(messageID==3){
-                            setTextSize(0.05);
-                            this->setCaption("First click, then press space to start");
-                        }
-                    }
-                    else{
-                        std::string message;
-                        setTextSize(0.05);
-                        switch(messageID){
-                            case 0:
-                                message = "Game Over";
-                                setTextSize(0.1);
-                                this->setCaption(message);
-                            break;
-                            case 1:
-                                message = this->PacmanGame->sDeathMessage;
-                            break;
-                            case 2:
-                                message = "Your Score: "+multi_cast<std::string>(this->PacmanGame->getPoints())+
-                                                        "  Local High Score: "+multi_cast<std::string>(Highscore::getInstance().getHighestScoreOfGame("Flappy Orx"));
-                            break;
-                            case 3:
-                                time_t time = this->PacmanGame->getPlayer()->timeUntilRespawn();
-                                if(time<=0)
-                                    message = "Press space to restart.";
-                                else
-                                    message = "Please wait "+multi_cast<std::string>(time)+" seconds.";
-                            break;
-                        }
-                        this->setCaption(message);
-                    }
-                }
-            }   
         }
-    }
+    }    
 
     void PacmanHUDinfo::changedOwner()