Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 29, 2014, 3:31:05 PM (10 years ago)
Author:
richtero
Message:

first working compile

Location:
code/branches/minigame4DHS14
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/minigame4DHS14/data/levels/4Dtest.oxw

    r10100 r10101  
    2323
    2424<Level
    25  gametype = "Mini4Dgame"
     25 gametype=Mini4Dgame
    2626>
    2727
     
    4949        <Mini4DgameCenterpoint name=mini4Dgamecenter width=16 height=16 length=16 position="0,0,0">
    5050        <attached>
    51             <Model position="1,1,1" mesh="cube.mesh" scale3D="1,1,1" />
    52             <Model position="-1,1,1" mesh="cube.mesh" scale3D="1,1,1" />
    53             <Model position="1,-1,1" mesh="cube.mesh" scale3D="1,1,1" />
    54             <Model position="-1,-1,1" mesh="cube.mesh" scale3D="1,1,1" />
    55             <Model position="1,1,-1" mesh="cube.mesh" scale3D="1,1,1" />
    56             <Model position="-1,1,-1" mesh="cube.mesh" scale3D="1,1,1" />
    57             <Model position="1,-1,-1" mesh="cube.mesh" scale3D="1,1,1" />
    58             <Model position="-1,-1,-1" mesh="cube.mesh" scale3D="1,1,1" />
     51            <Model position="10,10,10" mesh="cube.mesh" scale3D="1,1,1" />
     52            <Model position="-10,10,10" mesh="cube.mesh" scale3D="1,1,1" />
     53            <Model position="10,-10,10" mesh="cube.mesh" scale3D="1,1,1" />
     54            <Model position="-10,-10,10" mesh="cube.mesh" scale3D="1,1,1" />
     55            <Model position="10,10,-10" mesh="cube.mesh" scale3D="1,1,1" />
     56            <Model position="-10,10,-10" mesh="cube.mesh" scale3D="1,1,1" />
     57            <Model position="10,-10,-10" mesh="cube.mesh" scale3D="1,1,1" />
     58            <Model position="-10,-10,-10" mesh="cube.mesh" scale3D="1,1,1" />
    5959        </attached>
    6060    </Mini4DgameCenterpoint>
  • code/branches/minigame4DHS14/src/modules/CMakeLists.txt

    r9939 r10101  
    4040ADD_SUBDIRECTORY(towerdefense)
    4141ADD_SUBDIRECTORY(invader)
     42ADD_SUBDIRECTORY(mini4Dgame)
  • code/branches/minigame4DHS14/src/modules/mini4Dgame/CMakeLists.txt

    r10100 r10101  
    11SET_SOURCE_FILES(Mini4Dgame_SRC_FILES
    2 BUILD_UNIT mini4DgameBuildUnit.cc
    32  Mini4Dgame.cc
    43  Mini4DgameCenterpoint.cc
    5 END_BUILD_UNIT
    64)
    75
  • code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.cc

    r10100 r10101  
    4141
    4242#include "core/CoreIncludes.h"
     43#include "core/EventIncludes.h"
    4344#include "core/command/Executor.h"
    4445#include "core/config/ConfigValueIncludes.h"
     46#include "infos/PlayerInfo.h"
    4547
    4648#include "gamestates/GSLevel.h"
     
    6264        RegisterObject(Mini4Dgame);
    6365
    64         this->center_ = NULL;
     66        this->center_ = 0;
    6567        //TODO: player Null setzen
    6668    }
     
    177179    PlayerInfo* Mini4Dgame::getPlayer(int color) const
    178180    {
    179         return players[color];
     181        return players[color].info_;
    180182        //for(int i=0;i<NUMBEROFPLAYERS;i++)
    181183                //if(color == this->mini4DgamePlayers[i].color)
  • code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h

    r10100 r10101  
    3636
    3737#include "gametypes/Deathmatch.h"
     38#include "mini4Dgame/Mini4DgamePrereqs.h"
    3839
    3940namespace orxonox
     
    4546
    4647    */
    47     class Mini4Dgame : public Deathmatch
     48    class _Mini4DgameExport Mini4Dgame : public Deathmatch
    4849    {
    4950        public:
     
    7273            void cleanup(void); //!< Cleans up the Gametype by destroying the ball and the bats.
    7374
    74           PlayerInfo* players[3];
     75          Player players[3];
    7576
    7677            WeakPtr<Mini4DgameCenterpoint> center_; //!< The playing field.
  • code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.h

    r10097 r10101  
    4040
    4141#include "worldentities/StaticEntity.h"
     42#include "mini4Dgame/Mini4DgamePrereqs.h"
    4243
    4344namespace orxonox
     
    5758        - 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>.
    5859    */
    59     class Mini4DgameCenterpoint : public StaticEntity
     60    class _Mini4DgameExport Mini4DgameCenterpoint : public StaticEntity
    6061    {
    6162        public:
Note: See TracChangeset for help on using the changeset viewer.