[Orxonox-commit 1137] r5858 - in code/branches/core5/src: libraries/core libraries/network libraries/tools libraries/util modules/objects modules/overlays modules/pong modules/questsystem modules/weapons orxonox orxonox/graphics orxonox/interfaces
rgrieder at orxonox.net
rgrieder at orxonox.net
Fri Oct 2 11:41:01 CEST 2009
Author: rgrieder
Date: 2009-10-02 11:41:00 +0200 (Fri, 02 Oct 2009)
New Revision: 5858
Modified:
code/branches/core5/src/libraries/core/BaseObject.cc
code/branches/core5/src/libraries/core/CorePrereqs.h
code/branches/core5/src/libraries/core/XMLPort.h
code/branches/core5/src/libraries/network/NetworkPrereqs.h
code/branches/core5/src/libraries/tools/ToolsPrereqs.h
code/branches/core5/src/libraries/util/Scope.h
code/branches/core5/src/libraries/util/UtilPrereqs.h
code/branches/core5/src/modules/objects/ObjectsPrereqs.h
code/branches/core5/src/modules/overlays/OverlaysPrereqs.h
code/branches/core5/src/modules/pong/PongPrereqs.h
code/branches/core5/src/modules/questsystem/QuestsystemPrereqs.h
code/branches/core5/src/modules/weapons/WeaponsPrereqs.h
code/branches/core5/src/orxonox/OrxonoxPrereqs.h
code/branches/core5/src/orxonox/graphics/ParticleEmitter.h
code/branches/core5/src/orxonox/interfaces/NotificationListener.h
code/branches/core5/src/orxonox/interfaces/RadarViewable.h
Log:
Cleanup in *Prereqs.h files
- Removed forward declarations to non-existent classes
- Ordered all declarations by name and folder
- introduce new section: "Enums" for those files with enums.
- Added missing declarations
Modified: code/branches/core5/src/libraries/core/BaseObject.cc
===================================================================
--- code/branches/core5/src/libraries/core/BaseObject.cc 2009-10-02 08:47:44 UTC (rev 5857)
+++ code/branches/core5/src/libraries/core/BaseObject.cc 2009-10-02 09:41:00 UTC (rev 5858)
@@ -45,7 +45,6 @@
#include "XMLFile.h"
#include "XMLNameListener.h"
#include "XMLPort.h"
-#include "network/NetworkPrereqs.h"
namespace orxonox
{
Modified: code/branches/core5/src/libraries/core/CorePrereqs.h
===================================================================
--- code/branches/core5/src/libraries/core/CorePrereqs.h 2009-10-02 08:47:44 UTC (rev 5857)
+++ code/branches/core5/src/libraries/core/CorePrereqs.h 2009-10-02 09:41:00 UTC (rev 5858)
@@ -27,8 +27,9 @@
*/
/**
- @file
- @brief Contains all the necessary forward declarations for all classes and structs.
+ at file
+ at brief
+ Shared library macros, enums, constants and forward declarations for the core library
*/
#ifndef _CorePrereqs_H__
@@ -39,6 +40,7 @@
//-----------------------------------------------------------------------
// Shared library settings
//-----------------------------------------------------------------------
+
#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined( CORE_STATIC_BUILD )
# ifdef CORE_SHARED_BUILD
# define _CoreExport __declspec(dllexport)
@@ -55,10 +57,19 @@
# define _CoreExport
#endif
+//-----------------------------------------------------------------------
+// Constants
+//-----------------------------------------------------------------------
+namespace orxonox
+{
+ static const uint32_t OBJECTID_UNKNOWN = static_cast<uint32_t>(-1);
+}
+
//-----------------------------------------------------------------------
-// Forward declarations
+// Enums
//-----------------------------------------------------------------------
+
namespace orxonox
{
namespace XMLPort
@@ -81,12 +92,18 @@
None
};
};
+}
+//-----------------------------------------------------------------------
+// Forward declarations
+//-----------------------------------------------------------------------
+
+namespace orxonox
+{
typedef std::string LanguageEntryLabel;
class ArgumentCompleter;
class ArgumentCompletionListElement;
- class BaseMetaObjectListElement;
class BaseObject;
template <class T>
class ClassFactory;
@@ -97,7 +114,6 @@
class ClassTreeMaskNode;
class ClassTreeMaskObjectIterator;
class CommandEvaluation;
- class CommandExecutor;
class CommandLine;
class CommandLineArgument;
class ConfigFile;
@@ -106,6 +122,7 @@
class ConfigFileEntryValue;
class ConfigFileManager;
class ConfigFileSection;
+ struct ConfigFileType;
class ConfigValueContainer;
class ConsoleCommand;
class Core;
@@ -122,16 +139,17 @@
template <class T>
class FunctorMember;
class FunctorStatic;
+ class Game;
+ class GameState;
+ struct GameStateInfo;
+ struct GameStateTreeNode;
class GraphicsManager;
class GUIManager;
class Identifier;
class IRC;
template <class T>
class Iterator;
- class IteratorBase;
class Language;
- class LanguageEntry;
- class Loader;
class LuaState;
class MemoryArchive;
class MemoryArchiveFactory;
@@ -163,6 +181,8 @@
class TclThreadList;
class TclThreadManager;
class Template;
+ class Thread;
+ class ThreadPool;
template <class T>
class WeakPtr;
class WindowEventListener;
@@ -175,17 +195,10 @@
class XMLPortObjectContainer;
class XMLPortParamContainer;
- // game states
- class Game;
- class GameState;
- struct GameStateInfo;
- struct GameStateTreeNode;
-
- // input
+ // Input
class BaseCommand;
class BufferedParamCommand;
class Button;
- class CalibratorCallback;
class HalfAxis;
class InputBuffer;
class InputDevice;
@@ -194,18 +207,16 @@
class InputHandler;
class InputManager;
class InputState;
+ struct InputStatePriority;
+ class JoyStickQuantityListener;
class JoyStick;
- class Mouse;
+ class KeyBinder;
class Keyboard;
- class KeyBinder;
class KeyDetector;
+ class KeyEvent;
+ class Mouse;
class ParamCommand;
class SimpleCommand;
-
-
- // multithreading
- class Thread;
- class ThreadPool;
}
// CppTcl
@@ -284,14 +295,7 @@
}
namespace orxonox
{
- using ticpp::Document;
using ticpp::Element;
- using ticpp::Declaration;
- using ticpp::StylesheetReference;
- using ticpp::Text;
- using ticpp::Comment;
- using ticpp::Attribute;
}
-
#endif /* _CorePrereqs_H__ */
Modified: code/branches/core5/src/libraries/core/XMLPort.h
===================================================================
--- code/branches/core5/src/libraries/core/XMLPort.h 2009-10-02 08:47:44 UTC (rev 5857)
+++ code/branches/core5/src/libraries/core/XMLPort.h 2009-10-02 09:41:00 UTC (rev 5858)
@@ -375,7 +375,7 @@
{
this->owner_->xmlAttributes_.clear();
// Iterate through the attributes manually in order to make them case insensitive
- Attribute* attribute = xmlelement.FirstAttribute(false);
+ ticpp::Attribute* attribute = xmlelement.FirstAttribute(false);
while (attribute != 0)
{
this->owner_->xmlAttributes_[getLowercase(attribute->Name())] = attribute->Value();
Modified: code/branches/core5/src/libraries/network/NetworkPrereqs.h
===================================================================
--- code/branches/core5/src/libraries/network/NetworkPrereqs.h 2009-10-02 08:47:44 UTC (rev 5857)
+++ code/branches/core5/src/libraries/network/NetworkPrereqs.h 2009-10-02 09:41:00 UTC (rev 5858)
@@ -27,8 +27,9 @@
*/
/**
- @file
- @brief Contains all the necessary forward declarations for all classes and structs.
+ at file
+ at brief
+ Shared library macros, enums, constants and forward declarations for the network library
*/
#ifndef _NetworkPrereqs_H__
@@ -39,6 +40,7 @@
//-----------------------------------------------------------------------
// Shared library settings
//-----------------------------------------------------------------------
+
#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined( NETWORK_STATIC_BUILD )
# ifdef NETWORK_SHARED_BUILD
# define _NetworkExport __declspec(dllexport)
@@ -56,16 +58,36 @@
#endif
//-----------------------------------------------------------------------
-// Library global contants
+// Constants
//-----------------------------------------------------------------------
+
namespace orxonox
{
static const unsigned int GAMESTATEID_INITIAL = static_cast<unsigned int>(-1);
static const unsigned int CLIENTID_UNKNOWN = static_cast<unsigned int>(-2);
- static const uint32_t OBJECTID_UNKNOWN = static_cast<uint32_t>(-1);
}
//-----------------------------------------------------------------------
+// Enums
+//-----------------------------------------------------------------------
+
+namespace orxonox
+{
+ namespace packet
+ {
+ namespace PacketFlag
+ {
+ enum Value
+ {
+ Reliable = 1,
+ Unsequence = 2,
+ NoAllocate = 4
+ };
+ }
+ }
+}
+
+//-----------------------------------------------------------------------
// Forward declarations
//-----------------------------------------------------------------------
@@ -83,61 +105,53 @@
namespace orxonox
{
+ class ChatListener;
class Client;
class ClientConnection;
class ClientConnectionListener;
- class ClientFrameListener;
class ClientInformation;
class Connection;
class FunctionCallManager;
class GamestateClient;
+ class GamestateHandler;
class GamestateManager;
- class GamestateHandler;
- class NetworkCallbackBase;
- template <class T> class NetworkCallback;
- class NetworkCallbackManager;
+ class Host;
class NetworkFunctionBase;
+ struct NetworkFunctionPointer;
class NetworkFunctionStatic;
+ template <class T>
+ class NetworkMemberFunction;
class NetworkMemberFunctionBase;
- template <class T> class NetworkMemeberFunction;
- struct NetworkFunctionPointer;
class Server;
class ServerConnection;
- class ServerFrameListener;
- class Synchronisable;
- class SynchronisableVariableBase;
- template <class T> class SynchronisableVariable;
- template <class T> class SynchronisableVariableBidirectional;
- struct ClientList;
- struct PacketEnvelope;
- struct QueueItem;
- struct syncData;
class TrafficControl;
- class obj;
- class objInfo;
+ // packet
namespace packet
{
class Acknowledgement;
class Chat;
class ClassID;
+ class DeleteObjects;
class FunctionCalls;
class FunctionIDs;
class Gamestate;
- class NetworkIDs;
class Packet;
class Welcome;
+ }
- namespace PacketFlag
- {
- enum Value
- {
- Reliable = 1,
- Unsequence = 2,
- NoAllocate = 4
- };
- }
- }
+ // synchronisable
+ template <class T>
+ class NetworkCallback;
+ class NetworkCallbackBase;
+ class NetworkCallbackManager;
+ class Synchronisable;
+ class SynchronisableHeader;
+ template <class T>
+ class SynchronisableVariable;
+ class SynchronisableVariableBase;
+ template <class T>
+ class SynchronisableVariableBidirectional;
}
#endif /* _NetworkPrereqs_H__ */
Modified: code/branches/core5/src/libraries/tools/ToolsPrereqs.h
===================================================================
--- code/branches/core5/src/libraries/tools/ToolsPrereqs.h 2009-10-02 08:47:44 UTC (rev 5857)
+++ code/branches/core5/src/libraries/tools/ToolsPrereqs.h 2009-10-02 09:41:00 UTC (rev 5858)
@@ -27,8 +27,9 @@
*/
/**
- @file
- @brief Contains all the necessary forward declarations for all classes and structs.
+ at file
+ at brief
+ Shared library macros, enums, constants and forward declarations for the tools module
*/
#ifndef _ToolsPrereqs_H__
@@ -39,6 +40,7 @@
//-----------------------------------------------------------------------
// Shared library settings
//-----------------------------------------------------------------------
+
#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
# ifdef TOOLS_SHARED_BUILD
# define _ToolsExport __declspec(dllexport)
@@ -56,7 +58,7 @@
#endif
//-----------------------------------------------------------------------
-// Forward declarations
+// Enums
//-----------------------------------------------------------------------
namespace orxonox
@@ -71,11 +73,22 @@
High = 3
};
}
+}
+//-----------------------------------------------------------------------
+// Forward declarations
+//-----------------------------------------------------------------------
+
+namespace orxonox
+{
class BillboardSet;
class Mesh;
class ParticleInterface;
+ class ResourceCollection;
+ class ResourceLocation;
class Shader;
+ class Tickable;
+ class TimeFactorListener;
class Timer;
}
Modified: code/branches/core5/src/libraries/util/Scope.h
===================================================================
--- code/branches/core5/src/libraries/util/Scope.h 2009-10-02 08:47:44 UTC (rev 5857)
+++ code/branches/core5/src/libraries/util/Scope.h 2009-10-02 09:41:00 UTC (rev 5858)
@@ -38,22 +38,6 @@
namespace orxonox
{
- namespace ScopeID
- {
- /**
- @brief A list of available scopes for the Scope template.
- */
- enum Value
- {
- Root,
- Graphics
- };
- }
-
- // Forward declarations
- class ScopeListener;
- class Clock;
-
/**
@brief The ScopeManager stores the variables of the scope templates in a statically linked context.
*/
Modified: code/branches/core5/src/libraries/util/UtilPrereqs.h
===================================================================
--- code/branches/core5/src/libraries/util/UtilPrereqs.h 2009-10-02 08:47:44 UTC (rev 5857)
+++ code/branches/core5/src/libraries/util/UtilPrereqs.h 2009-10-02 09:41:00 UTC (rev 5858)
@@ -27,8 +27,9 @@
*/
/**
- @file
- @brief Contains all the necessary forward declarations for all classes and structs.
+ at file
+ at brief
+ Shared library macros, enums, constants and forward declarations for the util library
*/
#ifndef _UtilPrereqs_H__
@@ -39,6 +40,7 @@
//-----------------------------------------------------------------------
// Shared library settings
//-----------------------------------------------------------------------
+
#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined( UTIL_STATIC_BUILD )
# ifdef UTIL_SHARED_BUILD
# define _UtilExport __declspec(dllexport)
@@ -55,7 +57,23 @@
# define _UtilExport
#endif
+//-----------------------------------------------------------------------
+// Enums
+//-----------------------------------------------------------------------
+namespace orxonox
+{
+ namespace ScopeID
+ {
+ //!A list of available scopes for the Scope template.
+ enum Value
+ {
+ Root,
+ Graphics
+ };
+ }
+}
+
//-----------------------------------------------------------------------
// Forward declarations
//-----------------------------------------------------------------------
@@ -71,7 +89,14 @@
class OutputBuffer;
class OutputBufferListener;
class OutputHandler;
+ template <ScopeID::Value>
+ class Scope;
+ template <class, ScopeID::Value>
+ class ScopedSingleton;
+ class ScopeListener;
class SignalHandler;
+ template <class T>
+ class Singleton;
class SubString;
}
Modified: code/branches/core5/src/modules/objects/ObjectsPrereqs.h
===================================================================
--- code/branches/core5/src/modules/objects/ObjectsPrereqs.h 2009-10-02 08:47:44 UTC (rev 5857)
+++ code/branches/core5/src/modules/objects/ObjectsPrereqs.h 2009-10-02 09:41:00 UTC (rev 5858)
@@ -27,20 +27,21 @@
*/
/**
- @file
- @brief Contains all the necessary forward declarations for all classes and structs.
+ at file
+ at brief
+ Shared library macros, enums, constants and forward declarations for the objects module
*/
#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)
@@ -75,15 +76,15 @@
class SphereCollisionShape;
// eventsystem
+ class EventDispatcher;
class EventListener;
- class EventDispatcher;
class EventTarget;
// triggers
- class Trigger;
+ class CheckPoint;
class DistanceTrigger;
class EventTrigger;
- class CheckPoint;
+ class Trigger;
}
#endif /* _ObjectsPrereqs_H__ */
Modified: code/branches/core5/src/modules/overlays/OverlaysPrereqs.h
===================================================================
--- code/branches/core5/src/modules/overlays/OverlaysPrereqs.h 2009-10-02 08:47:44 UTC (rev 5857)
+++ code/branches/core5/src/modules/overlays/OverlaysPrereqs.h 2009-10-02 09:41:00 UTC (rev 5858)
@@ -27,18 +27,21 @@
*/
/**
- @file
- @brief Contains all the necessary forward declarations for all classes and structs.
+ at file
+ at brief
+ Shared library macros, enums, constants and forward declarations for the overlays module
*/
#ifndef _OverlaysPrereqs_H__
#define _OverlaysPrereqs_H__
#include "OrxonoxConfig.h"
+#include "OrxonoxPrereqs.h"
//-----------------------------------------------------------------------
// Shared library settings
//-----------------------------------------------------------------------
+
#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
# ifdef OVERLAYS_SHARED_BUILD
# define _OverlaysExport __declspec(dllexport)
@@ -61,25 +64,31 @@
namespace orxonox
{
- class BarColour;
+ class FadeoutText;
+ class GUIOverlay;
+ class OverlayText;
+
+ // debugging
class DebugFPSText;
class DebugRTRText;
- class GUIOverlay;
+
+ // hud
+ class AnnounceMessage;
+ class BarColour;
+ class ChatOverlay;
+ class DeathMessage;
+ class GametypeStatus;
class HUDBar;
+ class HUDHealthBar;
class HUDNavigation;
class HUDRadar;
class HUDSpeedBar;
- class HUDHealthBar;
class HUDTimer;
- class OrxonoxOverlay;
- class OverlayGroup;
- class OverlayText;
- class FadeoutText;
- class GametypeStatus;
- class AnnounceMessage;
class KillMessage;
- class DeathMessage;
+ class TeamBaseMatchScore;
+ class UnderAttackHealthBar;
+ // stats
class CreateLines;
class Scoreboard;
class Stats;
Modified: code/branches/core5/src/modules/pong/PongPrereqs.h
===================================================================
--- code/branches/core5/src/modules/pong/PongPrereqs.h 2009-10-02 08:47:44 UTC (rev 5857)
+++ code/branches/core5/src/modules/pong/PongPrereqs.h 2009-10-02 09:41:00 UTC (rev 5858)
@@ -27,20 +27,21 @@
*/
/**
- @file
- @brief Contains all the necessary forward declarations for all classes and structs.
+ at file
+ at brief
+ Shared library macros, enums, constants and forward declarations for the pong module
*/
#ifndef _PongPrereqs_H__
#define _PongPrereqs_H__
#include "OrxonoxConfig.h"
+#include "OrxonoxPrereqs.h"
-#include "pong/PongPrereqs.h"
-
//-----------------------------------------------------------------------
// Shared library settings
//-----------------------------------------------------------------------
+
#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
# ifdef PONG_SHARED_BUILD
# define _PongExport __declspec(dllexport)
Modified: code/branches/core5/src/modules/questsystem/QuestsystemPrereqs.h
===================================================================
--- code/branches/core5/src/modules/questsystem/QuestsystemPrereqs.h 2009-10-02 08:47:44 UTC (rev 5857)
+++ code/branches/core5/src/modules/questsystem/QuestsystemPrereqs.h 2009-10-02 09:41:00 UTC (rev 5858)
@@ -27,20 +27,21 @@
*/
/**
- @file
- @brief Contains all the necessary forward declarations for all classes and structs.
+ at file
+ at brief
+ Shared library macros, enums, constants and forward declarations for the questsystem module
*/
#ifndef _QuestsystemPrereqs_H__
#define _QuestsystemPrereqs_H__
#include "OrxonoxConfig.h"
-
#include "OrxonoxPrereqs.h"
//-----------------------------------------------------------------------
// Shared library settings
//-----------------------------------------------------------------------
+
#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
# ifdef QUESTSYSTEM_SHARED_BUILD
# define _QuestsystemExport __declspec(dllexport)
@@ -75,17 +76,16 @@
class QuestDescription;
class QuestEffect;
class QuestEffectBeacon;
+ class QuestGUI;
class QuestGUINode;
- class QuestGUI;
class QuestHint;
class QuestItem;
class QuestListener;
class QuestManager;
class QuestNotification;
- class Rewardable;
+ // notifications
class Notification;
- class NotificationListener;
class NotificationManager;
class NotificationOverlay;
class NotificationQueue;
Modified: code/branches/core5/src/modules/weapons/WeaponsPrereqs.h
===================================================================
--- code/branches/core5/src/modules/weapons/WeaponsPrereqs.h 2009-10-02 08:47:44 UTC (rev 5857)
+++ code/branches/core5/src/modules/weapons/WeaponsPrereqs.h 2009-10-02 09:41:00 UTC (rev 5858)
@@ -27,20 +27,21 @@
*/
/**
- @file
- @brief Contains all the necessary forward declarations for all classes and structs.
+ at file
+ at brief
+ Shared library macros, enums, constants and forward declarations for the weapons module
*/
#ifndef _WeaponsPrereqs_H__
#define _WeaponsPrereqs_H__
#include "OrxonoxConfig.h"
-
#include "OrxonoxPrereqs.h"
//-----------------------------------------------------------------------
// Shared library settings
//-----------------------------------------------------------------------
+
#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
# ifdef WEAPONS_SHARED_BUILD
# define _WeaponsExport __declspec(dllexport)
@@ -63,22 +64,25 @@
namespace orxonox
{
- class LaserFire;
- class FusionFire;
- class HsW01;
- class LightningGun;
- class EnergyDrink;
+ class MuzzleFlash;
- class Projectile;
+ // munitions
+ class FusionMunition;
+ class LaserMunition;
+ class ReplenishingMunition;
+
+ // projectiles
class BillboardProjectile;
+ class LightningGunProjectile;
class ParticleProjectile;
- class LightningGunProjectile;
+ class Projectile;
- class ReplenishingMunition;
- class LaserMunition;
- class FusionMunition;
-
- class MuzzleFlash;
+ // weaponmodes
+ class EnergyDrink;
+ class FusionFire;
+ class HsW01;
+ class LaserFire;
+ class LightningGun;
}
#endif /* _WeaponsPrereqs_H__ */
Modified: code/branches/core5/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- code/branches/core5/src/orxonox/OrxonoxPrereqs.h 2009-10-02 08:47:44 UTC (rev 5857)
+++ code/branches/core5/src/orxonox/OrxonoxPrereqs.h 2009-10-02 09:41:00 UTC (rev 5858)
@@ -27,8 +27,9 @@
*/
/**
- @file
- @brief Contains all the necessary forward declarations for all classes and structs.
+ at file
+ at brief
+ Shared library macros, enums, constants and forward declarations for the orxonox library
*/
#ifndef _OrxonoxPrereqs_H__
@@ -36,11 +37,10 @@
#include "OrxonoxConfig.h"
-#include "tools/ToolsPrereqs.h"
-
//-----------------------------------------------------------------------
// Shared library settings
//-----------------------------------------------------------------------
+
#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
# ifdef ORXONOX_SHARED_BUILD
# define _OrxonoxExport __declspec(dllexport)
@@ -64,71 +64,76 @@
namespace orxonox
{
class CameraManager;
+ class Level;
class LevelManager;
class PawnManager;
class PlayerManager;
-
- class Level;
+ class Radar;
class Scene;
- class Tickable;
- // interfaces
- class GametypeMessageListener;
- class NotificationListener;
- class PawnListener;
- class PlayerTrigger;
- class RadarListener;
- class RadarViewable;
- class Rewardable;
- class Teamcolourable;
+ // collisionshapes
+ class CollisionShape;
+ class CompoundCollisionShape;
+ class WorldEntityCollisionShape;
- // worldentities
- class WorldEntity;
- class StaticEntity;
- class MobileEntity;
- class ControllableEntity;
- class MovableEntity;
+ // controllers
+ class AIController;
+ class ArtificialController;
+ class Controller;
+ class HumanController;
+ class ScriptController;
+ class WaypointController;
+ class WaypointPatrolController;
+ // gametypes
+ class Asteroids;
+ class Deathmatch;
+ class Gametype;
+ class TeamBaseMatch;
+ class TeamDeathmatch;
+ class UnderAttack;
+
// graphics
- class Model;
+ class Backlight;
class Billboard;
class BlinkingBillboard;
- class BigExplosion;
- class ExplosionChunk;
+ class Camera;
class FadingBillboard;
class GlobalShader;
class Light;
- class Backlight;
+ class Model;
class ParticleEmitter;
class ParticleSpawner;
- class Camera;
- // mixed
- class SpawnPoint;
- class TeamSpawnPoint;
+ // infos
+ class Bot;
+ class GametypeInfo;
+ class HumanPlayer;
+ class Info;
+ class PlayerInfo;
- class CameraPosition;
- class Sublevel;
- class Radar;
+ // interfaces
+ class GametypeMessageListener;
+ class NotificationListener;
+ class PawnListener;
+ class PlayerTrigger;
+ class RadarListener;
+ class RadarViewable;
+ class Rewardable;
+ class TeamColourable;
- class Test;
+ // items
+ class Engine;
+ class Item;
+ class MultiStateEngine;
- // pawns
- class Spectator;
- class Pawn;
- class SpaceShip;
- class TeamBaseMatchBase;
- class Destroyer;
+ // overlays
+ class InGameConsole;
+ class Map;
+ class OrxonoxOverlay;
+ class OverlayGroup;
- // gametypes
- class Gametype;
- class Deathmatch;
- class TeamDeathmatch;
- class Asteroids;
- class TeamBaseMatch;
- class UnderAttack;
-
- // pickups
+ // pickup
class BaseItem;
class DroppedItem;
class EquipmentItem;
@@ -138,60 +143,43 @@
class PickupInventory;
class PickupSpawner;
class UsableItem;
-
- class Jump;
+ // pickup, items
+ class HealthImmediate;
class HealthUsable;
- class PassiveItem;
+ class Jump;
- // items
- class Item;
- class Engine;
- class MultiStateEngine;
- class RotatingEngine;
+ //sound
+ class SoundBase;
+ class SoundManager;
+ class SoundMainMenu;
// weaponsystem
- class WeaponSystem;
- class WeaponSet;
- class WeaponSlot;
- class WeaponPack;
- class Weapon;
- class WeaponMode;
class DefaultWeaponmodeLink;
class Munition;
+ class Weapon;
+ class WeaponMode;
+ class WeaponPack;
+ class WeaponSet;
+ class WeaponSlot;
+ class WeaponSystem;
- // controller
- class Controller;
- class HumanController;
- class ArtificialController;
- class AIController;
- class ScriptController;
- class WaypointController;
- class WaypointPatrolController;
-
- // infos
- class Info;
- class PlayerInfo;
- class HumanPlayer;
- class Bot;
- class GametypeInfo;
-
- // collision
- class CollisionShape;
- class CompoundCollisionShape;
- class WorldEntityCollisionShape;
-
- // overlays
- class OverlayGroup;
- class OrxonoxOverlay;
- class Notification;
- class NotificationManager;
- class InGameConsole;
- class Map;
-
- //sound
- class SoundBase;
- class SoundManager;
- class SoundMainMenu;
+ // worldentities
+ class BigExplosion;
+ class CameraPosition;
+ class ControllableEntity;
+ class ExplosionChunk;
+ class MobileEntity;
+ class MovableEntity;
+ class SpawnPoint;
+ class StaticEntity;
+ class TeamSpawnPoint;
+ class WorldEntity;
+ // worldentities, pawns
+ class Destroyer;
+ class Pawn;
+ class SpaceShip;
+ class Spectator;
+ class TeamBaseMatchBase;
}
// Bullet Physics Engine
Modified: code/branches/core5/src/orxonox/graphics/ParticleEmitter.h
===================================================================
--- code/branches/core5/src/orxonox/graphics/ParticleEmitter.h 2009-10-02 08:47:44 UTC (rev 5857)
+++ code/branches/core5/src/orxonox/graphics/ParticleEmitter.h 2009-10-02 09:41:00 UTC (rev 5858)
@@ -33,6 +33,7 @@
#include <string>
#include "worldentities/StaticEntity.h"
+#include "tools/ToolsPrereqs.h"
namespace orxonox
{
Modified: code/branches/core5/src/orxonox/interfaces/NotificationListener.h
===================================================================
--- code/branches/core5/src/orxonox/interfaces/NotificationListener.h 2009-10-02 08:47:44 UTC (rev 5857)
+++ code/branches/core5/src/orxonox/interfaces/NotificationListener.h 2009-10-02 09:41:00 UTC (rev 5858)
@@ -44,6 +44,8 @@
namespace orxonox
{
+ class Notification;
+
class _OrxonoxExport NotificationListener : virtual public OrxonoxClass
{
public:
Modified: code/branches/core5/src/orxonox/interfaces/RadarViewable.h
===================================================================
--- code/branches/core5/src/orxonox/interfaces/RadarViewable.h 2009-10-02 08:47:44 UTC (rev 5857)
+++ code/branches/core5/src/orxonox/interfaces/RadarViewable.h 2009-10-02 09:41:00 UTC (rev 5858)
@@ -37,6 +37,7 @@
#include "util/Math.h"
#include "util/OgreForwardRefs.h"
#include "core/OrxonoxClass.h"
+#include "tools/ToolsPrereqs.h"
namespace orxonox
{
More information about the Orxonox-commit
mailing list