Changeset 10229

Timestamp:

Feb 1, 2015, 2:50:46 PM (10 years ago)

Author:

landauf

Message:

fixed warnings & details

Location:

code/branches/minigame4DHS14/src/modules/mini4dgame

Files:

• Mini4Dgame.cc (modified) (1 diff)
• Mini4DgameBoard.cc (modified) (7 diffs)
• Mini4DgameBoard.h (modified) (3 diffs)

code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4Dgame.cc

@@ -190 +190 @@
     void Mini4Dgame::setStone(int x,int y,int z,int w)//Vector4 move, const int playerColor)
     {
-        Vector4 move = Vector4(x,y,z,w);
+        Mini4DgamePosition move = Mini4DgamePosition(x,y,z,w);
         ObjectList<Mini4DgameBoard>::iterator it = ObjectList<Mini4DgameBoard>::begin();
         it->makeMove(move);

code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.cc

@@ -84 +84 @@
         @param the position where to put the stone plus the player who makes the move
     */
-    bool Mini4DgameBoard::isValidMove(const Vector4 move)
+    bool Mini4DgameBoard::isValidMove(const Mini4DgamePosition& move)
     {
         return (move.x<4 && move.y<4 && move.z<4 && move.w<4
                         && move.x>=0 && move.y>=0 && move.z>=0 && move.w>=0
-                        && this->board[(int)move.x][(int)move.y][(int)move.z][(int)move.w] == mini4DgamePlayerColor::none);
+                        && this->board[move.x][move.y][move.z][move.w] == mini4DgamePlayerColor::none);
     }
 
         void Mini4DgameBoard::undoMove()
         {
-                Vector4 move = moves.back();
+            const Mini4DgamePosition& move = moves.back();
                 moves.pop_back();
-        this->board[(int)move.x][(int)move.y][(int)move.z][(int)move.w] = mini4DgamePlayerColor::none;
-        this->blinkingBillboards[(int)move.x][(int)move.y][(int)move.z][(int)move.w]->destroy();
-        this->blinkingBillboards[(int)move.x][(int)move.y][(int)move.z][(int)move.w] = 0;
+        this->board[move.x][move.y][move.z][move.w] = mini4DgamePlayerColor::none;
+        this->blinkingBillboards[move.x][move.y][move.z][move.w]->destroy();
+        this->blinkingBillboards[move.x][move.y][move.z][move.w] = 0;
         if(player_toggle_){
                 this->player_toggle_ = false;
@@ -109 +109 @@
     @param the position where to put the stone plus the player who makes the move
     */
-    void Mini4DgameBoard::makeMove(const Vector4 move)
+    void Mini4DgameBoard::makeMove(const Mini4DgamePosition& move)
     {
         if(this->isValidMove(move))
@@ -116 +116 @@
                 {
                         //stop blinking of last move
-                        Vector4 lastMove = moves.back();
-                        this->blinkingBillboards[(int)lastMove.x][(int)lastMove.y][(int)lastMove.z][(int)lastMove.w]
+                    const Mini4DgamePosition& lastMove = moves.back();
+                        this->blinkingBillboards[lastMove.x][lastMove.y][lastMove.z][lastMove.w]
                                         ->setActive(false);
-                        this->blinkingBillboards[(int)lastMove.x][(int)lastMove.y][(int)lastMove.z][(int)lastMove.w]
+                        this->blinkingBillboards[lastMove.x][lastMove.y][lastMove.z][lastMove.w]
                                         ->setScale(0.1);
                 }
@@ -133 +133 @@
                 }
 
-                this->board[(int)move.x][(int)move.y][(int)move.z][(int)move.w] = (mini4DgamePlayerColor::color) playerColor;
+                this->board[move.x][move.y][move.z][move.w] = (mini4DgamePlayerColor::color) playerColor;
 
                 BlinkingBillboard* bb = new BlinkingBillboard(this->getContext());
@@ -139 +139 @@
                         bb->setAmplitude(0.1);
 
-                        switch((int)move.w){
+                        switch(move.w){
                         case 0: bb->setMaterial("Numbers/One");
-                                        bb->setPosition(60*(int)move.x-95,60*(int)move.y-95,60*(int)move.z-95);
+                                        bb->setPosition(60.0f*move.x-95,60.0f*move.y-95,60.0f*move.z-95);
                                         break;
                         case 1: bb->setMaterial("Numbers/Two");
-                                        bb->setPosition(60*(int)move.x-85,60*(int)move.y-85,60*(int)move.z-95);
+                                        bb->setPosition(60.0f*move.x-85,60.0f*move.y-85,60.0f*move.z-95);
                                         break;
                         case 2: bb->setMaterial("Numbers/Three");
-                                        bb->setPosition(60*(int)move.x-85,60*(int)move.y-95,60*(int)move.z-85);
+                                        bb->setPosition(60.0f*move.x-85,60.0f*move.y-95,60.0f*move.z-85);
                                         break;
                         case 3: bb->setMaterial("Numbers/Four");
-                                        bb->setPosition(60*(int)move.x-85,60*(int)move.y-85,60*(int)move.z-85);
+                                        bb->setPosition(60.0f*move.x-85,60.0f*move.y-85,60.0f*move.z-85);
                                         break;
                         }
@@ -165 +165 @@
 
                         this->attach(bb);
-                        this->blinkingBillboards[(int)move.x][(int)move.y][(int)move.z][(int)move.w] = bb;
+                        this->blinkingBillboards[move.x][move.y][move.z][move.w] = bb;
 
 
@@ -176 +176 @@
                                         redFlare->setFrequency(0.5);
                                         redFlare->setAmplitude(3);
-                                        redFlare->setPosition(60*(int)winner.winningRow[i]-90,
-                                                                        60*(int)winner.winningColumn[i]-90,
-                                                                        60*(int)winner.winningHeight[i]-90);
+                                        redFlare->setPosition(60.0f*(int)winner.winningRow[i]-90,
+                                                                        60.0f*(int)winner.winningColumn[i]-90,
+                                                                        60.0f*(int)winner.winningHeight[i]-90);
                                         redFlare->setMaterial("Flares/lensflare");
                                         redFlare->setColour(ColourValue(1,0,0));

code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.h

@@ -43 +43 @@
 {
 
+    struct Mini4DgamePosition
+    {
+        Mini4DgamePosition(int x, int y, int z, int w) : x(x), y(y), z(z), w(w) {}
+        int x;
+        int y;
+        int z;
+        int w;
+    };
+
         struct Mini4DgameWinner
         {
@@ -67 +76 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            bool isValidMove(const Vector4 move);
+            bool isValidMove(const Mini4DgamePosition& move);
             void undoMove();
-            void makeMove(const Vector4 move);
+            void makeMove(const Mini4DgamePosition& move);
             Mini4DgameWinner getWinner();
 
@@ -77 +86 @@
         private:
             //void registerVariables();
-            std::vector<Vector4> moves;
+            std::vector<Mini4DgamePosition> moves;
             bool player_toggle_;
             BlinkingBillboard* blinkingBillboards[4][4][4][4];