Changeset 877 for code/branches/core2/src

Timestamp:

Mar 10, 2008, 1:43:14 AM (17 years ago)

Author:

landauf

Message:

started implementing a Namespace object (which will be used in level files to create and access groups of objects)

Location:

code/branches/core2/src/orxonox

Files:

• core/BaseObject.h (modified) (2 diffs)
• core/CMakeLists.txt (modified) (1 diff)
• core/CorePrereqs.h (modified) (1 diff)
• core/Loader.cc (modified) (1 diff)
• core/Namespace.cc (added)
• core/Namespace.h (added)
• core/XMLPort.h (modified) (3 diffs)
• objects/WorldEntity.cc (modified) (1 diff)
• objects/WorldEntity.h (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; }
+            inline Namespace* getNamespace() const { return this->namespace_; }
+
             /** @brief Sets the indentation of the debug output in the Loader. @param indentation The indentation */
             inline void setLoaderIndentation(const std::string& indentation) { this->loaderIndentation_ = indentation; }
@@ -90 +93 @@
             const Level* level_;                        //!< The level that loaded this object
             std::string loaderIndentation_;             //!< Indentation of the debug output in the Loader
+            Namespace* namespace_;
     };
 }

code/branches/core2/src/orxonox/core/CMakeLists.txt

@@ -17 +17 @@
   Executor.cc
   XMLPort.cc
+  Namespace.cc
 )
 

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

@@ -95 +95 @@
   template <class T>
   class MetaObjectListElement;
+  class Namespace;
   template <class T>
   class ObjectList;

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

@@ -115 +115 @@
             xmlfile.LoadFile();
 
-            for ( ticpp::Iterator<ticpp::Element> child = xmlfile.FirstChildElement(false); child != child.end(); child++ )
+            for (ticpp::Iterator<ticpp::Element> child = xmlfile.FirstChildElement(false); child != child.end(); child++)
             {
                 Identifier* identifier = ID(child->Value());

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

@@ -211 +211 @@
     {
         public:
-            XMLPortClassObjectContainer(const std::string classname, const std::string sectionname, void (T::*loadfunction)(O*), const O* (T::*savefunction)(unsigned int))
+            XMLPortClassObjectContainer(const std::string classname, const std::string sectionname, void (T::*loadfunction)(O*), const O* (T::*savefunction)(unsigned int) const)
             {
                 this->classname_ = classname;
@@ -225 +225 @@
                     try
                     {
-                        Element* xmlsubelement = xmlelement.FirstChildElement(this->sectionname_, false);
+                        Element* xmlsubelement;
+                        if (this->sectionname_ != "")
+                            xmlsubelement = xmlelement.FirstChildElement(this->sectionname_, false);
+                        else
+                            xmlsubelement = &xmlelement;
 
                         if (xmlsubelement)
                         {
-                            for ( ticpp::Iterator<ticpp::Element> child = xmlsubelement->FirstChildElement(false); child != child.end(); child++ )
+                            for (ticpp::Iterator<ticpp::Element> child = xmlsubelement->FirstChildElement(false); child != child.end(); child++)
                             {
                                 Identifier* identifier = ID(child->Value());
@@ -276 +280 @@
         private:
             void     (T::*loadfunction_)(O*);
-            const O* (T::*savefunction_)(unsigned int);
+            const O* (T::*savefunction_)(unsigned int) const;
     };
 }

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

@@ -218 +218 @@
     }
 
-    const WorldEntity* WorldEntity::getAttachedWorldEntity(unsigned int index)
+    const WorldEntity* WorldEntity::getAttachedWorldEntity(unsigned int index) const
     {
         if (index < this->attachedWorldEntities_.size())

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

@@ -29 +29 @@
 
             void attachWorldEntity(WorldEntity* entity);
-            const WorldEntity* getAttachedWorldEntity(unsigned int index);
+            const WorldEntity* getAttachedWorldEntity(unsigned int index) const;
 
             inline Ogre::SceneNode* getNode()