Changeset 10156 for code/branches

Timestamp:

Dec 4, 2014, 5:16:20 PM (10 years ago)

Author:

richtero

Message:

getting closer to a playable version

Location:

code/branches/minigame4DHS14

Files:

• data/levels/4Dtest.oxw (modified) (2 diffs)
• src/modules/mini4Dgame/CMakeLists.txt (modified) (1 diff)
• src/modules/mini4Dgame/Mini4Dgame.cc (modified) (4 diffs)
• src/modules/mini4Dgame/Mini4Dgame.h (modified) (3 diffs)
• src/modules/mini4Dgame/Mini4DgameBoard.cc (modified) (5 diffs)
• src/modules/mini4Dgame/Mini4DgameBoard.h (modified) (2 diffs)
• src/modules/mini4Dgame/Mini4DgamePrereqs.h (modified) (1 diff)

code/branches/minigame4DHS14/data/levels/4Dtest.oxw

@@ -13 +13 @@
 
 <!-- Templates here -->
-<Template name=mini4Dgameboard>
-  <Mini4DgameBoard>
-    <attached>
-      <?lua
-                for i = -90, 90, 60
-                do
-                ?>
-                        <?lua
-                        for j = -90, 90, 60
-                        do
-                        ?>
-                                <?lua
-                                for k = -90, 90, 60
-                                do
-                                ?>
-                                        <Model
-                                        position="<?lua print(i) ?>,<?lua print(j) ?>,<?lua print(k) ?>"
-                                        mesh="checkPoint.mesh"
-                                        scale="5" />
-                                <?lua
-                                end
-                                ?>
-                        <?lua
-                        end
-                        ?>
-                <?lua
-                end
-                ?>
-    </attached>
-  </Mini4DgameBoard>
-</Template>
 
-<!--
-        <BlinkingBillboard position="0,0,0" frequency=0.6 amplitude=0.4 material="Flares/lensflare" colour="0,1,0">
-        </BlinkingBillboard>
- -->
 
 <Level
@@ -75 +40 @@
     <SpawnPoint position="-330,330,165" lookat="0,0,0" />
 
-        <Mini4DgameCenterpoint name=mini4Dgamecenter boardtemplate=mini4Dgameboard width=16 height=16 length=16 position="0,0,0">
+        <Mini4DgameBoard>
+        <attached>
+        <?lua
+                for i = -90, 90, 60
+                do
+                ?>
+                        <?lua
+                        for j = -90, 90, 60
+                        do
+                        ?>
+                                <?lua
+                                for k = -90, 90, 60
+                                do
+                                ?>
+                                        <Model
+                                        position="<?lua print(i) ?>,<?lua print(j) ?>,<?lua print(k) ?>"
+                                        mesh="checkPoint.mesh"
+                                        scale="5" />
+                                <?lua
+                                end
+                                ?>
+                        <?lua
+                        end
+                        ?>
+                <?lua
+                end
+                ?>
+        </attached>
+        
+        </Mini4DgameBoard>
 
-    </Mini4DgameCenterpoint>
-
+<!--
+<attached>
+    <BlinkingBillboard position="0,0,0" frequency=0.6 amplitude=0.4 material="Flares/lensflare" colour="0,1,0" visabilaty=gone>
+        </BlinkingBillboard>
+</attached>
+-->
 
   </Scene>

code/branches/minigame4DHS14/src/modules/mini4Dgame/CMakeLists.txt

@@ -3 +3 @@
   #Mini4DgameAI.cc
   Mini4DgameBoard.cc
-  Mini4DgameCenterpoint.cc
 )
 

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

@@ -50 +50 @@
 #include "chat/ChatManager.h"
 
