Changeset 10562 for code/branches/core7

Timestamp:

Aug 29, 2015, 11:15:28 PM (9 years ago)

Author:

landauf

Message:

removed unnecessary code - this is all done by passing the context to the BaseObject's constructor

Location:

code/branches/core7/src

Files:

• libraries/core/Namespace.cc (modified) (1 diff)
• libraries/network/synchronisable/Synchronisable.cc (modified) (1 diff)
• orxonox/Level.cc (modified) (1 diff)
• orxonox/Scene.cc (modified) (2 diffs)

code/branches/core7/src/libraries/core/Namespace.cc

@@ -105 +105 @@
     void Namespace::loadObjects(BaseObject* object)
     {
-        object->setNamespace(this);
     }
 

code/branches/core7/src/libraries/network/synchronisable/Synchronisable.cc

@@ -182 +182 @@
     no->setClassID(header.getClassID());
     assert(no->contextID_ == header.getContextID());
-    if( context )
-    {
-      BaseObject* boContext = orxonox_cast<BaseObject*>(context);
-      if (boContext)
-          bo->setLevel(boContext->getLevel()); // Note: this ensures that the level is known on the client for child objects of the scene (and the scene itself)
-    }
     //assert(no->classID_ == header.getClassID());
     orxout(verbose, context::network) << "fabricate objectID_: " << no->objectID_ << " classID_: " << no->classID_ << endl;

code/branches/core7/src/orxonox/Level.cc

@@ -134 +134 @@
     {
         this->objects_.push_back(object);
-        object->setGametype(this->getGametype());
         object->setLevel(this);
     }

code/branches/core7/src/orxonox/Scene.cc

@@ -62 +62 @@
         RegisterObject(Scene);
 
-        this->setScene(StrongPtr<Scene>(this, false), OBJECTID_UNKNOWN);
+        this->setScene(StrongPtr<Scene>(this, false), this->getObjectID());
         this->bShadows_ = true;
         this->bDebugDrawPhysics_ = false;
@@ -316 +316 @@
     {
         this->objects_.push_back(object);
-        object->setScene(this, this->getObjectID());
     }