[Orxonox-commit 4390] r9061 - in code/branches/surfaceRace/data/levels: . templates

[laumerf at orxonox.net]

Author: laumerf
Date: 2012-03-30 13:51:55 +0200 (Fri, 30 Mar 2012)
New Revision: 9061

Modified:
   code/branches/surfaceRace/data/levels/surfaceRace.oxw
   code/branches/surfaceRace/data/levels/templates/spaceshipRace.oxt
Log:
new collision shape

Modified: code/branches/surfaceRace/data/levels/surfaceRace.oxw
===================================================================
--- code/branches/surfaceRace/data/levels/surfaceRace.oxw	2012-03-30 11:40:06 UTC (rev 9060)
+++ code/branches/surfaceRace/data/levels/surfaceRace.oxw	2012-03-30 11:51:55 UTC (rev 9061)
@@ -23,7 +23,7 @@
   <Scene
     ambientlight = "2.0, 2.0, 2.0"
     skybox       = "Orxonox/skyBoxClouds"
-    gravity      = "0,-150,0"
+    gravity      = "0,-70,0"
     negativeWorldRange = "-100000, -100000, -100000"
     positiveWorldRange = " 100000,  100000,  100000"
     hasPhysics   = true
@@ -35,9 +35,16 @@
       <attached>
         <Model position="0,0,0" mesh="testcube.mesh" scale3D="5000,5000,5000" />
       </attached>
+
+	<!-- ------------------Boden----------------- -->
       <collisionShapes>
         <BoxCollisionShape position="0,50,0" halfExtents="5000,5000,5000" />
       </collisionShapes>
+	
+	<!-- ------------------obere Begrenzung----------------- -->
+       <collisionShapes>
+        <BoxCollisionShape position="0,70,0" halfExtents="5000,10,5000" />
+      </collisionShapes>
   </StaticEntity>
 
 

Modified: code/branches/surfaceRace/data/levels/templates/spaceshipRace.oxt
===================================================================
--- code/branches/surfaceRace/data/levels/templates/spaceshipRace.oxt	2012-03-30 11:40:06 UTC (rev 9060)
+++ code/branches/surfaceRace/data/levels/templates/spaceshipRace.oxt	2012-03-30 11:51:55 UTC (rev 9061)
@@ -48,8 +48,13 @@
     </attached>
     <collisionShapes>
 
-      	<ConeCollisionShape position="0,0,0"     hight="15" radius="15" />
-	
+      <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" />
+
     </collisionShapes>
 <?lua
   include("../includes/weaponSettingsAssff.oxi")