Changeset 1625 for code/trunk/src/core

Timestamp:

Jun 26, 2008, 2:13:17 PM (16 years ago)

Author:

rgrieder

Message:

merged hud branch back to trunk

Location:

code/trunk/src/core

Files:

• BaseObject.cc (modified) (2 diffs)
• BaseObject.h (modified) (1 diff)
• Executor.cc (modified) (2 diffs)
• Iterator.h (modified) (1 diff)
• Loader.cc (modified) (1 diff)
• Script.h (modified) (1 diff)
• TclThreadManager.h (modified) (1 diff)

code/trunk/src/core/BaseObject.cc

@@ -66 +66 @@
 
     /**
-        @brief load general xml paramters
-    */
-    void BaseObject::loadParams(TiXmlElement* xmlElem)
-    {
-        if (xmlElem->Attribute("name"))
-        {
-            this->setName(xmlElem->Attribute("name"));
-        }
-    }
-
-    /**
         @brief XML loading and saving.
         @param xmlelement The XML-element
@@ -85 +74 @@
     {
         XMLPortParam(BaseObject, "name", setName, getName, xmlelement, mode);
+        XMLPortParam(BaseObject, "visible", setVisible, isVisible, xmlelement, mode);
+        XMLPortParam(BaseObject, "active", setActive, isActive, xmlelement, mode);
     }
 

code/trunk/src/core/BaseObject.h

@@ -52 +52 @@
             BaseObject();
             virtual ~BaseObject();
-            virtual void loadParams(TiXmlElement* xmlElem);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 

code/trunk/src/core/Executor.cc

@@ -30 +30 @@
 #include "Executor.h"
 #include "util/Math.h"
+#include "util/Convert.h"
 #include "Language.h"
 
@@ -136 +137 @@
             {
                 std::string paramnumber;
-                if (!Convert::ToString(&paramnumber, param))
+                if (!convertValue(&paramnumber, param))
                     return (*this);
 

code/trunk/src/core/Iterator.h

@@ -92 +92 @@
             {
                 this->element_ = element;
+                return *this;
             }
 

code/trunk/src/core/Loader.cc

@@ -116 +116 @@
         Script::run();*/
         Script* lua = Script::getInstance();
+        lua->clearLuaOutput();
         lua->loadFile(level->getFile(), true);
         lua->run();

code/trunk/src/core/Script.h

@@ -72 +72 @@
     inline std::string getLuaOutput() { return output_; };
     //inline std::string* getFileString() { return &fileString_; };
+    inline void clearLuaOutput() { output_ = ""; }
 
     unsigned int getNextQuote(const std::string& text, unsigned int start);

code/trunk/src/core/TclThreadManager.h

@@ -45 +45 @@
 namespace orxonox
 {
-    class boost::thread;
-
     struct _CoreExport TclInterpreterBundle
     {