[Orxonox-commit 4526] r9197 - in data/trunk: images/textures materials models

[mentzerf at orxonox.net]

Author: mentzerf
Date: 2012-05-18 15:00:44 +0200 (Fri, 18 May 2012)
New Revision: 9197

Added:
   data/trunk/models/Tower.mesh
Removed:
   data/trunk/images/textures/brick01.jpg
Modified:
   data/trunk/materials/Tower.material
Log:
* Changed Tower material and mesh

Deleted: data/trunk/images/textures/brick01.jpg
===================================================================
(Binary files differ)

Modified: data/trunk/materials/Tower.material
===================================================================
--- data/trunk/materials/Tower.material	2012-05-18 13:00:02 UTC (rev 9196)
+++ data/trunk/materials/Tower.material	2012-05-18 13:00:44 UTC (rev 9197)
@@ -1,14 +1,25 @@
-material Tower_MAT
+material Material/TEXFACE/RustySteel.jpg
 {
 	receive_shadows on
 	technique
 	{
 		pass
 		{
-			ambient 1.000000 1.000000 1.000000 1.000000
-			diffuse 0.640000 0.640000 0.640000 1.000000
-			specular 0.500000 0.500000 0.500000 1.000000 12.500000
+			ambient 0.500000 0.500000 0.500000 1.000000
+			diffuse 0.800000 0.800000 0.800000 1.000000
 			emissive 0.000000 0.000000 0.000000 1.000000
+			texture_unit
+			{
+				texture RustySteel.jpg
+				colour_op modulate
+			}
 		}
+		pass
+		{
+			ambient 0.0 0.0 0.0
+			diffuse 0.0 0.0 0.0
+			specular 0.500000 0.500000 0.500000 1.000000 12.500000
+			scene_blend add
+		}
 	}
 }

Added: data/trunk/models/Tower.mesh
===================================================================
(Binary files differ)


Property changes on: data/trunk/models/Tower.mesh
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream