Changeset 12326 for code/branches/3DPacman_FS19/src

Timestamp:

May 2, 2019, 1:00:11 PM (6 years ago)

Author:

peterf

Message:

bug fix

Location:

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

Files:

• PacmanGhost.cc (modified) (8 diffs)
• PacmanPink.cc (modified) (4 diffs)

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

@@ -260 +260 @@
         
     //(optional parameter) pointToAvoidP1 is a point that cannot be considered
-
+        
 
     graphVertex listOfVerticesM[67]; //our list of all possible graphs
@@ -619 +619 @@
                 adjacentVertices[0]=&listOfVerticesP2[35]; //graphVertex(possibleposition[35]);
                 adjacentVertices[1]=&listOfVerticesP2[43]; //graphVertex(possibleposition[43]);
+                adjacentVertices[2]=&listOfVerticesP2[40]; //error meuh
                        }
             else if(findpos(actuelposition,possibleposition[42])){
@@ -628 +629 @@
                 adjacentVertices[0]=&listOfVerticesP2[41]; //graphVertex(possibleposition[41]);
                 adjacentVertices[1]=&listOfVerticesP2[46]; //graphVertex(possibleposition[46]);
+                adjacentVertices[2]=&listOfVerticesP2[42]; //error meuh
                        }
             else if(findpos(actuelposition,possibleposition[44])){
@@ -1219 +1221 @@
 
                     }
-        std::cout<<"bra"<<frontPoint<<endl;
                 }
 
@@ -1227 +1228 @@
             }
     else{
-        std::cout<<frontPoint<<endl;
+        //std::cout<<frontPoint<<endl;
         return frontPoint;
             }
@@ -1433 +1434 @@
                 adjacentPositions[0]=positionArray[35]; //graphVertex(possibleposition[35]);
                 adjacentPositions[1]=positionArray[43]; //graphVertex(possibleposition[43]);
+                adjacentPositions[2]=positionArray[40];  //error 
                        }
             else if(findpos(actuelposition,possibleposition[42])){
@@ -1442 +1444 @@
                 adjacentPositions[0]=positionArray[41]; //graphVertex(possibleposition[41]);
                 adjacentPositions[1]=positionArray[46]; //graphVertex(possibleposition[46]);
+                adjacentPositions[2]=positionArray[42]; //error
                        }
             else if(findpos(actuelposition,possibleposition[44])){
@@ -1514 +1517 @@
             else if(findpos(actuelposition,possibleposition[59])){
                 adjacentPositions[0]=positionArray[58]; //graphVertex(possibleposition[58]);
-                adjacentPositions[1]=positionArray[59]; //graphVertex(possibleposition[59]);
+                adjacentPositions[1]=positionArray[60]; //graphVertex(possibleposition[60]); //error 59
                 adjacentPositions[2]=positionArray[63]; //graphVertex(possibleposition[63]);
                           }

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

@@ -36 +36 @@
 
         this->actuelposition = this->getPosition();
+        //std::cout<<this->actuelposition<<endl;
 
 
@@ -46 +47 @@
         int directionV = findPlayerTravDir (lastPlayerPassedPoint, this->getPlayerPos());
         this->pointInFrontOfPlayer=frontPosition(); //getPointInFrontOfPacman(lastPlayerPassedPoint, directionV);
-        std::cout<<this->pointInFrontOfPlayer<<endl;
-        std::cout<<this->lastPlayerPassedPoint<<endl;
+        //std::cout<<this->pointInFrontOfPlayer<<endl;
+        //std::cout<<this->lastPlayerPassedPoint<<endl;
+
+        Vector3 pinkPos=Vector3(this->target_x, 10, this->target_z);
+        //std::cout<<pinkPos<<endl;
         
         //Stop, if target arrived
@@ -87 +91 @@
             lockmove = true;
 
-            Vector3 pinkPos=Vector3(this->target_x, 10, this->target_z);
+            //Vector3 pinkPos=Vector3(this->target_x, 10, this->target_z);
+            //std::cout<<pinkPos<<endl;
 
             //int directionV = findPlayerTravDir (lastPlayerPassedPoint, this->getPlayerPos());
@@ -114 +119 @@
         Vector3 nextTarget;
 
+        std::cout<<this->actuelposition<<endl;
+        std::cout<<pinkPosP<<endl;
+        std::cout<<playerPos<<endl;
+        std::cout<<pointToAvoidP11<<endl;
+        std::cout<<this->getPlayerPos()<<endl;
+
         if(playerPos==pointToAvoidP11){ //SIGSEV if playerPos==pointToAvoidP11 otherwise
             nextTarget = getShortestPath(pinkPosP, playerPos);
         }
+        /*else if(pinkPosP==pointToAvoidP11){
+            nextTarget=getShortestPath(pinkPosP, playerPos);
+        }*/
         else{
+            //bugs here
+            std::cout<<"msjiowjqiq"<<endl;
         nextTarget = getShortestPath(pinkPosP, playerPos, pointToAvoidP11);
         }