Changeset 11931 for code/branches/3DPacman_FS18

Timestamp:

May 3, 2018, 2:57:35 PM (7 years ago)

Author:

dreherm

Message:

HUD first commit

Location:

code/branches/3DPacman_FS18

Files:

• data/levels/3DPacman.oxw (modified) (8 diffs)
• data/levels/templates/PacmanGelb.oxt (modified) (2 diffs)
• data/overlays/PacmanHUD.oxo (added)
• src/modules/pacman/Pacman.cc (modified) (4 diffs)
• src/modules/pacman/Pacman.h (modified) (2 diffs)
• src/modules/pacman/PacmanGhost.cc (modified) (2 diffs)
• src/modules/pacman/PacmanGhost.h (modified) (1 diff)
• src/modules/pacman/PacmanHUDinfo.cc (added)
• src/modules/pacman/PacmanHUDinfo.h (added)

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

@@ -34 +34 @@
     <SpawnPoint team=0 position="0,10,245" lookat="0,0,0" spawnclass=PacmanGelb pawndesign=PacmanGelb />
 
-
-<--! GHOSTS -->
-<PacmanGhost position="0,0,0">
+<!-- GHOSTS -->
+<PacmanGhost position="0,10,15" >
     <attached>
         <Model position="0,0,0" mesh="PacmanGhostRed.mesh" scale="5" />
@@ -42 +41 @@
 </PacmanGhost>
 
-<PacmanGhost position="0,0,0">
+<PacmanGhost position="0,10,15" >
     <attached>
         <Model position="0,0,0" mesh="PacmanGhostBlue.mesh" scale="5" />
@@ -48 +47 @@
 </PacmanGhost>
 
-<PacmanGhost position="0,0,0">
+<PacmanGhost position="0,10,15" >
     <attached>
         <Model position="0,0,0" mesh="PacmanGhostOrange.mesh" scale="5" />
@@ -54 +53 @@
 </PacmanGhost>
 
-<PacmanGhost position="0,0,0">
+<PacmanGhost position="0,10,15" >
     <attached>
         <Model position="0,0,0" mesh="PacmanGhostPink.mesh" scale="5" />
@@ -60 +59 @@
 </PacmanGhost>
 
-<--! POINTS -->
+<!-- POINTS -->
 <PacmanPointSphere position="0,10,0">
     <attached>
@@ -80 +79 @@
 
 
-
-
-<--! Map -->
+<!-- Map -->
 <StaticEntity position="0,0,25" direction="0,0,0" collisionType=static mass=100000 friction=0.01 >
     <attached> 
@@ -89 +86 @@
     <collisionShapes> 
 
-  <--! Edge -->
-        <BoxCollisionShape position="250,10,0" halfExtents="1,15,250" />
-        <BoxCollisionShape position="-250,10,0" halfExtents="1,15,250" />
+  <!-- Edge -->  
+  <BoxCollisionShape position="250,10,0" halfExtents="1,15,250" />
+  <BoxCollisionShape position="-250,10,0" halfExtents="1,15,250" />
   <BoxCollisionShape position="0,10,250" halfExtents="250,15,1" />
   <BoxCollisionShape position="0,10,-250" halfExtents="250,15,1" />
 
-  <--! Shapes in order -->
-  <BoxCollisionShape position="-35,10,-200" halfExtents="40,15,25" />
-  <BoxCollisionShape position="60,10,-200" halfExtents="40,15,25" />
-  <BoxCollisionShape position="-35,10,200" halfExtents="40,15,25" />
-  <BoxCollisionShape position="60,10,200" halfExtents="40,15,25" />
-
-  <BoxCollisionShape position="-175,10,-165" halfExtents="30,15,20" />
-
-
+   <!-- Shapes in order -->    
+  <BoxCollisionShape position="-200,10,-65" halfExtents="55,15,35" />
+  <BoxCollisionShape position="-200,10,30" halfExtents="55,15,35" />
+  <BoxCollisionShape position="200,10,-65" halfExtents="55,15,35" />
+  <BoxCollisionShape position="200,10,30" halfExtents="55,15,35" />
 
     </collisionShapes> 
