[Orxonox-commit 1539] r6257 - in code/branches/presentation2/data: levels particle

[decapitb at orxonox.net]

Author: decapitb
Date: 2009-12-06 18:15:28 +0100 (Sun, 06 Dec 2009)
New Revision: 6257

Added:
   code/branches/presentation2/data/levels/presentationHS09b.oxw
Modified:
   code/branches/presentation2/data/particle/Steam.particle
Log:
new level presentationHS09b with asteroid field fog and most importantly SOUND. couldn't get sound to work in the other level...same error every time:
"Sound: Error setting pitch: 40961"

Added: code/branches/presentation2/data/levels/presentationHS09b.oxw
===================================================================
--- code/branches/presentation2/data/levels/presentationHS09b.oxw	                        (rev 0)
+++ code/branches/presentation2/data/levels/presentationHS09b.oxw	2009-12-06 17:15:28 UTC (rev 6257)
@@ -0,0 +1,89 @@
+<?lua
+  include("stats.oxo")
+  include("hudtemplates3.oxo")
+?>
+
+<?lua
+  include("templates/spaceship_assff.oxt")
+  include("templates/spaceship_pirate.oxt")
+?>
+
+<Level
+ name         = "Sample"
+ description  = "Just a few tests"
+>
+  <Scene
+    ambientlight = "0.8, 0.8, 0.8"
+    skybox       = "Orxonox/Starbox"
+  >
+
+    
+    	<AmbientSound ambientSource="Earth.ogg" loop="true" play="true" />
+
+   <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" />
+   <?lua
+   elements = {"asteroid_ice.mesh", "asteroid_UV.mesh", "ast1.mesh", "ast2.mesh", "ast3.mesh", "ast4.mesh", "ast5.mesh", "ast6.mesh"}
+   elements.length = function()
+	return table.getn(elements)
+   end
+   for i = 1, 100, 1 
+   do
+   x = math.random() * 200  + (i) * 200
+   y = math.random() * 3000 - 1500
+   z = math.random() * 3000 - 1500 + (i-100) * 10
+   s = math.random() * 60 + 30
+   e = math.floor(math.random()*elements.length()+1)
+   ?>
+    
+    <MovableEntity mass=90000 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() * 100 - 15) ?>"> 
+      <attached>
+        <Model position="0,0,0" scale=<?lua print(s) ?> mesh="<?lua print(elements[e])?>" />
+      </attached>
+    </MovableEntity>
+<?lua 
+end
+?>
+
+<?lua
+for i = 1, 200, 1 
+do
+x = math.random() * 100 + i*100
+y = math.random() * 3000 - 1500
+z = math.random() * 3000 - 1500 + (i-100) * 10
+s = math.random() * 60 + 30
+?>
+ <ParticleSpawner position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" source="Orxonox/Steam" lifetime=3.0 loop=1 />
+
+<!--<Billboard material="Test/Fog" position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>"  color="1, 1, 1, 0.01" scale="20" />
+-->
+<?lua 
+end
+?>
+
+<?lua
+elements = {"BodyDebris1.mesh", "CockpitDebris.mesh", "LightningGun.mesh", "WingDebris1.mesh", "WingDebris2.mesh", "satellitedish.mesh", "Thruster.mesh"}
+sizes = {4, 4, 4, 4, 4, 10, 20}
+elements.length = function()
+    return table.getn(elements)
+end
+for i = 1, 100, 1 
+do
+x = math.random() * 750 - 4500
+y = math.random() * 1000 + 2000
+z = math.random() * 500 + 1000
+e = math.floor(math.random()*elements.length()+1)
+?>
+    
+    <MovableEntity mass=90000 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(sizes[e]) ?>" mesh="<?lua print( elements[e]) ?>" />
+      </attached>
+    </MovableEntity>
+	<?lua 
+	end
+	?>
+
+
+    <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
+  </Scene>
+</Level>

Modified: code/branches/presentation2/data/particle/Steam.particle
===================================================================
--- code/branches/presentation2/data/particle/Steam.particle	2009-12-06 16:07:22 UTC (rev 6256)
+++ code/branches/presentation2/data/particle/Steam.particle	2009-12-06 17:15:28 UTC (rev 6257)
@@ -18,30 +18,27 @@
 	point_rendering	false
 	accurate_facing	false
 
-	emitter Ellipsoid
+	emitter Point
 	{
-		angle	180
+		angle	0
 		colour	1 1 1 0.1
 		colour_range_start	1 1 1 0.1
 		colour_range_end	1 1 1 0.02
 		direction	0 1 0
 		emission_rate	1
 		position	0 0 0
-		velocity	5
-		velocity_min	5
-		velocity_max	5
-		time_to_live	100
-		time_to_live_min	100
-		time_to_live_max	100
+		velocity	0
+		velocity_min	0
+		velocity_max	0
+		time_to_live	200
+		time_to_live_min	200
+		time_to_live_max	300
 		duration	0
 		duration_min	0
 		duration_max	0
 		repeat_delay	0
 		repeat_delay_min	0
 		repeat_delay_max	0
-		width	 2000
-		height	1000
-		depth	119.4
 	}
 }