Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 25, 2013, 9:08:42 PM (11 years ago)
Author:
landauf
Message:

merged core6 back to trunk

Location:
code/trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/src/libraries/tools/ParticleInterface.cc

    r8858 r9667  
    4343#include "util/Math.h"
    4444#include "core/CoreIncludes.h"
    45 #include "core/ConfigValueIncludes.h"
     45#include "core/config/ConfigValueIncludes.h"
    4646#include "core/GameMode.h"
    4747

  • code/trunk/src/libraries/tools/ResourceCollection.cc

    r8858 r9667  
    3737namespace orxonox
    3838{
    39     CreateFactory(ResourceCollection);
     39    RegisterClass(ResourceCollection);
    4040
    41     ResourceCollection::ResourceCollection(BaseObject* creator)
    42         : BaseObject(creator)
     41    ResourceCollection::ResourceCollection(Context* context)
     42        : BaseObject(context)
    4343    {
    4444        RegisterObject(ResourceCollection);

  • code/trunk/src/libraries/tools/ResourceCollection.h

    r7401 r9667  
    4141    {
    4242    public:
    43         ResourceCollection(BaseObject* creator);
     43        ResourceCollection(Context* context);
    4444        virtual ~ResourceCollection();
    4545

  • code/trunk/src/libraries/tools/ResourceLocation.cc

    r8858 r9667  
    4141namespace orxonox
    4242{
    43     CreateFactory(ResourceLocation);
     43    RegisterClass(ResourceLocation);
    4444
    45     ResourceLocation::ResourceLocation(BaseObject* creator)
    46         : BaseObject(creator)
     45    ResourceLocation::ResourceLocation(Context* context)
     46        : BaseObject(context)
    4747    {
    4848        RegisterObject(ResourceLocation);

  • code/trunk/src/libraries/tools/ResourceLocation.h

    r7401 r9667  
    4343
    4444    public:
    45         ResourceLocation(BaseObject* creator);
     45        ResourceLocation(Context* context);
    4646        virtual ~ResourceLocation();
    4747

  • code/trunk/src/libraries/tools/Shader.cc

    r9550 r9667  
    3939namespace orxonox
    4040{
     41    RegisterClassNoArgs(Shader);
     42
    4143    /**
    4244        @brief Initializes the values and sets the scene manager.

  • code/trunk/src/libraries/tools/Timer.cc

    r8729 r9667  
    132132    }
    133133
     134    RegisterClassNoArgs(Timer);
     135
    134136    /**
    135137        @brief Constructor: Sets the default-values.
    … …  
    138140    {
    139141        this->init();
    140         RegisterRootObject(Timer);
     142        RegisterObject(Timer);
    141143    }
    142144
    … …  
    151153    {
    152154        this->init();
    153         RegisterRootObject(Timer);
     155        RegisterObject(Timer);
    154156
    155157        this->setTimer(interval, bLoop, executor, bKillAfterCall);

  • code/trunk/src/libraries/tools/Timer.h

    r8858 r9667  
    7979#include "tools/ToolsPrereqs.h"
    8080
    81 #include "core/OrxonoxClass.h"
     81#include "core/class/OrxonoxClass.h"
    8282#include "core/command/ExecutorPtr.h"
    8383
    … …  
    102102        on the game time.
    103103    */
    104     class _ToolsExport Timer : virtual public OrxonoxClass
     104    class _ToolsExport Timer : public OrxonoxClass
    105105    {
    106106        public:

  • code/trunk/src/libraries/tools/interfaces/Tickable.h

    r5781 r9667  
    4444#include "tools/ToolsPrereqs.h"
    4545
    46 #include "core/OrxonoxClass.h"
    47 #include "core/Super.h"
     46#include "core/class/OrxonoxInterface.h"
     47#include "core/class/Super.h"
    4848
    4949namespace orxonox
    5050{
    5151    //! The Tickable interface provides a tick(dt) function, that gets called every frame.
    52     class _ToolsExport Tickable : virtual public OrxonoxClass
     52    class _ToolsExport Tickable : virtual public OrxonoxInterface
    5353    {
    5454        public:

  • code/trunk/src/libraries/tools/interfaces/TimeFactorListener.h

    r7172 r9667  
    3131
    3232#include "tools/ToolsPrereqs.h"
    33 #include "core/OrxonoxClass.h"
     33#include "core/object/Listable.h"
    3434
    3535namespace orxonox
    3636{
    37     class _ToolsExport TimeFactorListener : virtual public OrxonoxClass
     37    class _ToolsExport TimeFactorListener : virtual public Listable
    3838    {
    3939        public:

  • code/trunk/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc

    r7172 r9667  
    4646    float TimeFactorListener::timefactor_s = 1.0f;
    4747
     48    RegisterAbstractClass(TimeFactorListener).inheritsFrom(Class(Listable));
     49
    4850    TimeFactorListener::TimeFactorListener()
    4951    {
    50         RegisterRootObject(TimeFactorListener);
     52        RegisterObject(TimeFactorListener);
    5153    }
    5254
    … …  
    6567    // Tickable
    6668    //----------------------------
     69    RegisterAbstractClass(Tickable).inheritsFrom(Class(OrxonoxInterface));
     70
    6771    /**
    6872        @brief Constructor: Registers the object in the Tickable-list
    … …  
    7074    Tickable::Tickable()
    7175    {
    72         RegisterRootObject(Tickable);
     76        RegisterObject(Tickable);
    7377    }
    7478}
Note: See TracChangeset for help on using the changeset viewer.