Changeset 9585

Timestamp:

Mar 26, 2013, 11:01:08 PM (11 years ago)

Author:

landauf

Message:

added OrxonoxInterface, a base class for interfaces within the game logic (in contrast to OrxonoxClass which is for real classes)

Location:

code/branches/core6/src

Files:

• libraries/core/CorePrereqs.h (modified) (1 diff)
• libraries/core/class/OrxonoxClass.h (modified) (2 diffs)
• libraries/core/class/OrxonoxInterface.h (added)
• modules/weapons/projectiles/BasicProjectile.h (modified) (2 diffs)
• orxonox/LevelInfo.h (modified) (2 diffs)
• orxonox/MoodManager.h (modified) (2 diffs)
• orxonox/interfaces/GametypeMessageListener.h (modified) (1 diff)
• orxonox/interfaces/NotificationListener.h (modified) (2 diffs)
• orxonox/interfaces/PickupCarrier.h (modified) (2 diffs)
• orxonox/interfaces/PickupListener.h (modified) (2 diffs)
• orxonox/interfaces/Pickupable.h (modified) (2 diffs)
• orxonox/interfaces/PlayerTrigger.h (modified) (2 diffs)
• orxonox/interfaces/RadarListener.h (modified) (1 diff)
• orxonox/interfaces/RadarViewable.h (modified) (2 diffs)
• orxonox/interfaces/Rewardable.h (modified) (2 diffs)
• orxonox/interfaces/TeamColourable.h (modified) (1 diff)

code/branches/core6/src/libraries/core/CorePrereqs.h

@@ -181 +181 @@
     class OgreWindowEventListener;
     class OrxonoxClass;
+    class OrxonoxInterface;
     class PathConfig;
     struct ResourceInfo;

code/branches/core6/src/libraries/core/class/OrxonoxClass.h

@@ -35 +35 @@
     @file
     @ingroup Class OrxonoxClass
-    @brief Declaration of OrxonoxClass, the base class of all objects and interfaces in Orxonox.
+    @brief Declaration of OrxonoxClass, the base class of all objects in Orxonox.
 */
 
@@ -49 +49 @@
 {
     /**
-        @brief This is the class from which all objects and interfaces of the game-logic (not the engine) are derived from.
+        @brief This is the class from which all objects of the game-logic (not the engine) are derived from.
 
-        The BaseObject and Interfaces are derived with @c virtual @c public @c OrxonoxClass from OrxonoxClass.
+        The BaseObject and other classes are derived with @c virtual @c public @c OrxonoxClass from OrxonoxClass.
     */
     class _CoreExport OrxonoxClass : virtual public Configurable, virtual public Destroyable

code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.h

@@ -39 +39 @@
 #include "worldentities/pawns/Pawn.h"
 
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
 
 namespace orxonox
@@ -52 +52 @@
     @ingroup WeaponsProjectiles
     */
-    class _WeaponsExport BasicProjectile : public virtual OrxonoxClass
+    class _WeaponsExport BasicProjectile : public virtual OrxonoxInterface
     {
         public:

code/branches/core6/src/orxonox/LevelInfo.h

@@ -45 +45 @@
 #include <iostream>
 #include <fstream>
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
 
 namespace orxonox // tolua_export
@@ -61 +61 @@
     */
     class _OrxonoxExport LevelInfoItem // tolua_export
-        : virtual public OrxonoxClass
+        : virtual public OrxonoxInterface
     { // tolua_export
         public:

code/branches/core6/src/orxonox/MoodManager.h

@@ -34 +34 @@
 #include <string>
 #include "util/Singleton.h"
-#include "core/config/Configurable.h"
+#include "core/class/OrxonoxInterface.h"
 
 namespace orxonox
@@ -42 +42 @@
         The MoodListener class is aware of a change in themes and directs that info to dependent classes.
     */
-    class _OrxonoxExport MoodListener : virtual public OrxonoxClass
+    class _OrxonoxExport MoodListener : virtual public OrxonoxInterface
     {
         friend class MoodManager;

code/branches/core6/src/orxonox/interfaces/GametypeMessageListener.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GametypeMessageListener : virtual public OrxonoxClass
+    class _OrxonoxExport GametypeMessageListener : virtual public OrxonoxInterface
     {
         public:

code/branches/core6/src/orxonox/interfaces/NotificationListener.h

@@ -44 +44 @@
 #include "util/StringUtils.h"
 
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
 
 namespace orxonox
@@ -90 +90 @@
     @todo Consistent terminology between message, notification and command.
     */
-    class _OrxonoxExport NotificationListener : virtual public OrxonoxClass
+    class _OrxonoxExport NotificationListener : virtual public OrxonoxInterface
     {
         public:

code/branches/core6/src/orxonox/interfaces/PickupCarrier.h

@@ -41 +41 @@
 #include <vector>
 
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
 
 namespace orxonox
@@ -66 +66 @@
     @ingroup Pickup
     */
-    class _OrxonoxExport PickupCarrier : virtual public OrxonoxClass
+    class _OrxonoxExport PickupCarrier : virtual public OrxonoxInterface
     {
         // So that the different Pickupables have full access to their PickupCarrier.

code/branches/core6/src/orxonox/interfaces/PickupListener.h

@@ -39 +39 @@
 #include "Pickupable.h"
 
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
 
 namespace orxonox
@@ -55 +55 @@
     @ingroup Pickup
     */
-    class _OrxonoxExport PickupListener : virtual public OrxonoxClass
+    class _OrxonoxExport PickupListener : virtual public OrxonoxInterface
     {
         public:

code/branches/core6/src/orxonox/interfaces/Pickupable.h

@@ -41 +41 @@
 #include "core/class/Super.h"
 
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
 #include "Rewardable.h"
 
@@ -58 +58 @@
     @ingroup Pickup
     */
-    class _OrxonoxExport Pickupable : virtual public OrxonoxClass, public Rewardable
+    class _OrxonoxExport Pickupable : virtual public OrxonoxInterface, public Rewardable
     {
         friend class PickupCarrier;

code/branches/core6/src/orxonox/interfaces/PlayerTrigger.h

@@ -38 +38 @@
 #include "OrxonoxPrereqs.h"
 
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
 #include "core/object/WeakPtr.h"
 
@@ -52 +52 @@
     @ingroup Triggers
     */
-    class _OrxonoxExport PlayerTrigger : virtual public OrxonoxClass
+    class _OrxonoxExport PlayerTrigger : virtual public OrxonoxInterface
     {
     public:

code/branches/core6/src/orxonox/interfaces/RadarListener.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport RadarListener : virtual public OrxonoxClass
+    class _OrxonoxExport RadarListener : virtual public OrxonoxInterface
     {
     public:

code/branches/core6/src/orxonox/interfaces/RadarViewable.h

@@ -36 +36 @@
 
 #include "util/Math.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
 #include "core/object/SmartPtr.h"
 
@@ -46 +46 @@
     @brief Interface for receiving window events.
     */
-    class _OrxonoxExport RadarViewable : virtual public OrxonoxClass
+    class _OrxonoxExport RadarViewable : virtual public OrxonoxInterface
     {
     public:

code/branches/core6/src/orxonox/interfaces/Rewardable.h

@@ -36 +36 @@
 
 #include "OrxonoxPrereqs.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
 
 namespace orxonox
@@ -48 +48 @@
         Damian 'Mozork' Frick
     */
-    class _OrxonoxExport Rewardable : virtual public OrxonoxClass
+    class _OrxonoxExport Rewardable : virtual public OrxonoxInterface
     {
         public:

code/branches/core6/src/orxonox/interfaces/TeamColourable.h

@@ -33 +33 @@
 
 #include "util/UtilPrereqs.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport TeamColourable : virtual public OrxonoxClass
+    class _OrxonoxExport TeamColourable : virtual public OrxonoxInterface
     {
         public: