[Orxonox-commit 5412] r10075 - in code/branches/ScriptableController/data: gui/scripts levels

[mkronig at orxonox.net]

Author: mkronig
Date: 2014-05-22 15:39:37 +0200 (Thu, 22 May 2014)
New Revision: 10075

Modified:
   code/branches/ScriptableController/data/gui/scripts/testscript.lua
   code/branches/ScriptableController/data/levels/levelTry.oxw
Log:
commit for merging files

Modified: code/branches/ScriptableController/data/gui/scripts/testscript.lua
===================================================================
--- code/branches/ScriptableController/data/gui/scripts/testscript.lua	2014-05-22 13:05:46 UTC (rev 10074)
+++ code/branches/ScriptableController/data/gui/scripts/testscript.lua	2014-05-22 13:39:37 UTC (rev 10075)
@@ -7,6 +7,10 @@
 yl = 3000 
 zl = -1000
 
+xr = 2000
+yr = 500
+zr = 2000
+
 d = 5
 Tabs = 0
 
@@ -31,18 +35,49 @@
     ctrl:eventScheduler("mal", xl+3000*xt, yl+3000*yt, zl, xl, yl, zl, dt, t+0.9)
   end
 
+
   -- Update absolute time
   Tabs = math.pi + 0.9
 
+  
+
   -- Move away again, still looking at the station
   ctrl:eventScheduler("mal", 0,0,1000, xl,yl,zl, 3, Tabs+0.4)
 
+
+
   -- Update absolute time
   Tabs = Tabs + 0.4 + 3
 
+  
+
+  
+
   -- Transition the look from (xl,yl,zl) to (3500,0,0) in 3 seconds
-  ctrl:eventScheduler("chl", xl, yl, zl, 3500, 0, 0, 3, Tabs)
+  ctrl:eventScheduler("chl", xl, yl, zl, xr, yr, zr, 2, Tabs+0.2)
 
+  Tabs = Tabs + 2 + 0.2
+
+   ctrl:eventScheduler("mal", xr + 600,yr,zr, xr,yr,zr, 4, Tabs+0)
+
+   Tabs = Tabs + 4 
+
+  for t = 0,math.pi,dt do
+    xt = math.cos(t)
+    zt = math.sin(t)
+
+    ctrl:eventScheduler("mal", xr+600*xt, yr, zr+600*zt, xr, yr, zr, dt, Tabs+t)
+  end
+
+  Tabs = Tabs + math.pi
+
+  ctrl:eventScheduler("chl", xr, yr, zr, xl, yl, zl, 3, Tabs+0.2)
+
+  Tabs = Tabs + 3 + 0.2
+
+  ctrl:eventScheduler("mal", xm,ym,zm, xl,yl,zl, 4, Tabs+2.5)
+
+
 end
 
 

Modified: code/branches/ScriptableController/data/levels/levelTry.oxw
===================================================================
--- code/branches/ScriptableController/data/levels/levelTry.oxw	2014-05-22 13:05:46 UTC (rev 10074)
+++ code/branches/ScriptableController/data/levels/levelTry.oxw	2014-05-22 13:39:37 UTC (rev 10075)
@@ -73,12 +73,12 @@
     -->
 
 
-    <Billboard position="3500,0,0" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=10 />
-    <DistanceTrigger position="3500,0,0" distance="200" target="Pawn"
+    <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"
     />
 
-    <StaticEntity position  = "0,0,0" mass=10000 collisionType=static >
+    <StaticEntity position  = "2000,500,2000" mass=10000 collisionType=static >
       <attached>
         <Model mesh="HydroHarvester.mesh" mass=10 position="0,0,0" scale=10 />
       </attached>
@@ -90,6 +90,9 @@
       </attached>
     </StaticEntity>
 
+
+
+
 <!-- ControllerDirector waits for the event takeControl to attach a new Controller -->
     <ControllerDirector position="0,0,0">
         <events>