[Orxonox-commit 2267] r6983 - in data/trunk: materials/scripts models

[decapitb at orxonox.net]

Author: decapitb
Date: 2010-05-27 19:09:48 +0200 (Thu, 27 May 2010)
New Revision: 6983

Modified:
   data/trunk/materials/scripts/hs-w01_reduced.material
   data/trunk/models/
Log:
corrected material script for hsw01_reduced

Modified: data/trunk/materials/scripts/hs-w01_reduced.material
===================================================================
--- data/trunk/materials/scripts/hs-w01_reduced.material	2010-05-27 17:08:12 UTC (rev 6982)
+++ data/trunk/materials/scripts/hs-w01_reduced.material	2010-05-27 17:09:48 UTC (rev 6983)
@@ -10,7 +10,7 @@
 			emissive 0.000000 0.000000 0.000000 1.000000
 			texture_unit
 			{
-				texture hs-w01_reduced.tga
+				texture hs-w01_reduced.png
 				colour_op modulate
 			}
 		}
@@ -34,6 +34,10 @@
 			diffuse 0.800000 0.800000 0.800000 1.000000
 			specular 0.500000 0.500000 0.500000 1.000000 12.500000
 			emissive 0.000000 0.000000 0.000000 1.000000
+			texture_unit
+			{
+				texture hs-w01_reduced.png
+			}
 		}
 	}
 }
@@ -48,6 +52,10 @@
 			diffuse 0.800000 0.800000 0.800000 1.000000
 			specular 0.500000 0.500000 0.500000 1.000000 12.500000
 			emissive 0.000000 0.000000 0.000000 1.000000
+			texture_unit
+			{
+				texture hs-w01_reduced.png
+			}
 		}
 	}
 }
@@ -63,7 +71,7 @@
 			emissive 0.000000 0.000000 0.000000 1.000000
 			texture_unit
 			{
-				texture hs-w01_reduced.tga
+				texture hs-w01_reduced.png
 				colour_op modulate
 			}
 		}
@@ -87,6 +95,10 @@
 			diffuse 0.640000 0.640000 0.640000 1.000000
 			specular 0.500000 0.500000 0.500000 1.000000 12.500000
 			emissive 0.000000 0.000000 0.000000 1.000000
+			texture_unit
+			{
+				texture hs-w01_reduced.png
+			}
 		}
 	}
 }
@@ -102,7 +114,7 @@
 			emissive 0.000000 0.000000 0.000000 1.000000
 			texture_unit
 			{
-				texture hs-w01_reduced.tga
+				hs-w01_reduced.png
 				colour_op modulate
 			}
 		}
@@ -112,6 +124,10 @@
 			diffuse 0.0 0.0 0.0
 			specular 0.500000 0.500000 0.500000 1.000000 12.500000
 			scene_blend add
+			texture_unit
+			{
+				texture hs-w01_reduced.png
+			}
 		}
 	}
 }
@@ -127,7 +143,7 @@
 			emissive 0.000000 0.000000 0.000000 1.000000
 			texture_unit
 			{
-				texture stand.tga
+				texture hs-w01_reduced.png
 				colour_op modulate
 			}
 		}
@@ -137,6 +153,10 @@
 			diffuse 0.0 0.0 0.0
 			specular 0.500000 0.500000 0.500000 1.000000 12.500000
 			scene_blend add
+			texture_unit
+			{
+				texture hs-w01_reduced.png
+			}
 		}
 	}
 }
@@ -166,7 +186,7 @@
 			emissive 0.000000 0.000000 0.000000 1.000000
 			texture_unit
 			{
-				texture hs-w01_reduced.tga
+				texture hs-w01_reduced.png
 				colour_op modulate
 			}
 		}
@@ -191,7 +211,7 @@
 			emissive 0.000000 0.000000 0.000000 1.000000
 			texture_unit
 			{
-				texture hs-w01_reduced.tga
+				texture hs-w01_reduced.png
 				colour_op modulate
 			}
 		}
@@ -216,7 +236,7 @@
 			emissive 0.000000 0.000000 0.000000 1.000000
 			texture_unit
 			{
-				texture hs-w01_reduced.tga
+				texture hs-w01_reduced.png
 				colour_op modulate
 			}
 		}


Property changes on: data/trunk/models
___________________________________________________________________
Modified: svn:ignore
   - Transporter

   + ManCandy.skeleton
ManMesh.mesh
Transporter
bender.mesh
bender.mesh.xml
bender.skeleton
bender.skeleton.xml