Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5730


Ignore:
Timestamp:
Aug 31, 2009, 10:38:48 PM (15 years ago)
Author:
landauf
Message:

Added CMakeLists, ObjectsPrereqs.h and _ObjectsExport
Changed Paths in the files of the objects module
Compiles now again

Btw, I had to link the objects module into the weaponsystem module because the projectile is hardcoded at the moment and therefore needs a collision shape. This will be changed somewhen in the future.

Location:
code/branches/libraries2/src
Files:
4 added
20 edited

Legend:

Unmodified
Added
Removed

  • code/branches/libraries2/src/modules/CMakeLists.txt

    r5725 r5730  
    2121
    2222ADD_SUBDIRECTORY(gamestates)
     23ADD_SUBDIRECTORY(objects)
    2324ADD_SUBDIRECTORY(overlays)
    2425ADD_SUBDIRECTORY(pong)

  • code/branches/libraries2/src/modules/objects/Attacher.h

    r5728 r5730  
    3030#define _Attacher_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/ObjectsPrereqs.h"
    3333
    3434#include <list>
    … …  
    3939namespace orxonox
    4040{
    41     class _OrxonoxExport Attacher : public StaticEntity, public XMLNameListener
     41    class _ObjectsExport Attacher : public StaticEntity, public XMLNameListener
    4242    {
    4343        public:

  • code/branches/libraries2/src/modules/objects/ForceField.h

    r5728 r5730  
    3131#define _ForceField_H__
    3232
    33 #include "OrxonoxPrereqs.h"
     33#include "objects/ObjectsPrereqs.h"
    3434
    3535#include "tools/interfaces/Tickable.h"
    36 #include "StaticEntity.h"
     36#include "objects/worldentities/StaticEntity.h"
    3737
    3838namespace orxonox
    3939{
    40     class _OrxonoxExport ForceField : public StaticEntity, public Tickable
     40    class _ObjectsExport ForceField : public StaticEntity, public Tickable
    4141    {
    4242    public:

  • code/branches/libraries2/src/modules/objects/Planet.cc

    r5728 r5730  
    3737#include "core/XMLPort.h"
    3838#include "objects/Scene.h"
    39 #include "Camera.h"
     39#include "objects/worldentities/Camera.h"
    4040#include "CameraManager.h"
    4141
    4242namespace orxonox
    4343{
    44     CreateFactory(Planet);   
     44    CreateFactory(Planet);
    4545
    4646    /**
    … …  
    6060        if (this->isInitialized() && this->mesh_.getEntity())
    6161            this->detachOgreObject(this->mesh_.getEntity());
    62     }   
     62    }
    6363
    6464    void Planet::tick(float dt)
    … …  
    107107        billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->atmosphere_, Vector3(0,0,0));
    108108
    109         this->attachOgreObject(this->billboard_.getBillboardSet());   
     109        this->attachOgreObject(this->billboard_.getBillboardSet());
    110110        this->billboard_.getBillboardSet()->setUseAccurateFacing(true);
    111111        this->setCastShadows(true);
    … …  
    148148        {
    149149            XMLPortParam(Planet, "atmosphere", setAtmosphere, getAtmosphere, xmlelement, mode).defaultValues("planet/Atmosphere");
    150             XMLPortParam(Planet, "atmospheresize", setAtmosphereSize, getAtmosphereSize, xmlelement,mode);     
    151             XMLPortParam(Planet, "imagesize", setImageSize, getImageSize, xmlelement,mode);         
     150            XMLPortParam(Planet, "atmospheresize", setAtmosphereSize, getAtmosphereSize, xmlelement,mode);
     151            XMLPortParam(Planet, "imagesize", setImageSize, getImageSize, xmlelement,mode);
    152152            XMLPortParam(Planet, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
    153153            XMLPortParam(Planet, "shadow", setCastShadows, getCastShadows, xmlelement, mode).defaultValues(true);

  • code/branches/libraries2/src/modules/objects/Planet.h

    r5728 r5730  
    3030#define _Planet_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/ObjectsPrereqs.h"
    3333
    3434#include <string>
    3535#include "tools/BillboardSet.h"
    3636#include "tools/Mesh.h"
    37 #include "MovableEntity.h"
     37#include "objects/worldentities/MovableEntity.h"
    3838
    3939namespace orxonox
    4040{
    41     class _OrxonoxExport Planet : public MovableEntity
     41    class _ObjectsExport Planet : public MovableEntity
    4242    {
    4343        public:
    4444            Planet(BaseObject* creator);
    45            
     45
    4646            virtual ~Planet();
    47            
     47
    4848            void init();
    4949            virtual void tick(float dt);
    50            
     50
    5151            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    52            
     52
    5353            virtual void changedVisibility();
    54            
     54
    5555            inline void setMeshSource(const std::string& meshname)
    5656                { this->meshSrc_ = meshname; this->changedMesh(); }
    57                
     57
    5858            inline const std::string& getMeshSource() const
    5959                { return this->meshSrc_; }
    … …  
    6161            inline void setCastShadows(bool bCastShadows)
    6262                { this->bCastShadows_ = bCastShadows; this->changedShadows(); }
    63                
     63
    6464            inline bool getCastShadows() const
    65                 { return this->bCastShadows_; }           
    66            
     65                { return this->bCastShadows_; }
     66
    6767            inline const std::string& getMesh() const{
    6868                return this->meshSrc_;
    6969            }
    70            
     70
    7171            inline void setAtmosphereSize(float size){
    7272                this->atmosphereSize = size;
    7373            }
    74            
     74
    7575            inline float getAtmosphereSize(){
    7676                return this->atmosphereSize;
    7777            }
    78            
     78
    7979            inline void setAtmosphere(const std::string& atmosphere){
    8080                this->atmosphere_ = atmosphere;
    8181            }
    82            
     82
    8383            inline const std::string& getAtmosphere(){
    8484                return this->atmosphere_;
    8585            }
    86            
     86
    8787            inline void setImageSize(float size){
    8888                this->imageSize = size;
    8989            }
    90            
     90
    9191            inline float getImageSize(){
    9292                return this->imageSize;
    … …  
    9797
    9898        private:
    99        
     99
    100100            void changedMesh();
    101101            void changedShadows();
    102            
     102
    103103            std::string meshSrc_;
    104104            std::string atmosphere_;

  • code/branches/libraries2/src/modules/objects/Script.h

    r5728 r5730  
    3030#define _Script_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/ObjectsPrereqs.h"
    3333
    3434#include <string>
    … …  
    3737namespace orxonox
    3838{
    39     class _OrxonoxExport Script : public BaseObject
     39    class _ObjectsExport Script : public BaseObject
    4040    {
    4141    public:

  • code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h

    r5728 r5730  
    3030#define _BoxCollisionShape_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/ObjectsPrereqs.h"
    3333
    3434#include "util/Math.h"
    35 #include "CollisionShape.h"
     35#include "objects/collisionshapes/CollisionShape.h"
    3636
    3737namespace orxonox
    3838{
    39     class _OrxonoxExport BoxCollisionShape : public CollisionShape
     39    class _ObjectsExport BoxCollisionShape : public CollisionShape
    4040    {
    4141        public:

  • code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h

    r5728 r5730  
    3030#define _ConeCollisionShape_H__
    3131
    32 #include "OrxonoxPrereqs.h"
    33 #include "CollisionShape.h"
     32#include "objects/ObjectsPrereqs.h"
     33#include "objects/collisionshapes/CollisionShape.h"
    3434
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport ConeCollisionShape : public CollisionShape
     37    class _ObjectsExport ConeCollisionShape : public CollisionShape
    3838    {
    3939        public:

  • code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h

    r5728 r5730  
    3030#define _PlaneCollisionShape_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/ObjectsPrereqs.h"
    3333
    3434#include "util/Math.h"
    35 #include "CollisionShape.h"
     35#include "objects/collisionshapes/CollisionShape.h"
    3636
    3737namespace orxonox
    3838{
    39     class _OrxonoxExport PlaneCollisionShape : public CollisionShape
     39    class _ObjectsExport PlaneCollisionShape : public CollisionShape
    4040    {
    4141        public:

  • code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h

    r5728 r5730  
    3030#define _SphereCollisionShape_H__
    3131
    32 #include "OrxonoxPrereqs.h"
    33 #include "CollisionShape.h"
     32#include "objects/ObjectsPrereqs.h"
     33#include "objects/collisionshapes/CollisionShape.h"
    3434
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport SphereCollisionShape : public CollisionShape
     37    class _ObjectsExport SphereCollisionShape : public CollisionShape
    3838    {
    3939        public:

  • code/branches/libraries2/src/modules/objects/eventsystem/EventDispatcher.h

    r5728 r5730  
    3030#define _EventDispatcher_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/ObjectsPrereqs.h"
    3333
    3434#include <list>
    … …  
    3737namespace orxonox
    3838{
    39     class _OrxonoxExport EventDispatcher : public BaseObject
     39    class _ObjectsExport EventDispatcher : public BaseObject
    4040    {
    4141        public:

  • code/branches/libraries2/src/modules/objects/eventsystem/EventListener.h

    r5728 r5730  
    3030#define _EventListener_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/ObjectsPrereqs.h"
    3333
    3434#include <string>
    … …  
    3838namespace orxonox
    3939{
    40     class _OrxonoxExport EventListener : public BaseObject, public XMLNameListener
     40    class _ObjectsExport EventListener : public BaseObject, public XMLNameListener
    4141    {
    4242        public:

  • code/branches/libraries2/src/modules/objects/eventsystem/EventTarget.h

    r5728 r5730  
    3030#define _EventTarget_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/ObjectsPrereqs.h"
    3333
    3434#include "core/BaseObject.h"
    … …  
    3737namespace orxonox
    3838{
    39     class _OrxonoxExport EventTarget : public BaseObject, public XMLNameListener
     39    class _ObjectsExport EventTarget : public BaseObject, public XMLNameListener
    4040    {
    4141        public:

  • code/branches/libraries2/src/modules/objects/triggers/CMakeLists.txt

    r5728 r5730  
    1 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
     1ADD_SOURCE_FILES(OBJECTS_SRC_FILES
    22  Trigger.cc
    33  DistanceTrigger.cc

  • code/branches/libraries2/src/modules/objects/triggers/CheckPoint.h

    r3196 r5730  
    3535#define _CheckPoint_H__
    3636
    37 #include "OrxonoxPrereqs.h"
     37#include "objects/ObjectsPrereqs.h"
    3838
    3939#include "interfaces/RadarViewable.h"
    … …  
    4242namespace orxonox
    4343{
    44     class _OrxonoxExport CheckPoint : public DistanceTrigger, public RadarViewable
     44    class _ObjectsExport CheckPoint : public DistanceTrigger, public RadarViewable
    4545    {
    4646    public:

  • code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.h

    r5728 r5730  
    3030#define _DistanceTrigger_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/ObjectsPrereqs.h"
    3333
    3434#include <set>
    … …  
    3939namespace orxonox
    4040{
    41   class _OrxonoxExport DistanceTrigger : public Trigger, public PlayerTrigger
     41  class _ObjectsExport DistanceTrigger : public Trigger, public PlayerTrigger
    4242  {
    4343    public:

  • code/branches/libraries2/src/modules/objects/triggers/EventTrigger.h

    r3280 r5730  
    3030#define _EventTrigger_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/ObjectsPrereqs.h"
    3333#include "Trigger.h"
    3434
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport EventTrigger : public Trigger
     37    class _ObjectsExport EventTrigger : public Trigger
    3838    {
    3939        public:

  • code/branches/libraries2/src/modules/objects/triggers/Trigger.h

    r5693 r5730  
    3030#define _Trigger_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/ObjectsPrereqs.h"
    3333
    3434#include <set>
    … …  
    5151  }
    5252
    53   class _OrxonoxExport Trigger : public StaticEntity, public Tickable
     53  class _ObjectsExport Trigger : public StaticEntity, public Tickable
    5454  {
    5555    public:

  • code/branches/libraries2/src/modules/weapons/CMakeLists.txt

    r5724 r5730  
    1313  LINK_LIBRARIES
    1414    orxonox
     15    # TODO: Remove this as soon as projectiles aren't hardcoded anymore buth rather defined in XML
     16    objects
    1517  SOURCE_FILES ${WEAPONS_SRC_FILES}
    1618)

  • code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h

    r5727 r5730  
    107107
    108108    // mixed
    109     class EventListener;
    110     class EventDispatcher;
    111     class EventTarget;
    112 
    113109    class SpawnPoint;
    114110    class TeamSpawnPoint;
    115111
    116     class Attacher;
    117112    class CameraPosition;
    118113    class Sublevel;
    119     class ForceField;
    120114    class Radar;
    121115
    … …  
    158152    class RotatingEngine;
    159153
    160     // trigger
    161     class Trigger;
    162     class DistanceTrigger;
    163     class EventTrigger;
    164     class CheckPoint;
    165 
    166154    // weaponsystem
    167155    class WeaponSystem;
    … …  
    192180    // collision
    193181    class CollisionShape;
    194     class SphereCollisionShape;
    195182    class CompoundCollisionShape;
    196     class PlaneCollisionShape;
    197183    class WorldEntityCollisionShape;
    198184
Note: See TracChangeset for help on using the changeset viewer.