[Orxonox-commit 4916] r9585 - in code/branches/core6/src: libraries/core libraries/core/class modules/weapons/projectiles orxonox orxonox/interfaces
landauf at orxonox.net
landauf at orxonox.net
Tue Mar 26 23:01:09 CET 2013
Author: landauf
Date: 2013-03-26 23:01:08 +0100 (Tue, 26 Mar 2013)
New Revision: 9585
Added:
code/branches/core6/src/libraries/core/class/OrxonoxInterface.h
Modified:
code/branches/core6/src/libraries/core/CorePrereqs.h
code/branches/core6/src/libraries/core/class/OrxonoxClass.h
code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.h
code/branches/core6/src/orxonox/LevelInfo.h
code/branches/core6/src/orxonox/MoodManager.h
code/branches/core6/src/orxonox/interfaces/GametypeMessageListener.h
code/branches/core6/src/orxonox/interfaces/NotificationListener.h
code/branches/core6/src/orxonox/interfaces/PickupCarrier.h
code/branches/core6/src/orxonox/interfaces/PickupListener.h
code/branches/core6/src/orxonox/interfaces/Pickupable.h
code/branches/core6/src/orxonox/interfaces/PlayerTrigger.h
code/branches/core6/src/orxonox/interfaces/RadarListener.h
code/branches/core6/src/orxonox/interfaces/RadarViewable.h
code/branches/core6/src/orxonox/interfaces/Rewardable.h
code/branches/core6/src/orxonox/interfaces/TeamColourable.h
Log:
added OrxonoxInterface, a base class for interfaces within the game logic (in contrast to OrxonoxClass which is for real classes)
Modified: code/branches/core6/src/libraries/core/CorePrereqs.h
===================================================================
--- code/branches/core6/src/libraries/core/CorePrereqs.h 2013-03-26 15:02:36 UTC (rev 9584)
+++ code/branches/core6/src/libraries/core/CorePrereqs.h 2013-03-26 22:01:08 UTC (rev 9585)
@@ -180,6 +180,7 @@
class ObjectListIterator;
class OgreWindowEventListener;
class OrxonoxClass;
+ class OrxonoxInterface;
class PathConfig;
struct ResourceInfo;
class SettingsConfigFile;
Modified: code/branches/core6/src/libraries/core/class/OrxonoxClass.h
===================================================================
--- code/branches/core6/src/libraries/core/class/OrxonoxClass.h 2013-03-26 15:02:36 UTC (rev 9584)
+++ code/branches/core6/src/libraries/core/class/OrxonoxClass.h 2013-03-26 22:01:08 UTC (rev 9585)
@@ -34,7 +34,7 @@
/**
@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.
*/
#ifndef _OrxonoxClass_H__
@@ -48,9 +48,9 @@
namespace orxonox
{
/**
- @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
{
Added: code/branches/core6/src/libraries/core/class/OrxonoxInterface.h
===================================================================
--- code/branches/core6/src/libraries/core/class/OrxonoxInterface.h (rev 0)
+++ code/branches/core6/src/libraries/core/class/OrxonoxInterface.h 2013-03-26 22:01:08 UTC (rev 9585)
@@ -0,0 +1,55 @@
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @ingroup Class OrxonoxClass
+ @brief Declaration of OrxonoxInterface, the base class of all interfaces in Orxonox.
+*/
+
+#ifndef _OrxonoxInterface_H__
+#define _OrxonoxInterface_H__
+
+#include "core/CorePrereqs.h"
+
+#include "core/config/Configurable.h"
+#include "core/object/Destroyable.h"
+
+namespace orxonox
+{
+ /**
+ @brief This is the class from which all interfaces of the game-logic (not the engine) are derived from.
+
+ Interfaces are derived with @c virtual @c public @c OrxonoxInterface from OrxonoxInterface.
+ */
+ class _CoreExport OrxonoxInterface : virtual public Configurable, virtual public Destroyable
+ {
+ };
+}
+
+#endif /* _OrxonoxInterface_H__ */
Property changes on: code/branches/core6/src/libraries/core/class/OrxonoxInterface.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.h
===================================================================
--- code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.h 2013-03-26 15:02:36 UTC (rev 9584)
+++ code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.h 2013-03-26 22:01:08 UTC (rev 9585)
@@ -38,7 +38,7 @@
#include "worldentities/pawns/Pawn.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
namespace orxonox
{
@@ -51,7 +51,7 @@
Simon Miescher
@ingroup WeaponsProjectiles
*/
- class _WeaponsExport BasicProjectile : public virtual OrxonoxClass
+ class _WeaponsExport BasicProjectile : public virtual OrxonoxInterface
{
public:
BasicProjectile();
Modified: code/branches/core6/src/orxonox/LevelInfo.h
===================================================================
--- code/branches/core6/src/orxonox/LevelInfo.h 2013-03-26 15:02:36 UTC (rev 9584)
+++ code/branches/core6/src/orxonox/LevelInfo.h 2013-03-26 22:01:08 UTC (rev 9585)
@@ -44,7 +44,7 @@
#include "core/BaseObject.h"
#include <iostream>
#include <fstream>
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
namespace orxonox // tolua_export
{ // tolua_export
@@ -60,7 +60,7 @@
@ingroup Orxonox
*/
class _OrxonoxExport LevelInfoItem // tolua_export
- : virtual public OrxonoxClass
+ : virtual public OrxonoxInterface
{ // tolua_export
public:
LevelInfoItem(); //!< Default constructor.
Modified: code/branches/core6/src/orxonox/MoodManager.h
===================================================================
--- code/branches/core6/src/orxonox/MoodManager.h 2013-03-26 15:02:36 UTC (rev 9584)
+++ code/branches/core6/src/orxonox/MoodManager.h 2013-03-26 22:01:08 UTC (rev 9585)
@@ -33,7 +33,7 @@
#include <string>
#include "util/Singleton.h"
-#include "core/config/Configurable.h"
+#include "core/class/OrxonoxInterface.h"
namespace orxonox
{
@@ -41,7 +41,7 @@
@brief
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;
Modified: code/branches/core6/src/orxonox/interfaces/GametypeMessageListener.h
===================================================================
--- code/branches/core6/src/orxonox/interfaces/GametypeMessageListener.h 2013-03-26 15:02:36 UTC (rev 9584)
+++ code/branches/core6/src/orxonox/interfaces/GametypeMessageListener.h 2013-03-26 22:01:08 UTC (rev 9585)
@@ -30,11 +30,11 @@
#define _GametypeMessageListener_H__
#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:
GametypeMessageListener();
Modified: code/branches/core6/src/orxonox/interfaces/NotificationListener.h
===================================================================
--- code/branches/core6/src/orxonox/interfaces/NotificationListener.h 2013-03-26 15:02:36 UTC (rev 9584)
+++ code/branches/core6/src/orxonox/interfaces/NotificationListener.h 2013-03-26 22:01:08 UTC (rev 9585)
@@ -43,7 +43,7 @@
#include "util/StringUtils.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
namespace orxonox
{
@@ -89,7 +89,7 @@
@ingroup Notifications
@todo Consistent terminology between message, notification and command.
*/
- class _OrxonoxExport NotificationListener : virtual public OrxonoxClass
+ class _OrxonoxExport NotificationListener : virtual public OrxonoxInterface
{
public:
NotificationListener();
Modified: code/branches/core6/src/orxonox/interfaces/PickupCarrier.h
===================================================================
--- code/branches/core6/src/orxonox/interfaces/PickupCarrier.h 2013-03-26 15:02:36 UTC (rev 9584)
+++ code/branches/core6/src/orxonox/interfaces/PickupCarrier.h 2013-03-26 22:01:08 UTC (rev 9585)
@@ -40,7 +40,7 @@
#include <set>
#include <vector>
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
namespace orxonox
{
@@ -65,7 +65,7 @@
@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.
friend class Pickupable;
Modified: code/branches/core6/src/orxonox/interfaces/PickupListener.h
===================================================================
--- code/branches/core6/src/orxonox/interfaces/PickupListener.h 2013-03-26 15:02:36 UTC (rev 9584)
+++ code/branches/core6/src/orxonox/interfaces/PickupListener.h 2013-03-26 22:01:08 UTC (rev 9585)
@@ -38,7 +38,7 @@
#include "Pickupable.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
namespace orxonox
{
@@ -54,7 +54,7 @@
@ingroup Pickup
*/
- class _OrxonoxExport PickupListener : virtual public OrxonoxClass
+ class _OrxonoxExport PickupListener : virtual public OrxonoxInterface
{
public:
PickupListener();
Modified: code/branches/core6/src/orxonox/interfaces/Pickupable.h
===================================================================
--- code/branches/core6/src/orxonox/interfaces/Pickupable.h 2013-03-26 15:02:36 UTC (rev 9584)
+++ code/branches/core6/src/orxonox/interfaces/Pickupable.h 2013-03-26 22:01:08 UTC (rev 9585)
@@ -40,7 +40,7 @@
#include <list>
#include "core/class/Super.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
#include "Rewardable.h"
namespace orxonox
@@ -57,7 +57,7 @@
@ingroup Pickup
*/
- class _OrxonoxExport Pickupable : virtual public OrxonoxClass, public Rewardable
+ class _OrxonoxExport Pickupable : virtual public OrxonoxInterface, public Rewardable
{
friend class PickupCarrier;
Modified: code/branches/core6/src/orxonox/interfaces/PlayerTrigger.h
===================================================================
--- code/branches/core6/src/orxonox/interfaces/PlayerTrigger.h 2013-03-26 15:02:36 UTC (rev 9584)
+++ code/branches/core6/src/orxonox/interfaces/PlayerTrigger.h 2013-03-26 22:01:08 UTC (rev 9585)
@@ -37,7 +37,7 @@
#include "OrxonoxPrereqs.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
#include "core/object/WeakPtr.h"
namespace orxonox
@@ -51,7 +51,7 @@
@ingroup Triggers
*/
- class _OrxonoxExport PlayerTrigger : virtual public OrxonoxClass
+ class _OrxonoxExport PlayerTrigger : virtual public OrxonoxInterface
{
public:
PlayerTrigger();
Modified: code/branches/core6/src/orxonox/interfaces/RadarListener.h
===================================================================
--- code/branches/core6/src/orxonox/interfaces/RadarListener.h 2013-03-26 15:02:36 UTC (rev 9584)
+++ code/branches/core6/src/orxonox/interfaces/RadarListener.h 2013-03-26 22:01:08 UTC (rev 9585)
@@ -30,11 +30,11 @@
#define _RadarListener_H__
#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:
RadarListener();
Modified: code/branches/core6/src/orxonox/interfaces/RadarViewable.h
===================================================================
--- code/branches/core6/src/orxonox/interfaces/RadarViewable.h 2013-03-26 15:02:36 UTC (rev 9584)
+++ code/branches/core6/src/orxonox/interfaces/RadarViewable.h 2013-03-26 22:01:08 UTC (rev 9585)
@@ -35,7 +35,7 @@
#include <cassert>
#include "util/Math.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
#include "core/object/SmartPtr.h"
namespace orxonox
@@ -45,7 +45,7 @@
/**
@brief Interface for receiving window events.
*/
- class _OrxonoxExport RadarViewable : virtual public OrxonoxClass
+ class _OrxonoxExport RadarViewable : virtual public OrxonoxInterface
{
public:
enum Shape
Modified: code/branches/core6/src/orxonox/interfaces/Rewardable.h
===================================================================
--- code/branches/core6/src/orxonox/interfaces/Rewardable.h 2013-03-26 15:02:36 UTC (rev 9584)
+++ code/branches/core6/src/orxonox/interfaces/Rewardable.h 2013-03-26 22:01:08 UTC (rev 9585)
@@ -35,7 +35,7 @@
#define _Rewardable_H__
#include "OrxonoxPrereqs.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
namespace orxonox
{
@@ -47,7 +47,7 @@
@author
Damian 'Mozork' Frick
*/
- class _OrxonoxExport Rewardable : virtual public OrxonoxClass
+ class _OrxonoxExport Rewardable : virtual public OrxonoxInterface
{
public:
Rewardable();
Modified: code/branches/core6/src/orxonox/interfaces/TeamColourable.h
===================================================================
--- code/branches/core6/src/orxonox/interfaces/TeamColourable.h 2013-03-26 15:02:36 UTC (rev 9584)
+++ code/branches/core6/src/orxonox/interfaces/TeamColourable.h 2013-03-26 22:01:08 UTC (rev 9585)
@@ -32,11 +32,11 @@
#include "OrxonoxPrereqs.h"
#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:
virtual void setTeamColour(const ColourValue& colour) = 0;
More information about the Orxonox-commit
mailing list