[Orxonox-commit 3758] r8438 - code/trunk/data/levels

[youngk at orxonox.net]

Author: youngk
Date: 2011-05-09 18:24:21 +0200 (Mon, 09 May 2011)
New Revision: 8438

Modified:
   code/trunk/data/levels/earth.oxw
   code/trunk/data/levels/planets.oxw
Log:
Update to planet levels to support new meshes.

Modified: code/trunk/data/levels/earth.oxw
===================================================================
--- code/trunk/data/levels/earth.oxw	2011-05-09 16:23:34 UTC (rev 8437)
+++ code/trunk/data/levels/earth.oxw	2011-05-09 16:24:21 UTC (rev 8438)
@@ -21,8 +21,14 @@
 
   <Scene
     ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/skypanoramagen1"
+    skybox       = "Orxonox/skyboxempty"
   >
+    <WorldAmbientSound
+      source="Earth.ogg"
+      looping="true"
+      playOnLoad="true"
+    />
+
     <Light
       type="directional"
       position="-500000,-500000,0"
@@ -38,6 +44,7 @@
       pawndesign="spaceshipHXY"
     />
 
+    <!-- This is a model of Earth: mass=EarthMass/1000 and radius=EarthRadius[km]*10 -->
     <Planet
       position="0,0,0"
       scale="63000"
@@ -46,7 +53,7 @@
       angularDamping="0"
       mass="5.9e21"
       pitch="0"
-      mesh="earth.mesh"
+      mesh="planets/earth.mesh"
       atmosphere="atmosphere1"
       rotationaxis="0,1,0"
       rotationrate="0.2"
@@ -60,5 +67,29 @@
         <SphereCollisionShape radius="63000" position="0,0,0" />
       </collisionShapes>
     </Planet>
+
+    <!-- This is a model of our Moon: mass=MoonMass/1000 and radius=MoonRadius[km]*10 and position=DistanceFromEarth[km]*10 -->
+    <Planet
+      position="3625700,0,0"
+      scale="17370"
+      collisionType="dynamic"
+      linearDamping="0.8"
+      angularDamping="0"
+      mass="7.36e19"
+      pitch="0"
+      mesh="planets/moon.mesh"
+      atmosphere="atmosphere1"
+      rotationaxis="0,1,0"
+      rotationrate="0.2"
+      atmospheresize="300.0f"
+      imagesize="1024.0f"
+    >
+      <attached>
+        <ForceField position="0,0,0" mode="newtonianGravity" diameter="40000" massDiameter="34740" mass="7.36e19" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="17370" position="0,0,0" />
+      </collisionShapes>
+    </Planet>
   </Scene>
 </Level>

Modified: code/trunk/data/levels/planets.oxw
===================================================================
--- code/trunk/data/levels/planets.oxw	2011-05-09 16:23:34 UTC (rev 8437)
+++ code/trunk/data/levels/planets.oxw	2011-05-09 16:24:21 UTC (rev 8438)
@@ -53,7 +53,7 @@
       angularDamping="0"
       mass="10000000"
       pitch="0"
-      mesh="Muunilinst.mesh"
+      mesh="planets/muunilinst.mesh"
       atmosphere="atmosphere1"
       rotationaxis="1,0,0"
       rotationrate="1.0"
@@ -76,7 +76,7 @@
       angularDamping="0"
       mass="5000000"
       pitch="0"
-      mesh="ganymede.mesh"
+      mesh="planets/ganymede.mesh"
       atmosphere="atmosphere1"
       rotationaxis="1,0,0"
       rotationrate="1.0"