Changeset 8493 for code/branches/dockingsystem2/data

Timestamp:

May 16, 2011, 6:21:05 PM (14 years ago)

Author:

sven

Message:

Added docking animations, skeletton for DockingController..

Location:

code/branches/dockingsystem2/data

Files:

• gui/scripts/DockingDialog.lua (modified) (3 diffs)
• levels/docking.oxw (modified) (3 diffs)

code/branches/dockingsystem2/data/gui/scripts/DockingDialog.lua

@@ -10 +10 @@
 
 function P.onShow()
-    orxonox.CommandExecutor:execute("pause")
+    orxonox.execute("setPause 1")
     P.update()
 end
 
 function P.onHide()
-    orxonox.CommandExecutor:execute("pause")
+    orxonox.execute("setPause 0")
 end
 
@@ -42 +42 @@
         local index = listbox:getItemIndex(choice)
         local dock = P.docks[index+1]
-        cout(0, index )--.. ": " .. P.docks[index])
         if dock ~= nil then
-            cout(0, "LUA>Docking")
             dock:dock()
         end
@@ -52 +50 @@
 
 function P.cancelButton_clicked(e)
-    --P.hideMe()
     hideMenuSheet(P.name)
 end

code/branches/dockingsystem2/data/levels/docking.oxw

@@ -35 +35 @@
 
 
-
     <Dock>
-        <animation>
+        <animations>
             <MoveToDockingTarget target="destroyer" position="10,150,40" />
-        </animation>
+        </animations>
         <effects>
-            <DockToShip target="destroyer" />
+            <DockToShip target="spaceShip" />
         </effects>
         <events>
@@ -49 +48 @@
         </events>
         <attached>
-            <DistanceTrigger position="0,0,0" distance="30" target="Pawn" beaconMode="exclude" targetname="destroyerBeacon" name="dockMe" />
+            <DistanceTrigger position="0,0,0" distance="30" target="Pawn" beaconMode="exclude" targetname="bcnSpaceShip" name="dockMe" />
             <Billboard material="Examples/Flare" colour="1.0, 0, 0" />
         </attached>
@@ -79 +78 @@
   >
     <attached>
-        <DistanceTriggerBeacon name="bcnSpaceShip1" />
-        <DockingTarget name="spaceShip1" />
+        <DistanceTriggerBeacon name="bcnSpaceShip" />
+        <DockingTarget name="spaceShip" />
 
       <Model position="0,0,0" yaw="90" pitch="-90" roll="0" scale="4" mesh="assff.mesh" />