Changeset 11939 for code/branches

Timestamp:

May 4, 2018, 11:22:50 PM (7 years ago)

Author:

dreherm

Message:

Afraid Test 1

Location:

code/branches/3DPacman_FS18/src/modules/pacman

Files:

• CMakeLists.txt (modified) (1 diff)
• Pacman.cc (modified) (3 diffs)
• PacmanPointAfraid.cc (modified) (6 diffs)
• PacmanPointAfraid.h (modified) (3 diffs)

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

@@ -4 +4 @@
   PacmanGelb.cc
   PacmanPointSphere.cc
+  PacmanPointAfraid.cc
 )
 

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

@@ -65 +65 @@
     {
         SUPER(Pacman, tick, dt);
+
+        if(!timer){
+            timer = timer - dt;
+            if(timer<=0){
+                afraid = false;
+                timer = 0;
+            }
+        }
 
         int i = 0;
@@ -119 +127 @@
         }
     else{
-
         for(int nrghost = 0; nrghost<3; ++nrghost){
         bcolli = collis(ghosts[nrghost]->getPosition(), currentPosition);
@@ -130 +137 @@
     void setAfraid(){
         afraid = true;
+        timer = 10; //Set timer to 10 seconds
     } 
 

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

@@ -27 +27 @@
  */
 
-#include "PacmanPointSphere.h"
+#include "PacmanPointAfraid.h"
 
 #include "core/CoreIncludes.h"
@@ -34 +34 @@
 namespace orxonox
 {
-    RegisterClass(PacmanPointSphere);
+    RegisterClass(PacmanPointAfraid);
 
     /**
@@ -42 +42 @@
         The creator of this object.
     */
-    PacmanPointSphere::PacmanPointSphere(Context* context) : ControllableEntity(context)
+    PacmanPointAfraid::PacmanPointAfraid(Context* context) : ControllableEntity(context)
     {
-        RegisterObject(PacmanPointSphere);
+        RegisterObject(PacmanPointAfraid);
         this->setCollisionType(CollisionType::None); 
     }
@@ -52 +52 @@
         Destructor. Destroys controller, if present.
     */
-    PacmanPointSphere::~PacmanPointSphere()
+    PacmanPointAfraid::~PacmanPointAfraid()
     {
         // Deletes the controller if the object was initialized and the pointer to the controller is not NULL.
@@ -61 +61 @@
         Method for creating a AutonomousDrone through XML.
     */
-    void PacmanPointSphere::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    void PacmanPointAfraid::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        SUPER(PacmanPointSphere, XMLPort, xmlelement, mode);
+        SUPER(PacmanPointAfraid, XMLPort, xmlelement, mode);
     }
 
 
-    void PacmanPointSphere::tick(float dt)
+    void PacmanPointAfraid::tick(float dt)
     {
-        SUPER(PacmanPointSphere, tick, dt);
+        SUPER(PacmanPointAfraid, tick, dt);
     }
 
-    bool PacmanPointSphere::taken(Vector3 playerpos)
+    bool PacmanPointAfraid::taken(Vector3 playerpos)
     {
       if((abs(this->resetposition.x - playerpos.x)<0.1) && (abs(this->resetposition.z - playerpos.z)<0.1)){
@@ -83 +83 @@
 
 
-    void PacmanPointSphere::resetPacmanPointSphere(){
+    void PacmanPointAfraid::resetPacmanPointAfraid(){
         this->setPosition(resetposition);
     }

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

@@ -27 +27 @@
  */
 
-#ifndef _PacmanPointSphere_H__
-#define _PacmanPointSphere_H__
+#ifndef _PacmanPointAfraid_H__
+#define _PacmanPointAfraid_H__
 
 #include "OrxonoxPrereqs.h"
@@ -38 +38 @@
 namespace orxonox {
 
-    class _OrxonoxExport PacmanPointSphere : public ControllableEntity
+    class _OrxonoxExport PacmanPointAfraid : public ControllableEntity
     {
         public:
-            PacmanPointSphere(Context* context);
-            virtual ~PacmanPointSphere();
+            PacmanPointAfraid(Context* context);
+            virtual ~PacmanPointAfraid();
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating an AutonomousDrone through XML.
@@ -48 +48 @@
 
             bool taken(Vector3 playerpos);
-            void resetPacmanPointSphere();
+            void resetPacmanPointAfraid();
         private: