Changeset 11845 for code/branches

Timestamp:

Apr 1, 2018, 12:12:17 AM (7 years ago)

Author:

dreherm

Message:

Commit and check ghost class

Location:

code/branches/3DPacman_FS18/src/modules/Pacman

Files:

• PacmanGhost.cc (modified) (4 diffs)
• PacmanGhost.h (modified) (2 diffs)

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

@@ -49 +49 @@
         this->localAngularAcceleration_.setValue(1, 1, 1);
 
-        this->velocity.setValue(1, 0, 0);
+        this->velocity(1, 0, 0);
 
         this->setCollisionType(CollisionType::Dynamic);
@@ -115 +115 @@
         this->actuelposition = this->getPosition();
         
-        move();
-
-
-        /*
-
-        //Calculate next move
-
-        this->actuelposition = this->getPosition();
-
+        //Stop, if target arrived
         if(((this->actuelposition.x - this->target_x)<0.1) && ((this->actuelposition.z - this->target_z)<0.1)){
                  this->ismoving = false;
         }
 
+        //Move, if ghost hasn't arrived yet
         if(this->ismoving){
-            if(!((this->actuelposition.z-target_z)<0.1))
-                moveFrontBack(sgn(this->actuelposition.z-this->target_z)*dt*100);
-            if(!((this->actuelposition.x-target_x)<0.1))
-              moveRightLeft(sgn(this->actuelposition.x-this->target_x)*dt*100); //Assume dt is quite small
+            if(!((this->actuelposition.z-target_z)<0.1)) {
+                velocity = Vector3(sgn(this->actuelposition.x-this->target_x),sgn(this->actuelposition.y-this->target_y),sgn(this->actuelposition.z-this->target_z));
+                move(dt);
+            }    
+            if(!((this->actuelposition.x-target_x)<0.1)){
+                velocity = Vector3(sgn(this->actuelposition.x-this->target_x),sgn(this->actuelposition.y-this->target_y),sgn(this->actuelposition.z-this->target_z));
+                move(dt);
+            }
         }
-        
-        else{ //Check on which position ghost is
+
+        //Check on which position ghost has arrived and set new target
+         else{
             if(((this->actuelposition.x - possibleposition[0].x)<0.1) && ((this->actuelposition.z - possibleposition[0].z)<0.1)){
                 this->target_x = possibleposition[1].x;
@@ -149 +147 @@
             } //End of Position table
             }
-             */
-    }
-
-
+
+    }
+
+
+
+    void move(float dt){
+        this->setPosition(actuelposition+velocity*dt);
+    }
 
 
@@ -163 +165 @@
     void PacmanGhost::moveFrontBack(const Vector2& value)
     {
-        this->setPosition(dt*(actuelposition + velocity_));
+        //this->setPosition(dt*(actuelposition + velocity_));
     }
 

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

@@ -54 +54 @@
             virtual void rotatePitch(const Vector2& value);
             virtual void rotateRoll(const Vector2& value);
+
+            virtual void move();
             
             //virtual void resetGhost();
@@ -140 +142 @@
             Vector3 actuelposition;
             Vector3 velocity;
+            Vector3 resetposition;
     };