Changeset 12357 for code/branches/3DPacman_FS19/src/modules/pacman/PacmanCyan.cc

Timestamp:

May 9, 2019, 2:54:22 PM (5 years ago)

Author:

peterf

Message:

Improved formatting and added some comments to make the code more precise

File:

• code/branches/3DPacman_FS19/src/modules/pacman/PacmanCyan.cc (modified) (11 diffs)

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

@@ -4 +4 @@
 #include "core/CoreIncludes.h"
 #include "BulletDynamics/Dynamics/btRigidBody.h"
-
-
 
         namespace orxonox{
@@ -39 +37 @@
         
         SUPER(PacmanGhost, tick, dt);
-
         this->actuelposition = this->getPosition();
-
-
 
         //Stop, if target arrived
@@ -51 +46 @@
 
         //Move, if ghost hasn't arrived yet
-        if(this->ismoving){
-            
+        if(this->ismoving){     
             if(!(abs(this->actuelposition.z-target_z)<0.5)) {
                 velocity = Vector3(0,0,-sgn(this->actuelposition.z-this->target_z));
@@ -60 +54 @@
                 velocity = Vector3(-sgn(this->actuelposition.x-this->target_x),0,0);
                 move(dt, actuelposition, velocity);
-            }
-            
+            }    
         }
 
         //Check on which position the ghost has arrived and set new target
         else{
-
-            std::cout<<startPatrol<<endl;
-            std::cout<<goalPatrol<<endl;
-            std::cout<<isPatrolling<<endl;
-            std::cout<<this->actuelposition<<endl;
-            std::cout<<this->passedByStart<<endl;
-            std::cout<<this->passedByGoal<<endl;
-
             while(lockmove){};
             lockmove = true;
@@ -86 +71 @@
 
             }
-            else if/*((!findpos(cyanPos, startPatrol))&&*/(this->passedByStart==false)/*)*/{
+            else if(this->passedByStart==false){
                 //we have not even reached our startPatrol point
 
@@ -96 +81 @@
                 }
             }
-            else if/*((!findpos(cyanPos, goalPatrol))&&*/(this->passedByGoal==false)/*)*/{
+            else if(this->passedByGoal==false){
                 //we have reached our startPatrol point, now we go to goalPoint
 
@@ -113 +98 @@
 
             }
-            else /*if(findpos(cyanPos, this->startPatrol))*/{
+            else {
                 //we reached startPoint again. Either we change patrol
                 //or redo same patrol
@@ -130 +115 @@
             }
 
-
-
-
             lockmove=false; //NEVER FORGET THIS ONE !!!!!!!
         }
@@ -139 +121 @@
 
     void PacmanCyan::nextPatrol(){
-
 
                 int indexRand1=rand()%67;
@@ -155 +136 @@
                 }
 
-
-
-
               this->startPatrol =  possibleposition[indexRand1];
               this->goalPatrol = possibleposition[indexRand2];
-
-              /*PatrolPosition startPatPol = PatrolPosition(startPatrol);
-              PatrolPosition goalPatrol = PatrolPosition(goalPatrol);*/
 
               this->passedByStart=false;
@@ -180 +155 @@
         }
 
-    /*struct PacmanCyan::PatrolPosition{
-        //we need to check if PacmanCyan already passed the goal resp. start patrol point
-
-    public:
-
-        Vector3 position;
-        bool visitedPoint;
-
-        PatrolPosition(Vector3 positionP){
-            this->position=positionP;
-            visitedPoint=false;
-        }
-
-    };*/
-
 
 }