-#include "Mini4DgameCenterpoint.h"
-
 namespace orxonox
 {
@@ -67 +65 @@
         RegisterObject(Mini4Dgame);
 
-        this->center_ = 0;
         this->board_ = 0;
+        //ConsoleCommand("Mini4Dgame", "setStone", &Mini4Dgame::setStone).addShortcut().setAsInputCommand();
 
         // Set the type of Bots for this particular Gametype.
@@ -99 +97 @@
     void Mini4Dgame::start()
     {
-        if (this->center_ != NULL) // There needs to be a Mini4DgameCenterpoint, i.e. the area the game takes place.
+        if (this->board_ != NULL) // There needs to be a Mini4DgameCenterpoint, i.e. the area the game takes place.
         {
+                /*
                 if (this->board_ == NULL)
                 {
-                        this->board_ = new Mini4DgameBoard(this->center_->getContext());
+                        this->board_ = new Mini4DgameBoard(this->board_->getContext());
                         // Apply the template for the ball specified by the centerpoint.
                         this->board_->addTemplate(this->center_->getBoardtemplate());
                 }
+                */
 
                 // Attach the board to the centerpoint and set the parameters as specified in the centerpoint, the ball is attached to.
-                this->center_->attach(this->board_);
+
                 this->board_->setPosition(0, 0, 0);
 
@@ -177 +177 @@
     }
 
-    static void Mini4Dgame::setStone(Vector4 move, const int playerColor, Mini4DgameBoard* board)
+    //void Mini4Dgame::setStone(Vector4 move, const int playerColor, Mini4DgameBoard* board)
+    void Mini4Dgame::setStone(int x,int y,int z,int w)//Vector4 move, const int playerColor)
     {
-        board->makeMove(move,playerColor);
+        Vector4 move = Vector4(x,y,z,w);
+        ObjectList<Mini4DgameBoard>::iterator it = ObjectList<Mini4DgameBoard>::begin();
+        it->makeMove(move,1);//playerColor);
     }
 

code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h

@@ -37 +37 @@
 #include "gametypes/Deathmatch.h"
 #include "mini4Dgame/Mini4DgamePrereqs.h"
-#include "Mini4DgameCenterpoint.h"
 #include "Mini4DgameBoard.h"
 
@@ -71 +70 @@
             virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
 
-            void setCenterpoint(Mini4DgameCenterpoint* center)
-                { this->center_ = center; }
+            void setGameboard(Mini4DgameBoard* board)
+                { this->board_ = board; }
 
-            static void setStone(Vector4 move, const int playerColor, Mini4DgameBoard* board);
+            Mini4DgameBoard* getBoard(void)
+                { return this->board_; }
+
+            //static void setStone(Vector4 move, const int playerColor, Mini4DgameBoard* board);
+            static void setStone(int x,int y, int z, int w);//Vector4 move, const int playerColor);
 
             void win(Mini4DgameWinner winner);
@@ -86 +89 @@
 
             //Player players[2];
-
-            WeakPtr<Mini4DgameCenterpoint> center_; //!< The centerpoint to which the objects are attached
-            WeakPtr<Mini4DgameBoard> board_;
+            Mini4DgameBoard* board_;
     };
 }

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

@@ -38 +38 @@
 
 #include "gametypes/Gametype.h"
+#include "graphics/BlinkingBillboard.h"
 
 #include "core/XMLPort.h"
@@ -57 +58 @@
         //this->registerVariables();
 
-        //initialize sound
+        //initialize board
         for(int i=0;i<4;i++){
                 for(int j=0;j<4;j++){
@@ -67 +68 @@
                 }
         }
+
+        this->checkGametype();
     }
 
@@ -123 +126 @@
         {
                 this->board[(int)move.x][(int)move.y][(int)move.z][(int)move.w] = (mini4DgamePlayerColor::color) playerColor;
-                //BlinkingBillboard* bb = new BlinkingBillboard(this->getContext());
-                //bb->setPosition(0,0,0);
+                        BlinkingBillboard* bb = new BlinkingBillboard(this->getContext());
+                        orxout(user_status) << "Mini4Dgame: move.x " << move.x << endl;
+
+                        bb->setPosition(60*(int)move.x-90,60*(int)move.y-90,60*(int)move.z-90);
+                        bb->setFrequency(0.6);
+                        bb->setAmplitude(0.1);
+                        //bb->setMaterial("Flares/lensflare");
+                        bb->setMaterial("Numbers/One");
+                        bb->setColour(ColourValue(0,1,0));
+
+                        this->attach(bb);
+
+
                 Mini4DgameWinner winner = this->getWinner();
                 if(winner.color_ != mini4DgamePlayerColor::none)
                 {
+                        orxout(user_status) << "Mini4Dgame: win!!!!!!!" << endl;
                         //win(winner);
                 }
@@ -837 +852 @@
         return winner;
     }
+
+    /**
+    @brief
+        Is called when the gametype has changed.
+    */
+    void Mini4DgameBoard::changedGametype()
+    {
+        SUPER(Mini4DgameBoard, changedGametype);
+
+        // Check, whether it's still Mini4Dgame.
+        this->checkGametype();
+    }
+
+    /**
+    @brief
+        Checks whether the gametype is Mini4Dgame and if it is, sets its centerpoint.
+    */
+    void Mini4DgameBoard::checkGametype()
+    {
+        if (this->getGametype() != NULL && this->getGametype()->isA(Class(Mini4Dgame)))
+        {
+            Mini4Dgame* Mini4DgameGametype = orxonox_cast<Mini4Dgame*>(this->getGametype().get());
+            Mini4DgameGametype->setGameboard(this);
+        }
+    }
 }

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

@@ -40 +40 @@
 #include "worldentities/StaticEntity.h"
 
-#include "Mini4DgameCenterpoint.h"
-
 namespace orxonox
 {
@@ -73 +71 @@
             Mini4DgameWinner getWinner();
 
+            void changedGametype();
+            void checkGametype();
+
         private:
             //void registerVariables();

code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h

@@ -70 +70 @@
     class Mini4Dgame;
     class Mini4DgameBoard;
-    class Mini4DgameCenterpoint;
 }