Changeset 12320

Timestamp:

Apr 22, 2019, 2:17:58 PM (6 years ago)

Author:

peterf

Message:

began PacmanBrown and Cyan implementation

Location:

code/branches/3DPacman_FS19/src/modules/pacman

Files:

• CMakeLists.txt (modified) (1 diff)
• PacmanBrown.cc (modified) (6 diffs)
• PacmanBrown.h (modified) (1 diff)
• PacmanCyan.cc (added)
• PacmanCyan.h (added)
• PacmanGhost.h (modified) (1 diff)

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

@@ -9 +9 @@
   PacmanRed.cc
   PacmanPink.cc
+  PacmanBrown.cc
+  PacmanCyan.cc
 )
 

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

@@ -25 +25 @@
     }
 
+
+int PacmanBrown::absoluteDistance(Vector3 pos1, Vector3 pos2){
+
+
+        Ogre::Vector3 diffVector;
+        diffVector.x=pos2.x-pos1.x;
+        diffVector.y=pos2.y-pos1.y; //should always be 0
+        diffVector.z=pos2.z-pos1.z;
+        int result = sqrt((diffVector.x)*(diffVector.x)+(diffVector.z)*(diffVector.z));
+        return result;
+    }
 
 
@@ -59 +70 @@
                 //put everything needed here
 
-                if((this->fleeing==true)&&(this->actuelposition!=(-215,10,-195))){
+            Vector3 brownPos=Vector3(this->target_x, 10, this->target_z);
+
+            if(absoluteDistance(this->lastPlayerPassedPoint, this->actuelposition)<50){
+                //no idea if 50 is large enough 
+
+                //if near player, flee
+
+                this->isFleeing=true;
+                Vector3 nextMove=getShortestPath( brownPos,Vector3(-215, 10, -195));
+                setNewTargetGhost(nextMove);
+
+            }
+
+            else if((this->isFleeing==true)&&(brownPos!=Vector3(-215,10,-195))){
+                //if fleeing, continue to flee
+             Vector3 nextMove = getShortestPath(brownPos, Vector3(-215, 10, -195));
+             setNewTargetGhost(nextMove);
+        }
+            else if ((this->isFleeing==true)&&(brownPos==Vector3(-215,10,-195))){
+                //if fleeing and reached flee point, go back near player
+            this->isFleeing=false;
+            Vector3 nextMove = getShortestPath(brownPos, this->lastPlayerPassedPoint);
+            setNewTargetGhost(nextMove);
+        }
+            else{
+                //if not fleeing and not near player, go near player
+                Vector3 nextMove = getShortestPath(brownPos, this->lastPlayerPassedPoint);
+            setNewTargetGhost(nextMove);
+            }
+        }
+
+
+
+
+                /*if((this->fleeing==true)&&(this->actuelposition!=(-215,10,-195))){
             //if fleeing, then go to corner map if not already there
                         fleeMode();
@@ -82 +127 @@
                         }
 
-                }
+                }*/
+            lockmove=false; //NEVER FORGET THIS ONE !!!
    
         }
-        
-    }
-
-
-
-
-
-
-
-
-
-
-        int graphDistance(Vector3 start, Vector3 goal){
+    }
+
+
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+        /*int graphDistance(Vector3 start, Vector3 goal){
 
         Vector3 differenceVector= Vector3(abs(goal.x-start.x), 0,abs(goal.z-start.z));
 
         return differenceVector.x+differenceVector.z;
-    }
-
-        void setNewTargetBrown(Vector3 goalToGo){
+    }*/
+
+        /*void setNewTargetBrown(Vector3 goalToGo){
 
                                         this->target_x = goalToGo.x;
                     this->target_z = goalToGo.z; 
                     this->ismoving = true;
-        }
-
-
-
-        int absoluteDistance(Vector3 pos1, Vector3 pos2){
+        }*/
+
+
+
+        /*int PacmanBrown::absoluteDistance(Vector3 pos1, Vector3 pos2){
 
 
@@ -120 +172 @@
                 diffVector.y=pos2-pos1; //should always be 0
                 diffVector.z=pos2-pos1;
-                int result = sqrt(diffVector.x²+diffVector.z²);
+                int result = sqrt((diffVector.x)*(diffVector.x)+(diffVector.z)*(diffVector.z));
                 return result;
-        }
-
-
-        void fleeMode(){ //flees to corner of the map
+        }*/
+
+
+        /*void fleeMode(){ //flees to corner of the map
 
                 Vector3 cornerPos = Vector3(-215,10,-195); //let's take this. We can still change
                 Vector3 nextMove = getShortestPath(this->actuelposition, cornerPos);
-                setNewTargetBrown(nextMove);
-
-                /*//while(this->actuelposition!=cornerPos){
+                setNewTargetGhost(nextMove);
+
+                //while(this->actuelposition!=cornerPos){
         
                 continue moving and each time find next point to go until
                 we reach the corner
-                }*/
-        }
-
-
-        Vector3 goAdjacentOfPlayer(Vector neighboorsOfPlayer[]){
+                }
+        }*/
+
+
+        /*Vector3 goAdjacentOfPlayer(Vector neighboorsOfPlayer[]){
                 //find ,nearest to brown, player neighboor 
 
@@ -171 +223 @@
                 return chosenNeighbor;
 
-        }
-
-
-        Vector3 findPlayerNeighboorNearestToPacman(Vector3 neighboorArray[]){
+        }*/
+
+
+        /*Vector3 findPlayerNeighboorNearestToPacman(Vector3 neighboorArray[]){
                 //uh, i think it does the same think as the function above
 
@@ -203 +255 @@
         return nextMove;
 
-    }
-
-}
-
-
-
-
+    }*/
+
+
+
+
+
+

code/branches/3DPacman_FS19/src/modules/pacman/PacmanBrown.h

@@ -29 +29 @@
 
 
-                        Vector3 goAdjacentOfPlayer(Vector neighboorsOfPlayer[]);
+                        Vector3 goAdjacentOfPlayer(Vector3 neighboorsOfPlayer[]);
                         //they both do the same -_-
                         Vector3 findPlayerNeighboorNearestToPacman(Vector3 neighboorArray);
+
+        bool isFleeing;
 
 

code/branches/3DPacman_FS19/src/modules/pacman/PacmanGhost.h

@@ -37 +37 @@
 
 #include "Pacman.h"
-#include "GetShortestPathAlgorithm.h"
+//#include "GetShortestPathAlgorithm.h"
 
 namespace orxonox {