[Orxonox-commit 4744] r9413 - in data/trunk: images/textures materials models

[jo at orxonox.net]

Author: jo
Date: 2012-10-23 13:03:31 +0200 (Tue, 23 Oct 2012)
New Revision: 9413

Added:
   data/trunk/images/textures/gunsTX.jpg
   data/trunk/images/textures/hullTX.jpg
   data/trunk/materials/escortShipMaterial.material
   data/trunk/materials/escortWeaponMaterial.material
   data/trunk/models/escortShip.mesh
   data/trunk/models/escortWeapon.mesh
Modified:
   data/trunk/materials/Scene.material
Log:
Adding the light escort ship from Felix Schulthess.

Added: data/trunk/images/textures/gunsTX.jpg
===================================================================
(Binary files differ)


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

Added: data/trunk/images/textures/hullTX.jpg
===================================================================
(Binary files differ)


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

Modified: data/trunk/materials/Scene.material
===================================================================
--- data/trunk/materials/Scene.material	2012-10-22 15:05:14 UTC (rev 9412)
+++ data/trunk/materials/Scene.material	2012-10-23 11:03:31 UTC (rev 9413)
@@ -1,16 +1,16 @@
-material Material.002/TEXFACE/asteroid.tga
+material Material/TEXFACE/hullTX.jpg
 {
 	receive_shadows on
 	technique
 	{
 		pass
 		{
-			ambient 0.800000 0.600000 0.200000 1
-			diffuse 0.800000 0.600000 0.200000 1
-			emissive 0.000000 0.000000 0.000000 1
+			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 asteroid.png
+				texture hullTX.jpg
 				colour_op modulate
 			}
 		}
@@ -18,7 +18,7 @@
 		{
 			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
+			specular 0.000000 0.000000 0.000000 1.000000 12.500000
 			scene_blend add
 		}
 	}

Added: data/trunk/materials/escortShipMaterial.material
===================================================================
--- data/trunk/materials/escortShipMaterial.material	                        (rev 0)
+++ data/trunk/materials/escortShipMaterial.material	2012-10-23 11:03:31 UTC (rev 9413)
@@ -0,0 +1,43 @@
+// escortShipMaterial genrated by blender2ogre 0.5.8
+
+material escortShipMaterial 
+{
+    receive_shadows on 
+
+    technique
+    {
+        pass escortShipMaterial
+        {
+            ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
+            diffuse 0.6400000190734865 0.6400000190734865 0.6400000190734865 1.0
+            specular 0.0 0.0 0.0 1.0 12.5
+            emissive 0.0 0.0 0.0 1.0
+
+            alpha_to_coverage off
+            colour_write on
+            cull_hardware clockwise
+            depth_check on
+            depth_func less_equal
+            depth_write on
+            illumination_stage 
+            light_clip_planes off
+            light_scissor off
+            lighting on
+            normalise_normals off
+            polygon_mode solid
+            scene_blend one zero
+            scene_blend_op add
+            shading gouraud
+            transparent_sorting on
+
+            texture_unit 
+            {
+                texture hullTX.jpg
+                tex_address_mode wrap
+                scale 1.0 1.0
+                tex_coord_set 0
+                colour_op modulate
+            }
+        }
+    }
+}

Added: data/trunk/materials/escortWeaponMaterial.material
===================================================================
--- data/trunk/materials/escortWeaponMaterial.material	                        (rev 0)
+++ data/trunk/materials/escortWeaponMaterial.material	2012-10-23 11:03:31 UTC (rev 9413)
@@ -0,0 +1,43 @@
+// escortWeaponMaterial genrated by blender2ogre 0.5.8
+
+material escortWeaponMaterial 
+{
+    receive_shadows on 
+
+    technique
+    {
+        pass escortWeaponMaterial
+        {
+            ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
+            diffuse 0.6400000190734865 0.6400000190734865 0.6400000190734865 1.0
+            specular 0.5 0.5 0.5 1.0 12.5
+            emissive 0.0 0.0 0.0 1.0
+
+            alpha_to_coverage off
+            colour_write on
+            cull_hardware clockwise
+            depth_check on
+            depth_func less_equal
+            depth_write on
+            illumination_stage 
+            light_clip_planes off
+            light_scissor off
+            lighting on
+            normalise_normals off
+            polygon_mode solid
+            scene_blend one zero
+            scene_blend_op add
+            shading gouraud
+            transparent_sorting on
+
+            texture_unit 
+            {
+                texture gunsTX.jpg
+                tex_address_mode wrap
+                scale 1.0 1.0
+                tex_coord_set 0
+                colour_op modulate
+            }
+        }
+    }
+}

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


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

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


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