[Orxonox-commit 7788] r12380 - in code/branches/3DPacman_FS19: data/levels src/modules/pacman

[rueegseb at orxonox.net]

Author: rueegseb
Date: 2019-05-16 15:10:44 +0200 (Thu, 16 May 2019)
New Revision: 12380

Modified:
   code/branches/3DPacman_FS19/data/levels/3DPacman.oxw
   code/branches/3DPacman_FS19/src/modules/pacman/CMakeLists.txt
   code/branches/3DPacman_FS19/src/modules/pacman/Pacman.cc
   code/branches/3DPacman_FS19/src/modules/pacman/PacmanLaser.cpp
   code/branches/3DPacman_FS19/src/modules/pacman/PacmanLaser.h
   code/branches/3DPacman_FS19/src/modules/pacman/PacmanPointSphere.cc
Log:
laser appears after five pointsphere are eaten

Modified: code/branches/3DPacman_FS19/data/levels/3DPacman.oxw
===================================================================
--- code/branches/3DPacman_FS19/data/levels/3DPacman.oxw	2019-05-16 13:00:14 UTC (rev 12379)
+++ code/branches/3DPacman_FS19/data/levels/3DPacman.oxw	2019-05-16 13:10:44 UTC (rev 12380)
@@ -87,9 +87,9 @@
 
 <!-- POINTS first Line -->
 
-<PacmanLaser position="-215,10,245">
+<PacmanLaser position="20,-200,150">
     <attached>
-        <Model position="0, 60,-40" yaw="90" pitch="-90" roll="0" scale3D="1, 1, 10" mesh="LaserBeam2.mesh" />
+        <Model position="0, 0, 0" yaw="90" pitch="-90" roll="0" scale3D="1, 1, 10" mesh="LaserBeam2.mesh" />
     </attached>
 </PacmanLaser>
 

Modified: code/branches/3DPacman_FS19/src/modules/pacman/CMakeLists.txt
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/CMakeLists.txt	2019-05-16 13:00:14 UTC (rev 12379)
+++ code/branches/3DPacman_FS19/src/modules/pacman/CMakeLists.txt	2019-05-16 13:10:44 UTC (rev 12380)
@@ -10,6 +10,7 @@
   PacmanPink.cc
   PacmanBrown.cc
   PacmanCyan.cc
+  PacmanLaser.cpp
 )
 
 ORXONOX_ADD_LIBRARY(pacman

Modified: code/branches/3DPacman_FS19/src/modules/pacman/Pacman.cc
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/Pacman.cc	2019-05-16 13:00:14 UTC (rev 12379)
+++ code/branches/3DPacman_FS19/src/modules/pacman/Pacman.cc	2019-05-16 13:10:44 UTC (rev 12380)
@@ -87,14 +87,22 @@
         if(deathtime != 0){
             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;
                     }
 
@@ -102,12 +110,7 @@
                 }
 
             }
-         
-        }
 
-        //ingame loop
-        else{
-
             //Register ghosts
             int i = 0;
             for(PacmanGhost* nextghost: ObjectList<PacmanGhost>()){
@@ -222,7 +225,7 @@
     //Collision with PointSphere
     void Pacman::takePoint(PacmanPointSphere* taken){
         ++point;
-        }
+        
         if(point == totallevelpoint){ 
             this->levelUp();
             return;
@@ -301,4 +304,4 @@
     {
         GSLevel::startMainMenu();
     }
-}
+}
\ No newline at end of file

Modified: code/branches/3DPacman_FS19/src/modules/pacman/PacmanLaser.cpp
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/PacmanLaser.cpp	2019-05-16 13:00:14 UTC (rev 12379)
+++ code/branches/3DPacman_FS19/src/modules/pacman/PacmanLaser.cpp	2019-05-16 13:10:44 UTC (rev 12380)
@@ -15,7 +15,7 @@
     */
     PacmanLaser::PacmanLaser(Context* context) : ControllableEntity(context)
     {
-        RegisterObject(PacmanPointSphere);
+        RegisterObject(PacmanLaser);
         this->setCollisionType(CollisionType::None);
     }
 
@@ -32,15 +32,15 @@
     @brief
         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);
     }
 
 
     void PacmanLaser::tick(float dt)
     {
-        SUPER(PacmanPointSphere, tick, dt);
+        SUPER(PacmanLaser, tick, dt);
     }
 
     void PacmanLaser::resetPacmanLaser(){

Modified: code/branches/3DPacman_FS19/src/modules/pacman/PacmanLaser.h
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/PacmanLaser.h	2019-05-16 13:00:14 UTC (rev 12379)
+++ code/branches/3DPacman_FS19/src/modules/pacman/PacmanLaser.h	2019-05-16 13:10:44 UTC (rev 12380)
@@ -17,8 +17,9 @@
 
             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();
+            
 
         private:
             

Modified: code/branches/3DPacman_FS19/src/modules/pacman/PacmanPointSphere.cc
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/PacmanPointSphere.cc	2019-05-16 13:00:14 UTC (rev 12379)
+++ code/branches/3DPacman_FS19/src/modules/pacman/PacmanPointSphere.cc	2019-05-16 13:10:44 UTC (rev 12380)
@@ -81,11 +81,6 @@
       } 
       return false;
     }
-    bool showLaserPointSphere = false;
-
-
-    
-
     //Reset position
     void PacmanPointSphere::resetPacmanPointSphere(){
         resetposition = this->getPosition();