Changeset 10101

Timestamp:

Oct 29, 2014, 3:31:05 PM (10 years ago)

Author:

richtero

Message:

first working compile

Location:

code/branches/minigame4DHS14

Files:

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

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

@@ -23 +23 @@
 
 <Level
- gametype = "Mini4Dgame"
+ gametype=Mini4Dgame
 >
 
@@ -49 +49 @@
         <Mini4DgameCenterpoint name=mini4Dgamecenter width=16 height=16 length=16 position="0,0,0">
         <attached>
-            <Model position="1,1,1" mesh="cube.mesh" scale3D="1,1,1" />
-            <Model position="-1,1,1" mesh="cube.mesh" scale3D="1,1,1" />
-            <Model position="1,-1,1" mesh="cube.mesh" scale3D="1,1,1" />
-            <Model position="-1,-1,1" mesh="cube.mesh" scale3D="1,1,1" />
-            <Model position="1,1,-1" mesh="cube.mesh" scale3D="1,1,1" />
-            <Model position="-1,1,-1" mesh="cube.mesh" scale3D="1,1,1" />
-            <Model position="1,-1,-1" mesh="cube.mesh" scale3D="1,1,1" />
-            <Model position="-1,-1,-1" mesh="cube.mesh" scale3D="1,1,1" />
+            <Model position="10,10,10" mesh="cube.mesh" scale3D="1,1,1" />
+            <Model position="-10,10,10" mesh="cube.mesh" scale3D="1,1,1" />
+            <Model position="10,-10,10" mesh="cube.mesh" scale3D="1,1,1" />
+            <Model position="-10,-10,10" mesh="cube.mesh" scale3D="1,1,1" />
+            <Model position="10,10,-10" mesh="cube.mesh" scale3D="1,1,1" />
+            <Model position="-10,10,-10" mesh="cube.mesh" scale3D="1,1,1" />
+            <Model position="10,-10,-10" mesh="cube.mesh" scale3D="1,1,1" />
+            <Model position="-10,-10,-10" mesh="cube.mesh" scale3D="1,1,1" />
         </attached>
     </Mini4DgameCenterpoint>

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

@@ -40 +40 @@
 ADD_SUBDIRECTORY(towerdefense)
 ADD_SUBDIRECTORY(invader)
+ADD_SUBDIRECTORY(mini4Dgame)

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

@@ -1 +1 @@
 SET_SOURCE_FILES(Mini4Dgame_SRC_FILES
-BUILD_UNIT mini4DgameBuildUnit.cc
   Mini4Dgame.cc
   Mini4DgameCenterpoint.cc
-END_BUILD_UNIT
 )
 

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

@@ -41 +41 @@
 
 #include "core/CoreIncludes.h"
+#include "core/EventIncludes.h"
 #include "core/command/Executor.h"
 #include "core/config/ConfigValueIncludes.h"
+#include "infos/PlayerInfo.h"
 
 #include "gamestates/GSLevel.h"
@@ -62 +64 @@
         RegisterObject(Mini4Dgame);
 
-        this->center_ = NULL;
+        this->center_ = 0;
         //TODO: player Null setzen
     }
@@ -177 +179 @@
     PlayerInfo* Mini4Dgame::getPlayer(int color) const
     {
-        return players[color];
+        return players[color].info_;
         //for(int i=0;i<NUMBEROFPLAYERS;i++)
                 //if(color == this->mini4DgamePlayers[i].color)

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

@@ -36 +36 @@
 
 #include "gametypes/Deathmatch.h"
+#include "mini4Dgame/Mini4DgamePrereqs.h"
 
 namespace orxonox
@@ -45 +46 @@
 
     */
-    class Mini4Dgame : public Deathmatch
+    class _Mini4DgameExport Mini4Dgame : public Deathmatch
     {
         public:
@@ -72 +73 @@
             void cleanup(void); //!< Cleans up the Gametype by destroying the ball and the bats.
 
-          PlayerInfo* players[3];
+          Player players[3];
 
             WeakPtr<Mini4DgameCenterpoint> center_; //!< The playing field.

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

@@ -40 +40 @@
 
 #include "worldentities/StaticEntity.h"
+#include "mini4Dgame/Mini4DgamePrereqs.h"
 
 namespace orxonox
@@ -57 +58 @@
         - The <b>batlength</b> is the length of the @ref orxonox::PongBat "PongBats" as the percentage of the height of the playing field. The default is <em>0.25</em>.
     */
-    class Mini4DgameCenterpoint : public StaticEntity
+    class _Mini4DgameExport Mini4DgameCenterpoint : public StaticEntity
     {
         public: