Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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
Files:
1 added
15 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core6/src/libraries/core/CorePrereqs.h

    r9577 r9585  
    181181    class OgreWindowEventListener;
    182182    class OrxonoxClass;
     183    class OrxonoxInterface;
    183184    class PathConfig;
    184185    struct ResourceInfo;
  • code/branches/core6/src/libraries/core/class/OrxonoxClass.h

    r9577 r9585  
    3535    @file
    3636    @ingroup Class OrxonoxClass
    37     @brief Declaration of OrxonoxClass, the base class of all objects and interfaces in Orxonox.
     37    @brief Declaration of OrxonoxClass, the base class of all objects in Orxonox.
    3838*/
    3939
     
    4949{
    5050    /**
    51         @brief This is the class from which all objects and interfaces of the game-logic (not the engine) are derived from.
     51        @brief This is the class from which all objects of the game-logic (not the engine) are derived from.
    5252
    53         The BaseObject and Interfaces are derived with @c virtual @c public @c OrxonoxClass from OrxonoxClass.
     53        The BaseObject and other classes are derived with @c virtual @c public @c OrxonoxClass from OrxonoxClass.
    5454    */
    5555    class _CoreExport OrxonoxClass : virtual public Configurable, virtual public Destroyable
  • code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.h

    r9563 r9585  
    3939#include "worldentities/pawns/Pawn.h"
    4040
    41 #include "core/class/OrxonoxClass.h"
     41#include "core/class/OrxonoxInterface.h"
    4242
    4343namespace orxonox
     
    5252    @ingroup WeaponsProjectiles
    5353    */
    54     class _WeaponsExport BasicProjectile : public virtual OrxonoxClass
     54    class _WeaponsExport BasicProjectile : public virtual OrxonoxInterface
    5555    {
    5656        public:
  • code/branches/core6/src/orxonox/LevelInfo.h

    r9563 r9585  
    4545#include <iostream>
    4646#include <fstream>
    47 #include "core/class/OrxonoxClass.h"
     47#include "core/class/OrxonoxInterface.h"
    4848
    4949namespace orxonox // tolua_export
     
    6161    */
    6262    class _OrxonoxExport LevelInfoItem // tolua_export
    63         : virtual public OrxonoxClass
     63        : virtual public OrxonoxInterface
    6464    { // tolua_export
    6565        public:
  • code/branches/core6/src/orxonox/MoodManager.h

    r9578 r9585  
    3434#include <string>
    3535#include "util/Singleton.h"
    36 #include "core/config/Configurable.h"
     36#include "core/class/OrxonoxInterface.h"
    3737
    3838namespace orxonox
     
    4242        The MoodListener class is aware of a change in themes and directs that info to dependent classes.
    4343    */
    44     class _OrxonoxExport MoodListener : virtual public OrxonoxClass
     44    class _OrxonoxExport MoodListener : virtual public OrxonoxInterface
    4545    {
    4646        friend class MoodManager;
  • code/branches/core6/src/orxonox/interfaces/GametypeMessageListener.h

    r9563 r9585  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 #include "core/class/OrxonoxClass.h"
     33#include "core/class/OrxonoxInterface.h"
    3434
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport GametypeMessageListener : virtual public OrxonoxClass
     37    class _OrxonoxExport GametypeMessageListener : virtual public OrxonoxInterface
    3838    {
    3939        public:
  • code/branches/core6/src/orxonox/interfaces/NotificationListener.h

    r9563 r9585  
    4444#include "util/StringUtils.h"
    4545
    46 #include "core/class/OrxonoxClass.h"
     46#include "core/class/OrxonoxInterface.h"
    4747
    4848namespace orxonox
     
    9090    @todo Consistent terminology between message, notification and command.
    9191    */
    92     class _OrxonoxExport NotificationListener : virtual public OrxonoxClass
     92    class _OrxonoxExport NotificationListener : virtual public OrxonoxInterface
    9393    {
    9494        public:
  • code/branches/core6/src/orxonox/interfaces/PickupCarrier.h

    r9563 r9585  
    4141#include <vector>
    4242
    43 #include "core/class/OrxonoxClass.h"
     43#include "core/class/OrxonoxInterface.h"
    4444
    4545namespace orxonox
     
    6666    @ingroup Pickup
    6767    */
    68     class _OrxonoxExport PickupCarrier : virtual public OrxonoxClass
     68    class _OrxonoxExport PickupCarrier : virtual public OrxonoxInterface
    6969    {
    7070        // So that the different Pickupables have full access to their PickupCarrier.
  • code/branches/core6/src/orxonox/interfaces/PickupListener.h

    r9563 r9585  
    3939#include "Pickupable.h"
    4040
    41 #include "core/class/OrxonoxClass.h"
     41#include "core/class/OrxonoxInterface.h"
    4242
    4343namespace orxonox
     
    5555    @ingroup Pickup
    5656    */
    57     class _OrxonoxExport PickupListener : virtual public OrxonoxClass
     57    class _OrxonoxExport PickupListener : virtual public OrxonoxInterface
    5858    {
    5959        public:
  • code/branches/core6/src/orxonox/interfaces/Pickupable.h

    r9571 r9585  
    4141#include "core/class/Super.h"
    4242
    43 #include "core/class/OrxonoxClass.h"
     43#include "core/class/OrxonoxInterface.h"
    4444#include "Rewardable.h"
    4545
     
    5858    @ingroup Pickup
    5959    */
    60     class _OrxonoxExport Pickupable : virtual public OrxonoxClass, public Rewardable
     60    class _OrxonoxExport Pickupable : virtual public OrxonoxInterface, public Rewardable
    6161    {
    6262        friend class PickupCarrier;
  • code/branches/core6/src/orxonox/interfaces/PlayerTrigger.h

    r9563 r9585  
    3838#include "OrxonoxPrereqs.h"
    3939
    40 #include "core/class/OrxonoxClass.h"
     40#include "core/class/OrxonoxInterface.h"
    4141#include "core/object/WeakPtr.h"
    4242
     
    5252    @ingroup Triggers
    5353    */
    54     class _OrxonoxExport PlayerTrigger : virtual public OrxonoxClass
     54    class _OrxonoxExport PlayerTrigger : virtual public OrxonoxInterface
    5555    {
    5656    public:
  • code/branches/core6/src/orxonox/interfaces/RadarListener.h

    r9563 r9585  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 #include "core/class/OrxonoxClass.h"
     33#include "core/class/OrxonoxInterface.h"
    3434
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport RadarListener : virtual public OrxonoxClass
     37    class _OrxonoxExport RadarListener : virtual public OrxonoxInterface
    3838    {
    3939    public:
  • code/branches/core6/src/orxonox/interfaces/RadarViewable.h

    r9563 r9585  
    3636
    3737#include "util/Math.h"
    38 #include "core/class/OrxonoxClass.h"
     38#include "core/class/OrxonoxInterface.h"
    3939#include "core/object/SmartPtr.h"
    4040
     
    4646    @brief Interface for receiving window events.
    4747    */
    48     class _OrxonoxExport RadarViewable : virtual public OrxonoxClass
     48    class _OrxonoxExport RadarViewable : virtual public OrxonoxInterface
    4949    {
    5050    public:
  • code/branches/core6/src/orxonox/interfaces/Rewardable.h

    r9563 r9585  
    3636
    3737#include "OrxonoxPrereqs.h"
    38 #include "core/class/OrxonoxClass.h"
     38#include "core/class/OrxonoxInterface.h"
    3939
    4040namespace orxonox
     
    4848        Damian 'Mozork' Frick
    4949    */
    50     class _OrxonoxExport Rewardable : virtual public OrxonoxClass
     50    class _OrxonoxExport Rewardable : virtual public OrxonoxInterface
    5151    {
    5252        public:
  • code/branches/core6/src/orxonox/interfaces/TeamColourable.h

    r9563 r9585  
    3333
    3434#include "util/UtilPrereqs.h"
    35 #include "core/class/OrxonoxClass.h"
     35#include "core/class/OrxonoxInterface.h"
    3636
    3737namespace orxonox
    3838{
    39     class _OrxonoxExport TeamColourable : virtual public OrxonoxClass
     39    class _OrxonoxExport TeamColourable : virtual public OrxonoxInterface
    4040    {
    4141        public:
Note: See TracChangeset for help on using the changeset viewer.