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:
51 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/src/modules/objects/Attacher.cc

    r6417 r9667  
    3434namespace orxonox
    3535{
    36     CreateFactory(Attacher);
     36    RegisterClass(Attacher);
    3737
    38     Attacher::Attacher(BaseObject* creator) : StaticEntity(creator)
     38    Attacher::Attacher(Context* context) : StaticEntity(context)
    3939    {
    4040        RegisterObject(Attacher);

  • code/trunk/src/modules/objects/Attacher.h

    r7601 r9667  
    4848    {
    4949        public:
    50             Attacher(BaseObject* creator);
     50            Attacher(Context* context);
    5151            virtual ~Attacher() {}
    5252

  • code/trunk/src/modules/objects/ForceField.cc

    r8858 r9667  
    4040namespace orxonox
    4141{
    42     CreateFactory(ForceField);
     42    RegisterClass(ForceField);
    4343
    4444    /*static*/ const std::string ForceField::modeTube_s = "tube";
    … …  
    5353        Constructor. Registers the object and initializes some values.
    5454    */
    55     ForceField::ForceField(BaseObject* creator) : StaticEntity(creator)
     55    ForceField::ForceField(Context* context) : StaticEntity(context)
    5656    {
    5757        RegisterObject(ForceField);

  • code/trunk/src/modules/objects/ForceField.h

    r8397 r9667  
    8686    {
    8787        public:
    88             ForceField(BaseObject* creator);
     88            ForceField(Context* context);
    8989            virtual ~ForceField();
    9090

  • code/trunk/src/modules/objects/Planet.cc

    r8858 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(Planet);
     44    RegisterClass(Planet);
    4545
    4646    /**
    4747     * @brief Constructor
    4848     */
    49     Planet::Planet(BaseObject* creator) : MovableEntity(creator)
     49    Planet::Planet(Context* context) : MovableEntity(context)
    5050    {
    5151        RegisterObject(Planet);

  • code/trunk/src/modules/objects/Planet.h

    r7601 r9667  
    4848    {
    4949        public:
    50             Planet(BaseObject* creator);
     50            Planet(Context* context);
    5151
    5252            virtual ~Planet();

  • code/trunk/src/modules/objects/Script.cc

    r8858 r9667  
    4646namespace orxonox
    4747{
    48     CreateFactory(Script);
     48    RegisterClass(Script);
    4949
    5050    registerStaticNetworkFunction(Script::executeHelper);
    … …  
    6161        The creator of this object.
    6262    */
    63     Script::Script(BaseObject* creator) : BaseObject(creator)
     63    Script::Script(Context* context) : BaseObject(context)
    6464    {
    6565        RegisterObject(Script);

  • code/trunk/src/modules/objects/Script.h

    r7601 r9667  
    9595    {
    9696        public:
    97             Script(BaseObject* creator);
     97            Script(Context* context);
    9898            virtual ~Script();
    9999

  • code/trunk/src/modules/objects/SpaceBoundaries.cc

    r8858 r9667  
    3232
    3333#include "core/CoreIncludes.h"
    34 #include "core/ObjectListIterator.h"
     34#include "core/object/ObjectListIterator.h"
    3535#include "core/XMLPort.h"
    3636
    … …  
    4242namespace orxonox
    4343{
    44     CreateFactory(SpaceBoundaries);
    45 
    46     SpaceBoundaries::SpaceBoundaries(BaseObject* creator) : StaticEntity(creator)
     44    RegisterClass(SpaceBoundaries);
     45
     46    SpaceBoundaries::SpaceBoundaries(Context* context) : StaticEntity(context)
    4747    {
    4848        RegisterObject(SpaceBoundaries);
    … …  
    7373    {
    7474        pawnsIn_.clear();
    75         for(ObjectListIterator<Pawn> current = ObjectList<Pawn>::begin(); current != ObjectList<Pawn>::end(); ++current)
     75        for(ObjectList<Pawn>::iterator current = ObjectList<Pawn>::begin(); current != ObjectList<Pawn>::end(); ++current)
    7676        {
    7777            Pawn* currentPawn = *current;
    … …  
    104104        if (current == this->billboards_.size())
    105105        {
    106             Billboard* billboard = new Billboard(this);
     106            Billboard* billboard = new Billboard(this->getContext());
    107107            billboard->setPosition(position);
    108108            billboard->setSyncMode(ObjectDirection::None);

  • code/trunk/src/modules/objects/SpaceBoundaries.h

    r8767 r9667  
    3636#include <vector>
    3737
    38 #include "core/CoreIncludes.h"
    39 #include "core/WeakPtr.h"
     38#include "core/object/WeakPtr.h"
    4039
    4140#include "tools/interfaces/Tickable.h"
    … …  
    7675    {
    7776        public:
    78             SpaceBoundaries(BaseObject* creator);
     77            SpaceBoundaries(Context* context);
    7978            ~SpaceBoundaries();
    8079

  • code/trunk/src/modules/objects/Turret.cc

    r9526 r9667  
    3535namespace orxonox
    3636{
    37     CreateFactory(Turret);
     37    RegisterClass(Turret);
    3838
    3939    /**
    4040     * @brief Constructor
    4141     */
    42     Turret::Turret(BaseObject* creator) : SpaceShip(creator)
     42    Turret::Turret(Context* context) : SpaceShip(context)
    4343    {
    4444        RegisterObject(Turret);
    45         this->controller_ = new WaypointPatrolController(this);
     45        this->controller_ = new WaypointPatrolController(this->getContext());
    4646    }
    4747

  • code/trunk/src/modules/objects/Turret.h

    r9526 r9667  
    4545    {
    4646        public:
    47             Turret(BaseObject* creator);
     47            Turret(Context* context);
    4848            virtual ~Turret();
    4949

  • code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc

    r8858 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(BoxCollisionShape);
     44    RegisterClass(BoxCollisionShape);
    4545
    4646    /**
    … …  
    4848        Constructor. Registers and initializes the object.
    4949    */
    50     BoxCollisionShape::BoxCollisionShape(BaseObject* creator) : CollisionShape(creator)
     50    BoxCollisionShape::BoxCollisionShape(Context* context) : CollisionShape(context)
    5151    {
    5252        RegisterObject(BoxCollisionShape);

  • code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h

    r8706 r9667  
    5757    {
    5858        public:
    59             BoxCollisionShape(BaseObject* creator);
     59            BoxCollisionShape(Context* context);
    6060            virtual ~BoxCollisionShape();
    6161

  • code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc

    r8858 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(ConeCollisionShape);
     44    RegisterClass(ConeCollisionShape);
    4545
    4646    /**
    … …  
    4848        Constructor. Registers and initializes the object.
    4949    */
    50     ConeCollisionShape::ConeCollisionShape(BaseObject* creator) : CollisionShape(creator)
     50    ConeCollisionShape::ConeCollisionShape(Context* context) : CollisionShape(context)
    5151    {
    5252        RegisterObject(ConeCollisionShape);

  • code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h

    r8706 r9667  
    5555    {
    5656        public:
    57             ConeCollisionShape(BaseObject* creator);
     57            ConeCollisionShape(Context* context);
    5858            virtual ~ConeCollisionShape();
    5959

  • code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc

    r8858 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(PlaneCollisionShape);
     44    RegisterClass(PlaneCollisionShape);
    4545
    4646    /**
    … …  
    4848        Constructor. Registers and initializes the object.
    4949    */
    50     PlaneCollisionShape::PlaneCollisionShape(BaseObject* creator) : CollisionShape(creator)
     50    PlaneCollisionShape::PlaneCollisionShape(Context* context) : CollisionShape(context)
    5151    {
    5252        RegisterObject(PlaneCollisionShape);

  • code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h

    r8706 r9667  
    5757    {
    5858        public:
    59             PlaneCollisionShape(BaseObject* creator);
     59            PlaneCollisionShape(Context* context);
    6060            virtual ~PlaneCollisionShape();
    6161

  • code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc

    r8858 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(SphereCollisionShape);
     44    RegisterClass(SphereCollisionShape);
    4545
    4646    /**
    … …  
    4848        Constructor. registers and initializes the object.
    4949    */
    50     SphereCollisionShape::SphereCollisionShape(BaseObject* creator) : CollisionShape(creator)
     50    SphereCollisionShape::SphereCollisionShape(Context* context) : CollisionShape(context)
    5151    {
    5252        RegisterObject(SphereCollisionShape);

  • code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h

    r8706 r9667  
    5555    {
    5656        public:
    57             SphereCollisionShape(BaseObject* creator);
     57            SphereCollisionShape(Context* context);
    5858            virtual ~SphereCollisionShape();
    5959

  • code/trunk/src/modules/objects/eventsystem/EventDispatcher.cc

    r5929 r9667  
    3535namespace orxonox
    3636{
    37     CreateFactory(EventDispatcher);
     37    RegisterClass(EventDispatcher);
    3838
    39     EventDispatcher::EventDispatcher(BaseObject* creator) : BaseObject(creator)
     39    EventDispatcher::EventDispatcher(Context* context) : BaseObject(context)
    4040    {
    4141        RegisterObject(EventDispatcher);

  • code/trunk/src/modules/objects/eventsystem/EventDispatcher.h

    r7601 r9667  
    4646    {
    4747        public:
    48             EventDispatcher(BaseObject* creator);
     48            EventDispatcher(Context* context);
    4949            virtual ~EventDispatcher();
    5050

  • code/trunk/src/modules/objects/eventsystem/EventFilter.cc

    r8858 r9667  
    3636namespace orxonox
    3737{
    38     CreateFactory(EventFilter);
     38    RegisterClass(EventFilter);
    3939
    40     EventFilter::EventFilter(BaseObject* creator) : BaseObject(creator)
     40    EventFilter::EventFilter(Context* context) : BaseObject(context)
    4141    {
    4242        RegisterObject(EventFilter);

  • code/trunk/src/modules/objects/eventsystem/EventFilter.h

    r7601 r9667  
    4646    {
    4747        public:
    48             EventFilter(BaseObject* creator);
     48            EventFilter(Context* context);
    4949            virtual ~EventFilter();
    5050

  • code/trunk/src/modules/objects/eventsystem/EventListener.cc

    r8858 r9667  
    3535namespace orxonox
    3636{
    37     CreateFactory(EventListener);
     37    RegisterClass(EventListener);
    3838
    39     EventListener::EventListener(BaseObject* creator) : BaseObject(creator)
     39    EventListener::EventListener(Context* context) : BaseObject(context)
    4040    {
    4141        RegisterObject(EventListener);

  • code/trunk/src/modules/objects/eventsystem/EventListener.h

    r7601 r9667  
    4747    {
    4848        public:
    49             EventListener(BaseObject* creator);
     49            EventListener(Context* context);
    5050            virtual ~EventListener();
    5151

  • code/trunk/src/modules/objects/eventsystem/EventName.cc

    r5929 r9667  
    3232namespace orxonox
    3333{
    34     CreateFactory(EventName);
     34    RegisterClass(EventName);
    3535
    36     EventName::EventName(BaseObject* creator) : BaseObject(creator)
     36    EventName::EventName(Context* context) : BaseObject(context)
    3737    {
    3838        RegisterObject(EventName);

  • code/trunk/src/modules/objects/eventsystem/EventName.h

    r7601 r9667  
    4545    {
    4646        public:
    47             EventName(BaseObject* creator);
     47            EventName(Context* context);
    4848            virtual ~EventName() {}
    4949    };

  • code/trunk/src/modules/objects/eventsystem/EventTarget.cc

    r8858 r9667  
    3333namespace orxonox
    3434{
    35     CreateFactory(EventTarget);
     35    RegisterClass(EventTarget);
    3636
    37     EventTarget::EventTarget(BaseObject* creator) : BaseObject(creator)
     37    EventTarget::EventTarget(Context* context) : BaseObject(context)
    3838    {
    3939        RegisterObject(EventTarget);

  • code/trunk/src/modules/objects/eventsystem/EventTarget.h

    r7601 r9667  
    4646    {
    4747        public:
    48             EventTarget(BaseObject* creator);
     48            EventTarget(Context* context);
    4949            virtual ~EventTarget();
    5050

  • code/trunk/src/modules/objects/triggers/CheckPoint.cc

    r9348 r9667  
    4242namespace orxonox
    4343{
    44     CreateFactory(CheckPoint);
     44    RegisterClass(CheckPoint);
    4545
    46     CheckPoint::CheckPoint(BaseObject* creator)
    47         : DistanceTrigger(creator)
    48         , RadarViewable(creator, static_cast<WorldEntity*>(this))
     46    CheckPoint::CheckPoint(Context* context)
     47        : DistanceTrigger(context)
     48        , RadarViewable(this, static_cast<WorldEntity*>(this))
    4949    {
    5050        RegisterObject(CheckPoint);

  • code/trunk/src/modules/objects/triggers/CheckPoint.h

    r7601 r9667  
    5555    {
    5656    public:
    57         CheckPoint(BaseObject* creator);
     57        CheckPoint(Context* context);
    5858        virtual ~CheckPoint();
    5959

  • code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc

    r8858 r9667  
    4747    /*static*/ const std::string DistanceMultiTrigger::beaconModeExlcude_s = "exclude";
    4848   
    49     CreateFactory(DistanceMultiTrigger);
     49    RegisterClass(DistanceMultiTrigger);
    5050
    5151    /**
    … …  
    5353        Default Constructor. Registers the object and initializes default values.
    5454    */
    55     DistanceMultiTrigger::DistanceMultiTrigger(BaseObject* creator) : MultiTrigger(creator)
     55    DistanceMultiTrigger::DistanceMultiTrigger(Context* context) : MultiTrigger(context)
    5656    {
    5757        RegisterObject(DistanceMultiTrigger);

  • code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h

    r9016 r9667  
    4040#include <map>
    4141
    42 #include "core/WeakPtr.h"
     42#include "core/object/WeakPtr.h"
    4343
    4444#include "worldentities/WorldEntity.h"
    … …  
    9595
    9696        public:
    97             DistanceMultiTrigger(BaseObject* creator); // Default Constructor. Registers the object and initializes default values.
     97            DistanceMultiTrigger(Context* context); // Default Constructor. Registers the object and initializes default values.
    9898            virtual ~DistanceMultiTrigger(); // Destructor.
    9999

  • code/trunk/src/modules/objects/triggers/DistanceTrigger.cc

    r8858 r9667  
    4949    /*static*/ const std::string DistanceTrigger::beaconModeExlcude_s = "exclude";
    5050
    51     CreateFactory(DistanceTrigger);
     51    RegisterClass(DistanceTrigger);
    5252
    5353    /**
    … …  
    5757        The creator of this trigger.
    5858    */
    59     DistanceTrigger::DistanceTrigger(BaseObject* creator) : Trigger(creator)
     59    DistanceTrigger::DistanceTrigger(Context* context) : Trigger(context)
    6060    {
    6161        RegisterObject(DistanceTrigger);

  • code/trunk/src/modules/objects/triggers/DistanceTrigger.h

    r8706 r9667  
    9797    {
    9898        public:
    99             DistanceTrigger(BaseObject* creator); // Constructor. Registers and initializes the object.
     99            DistanceTrigger(Context* context); // Constructor. Registers and initializes the object.
    100100            virtual ~DistanceTrigger();
    101101

  • code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.cc

    r7601 r9667  
    4040{
    4141
    42     CreateFactory(DistanceTriggerBeacon);
     42    RegisterClass(DistanceTriggerBeacon);
    4343
    4444    /**
    … …  
    4848        The creator of this object.
    4949    */
    50     DistanceTriggerBeacon::DistanceTriggerBeacon(BaseObject* creator) : StaticEntity(creator)
     50    DistanceTriggerBeacon::DistanceTriggerBeacon(Context* context) : StaticEntity(context)
    5151    {
    5252        RegisterObject(DistanceTriggerBeacon);

  • code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.h

    r7601 r9667  
    5757
    5858        public:
    59             DistanceTriggerBeacon(BaseObject* creator); //!< Constructor.
     59            DistanceTriggerBeacon(Context* context); //!< Constructor.
    6060            virtual ~DistanceTriggerBeacon() {} //!< Destructor.
    6161

  • code/trunk/src/modules/objects/triggers/EventMultiTrigger.cc

    r7601 r9667  
    4343{
    4444
    45     CreateFactory(EventMultiTrigger);
     45    RegisterClass(EventMultiTrigger);
    4646
    4747    /**
    … …  
    4949        Constructor. Registers the object.
    5050    */
    51     EventMultiTrigger::EventMultiTrigger(BaseObject* creator) : MultiTrigger(creator)
     51    EventMultiTrigger::EventMultiTrigger(Context* context) : MultiTrigger(context)
    5252    {
    5353        RegisterObject(EventMultiTrigger);

  • code/trunk/src/modules/objects/triggers/EventMultiTrigger.h

    r8213 r9667  
    7373
    7474        public:
    75             EventMultiTrigger(BaseObject* creator); //!< Constructor. Registers the object.
     75            EventMultiTrigger(Context* context); //!< Constructor. Registers the object.
    7676            virtual ~EventMultiTrigger(); //!< Destructor.
    7777

  • code/trunk/src/modules/objects/triggers/EventTrigger.cc

    r8213 r9667  
    4040namespace orxonox
    4141{
    42     CreateFactory(EventTrigger);
     42    RegisterClass(EventTrigger);
    4343
    4444    /**
    … …  
    4848        The creator of the EventTrigger.
    4949    */
    50     EventTrigger::EventTrigger(BaseObject* creator) : Trigger(creator)
     50    EventTrigger::EventTrigger(Context* context) : Trigger(context)
    5151    {
    5252        RegisterObject(EventTrigger);

  • code/trunk/src/modules/objects/triggers/EventTrigger.h

    r8706 r9667  
    7070    {
    7171        public:
    72             EventTrigger(BaseObject* creator); // Constructor. Registers and initializes the object.
     72            EventTrigger(Context* context); // Constructor. Registers and initializes the object.
    7373            virtual ~EventTrigger();
    7474

  • code/trunk/src/modules/objects/triggers/MultiTrigger.cc

    r8858 r9667  
    4343{
    4444
    45     CreateFactory(MultiTrigger);
     45    RegisterClass(MultiTrigger);
    4646
    4747    /**
    … …  
    5151        The creator.
    5252    */
    53     MultiTrigger::MultiTrigger(BaseObject* creator) : TriggerBase(creator)
     53    MultiTrigger::MultiTrigger(Context* context) : TriggerBase(context)
    5454    {
    5555        RegisterObject(MultiTrigger);
    … …  
    451451        }
    452452
    453         MultiTriggerContainer* container = new MultiTriggerContainer(this, this, originator);
     453        MultiTriggerContainer* container = new MultiTriggerContainer(this->getContext(), this, originator);
    454454        this->fireEvent(status, container);
    455455        orxout(verbose, context::triggers) << "MultiTrigger '" <<  this->getName() << "' (&" << this << "): Fired event. originator: " << originator->getIdentifier()->getName() << " (&" << originator << "), status: " << status << "." << endl;

  • code/trunk/src/modules/objects/triggers/MultiTrigger.h

    r9016 r9667  
    9999    {
    100100        public:
    101             MultiTrigger(BaseObject* creator); //!< Constructor. Registers the objects and initializes default values.
     101            MultiTrigger(Context* context); //!< Constructor. Registers the objects and initializes default values.
    102102            virtual ~MultiTrigger(); //!< Destructor.
    103103

  • code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc

    r8706 r9667  
    4242{
    4343
    44     CreateUnloadableFactory(MultiTriggerContainer);
     44    RegisterUnloadableClass(MultiTriggerContainer);
    4545
    4646    /**
    … …  
    5050        The creator.
    5151    */
    52     MultiTriggerContainer::MultiTriggerContainer(BaseObject* creator) : BaseObject(creator), originator_(NULL), data_(NULL)
     52    MultiTriggerContainer::MultiTriggerContainer(Context* context) : BaseObject(context), originator_(NULL), data_(NULL)
    5353    {
    5454        RegisterObject(MultiTriggerContainer);
    … …  
    6565        A pointer to the data that should be sent with the container.
    6666    */
    67     MultiTriggerContainer::MultiTriggerContainer(BaseObject* creator, MultiTrigger* originator, BaseObject* data) : BaseObject(creator), originator_(originator), data_(data)
     67    MultiTriggerContainer::MultiTriggerContainer(Context* context, MultiTrigger* originator, BaseObject* data) : BaseObject(context), originator_(originator), data_(data)
    6868    {
    6969        RegisterObject(MultiTriggerContainer);

  • code/trunk/src/modules/objects/triggers/MultiTriggerContainer.h

    r7601 r9667  
    5858
    5959        public:
    60             MultiTriggerContainer(BaseObject* creator); //!< Default constructor. Registers the object and creates an empty container.
    61             MultiTriggerContainer(BaseObject* creator, MultiTrigger* originator, BaseObject* data); //!< Constructor. Registers the object and sets the input values.
     60            MultiTriggerContainer(Context* context); //!< Default constructor. Registers the object and creates an empty container.
     61            MultiTriggerContainer(Context* context, MultiTrigger* originator, BaseObject* data); //!< Constructor. Registers the object and sets the input values.
    6262            virtual ~MultiTriggerContainer(); //!< Destructor.
    6363

  • code/trunk/src/modules/objects/triggers/Trigger.cc

    r8706 r9667  
    4747    SetConsoleCommand("Trigger", "debugFlares", &Trigger::debugFlares).defaultValues(false);
    4848
    49     CreateFactory(Trigger);
     49    RegisterClass(Trigger);
    5050
    5151    /**
    … …  
    5555        The creator of the Trigger.
    5656    */
    57     Trigger::Trigger(BaseObject* creator) : TriggerBase(creator)
     57    Trigger::Trigger(Context* context) : TriggerBase(context)
    5858    {
    5959        RegisterObject(Trigger);

  • code/trunk/src/modules/objects/triggers/Trigger.h

    r8213 r9667  
    8080    {
    8181        public:
    82             Trigger(BaseObject* creator); // Constructor. Registers and initializes the object.
     82            Trigger(Context* context); // Constructor. Registers and initializes the object.
    8383            virtual ~Trigger();
    8484

  • code/trunk/src/modules/objects/triggers/TriggerBase.cc

    r8858 r9667  
    4646    /*static*/ const std::string TriggerBase::xor_s = "xor";
    4747
    48     CreateFactory(TriggerBase);
     48    RegisterClass(TriggerBase);
    4949
    5050    /**
    … …  
    5252        Constructor. Registers the object and initializes some values.
    5353    */
    54     TriggerBase::TriggerBase(BaseObject* creator) : StaticEntity(creator)
     54    TriggerBase::TriggerBase(Context* context) : StaticEntity(context)
    5555    {
    5656        RegisterObject(TriggerBase);

  • code/trunk/src/modules/objects/triggers/TriggerBase.h

    r8706 r9667  
    7474    {
    7575        public:
    76             TriggerBase(BaseObject* creator);
     76            TriggerBase(Context* context);
    7777            virtual ~TriggerBase();
    7878
Note: See TracChangeset for help on using the changeset viewer.