[Orxonox-commit 4664] r9335 - code/branches/presentation2012merge/src/modules/towerdefense data/pool/materials data/pool/models data/pool/models/towerdefense data/pool/models/towerdefense/field data/pool/models/towerdefense/tower

[landauf at orxonox.net]

Author: landauf
Date: 2012-07-22 22:44:22 +0200 (Sun, 22 Jul 2012)
New Revision: 9335

Added:
   data/pool/materials/Tower.material
   data/pool/models/towerdefense/
   data/pool/models/towerdefense/field/
   data/pool/models/towerdefense/tower/
Removed:
   code/branches/presentation2012merge/src/modules/towerdefense/Spielfeld Blender/
   code/branches/presentation2012merge/src/modules/towerdefense/tower/
   data/pool/models/towerdefense/field/OgreXMLConverter.log
   data/pool/models/towerdefense/tower/Tower.material
Modified:
   data/pool/materials/AUTHORS
   data/pool/models/AUTHORS
Log:
moved tower defense blender files to pool

Modified: data/pool/materials/AUTHORS
===================================================================
--- data/pool/materials/AUTHORS	2012-07-22 20:21:36 UTC (rev 9334)
+++ data/pool/materials/AUTHORS	2012-07-22 20:44:22 UTC (rev 9335)
@@ -83,6 +83,7 @@
 Tiling.material                                   Fabian Landau?
 tomato.material                                   Felix Schulthess
 ToonShader.material                               Stefan Lienhard
+Tower.material                                    Fabian Mentzer
 Trail.material                                    Fabian 'x3n' Landau
 Transparency.material                             Janis Edelmann
 Transporter.material                              Benjamin de Capitani

Copied: data/pool/materials/Tower.material (from rev 9334, code/branches/presentation2012merge/src/modules/towerdefense/tower/Tower.material)
===================================================================
--- data/pool/materials/Tower.material	                        (rev 0)
+++ data/pool/materials/Tower.material	2012-07-22 20:44:22 UTC (rev 9335)
@@ -0,0 +1,25 @@
+material Material/TEXFACE/RustySteel.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 RustySteel.jpg
+				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
+		}
+	}
+}

Modified: data/pool/models/AUTHORS
===================================================================
--- data/pool/models/AUTHORS	2012-07-22 20:21:36 UTC (rev 9334)
+++ data/pool/models/AUTHORS	2012-07-22 20:44:22 UTC (rev 9335)
@@ -53,6 +53,7 @@
 spacestation/SemiCircleCockpit.mesh           Mirko Kaiser
 spacestation/SolarPanel.mesh                  Mirko Kaiser
 spacestation/Thruster.mesh                    Mirko Kaiser
+towerdefense/*                                Fabian Mentzer
 can.mesh                                      Hagen Seifert
 cwrench.mesh                                  Felix Schulthess
 earth.mesh                                    Marian Runo

Deleted: data/pool/models/towerdefense/field/OgreXMLConverter.log
===================================================================
--- code/branches/presentation2012merge/src/modules/towerdefense/Spielfeld Blender/OgreXMLConverter.log	2012-07-22 20:21:36 UTC (rev 9334)
+++ data/pool/models/towerdefense/field/OgreXMLConverter.log	2012-07-22 20:44:22 UTC (rev 9335)
@@ -1,31 +0,0 @@
-15:38:46: Creating resource group General
-15:38:46: Creating resource group Internal
-15:38:46: Creating resource group Autodetect
-15:38:46: Registering ResourceManager for type Mesh
-15:38:46: Registering ResourceManager for type Material
-15:38:46: Registering ResourceManager for type Skeleton
-15:38:46: XMLMeshSerializer reading mesh data from /home/mentzerf/mentzerf-extra-0/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Playfield_ME.mesh.xml...
-15:38:46: Reading submeshes...
-15:38:46: Reading geometry...
-15:38:46: Geometry done...
-15:38:46: Submeshes done.
-15:38:46: XMLMeshSerializer import successful.
-15:38:46: Reorganising vertex buffers to automatic layout..
-15:38:46: MeshSerializer writing mesh data to /home/mentzerf/mentzerf-extra-0/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Playfield_ME.mesh...
-15:38:46: File header written.
-15:38:46: Writing mesh data...
-15:38:46: Writing submesh...
-15:38:46: Exporting submesh texture aliases...
-15:38:46: Submesh texture aliases exported.
-15:38:46: Submesh exported.
-15:38:46: Exporting bounds information....
-15:38:46: Bounds information exported.
-15:38:46: Exporting submesh name table...
-15:38:46: Submesh name table exported.
-15:38:46: Exporting edge lists...
-15:38:46: Edge lists exported
-15:38:46: Mesh data exported.
-15:38:46: MeshSerializer export successful.
-15:38:46: Unregistering ResourceManager for type Skeleton
-15:38:46: Unregistering ResourceManager for type Material
-15:38:46: Unregistering ResourceManager for type Mesh

Deleted: data/pool/models/towerdefense/tower/Tower.material
===================================================================
--- code/branches/presentation2012merge/src/modules/towerdefense/tower/Tower.material	2012-07-22 20:21:36 UTC (rev 9334)
+++ data/pool/models/towerdefense/tower/Tower.material	2012-07-22 20:44:22 UTC (rev 9335)
@@ -1,25 +0,0 @@
-material Material/TEXFACE/RustySteel.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 RustySteel.jpg
-				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
-		}
-	}
-}