Changeset 11847 for code/branches/3DPacman_FS18/src

Timestamp:

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

Author:

dreherm

Message:

Commit and check ghost class 3

Location:

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

Files:

• PacmanGhost.cc (modified) (3 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 = Vector3(0, 0, 0);
+        this->velocity.setValue(0, 0, 0);
 
         this->setCollisionType(CollisionType::Dynamic);
 
-        this->resetposition = Vector3(0,20,245); //Set Default start position
+        this->resetposition.setValue(0,20,245); //Set Default start position
         
         this->actuelposition = this->getPosition();
@@ -87 +87 @@
 
     
-    Vector3 possibleposition[] = {Vector3(0,10,245),Vector3(215,0,240)};
+    btVector3 possibleposition[] = {btVector3(0,10,245),btVector3(215,0,240)};
 
     /**
@@ -123 +123 @@
         if(this->ismoving){
             if(!((this->actuelposition.z-target_z)<0.1)) {
-                velocity = Vector3(-sgn(this->actuelposition.x-this->target_x),-sgn(this->actuelposition.y),-sgn(this->actuelposition.z-this->target_z));
+                velocity = btVector3(-sgn(this->actuelposition.x-this->target_x),-sgn(this->actuelposition.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));
+                velocity = btVector3(-sgn(this->actuelposition.x-this->target_x),-sgn(this->actuelposition.y-this->target_y),-sgn(this->actuelposition.z-this->target_z));
                 move(dt);
             }

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

@@ -55 +55 @@
             virtual void rotateRoll(const Vector2& value);
 
-            void move();
+            void move(float dt);
             
             //virtual void resetGhost();
@@ -140 +140 @@
             int target_x = 0; 
             int target_z = 0; 
-            Vector3 actuelposition;
-            Vector3 velocity;
-            Vector3 resetposition;
+            btVector3 actuelposition;
+            btVector3 velocity;
+            btVector3 resetposition;
     };