[Orxonox-commit 542] r2189 - in media: levels materials/scripts materials/textures

[landauf at orxonox.net]

Author: landauf
Date: 2009-05-27 14:37:38 +0200 (Wed, 27 May 2009)
New Revision: 2189

Added:
   media/levels/presentation09b.oxw
   media/materials/textures/skypanoramagen2_bk.jpg
   media/materials/textures/skypanoramagen2_dn.jpg
   media/materials/textures/skypanoramagen2_fr.jpg
   media/materials/textures/skypanoramagen2_lf.jpg
   media/materials/textures/skypanoramagen2_rt.jpg
   media/materials/textures/skypanoramagen2_up.jpg
Modified:
   media/levels/presentation09.oxw
   media/materials/scripts/OrxonoxSky.material
Log:
added a second skybox, tested it in a level with an alternative asteroid placement

Modified: media/levels/presentation09.oxw
===================================================================
--- media/levels/presentation09.oxw	2009-05-26 23:47:27 UTC (rev 2188)
+++ media/levels/presentation09.oxw	2009-05-27 12:37:38 UTC (rev 2189)
@@ -17,15 +17,14 @@
     <Light type=directional position="0,0,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" />
 
 
-<SpawnPoint position="<?lua print(math.sin(1.5) *40000) ?>,<?lua print(math.cos(1.5) *40000) ?>,<?lua print(500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+<SpawnPoint position="<?lua print(math.sin(1.5) *20000) ?>,<?lua print(math.cos(1.5) *20000) ?>,<?lua print(500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
 
-
 <?lua
 max = 20
 for i = 1, max, 1
 do 
-    x = math.sin(i/max*6)*40000
-    y = math.cos(i/max*6)*40000
+    x = math.sin(i/max*6)*20000
+    y = math.cos(i/max*6)*20000
     z = i*100
     ?>
 <?lua
@@ -46,7 +45,9 @@
 end
 ?>
 <?lua end ?>
-    <Planet position="0,0,0" scale=10000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
+
+    <Planet position="0,0,0" scale=5000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
+    <ParticleEmitter pitch=90 position="0,0,0" source="Orxonox/RingDust" />
     
   </Scene>
 </Level>

Added: media/levels/presentation09b.oxw
===================================================================
--- media/levels/presentation09b.oxw	                        (rev 0)
+++ media/levels/presentation09b.oxw	2009-05-27 12:37:38 UTC (rev 2189)
@@ -0,0 +1,40 @@
+<?lua
+  include("overlay/hudtemplates3.oxo")
+  include("overlay/stats.oxo")
+  include("levels/templates/spaceship_assff.oxt")
+  include("levels/templates/spaceship_H2.oxt")
+?>
+
+<Level
+ name         = "Presentation09"
+ description  = "presentation level for Orxonox Convention X"
+
+>
+  <Scene
+   ambientlight = "0.5, 0.5, 0.5"
+   skybox       = "Orxonox/skypanoramagen2"
+  >
+    <Light type=directional position="0,0,0" direction="0.683, 0.289, 0.670" diffuse="1.0, 1.0, 1.0, 1.0" specular="1.0, 1.0, 1.0, 1.0" />
+
+    <SpawnPoint position="10000, 2000, 3000" direction="-0.6, -0.5, -0.7" spawnclass=SpaceShip pawndesign=spaceshipassff />
+
+<?lua
+for i = 1, 200, 1 
+do
+x = math.random() * 100  + (i-50) * 100
+y = math.random() * 3000 - 1500
+z = math.random() * 3000 - 1500 + (i-100) * 10
+s = math.random() * 100 + 50
+?>
+    
+    <MovableEntity position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 - 15) ?>"> 
+      <attached>
+        <Model position="0,0,0" scale=<?lua print(s) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+      </attached>
+    </MovableEntity>
+<?lua 
+end
+?>
+    
+  </Scene>
+</Level>

Modified: media/materials/scripts/OrxonoxSky.material
===================================================================
--- media/materials/scripts/OrxonoxSky.material	2009-05-26 23:47:27 UTC (rev 2188)
+++ media/materials/scripts/OrxonoxSky.material	2009-05-27 12:37:38 UTC (rev 2189)
@@ -16,6 +16,24 @@
 	}
 }
 
+material Orxonox/skypanoramagen2
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+
+			texture_unit
+			{
+				cubic_texture skypanoramagen2.jpg separateUV
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+
 material Orxonox/Starbox
 {
 	technique

Added: media/materials/textures/skypanoramagen2_bk.jpg
===================================================================
(Binary files differ)


Property changes on: media/materials/textures/skypanoramagen2_bk.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: media/materials/textures/skypanoramagen2_dn.jpg
===================================================================
(Binary files differ)


Property changes on: media/materials/textures/skypanoramagen2_dn.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: media/materials/textures/skypanoramagen2_fr.jpg
===================================================================
(Binary files differ)


Property changes on: media/materials/textures/skypanoramagen2_fr.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: media/materials/textures/skypanoramagen2_lf.jpg
===================================================================
(Binary files differ)


Property changes on: media/materials/textures/skypanoramagen2_lf.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: media/materials/textures/skypanoramagen2_rt.jpg
===================================================================
(Binary files differ)


Property changes on: media/materials/textures/skypanoramagen2_rt.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: media/materials/textures/skypanoramagen2_up.jpg
===================================================================
(Binary files differ)


Property changes on: media/materials/textures/skypanoramagen2_up.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream