Changeset 9585 for code/branches/core6/src/orxonox/interfaces

Timestamp:

Mar 26, 2013, 11:01:08 PM (12 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/orxonox/interfaces

Files:

• GametypeMessageListener.h (modified) (1 diff)
• NotificationListener.h (modified) (2 diffs)
• PickupCarrier.h (modified) (2 diffs)
• PickupListener.h (modified) (2 diffs)
• Pickupable.h (modified) (2 diffs)
• PlayerTrigger.h (modified) (2 diffs)
• RadarListener.h (modified) (1 diff)
• RadarViewable.h (modified) (2 diffs)
• Rewardable.h (modified) (2 diffs)
• TeamColourable.h (modified) (1 diff)

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: