Changeset 879 for code/branches

Timestamp:

Mar 10, 2008, 5:07:48 PM (17 years ago)

Author:

landauf

Message:

started implementing the Namespace hierarchy (still unfinished)

Location:

code/branches/core2/src/orxonox

Files:

• core/BaseObject.h (modified) (1 diff)
• core/Namespace.cc (modified) (2 diffs)
• core/Namespace.h (modified) (2 diffs)
• core/XMLPort.h (modified) (5 diffs)
• objects/WorldEntity.cc (modified) (1 diff)

code/branches/core2/src/orxonox/core/BaseObject.h

@@ -79 +79 @@
             const std::string& getLevelfile() const;
 
-            inline void setNamespace(Namespace* ns) { this->namespace_ = ns; }
+            virtual inline void setNamespace(Namespace* ns) { this->namespace_ = ns; }
             inline Namespace* getNamespace() const { return this->namespace_; }
 

code/branches/core2/src/orxonox/core/Namespace.cc

@@ -38 +38 @@
         RegisterObject(Namespace);
 
-        this->representingNamespace_ = 0;
+        this->representingNamespace_ = this;
     }
 
@@ -55 +55 @@
         BaseObject::XMLPort(xmlelement, loading);
 
-        XMLPortObject(Namespace, BaseObject, "", loadObjects, saveObjects, xmlelement, loading, true);
+        XMLPortObject(Namespace, BaseObject, "", loadObjects, saveObjects, xmlelement, loading, true, false);
     }
 
     void Namespace::loadObjects(BaseObject* object)
     {
-        object->setNamespace(this);
+        object->setNamespace(this->representingNamespace_);
+
+        if (object->isA(Class(Namespace)))
+            this->addSubnamespace((Namespace*)object);
+    }
+
+    void Namespace::addSubnamespace(Namespace* ns)
+    {
+        std::string name = ns->getName().substr(ns->getName().find("::"
+
+        if (!this->hasSubnamespace(ns->getName()))
+            this->namespaces_[ns->getName()] = ns;
+        else
+            ns->representingNamespace_ = object;
+    }
+
+    bool Namespace::hasSubnamespace(const std::string& name) const
+    {
+        return (this->namespaces_.find(name) != this->namespaces_.end());
     }
 

code/branches/core2/src/orxonox/core/Namespace.h

@@ -29 +29 @@
 #define _Namespace_H__
 
-#include <list>
+#include <map>
 
 #include "BaseObject.h"
@@ -49 +49 @@
             const BaseObject* saveObjects(unsigned int index) const;
 
+            void addSubnamespace(Namespace* ns);
+            bool hasSubnamespace(const std::string& name) const;
+
         private:
-            std::list<Namespace*> namespaces_;
+            std::map<std::string, Namespace*> namespaces_;
             Namespace* representingNamespace_;
     };

code/branches/core2/src/orxonox/core/XMLPort.h

@@ -59 +59 @@
     xmlcontainer##loadfunction##savefunction->port(this, xmlelement, loading)
 
-#define XMLPortObject(classname, objectclass, sectionname, loadfunction, savefunction, xmlelement, loading, bApplyLoaderMask) \
+#define XMLPortObject(classname, objectclass, sectionname, loadfunction, savefunction, xmlelement, loading, bApplyLoaderMask, bLoadBefore) \
     orxonox::XMLPortClassObjectContainer<classname, objectclass>* xmlcontainer##loadfunction##savefunction = (orxonox::XMLPortClassObjectContainer<classname, objectclass>*)(this->getIdentifier()->getXMLPortObjectContainer(sectionname)); \
     if (!xmlcontainer##loadfunction##savefunction) \
     { \
-        xmlcontainer##loadfunction##savefunction = new orxonox::XMLPortClassObjectContainer<classname, objectclass>(this->getIdentifier()->getName(), std::string(sectionname), &classname::loadfunction, &classname::savefunction, bApplyLoaderMask); \
+        xmlcontainer##loadfunction##savefunction = new orxonox::XMLPortClassObjectContainer<classname, objectclass>(this->getIdentifier()->getName(), std::string(sectionname), &classname::loadfunction, &classname::savefunction, bApplyLoaderMask, bLoadBefore); \
         this->getIdentifier()->addXMLPortObjectContainer(sectionname, xmlcontainer##loadfunction##savefunction); \
     } \
@@ -202 +202 @@
             std::string sectionname_;
             bool bApplyLoaderMask_;
+            bool bLoadBefore_;
 
         private:
@@ -212 +213 @@
     {
         public:
-            XMLPortClassObjectContainer(const std::string classname, const std::string sectionname, void (T::*loadfunction)(O*), const O* (T::*savefunction)(unsigned int) const, bool bApplyLoaderMask)
+            XMLPortClassObjectContainer(const std::string classname, const std::string sectionname, void (T::*loadfunction)(O*), const O* (T::*savefunction)(unsigned int) const, bool bApplyLoaderMask, bool bLoadBefore)
             {
                 this->classname_ = classname;
@@ -219 +220 @@
                 this->savefunction_ = savefunction;
                 this->bApplyLoaderMask_ = bApplyLoaderMask;
+                this->bLoadBefore_ = bLoadBefore;
             }
 
@@ -248 +250 @@
                                             newObject->setLoaderIndentation(object->getLoaderIndentation() + "  ");
                                             newObject->setLevel(object->getLevel());
-                                            newObject->XMLPort(*child, true);
+                                            newObject->setNamespace(object->getNamespace());
+                                            if (this->bLoadBefore_)
+                                                newObject->XMLPort(*child, true);
                                             COUT(4) << object->getLoaderIndentation() << "assigning " << child->Value() << " (objectname " << newObject->getName() << ") to " << this->classname_ << " (objectname " << object->getName() << ")" << std::endl;
                                             (*object.*this->loadfunction_)(newObject);
+                                            if (!this->bLoadBefore_)
+                                                newObject->XMLPort(*child, true);
                                             COUT(5) << "  ...fabricated " << child->Value() << " (objectname " << newObject->getName() << ")." << std::endl;
                                         }

code/branches/core2/src/orxonox/objects/WorldEntity.cc

@@ -182 +182 @@
         XMLPortParam(WorldEntity, "rotationRate", setRotationRate, getRotationRate, xmlelement, loading);
 
-        XMLPortObject(WorldEntity, WorldEntity, "attached", attachWorldEntity, getAttachedWorldEntity, xmlelement, loading, false);
+        XMLPortObject(WorldEntity, WorldEntity, "attached", attachWorldEntity, getAttachedWorldEntity, xmlelement, loading, false, true);
     }