[Orxonox-commit 3576] r8262 - code/branches/mac_osx/data/levels

[youngk at orxonox.net]

Author: youngk
Date: 2011-04-18 23:51:05 +0200 (Mon, 18 Apr 2011)
New Revision: 8262

Modified:
   code/branches/mac_osx/data/levels/planets.oxw
Log:
Changing planets level

Modified: code/branches/mac_osx/data/levels/planets.oxw
===================================================================
--- code/branches/mac_osx/data/levels/planets.oxw	2011-04-18 21:37:42 UTC (rev 8261)
+++ code/branches/mac_osx/data/levels/planets.oxw	2011-04-18 21:51:05 UTC (rev 8262)
@@ -22,44 +22,23 @@
    skybox       = "Orxonox/skypanoramagen1"
   >
     
-<AmbientSound ambientSource="AlphaCentauri.ogg" looping="true" playOnLoad="true" />
-<Light type=directional position="-10000,-10000,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
+    <AmbientSound ambientSource="AlphaCentauri.ogg" looping="true" playOnLoad="true" />
+    <Light type=directional position="-10000,-10000,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
 
-<?lua
-planetsize=40000
-?>
+    <?lua
+      planetsize=4000
+    ?>
 
-<SpawnPoint position="<?lua print(math.sin(1.5) *(3)*planetsize) ?>,<?lua print(math.cos(1.5) *3*planetsize) ?>,<?lua print(500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipswallow />
+    <SpawnPoint position="<?lua print(math.sin(1.5) *(2)*planetsize) ?>,<?lua print(math.cos(1.5) *3*planetsize) ?>,<?lua print(500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipswallow />
 
 
-<?lua
-max = 50
+    <Planet position="0,0,0" scale="<?lua print(planetsize) ?>" pitch=-90 mesh="Muunilinst.mesh" atmosphere="atmosphere1" rotationaxis="0,1,0" rotationrate="0.2" atmospheresize=300.0f imagesize=1024.0f />
 
-for i = 1, max, 1
-do
-    x = math.sin(i/max*6)*(1.5)*planetsize
-    y = i*100
-    z = math.cos(i/max*6)*(1.5)*planetsize
-    ?>
-<?lua
-for k = 1, 25, 1
-do
-j = math.random()
-?>
+    <Planet position="<?lua print(3*planetsize) ?>,0,0" scale=1000 pitch=30 mesh="ganymede.mesh" atmosphere="atmosphere1" rotationaxis="1,0,1" rotationrate="1.5" atmospheresize=224.0f imagesize=1024.0f />
 
-    <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-      <attached>
-        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
-      </attached>
-      <?lua if i == 5 then ?><collisionShapes>
-        <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
-      </collisionShapes> <?lua end ?>
-    </MovableEntity>
-<?lua
-end
-?>
-<?lua end ?>
-    <Planet position="0,0,0" scale="<?lua print(planetsize) ?>" pitch=-90 mesh="jupiter.mesh" atmosphere="atmosphere1" rotationaxis="0,1,0" rotationrate="0.2" atmospheresize=300.0f imagesize=1024.0f />
-    <Planet position="<?lua print(5*planetsize) ?>,0,0" scale=10000 pitch=30 mesh="ganymede.mesh" atmosphere="atmosphere1" rotationaxis="1,0,1" rotationrate="1.5" atmospheresize=224.0f imagesize=1024.0f />
+    <Planet position="0,<?lua print(3*planetsize) ?>,0" scale=1000 pitch=30 mesh="jupiter.mesh" atmosphere="atmosphere1" rotationaxis="1,0,1" rotationrate="1.5" atmospheresize=224.0f imagesize=1024.0f />
+
+    <Planet position="0,0,<?lua print(3*planetsize) ?>" scale=1000 pitch=30 mesh="Planet3.mesh" atmosphere="atmosphere1" rotationaxis="1,0,1" rotationrate="1.5" atmospheresize=224.0f imagesize=1024.0f />
+
   </Scene>
 </Level>