@@ -112 +105 @@
 <PortalLink fromID="1" toID="2" />
 <PortalLink fromID="2" toID="1" />
-
   </Scene>
 </Level>

code/branches/3DPacman_FS18/data/levels/templates/PacmanGelb.oxt

@@ -50 +50 @@
     </attached>
     <collisionShapes>
-      <BoxCollisionShape position="0    ,0 ,  3" halfExtents="10,   4,8" />
-      <BoxCollisionShape position="12.6 ,-2,  3" halfExtents="2.8,2.8,11"/>
-      <BoxCollisionShape position="-12.6,-2,  3" halfExtents="2.8,2.8,11"/>
-      <BoxCollisionShape position="0,     0,-12" halfExtents="4  , 4 ,7" />
+      <BoxCollisionShape position="0    ,0 ,  0" halfExtents="1,1,1" />
     </collisionShapes>
 
@@ -74 +71 @@
    boostfactor    = 1.0
 
-   speedfront     = 50
+   speedfront     = 60
    speedback      = 20
    speedleftright =  1

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

@@ -44 +44 @@
         RegisterObject(Pacman);
 
+       // firstGame = true;                   //needed for the HUD
         lives = 10;
         point = 0;
         level = 1;
 
+       // setHUDTemplate("PacmanOrxHUD");
+       // scoreboardTemplate_ = "";
     }
 
@@ -97 +100 @@
 
     bool Pacman::collis(Vector3 one, Vector3 other){
-        if((abs(one.x-other.x)<7) && (abs(one.y-other.y)<7) && (abs(one.z-other.z)<7))
+        if((abs(one.x-other.x)<10) && (abs(one.y-other.y)<10) && (abs(one.z-other.z)<10))
             return true;
         return false;
@@ -146 +149 @@
     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())
         {
@@ -151 +171 @@
             //Highscore::getInstance().storeScore("3DPacman", score, this->playerInfo_);
         }
+        */
         GSLevel::startMainMenu();
     }

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

@@ -94 +94 @@
             Vector3 startposplayer = Vector3(0,10,245);
             int totallevelpoint = 3;
+            //bool firstGame;
             
        private:
@@ -107 +108 @@
             Timer showLevelTimer;
 
-
-         /*
-
-            //void spawnEnemy();
-
-
-
-
-
-
-
-
-
-
-
-
-        private:
-
-
-
-
-            //Context* context;
-            */
+/*
+std::string sDeathMessage;
+const std::vector<std::string> DeathMessage7 = {
+                "You should really try that again",
+                "You can do better, can you?",
+                "Hey, maybe you get a participation award, that's good isn't it?",
+                "Congratulations, you get a medal, a wooden one",
+                "That was flappin bad!",
+                "Well, that was a waste of time",
+                "You suck!",
+                "Maybe try SuperOrxoBros. That game is not as hard.",
+                "Here's a tip: Try not to fly into these grey thingies.",
+                "We won't comment on that."};
+            const std::vector<std::string> DeathMessage20 = {
+                "Getting better!",
+                "Training has paid off, huh?",
+                "Good average!",
+                "That was somehow enjoyable to watch",
+                "Flappin average",
+                "Getting closer to something",
+                "That wasn't crap, not bad",
+                "Surprisingly not bad."};
+  */      
+        
     };
 }
 
-#endif /* _DodgeRace_H__ */
+#endif /* _Pacman_H__ */

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

@@ -49 +49 @@
 
         this->setCollisionType(CollisionType::Dynamic);
-
-        this->resetposition = this->getPosition(); //Set Default start position
         
         this->actuelposition = this->getPosition();
@@ -325 +323 @@
                 setnewTarget(56,64);
             }
+            else if(findpos(actuelposition,possibleposition[66])){
+                setnewTarget(47,48);
+            }
 
             else{

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

@@ -67 +67 @@
             Vector3 actuelposition;
             Vector3 velocity;
-            Vector3 resetposition;
+            Vector3 resetposition = Vector3(0,10,15);
     };