Changeset 10499 for code/branches/presentationFS15/src/orxonox

Timestamp:

May 27, 2015, 2:36:07 PM (9 years ago)

Author:

maxima

Message:

New XMLPort for ControllerDirector. The name of the script can now be set via XMLPort. Level scriptController plays the new Script 'presentation.lua'

Location:

code/branches/presentationFS15/src/orxonox/controllers

Files:

• ControllerDirector.cc (modified) (3 diffs)
• ControllerDirector.h (modified) (2 diffs)

code/branches/presentationFS15/src/orxonox/controllers/ControllerDirector.cc

@@ -41 +41 @@
     {
         SUPER(ControllerDirector, XMLPort, xmlelement, mode);
+        XMLPortParam(ControllerDirector, "scriptname", setScriptName, getScriptName, xmlelement, mode).defaultValues("testscript");
 
         orxout(verbose)<< "ControllerDirector::XMLPort " 
@@ -83 +84 @@
        else
          return;
-       
+
        /* Set up a luastate to use for running the scripts */
        LuaState * ls = new LuaState();
@@ -98 +99 @@
         * variable "newctrlid" defined, which means it can make use of it.
         */
-
-       ls->doFile("testscript.lua");
+       std::string scr = this->scriptname_ + ".lua";
+       ls->doFile(scr);
 
        /* Increase the controller ID so we have a different one for

code/branches/presentationFS15/src/orxonox/controllers/ControllerDirector.h

@@ -47 +47 @@
             virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
 
+            inline void setScriptName(const std::string& name) { this->scriptname_ = name; }
+            inline const std::string& getScriptName() const { return this->scriptname_; }
+
 
             /* Take over control of a given object */
@@ -55 +58 @@
             //void setNewController(Controller * controller);
 
-        private:
+        protected:
+            std::string scriptname_;   
             PlayerInfo* player_;
             ControllableEntity* entity_;