[Orxonox-commit 3752] r8432 - in data/trunk: images/textures/stellarobjects materials models models/planets

decapitb at orxonox.net decapitb at orxonox.net
Mon May 9 15:56:39 CEST 2011


Author: decapitb
Date: 2011-05-09 15:56:39 +0200 (Mon, 09 May 2011)
New Revision: 8432

Added:
   data/trunk/images/textures/stellarobjects/planet1.png
   data/trunk/images/textures/stellarobjects/planet_3.png
   data/trunk/images/textures/stellarobjects/planet_earth.png
   data/trunk/images/textures/stellarobjects/planet_ganymede.png
   data/trunk/images/textures/stellarobjects/planet_jupiter.png
   data/trunk/images/textures/stellarobjects/planet_moon.png
   data/trunk/images/textures/stellarobjects/planet_muunilinst.png
   data/trunk/images/textures/stellarobjects/star_sol.png
   data/trunk/models/planets/
   data/trunk/models/planets/earth.mesh
   data/trunk/models/planets/ganymede.mesh
   data/trunk/models/planets/jupiter.mesh
   data/trunk/models/planets/moon.mesh
   data/trunk/models/planets/muunilinst.mesh
   data/trunk/models/planets/planet3.mesh
   data/trunk/models/planets/sol.mesh
Modified:
   data/trunk/materials/planets.material
Log:
added kevins awesome planet meshes

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


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

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


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

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


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

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


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

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


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

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


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

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


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

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


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

Modified: data/trunk/materials/planets.material
===================================================================
--- data/trunk/materials/planets.material	2011-05-09 13:56:13 UTC (rev 8431)
+++ data/trunk/materials/planets.material	2011-05-09 13:56:39 UTC (rev 8432)
@@ -123,4 +123,181 @@
 		}
 	}
 }
+material planet3Tex/TEXFACE/planet_3.png
+{
+	receive_shadows on
+	technique
+	{
+		pass
+		{
+			ambient 0.500000 0.500000 0.500000 1.000000
+			diffuse 1.000000 1.000000 1.000000 1.000000
+			emissive 0.000000 0.000000 0.000000 1.000000
+			texture_unit
+			{
+				texture planet_3.png
+				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 solTex/TEXFACE/star_sol.png
+{
+	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 star_sol.png
+				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
+		}
+	}
+}
+material muunilinstTex/TEXFACE/planet_muunilinst.png
+{
+	receive_shadows on
+	technique
+	{
+		pass
+		{
+			ambient 0.500000 0.500000 0.500000 1.000000
+			diffuse 0.658880 0.658880 0.658880 1.000000
+			emissive 0.000000 0.000000 0.000000 1.000000
+			texture_unit
+			{
+				texture planet_muunilinst.png
+				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 127.750000
+			scene_blend add
+		}
+	}
+}
+material moonTex/TEXFACE/planet_moon.png
+{
+	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 planet_moon.png
+				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
+		}
+	}
+}
+material jupiter/TEXFACE/planet_jupiter.png
+{
+	receive_shadows on
+	technique
+	{
+		pass
+		{
+			ambient 1.000000 1.000000 1.000000 1.000000
+			diffuse 1.000000 1.000000 1.000000 1.000000
+			emissive 0.000000 0.000000 0.000000 1.000000
+			texture_unit
+			{
+				texture planet_jupiter.png
+				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 ganymedeTex/TEXFACE/planet_ganymede.png
+{
+	receive_shadows on
+	technique
+	{
+		pass
+		{
+			ambient 0.500000 0.500000 0.500000 1.000000
+			diffuse 1.000000 1.000000 1.000000 1.000000
+			emissive 0.000000 0.000000 0.000000 1.000000
+			texture_unit
+			{
+				texture planet_ganymede.png
+				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 earthTex/TEXFACE/planet_earth.png
+{
+	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 planet_earth.png
+				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/planets/earth.mesh
===================================================================
(Binary files differ)


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

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


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

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


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

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


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

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


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

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


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

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


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




More information about the Orxonox-commit mailing list