Changeset 10057 for code/branches/ScriptableController/src/orxonox

Timestamp:

May 15, 2014, 2:18:08 PM (11 years ago)

Author:

mkronig

Message:

 

Location:

code/branches/ScriptableController/src/orxonox/controllers

Files:

• ControllerDirector.cc (modified) (2 diffs)
• ScriptController.cc (modified) (5 diffs)

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

@@ -27 +27 @@
 
         // output a message to ensure we know the constructor was run
-        orxout()<<"hello universe constructor"<< endl;
+        orxout()<<"hello universe constructor blablub"<< endl;
+
+
 
         // Initialize member variables
@@ -96 +98 @@
         * variable "newctrlid" defined, which means it can make use of it.
         */
+
        ls->doFile("testscript.lua");
 

code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    float scTime=0;  /*initialise time, to coordinate eventTime*/
+    float scTime=0;  /*initialize time, to coordinate eventTime*/
 
 
@@ -117 +117 @@
         if(ev.fctName=="moveToPosition_beta")
         {
+
             moveToPosition_beta(ev.xCoord,ev.yCoord,ev.zCoord);
         }
@@ -137 +138 @@
             /*TO DO: execute the function: eventList[0].fctName*/
 
-
+            execute(eventList[0]);
             eventList.erase(eventList.begin());
         }
@@ -167 +168 @@
     void ScriptController::eventScheduler(std::string instruction, float x, float y, float z, float executionTime)
     {
+
         /*put data (from LUA) into time-sorted eventList*/ 
         /*nimmt den befehl und die argumente aus luascript und ertellt einen struct pro event, diese structs werden sortiert nach eventTime*/
@@ -195 +197 @@
         }
         
+        
     }