Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 9, 2013, 9:26:46 PM (11 years ago)
Author:
landauf
Message:

BaseObject now requires a Context instead of a creator (BaseObject*) in its constructor.
Namespace, Level, and Scene inherit from Context

Location:
code/branches/core6/src/libraries/core/class
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core6/src/libraries/core/class/Identifier.cc

    r9606 r9629  
    174174        @return The new object
    175175    */
    176     OrxonoxClass* Identifier::fabricate(BaseObject* creator)
     176    OrxonoxClass* Identifier::fabricate(Context* context)
    177177    {
    178178        if (this->factory_)
    179179        {
    180             return this->factory_->fabricate(creator);
     180            return this->factory_->fabricate(context);
    181181        }
    182182        else
  • code/branches/core6/src/libraries/core/class/Identifier.h

    r9626 r9629  
    125125            inline bool hasFactory() const { return (this->factory_ != 0); }
    126126
    127             OrxonoxClass* fabricate(BaseObject* creator);
     127            OrxonoxClass* fabricate(Context* context);
    128128
    129129            /// Returns true if the class can be loaded through XML.
  • code/branches/core6/src/libraries/core/class/SubclassIdentifier.h

    r9563 r9629  
    163163
    164164            /// Creates a new object of the type of the assigned Identifier and dynamic_casts it to the minimal type given by T.
    165             T* fabricate(BaseObject* creator) const
    166             {
    167                 OrxonoxClass* newObject = this->identifier_->fabricate(creator);
     165            T* fabricate(Context* context) const
     166            {
     167                OrxonoxClass* newObject = this->identifier_->fabricate(context);
    168168
    169169                // Check if the creation was successful
Note: See TracChangeset for help on using the changeset viewer.