Changeset 12252 for code/branches

Timestamp:

Mar 28, 2019, 3:09:12 PM (6 years ago)

Author:

rueegseb

Message:

Added a feature to differentiate the seperate ghosts

Location:

code/branches/3DPacman_FS19

Files:

• data/levels/3DPacman.oxw (modified) (4 diffs)
• src/modules/pacman/PacmanGhost.cc (modified) (2 diffs)
• src/modules/pacman/PacmanGhost.h (modified) (2 diffs)

code/branches/3DPacman_FS19/data/levels/3DPacman.oxw

@@ -35 +35 @@
 
 <!-- GHOSTS -->
-<PacmanGhost position="0,10,15" >
+<PacmanGhost position="0,10,15" colour='1'>
     <attached>
         <Model position="0,0,0" mesh="PacmanGhostRed.mesh" scale="5" />
@@ -41 +41 @@
 </PacmanGhost>
 
-<PacmanGhost position="0,10,15" >
+<PacmanGhost position="0,10,15" colour='2'>
     <attached>
         <Model position="0,0,0" mesh="PacmanGhostBlue.mesh" scale="5" />
@@ -47 +47 @@
 </PacmanGhost>
 
-<PacmanGhost position="0,10,15" >
+<PacmanGhost position="0,10,15" colour='3'>
     <attached>
         <Model position="0,0,0" mesh="PacmanGhostOrange.mesh" scale="5" />
@@ -53 +53 @@
 </PacmanGhost>
 
-<PacmanGhost position="0,10,15" >
+<PacmanGhost position="0,10,15" colour='4'>
     <attached>
         <Model position="0,0,0" mesh="PacmanGhostPink.mesh" scale="5" />

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

@@ -47 +47 @@
 
         this->velocity = Vector3(0, 0, 0);
-
+        this->colour = 1;
         this->setCollisionType(CollisionType::Dynamic);
         
@@ -76 +76 @@
     {
         SUPER(PacmanGhost, XMLPort, xmlelement, mode);
+
+        XMLPortParam(PacmanGhost, "colour", setColour, getColour, xmlelement, mode);
+
     }
 

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

@@ -58 +58 @@
             bool dontmove = false;
 
+            //analog AutonomousDrone.h
+            inline void setColour( int newColour )
+                { this->coulour = newColour; }
+
+            inline int getColour()
+                { return this->coulour;}
+
         private:
             int decision = 0; 
@@ -69 +76 @@
             int target_z = 0;
             bool lockmove = false;
-
+            int colour=0;
+            /*
+            colour=
+            1: red
+            2: blue
+            3: orange
+            4: pink
+            */
             void setnewTarget(int firstdec);
             void setnewTarget(int firstdec, int seconddec);