Changeset 1052 for code/trunk/src/orxonox/core/Loader.cc

Timestamp:

Apr 14, 2008, 3:42:49 AM (16 years ago)

Author:

landauf

Message:

merged core2 back to trunk
there might be some errors, wasn't able to test it yet due to some strange g++ and linker behaviour.

File:

• code/trunk/src/orxonox/core/Loader.cc (modified) (2 diffs)

code/trunk/src/orxonox/core/Loader.cc

@@ -34 +34 @@
 #include "CoreIncludes.h"
 #include "Script.h"
+#include "Namespace.h"
 
 #include "util/tinyxml/ticpp.h"
@@ -129 +130 @@
             xmlfile.Parse(lua->getLuaOutput(), true);
 
-            for ( ticpp::Iterator<ticpp::Element> child = xmlfile.FirstChildElement(false); child != child.end(); child++ )
-            {
-                Identifier* identifier = ID(child->Value());
-                if (identifier)
-                {
-                    if (Loader::currentMask_s.isIncluded(identifier))
-                    {
-                        COUT(4) << "  fabricating " << child->Value() << "..." << std::endl;
-                        BaseObject* newObject = identifier->fabricate();
-                        newObject->setLoaderIndentation("    ");
-                        newObject->setLevel(level);
-                        newObject->XMLPort(*child, true);
-                        COUT(5) << "  ...fabricated " << child->Value() << " (objectname " << newObject->getName() << ")." << std::endl;
-                    }
-                }
-                else
-                {
-                    COUT(2) << "  Warning: '" << child->Value() << "' is not a valid classname." << std::endl;
-                }
-            }
+            ticpp::Element rootElement;
+            rootElement.SetAttribute("name", "root");
+            rootElement.SetAttribute("bAutogenerated", true);
+
+            for (ticpp::Iterator<ticpp::Element> child = xmlfile.FirstChildElement(false); child != child.end(); child++)
+                rootElement.InsertEndChild(*child);
+
+            COUT(4) << "  creating root-namespace..." << std::endl;
+            Namespace* rootNamespace = new Namespace();
+            rootNamespace->setLoaderIndentation("    ");
+            rootNamespace->setLevel(level);
+            rootNamespace->setNamespace(rootNamespace);
+            rootNamespace->setRoot(true);
+            rootNamespace->XMLPort(rootElement, XMLPort::LoadObject);
 
             COUT(0) << "Finished loading " << level->getFile() << "." << std::endl;
+
+            COUT(4) << "Namespace-tree:" << std::endl << rootNamespace->toString("  ") << std::endl;
 
             return true;