[Orxonox-commit 963] r5686 - in code/branches/libraries/src/orxonox: . objects/weaponsystem objects/weaponsystem/munitions objects/weaponsystem/projectiles objects/weaponsystem/weaponmodes
landauf at orxonox.net
landauf at orxonox.net
Sat Aug 29 18:37:04 CEST 2009
Author: landauf
Date: 2009-08-29 18:37:04 +0200 (Sat, 29 Aug 2009)
New Revision: 5686
Added:
code/branches/libraries/src/orxonox/objects/weaponsystem/WeaponsystemPrereqs.h
Modified:
code/branches/libraries/src/orxonox/OrxonoxPrereqs.h
code/branches/libraries/src/orxonox/objects/weaponsystem/CMakeLists.txt
code/branches/libraries/src/orxonox/objects/weaponsystem/MuzzleFlash.h
code/branches/libraries/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h
code/branches/libraries/src/orxonox/objects/weaponsystem/munitions/LaserMunition.h
code/branches/libraries/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h
code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h
code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h
code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.h
code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/Projectile.h
code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h
code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h
code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h
code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h
code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.h
Log:
added WeaponsystemPrereqs.h and _WeaponsystemExport macro
Modified: code/branches/libraries/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- code/branches/libraries/src/orxonox/OrxonoxPrereqs.h 2009-08-29 15:33:03 UTC (rev 5685)
+++ code/branches/libraries/src/orxonox/OrxonoxPrereqs.h 2009-08-29 16:37:04 UTC (rev 5686)
@@ -63,31 +63,34 @@
namespace orxonox
{
- class RadarViewable;
- class Radar;
- class RadarListener;
-
- class Teamcolourable;
-
+ // manager
class CameraManager;
class LevelManager;
class PawnManager;
class PlayerManager;
+ // interfaces
+ class GametypeMessageListener;
+ class NotificationListener;
+ class PawnListener;
+ class RadarListener;
+ class RadarViewable;
+ class Rewardable;
+ class Teamcolourable;
+
// objects
class Level;
class Scene;
class Tickable;
+ // worldentities
class WorldEntity;
class StaticEntity;
class MobileEntity;
class ControllableEntity;
class MovableEntity;
- class Sublevel;
- class ForceField;
- class Attacher;
+ // graphics
class Model;
class Billboard;
class BlinkingBillboard;
@@ -99,23 +102,45 @@
class Backlight;
class ParticleEmitter;
class ParticleSpawner;
+ class Camera;
+ // mixed
class PongCenterpoint;
class PongBall;
class PongBat;
- class Camera;
- class CameraPosition;
+ class EventListener;
+ class EventDispatcher;
+ class EventTarget;
+
class SpawnPoint;
class TeamSpawnPoint;
+
+ class Attacher;
+ class CameraPosition;
+ class Sublevel;
+ class ForceField;
+ class Radar;
+
class Test;
+ // pawns
class Spectator;
class Pawn;
class SpaceShip;
class TeamBaseMatchBase;
class Destroyer;
+ // gametypes
+ class Gametype;
+ class Deathmatch;
+ class TeamDeathmatch;
+ class Asteroids;
+ class TeamBaseMatch;
+ class UnderAttack;
+ class Pong;
+
+ // pickups
class BaseItem;
class DroppedItem;
class EquipmentItem;
@@ -130,17 +155,20 @@
class HealthUsable;
class PassiveItem;
+ // items
class Item;
class Engine;
class MultiStateEngine;
class RotatingEngine;
+ // trigger
class Trigger;
class DistanceTrigger;
class EventTrigger;
class PlayerTrigger;
class CheckPoint;
+ // weaponsystem
class WeaponSystem;
class WeaponSet;
class WeaponSlot;
@@ -148,28 +176,9 @@
class Weapon;
class WeaponMode;
class DefaultWeaponmodeLink;
- class MuzzleFlash;
-
- class LaserFire;
- class FusionFire;
- class HsW01;
- class LightningGun;
- class EnergyDrink;
-
- class ReplenishingMunition;
class Munition;
- class LaserMunition;
- class FusionMunition;
- class Projectile;
- class BillboardProjectile;
- class ParticleProjectile;
- class LightningGunProjectile;
-
- class EventListener;
- class EventDispatcher;
- class EventTarget;
-
+ // controller
class Controller;
class HumanController;
class ArtificialController;
@@ -179,6 +188,7 @@
class WaypointPatrolController;
class PongAI;
+ // infos
class Info;
class PlayerInfo;
class HumanPlayer;
@@ -186,14 +196,6 @@
class PongBot;
class GametypeInfo;
- class Gametype;
- class Deathmatch;
- class TeamDeathmatch;
- class Asteroids;
- class TeamBaseMatch;
- class UnderAttack;
- class Pong;
-
// collision
class CollisionShape;
class SphereCollisionShape;
@@ -205,7 +207,6 @@
class OverlayGroup;
class OrxonoxOverlay;
class Notification;
- class NotificationListener;
class NotificationManager;
class InGameConsole;
class Map;
Modified: code/branches/libraries/src/orxonox/objects/weaponsystem/CMakeLists.txt
===================================================================
--- code/branches/libraries/src/orxonox/objects/weaponsystem/CMakeLists.txt 2009-08-29 15:33:03 UTC (rev 5685)
+++ code/branches/libraries/src/orxonox/objects/weaponsystem/CMakeLists.txt 2009-08-29 16:37:04 UTC (rev 5686)
@@ -20,6 +20,8 @@
ORXONOX_ADD_LIBRARY(weaponsystem
MODULE
+ DEFINE_SYMBOL
+ "WEAPONSYSTEM_SHARED_BUILD"
LINK_LIBRARIES
orxonox
SOURCE_FILES ${WEAPONSYSTEM_SRC_FILES}
Modified: code/branches/libraries/src/orxonox/objects/weaponsystem/MuzzleFlash.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/weaponsystem/MuzzleFlash.h 2009-08-29 15:33:03 UTC (rev 5685)
+++ code/branches/libraries/src/orxonox/objects/weaponsystem/MuzzleFlash.h 2009-08-29 16:37:04 UTC (rev 5686)
@@ -29,14 +29,14 @@
#ifndef _MuzzleFlash_H__
#define _MuzzleFlash_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
#include "tools/Timer.h"
#include "objects/worldentities/Billboard.h"
namespace orxonox
{
- class _OrxonoxExport MuzzleFlash : public Billboard
+ class _WeaponsystemExport MuzzleFlash : public Billboard
{
public:
MuzzleFlash(BaseObject* creator);
Added: code/branches/libraries/src/orxonox/objects/weaponsystem/WeaponsystemPrereqs.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/weaponsystem/WeaponsystemPrereqs.h (rev 0)
+++ code/branches/libraries/src/orxonox/objects/weaponsystem/WeaponsystemPrereqs.h 2009-08-29 16:37:04 UTC (rev 5686)
@@ -0,0 +1,84 @@
+/*
+ * 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 _WeaponsystemPrereqs_H__
+#define _WeaponsystemPrereqs_H__
+
+#include "OrxonoxConfig.h"
+
+#include "OrxonoxPrereqs.h"
+
+//-----------------------------------------------------------------------
+// Shared library settings
+//-----------------------------------------------------------------------
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
+# ifdef WEAPONSYSTEM_SHARED_BUILD
+# define _WeaponsystemExport __declspec(dllexport)
+# else
+# if defined( __MINGW32__ )
+# define _WeaponsystemExport
+# else
+# define _WeaponsystemExport __declspec(dllimport)
+# endif
+# endif
+#elif defined ( ORXONOX_GCC_VISIBILITY )
+# define _WeaponsystemExport __attribute__ ((visibility("default")))
+#else
+# define _WeaponsystemExport
+#endif
+
+//-----------------------------------------------------------------------
+// Forward declarations
+//-----------------------------------------------------------------------
+
+namespace orxonox
+{
+ class LaserFire;
+ class FusionFire;
+ class HsW01;
+ class LightningGun;
+ class EnergyDrink;
+
+ class Projectile;
+ class BillboardProjectile;
+ class ParticleProjectile;
+ class LightningGunProjectile;
+
+ class ReplenishingMunition;
+ class LaserMunition;
+ class FusionMunition;
+
+ class MuzzleFlash;
+}
+
+#endif /* _WeaponsystemPrereqs_H__ */
Property changes on: code/branches/libraries/src/orxonox/objects/weaponsystem/WeaponsystemPrereqs.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/libraries/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h 2009-08-29 15:33:03 UTC (rev 5685)
+++ code/branches/libraries/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h 2009-08-29 16:37:04 UTC (rev 5686)
@@ -29,12 +29,12 @@
#ifndef _FusionMunition_H__
#define _FusionMunition_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
#include "objects/weaponsystem/Munition.h"
namespace orxonox
{
- class _OrxonoxExport FusionMunition : public Munition
+ class _WeaponsystemExport FusionMunition : public Munition
{
public:
FusionMunition(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/objects/weaponsystem/munitions/LaserMunition.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/weaponsystem/munitions/LaserMunition.h 2009-08-29 15:33:03 UTC (rev 5685)
+++ code/branches/libraries/src/orxonox/objects/weaponsystem/munitions/LaserMunition.h 2009-08-29 16:37:04 UTC (rev 5686)
@@ -29,12 +29,12 @@
#ifndef _LaserMunition_H__
#define _LaserMunition_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
#include "ReplenishingMunition.h"
namespace orxonox
{
- class _OrxonoxExport LaserMunition : public ReplenishingMunition
+ class _WeaponsystemExport LaserMunition : public ReplenishingMunition
{
public:
LaserMunition(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h 2009-08-29 15:33:03 UTC (rev 5685)
+++ code/branches/libraries/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h 2009-08-29 16:37:04 UTC (rev 5686)
@@ -29,14 +29,14 @@
#ifndef _ReplenishingMunition_H__
#define _ReplenishingMunition_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
#include "tools/Timer.h"
#include "objects/weaponsystem/Munition.h"
namespace orxonox
{
- class _OrxonoxExport ReplenishingMunition : public Munition
+ class _WeaponsystemExport ReplenishingMunition : public Munition
{
public:
ReplenishingMunition(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h 2009-08-29 15:33:03 UTC (rev 5685)
+++ code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h 2009-08-29 16:37:04 UTC (rev 5686)
@@ -29,7 +29,7 @@
#ifndef _BillboardProjectile_H__
#define _BillboardProjectile_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
#include "util/Math.h"
#include "tools/BillboardSet.h"
@@ -37,7 +37,7 @@
namespace orxonox
{
- class _OrxonoxExport BillboardProjectile : public Projectile
+ class _WeaponsystemExport BillboardProjectile : public Projectile
{
public:
BillboardProjectile(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h 2009-08-29 15:33:03 UTC (rev 5685)
+++ code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h 2009-08-29 16:37:04 UTC (rev 5686)
@@ -29,7 +29,7 @@
#ifndef _LightningGunProjectile_H__
#define _LightningGunProjectile_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
#include <string>
#include "tools/Timer.h"
@@ -37,16 +37,16 @@
namespace orxonox
{
- class _OrxonoxExport LightningGunProjectile : public BillboardProjectile
+ class _WeaponsystemExport LightningGunProjectile : public BillboardProjectile
{
public:
LightningGunProjectile(BaseObject* creator);
virtual ~LightningGunProjectile() {}
-
+
virtual void setMaterial(const std::string& material);
protected:
- void changeTexture();
+ void changeTexture();
unsigned int textureIndex_;
unsigned int maxTextureIndex_;
Timer<LightningGunProjectile> textureTimer_;
Modified: code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.h 2009-08-29 15:33:03 UTC (rev 5685)
+++ code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.h 2009-08-29 16:37:04 UTC (rev 5686)
@@ -29,12 +29,12 @@
#ifndef _ParticleProjectile_H__
#define _ParticleProjectile_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
#include "BillboardProjectile.h"
namespace orxonox
{
- class _OrxonoxExport ParticleProjectile : public BillboardProjectile
+ class _WeaponsystemExport ParticleProjectile : public BillboardProjectile
{
public:
ParticleProjectile(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/Projectile.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/Projectile.h 2009-08-29 15:33:03 UTC (rev 5685)
+++ code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/Projectile.h 2009-08-29 16:37:04 UTC (rev 5686)
@@ -29,7 +29,7 @@
#ifndef _Projectile_H__
#define _Projectile_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
#include "tools/Timer.h"
#include "interfaces/PawnListener.h"
@@ -37,7 +37,7 @@
namespace orxonox
{
- class _OrxonoxExport Projectile : public MovableEntity, public PawnListener
+ class _WeaponsystemExport Projectile : public MovableEntity, public PawnListener
{
public:
Projectile(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h 2009-08-29 15:33:03 UTC (rev 5685)
+++ code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h 2009-08-29 16:37:04 UTC (rev 5686)
@@ -29,7 +29,7 @@
#ifndef _EnergyDrink_H__
#define _EnergyDrink_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
#include <string>
#include "tools/Timer.h"
@@ -37,7 +37,7 @@
namespace orxonox
{
- class _OrxonoxExport EnergyDrink : public WeaponMode
+ class _WeaponsystemExport EnergyDrink : public WeaponMode
{
public:
EnergyDrink(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h 2009-08-29 15:33:03 UTC (rev 5685)
+++ code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h 2009-08-29 16:37:04 UTC (rev 5686)
@@ -29,12 +29,12 @@
#ifndef _FusionFire_H__
#define _FusionFire_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
#include "objects/weaponsystem/WeaponMode.h"
namespace orxonox
{
- class _OrxonoxExport FusionFire : public WeaponMode
+ class _WeaponsystemExport FusionFire : public WeaponMode
{
public:
FusionFire(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h 2009-08-29 15:33:03 UTC (rev 5685)
+++ code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h 2009-08-29 16:37:04 UTC (rev 5686)
@@ -29,14 +29,14 @@
#ifndef _HsW01_H__
#define _HsW01_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
#include "tools/Timer.h"
#include "objects/weaponsystem/WeaponMode.h"
namespace orxonox
{
- class _OrxonoxExport HsW01 : public WeaponMode
+ class _WeaponsystemExport HsW01 : public WeaponMode
{
public:
HsW01(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h 2009-08-29 15:33:03 UTC (rev 5685)
+++ code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h 2009-08-29 16:37:04 UTC (rev 5686)
@@ -29,12 +29,12 @@
#ifndef _LaserFire_H__
#define _LaserFire_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
#include "objects/weaponsystem/WeaponMode.h"
namespace orxonox
{
- class _OrxonoxExport LaserFire : public WeaponMode
+ class _WeaponsystemExport LaserFire : public WeaponMode
{
public:
LaserFire(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.h 2009-08-29 15:33:03 UTC (rev 5685)
+++ code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.h 2009-08-29 16:37:04 UTC (rev 5686)
@@ -29,12 +29,12 @@
#ifndef _LightningGun_H__
#define _LightningGun_H__
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
#include "objects/weaponsystem/WeaponMode.h"
namespace orxonox
{
- class _OrxonoxExport LightningGun : public WeaponMode
+ class _WeaponsystemExport LightningGun : public WeaponMode
{
public:
LightningGun(BaseObject* creator);
More information about the Orxonox-commit
mailing list