Changeset 996 for code/branches/script/src/orxonox/core

Timestamp:

Apr 5, 2008, 9:47:12 PM (17 years ago)

Author:

bknecht

Message:

tolua++ works now. A level will now be sent through lua, before getting loaded by tinyxml.

File:

• code/branches/script/src/orxonox/core/Loader.cc (modified) (3 diffs)

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

@@ -33 +33 @@
 #include "Debug.h"
 #include "CoreIncludes.h"
+#include "../script/Script.h"
 
 #include "util/tinyxml/ticpp.h"
@@ -107 +108 @@
         Loader::currentMask_s = level->getMask() * mask;
 
+        // let Lua work this out:
+        //Script* lua;
+        Script::loadFile(level->getFile(), true);
+        Script::init(Script::getLuaState());
+        Script::run();
+
         try
         {
@@ -112 +119 @@
             COUT(3) << "Mask: " << Loader::currentMask_s << std::endl;
 
-            ticpp::Document xmlfile(level->getFile());
-            xmlfile.LoadFile();
+            //ticpp::Document xmlfile(level->getFile());
+            //xmlfile.LoadFile();
+            //ticpp::Element myelement(*Script::getFileString());
+            ticpp::Document xmlfile;
+            //xmlfile.ToDocument();
+            xmlfile.Parse(*Script::getFileString(), true);
 
             for ( ticpp::Iterator<ticpp::Element> child = xmlfile.FirstChildElement(false); child != child.end(); child++ )