Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8632 for code/branches


Ignore:
Timestamp:
May 27, 2011, 11:35:05 PM (13 years ago)
Author:
dafrick
Message:

Moving space bounaries into modules/objects

Location:
code/branches/presentation/src
Files:
3 edited
2 moved

Legend:

Unmodified
Added
Removed
  • code/branches/presentation/src/modules/objects/CMakeLists.txt

    r7163 r8632  
    44  Planet.cc
    55  Script.cc
     6  SpaceBoundaries.cc
    67)
    78
  • code/branches/presentation/src/modules/objects/ObjectsPrereqs.h

    r8351 r8632  
    7272    class Planet;
    7373    class Script;
     74    class SpaceBoundaries;
    7475
    7576    // collisionshapes
  • code/branches/presentation/src/modules/objects/SpaceBoundaries.cc

    r8628 r8632  
    2929#include "SpaceBoundaries.h"
    3030
    31 #include "worldentities/MobileEntity.h"
    32 #include "worldentities/ControllableEntity.h"
     31#include <OgreBillboardSet.h>
     32
     33#include "core/CoreIncludes.h"
    3334#include "core/ObjectListIterator.h"
    3435#include "core/XMLPort.h"
     36
     37#include "graphics/Billboard.h"
     38#include "infos/PlayerInfo.h"
     39#include "worldentities/WorldEntity.h"
    3540#include "worldentities/pawns/Pawn.h"
    36 #include "infos/PlayerInfo.h"
    37 #include "interfaces/RadarViewable.h"
    38 #include "graphics/Billboard.h"
    39 #include <OgreBillboardSet.h>
    40 
    4141
    4242namespace orxonox
  • code/branches/presentation/src/modules/objects/SpaceBoundaries.h

    r8628 r8632  
    3030#define _SpaceBoundaries_H__
    3131
    32 
    33 #include "core/CoreIncludes.h"
    34 #include "core/WeakPtr.h"
    35 #include "tools/interfaces/Tickable.h"
    36 #include "interfaces/RadarViewable.h"
    37 #include "worldentities/StaticEntity.h"
    38 #include "worldentities/WorldEntity.h"
     32#include "objects/ObjectsPrereqs.h"
    3933
    4034#include <string>
    4135#include <list>
    4236#include <vector>
     37
     38#include "core/CoreIncludes.h"
     39#include "core/WeakPtr.h"
     40
     41#include "tools/interfaces/Tickable.h"
     42#include "worldentities/StaticEntity.h"
    4343
    4444namespace orxonox
     
    7474*/
    7575
    76     class _OrxonoxExport SpaceBoundaries : public StaticEntity, public Tickable
     76    class _ObjectsExport SpaceBoundaries : public StaticEntity, public Tickable
    7777    {
    7878        public:
  • code/branches/presentation/src/orxonox/worldentities/CMakeLists.txt

    r8458 r8632  
    1212  SpawnPoint.cc
    1313  TeamSpawnPoint.cc
    14   SpaceBoundaries.cc
    1514)
    1615
Note: See TracChangeset for help on using the changeset viewer.