[Orxonox-commit 7765] r12357 - code/branches/3DPacman_FS19/src/modules/pacman
peterf at orxonox.net
peterf at orxonox.net
Thu May 9 14:54:22 CEST 2019
Author: peterf
Date: 2019-05-09 14:54:22 +0200 (Thu, 09 May 2019)
New Revision: 12357
Modified:
code/branches/3DPacman_FS19/src/modules/pacman/PacmanBrown.cc
code/branches/3DPacman_FS19/src/modules/pacman/PacmanBrown.h
code/branches/3DPacman_FS19/src/modules/pacman/PacmanCyan.cc
code/branches/3DPacman_FS19/src/modules/pacman/PacmanCyan.h
code/branches/3DPacman_FS19/src/modules/pacman/PacmanGhost.cc
code/branches/3DPacman_FS19/src/modules/pacman/PacmanGhost.h
code/branches/3DPacman_FS19/src/modules/pacman/PacmanPink.cc
code/branches/3DPacman_FS19/src/modules/pacman/PacmanPink.h
code/branches/3DPacman_FS19/src/modules/pacman/PacmanRandom.h
code/branches/3DPacman_FS19/src/modules/pacman/PacmanRed.cc
code/branches/3DPacman_FS19/src/modules/pacman/PacmanRed.h
Log:
Improved formatting and added some comments to make the code more precise
Modified: code/branches/3DPacman_FS19/src/modules/pacman/PacmanBrown.cc
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/PacmanBrown.cc 2019-05-09 12:20:32 UTC (rev 12356)
+++ code/branches/3DPacman_FS19/src/modules/pacman/PacmanBrown.cc 2019-05-09 12:54:22 UTC (rev 12357)
@@ -15,7 +15,7 @@
this->target_x=0;
this->target_z=15;
- this->lastPlayerPassedPoint=Vector3(0,0,0); //Vector3(70,10,-135);
+ this->lastPlayerPassedPoint=Vector3(0,0,0);
}
@@ -78,12 +78,10 @@
//of the player to move accordingly
this->ismoving=false;
- std::cout<<"weie"<<endl;
}
//Check on which position the ghost has arrived and set new target
else{
- std::cout<<"naye"<<endl;
while(lockmove){};
lockmove = true;
@@ -91,14 +89,11 @@
//put everything needed here
Vector3 brownPos=Vector3(this->target_x, 10, this->target_z);
- std::cout<<brownPos<<endl;
if(this->isFleeing==true){
if(findpos(brownPos, Vector3(-215,10,-195))){
this->isFleeing=false;
- //Vector3 nextMoveP = getShortestPath(brownPos, this->lastPlayerPassedPoint);
- //this->setNewTargetGhost(nextMoveP);
}
else{
if(findpos(this->lastPlayerPassedPoint, Vector3(-215,10,-195))){
@@ -123,9 +118,8 @@
Vector3 nextMove = getShortestPath(brownPos, this->lastPlayerPassedPoint);
setNewTargetGhost(nextMove);
}
-
+
}
- std::cout<<this->isFleeing<<endl;
lockmove=false; //NEVER FORGET THIS ONE !!!
Modified: code/branches/3DPacman_FS19/src/modules/pacman/PacmanBrown.h
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/PacmanBrown.h 2019-05-09 12:20:32 UTC (rev 12356)
+++ code/branches/3DPacman_FS19/src/modules/pacman/PacmanBrown.h 2019-05-09 12:54:22 UTC (rev 12357)
@@ -1,11 +1,8 @@
#ifndef _PacmanBrown_H__
#define _PacmanBrown_H__
-
#include "PacmanGhost.h"
-//#include "getShortestPath.h"
-
namespace orxonox {
class _OrxonoxExport PacmanBrown : public PacmanGhost{
@@ -13,7 +10,7 @@
public :
PacmanBrown(Context* context);
- virtual void tick(float dt) override; //!< Defines which actions the AutonomousDrone has to take in each tick.
+ virtual void tick(float dt) override; //!< Defines which actions the AutonomousDrone has to take in each tick.
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
@@ -36,9 +33,6 @@
bool isAdjacentToPlayerLastPastPoint(Vector3 pacmanBrownPos, Vector3 arrayForNeighborPositions[]);
- //void findNeighboorPositions(Vector3 actuelposition, Vector3 adjacentPositions[], Vector3 positionArray[]);
-
-
};
}
Modified: code/branches/3DPacman_FS19/src/modules/pacman/PacmanCyan.cc
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/PacmanCyan.cc 2019-05-09 12:20:32 UTC (rev 12356)
+++ code/branches/3DPacman_FS19/src/modules/pacman/PacmanCyan.cc 2019-05-09 12:54:22 UTC (rev 12357)
@@ -4,8 +4,6 @@
#include "core/CoreIncludes.h"
#include "BulletDynamics/Dynamics/btRigidBody.h"
-
-
namespace orxonox{
RegisterClass(PacmanCyan);
@@ -38,11 +36,8 @@
{
SUPER(PacmanGhost, tick, dt);
-
this->actuelposition = this->getPosition();
-
-
//Stop, if target arrived
if((abs(this->actuelposition.x - this->target_x)<0.5) && (abs(this->actuelposition.z - this->target_z)<0.5)){
@@ -50,8 +45,7 @@
}
//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));
move(dt, actuelposition, velocity);
@@ -59,20 +53,11 @@
if(!(abs(this->actuelposition.x-target_x)<0.5)){
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;
@@ -85,7 +70,7 @@
this->nextPatrol();
}
- else if/*((!findpos(cyanPos, startPatrol))&&*/(this->passedByStart==false)/*)*/{
+ else if(this->passedByStart==false){
//we have not even reached our startPatrol point
if(findpos(cyanPos, startPatrol)){
@@ -95,7 +80,7 @@
nextMove(cyanPos, startPatrol);
}
}
- else if/*((!findpos(cyanPos, goalPatrol))&&*/(this->passedByGoal==false)/*)*/{
+ else if(this->passedByGoal==false){
//we have reached our startPatrol point, now we go to goalPoint
if(findpos(cyanPos, goalPatrol)){
@@ -112,7 +97,7 @@
nextMove(cyanPos, startPatrol);
}
- else /*if(findpos(cyanPos, this->startPatrol))*/{
+ else {
//we reached startPoint again. Either we change patrol
//or redo same patrol
@@ -129,9 +114,6 @@
}
}
-
-
-
lockmove=false; //NEVER FORGET THIS ONE !!!!!!!
}
@@ -139,7 +121,6 @@
void PacmanCyan::nextPatrol(){
-
int indexRand1=rand()%67;
while(indexRand1==44){
//new try if index is that of the position in the middle
@@ -154,15 +135,9 @@
indexRand2=rand()%67;
}
-
-
-
this->startPatrol = possibleposition[indexRand1];
this->goalPatrol = possibleposition[indexRand2];
- /*PatrolPosition startPatPol = PatrolPosition(startPatrol);
- PatrolPosition goalPatrol = PatrolPosition(goalPatrol);*/
-
this->passedByStart=false;
this->passedByGoal=false;
this->isPatrolling=true;
@@ -179,20 +154,5 @@
setNewTargetGhost(nextTarget);
}
- /*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;
- }
-
- };*/
-
-
}
\ No newline at end of file
Modified: code/branches/3DPacman_FS19/src/modules/pacman/PacmanCyan.h
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/PacmanCyan.h 2019-05-09 12:20:32 UTC (rev 12356)
+++ code/branches/3DPacman_FS19/src/modules/pacman/PacmanCyan.h 2019-05-09 12:54:22 UTC (rev 12357)
@@ -1,11 +1,8 @@
#ifndef _PacmanCyan_H__
#define _PacmanCyan_H__
-
#include "PacmanGhost.h"
-//#include "getShortestPath.h"
-
namespace orxonox {
class _OrxonoxExport PacmanCyan : public PacmanGhost{
@@ -13,7 +10,7 @@
public :
PacmanCyan(Context* context);
- virtual void tick(float dt) override; //!< Defines which actions the AutonomousDrone has to take in each tick.
+ virtual void tick(float dt) override; //!< Defines which actions the AutonomousDrone has to take in each tick.
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
@@ -31,8 +28,6 @@
bool passedByStart;
bool passedByGoal;
-
-
};
}
Modified: code/branches/3DPacman_FS19/src/modules/pacman/PacmanGhost.cc
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/PacmanGhost.cc 2019-05-09 12:20:32 UTC (rev 12356)
+++ code/branches/3DPacman_FS19/src/modules/pacman/PacmanGhost.cc 2019-05-09 12:54:22 UTC (rev 12357)
@@ -44,8 +44,6 @@
Vector3 position;
graphVertex *adjacentVertices[4]; //neighbooring vertices
- //would a vector of vector storing the neighboors not be more suitable ?
-
int shortestDistanceToStart; //actual shortest distance to start point
graphVertex* actuelPredecessor; //the predecessor giving the for now shortest
//path to start
@@ -226,7 +224,7 @@
{
return player->getWorldPosition();
}
- //std::cout<<"bug ??"<<endl;
+
return Vector3(0,0,0); //default, should not be used
}
@@ -233,11 +231,14 @@
bool PacmanGhost::jeanfindpos(Vector3 one, Vector3 other){
+ //This function is used to detect the last Vector3 position that the player crossed.
+
if((abs(one.x - other.x)<15) && (abs(one.y - other.y)<15) && (abs(one.z - other.z)<15)) return true;
return false;
}
void PacmanGhost::setNewTargetGhost(Vector3 goalToGo){
+ //Ghosts will go to goalToGo
this->target_x = goalToGo.x;
this->target_z = goalToGo.z;
@@ -261,9 +262,7 @@
graphVertex listOfVerticesM[67]; //our list of all possible graphs
graphVertex* actualVertex; //we will walk through the array with a pointer
- //vector<graphVertex> listOfVertices;
-
if(start==goal){ // basic case
return start;
}
@@ -270,16 +269,14 @@
for(int an=0; an < 67; an++){
listOfVerticesM[an]= graphVertex(possibleposition[an]); //same position order as in other file
- //listOfVertices.at(an) = graphVertex(possibleposition[an]);
+
if(start==possibleposition[an]){
actualVertex= &listOfVerticesM[an]; //our pointer points to the graph with position start in array
- //cout<<an<<endl;
+
}
}
- //graphVertex actualVertex= listOfVerticesM[an];
-
actualVertex->alreadyVisited=true; //our start point is now visited
actualVertex->shortestDistanceToStart=0; //At our start point, distance from start is 0
findNeighboorVertices(actualVertex->position, actualVertex->adjacentVertices, listOfVerticesM);
@@ -289,19 +286,15 @@
for(int h=0;h < 4; h++){
if(actualVertex->adjacentVertices[h]!=nullptr){ //check all neighboors of our current graphVertex
- //h=2 and 3 never reached
+
updateShortestDistanceToStart(*actualVertex, *actualVertex->adjacentVertices[h]);
} //we "update" the neighboors of our new visited vertex
}
- if(actualVertex==nullptr){
- std::cout<<"Ornopdpde"<<endl;
- }
-
actualVertex=findNextVertexToConsider(listOfVerticesM, pointToAvoidP1);
actualVertex->alreadyVisited=true;
- //cout<<actualVertex->position<<endl;
+
if(actualVertex->position!=goal){
findNeighboorVertices(actualVertex->position, actualVertex->adjacentVertices, listOfVerticesM);
//we find the neighboors of our new visited vertex
@@ -308,8 +301,6 @@
}
}
- //cout<<"meuejeeke"<<endl; never reached
-
//we should have reached our goal at this point
while(actualVertex->actuelPredecessor->actuelPredecessor!=nullptr){ //the predecessor of our predecessor
@@ -325,7 +316,7 @@
int PacmanGhost::graphDistance(Vector3 start, Vector3 goal){
- //cout<<hgj++<<endl;
+
Vector3 differenceVector= Vector3(abs(goal.x-start.x), 0,abs(goal.z-start.z));
return differenceVector.x+differenceVector.z;
@@ -360,17 +351,17 @@
shortestDistance= graphDistance(vertex.position, vertex.adjacentVertices[i]->position);
nearestNonVisitedNeighboor=vertex.adjacentVertices[i]; //warning, both sides are pointer adresses !
- //cout<<shortestDistance<<endl;
+
}
else if(graphDistance(vertex.position, vertex.adjacentVertices[i]->position)<shortestDistance){
shortestDistance= graphDistance(vertex.position, vertex.adjacentVertices[i]->position);
nearestNonVisitedNeighboor=vertex.adjacentVertices[i]; //warning, both sides are pointer adresses !
- //cout<<(hgj++)%4<<endl;
+
}
}
}
vertex.currentNearestNonVisitedNeighboor = nearestNonVisitedNeighboor; //warning, both sides are pointer adresses !
- //cout<<hgj++<<endl;
+
}
@@ -421,333 +412,324 @@
//////////////////////////////////////////////////////////////////////////////////////////////
- //-215 -185 -135 -70 -20 0 20 70 135 185 215
-
- //-195 -135 -85 -35 15 60 105 150 195 245
-
void PacmanGhost::findNeighboorVertices(Vector3 actuelposition, graphVertex* adjacentVertices[], graphVertex listOfVerticesP2[]){
+ //Should put in adjacentVertices the neighboor points of actuelposition. listOfVertices is the
+ //array containing all possible positions in the map.
-
if(findpos(actuelposition,possibleposition[0])){
- // we should use listOfVerticesP2[i] instead of possibleposition[i] I think
- // so that all neighboors are "the same"
- adjacentVertices[0]=&listOfVerticesP2[1]; //graphVertex(possibleposition[1]); //need to do it everywhere !!!
- adjacentVertices[1]=&listOfVerticesP2[17]; //graphVertex(possibleposition[17]);
- adjacentVertices[2]=&listOfVerticesP2[19]; //graphVertex(possibleposition[19]); //maybe a vector would be more suitable ?
+
+ adjacentVertices[0]=&listOfVerticesP2[1];
+ adjacentVertices[1]=&listOfVerticesP2[17];
+ adjacentVertices[2]=&listOfVerticesP2[19];
}
else if(findpos(actuelposition,possibleposition[1])){
- adjacentVertices[0]=&listOfVerticesP2[0]; //graphVertex(possibleposition[0]);
- adjacentVertices[1]=&listOfVerticesP2[2]; //graphVertex(possibleposition[2]);
+ adjacentVertices[0]=&listOfVerticesP2[0];
+ adjacentVertices[1]=&listOfVerticesP2[2];
}
else if(findpos(actuelposition,possibleposition[2])){
- adjacentVertices[0]=&listOfVerticesP2[1]; //graphVertex(possibleposition[1]);
- adjacentVertices[1]=&listOfVerticesP2[3]; //graphVertex(possibleposition[3]);
+ adjacentVertices[0]=&listOfVerticesP2[1];
+ adjacentVertices[1]=&listOfVerticesP2[3];
}
else if(findpos(actuelposition,possibleposition[3])){
- adjacentVertices[0]=&listOfVerticesP2[2]; //graphVertex(possibleposition[2]);
- adjacentVertices[1]=&listOfVerticesP2[4]; //graphVertex(possibleposition[4]);
- adjacentVertices[2]=&listOfVerticesP2[5]; //graphVertex(possibleposition[5]);
+ adjacentVertices[0]=&listOfVerticesP2[2];
+ adjacentVertices[1]=&listOfVerticesP2[4];
+ adjacentVertices[2]=&listOfVerticesP2[5];
}
else if(findpos(actuelposition,possibleposition[4])){
- adjacentVertices[0]=&listOfVerticesP2[3]; //graphVertex(possibleposition[3]);
- adjacentVertices[1]=&listOfVerticesP2[6]; //graphVertex(possibleposition[6]);
+ adjacentVertices[0]=&listOfVerticesP2[3];
+ adjacentVertices[1]=&listOfVerticesP2[6];
}
else if(findpos(actuelposition,possibleposition[5])){
- adjacentVertices[0]=&listOfVerticesP2[3]; //graphVertex(possibleposition[3]);
- adjacentVertices[1]=&listOfVerticesP2[7]; //graphVertex(possibleposition[7]);
+ adjacentVertices[0]=&listOfVerticesP2[3];
+ adjacentVertices[1]=&listOfVerticesP2[7];
}
else if(findpos(actuelposition,possibleposition[6])){
- adjacentVertices[0]=&listOfVerticesP2[4]; //graphVertex(possibleposition[4]);
- adjacentVertices[1]=&listOfVerticesP2[9]; //graphVertex(possibleposition[9]);
- adjacentVertices[2]=&listOfVerticesP2[26]; //graphVertex(possibleposition[26]);
+ adjacentVertices[0]=&listOfVerticesP2[4];
+ adjacentVertices[1]=&listOfVerticesP2[9];
+ adjacentVertices[2]=&listOfVerticesP2[26];
}
else if(findpos(actuelposition,possibleposition[7])){
- adjacentVertices[0]=&listOfVerticesP2[5]; //graphVertex(possibleposition[5]);
- adjacentVertices[1]=&listOfVerticesP2[8]; //graphVertex(possibleposition[8]);
+ adjacentVertices[0]=&listOfVerticesP2[5];
+ adjacentVertices[1]=&listOfVerticesP2[8];
}
else if(findpos(actuelposition,possibleposition[8])){
- adjacentVertices[0]=&listOfVerticesP2[7]; //graphVertex(possibleposition[7]);
- adjacentVertices[1]=&listOfVerticesP2[9]; //graphVertex(possibleposition[9]);
+ adjacentVertices[0]=&listOfVerticesP2[7];
+ adjacentVertices[1]=&listOfVerticesP2[9];
}
else if(findpos(actuelposition,possibleposition[9])){
- adjacentVertices[0]=&listOfVerticesP2[6]; //graphVertex(possibleposition[6]);
- adjacentVertices[1]=&listOfVerticesP2[8]; //graphVertex(possibleposition[8]);
- adjacentVertices[2]=&listOfVerticesP2[10]; //graphVertex(possibleposition[10]);
- adjacentVertices[3]=&listOfVerticesP2[38]; //graphVertex(possibleposition[38]);
+ adjacentVertices[0]=&listOfVerticesP2[6];
+ adjacentVertices[1]=&listOfVerticesP2[8];
+ adjacentVertices[2]=&listOfVerticesP2[10];
+ adjacentVertices[3]=&listOfVerticesP2[38];
}
else if(findpos(actuelposition,possibleposition[10])){
- adjacentVertices[0]=&listOfVerticesP2[9]; //graphVertex(possibleposition[9]);
- adjacentVertices[1]=&listOfVerticesP2[11]; //graphVertex(possibleposition[11]);
- adjacentVertices[2]=&listOfVerticesP2[45]; //graphVertex(possibleposition[45]);
+ adjacentVertices[0]=&listOfVerticesP2[9];
+ adjacentVertices[1]=&listOfVerticesP2[11];
+ adjacentVertices[2]=&listOfVerticesP2[45];
}
else if(findpos(actuelposition,possibleposition[11])){
- adjacentVertices[0]=&listOfVerticesP2[10]; //graphVertex(possibleposition[10]);
- adjacentVertices[1]=&listOfVerticesP2[12]; //graphVertex(possibleposition[12]);
- adjacentVertices[2]=&listOfVerticesP2[13]; //graphVertex(possibleposition[13]);
+ adjacentVertices[0]=&listOfVerticesP2[10];
+ adjacentVertices[1]=&listOfVerticesP2[12];
+ adjacentVertices[2]=&listOfVerticesP2[13];
}
else if(findpos(actuelposition,possibleposition[12])){
- adjacentVertices[0]=&listOfVerticesP2[11]; //graphVertex(possibleposition[11]);
- adjacentVertices[1]=&listOfVerticesP2[14]; //graphVertex(possibleposition[14]);
+ adjacentVertices[0]=&listOfVerticesP2[11];
+ adjacentVertices[1]=&listOfVerticesP2[14];
}
else if(findpos(actuelposition,possibleposition[13])){
- adjacentVertices[0]=&listOfVerticesP2[11]; //graphVertex(possibleposition[11]);
- adjacentVertices[1]=&listOfVerticesP2[14]; //graphVertex(possibleposition[14]);
- adjacentVertices[2]=&listOfVerticesP2[16]; //graphVertex(possibleposition[16]);
- adjacentVertices[3]=&listOfVerticesP2[61]; //graphVertex(possibleposition[61]);
+ adjacentVertices[0]=&listOfVerticesP2[11];
+ adjacentVertices[1]=&listOfVerticesP2[14];
+ adjacentVertices[2]=&listOfVerticesP2[16];
+ adjacentVertices[3]=&listOfVerticesP2[61];
}
else if(findpos(actuelposition,possibleposition[14])){
- adjacentVertices[0]=&listOfVerticesP2[12]; //graphVertex(possibleposition[12]);
- adjacentVertices[1]=&listOfVerticesP2[13]; //graphVertex(possibleposition[13]);
- adjacentVertices[2]=&listOfVerticesP2[15]; //graphVertex(possibleposition[15]);
+ adjacentVertices[0]=&listOfVerticesP2[12];
+ adjacentVertices[1]=&listOfVerticesP2[13];
+ adjacentVertices[2]=&listOfVerticesP2[15];
}
else if(findpos(actuelposition,possibleposition[15])){
- adjacentVertices[0]=&listOfVerticesP2[14]; //graphVertex(possibleposition[14]);
- adjacentVertices[1]=&listOfVerticesP2[16]; //graphVertex(possibleposition[16]);
+ adjacentVertices[0]=&listOfVerticesP2[14];
+ adjacentVertices[1]=&listOfVerticesP2[16];
}
else if(findpos(actuelposition,possibleposition[16])){
- adjacentVertices[0]=&listOfVerticesP2[13]; //graphVertex(possibleposition[13]);
- adjacentVertices[1]=&listOfVerticesP2[15]; //graphVertex(possibleposition[15]);
- adjacentVertices[2]=&listOfVerticesP2[62]; //graphVertex(possibleposition[62]);
+ adjacentVertices[0]=&listOfVerticesP2[13];
+ adjacentVertices[1]=&listOfVerticesP2[15];
+ adjacentVertices[2]=&listOfVerticesP2[62];
}
else if(findpos(actuelposition,possibleposition[17])){
- adjacentVertices[0]=&listOfVerticesP2[0]; //graphVertex(possibleposition[0]);
- adjacentVertices[1]=&listOfVerticesP2[25]; //graphVertex(possibleposition[25]);
+ adjacentVertices[0]=&listOfVerticesP2[0];
+ adjacentVertices[1]=&listOfVerticesP2[25];
}
else if(findpos(actuelposition,possibleposition[18])){
- adjacentVertices[0]=&listOfVerticesP2[19]; //graphVertex(possibleposition[19]);
- adjacentVertices[1]=&listOfVerticesP2[24]; //graphVertex(possibleposition[24]);
+ adjacentVertices[0]=&listOfVerticesP2[19];
+ adjacentVertices[1]=&listOfVerticesP2[24];
}
else if(findpos(actuelposition,possibleposition[19])){
- adjacentVertices[0]=&listOfVerticesP2[0]; //graphVertex(possibleposition[0]);
- adjacentVertices[1]=&listOfVerticesP2[18]; //graphVertex(possibleposition[18]);
- adjacentVertices[2]=&listOfVerticesP2[20]; //graphVertex(possibleposition[20]);
+ adjacentVertices[0]=&listOfVerticesP2[0];
+ adjacentVertices[1]=&listOfVerticesP2[18];
+ adjacentVertices[2]=&listOfVerticesP2[20];
}
else if(findpos(actuelposition,possibleposition[20])){
- adjacentVertices[0]=&listOfVerticesP2[19]; //graphVertex(possibleposition[19]);
- adjacentVertices[1]=&listOfVerticesP2[21]; //graphVertex(possibleposition[21]);
+ adjacentVertices[0]=&listOfVerticesP2[19];
+ adjacentVertices[1]=&listOfVerticesP2[21];
}
else if(findpos(actuelposition,possibleposition[21])){
- adjacentVertices[0]=&listOfVerticesP2[20]; //graphVertex(possibleposition[20]);
- adjacentVertices[1]=&listOfVerticesP2[22]; //graphVertex(possibleposition[22]);
+ adjacentVertices[0]=&listOfVerticesP2[20];
+ adjacentVertices[1]=&listOfVerticesP2[22];
}
else if(findpos(actuelposition,possibleposition[22])){
- adjacentVertices[0]=&listOfVerticesP2[21]; //graphVertex(possibleposition[21]);
- adjacentVertices[1]=&listOfVerticesP2[23]; //graphVertex(possibleposition[23]);
- adjacentVertices[2]=&listOfVerticesP2[31]; //graphVertex(possibleposition[31]);
+ adjacentVertices[0]=&listOfVerticesP2[21];
+ adjacentVertices[1]=&listOfVerticesP2[23];
+ adjacentVertices[2]=&listOfVerticesP2[31];
}
else if(findpos(actuelposition,possibleposition[23])){
- adjacentVertices[0]=&listOfVerticesP2[22]; //graphVertex(possibleposition[22]);
- adjacentVertices[1]=&listOfVerticesP2[30]; //graphVertex(possibleposition[30]);
+ adjacentVertices[0]=&listOfVerticesP2[22];
+ adjacentVertices[1]=&listOfVerticesP2[30];
}
else if(findpos(actuelposition,possibleposition[24])){
- adjacentVertices[0]=&listOfVerticesP2[18]; //graphVertex(possibleposition[18]);
- adjacentVertices[1]=&listOfVerticesP2[29]; //graphVertex(possibleposition[29]);
+ adjacentVertices[0]=&listOfVerticesP2[18];
+ adjacentVertices[1]=&listOfVerticesP2[29];
}
else if(findpos(actuelposition,possibleposition[25])){
- adjacentVertices[0]=&listOfVerticesP2[17]; //graphVertex(possibleposition[17]);
- adjacentVertices[1]=&listOfVerticesP2[26]; //graphVertex(possibleposition[26]);
+ adjacentVertices[0]=&listOfVerticesP2[17];
+ adjacentVertices[1]=&listOfVerticesP2[26];
}
else if(findpos(actuelposition,possibleposition[26])){
- adjacentVertices[0]=&listOfVerticesP2[6]; //graphVertex(possibleposition[6]);
- adjacentVertices[1]=&listOfVerticesP2[25]; //graphVertex(possibleposition[25]);
- adjacentVertices[2]=&listOfVerticesP2[27]; //graphVertex(possibleposition[27]);
+ adjacentVertices[0]=&listOfVerticesP2[6];
+ adjacentVertices[1]=&listOfVerticesP2[25];
+ adjacentVertices[2]=&listOfVerticesP2[27];
}
else if(findpos(actuelposition,possibleposition[27])){
- adjacentVertices[0]=&listOfVerticesP2[26]; //graphVertex(possibleposition[26]);
- adjacentVertices[1]=&listOfVerticesP2[28]; //graphVertex(possibleposition[28]);
- adjacentVertices[2]=&listOfVerticesP2[37]; //graphVertex(possibleposition[37]);
+ adjacentVertices[0]=&listOfVerticesP2[26];
+ adjacentVertices[1]=&listOfVerticesP2[28];
+ adjacentVertices[2]=&listOfVerticesP2[37];
}
else if(findpos(actuelposition,possibleposition[28])){
- adjacentVertices[0]=&listOfVerticesP2[27]; //graphVertex(possibleposition[27]);
- adjacentVertices[1]=&listOfVerticesP2[29]; //graphVertex(possibleposition[29]);
- adjacentVertices[2]=&listOfVerticesP2[36]; //graphVertex(possibleposition[36]);
+ adjacentVertices[0]=&listOfVerticesP2[27];
+ adjacentVertices[1]=&listOfVerticesP2[29];
+ adjacentVertices[2]=&listOfVerticesP2[36];
}
else if(findpos(actuelposition,possibleposition[29])){
- adjacentVertices[0]=&listOfVerticesP2[24]; //graphVertex(possibleposition[24]);
- adjacentVertices[1]=&listOfVerticesP2[28]; //graphVertex(possibleposition[28]);
- adjacentVertices[2]=&listOfVerticesP2[30]; //graphVertex(possibleposition[30]);
+ adjacentVertices[0]=&listOfVerticesP2[24];
+ adjacentVertices[1]=&listOfVerticesP2[28];
+ adjacentVertices[2]=&listOfVerticesP2[30];
}
else if(findpos(actuelposition,possibleposition[30])){
- adjacentVertices[0]=&listOfVerticesP2[23]; //graphVertex(possibleposition[23]);
- adjacentVertices[1]=&listOfVerticesP2[29]; //graphVertex(possibleposition[29]);
- adjacentVertices[2]=&listOfVerticesP2[34]; //graphVertex(possibleposition[34]);
+ adjacentVertices[0]=&listOfVerticesP2[23];
+ adjacentVertices[1]=&listOfVerticesP2[29];
+ adjacentVertices[2]=&listOfVerticesP2[34];
}
else if(findpos(actuelposition,possibleposition[31])){
- adjacentVertices[0]=&listOfVerticesP2[22]; //graphVertex(possibleposition[22]);
- adjacentVertices[1]=&listOfVerticesP2[32]; //graphVertex(possibleposition[32]);
+ adjacentVertices[0]=&listOfVerticesP2[22];
+ adjacentVertices[1]=&listOfVerticesP2[32];
}
else if(findpos(actuelposition,possibleposition[32])){
- adjacentVertices[0]=&listOfVerticesP2[31]; //graphVertex(possibleposition[31]);
- adjacentVertices[1]=&listOfVerticesP2[33]; //graphVertex(possibleposition[33]);
+ adjacentVertices[0]=&listOfVerticesP2[31];
+ adjacentVertices[1]=&listOfVerticesP2[33];
}
else if(findpos(actuelposition,possibleposition[33])){
- adjacentVertices[0]=&listOfVerticesP2[32]; //graphVertex(possibleposition[32]);
- adjacentVertices[1]=&listOfVerticesP2[34]; //graphVertex(possibleposition[34]);
+ adjacentVertices[0]=&listOfVerticesP2[32];
+ adjacentVertices[1]=&listOfVerticesP2[34];
}
else if(findpos(actuelposition,possibleposition[34])){
- adjacentVertices[0]=&listOfVerticesP2[30]; //graphVertex(possibleposition[30]);
- adjacentVertices[1]=&listOfVerticesP2[33]; //graphVertex(possibleposition[33]);
- adjacentVertices[2]=&listOfVerticesP2[35]; //graphVertex(possibleposition[35]);
- adjacentVertices[3]=&listOfVerticesP2[42]; //graphVertex(possibleposition[42]);
+ adjacentVertices[0]=&listOfVerticesP2[30];
+ adjacentVertices[1]=&listOfVerticesP2[33];
+ adjacentVertices[2]=&listOfVerticesP2[35];
+ adjacentVertices[3]=&listOfVerticesP2[42];
}
else if(findpos(actuelposition,possibleposition[35])){
- adjacentVertices[0]=&listOfVerticesP2[34]; //graphVertex(possibleposition[34]);
- adjacentVertices[1]=&listOfVerticesP2[36]; //graphVertex(possibleposition[36]);
- adjacentVertices[2]=&listOfVerticesP2[41]; //graphVertex(possibleposition[41]);
+ adjacentVertices[0]=&listOfVerticesP2[34];
+ adjacentVertices[1]=&listOfVerticesP2[36];
+ adjacentVertices[2]=&listOfVerticesP2[41];
}
else if(findpos(actuelposition,possibleposition[36])){
- adjacentVertices[0]=&listOfVerticesP2[28]; //graphVertex(possibleposition[28]);
- adjacentVertices[1]=&listOfVerticesP2[35]; //graphVertex(possibleposition[35]);
+ adjacentVertices[0]=&listOfVerticesP2[28];
+ adjacentVertices[1]=&listOfVerticesP2[35];
}
else if(findpos(actuelposition,possibleposition[37])){
- adjacentVertices[0]=&listOfVerticesP2[27]; //graphVertex(possibleposition[27]);
- adjacentVertices[1]=&listOfVerticesP2[38]; //graphVertex(possibleposition[38]);
+ adjacentVertices[0]=&listOfVerticesP2[27];
+ adjacentVertices[1]=&listOfVerticesP2[38];
}
else if(findpos(actuelposition,possibleposition[38])){
- adjacentVertices[0]=&listOfVerticesP2[9]; //graphVertex(possibleposition[9]);
- adjacentVertices[1]=&listOfVerticesP2[37]; //graphVertex(possibleposition[37]);
- adjacentVertices[2]=&listOfVerticesP2[39]; //graphVertex(possibleposition[39]);
+ adjacentVertices[0]=&listOfVerticesP2[9];
+ adjacentVertices[1]=&listOfVerticesP2[37];
+ adjacentVertices[2]=&listOfVerticesP2[39];
}
else if(findpos(actuelposition,possibleposition[39])){
- adjacentVertices[0]=&listOfVerticesP2[38]; //graphVertex(possibleposition[38]);
- adjacentVertices[1]=&listOfVerticesP2[40]; //graphVertex(possibleposition[40]);
- adjacentVertices[2]=&listOfVerticesP2[45]; //graphVertex(possibleposition[45]);
+ adjacentVertices[0]=&listOfVerticesP2[38];
+ adjacentVertices[1]=&listOfVerticesP2[40];
+ adjacentVertices[2]=&listOfVerticesP2[45];
}
else if(findpos(actuelposition,possibleposition[40])){
- adjacentVertices[0]=&listOfVerticesP2[39]; //graphVertex(possibleposition[39]);
- adjacentVertices[1]=&listOfVerticesP2[41]; //graphVertex(possibleposition[41]);
+ adjacentVertices[0]=&listOfVerticesP2[39];
+ adjacentVertices[1]=&listOfVerticesP2[41];
}
else if(findpos(actuelposition,possibleposition[41])){
- adjacentVertices[0]=&listOfVerticesP2[35]; //graphVertex(possibleposition[35]);
- adjacentVertices[1]=&listOfVerticesP2[43]; //graphVertex(possibleposition[43]);
- adjacentVertices[2]=&listOfVerticesP2[40]; //error meuh
+ adjacentVertices[0]=&listOfVerticesP2[35];
+ adjacentVertices[1]=&listOfVerticesP2[43];
+ adjacentVertices[2]=&listOfVerticesP2[40];
}
else if(findpos(actuelposition,possibleposition[42])){
- adjacentVertices[0]=&listOfVerticesP2[34]; //graphVertex(possibleposition[34]);
- adjacentVertices[1]=&listOfVerticesP2[43]; //graphVertex(possibleposition[43]);
- adjacentVertices[2]=&listOfVerticesP2[54]; //graphVertex(possibleposition[54]);
+ adjacentVertices[0]=&listOfVerticesP2[34];
+ adjacentVertices[1]=&listOfVerticesP2[43];
+ adjacentVertices[2]=&listOfVerticesP2[54];
}
else if(findpos(actuelposition,possibleposition[43])){
- adjacentVertices[0]=&listOfVerticesP2[41]; //graphVertex(possibleposition[41]);
- adjacentVertices[1]=&listOfVerticesP2[46]; //graphVertex(possibleposition[46]);
- adjacentVertices[2]=&listOfVerticesP2[42]; //error meuh
+ adjacentVertices[0]=&listOfVerticesP2[41];
+ adjacentVertices[1]=&listOfVerticesP2[46];
+ adjacentVertices[2]=&listOfVerticesP2[42];
}
else if(findpos(actuelposition,possibleposition[44])){
- adjacentVertices[0]=&listOfVerticesP2[40]; //graphVertex(possibleposition[40]);
- adjacentVertices[1]=&listOfVerticesP2[66]; //graphVertex(possibleposition[66]);
+ adjacentVertices[0]=&listOfVerticesP2[40];
+ adjacentVertices[1]=&listOfVerticesP2[66];
}
else if(findpos(actuelposition,possibleposition[45])){
- adjacentVertices[0]=&listOfVerticesP2[10]; //graphVertex(possibleposition[10]);
- adjacentVertices[1]=&listOfVerticesP2[39]; //graphVertex(possibleposition[39]);
- adjacentVertices[2]=&listOfVerticesP2[49]; //graphVertex(possibleposition[49]);
+ adjacentVertices[0]=&listOfVerticesP2[10];
+ adjacentVertices[1]=&listOfVerticesP2[39];
+ adjacentVertices[2]=&listOfVerticesP2[49];
}
else if(findpos(actuelposition,possibleposition[46])){
- adjacentVertices[0]=&listOfVerticesP2[43]; //graphVertex(possibleposition[43]);
- adjacentVertices[1]=&listOfVerticesP2[47]; //graphVertex(possibleposition[47]);
+ adjacentVertices[0]=&listOfVerticesP2[43];
+ adjacentVertices[1]=&listOfVerticesP2[47];
}
else if(findpos(actuelposition,possibleposition[47])){
- adjacentVertices[0]=&listOfVerticesP2[46]; //graphVertex(possibleposition[46]);
- adjacentVertices[1]=&listOfVerticesP2[52]; //graphVertex(possibleposition[52]);
- adjacentVertices[2]=&listOfVerticesP2[66]; //graphVertex(possibleposition[66]);
+ adjacentVertices[0]=&listOfVerticesP2[46];
+ adjacentVertices[1]=&listOfVerticesP2[52];
+ adjacentVertices[2]=&listOfVerticesP2[66];
}
else if(findpos(actuelposition,possibleposition[48])){
- adjacentVertices[0]=&listOfVerticesP2[49]; //graphVertex(possibleposition[49]);
- adjacentVertices[1]=&listOfVerticesP2[51]; //graphVertex(possibleposition[51]);
- adjacentVertices[2]=&listOfVerticesP2[66]; //graphVertex(possibleposition[66]);
+ adjacentVertices[0]=&listOfVerticesP2[49];
+ adjacentVertices[1]=&listOfVerticesP2[51];
+ adjacentVertices[2]=&listOfVerticesP2[66];
}
else if(findpos(actuelposition,possibleposition[49])){
- adjacentVertices[0]=&listOfVerticesP2[45]; //graphVertex(possibleposition[45]);
- adjacentVertices[1]=&listOfVerticesP2[48]; //graphVertex(possibleposition[48]);
+ adjacentVertices[0]=&listOfVerticesP2[45];
+ adjacentVertices[1]=&listOfVerticesP2[48];
}
else if(findpos(actuelposition,possibleposition[50])){
- adjacentVertices[0]=&listOfVerticesP2[51]; //graphVertex(possibleposition[51]);
- adjacentVertices[1]=&listOfVerticesP2[61]; //graphVertex(possibleposition[61]);
+ adjacentVertices[0]=&listOfVerticesP2[51];
+ adjacentVertices[1]=&listOfVerticesP2[61];
}
else if(findpos(actuelposition,possibleposition[51])){
- adjacentVertices[0]=&listOfVerticesP2[48]; //graphVertex(possibleposition[48]);
- adjacentVertices[1]=&listOfVerticesP2[50]; //graphVertex(possibleposition[50]);
+ adjacentVertices[0]=&listOfVerticesP2[48];
+ adjacentVertices[1]=&listOfVerticesP2[50];
}
else if(findpos(actuelposition,possibleposition[52])){
- adjacentVertices[0]=&listOfVerticesP2[47]; //graphVertex(possibleposition[47]);
- adjacentVertices[1]=&listOfVerticesP2[53]; //graphVertex(possibleposition[53]);
+ adjacentVertices[0]=&listOfVerticesP2[47];
+ adjacentVertices[1]=&listOfVerticesP2[53];
}
else if(findpos(actuelposition,possibleposition[53])){
- adjacentVertices[0]=&listOfVerticesP2[52]; //graphVertex(possibleposition[52]);
- adjacentVertices[1]=&listOfVerticesP2[58]; //graphVertex(possibleposition[58]);
+ adjacentVertices[0]=&listOfVerticesP2[52];
+ adjacentVertices[1]=&listOfVerticesP2[58];
}
else if(findpos(actuelposition,possibleposition[54])){
- adjacentVertices[0]=&listOfVerticesP2[42]; //graphVertex(possibleposition[42]);
- adjacentVertices[1]=&listOfVerticesP2[55]; //graphVertex(possibleposition[55]);
- adjacentVertices[2]=&listOfVerticesP2[57]; //graphVertex(possibleposition[57]);
+ adjacentVertices[0]=&listOfVerticesP2[42];
+ adjacentVertices[1]=&listOfVerticesP2[55];
+ adjacentVertices[2]=&listOfVerticesP2[57];
}
else if(findpos(actuelposition,possibleposition[55])){
- adjacentVertices[0]=&listOfVerticesP2[54]; //graphVertex(possibleposition[54]);
- adjacentVertices[1]=&listOfVerticesP2[56]; //graphVertex(possibleposition[56]);
+ adjacentVertices[0]=&listOfVerticesP2[54];
+ adjacentVertices[1]=&listOfVerticesP2[56];
}
else if(findpos(actuelposition,possibleposition[56])){
- adjacentVertices[0]=&listOfVerticesP2[55]; //graphVertex(possibleposition[55]);
- adjacentVertices[1]=&listOfVerticesP2[57]; //graphVertex(possibleposition[57]);
- adjacentVertices[2]=&listOfVerticesP2[65]; //graphVertex(possibleposition[65]);
+ adjacentVertices[0]=&listOfVerticesP2[55];
+ adjacentVertices[1]=&listOfVerticesP2[57];
+ adjacentVertices[2]=&listOfVerticesP2[65];
}
else if(findpos(actuelposition,possibleposition[57])){
- adjacentVertices[0]=&listOfVerticesP2[54]; //graphVertex(possibleposition[54]);
- adjacentVertices[1]=&listOfVerticesP2[56]; //graphVertex(possibleposition[56]);
- adjacentVertices[2]=&listOfVerticesP2[58]; //graphVertex(possibleposition[58]);
- adjacentVertices[3]=&listOfVerticesP2[64]; //graphVertex(possibleposition[64]);
+ adjacentVertices[0]=&listOfVerticesP2[54];
+ adjacentVertices[1]=&listOfVerticesP2[56];
+ adjacentVertices[2]=&listOfVerticesP2[58];
+ adjacentVertices[3]=&listOfVerticesP2[64];
}
else if(findpos(actuelposition,possibleposition[58])){
- adjacentVertices[0]=&listOfVerticesP2[53]; //graphVertex(possibleposition[53]);
- adjacentVertices[1]=&listOfVerticesP2[57]; //graphVertex(possibleposition[57]);
- adjacentVertices[2]=&listOfVerticesP2[59]; //graphVertex(possibleposition[59]);
+ adjacentVertices[0]=&listOfVerticesP2[53];
+ adjacentVertices[1]=&listOfVerticesP2[57];
+ adjacentVertices[2]=&listOfVerticesP2[59];
}
else if(findpos(actuelposition,possibleposition[59])){
- adjacentVertices[0]=&listOfVerticesP2[58]; //graphVertex(possibleposition[58]);
- adjacentVertices[1]=&listOfVerticesP2[60]; //graphVertex(possibleposition[59]);
- adjacentVertices[2]=&listOfVerticesP2[63]; //graphVertex(possibleposition[63]);
+ adjacentVertices[0]=&listOfVerticesP2[58];
+ adjacentVertices[1]=&listOfVerticesP2[60];
+ adjacentVertices[2]=&listOfVerticesP2[63];
}
else if(findpos(actuelposition,possibleposition[60])){
- adjacentVertices[0]=&listOfVerticesP2[59]; //graphVertex(possibleposition[59]);
- adjacentVertices[1]=&listOfVerticesP2[61]; //graphVertex(possibleposition[61]);
- adjacentVertices[2]=&listOfVerticesP2[62]; //graphVertex(possibleposition[62]);
+ adjacentVertices[0]=&listOfVerticesP2[59];
+ adjacentVertices[1]=&listOfVerticesP2[61];
+ adjacentVertices[2]=&listOfVerticesP2[62];
}
else if(findpos(actuelposition,possibleposition[61])){
- adjacentVertices[0]=&listOfVerticesP2[13]; //graphVertex(possibleposition[13]);
- adjacentVertices[1]=&listOfVerticesP2[50]; //graphVertex(possibleposition[50]);
- adjacentVertices[2]=&listOfVerticesP2[60]; //graphVertex(possibleposition[60]);
+ adjacentVertices[0]=&listOfVerticesP2[13];
+ adjacentVertices[1]=&listOfVerticesP2[50];
+ adjacentVertices[2]=&listOfVerticesP2[60];
}
else if(findpos(actuelposition,possibleposition[62])){
- adjacentVertices[0]=&listOfVerticesP2[16]; //graphVertex(possibleposition[16]);
- adjacentVertices[1]=&listOfVerticesP2[60]; //graphVertex(possibleposition[60]);
+ adjacentVertices[0]=&listOfVerticesP2[16];
+ adjacentVertices[1]=&listOfVerticesP2[60];
}
else if(findpos(actuelposition,possibleposition[63])){
- adjacentVertices[0]=&listOfVerticesP2[59]; //graphVertex(possibleposition[59]);
- adjacentVertices[1]=&listOfVerticesP2[64]; //graphVertex(possibleposition[64]);
+ adjacentVertices[0]=&listOfVerticesP2[59];
+ adjacentVertices[1]=&listOfVerticesP2[64];
}
else if(findpos(actuelposition,possibleposition[64])){
- adjacentVertices[0]=&listOfVerticesP2[57]; //graphVertex(possibleposition[57]);
- adjacentVertices[1]=&listOfVerticesP2[63]; //graphVertex(possibleposition[63]);
- adjacentVertices[2]=&listOfVerticesP2[65]; //graphVertex(possibleposition[65]);
+ adjacentVertices[0]=&listOfVerticesP2[57];
+ adjacentVertices[1]=&listOfVerticesP2[63];
+ adjacentVertices[2]=&listOfVerticesP2[65];
}
else if(findpos(actuelposition,possibleposition[65])){
- adjacentVertices[0]=&listOfVerticesP2[56]; //graphVertex(possibleposition[56]);
- adjacentVertices[1]=&listOfVerticesP2[64]; //graphVertex(possibleposition[64]);
+ adjacentVertices[0]=&listOfVerticesP2[56];
+ adjacentVertices[1]=&listOfVerticesP2[64];
}
else if(findpos(actuelposition,possibleposition[66])){
- adjacentVertices[0]=&listOfVerticesP2[47]; //graphVertex(possibleposition[47]);
- adjacentVertices[1]=&listOfVerticesP2[48]; //graphVertex(possibleposition[48]);
+ adjacentVertices[0]=&listOfVerticesP2[47];
+ adjacentVertices[1]=&listOfVerticesP2[48];
}
}
- //functions taken from PacmanPink
- ///////////////////////
-
-
-
-
Vector3 PacmanGhost::frontPosition(){
+ //Should return the Vector3 point in front of the player.
Vector3 neighborPos[4] = {Vector3(-1,-1,-1)};
Vector3 frontPoint = Vector3(0,-1,0);
@@ -776,7 +758,6 @@
return this->lastPlayerPassedPoint;
}
else{
- //std::cout<<frontPoint<<endl;
return frontPoint;
}
}
@@ -787,317 +768,318 @@
void PacmanGhost::findNeighboorPositions(Vector3 actuelposition, Vector3 adjacentPositions[], Vector3 positionArray[]){
- //this function should put in adjacentPosition[] the neighboors of lastPlayerPastPoint
+ //this function should put in adjacentPositions[] the neighboors of actuelposition.
+ // positionArray[] contains all possible positions of the map.
if(findpos(actuelposition,possibleposition[0])){
- adjacentPositions[0]=positionArray[1]; //graphVertex(possibleposition[1]); //need to do it everywhere !!!
- adjacentPositions[1]=positionArray[17]; //graphVertex(possibleposition[17]);
- adjacentPositions[2]=positionArray[19]; //graphVertex(possibleposition[19]); //maybe a vector would be more suitable ?
+ adjacentPositions[0]=positionArray[1];
+ adjacentPositions[1]=positionArray[17];
+ adjacentPositions[2]=positionArray[19];
}
else if(findpos(actuelposition,possibleposition[1])){
- adjacentPositions[0]=positionArray[0]; //graphVertex(possibleposition[0]);
- adjacentPositions[1]=positionArray[2]; //graphVertex(possibleposition[2]);
+ adjacentPositions[0]=positionArray[0];
+ adjacentPositions[1]=positionArray[2];
}
else if(findpos(actuelposition,possibleposition[2])){
- adjacentPositions[0]=positionArray[1]; //graphVertex(possibleposition[1]);
- adjacentPositions[1]=positionArray[3]; //graphVertex(possibleposition[3]);
+ adjacentPositions[0]=positionArray[1];
+ adjacentPositions[1]=positionArray[3];
}
else if(findpos(actuelposition,possibleposition[3])){
- adjacentPositions[0]=positionArray[2]; //graphVertex(possibleposition[2]);
- adjacentPositions[1]=positionArray[4]; //graphVertex(possibleposition[4]);
- adjacentPositions[2]=positionArray[5]; //graphVertex(possibleposition[5]);
+ adjacentPositions[0]=positionArray[2];
+ adjacentPositions[1]=positionArray[4];
+ adjacentPositions[2]=positionArray[5];
}
else if(findpos(actuelposition,possibleposition[4])){
- adjacentPositions[0]=positionArray[3]; //graphVertex(possibleposition[3]);
- adjacentPositions[1]=positionArray[6]; //graphVertex(possibleposition[6]);
+ adjacentPositions[0]=positionArray[3];
+ adjacentPositions[1]=positionArray[6];
}
else if(findpos(actuelposition,possibleposition[5])){
- adjacentPositions[0]=positionArray[3]; //graphVertex(possibleposition[3]);
- adjacentPositions[1]=positionArray[7]; //graphVertex(possibleposition[7]);
+ adjacentPositions[0]=positionArray[3];
+ adjacentPositions[1]=positionArray[7];
}
else if(findpos(actuelposition,possibleposition[6])){
- adjacentPositions[0]=positionArray[4]; //graphVertex(possibleposition[4]);
- adjacentPositions[1]=positionArray[9]; //graphVertex(possibleposition[9]);
- adjacentPositions[2]=positionArray[26]; //graphVertex(possibleposition[26]);
+ adjacentPositions[0]=positionArray[4]; ;
+ adjacentPositions[1]=positionArray[9];
+ adjacentPositions[2]=positionArray[26];
}
else if(findpos(actuelposition,possibleposition[7])){
- adjacentPositions[0]=positionArray[5]; //graphVertex(possibleposition[5]);
- adjacentPositions[1]=positionArray[8]; //graphVertex(possibleposition[8]);
+ adjacentPositions[0]=positionArray[5];
+ adjacentPositions[1]=positionArray[8];
}
else if(findpos(actuelposition,possibleposition[8])){
- adjacentPositions[0]=positionArray[7]; //graphVertex(possibleposition[7]);
- adjacentPositions[1]=positionArray[9]; //graphVertex(possibleposition[9]);
+ adjacentPositions[0]=positionArray[7];
+ adjacentPositions[1]=positionArray[9];
}
else if(findpos(actuelposition,possibleposition[9])){
- adjacentPositions[0]=positionArray[6]; //graphVertex(possibleposition[6]);
- adjacentPositions[1]=positionArray[8]; //graphVertex(possibleposition[8]);
- adjacentPositions[2]=positionArray[10]; //graphVertex(possibleposition[10]);
- adjacentPositions[3]=positionArray[38]; //graphVertex(possibleposition[38]);
+ adjacentPositions[0]=positionArray[6];
+ adjacentPositions[1]=positionArray[8];
+ adjacentPositions[2]=positionArray[10];
+ adjacentPositions[3]=positionArray[38];
}
else if(findpos(actuelposition,possibleposition[10])){
- adjacentPositions[0]=positionArray[9]; //graphVertex(possibleposition[9]);
- adjacentPositions[1]=positionArray[11]; //graphVertex(possibleposition[11]);
- adjacentPositions[2]=positionArray[45]; //graphVertex(possibleposition[45]);
+ adjacentPositions[0]=positionArray[9];
+ adjacentPositions[1]=positionArray[11];
+ adjacentPositions[2]=positionArray[45];
}
else if(findpos(actuelposition,possibleposition[11])){
- adjacentPositions[0]=positionArray[10]; //graphVertex(possibleposition[10]);
- adjacentPositions[1]=positionArray[12]; //graphVertex(possibleposition[12]);
- adjacentPositions[2]=positionArray[13]; //graphVertex(possibleposition[13]);
+ adjacentPositions[0]=positionArray[10];
+ adjacentPositions[1]=positionArray[12];
+ adjacentPositions[2]=positionArray[13];
}
else if(findpos(actuelposition,possibleposition[12])){
- adjacentPositions[0]=positionArray[11]; //graphVertex(possibleposition[11]);
- adjacentPositions[1]=positionArray[14]; //graphVertex(possibleposition[14]);
+ adjacentPositions[0]=positionArray[11];
+ adjacentPositions[1]=positionArray[14];
}
else if(findpos(actuelposition,possibleposition[13])){
- adjacentPositions[0]=positionArray[11]; //graphVertex(possibleposition[11]);
- adjacentPositions[1]=positionArray[14]; //graphVertex(possibleposition[14]);
- adjacentPositions[2]=positionArray[16]; //graphVertex(possibleposition[16]);
- adjacentPositions[3]=positionArray[61]; //graphVertex(possibleposition[61]);
+ adjacentPositions[0]=positionArray[11];
+ adjacentPositions[1]=positionArray[14];
+ adjacentPositions[2]=positionArray[16];
+ adjacentPositions[3]=positionArray[61];
}
else if(findpos(actuelposition,possibleposition[14])){
- adjacentPositions[0]=positionArray[12]; //graphVertex(possibleposition[12]);
- adjacentPositions[1]=positionArray[13]; //graphVertex(possibleposition[13]);
- adjacentPositions[2]=positionArray[15]; //graphVertex(possibleposition[15]);
+ adjacentPositions[0]=positionArray[12];
+ adjacentPositions[1]=positionArray[13];
+ adjacentPositions[2]=positionArray[15];
}
else if(findpos(actuelposition,possibleposition[15])){
- adjacentPositions[0]=positionArray[14]; //graphVertex(possibleposition[14]);
- adjacentPositions[1]=positionArray[16]; //graphVertex(possibleposition[16]);
+ adjacentPositions[0]=positionArray[14];
+ adjacentPositions[1]=positionArray[16];
}
else if(findpos(actuelposition,possibleposition[16])){
- adjacentPositions[0]=positionArray[13]; //graphVertex(possibleposition[13]);
- adjacentPositions[1]=positionArray[15]; //graphVertex(possibleposition[15]);
- adjacentPositions[2]=positionArray[62]; //graphVertex(possibleposition[62]);
+ adjacentPositions[0]=positionArray[13];
+ adjacentPositions[1]=positionArray[15];
+ adjacentPositions[2]=positionArray[62];
}
else if(findpos(actuelposition,possibleposition[17])){
- adjacentPositions[0]=positionArray[0]; //graphVertex(possibleposition[0]);
- adjacentPositions[1]=positionArray[25]; //graphVertex(possibleposition[25]);
+ adjacentPositions[0]=positionArray[0];
+ adjacentPositions[1]=positionArray[25];
}
else if(findpos(actuelposition,possibleposition[18])){
- adjacentPositions[0]=positionArray[19]; //graphVertex(possibleposition[19]);
- adjacentPositions[1]=positionArray[24]; //graphVertex(possibleposition[24]);
+ adjacentPositions[0]=positionArray[19];
+ adjacentPositions[1]=positionArray[24];
}
else if(findpos(actuelposition,possibleposition[19])){
- adjacentPositions[0]=positionArray[0]; //graphVertex(possibleposition[0]);
- adjacentPositions[1]=positionArray[18]; //graphVertex(possibleposition[18]);
- adjacentPositions[2]=positionArray[20]; //graphVertex(possibleposition[20]);
+ adjacentPositions[0]=positionArray[0];
+ adjacentPositions[1]=positionArray[18];
+ adjacentPositions[2]=positionArray[20];
}
else if(findpos(actuelposition,possibleposition[20])){
- adjacentPositions[0]=positionArray[19]; //graphVertex(possibleposition[19]);
- adjacentPositions[1]=positionArray[21]; //graphVertex(possibleposition[21]);
+ adjacentPositions[0]=positionArray[19];
+ adjacentPositions[1]=positionArray[21];
}
else if(findpos(actuelposition,possibleposition[21])){
- adjacentPositions[0]=positionArray[20]; //graphVertex(possibleposition[20]);
- adjacentPositions[1]=positionArray[22]; //graphVertex(possibleposition[22]);
+ adjacentPositions[0]=positionArray[20];
+ adjacentPositions[1]=positionArray[22];
}
else if(findpos(actuelposition,possibleposition[22])){
- adjacentPositions[0]=positionArray[21]; //graphVertex(possibleposition[21]);
- adjacentPositions[1]=positionArray[23]; //graphVertex(possibleposition[23]);
- adjacentPositions[2]=positionArray[31]; //graphVertex(possibleposition[31]);
+ adjacentPositions[0]=positionArray[21];
+ adjacentPositions[1]=positionArray[23];
+ adjacentPositions[2]=positionArray[31];
}
else if(findpos(actuelposition,possibleposition[23])){
- adjacentPositions[0]=positionArray[22]; //graphVertex(possibleposition[22]);
- adjacentPositions[1]=positionArray[30]; //graphVertex(possibleposition[30]);
+ adjacentPositions[0]=positionArray[22];
+ adjacentPositions[1]=positionArray[30];
}
else if(findpos(actuelposition,possibleposition[24])){
- adjacentPositions[0]=positionArray[18]; //graphVertex(possibleposition[18]);
- adjacentPositions[1]=positionArray[29]; //graphVertex(possibleposition[29]);
+ adjacentPositions[0]=positionArray[18];
+ adjacentPositions[1]=positionArray[29];
}
else if(findpos(actuelposition,possibleposition[25])){
- adjacentPositions[0]=positionArray[17]; //graphVertex(possibleposition[17]);
- adjacentPositions[1]=positionArray[26]; //graphVertex(possibleposition[26]);
+ adjacentPositions[0]=positionArray[17];
+ adjacentPositions[1]=positionArray[26];
}
else if(findpos(actuelposition,possibleposition[26])){
- adjacentPositions[0]=positionArray[6]; //graphVertex(possibleposition[6]);
- adjacentPositions[1]=positionArray[25]; //graphVertex(possibleposition[25]);
- adjacentPositions[2]=positionArray[27]; //graphVertex(possibleposition[27]);
+ adjacentPositions[0]=positionArray[6];
+ adjacentPositions[1]=positionArray[25];
+ adjacentPositions[2]=positionArray[27];
}
else if(findpos(actuelposition,possibleposition[27])){
- adjacentPositions[0]=positionArray[26]; //graphVertex(possibleposition[26]);
- adjacentPositions[1]=positionArray[28]; //graphVertex(possibleposition[28]);
- adjacentPositions[2]=positionArray[37]; //graphVertex(possibleposition[37]);
+ adjacentPositions[0]=positionArray[26];
+ adjacentPositions[1]=positionArray[28];
+ adjacentPositions[2]=positionArray[37];
}
else if(findpos(actuelposition,possibleposition[28])){
- adjacentPositions[0]=positionArray[27]; //graphVertex(possibleposition[27]);
- adjacentPositions[1]=positionArray[29]; //graphVertex(possibleposition[29]);
- adjacentPositions[2]=positionArray[36]; //graphVertex(possibleposition[36]);
+ adjacentPositions[0]=positionArray[27];
+ adjacentPositions[1]=positionArray[29];
+ adjacentPositions[2]=positionArray[36];
}
else if(findpos(actuelposition,possibleposition[29])){
- adjacentPositions[0]=positionArray[24]; //graphVertex(possibleposition[24]);
- adjacentPositions[1]=positionArray[28]; //graphVertex(possibleposition[28]);
- adjacentPositions[2]=positionArray[30]; //graphVertex(possibleposition[30]);
+ adjacentPositions[0]=positionArray[24];
+ adjacentPositions[1]=positionArray[28];
+ adjacentPositions[2]=positionArray[30];
}
else if(findpos(actuelposition,possibleposition[30])){
- adjacentPositions[0]=positionArray[23]; //graphVertex(possibleposition[23]);
- adjacentPositions[1]=positionArray[29]; //graphVertex(possibleposition[29]);
- adjacentPositions[2]=positionArray[34]; //graphVertex(possibleposition[34]);
+ adjacentPositions[0]=positionArray[23];
+ adjacentPositions[1]=positionArray[29];
+ adjacentPositions[2]=positionArray[34];
}
else if(findpos(actuelposition,possibleposition[31])){
- adjacentPositions[0]=positionArray[22]; //graphVertex(possibleposition[22]);
- adjacentPositions[1]=positionArray[32]; //graphVertex(possibleposition[32]);
+ adjacentPositions[0]=positionArray[22];
+ adjacentPositions[1]=positionArray[32];
}
else if(findpos(actuelposition,possibleposition[32])){
- adjacentPositions[0]=positionArray[31]; //graphVertex(possibleposition[31]);
- adjacentPositions[1]=positionArray[33]; //graphVertex(possibleposition[33]);
+ adjacentPositions[0]=positionArray[31];
+ adjacentPositions[1]=positionArray[33];
}
else if(findpos(actuelposition,possibleposition[33])){
- adjacentPositions[0]=positionArray[32]; //graphVertex(possibleposition[32]);
- adjacentPositions[1]=positionArray[34]; //graphVertex(possibleposition[34]);
+ adjacentPositions[0]=positionArray[32];
+ adjacentPositions[1]=positionArray[34];
}
else if(findpos(actuelposition,possibleposition[34])){
- adjacentPositions[0]=positionArray[30]; //graphVertex(possibleposition[30]);
- adjacentPositions[1]=positionArray[33]; //graphVertex(possibleposition[33]);
- adjacentPositions[2]=positionArray[35]; //graphVertex(possibleposition[35]);
- adjacentPositions[3]=positionArray[42]; //graphVertex(possibleposition[42]);
+ adjacentPositions[0]=positionArray[30];
+ adjacentPositions[1]=positionArray[33];
+ adjacentPositions[2]=positionArray[35];
+ adjacentPositions[3]=positionArray[42];
}
else if(findpos(actuelposition,possibleposition[35])){
- adjacentPositions[0]=positionArray[34]; //graphVertex(possibleposition[34]);
- adjacentPositions[1]=positionArray[36]; //graphVertex(possibleposition[36]);
- adjacentPositions[2]=positionArray[41]; //graphVertex(possibleposition[41]);
+ adjacentPositions[0]=positionArray[34];
+ adjacentPositions[1]=positionArray[36];
+ adjacentPositions[2]=positionArray[41];
}
else if(findpos(actuelposition,possibleposition[36])){
- adjacentPositions[0]=positionArray[28]; //graphVertex(possibleposition[28]);
- adjacentPositions[1]=positionArray[35]; //graphVertex(possibleposition[35]);
+ adjacentPositions[0]=positionArray[28];
+ adjacentPositions[1]=positionArray[35];
}
else if(findpos(actuelposition,possibleposition[37])){
- adjacentPositions[0]=positionArray[27]; //graphVertex(possibleposition[27]);
- adjacentPositions[1]=positionArray[38]; //graphVertex(possibleposition[38]);
+ adjacentPositions[0]=positionArray[27];
+ adjacentPositions[1]=positionArray[38];
}
else if(findpos(actuelposition,possibleposition[38])){
- adjacentPositions[0]=positionArray[9]; //graphVertex(possibleposition[9]);
- adjacentPositions[1]=positionArray[37]; //graphVertex(possibleposition[37]);
- adjacentPositions[2]=positionArray[39]; //graphVertex(possibleposition[39]);
+ adjacentPositions[0]=positionArray[9];
+ adjacentPositions[1]=positionArray[37];
+ adjacentPositions[2]=positionArray[39];
}
else if(findpos(actuelposition,possibleposition[39])){
- adjacentPositions[0]=positionArray[38]; //graphVertex(possibleposition[38]);
- adjacentPositions[1]=positionArray[40]; //graphVertex(possibleposition[40]);
- adjacentPositions[2]=positionArray[45]; //graphVertex(possibleposition[45]);
+ adjacentPositions[0]=positionArray[38];
+ adjacentPositions[1]=positionArray[40];
+ adjacentPositions[2]=positionArray[45];
}
else if(findpos(actuelposition,possibleposition[40])){
- adjacentPositions[0]=positionArray[39]; //graphVertex(possibleposition[39]);
- adjacentPositions[1]=positionArray[41]; //graphVertex(possibleposition[41]);
+ adjacentPositions[0]=positionArray[39];
+ adjacentPositions[1]=positionArray[41];
}
else if(findpos(actuelposition,possibleposition[41])){
- adjacentPositions[0]=positionArray[35]; //graphVertex(possibleposition[35]);
- adjacentPositions[1]=positionArray[43]; //graphVertex(possibleposition[43]);
- adjacentPositions[2]=positionArray[40]; //error
+ adjacentPositions[0]=positionArray[35];
+ adjacentPositions[1]=positionArray[43];
+ adjacentPositions[2]=positionArray[40];
}
else if(findpos(actuelposition,possibleposition[42])){
- adjacentPositions[0]=positionArray[34]; //graphVertex(possibleposition[34]);
- adjacentPositions[1]=positionArray[43]; //graphVertex(possibleposition[43]);
- adjacentPositions[2]=positionArray[54]; //graphVertex(possibleposition[54]);
+ adjacentPositions[0]=positionArray[34];
+ adjacentPositions[1]=positionArray[43];
+ adjacentPositions[2]=positionArray[54];
}
else if(findpos(actuelposition,possibleposition[43])){
- adjacentPositions[0]=positionArray[41]; //graphVertex(possibleposition[41]);
- adjacentPositions[1]=positionArray[46]; //graphVertex(possibleposition[46]);
- adjacentPositions[2]=positionArray[42]; //error
+ adjacentPositions[0]=positionArray[41];
+ adjacentPositions[1]=positionArray[46];
+ adjacentPositions[2]=positionArray[42];
}
else if(findpos(actuelposition,possibleposition[44])){
- adjacentPositions[0]=positionArray[40]; //graphVertex(possibleposition[40]);
- adjacentPositions[1]=positionArray[66]; //graphVertex(possibleposition[66]);
+ adjacentPositions[0]=positionArray[40];
+ adjacentPositions[1]=positionArray[66];
}
else if(findpos(actuelposition,possibleposition[45])){
- adjacentPositions[0]=positionArray[10]; //graphVertex(possibleposition[10]);
- adjacentPositions[1]=positionArray[39]; //graphVertex(possibleposition[39]);
- adjacentPositions[2]=positionArray[49]; //graphVertex(possibleposition[49]);
+ adjacentPositions[0]=positionArray[10];
+ adjacentPositions[1]=positionArray[39];
+ adjacentPositions[2]=positionArray[49];
}
else if(findpos(actuelposition,possibleposition[46])){
- adjacentPositions[0]=positionArray[43]; //graphVertex(possibleposition[43]);
- adjacentPositions[1]=positionArray[47]; //graphVertex(possibleposition[47]);
+ adjacentPositions[0]=positionArray[43];
+ adjacentPositions[1]=positionArray[47];
}
else if(findpos(actuelposition,possibleposition[47])){
- adjacentPositions[0]=positionArray[46]; //graphVertex(possibleposition[46]);
- adjacentPositions[1]=positionArray[52]; //graphVertex(possibleposition[52]);
- adjacentPositions[2]=positionArray[66]; //graphVertex(possibleposition[66]);
+ adjacentPositions[0]=positionArray[46];
+ adjacentPositions[1]=positionArray[52];
+ adjacentPositions[2]=positionArray[66];
}
else if(findpos(actuelposition,possibleposition[48])){
- adjacentPositions[0]=positionArray[49]; //graphVertex(possibleposition[49]);
- adjacentPositions[1]=positionArray[51]; //graphVertex(possibleposition[51]);
- adjacentPositions[2]=positionArray[66]; //graphVertex(possibleposition[66]);
+ adjacentPositions[0]=positionArray[49];
+ adjacentPositions[1]=positionArray[51];
+ adjacentPositions[2]=positionArray[66];
}
else if(findpos(actuelposition,possibleposition[49])){
- adjacentPositions[0]=positionArray[45]; //graphVertex(possibleposition[45]);
- adjacentPositions[1]=positionArray[48]; //graphVertex(possibleposition[48]);
+ adjacentPositions[0]=positionArray[45];
+ adjacentPositions[1]=positionArray[48];
}
else if(findpos(actuelposition,possibleposition[50])){
- adjacentPositions[0]=positionArray[51]; //graphVertex(possibleposition[51]);
- adjacentPositions[1]=positionArray[61]; //graphVertex(possibleposition[61]);
+ adjacentPositions[0]=positionArray[51];
+ adjacentPositions[1]=positionArray[61];
}
else if(findpos(actuelposition,possibleposition[51])){
- adjacentPositions[0]=positionArray[48]; //graphVertex(possibleposition[48]);
- adjacentPositions[1]=positionArray[50]; //graphVertex(possibleposition[50]);
+ adjacentPositions[0]=positionArray[48];
+ adjacentPositions[1]=positionArray[50];
}
else if(findpos(actuelposition,possibleposition[52])){
- adjacentPositions[0]=positionArray[47]; //graphVertex(possibleposition[47]);
- adjacentPositions[1]=positionArray[53]; //graphVertex(possibleposition[53]);
+ adjacentPositions[0]=positionArray[47];
+ adjacentPositions[1]=positionArray[53];
}
else if(findpos(actuelposition,possibleposition[53])){
- adjacentPositions[0]=positionArray[52]; //graphVertex(possibleposition[52]);
- adjacentPositions[1]=positionArray[58]; //graphVertex(possibleposition[58]);
+ adjacentPositions[0]=positionArray[52];
+ adjacentPositions[1]=positionArray[58];
}
else if(findpos(actuelposition,possibleposition[54])){
- adjacentPositions[0]=positionArray[42]; //graphVertex(possibleposition[42]);
- adjacentPositions[1]=positionArray[55]; //graphVertex(possibleposition[55]);
- adjacentPositions[2]=positionArray[57]; //graphVertex(possibleposition[57]);
+ adjacentPositions[0]=positionArray[42];
+ adjacentPositions[1]=positionArray[55];
+ adjacentPositions[2]=positionArray[57];
}
else if(findpos(actuelposition,possibleposition[55])){
- adjacentPositions[0]=positionArray[54]; //graphVertex(possibleposition[54]);
- adjacentPositions[1]=positionArray[56]; //graphVertex(possibleposition[56]);
+ adjacentPositions[0]=positionArray[54];
+ adjacentPositions[1]=positionArray[56];
}
else if(findpos(actuelposition,possibleposition[56])){
- adjacentPositions[0]=positionArray[55]; //graphVertex(possibleposition[55]);
- adjacentPositions[1]=positionArray[57]; //graphVertex(possibleposition[57]);
- adjacentPositions[2]=positionArray[65]; //graphVertex(possibleposition[65]);
+ adjacentPositions[0]=positionArray[55];
+ adjacentPositions[1]=positionArray[57];
+ adjacentPositions[2]=positionArray[65];
}
else if(findpos(actuelposition,possibleposition[57])){
- adjacentPositions[0]=positionArray[54]; //graphVertex(possibleposition[54]);
- adjacentPositions[1]=positionArray[56]; //graphVertex(possibleposition[56]);
- adjacentPositions[2]=positionArray[58]; //graphVertex(possibleposition[58]);
- adjacentPositions[3]=positionArray[64]; //graphVertex(possibleposition[64]);
+ adjacentPositions[0]=positionArray[54];
+ adjacentPositions[1]=positionArray[56];
+ adjacentPositions[2]=positionArray[58];
+ adjacentPositions[3]=positionArray[64];
}
else if(findpos(actuelposition,possibleposition[58])){
- adjacentPositions[0]=positionArray[53]; //graphVertex(possibleposition[53]);
- adjacentPositions[1]=positionArray[57]; //graphVertex(possibleposition[57]);
- adjacentPositions[2]=positionArray[59]; //graphVertex(possibleposition[59]);
+ adjacentPositions[0]=positionArray[53];
+ adjacentPositions[1]=positionArray[57];
+ adjacentPositions[2]=positionArray[59];
}
else if(findpos(actuelposition,possibleposition[59])){
- adjacentPositions[0]=positionArray[58]; //graphVertex(possibleposition[58]);
- adjacentPositions[1]=positionArray[60]; //graphVertex(possibleposition[60]); //error 59
- adjacentPositions[2]=positionArray[63]; //graphVertex(possibleposition[63]);
+ adjacentPositions[0]=positionArray[58];
+ adjacentPositions[1]=positionArray[60];
+ adjacentPositions[2]=positionArray[63];
}
else if(findpos(actuelposition,possibleposition[60])){
- adjacentPositions[0]=positionArray[59]; //graphVertex(possibleposition[59]);
- adjacentPositions[1]=positionArray[61]; //graphVertex(possibleposition[61]);
- adjacentPositions[2]=positionArray[62]; //graphVertex(possibleposition[62]);
+ adjacentPositions[0]=positionArray[59];
+ adjacentPositions[1]=positionArray[61];
+ adjacentPositions[2]=positionArray[62];
}
else if(findpos(actuelposition,possibleposition[61])){
- adjacentPositions[0]=positionArray[13]; //graphVertex(possibleposition[13]);
- adjacentPositions[1]=positionArray[50]; //graphVertex(possibleposition[50]);
- adjacentPositions[2]=positionArray[60]; //graphVertex(possibleposition[60]);
+ adjacentPositions[0]=positionArray[13];
+ adjacentPositions[1]=positionArray[50];
+ adjacentPositions[2]=positionArray[60];
}
else if(findpos(actuelposition,possibleposition[62])){
- adjacentPositions[0]=positionArray[16]; //graphVertex(possibleposition[16]);
- adjacentPositions[1]=positionArray[60]; //graphVertex(possibleposition[60]);
+ adjacentPositions[0]=positionArray[16];
+ adjacentPositions[1]=positionArray[60];
}
else if(findpos(actuelposition,possibleposition[63])){
- adjacentPositions[0]=positionArray[59]; //graphVertex(possibleposition[59]);
- adjacentPositions[1]=positionArray[64]; //graphVertex(possibleposition[64]);
+ adjacentPositions[0]=positionArray[59];
+ adjacentPositions[1]=positionArray[64];
}
else if(findpos(actuelposition,possibleposition[64])){
- adjacentPositions[0]=positionArray[57]; //graphVertex(possibleposition[57]);
- adjacentPositions[1]=positionArray[63]; //graphVertex(possibleposition[63]);
- adjacentPositions[2]=positionArray[65]; //graphVertex(possibleposition[65]);
+ adjacentPositions[0]=positionArray[57];
+ adjacentPositions[1]=positionArray[63];
+ adjacentPositions[2]=positionArray[65];
}
else if(findpos(actuelposition,possibleposition[65])){
- adjacentPositions[0]=positionArray[56]; //graphVertex(possibleposition[56]);
- adjacentPositions[1]=positionArray[64]; //graphVertex(possibleposition[64]);
+ adjacentPositions[0]=positionArray[56];
+ adjacentPositions[1]=positionArray[64];
}
else if(findpos(actuelposition,possibleposition[66])){
- adjacentPositions[0]=positionArray[47]; //graphVertex(possibleposition[47]);
- adjacentPositions[1]=positionArray[48]; //graphVertex(possibleposition[48]);
+ adjacentPositions[0]=positionArray[47];
+ adjacentPositions[1]=positionArray[48];
}
}
Modified: code/branches/3DPacman_FS19/src/modules/pacman/PacmanGhost.h
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/PacmanGhost.h 2019-05-09 12:20:32 UTC (rev 12356)
+++ code/branches/3DPacman_FS19/src/modules/pacman/PacmanGhost.h 2019-05-09 12:54:22 UTC (rev 12357)
@@ -36,7 +36,6 @@
#include "worldentities/ControllableEntity.h"
#include "Pacman.h"
-//#include "GetShortestPathAlgorithm.h"
namespace orxonox {
@@ -63,8 +62,7 @@
virtual void changewith(PacmanGhost* otherghost);
virtual void levelupvelo();
-
- //bool findpos(Vector3 one, Vector3 other);
+
virtual void changemovability();
bool dontmove = false;
@@ -80,35 +78,20 @@
int target_z = 0;
bool lockmove = false;
- /*Vector3 getShortestPath(Vector3 start, Vector3 goal);
- Vector3 setPureArrayPos(Vector3 &posToSet);
+ Vector3 getPlayerPos();
- */Vector3 getPlayerPos();
-
Vector3 playerPos;
Vector3 lastPlayerPassedPoint;
Vector3 pointInFrontOfPlayer;
+
/*
-
-
- //Vector3 pathAlgorithm;
-
public: //HACK
-
*/
- /*struct graphVertex;
- void findNeighboorVertices(Vector3 actuelposition, graphVertex* adjacentVertices[], graphVertex listOfVerticesP2[]);
- void updateShortestDistanceToStart(graphVertex &vertex, graphVertex &neighboor);
- void findNearestNonVisitedNeighboor (graphVertex &vertex);
- int graphDistance(Vector3 start, Vector3 goal);
- graphVertex* findNextVertexToConsider(graphVertex listOfVerticesP[]);
- Vector3 getShortestPath(Vector3 start, Vector3 goal);*/
-
struct graphVertex;
void findNeighboorVertices(Vector3 actuelposition, graphVertex* adjacentVertices[], graphVertex listOfVerticesP2[]);
void updateShortestDistanceToStart(graphVertex &vertex, graphVertex &neighboor);
@@ -120,9 +103,6 @@
- //functions taken from PacmanPink
-
-
Vector3 getPointInFrontOfPacman(Vector3 pacLasVisPos,int indexForSWNE);
int findPlayerTravDir (Vector3 playerPosBefore, Vector3 playerPos);
Vector3 diffVector (Vector3 start, Vector3 goal);
Modified: code/branches/3DPacman_FS19/src/modules/pacman/PacmanPink.cc
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/PacmanPink.cc 2019-05-09 12:20:32 UTC (rev 12356)
+++ code/branches/3DPacman_FS19/src/modules/pacman/PacmanPink.cc 2019-05-09 12:54:22 UTC (rev 12357)
@@ -15,7 +15,7 @@
this->target_x=0;
this->target_z=15;
- this->lastPlayerPassedPoint=Vector3(0,0,0); //Vector3(70,10,-135);
+ this->lastPlayerPassedPoint=Vector3(0,0,0);
this->pointInFrontOfPlayer=Vector3(0,0,0);
}
@@ -33,11 +33,8 @@
void PacmanPink::tick(float dt)
{
SUPER(PacmanGhost, tick, dt);
-
this->actuelposition = this->getPosition();
- //std::cout<<this->actuelposition<<endl;
-
for(int u=0; u < 67; u++){//always check if player passed a point
if(jeanfindpos(this->getPlayerPos(), possibleposition[u])){
this->lastPlayerPassedPoint=possibleposition[u];
@@ -44,8 +41,7 @@
}
}
- this->pointInFrontOfPlayer=frontPosition(); //getPointInFrontOfPacman(lastPlayerPassedPoint, directionV);
-
+ this->pointInFrontOfPlayer=frontPosition();
Vector3 pinkPos=Vector3(this->target_x, 10, this->target_z);
//Stop, if target arrived
@@ -73,32 +69,18 @@
this->ismoving=false;
}
else if(this->pointInFrontOfPlayer==Vector3(0,0,0)){
- std::cout<<"arheeuuuu"<<endl;
Vector3 pinkPos=Vector3(this->target_x, 10, this->target_z);
-
setNewTargetGhost(getShortestPath(pinkPos, this->lastPlayerPassedPoint));
-
}
//Check on which position the ghost has arrived and set new target
else{
while(lockmove){};
lockmove = true;
-
- //this->pointInFrontOfPlayer=getPointInFrontOfPacman(lastPlayerPassedPoint, directionV);
-
nextMove(pinkPos, pointInFrontOfPlayer, lastPlayerPassedPoint);
-
-
lockmove=false;
-
}
-
-
-
-
-
}
@@ -107,36 +89,19 @@
Vector3 nextTarget;
- /*std::cout<<this->actuelposition<<endl;
- std::cout<<pinkPosP<<endl;
- std::cout<<playerPos<<endl;
- std::cout<<pointToAvoidP11<<endl;
- std::cout<<this->getPlayerPos()<<endl;*/
- std::cout<<playerPos<<endl;
- std::cout<<"kok"<<endl;
-
if(playerPos==pointToAvoidP11){ //SIGSEV if playerPos==pointToAvoidP11 otherwise
nextTarget = getShortestPath(pinkPosP, playerPos);
}
- /*else if(pinkPosP==pointToAvoidP11){
- nextTarget=getShortestPath(pinkPosP, playerPos);
- }*/
- else if((playerPos==Vector3(-70,10,-35))/*||(playerPos==Vector3(-20,10,-35))||(playerPos==Vector3(0,10,-35))*/){
- //nextTarget=pinkPosP;
+ else if(playerPos==Vector3(-70,10,-35)){
+
nextTarget=getShortestPath(pinkPosP, Vector3(-70,10,-35));
- std::cout<<"ChaillyVillage"<<endl;
+
}
- /*else if((playerPos==Vector3(-70,10,-35))&&(pinkPosP==Vector3(-70,10,60))/*||(playerPos==Vector3(-20,10,-35))||(playerPos==Vector3(0,10,-35))){
- //nextTarget=pinkPosP;
- nextTarget=getShortestPath(pinkPosP, Vector3(-70,10,-35));
- std::cout<<"ChaillyVillage"<<endl;
- }*/
- else{
- //bugs here
- std::cout<<pinkPosP<<endl;
+ else{
+
nextTarget = getShortestPath(pinkPosP, playerPos, pointToAvoidP11);
}
- std::cout<<nextTarget<<endl;
+
setNewTargetGhost(nextTarget);
}
Modified: code/branches/3DPacman_FS19/src/modules/pacman/PacmanPink.h
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/PacmanPink.h 2019-05-09 12:20:32 UTC (rev 12356)
+++ code/branches/3DPacman_FS19/src/modules/pacman/PacmanPink.h 2019-05-09 12:54:22 UTC (rev 12357)
@@ -3,7 +3,6 @@
#include "PacmanGhost.h"
-//#include "getShortestPath.h"
namespace orxonox {
@@ -17,16 +16,6 @@
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- //void setNewTargetPink(Vector3 goalToGo);
-
- //void nextMove(Vector3 playerPos, Vector3 redPos);
-
- //int findPlayerTravDir (Vector3 playerPosBefore, Vector3 playerPos);
-
- //Vector3 getPointInFrontOfPacman(Vector3 pacLasVisPos,int indexForSWNE);
-
- //Vector3 diffVector (Vector3 start, Vector3 goal);
-
Vector3 pinkPos;
void nextMove(Vector3 pinkPosP, Vector3 playerPos, Vector3 pointToAvoidP11=Vector3(0,0,0));
Modified: code/branches/3DPacman_FS19/src/modules/pacman/PacmanRandom.h
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/PacmanRandom.h 2019-05-09 12:20:32 UTC (rev 12356)
+++ code/branches/3DPacman_FS19/src/modules/pacman/PacmanRandom.h 2019-05-09 12:54:22 UTC (rev 12357)
@@ -6,6 +6,8 @@
namespace orxonox {
class _OrxonoxExport PacmanRandom : public PacmanGhost{
+ //This class is not used anymore in the game, given that all 4 Ghosts now have
+ //their own behavior. But it could maybe still be useful.
public:
PacmanRandom(Context* context);
Modified: code/branches/3DPacman_FS19/src/modules/pacman/PacmanRed.cc
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/PacmanRed.cc 2019-05-09 12:20:32 UTC (rev 12356)
+++ code/branches/3DPacman_FS19/src/modules/pacman/PacmanRed.cc 2019-05-09 12:54:22 UTC (rev 12357)
@@ -1,5 +1,4 @@
#include "PacmanRed.h"
-//#include "Pacman.h"
#include "core/CoreIncludes.h"
#include "BulletDynamics/Dynamics/btRigidBody.h"
@@ -15,7 +14,7 @@
RegisterObject(PacmanRed);
this->target_x=0;
this->target_z=15;
- this->lastPlayerPassedPoint=Vector3(0,0,0); //Vector3(70,10,-135);
+ this->lastPlayerPassedPoint=Vector3(0,0,0);
this->isNearPlayer=false;
}
@@ -30,43 +29,29 @@
SUPER(PacmanRed, XMLPort, xmlelement, mode);
}
- /*void PacmanRed::setPlayerPos(Vector3 _playerPos)
- {
- this->playerPos = _playerPos;
- }*/
-
-
void PacmanRed::tick(float dt)
{
- //std::cout<<"LemanExpress5"<<endl;
SUPER(PacmanGhost, tick, dt);
this->actuelposition = this->getPosition();
for(int u=0; u < 67; u++){//always check if player passed a point
- //if(possibleposition[u]!=Vector3(0,10,15)){
+
if(jeanfindpos(this->getPlayerPos(), possibleposition[u])){
- //if(!findpos(possibleposition[u],Vector3(0,10,15))){
+
this->lastPlayerPassedPoint=possibleposition[u];
- }
- //}
- //}
+ }
}
- std::cout<<this->lastPlayerPassedPoint<<endl;
- std::cout<<this->pointInFrontOfPlayer<<endl;
-
-
-
//Stop, if target arrived
if((abs(this->actuelposition.x - this->target_x)<0.5) && (abs(this->actuelposition.z - this->target_z)<0.5)){
- //std::cout<<"LemanExpress1"<<endl;
+
this->ismoving = false;
}
//Move, if ghost hasn't arrived yet
if(this->ismoving){
- //std::cout<<"LemanExpress2"<<endl;
+
if(!(abs(this->actuelposition.z-target_z)<0.5)) {
velocity = Vector3(0,0,-sgn(this->actuelposition.z-this->target_z));
move(dt, actuelposition, velocity);
@@ -75,7 +60,7 @@
velocity = Vector3(-sgn(this->actuelposition.x-this->target_x),0,0);
move(dt, actuelposition, velocity);
}
- //std::cout<<"LemanExpress4"<<endl;
+
}
else if(this->lastPlayerPassedPoint==Vector3(0,0,0)){
//as long as the player has not started the game,
@@ -88,7 +73,6 @@
//Check on which position the ghost has arrived and set new target
else{
- std::cout<<"LemanExpress3"<<endl;
while(lockmove){};
lockmove = true;
@@ -97,35 +81,17 @@
//Use target_x and target_z for position of red pacman
Vector3 redPos=Vector3(this->target_x, 10, this->target_z);
- //nextMove(this->getPlayerPos(), redPos);
+ this->pointInFrontOfPlayer=frontPosition();
- this->pointInFrontOfPlayer=frontPosition(); //getPointInFrontOfPacman(lastPlayerPassedPoint, directionV);
-
-
if(!findpos(this->actuelposition, lastPlayerPassedPoint)){
- /*std::cout<<this->getPlayerPos()<<endl;
- std::cout<<this->lastPlayerPassedPoint<<endl;
- std::cout<<this->pointInFrontOfPlayer<<endl;
- std::cout<<this->actuelposition<<endl;*/
nextMove(redPos, lastPlayerPassedPoint);
- std::cout<<"hiuddi"<<endl;
}
else if(findpos(this->actuelposition, lastPlayerPassedPoint)){// red pacman is at lastPlayerPassedPoint
- /*std::cout<<"dhdidjop"<<endl;
- std::cout<<this->getPlayerPos()<<endl;
- std::cout<<this->lastPlayerPassedPoint<<endl;
- std::cout<<this->pointInFrontOfPlayer<<endl;
- std::cout<<this->actuelposition<<endl;*/
-
- //if(!findpos(pointInFrontOfPlayer, Vector3(0,10,15))){
- nextMove(lastPlayerPassedPoint, pointInFrontOfPlayer);
- //}
- std::cout<<"ogslodm"<<endl;
+ nextMove(lastPlayerPassedPoint, pointInFrontOfPlayer);
}
-
lockmove=false; //NEVER FORGET THIS ONE !!!!!!!
}
Modified: code/branches/3DPacman_FS19/src/modules/pacman/PacmanRed.h
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/PacmanRed.h 2019-05-09 12:20:32 UTC (rev 12356)
+++ code/branches/3DPacman_FS19/src/modules/pacman/PacmanRed.h 2019-05-09 12:54:22 UTC (rev 12357)
@@ -3,7 +3,6 @@
#include "PacmanGhost.h"
-//#include "getShortestPath.h"
namespace orxonox {
More information about the Orxonox-commit
mailing list