Changeset 11207 for code/branches/presentationFS16/data

Timestamp:

May 26, 2016, 4:38:51 PM (9 years ago)

Author:

fvultier

Message:

merged scriptable controller

Location:

code/branches/presentationFS16

Files:

• . (modified) (1 prop)
• data/gui/scripts/testscript.lua (modified) (1 diff)
• data/levels/scriptController.oxw (modified) (2 diffs)

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

@@ -18 +18 @@
 
 -- Get a local pointer to a scriptcontroller
-local ctrl = orxonox.ScriptController:getScriptController()
+local ctrl = orxonox.NewScriptController:getNewScriptController()
 
 -- If it worked, call its "movetoposition" function
 if ctrl ~= nil then
 
-  ctrl:eventScheduler("mal", xl,yl,zl, xl,yl,zl, 2)
-  ctrl:eventScheduler("idle", 1)
-  ctrl:eventScheduler("ral", xl, yl, zl, 3, 3000, 0, math.pi)
-  ctrl:eventScheduler("idle", 1)
-  ctrl:eventScheduler("mal", 0,0,1000, xl,yl,zl, 3)
-  ctrl:eventScheduler("idle", 1)
-  ctrl:eventScheduler("chl", xl, yl, zl, xr, yr, zr, 2)
-  ctrl:eventScheduler("idle", 1)
-  ctrl:eventScheduler("mal", xr + 600,yr,zr, xr,yr,zr, 4)
-  ctrl:eventScheduler("idle", 1)
-  ctrl:eventScheduler("chl", xr, yr, zr, xl, yl, zl, 3)
-  ctrl:eventScheduler("idle", 1)
-  ctrl:eventScheduler("spi", xm,ym,zm, 0,0,0, 4)
-  ctrl:eventScheduler("idle", 1)
+  ctrl:moveTo(1, 0, 0, 100, 200)
+  ctrl:moveTo(20, 0, 0, 100, 200)
+  ctrl:moveTo(40, 0, 100, 0, 200)
+  --ctrl:eventScheduler("mal", xl,yl,zl, xl,yl,zl, 10)
+  -- ctrl:eventScheduler("ral", xl, yl, zl, 3, 3000, 0, math.pi)
+  -- ctrl:eventScheduler("idle", 1)
+  -- ctrl:eventScheduler("mal", 0,0,1000, xl,yl,zl, 3)
+  -- ctrl:eventScheduler("idle", 1)
+  -- ctrl:eventScheduler("chl", xl, yl, zl, xr, yr, zr, 2)
+  -- ctrl:eventScheduler("idle", 1)
+  -- ctrl:eventScheduler("mal", xr + 600,yr,zr, xr,yr,zr, 4)
+  -- ctrl:eventScheduler("idle", 1)
+  -- ctrl:eventScheduler("chl", xr, yr, zr, xl, yl, zl, 3)
+  -- ctrl:eventScheduler("idle", 1)
+  -- ctrl:eventScheduler("spi", xm,ym,zm, 0,0,0, 4)
+  -- ctrl:eventScheduler("idle", 1)
 
 end

code/branches/presentationFS16/data/levels/scriptController.oxw

@@ -39 +39 @@
     <Billboard position="2500,0,0" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=10 />
     <DistanceTrigger position="2500,0,0" distance="200" target="Pawn"
-      beaconMode="exclude" targetname="bcnDestroyer" name="takeControl"
+      beaconMode="exclude" targetname="bcnDestroyer" name="takeControl" stayActive="true"
     />
 
@@ -54 +54 @@
     </StaticEntity>
 
+
+    <StaticEntity position  = "3000,0,0" mass=10000 collisionType=static >
+      <attached>
+        <Model mesh="cube_green.mesh" mass=10 position="0,0,0" scale=10 />
+      </attached>
+    </StaticEntity>
+
+    <StaticEntity position  = "2000,0,0" mass=10000 collisionType=static >
+      <attached>
+        <Model mesh="cube_green.mesh" mass=10 position="0,0,0" scale=10 />
+      </attached>
+    </StaticEntity>
+
+    <StaticEntity position  = "2500,500,0" mass=10000 collisionType=static >
+      <attached>
+        <Model mesh="cube_green.mesh" mass=10 position="0,0,0" scale=10 />
+      </attached>
+    </StaticEntity>
+
 <!-- ControllerDirector waits for the event takeControl to attach a new Controller -->
-    <ControllerDirector position="0,0,0" scriptname="presentation">
+    <ControllerDirector position="0,0,0" scriptname="testscript">
         <events>
             <takeControl>