[Orxonox-commit 6316] r10973 - in data/trunk: materials models

fvultier at orxonox.net fvultier at orxonox.net
Mon Dec 14 11:24:36 CET 2015


Author: fvultier
Date: 2015-12-14 11:24:35 +0100 (Mon, 14 Dec 2015)
New Revision: 10973

Added:
   data/trunk/materials/CityGroundLamps.material
Modified:
   data/trunk/materials/101.material
   data/trunk/materials/CityGround.material
   data/trunk/materials/Glasstower1.material
   data/trunk/materials/Hausc1.material
   data/trunk/materials/PrimeTower.material
   data/trunk/models/101.mesh
   data/trunk/models/CityGround.mesh
   data/trunk/models/CityGroundLamps.mesh
   data/trunk/models/Glasstower1.mesh
   data/trunk/models/Hausc1.mesh
   data/trunk/models/PrimeTower.mesh
Log:
Converted some models to Ogre 1.4

Modified: data/trunk/materials/101.material
===================================================================
--- data/trunk/materials/101.material	2015-12-11 21:07:29 UTC (rev 10972)
+++ data/trunk/materials/101.material	2015-12-14 10:24:35 UTC (rev 10973)
@@ -1,42 +1,20 @@
-// 101 genrated by blender2ogre 0.6.0
-
-material 101 
-{
-    receive_shadows on 
-
-    technique
-    {
-        pass 101
-        {
-            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 101.png
-                tex_address_mode wrap
-                scale 1.0 1.0
-                colour_op modulate
-            }
-        }
-    }
-}
+
+material 101
+{
+	technique
+	{
+		pass 101
+		{
+			ambient 0.8 0.8 0.8 1
+			diffuse 0.64 0.64 0.64 1
+			specular 0.5 0.5 0.5 1 12.5
+
+			texture_unit
+			{
+				texture 101.png
+			}
+		}
+
+	}
+
+}

Modified: data/trunk/materials/CityGround.material
===================================================================
--- data/trunk/materials/CityGround.material	2015-12-11 21:07:29 UTC (rev 10972)
+++ data/trunk/materials/CityGround.material	2015-12-14 10:24:35 UTC (rev 10973)
@@ -1,42 +1,20 @@
-// CityGround genrated by blender2ogre 0.6.0
-
-material CityGround 
-{
-    receive_shadows on 
-
-    technique
-    {
-        pass CityGround
-        {
-            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 CityGround.jpg
-                tex_address_mode wrap
-                scale 1.0 1.0
-                colour_op modulate
-            }
-        }
-    }
-}
+
+material CityGround
+{
+	technique
+	{
+		pass CityGround
+		{
+			ambient 0.8 0.8 0.8 1
+			diffuse 0.64 0.64 0.64 1
+			specular 0.5 0.5 0.5 1 12.5
+
+			texture_unit
+			{
+				texture CityGround.jpg
+			}
+		}
+
+	}
+
+}

Added: data/trunk/materials/CityGroundLamps.material
===================================================================
--- data/trunk/materials/CityGroundLamps.material	                        (rev 0)
+++ data/trunk/materials/CityGroundLamps.material	2015-12-14 10:24:35 UTC (rev 10973)
@@ -0,0 +1,12 @@
+
+material BaseWhite
+{
+	technique
+	{
+		pass
+		{
+		}
+
+	}
+
+}

Modified: data/trunk/materials/Glasstower1.material
===================================================================
--- data/trunk/materials/Glasstower1.material	2015-12-11 21:07:29 UTC (rev 10972)
+++ data/trunk/materials/Glasstower1.material	2015-12-14 10:24:35 UTC (rev 10973)
@@ -1,42 +1,20 @@
-// Glasstower1 genrated by blender2ogre 0.6.0
-
-material Glasstower1 
-{
-    receive_shadows on 
-
-    technique
-    {
-        pass Glasstower1
-        {
-            ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
-            diffuse 0.800000011920929 0.800000011920929 0.800000011920929 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 Glasstower1.jpg
-                tex_address_mode wrap
-                scale 1.0 1.0
-                colour_op modulate
-            }
-        }
-    }
-}
+
+material Glasstower1
+{
+	technique
+	{
+		pass Glasstower1
+		{
+			ambient 0.8 0.8 0.8 1
+			diffuse 0.8 0.8 0.8 1
+			specular 0 0 0 1 12.5
+
+			texture_unit
+			{
+				texture Glasstower1.jpg
+			}
+		}
+
+	}
+
+}

Modified: data/trunk/materials/Hausc1.material
===================================================================
--- data/trunk/materials/Hausc1.material	2015-12-11 21:07:29 UTC (rev 10972)
+++ data/trunk/materials/Hausc1.material	2015-12-14 10:24:35 UTC (rev 10973)
@@ -1,42 +1,20 @@
-// Hausc1 genrated by blender2ogre 0.6.0
-
-material Hausc1 
-{
-    receive_shadows on 
-
-    technique
-    {
-        pass Hausc1
-        {
-            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 hausc1.png
-                tex_address_mode wrap
-                scale 1.0 1.0
-                colour_op modulate
-            }
-        }
-    }
-}
+
+material Hausc1
+{
+	technique
+	{
+		pass Hausc1
+		{
+			ambient 0.8 0.8 0.8 1
+			diffuse 0.64 0.64 0.64 1
+			specular 0.5 0.5 0.5 1 12.5
+
+			texture_unit
+			{
+				texture hausc1.png
+			}
+		}
+
+	}
+
+}

Modified: data/trunk/materials/PrimeTower.material
===================================================================
--- data/trunk/materials/PrimeTower.material	2015-12-11 21:07:29 UTC (rev 10972)
+++ data/trunk/materials/PrimeTower.material	2015-12-14 10:24:35 UTC (rev 10973)
@@ -1,43 +1,20 @@
-// PrimeTower genrated by blender2ogre 0.6.0
-
-material PrimeTower 
-{
-    receive_shadows on 
-
-    technique
-    {
-        pass PrimeTower
-        {
-            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 prim.png
-                tex_address_mode wrap
-                scale 1.0 1.0
-                tex_coord_set 0
-                colour_op modulate
-            }
-        }
-    }
-}
+
+material PrimeTower
+{
+	technique
+	{
+		pass PrimeTower
+		{
+			ambient 0.8 0.8 0.8 1
+			diffuse 0.64 0.64 0.64 1
+			specular 0.5 0.5 0.5 1 12.5
+
+			texture_unit
+			{
+				texture prim.png
+			}
+		}
+
+	}
+
+}

Modified: data/trunk/models/101.mesh
===================================================================
(Binary files differ)

Modified: data/trunk/models/CityGround.mesh
===================================================================
(Binary files differ)

Modified: data/trunk/models/CityGroundLamps.mesh
===================================================================
(Binary files differ)

Modified: data/trunk/models/Glasstower1.mesh
===================================================================
(Binary files differ)

Modified: data/trunk/models/Hausc1.mesh
===================================================================
(Binary files differ)

Modified: data/trunk/models/PrimeTower.mesh
===================================================================
(Binary files differ)




More information about the Orxonox-commit mailing list