[Orxonox-commit 4691] r9362 - in data/branches/dataRelease2012: audio/ambient audio/ambient/default materials

[jo at orxonox.net]

Author: jo
Date: 2012-09-02 13:58:43 +0200 (Sun, 02 Sep 2012)
New Revision: 9362

Added:
   data/branches/dataRelease2012/audio/ambient/default/mainmenu.ogg
   data/branches/dataRelease2012/materials/planet.material
Removed:
   data/branches/dataRelease2012/audio/ambient/default/mainmenu.ogg
   data/branches/dataRelease2012/audio/ambient/metal/
Log:
I removed metal music theme, updated the mainmenu music and re-added planet.material which is used in the release.

Deleted: data/branches/dataRelease2012/audio/ambient/default/mainmenu.ogg
===================================================================
(Binary files differ)

Added: data/branches/dataRelease2012/audio/ambient/default/mainmenu.ogg
===================================================================
(Binary files differ)


Property changes on: data/branches/dataRelease2012/audio/ambient/default/mainmenu.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: data/branches/dataRelease2012/materials/planet.material
===================================================================
--- data/branches/dataRelease2012/materials/planet.material	                        (rev 0)
+++ data/branches/dataRelease2012/materials/planet.material	2012-09-02 11:58:43 UTC (rev 9362)
@@ -0,0 +1,71 @@
+material planet/TEXFACE/planet.jpg
+{
+	receive_shadows on
+	technique
+	{
+		pass
+		{
+			ambient 0.500000 0.500000 0.500000 1.000000
+			diffuse 10.800000 10.800000 10.800000 1.000000
+			emissive 0.000000 0.000000 0.000000 1.000000
+
+			texture_unit
+			{
+				texture planet1024.jpg
+				colour_op modulate
+			}
+		}
+		pass
+		{
+			ambient 0.0 0.0 0.0
+			diffuse 0.0 0.0 0.0
+			specular 0.000000 0.000000 0.000000 1.000000 12.500000
+			scene_blend add
+		}
+	}
+}
+
+
+material planet/Atmosphere
+{
+	receive_shadows on
+	technique
+	{
+		pass
+		{  
+			depth_write off
+			lighting off
+			scene_blend alpha_blend
+			depth_check on
+			
+			texture_unit
+			{
+				texture atmospheretype3.png
+			}			
+		}
+	}
+}
+
+
+material atmosphere1
+{
+	receive_shadows on
+	technique
+	{
+		pass
+		{  
+			depth_write off
+			lighting off
+			scene_blend alpha_blend
+			depth_check on
+			
+			texture_unit
+			{
+				texture atmospheretype1.png
+			}			
+		}
+	}
+}
+
+
+