Changeset 11862 for code/branches

Timestamp:

Apr 13, 2018, 1:08:46 PM (7 years ago)

Author:

dreherm

Message:

Work on player

Location:

code/branches/3DPacman_FS18

Files:

• data/levels/3DPacman.oxw (modified) (2 diffs)
• data/levels/templates/PacmanGelb.oxt (modified) (2 diffs)
• src/modules/Pacman/3DPacman.cc (modified) (6 diffs)
• src/modules/Pacman/CMakeLists.txt (modified) (1 diff)
• src/modules/Pacman/PacmanGelb.h (modified) (3 diffs)
• src/modules/Pacman/PacmanPrereqs.h (added)
• src/modules/dodgerace/DodgeRaceShip.cc (modified) (1 diff)

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

@@ -13 +13 @@
 
 <?lua
-  include("templates/spaceshipEscort.oxt")
+  include("templates/PacmanGelb.oxt")
 ?>
 
@@ -28 +28 @@
 
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
-    <SpawnPoint team=0 position="0,10,245" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
+    <SpawnPoint team=0 position="0,10,245" lookat="0,0,0" spawnclass=SpaceShip pawndesign=PacmanGelb />
 
 

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

@@ -1 +1 @@
 <Template name=PacmanGelb>
-  <SpaceShip
+  <PacmanGelb
    hudtemplate            = spaceshiphud
    camerapositiontemplate = spaceshipescortcameras
@@ -63 +63 @@
   include("../includes/weaponSettingsEscort.oxi")
 ?>
-  </SpaceShip>
+  </PacmanGelb>
 </Template>
 
 <Template name=spaceshipescortcameras defaults=0>
-  <SpaceShip>
+  <PacmanGelb>
     <camerapositions>
       <CameraPosition position="0,0, 60" drag=false mouselook=true />
     </camerapositions>
-  </SpaceShip>
+  </PacmanGelb>
 </Template>
 

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

@@ -49 +49 @@
         point = 0:
         level = 1;
+        Vector3 startposplayer = Vector3(0,10,245);
 
     }
@@ -70 +71 @@
         }
 
-        i = 0:
-        for(PacmanPointSphere* nextsphere : ObjectList<PacmanPointSphere>()){
-            spheres[i] = nextsphere;
-            i++;
-        }
-
         player = this->getPlayer();
         if (player != nullptr)
@@ -90 +85 @@
         }
 
+        i = 0;
+        for(PacmanPointSphere* nextsphere : ObjectList<PacmanPointSphere>()){
+            if(collis(nextsphere.getPosition(), currentPosition)){
+                takePoint(nextsphere);
+            }
+        }
+
         SUPER(3DPacman, tick, dt);
 
     }
-
 
 
@@ -103 +104 @@
 
     void 3DPacman::catched(){
-        if(lives) this->end();
+        if(!lives) this->end();
         --lives;
         this->posreset();
@@ -111 +112 @@
         int i = 0;
         for(PacmanGhost* nextghost : ObjectList<PacmanGhost>()){
-            ghosts[i] = nextghost;
+            nextghost.resetGhost();
             i++;
         }
-        
+        player.setPosition(startposplayer);
+    }
+
+    void 3DPacman::takePoint(PacmanPointSphere* taken){
+        ++point;
+        if(point == totallevelpoint) this->levelUp;
+
+        Vector3 postaken = taken.getPosition();
+        postaken.y = -50;
+        taken.setPosition(postaken);
     }
 
@@ -147 +157 @@
     void 3DPacman::end()
     {
-        // DON'T CALL THIS!
-        //      Deathmatch::end();
-        // It will misteriously crash the game!
-        // Instead startMainMenu, this won't crash.
         if (Highscore::exists())
         {

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

@@ -1 +1 @@
 SET_SOURCE_FILES(PICKUP_SRC_FILES
   PacmanGhost.cc
+  PacmanGelb.cc
 )
 

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

@@ -36 +36 @@
 
 
-#include "dodgerace/DodgeRacePrereqs.h"
+#include "Pacman/PacmanPrereqs.h"
 
 #include "core/XMLPort.h"
@@ -44 +44 @@
 namespace orxonox
 {
-    class _PacmanGelbExport PacmanGelb : public SpaceShip
+    class _PacmanExport PacmanGelb : public SpaceShip
     {
         public:
@@ -53 +53 @@
         private:
             Vector3 actuelposition;
-            btQuaternion actuelorient;
+            Quaternion actuelorient;
        
-    }
+    };
 }
 

code/branches/3DPacman_FS18/src/modules/dodgerace/DodgeRaceShip.cc

@@ -106 +106 @@
 
         setPosition(pos);
-        setOrientation(Vector3::UNIT_Y, Degree(270));
+        //setOrientation(Vector3::UNIT_Y, Degree(270));
 
         // Level up!