Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5686


Ignore:
Timestamp:
Aug 29, 2009, 6:37:04 PM (15 years ago)
Author:
landauf
Message:

added WeaponsystemPrereqs.h and _WeaponsystemExport macro

Location:
code/branches/libraries/src/orxonox
Files:
1 added
15 edited

Legend:

Unmodified
Added
Removed

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

    r5648 r5686  
    6464namespace orxonox
    6565{
    66     class RadarViewable;
    67     class Radar;
    68     class RadarListener;
    69 
    70     class Teamcolourable;
    71 
     66    // manager
    7267    class CameraManager;
    7368    class LevelManager;
    … …  
    7570    class PlayerManager;
    7671
     72    // interfaces
     73    class GametypeMessageListener;
     74    class NotificationListener;
     75    class PawnListener;
     76    class RadarListener;
     77    class RadarViewable;
     78    class Rewardable;
     79    class Teamcolourable;
     80
    7781    // objects
    7882    class Level;
    … …  
    8084    class Tickable;
    8185
     86    // worldentities
    8287    class WorldEntity;
    8388    class StaticEntity;
    … …  
    8590    class ControllableEntity;
    8691    class MovableEntity;
    87     class Sublevel;
    88     class ForceField;
    89     class Attacher;
    90 
     92
     93    // graphics
    9194    class Model;
    9295    class Billboard;
    … …  
    100103    class ParticleEmitter;
    101104    class ParticleSpawner;
    102 
     105    class Camera;
     106
     107    // mixed
    103108    class PongCenterpoint;
    104109    class PongBall;
    105110    class PongBat;
    106111
    107     class Camera;
    108     class CameraPosition;
     112    class EventListener;
     113    class EventDispatcher;
     114    class EventTarget;
     115
    109116    class SpawnPoint;
    110117    class TeamSpawnPoint;
     118
     119    class Attacher;
     120    class CameraPosition;
     121    class Sublevel;
     122    class ForceField;
     123    class Radar;
     124
    111125    class Test;
    112126
     127    // pawns
    113128    class Spectator;
    114129    class Pawn;
    … …  
    117132    class Destroyer;
    118133
     134    // gametypes
     135    class Gametype;
     136    class Deathmatch;
     137    class TeamDeathmatch;
     138    class Asteroids;
     139    class TeamBaseMatch;
     140    class UnderAttack;
     141    class Pong;
     142
     143    // pickups
    119144    class BaseItem;
    120145    class DroppedItem;
    … …  
    131156    class PassiveItem;
    132157
     158    // items
    133159    class Item;
    134160    class Engine;
    … …  
    136162    class RotatingEngine;
    137163
     164    // trigger
    138165    class Trigger;
    139166    class DistanceTrigger;
    … …  
    142169    class CheckPoint;
    143170
     171    // weaponsystem
    144172    class WeaponSystem;
    145173    class WeaponSet;
    … …  
    149177    class WeaponMode;
    150178    class DefaultWeaponmodeLink;
    151     class MuzzleFlash;
    152 
    153     class LaserFire;
    154     class FusionFire;
    155     class HsW01;
    156     class LightningGun;
    157     class EnergyDrink;
    158 
    159     class ReplenishingMunition;
    160179    class Munition;
    161     class LaserMunition;
    162     class FusionMunition;
    163 
    164     class Projectile;
    165     class BillboardProjectile;
    166     class ParticleProjectile;
    167     class LightningGunProjectile;
    168 
    169     class EventListener;
    170     class EventDispatcher;
    171     class EventTarget;
    172 
     180
     181    // controller
    173182    class Controller;
    174183    class HumanController;
    … …  
    180189    class PongAI;
    181190
     191    // infos
    182192    class Info;
    183193    class PlayerInfo;
    … …  
    187197    class GametypeInfo;
    188198
    189     class Gametype;
    190     class Deathmatch;
    191     class TeamDeathmatch;
    192     class Asteroids;
    193     class TeamBaseMatch;
    194     class UnderAttack;
    195     class Pong;
    196 
    197199    // collision
    198200    class CollisionShape;
    … …  
    206208    class OrxonoxOverlay;
    207209    class Notification;
    208     class NotificationListener;
    209210    class NotificationManager;
    210211    class InGameConsole;

  • code/branches/libraries/src/orxonox/objects/weaponsystem/CMakeLists.txt

    r5685 r5686  
    2121ORXONOX_ADD_LIBRARY(weaponsystem
    2222  MODULE
     23  DEFINE_SYMBOL
     24    "WEAPONSYSTEM_SHARED_BUILD"
    2325  LINK_LIBRARIES
    2426    orxonox

  • code/branches/libraries/src/orxonox/objects/weaponsystem/MuzzleFlash.h

    r3196 r5686  
    3030#define _MuzzleFlash_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/weaponsystem/WeaponsystemPrereqs.h"
    3333
    3434#include "tools/Timer.h"
    … …  
    3737namespace orxonox
    3838{
    39     class _OrxonoxExport MuzzleFlash : public Billboard
     39    class _WeaponsystemExport MuzzleFlash : public Billboard
    4040    {
    4141        public:

  • code/branches/libraries/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h

    r3053 r5686  
    3030#define _FusionMunition_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/weaponsystem/WeaponsystemPrereqs.h"
    3333#include "objects/weaponsystem/Munition.h"
    3434
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport FusionMunition : public Munition
     37    class _WeaponsystemExport FusionMunition : public Munition
    3838    {
    3939        public:

  • code/branches/libraries/src/orxonox/objects/weaponsystem/munitions/LaserMunition.h

    r3053 r5686  
    3030#define _LaserMunition_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/weaponsystem/WeaponsystemPrereqs.h"
    3333#include "ReplenishingMunition.h"
    3434
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport LaserMunition : public ReplenishingMunition
     37    class _WeaponsystemExport LaserMunition : public ReplenishingMunition
    3838    {
    3939        public:

  • code/branches/libraries/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h

    r3196 r5686  
    3030#define _ReplenishingMunition_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/weaponsystem/WeaponsystemPrereqs.h"
    3333
    3434#include "tools/Timer.h"
    … …  
    3737namespace orxonox
    3838{
    39     class _OrxonoxExport ReplenishingMunition : public Munition
     39    class _WeaponsystemExport ReplenishingMunition : public Munition
    4040    {
    4141        public:

  • code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h

    r3196 r5686  
    3030#define _BillboardProjectile_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/weaponsystem/WeaponsystemPrereqs.h"
    3333
    3434#include "util/Math.h"
    … …  
    3838namespace orxonox
    3939{
    40     class _OrxonoxExport BillboardProjectile : public Projectile
     40    class _WeaponsystemExport BillboardProjectile : public Projectile
    4141    {
    4242        public:

  • code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h

    r3196 r5686  
    3030#define _LightningGunProjectile_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/weaponsystem/WeaponsystemPrereqs.h"
    3333
    3434#include <string>
    … …  
    3838namespace orxonox
    3939{
    40     class _OrxonoxExport LightningGunProjectile : public BillboardProjectile
     40    class _WeaponsystemExport LightningGunProjectile : public BillboardProjectile
    4141    {
    4242        public:
    4343            LightningGunProjectile(BaseObject* creator);
    4444            virtual ~LightningGunProjectile() {}
    45            
     45
    4646            virtual void setMaterial(const std::string& material);
    4747
    4848        protected:
    49             void changeTexture();       
     49            void changeTexture();
    5050            unsigned int textureIndex_;
    5151            unsigned int maxTextureIndex_;

  • code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.h

    r3196 r5686  
    3030#define _ParticleProjectile_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/weaponsystem/WeaponsystemPrereqs.h"
    3333#include "BillboardProjectile.h"
    3434
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport ParticleProjectile : public BillboardProjectile
     37    class _WeaponsystemExport ParticleProjectile : public BillboardProjectile
    3838    {
    3939        public:

  • code/branches/libraries/src/orxonox/objects/weaponsystem/projectiles/Projectile.h

    r3196 r5686  
    3030#define _Projectile_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/weaponsystem/WeaponsystemPrereqs.h"
    3333
    3434#include "tools/Timer.h"
    … …  
    3838namespace orxonox
    3939{
    40     class _OrxonoxExport Projectile : public MovableEntity, public PawnListener
     40    class _WeaponsystemExport Projectile : public MovableEntity, public PawnListener
    4141    {
    4242        public:

  • code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h

    r3196 r5686  
    3030#define _EnergyDrink_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/weaponsystem/WeaponsystemPrereqs.h"
    3333
    3434#include <string>
    … …  
    3838namespace orxonox
    3939{
    40     class _OrxonoxExport EnergyDrink : public WeaponMode
     40    class _WeaponsystemExport EnergyDrink : public WeaponMode
    4141    {
    4242        public:

  • code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h

    r3053 r5686  
    3030#define _FusionFire_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/weaponsystem/WeaponsystemPrereqs.h"
    3333#include "objects/weaponsystem/WeaponMode.h"
    3434
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport FusionFire : public WeaponMode
     37    class _WeaponsystemExport FusionFire : public WeaponMode
    3838    {
    3939        public:

  • code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h

    r3196 r5686  
    3030#define _HsW01_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/weaponsystem/WeaponsystemPrereqs.h"
    3333
    3434#include "tools/Timer.h"
    … …  
    3737namespace orxonox
    3838{
    39     class _OrxonoxExport HsW01 : public WeaponMode
     39    class _WeaponsystemExport HsW01 : public WeaponMode
    4040    {
    4141        public:

  • code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h

    r3053 r5686  
    3030#define _LaserFire_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/weaponsystem/WeaponsystemPrereqs.h"
    3333#include "objects/weaponsystem/WeaponMode.h"
    3434
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport LaserFire : public WeaponMode
     37    class _WeaponsystemExport LaserFire : public WeaponMode
    3838    {
    3939        public:

  • code/branches/libraries/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.h

    r3053 r5686  
    3030#define _LightningGun_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/weaponsystem/WeaponsystemPrereqs.h"
    3333#include "objects/weaponsystem/WeaponMode.h"
    3434
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport LightningGun : public WeaponMode
     37    class _WeaponsystemExport LightningGun : public WeaponMode
    3838    {
    3939        public:
Note: See TracChangeset for help on using the changeset viewer.