[Orxonox-commit 6300] r10957 - code/branches/campaignHS15/data/levels/templates

[bhatiab at orxonox.net]

Author: bhatiab
Date: 2015-12-08 11:15:47 +0100 (Tue, 08 Dec 2015)
New Revision: 10957

Modified:
   code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt
Log:
Fixed collisionshapes and camera angles for the spaceshuttle

Modified: code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt
===================================================================
--- code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt	2015-12-08 09:32:07 UTC (rev 10956)
+++ code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt	2015-12-08 10:15:47 UTC (rev 10957)
@@ -26,13 +26,14 @@
       <Model position="0,0,0" yaw=180 pitch=0 roll=0 scale=10 mesh="Transporterspaceship.mesh" />
     </attached>
     <collisionShapes>
-      <!--TODO: real collision shapes -->
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
+      <BoxCollisionShape position=" 0, 0, 20"      halfExtents=" 37, 25, 80" />
+      <BoxCollisionShape position=" 0, 21, 20"      halfExtents=" 37, 21, 80" />
+      <BoxCollisionShape position=" 0, 40, 110"      halfExtents=" 20, 10, 40" />
+      <BoxCollisionShape position=" 0, 45, 170"      halfExtents=" 33, 25, 20" />
+      <BoxCollisionShape position=" -60, 33, 0"      halfExtents=" 24, 16, 120" />
+      <BoxCollisionShape position=" 60, 33, 0"      halfExtents=" 24, 16, 120" />
+      <BoxCollisionShape position=" 0, 10, -90"      halfExtents=" 30, 25, 30" />
+      <BoxCollisionShape position=" 0, -3, -145"      halfExtents=" 20, 20, 30" />
     </collisionShapes>
 
 <?lua
@@ -45,9 +46,8 @@
   <SpaceShip>
     <camerapositions>
       <CameraPosition position="0,90,350" drag=true mouselook=true />
-      <CameraPosition position="0,150, 400" drag=true mouselook=true />
+      <CameraPosition position="0,125, 400" drag=true mouselook=true />
       <CameraPosition position="0,200,550" drag=true mouselook=true />
-      <CameraPosition position="0,120,200" pitch="-80" drag=true mouselook=true />
     </camerapositions>
   </SpaceShip>
 </Template>