[Orxonox-commit 5438] r10101 - in code/branches/minigame4DHS14: data/levels src/modules src/modules/mini4Dgame
richtero at orxonox.net
richtero at orxonox.net
Wed Oct 29 15:31:06 CET 2014
Author: richtero
Date: 2014-10-29 15:31:05 +0100 (Wed, 29 Oct 2014)
New Revision: 10101
Modified:
code/branches/minigame4DHS14/data/levels/4Dtest.oxw
code/branches/minigame4DHS14/src/modules/CMakeLists.txt
code/branches/minigame4DHS14/src/modules/mini4Dgame/CMakeLists.txt
code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.cc
code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h
code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.h
Log:
first working compile
Modified: code/branches/minigame4DHS14/data/levels/4Dtest.oxw
===================================================================
--- code/branches/minigame4DHS14/data/levels/4Dtest.oxw 2014-10-29 12:21:53 UTC (rev 10100)
+++ code/branches/minigame4DHS14/data/levels/4Dtest.oxw 2014-10-29 14:31:05 UTC (rev 10101)
@@ -22,7 +22,7 @@
-->
<Level
- gametype = "Mini4Dgame"
+ gametype=Mini4Dgame
>
<templates>
@@ -48,14 +48,14 @@
<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>
Modified: code/branches/minigame4DHS14/src/modules/CMakeLists.txt
===================================================================
--- code/branches/minigame4DHS14/src/modules/CMakeLists.txt 2014-10-29 12:21:53 UTC (rev 10100)
+++ code/branches/minigame4DHS14/src/modules/CMakeLists.txt 2014-10-29 14:31:05 UTC (rev 10101)
@@ -39,3 +39,4 @@
ADD_SUBDIRECTORY(docking)
ADD_SUBDIRECTORY(towerdefense)
ADD_SUBDIRECTORY(invader)
+ADD_SUBDIRECTORY(mini4Dgame)
Modified: code/branches/minigame4DHS14/src/modules/mini4Dgame/CMakeLists.txt
===================================================================
--- code/branches/minigame4DHS14/src/modules/mini4Dgame/CMakeLists.txt 2014-10-29 12:21:53 UTC (rev 10100)
+++ code/branches/minigame4DHS14/src/modules/mini4Dgame/CMakeLists.txt 2014-10-29 14:31:05 UTC (rev 10101)
@@ -1,8 +1,6 @@
SET_SOURCE_FILES(Mini4Dgame_SRC_FILES
-BUILD_UNIT mini4DgameBuildUnit.cc
Mini4Dgame.cc
Mini4DgameCenterpoint.cc
-END_BUILD_UNIT
)
ORXONOX_ADD_LIBRARY(mini4Dgame
Modified: code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.cc
===================================================================
--- code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.cc 2014-10-29 12:21:53 UTC (rev 10100)
+++ code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.cc 2014-10-29 14:31:05 UTC (rev 10101)
@@ -40,8 +40,10 @@
#include "Mini4Dgame.h"
#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"
#include "chat/ChatManager.h"
@@ -61,7 +63,7 @@
{
RegisterObject(Mini4Dgame);
- this->center_ = NULL;
+ this->center_ = 0;
//TODO: player Null setzen
}
@@ -176,7 +178,7 @@
//TODO: colors
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)
//return this->mini4DgamePlayers[i].info;
Modified: code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h
===================================================================
--- code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h 2014-10-29 12:21:53 UTC (rev 10100)
+++ code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h 2014-10-29 14:31:05 UTC (rev 10101)
@@ -35,6 +35,7 @@
#define _Mini4Dgame_H__
#include "gametypes/Deathmatch.h"
+#include "mini4Dgame/Mini4DgamePrereqs.h"
namespace orxonox
{
@@ -44,7 +45,7 @@
@author
*/
- class Mini4Dgame : public Deathmatch
+ class _Mini4DgameExport Mini4Dgame : public Deathmatch
{
public:
Mini4Dgame(Context* context); //!< Constructor. Registers and initializes the object.
@@ -71,7 +72,7 @@
private:
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.
Modified: code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.h
===================================================================
--- code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.h 2014-10-29 12:21:53 UTC (rev 10100)
+++ code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.h 2014-10-29 14:31:05 UTC (rev 10101)
@@ -39,6 +39,7 @@
#include <util/Math.h>
#include "worldentities/StaticEntity.h"
+#include "mini4Dgame/Mini4DgamePrereqs.h"
namespace orxonox
{
@@ -56,7 +57,7 @@
- The <b>batspeed</b> is the speed with which the @ref orxonox::PongBat "PongBats" move. The default is <em>60</em>.
- 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:
Mini4DgameCenterpoint(Context* context); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Mini4Dgame.
More information about the Orxonox-commit
mailing list