Changeset 10057

Timestamp:

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

Author:

mkronig

Message:

 

Location:

code/branches/ScriptableController

Files:

• data/gui/scripts/testscript.lua (modified) (1 diff)
• data/levels/levelTry.oxw (modified) (1 diff)
• src/orxonox/controllers/ControllerDirector.cc (modified) (2 diffs)
• src/orxonox/controllers/ScriptController.cc (modified) (5 diffs)

code/branches/ScriptableController/data/gui/scripts/testscript.lua

@@ -15 +15 @@
 -- If it worked, call its "movetoposition" function
 if ctrl ~= nil then
-  ctrl:eventScheduler("moveToPosition_beta", x, y, z, 5)
+  ctrl:eventScheduler("moveToPosition_beta", x, y, z, 0.01)
 end
+
+
 
 -- Output the newctrlid variable we set from the C++ code

code/branches/ScriptableController/data/levels/levelTry.oxw

@@ -72 +72 @@
 
 
-    <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=100 />
+    <Billboard position="500,0,0" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=10 />
     <DistanceTrigger position="0,0,0" distance="200" target="Pawn"
       beaconMode="exclude" targetname="bcnDestroyer" name="takeControl"

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 @@
         }
         
+        
     }