[Orxonox-commit 3428] r8115 - in data/trunk: images/textures materials models

youngk at orxonox.net youngk at orxonox.net
Fri Mar 25 20:36:55 CET 2011


Author: youngk
Date: 2011-03-25 20:36:55 +0100 (Fri, 25 Mar 2011)
New Revision: 8115

Added:
   data/trunk/images/textures/jupiter.png
   data/trunk/materials/Jupiter.material
   data/trunk/models/Jupiter.mesh
Modified:
   data/trunk/materials/earth.material
Log:
Data files for the new planet level

Added: data/trunk/images/textures/jupiter.png
===================================================================
(Binary files differ)


Property changes on: data/trunk/images/textures/jupiter.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: data/trunk/materials/Jupiter.material
===================================================================
--- data/trunk/materials/Jupiter.material	                        (rev 0)
+++ data/trunk/materials/Jupiter.material	2011-03-25 19:36:55 UTC (rev 8115)
@@ -0,0 +1,27 @@
+material Jupiter/TEXFACE/jupiter.jpg
+{
+	receive_shadows on
+	technique
+	{
+		pass
+		{
+			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 jupiter.png
+				colour_op modulate
+				tex_address_mode wrap
+				filtering trilinear
+			}
+		}
+		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
+		}
+	}
+}


Property changes on: data/trunk/materials/Jupiter.material
___________________________________________________________________
Added: svn:executable
   + *

Modified: data/trunk/materials/earth.material
===================================================================
--- data/trunk/materials/earth.material	2011-03-25 19:33:38 UTC (rev 8114)
+++ data/trunk/materials/earth.material	2011-03-25 19:36:55 UTC (rev 8115)
@@ -7,19 +7,14 @@
 		{
 			ambient 0.500000 0.500000 0.500000 1.000000
 			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 EarthMap_2500x1250.jpg
-				colour_op modulate
+				texture gasplanet.png
+				tex_address_mode wrap
+				filtering trilinear
 			}
 		}
-		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/Jupiter.mesh
===================================================================
(Binary files differ)


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




More information about the Orxonox-commit mailing list