[Orxonox-commit 1009] r5730 - in code/branches/libraries2/src: modules modules/objects modules/objects/collisionshapes modules/objects/eventsystem modules/objects/triggers modules/weapons orxonox
landauf at orxonox.net
landauf at orxonox.net
Mon Aug 31 22:38:49 CEST 2009
Author: landauf
Date: 2009-08-31 22:38:48 +0200 (Mon, 31 Aug 2009)
New Revision: 5730
Added:
code/branches/libraries2/src/modules/objects/CMakeLists.txt
code/branches/libraries2/src/modules/objects/ObjectsPrereqs.h
code/branches/libraries2/src/modules/objects/collisionshapes/CMakeLists.txt
code/branches/libraries2/src/modules/objects/eventsystem/CMakeLists.txt
Modified:
code/branches/libraries2/src/modules/CMakeLists.txt
code/branches/libraries2/src/modules/objects/Attacher.h
code/branches/libraries2/src/modules/objects/ForceField.h
code/branches/libraries2/src/modules/objects/Planet.cc
code/branches/libraries2/src/modules/objects/Planet.h
code/branches/libraries2/src/modules/objects/Script.h
code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h
code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h
code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h
code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h
code/branches/libraries2/src/modules/objects/eventsystem/EventDispatcher.h
code/branches/libraries2/src/modules/objects/eventsystem/EventListener.h
code/branches/libraries2/src/modules/objects/eventsystem/EventTarget.h
code/branches/libraries2/src/modules/objects/triggers/CMakeLists.txt
code/branches/libraries2/src/modules/objects/triggers/CheckPoint.h
code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.h
code/branches/libraries2/src/modules/objects/triggers/EventTrigger.h
code/branches/libraries2/src/modules/objects/triggers/Trigger.h
code/branches/libraries2/src/modules/weapons/CMakeLists.txt
code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h
Log:
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.
Modified: code/branches/libraries2/src/modules/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/modules/CMakeLists.txt 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/CMakeLists.txt 2009-08-31 20:38:48 UTC (rev 5730)
@@ -20,6 +20,7 @@
################ Sub Directories ################
ADD_SUBDIRECTORY(gamestates)
+ADD_SUBDIRECTORY(objects)
ADD_SUBDIRECTORY(overlays)
ADD_SUBDIRECTORY(pong)
ADD_SUBDIRECTORY(questsystem)
Modified: code/branches/libraries2/src/modules/objects/Attacher.h
===================================================================
--- code/branches/libraries2/src/modules/objects/Attacher.h 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/Attacher.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -29,7 +29,7 @@
#ifndef _Attacher_H__
#define _Attacher_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
#include <list>
#include <string>
@@ -38,7 +38,7 @@
namespace orxonox
{
- class _OrxonoxExport Attacher : public StaticEntity, public XMLNameListener
+ class _ObjectsExport Attacher : public StaticEntity, public XMLNameListener
{
public:
Attacher(BaseObject* creator);
Added: code/branches/libraries2/src/modules/objects/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/modules/objects/CMakeLists.txt (rev 0)
+++ code/branches/libraries2/src/modules/objects/CMakeLists.txt 2009-08-31 20:38:48 UTC (rev 5730)
@@ -0,0 +1,19 @@
+SET_SOURCE_FILES(OBJECTS_SRC_FILES
+ Attacher.cc
+ ForceField.cc
+ Planet.cc
+ Script.cc
+)
+
+ADD_SUBDIRECTORY(collisionshapes)
+ADD_SUBDIRECTORY(eventsystem)
+ADD_SUBDIRECTORY(triggers)
+
+ORXONOX_ADD_LIBRARY(objects
+ MODULE
+ DEFINE_SYMBOL
+ "OBJECTS_SHARED_BUILD"
+ LINK_LIBRARIES
+ orxonox
+ SOURCE_FILES ${OBJECTS_SRC_FILES}
+)
Property changes on: code/branches/libraries2/src/modules/objects/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/libraries2/src/modules/objects/ForceField.h
===================================================================
--- code/branches/libraries2/src/modules/objects/ForceField.h 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/ForceField.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -30,14 +30,14 @@
#ifndef _ForceField_H__
#define _ForceField_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
#include "tools/interfaces/Tickable.h"
-#include "StaticEntity.h"
+#include "objects/worldentities/StaticEntity.h"
namespace orxonox
{
- class _OrxonoxExport ForceField : public StaticEntity, public Tickable
+ class _ObjectsExport ForceField : public StaticEntity, public Tickable
{
public:
ForceField(BaseObject* creator);
Added: code/branches/libraries2/src/modules/objects/ObjectsPrereqs.h
===================================================================
--- code/branches/libraries2/src/modules/objects/ObjectsPrereqs.h (rev 0)
+++ code/branches/libraries2/src/modules/objects/ObjectsPrereqs.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -0,0 +1,89 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Reto Grieder
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Contains all the necessary forward declarations for all classes and structs.
+*/
+
+#ifndef _ObjectsPrereqs_H__
+#define _ObjectsPrereqs_H__
+
+#include "OrxonoxConfig.h"
+
+#include "OrxonoxPrereqs.h"
+
+//-----------------------------------------------------------------------
+// Shared library settings
+//-----------------------------------------------------------------------
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
+# ifdef OBJECTS_SHARED_BUILD
+# define _ObjectsExport __declspec(dllexport)
+# else
+# if defined( __MINGW32__ )
+# define _ObjectsExport
+# else
+# define _ObjectsExport __declspec(dllimport)
+# endif
+# endif
+#elif defined ( ORXONOX_GCC_VISIBILITY )
+# define _ObjectsExport __attribute__ ((visibility("default")))
+#else
+# define _ObjectsExport
+#endif
+
+//-----------------------------------------------------------------------
+// Forward declarations
+//-----------------------------------------------------------------------
+
+namespace orxonox
+{
+ class Attacher;
+ class ForceField;
+ class Planet;
+ class Script;
+
+ // collisionshapes
+ class BoxCollisionShape;
+ class ConeCollisionShape;
+ class PlaneCollisionShape;
+ class SphereCollisionShape;
+
+ // eventsystem
+ class EventListener;
+ class EventDispatcher;
+ class EventTarget;
+
+ // triggers
+ class Trigger;
+ class DistanceTrigger;
+ class EventTrigger;
+ class CheckPoint;
+}
+
+#endif /* _ObjectsPrereqs_H__ */
Property changes on: code/branches/libraries2/src/modules/objects/ObjectsPrereqs.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/libraries2/src/modules/objects/Planet.cc
===================================================================
--- code/branches/libraries2/src/modules/objects/Planet.cc 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/Planet.cc 2009-08-31 20:38:48 UTC (rev 5730)
@@ -36,12 +36,12 @@
#include "core/GameMode.h"
#include "core/XMLPort.h"
#include "objects/Scene.h"
-#include "Camera.h"
+#include "objects/worldentities/Camera.h"
#include "CameraManager.h"
namespace orxonox
{
- CreateFactory(Planet);
+ CreateFactory(Planet);
/**
* @brief Constructor
@@ -59,7 +59,7 @@
{
if (this->isInitialized() && this->mesh_.getEntity())
this->detachOgreObject(this->mesh_.getEntity());
- }
+ }
void Planet::tick(float dt)
{
@@ -106,7 +106,7 @@
this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, reductionValue);
billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->atmosphere_, Vector3(0,0,0));
- this->attachOgreObject(this->billboard_.getBillboardSet());
+ this->attachOgreObject(this->billboard_.getBillboardSet());
this->billboard_.getBillboardSet()->setUseAccurateFacing(true);
this->setCastShadows(true);
this->billboard_.getBillboardSet()->setRenderQueueGroup(this->mesh_.getEntity()->getRenderQueueGroup());
@@ -147,8 +147,8 @@
if (GameMode::showsGraphics())
{
XMLPortParam(Planet, "atmosphere", setAtmosphere, getAtmosphere, xmlelement, mode).defaultValues("planet/Atmosphere");
- XMLPortParam(Planet, "atmospheresize", setAtmosphereSize, getAtmosphereSize, xmlelement,mode);
- XMLPortParam(Planet, "imagesize", setImageSize, getImageSize, xmlelement,mode);
+ XMLPortParam(Planet, "atmospheresize", setAtmosphereSize, getAtmosphereSize, xmlelement,mode);
+ XMLPortParam(Planet, "imagesize", setImageSize, getImageSize, xmlelement,mode);
XMLPortParam(Planet, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
XMLPortParam(Planet, "shadow", setCastShadows, getCastShadows, xmlelement, mode).defaultValues(true);
}
Modified: code/branches/libraries2/src/modules/objects/Planet.h
===================================================================
--- code/branches/libraries2/src/modules/objects/Planet.h 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/Planet.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -29,65 +29,65 @@
#ifndef _Planet_H__
#define _Planet_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
#include <string>
#include "tools/BillboardSet.h"
#include "tools/Mesh.h"
-#include "MovableEntity.h"
+#include "objects/worldentities/MovableEntity.h"
namespace orxonox
{
- class _OrxonoxExport Planet : public MovableEntity
+ class _ObjectsExport Planet : public MovableEntity
{
public:
Planet(BaseObject* creator);
-
+
virtual ~Planet();
-
+
void init();
virtual void tick(float dt);
-
+
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
+
virtual void changedVisibility();
-
+
inline void setMeshSource(const std::string& meshname)
{ this->meshSrc_ = meshname; this->changedMesh(); }
-
+
inline const std::string& getMeshSource() const
{ return this->meshSrc_; }
inline void setCastShadows(bool bCastShadows)
{ this->bCastShadows_ = bCastShadows; this->changedShadows(); }
-
+
inline bool getCastShadows() const
- { return this->bCastShadows_; }
-
+ { return this->bCastShadows_; }
+
inline const std::string& getMesh() const{
return this->meshSrc_;
}
-
+
inline void setAtmosphereSize(float size){
this->atmosphereSize = size;
}
-
+
inline float getAtmosphereSize(){
return this->atmosphereSize;
}
-
+
inline void setAtmosphere(const std::string& atmosphere){
this->atmosphere_ = atmosphere;
}
-
+
inline const std::string& getAtmosphere(){
return this->atmosphere_;
}
-
+
inline void setImageSize(float size){
this->imageSize = size;
}
-
+
inline float getImageSize(){
return this->imageSize;
}
@@ -96,10 +96,10 @@
void registerVariables();
private:
-
+
void changedMesh();
void changedShadows();
-
+
std::string meshSrc_;
std::string atmosphere_;
Mesh mesh_;
Modified: code/branches/libraries2/src/modules/objects/Script.h
===================================================================
--- code/branches/libraries2/src/modules/objects/Script.h 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/Script.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -29,14 +29,14 @@
#ifndef _Script_H__
#define _Script_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
#include <string>
#include "core/BaseObject.h"
namespace orxonox
{
- class _OrxonoxExport Script : public BaseObject
+ class _ObjectsExport Script : public BaseObject
{
public:
Script(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h
===================================================================
--- code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -29,14 +29,14 @@
#ifndef _BoxCollisionShape_H__
#define _BoxCollisionShape_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
#include "util/Math.h"
-#include "CollisionShape.h"
+#include "objects/collisionshapes/CollisionShape.h"
namespace orxonox
{
- class _OrxonoxExport BoxCollisionShape : public CollisionShape
+ class _ObjectsExport BoxCollisionShape : public CollisionShape
{
public:
BoxCollisionShape(BaseObject* creator);
Added: code/branches/libraries2/src/modules/objects/collisionshapes/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/modules/objects/collisionshapes/CMakeLists.txt (rev 0)
+++ code/branches/libraries2/src/modules/objects/collisionshapes/CMakeLists.txt 2009-08-31 20:38:48 UTC (rev 5730)
@@ -0,0 +1,6 @@
+ADD_SOURCE_FILES(OBJECTS_SRC_FILES
+ BoxCollisionShape.cc
+ ConeCollisionShape.cc
+ PlaneCollisionShape.cc
+ SphereCollisionShape.cc
+)
Property changes on: code/branches/libraries2/src/modules/objects/collisionshapes/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h
===================================================================
--- code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -29,12 +29,12 @@
#ifndef _ConeCollisionShape_H__
#define _ConeCollisionShape_H__
-#include "OrxonoxPrereqs.h"
-#include "CollisionShape.h"
+#include "objects/ObjectsPrereqs.h"
+#include "objects/collisionshapes/CollisionShape.h"
namespace orxonox
{
- class _OrxonoxExport ConeCollisionShape : public CollisionShape
+ class _ObjectsExport ConeCollisionShape : public CollisionShape
{
public:
ConeCollisionShape(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h
===================================================================
--- code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -29,14 +29,14 @@
#ifndef _PlaneCollisionShape_H__
#define _PlaneCollisionShape_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
#include "util/Math.h"
-#include "CollisionShape.h"
+#include "objects/collisionshapes/CollisionShape.h"
namespace orxonox
{
- class _OrxonoxExport PlaneCollisionShape : public CollisionShape
+ class _ObjectsExport PlaneCollisionShape : public CollisionShape
{
public:
PlaneCollisionShape(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h
===================================================================
--- code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -29,12 +29,12 @@
#ifndef _SphereCollisionShape_H__
#define _SphereCollisionShape_H__
-#include "OrxonoxPrereqs.h"
-#include "CollisionShape.h"
+#include "objects/ObjectsPrereqs.h"
+#include "objects/collisionshapes/CollisionShape.h"
namespace orxonox
{
- class _OrxonoxExport SphereCollisionShape : public CollisionShape
+ class _ObjectsExport SphereCollisionShape : public CollisionShape
{
public:
SphereCollisionShape(BaseObject* creator);
Added: code/branches/libraries2/src/modules/objects/eventsystem/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/modules/objects/eventsystem/CMakeLists.txt (rev 0)
+++ code/branches/libraries2/src/modules/objects/eventsystem/CMakeLists.txt 2009-08-31 20:38:48 UTC (rev 5730)
@@ -0,0 +1,5 @@
+ADD_SOURCE_FILES(OBJECTS_SRC_FILES
+ EventDispatcher.cc
+ EventListener.cc
+ EventTarget.cc
+)
Property changes on: code/branches/libraries2/src/modules/objects/eventsystem/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/libraries2/src/modules/objects/eventsystem/EventDispatcher.h
===================================================================
--- code/branches/libraries2/src/modules/objects/eventsystem/EventDispatcher.h 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/eventsystem/EventDispatcher.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -29,14 +29,14 @@
#ifndef _EventDispatcher_H__
#define _EventDispatcher_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
#include <list>
#include "core/BaseObject.h"
namespace orxonox
{
- class _OrxonoxExport EventDispatcher : public BaseObject
+ class _ObjectsExport EventDispatcher : public BaseObject
{
public:
EventDispatcher(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/objects/eventsystem/EventListener.h
===================================================================
--- code/branches/libraries2/src/modules/objects/eventsystem/EventListener.h 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/eventsystem/EventListener.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -29,7 +29,7 @@
#ifndef _EventListener_H__
#define _EventListener_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
#include <string>
#include "core/BaseObject.h"
@@ -37,7 +37,7 @@
namespace orxonox
{
- class _OrxonoxExport EventListener : public BaseObject, public XMLNameListener
+ class _ObjectsExport EventListener : public BaseObject, public XMLNameListener
{
public:
EventListener(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/objects/eventsystem/EventTarget.h
===================================================================
--- code/branches/libraries2/src/modules/objects/eventsystem/EventTarget.h 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/eventsystem/EventTarget.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -29,14 +29,14 @@
#ifndef _EventTarget_H__
#define _EventTarget_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
#include "core/BaseObject.h"
#include "core/XMLNameListener.h"
namespace orxonox
{
- class _OrxonoxExport EventTarget : public BaseObject, public XMLNameListener
+ class _ObjectsExport EventTarget : public BaseObject, public XMLNameListener
{
public:
EventTarget(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/objects/triggers/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/modules/objects/triggers/CMakeLists.txt 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/triggers/CMakeLists.txt 2009-08-31 20:38:48 UTC (rev 5730)
@@ -1,4 +1,4 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ADD_SOURCE_FILES(OBJECTS_SRC_FILES
Trigger.cc
DistanceTrigger.cc
EventTrigger.cc
Modified: code/branches/libraries2/src/modules/objects/triggers/CheckPoint.h
===================================================================
--- code/branches/libraries2/src/modules/objects/triggers/CheckPoint.h 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/triggers/CheckPoint.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -34,14 +34,14 @@
#ifndef _CheckPoint_H__
#define _CheckPoint_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
#include "interfaces/RadarViewable.h"
#include "DistanceTrigger.h"
namespace orxonox
{
- class _OrxonoxExport CheckPoint : public DistanceTrigger, public RadarViewable
+ class _ObjectsExport CheckPoint : public DistanceTrigger, public RadarViewable
{
public:
CheckPoint(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.h
===================================================================
--- code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.h 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -29,7 +29,7 @@
#ifndef _DistanceTrigger_H__
#define _DistanceTrigger_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
#include <set>
#include "core/ClassTreeMask.h"
@@ -38,7 +38,7 @@
namespace orxonox
{
- class _OrxonoxExport DistanceTrigger : public Trigger, public PlayerTrigger
+ class _ObjectsExport DistanceTrigger : public Trigger, public PlayerTrigger
{
public:
DistanceTrigger(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/objects/triggers/EventTrigger.h
===================================================================
--- code/branches/libraries2/src/modules/objects/triggers/EventTrigger.h 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/triggers/EventTrigger.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -29,12 +29,12 @@
#ifndef _EventTrigger_H__
#define _EventTrigger_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
#include "Trigger.h"
namespace orxonox
{
- class _OrxonoxExport EventTrigger : public Trigger
+ class _ObjectsExport EventTrigger : public Trigger
{
public:
EventTrigger(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/objects/triggers/Trigger.h
===================================================================
--- code/branches/libraries2/src/modules/objects/triggers/Trigger.h 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/objects/triggers/Trigger.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -29,7 +29,7 @@
#ifndef _Trigger_H__
#define _Trigger_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
#include <set>
#include <queue>
@@ -50,7 +50,7 @@
};
}
- class _OrxonoxExport Trigger : public StaticEntity, public Tickable
+ class _ObjectsExport Trigger : public StaticEntity, public Tickable
{
public:
Trigger(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/weapons/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/modules/weapons/CMakeLists.txt 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/modules/weapons/CMakeLists.txt 2009-08-31 20:38:48 UTC (rev 5730)
@@ -12,5 +12,7 @@
"WEAPONS_SHARED_BUILD"
LINK_LIBRARIES
orxonox
+ # TODO: Remove this as soon as projectiles aren't hardcoded anymore buth rather defined in XML
+ objects
SOURCE_FILES ${WEAPONS_SRC_FILES}
)
Modified: code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h 2009-08-31 20:34:20 UTC (rev 5729)
+++ code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h 2009-08-31 20:38:48 UTC (rev 5730)
@@ -106,17 +106,11 @@
class Camera;
// mixed
- class EventListener;
- class EventDispatcher;
- class EventTarget;
-
class SpawnPoint;
class TeamSpawnPoint;
- class Attacher;
class CameraPosition;
class Sublevel;
- class ForceField;
class Radar;
class Test;
@@ -157,12 +151,6 @@
class MultiStateEngine;
class RotatingEngine;
- // trigger
- class Trigger;
- class DistanceTrigger;
- class EventTrigger;
- class CheckPoint;
-
// weaponsystem
class WeaponSystem;
class WeaponSet;
@@ -191,9 +179,7 @@
// collision
class CollisionShape;
- class SphereCollisionShape;
class CompoundCollisionShape;
- class PlaneCollisionShape;
class WorldEntityCollisionShape;
// overlays
More information about the Orxonox-commit
mailing list