Changeset 1021 for code/trunk/src/orxonox/core

Timestamp:

Apr 10, 2008, 5:03:34 PM (17 years ago)

Author:

bknecht

Message:

merged back that script-branch

Location:

code/trunk/src/orxonox/core

Files:

• BaseObject.cc (modified) (1 diff)
• CMakeLists.txt (modified) (2 diffs)
• ClassTreeMask.cc (modified) (6 diffs)
• DebugLevel.cc (modified) (1 diff)
• Loader.cc (modified) (3 diffs)
• Script.cc (copied) (copied from code/branches/script/src/orxonox/core/Script.cc)
• Script.h (copied) (copied from code/branches/script/src/orxonox/core/Script.h)
• Tickable.cc (copied) (copied from code/branches/script/src/orxonox/core/Tickable.cc)
• Tickable.h (copied) (copied from code/branches/script/src/orxonox/core/Tickable.h)

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

@@ -27 +27 @@
 
 /**
-    @file BaseObject.cc
+    @file
     @brief Implementation of the BaseObject class.
 */

code/trunk/src/orxonox/core/CMakeLists.txt

@@ -17 +17 @@
   Executor.cc
   XMLPort.cc
+  Tickable.cc
+  Script.cc
 )
 
@@ -24 +26 @@
 TARGET_LINK_LIBRARIES( core
   util
+  ${Lua_LIBRARIES}
 )

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

@@ -592 +592 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) || other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) or other.isIncluded(subclass), false, false);
         }
 
@@ -599 +599 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) || other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) or other.isIncluded(subclass), false, false);
         }
 
@@ -623 +623 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) && other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) and other.isIncluded(subclass), false, false);
         }
 
@@ -630 +630 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) && other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) and other.isIncluded(subclass), false, false);
         }
 
@@ -737 +737 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) XOR other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) xor other.isIncluded(subclass), false, false);
         }
 
@@ -744 +744 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) XOR other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) xor other.isIncluded(subclass), false, false);
         }
 

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

@@ -95 +95 @@
 
         // Return a constant value while we're creating the object
-        return 4;
+        return 3;
     }
 }

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

@@ -33 +33 @@
 #include "Debug.h"
 #include "CoreIncludes.h"
+#include "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();*/
+        Script* lua = Script::getInstance();
+        lua->loadFile(level->getFile(), true);
+        lua->run();
+
         try
         {
@@ -112 +122 @@
             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(lua->getLuaOutput(), true);
 
             for ( ticpp::Iterator<ticpp::Element> child = xmlfile.FirstChildElement(false); child != child.end(); child++ )