Changeset 12380

Timestamp:

May 16, 2019, 3:10:44 PM (6 years ago)

Author:

rueegseb

Message:

laser appears after five pointsphere are eaten

Location:

code/branches/3DPacman_FS19

Files:

• data/levels/3DPacman.oxw (modified) (1 diff)
• src/modules/pacman/CMakeLists.txt (modified) (1 diff)
• src/modules/pacman/Pacman.cc (modified) (3 diffs)
• src/modules/pacman/PacmanLaser.cpp (modified) (3 diffs)
• src/modules/pacman/PacmanLaser.h (modified) (1 diff)
• src/modules/pacman/PacmanPointSphere.cc (modified) (1 diff)

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

@@ -88 +88 @@
 <!-- POINTS first Line -->
 
-<PacmanLaser position="-215,10,245">
-    <attached>
-        <Model position="0, 60,-40" yaw="90" pitch="-90" roll="0" scale3D="1, 1, 10" mesh="LaserBeam2.mesh" />
+<PacmanLaser position="20,-200,150">
+    <attached>
+        <Model position="0, 0, 0" yaw="90" pitch="-90" roll="0" scale3D="1, 1, 10" mesh="LaserBeam2.mesh" />
     </attached>
 </PacmanLaser>

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

@@ -11 +11 @@
   PacmanBrown.cc
   PacmanCyan.cc
+  PacmanLaser.cpp
 )
 

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

@@ -88 +88 @@
             dead(dt);
 
-            if(point > 230){
+
+         
+        }
+
+        //ingame loop
+        else{
+            if(point > 5){
               
                 for(PacmanPointSphere* pointer : ObjectList<PacmanPointSphere>()){
-                     pointSpherePosition = pointer->getPosition();
+                    Vector3 pointSpherePosition = pointer->getPosition();
 
                      if(pointSpherePosition.y > 0){
-                        PacmanLaser* pos = ObjectList<PacmanLaser>(); //to do
+
+                        PacmanLaser* pos = *(ObjectList<PacmanLaser>().begin());
                         pos->setPosition(pointSpherePosition);
+                        orxout()<<"hellooooo" <<endl;
                         break;
                     }
@@ -103 +111 @@
 
             }
-         
-        }
-
-        //ingame loop
-        else{
 
             //Register ghosts
@@ -223 +226 @@
     void Pacman::takePoint(PacmanPointSphere* taken){
         ++point;
-        }
+        
         if(point == totallevelpoint){ 
             this->levelUp();

code/branches/3DPacman_FS19/src/modules/pacman/PacmanLaser.cpp

@@ -16 +16 @@
     PacmanLaser::PacmanLaser(Context* context) : ControllableEntity(context)
     {
-        RegisterObject(PacmanPointSphere);
+        RegisterObject(PacmanLaser);
         this->setCollisionType(CollisionType::None);
     }
@@ -33 +33 @@
         Method for creating a AutonomousDrone through XML.
     */
-    void PacmanPointSphere::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    void PacmanLaser::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        SUPER(PacmanPointSphere, XMLPort, xmlelement, mode);
+        SUPER(PacmanLaser, XMLPort, xmlelement, mode);
     }
 
@@ -41 +41 @@
     void PacmanLaser::tick(float dt)
     {
-        SUPER(PacmanPointSphere, tick, dt);
+        SUPER(PacmanLaser, tick, dt);
     }
 

code/branches/3DPacman_FS19/src/modules/pacman/PacmanLaser.h

@@ -18 +18 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating an AutonomousDrone through XML.
             virtual void tick(float dt); //!< Defines which actions the AutonomousDrone has to take in each tick.
-
+            
+            void resetPacmanLaser();
             
 

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

@@ -82 +82 @@
       return false;
     }
-    bool showLaserPointSphere = false;
-
-
-    
-
     //Reset position
     void PacmanPointSphere::resetPacmanPointSphere(){