Index: GTP/trunk/App/Demos/Geom/OgreStuff/media/materials/scripts/dwarf.material
===================================================================
--- GTP/trunk/App/Demos/Geom/OgreStuff/media/materials/scripts/dwarf.material	(revision 1092)
+++ GTP/trunk/App/Demos/Geom/OgreStuff/media/materials/scripts/dwarf.material	(revision 1783)
@@ -6,6 +6,5 @@
 		pass
 		{
-			ambient 0.2 0.2 0.2 1
-			diffuse 0.8 0.8 0.8 1
+			ambient 1.0 1.0 1.0 1
 
 			cull_hardware none
@@ -26,6 +25,5 @@
 		pass
 		{
-			ambient 0.2 0.2 0.2 1
-			diffuse 0.8 0.8 0.8 1
+			ambient 1.0 1.0 1.0 1
 
 			cull_hardware none
@@ -46,6 +44,5 @@
 		pass
 		{
-			ambient 0.2 0.2 0.2 1
-			diffuse 0.8 0.8 0.8 1
+			ambient 1.0 1.0 1.0 1
 
 			cull_hardware none
@@ -59,2 +56,21 @@
 	}
 }
+
+material Material3
+{
+	technique
+	{
+		pass
+		{
+			ambient 1.0 1.0 1.0 1
+
+			cull_hardware none
+			cull_software none
+
+			texture_unit
+			{
+				texture axe.jpg
+			}
+		}
+	}
+}
Index: GTP/trunk/App/Demos/Geom/OgreStuff/media/materials/scripts/Example.material
===================================================================
--- GTP/trunk/App/Demos/Geom/OgreStuff/media/materials/scripts/Example.material	(revision 1561)
+++ GTP/trunk/App/Demos/Geom/OgreStuff/media/materials/scripts/Example.material	(revision 1783)
@@ -44,7 +44,5 @@
 		pass
 		{
-			ambient 0.8 0.8 0.8
-			cull_hardware true
-
+			ambient 1.0 1.0 1.0
 			texture_unit
 			{
@@ -165,4 +163,5 @@
 			lighting off
 			depth_write off
+			fog_override true
 
 			texture_unit
@@ -703,4 +702,58 @@
 	}
 }
+
+material Demos/TerrainMixed
+{
+   technique
+   {
+     pass
+     {
+       // lighting on
+       // Base Pass
+       ambient 0.6 0.6 0.6
+       diffuse 0.6 0.6 0.6
+       texture_unit
+       {
+         // Base Texture
+         texture grass_1024.jpg
+	   scale 0.5 0.5
+       }
+       texture_unit
+      {
+         texture grass.png
+         colour_op_ex modulate_x2 src_current src_texture
+         scale 0.01 0.01
+      }         
+     }    
+    
+     pass
+     {
+       // Rock pass
+       ambient 0.6 0.6 0.6
+       diffuse 0.6 0.6 0.6
+       scene_blend alpha_blend
+       depth_func equal
+       texture_unit
+       {
+         // Alpha Map for rock
+         texture terrain_splat3.tga
+         tex_address_mode mirror
+         alpha_op_ex source1 src_texture src_texture
+         colour_op_ex source1 src_current src_current
+	   scale 0.5 0.5
+       }
+
+       texture_unit
+       {
+         // Rock Splatting texture
+         texture destina.jpg
+         tex_address_mode mirror
+         alpha_op_ex source1 src_current src_current
+         colour_op_ex source2 src_current src_texture
+         scale 0.01 0.01
+       }
+     }
+  }
+} 
 
 vertex_program Examples/GrassWaverVp cg
@@ -787,5 +840,5 @@
 }
 
-material Examples/ML11/leaf
+material Examples/ML11/leaf_orig
 {
     technique
@@ -806,4 +859,78 @@
 }
 
+material Examples/ML11/leaf
+{
+    technique
+    {
+        pass
+        {
+		alpha_rejection greater 150 
+	      cull_hardware none
+            texture_unit
+            {
+		    filtering linear linear linear
+                texture ml11lef.dds
+            }
+        }
+    }
+}
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// Bump map vertex program, support for this is required
+
+vertex_program Lodtree/BumpMapVP cg
+{
+	source LodTree_BumpMapping.cg
+	entry_point main_vp
+	profiles vs_1_1 arbvp1
+}
+
+// Bump map fragment program, support for this is optional
+fragment_program Lodtree/BumpMapFP cg
+{
+	source LodTree_BumpMapping.cg
+	entry_point main_fp
+	profiles ps_2_0 arbfp1 fp20
+}
+
+
+// Single light material, less passes (one pass on a 4-unit card)
+//material Demos/ML06/Leaf
+//{
+//	// Preferred technique, uses vertex and fragment programs
+//	// to support a single coloured light
+//	technique
+//	{
+//		pass
+//		{
+//			// base colours, not needed for rendering, but as information
+//			// to lighting pass categorisation routine
+//			ambient 0.7 0.7 0.7 
+//			// Vertex program reference
+//			vertex_program_ref Lodtree/BumpMapVP
+//			{
+//				param_named_auto lightPosition light_position_object_space 0
+//				param_named_auto worldViewProj worldviewproj_matrix
+//			}
+//
+//			// Fragment program
+//			fragment_program_ref Lodtree/BumpMapFP
+//			{
+//				param_named_auto lightDiffuse light_diffuse_colour 0 
+//			}
+//			
+//			// Decal
+//			texture_unit
+//			{
+//				texture ml06lef.dds
+//			}
+//		}
+//	}
+//
+//}
+
+
 material Examples/ML11/trunk
 {
@@ -821,4 +948,105 @@
 }
 
+material Demos/ML06/Leaf
+{
+    technique
+    {
+        pass
+        {
+		ambient 1 1 1
+		alpha_rejection greater 150 
+	      cull_hardware none
+		cull_software none
+            texture_unit
+            {
+		    filtering linear linear linear
+                texture ml06lef.dds
+            }
+        }
+    }
+}
+
+
+material Demos/ML06/Trunk
+{
+	technique
+	{
+		pass
+		{
+			cull_hardware clockwise
+			texture_unit
+			{
+				texture ML15brk.tif
+			}
+		}
+	}
+}
+
+material Demos/ML15/Trunk
+{
+	technique
+	{
+		pass
+		{
+			cull_hardware clockwise
+			texture_unit
+			{
+				texture ML15brk.tif
+			}
+		}
+	}
+}
+
+material Demos/ML15/Leaf
+{
+    technique
+    {
+        pass
+        {
+		alpha_rejection greater 150 
+	      cull_hardware none
+		ambient 1 1 1
+            texture_unit
+            {
+		    filtering linear linear linear
+                texture ml15lef.dds
+            }
+        }
+    }
+}
+
+material Demos/ML13/Trunk
+{
+	technique
+	{
+		pass
+		{
+			cull_hardware clockwise
+			texture_unit
+			{
+				texture ML13brk.tif
+			}
+		}
+	}
+}
+
+material Demos/ML13/Leaf
+{
+    technique
+    {
+        pass
+        {
+		alpha_rejection greater 150 
+	      cull_hardware none
+		ambient 1 1 1
+            texture_unit
+            {
+		    filtering linear linear linear
+                texture ml13lef.dds
+            }
+        }
+    }
+}
+
 material Examples/Rockwall
 {
Index: GTP/trunk/App/Demos/Geom/OgreStuff/bin/release/terrain.cfg
===================================================================
--- GTP/trunk/App/Demos/Geom/OgreStuff/bin/release/terrain.cfg	(revision 1092)
+++ GTP/trunk/App/Demos/Geom/OgreStuff/bin/release/terrain.cfg	(revision 1783)
@@ -1,10 +1,10 @@
 # The main world texture (if you wish the terrain manager to create a material for you)
-WorldTexture=terrain_texture.jpg
+WorldTexture=grass_1024.jpg
 
 # The detail texture (if you wish the terrain manager to create a material for you)
-DetailTexture=terrain_detail.jpg
+DetailTexture=grass.png
 
 #number of times the detail texture will tile in a terrain tile
-DetailTile=3
+DetailTile=8
 
 # Heightmap source
@@ -12,5 +12,5 @@
 
 # Heightmap-source specific settings
-Heightmap.image=terrain.png
+Heightmap.image=noise2.jpg
 
 # If you use RAW, fill in the below too
@@ -23,8 +23,8 @@
 
 # How large is a page of tiles (in vertices)? Must be (2^n)+1
-PageSize=513
+PageSize=33
 
 # How large is each tile? Must be (2^n)+1 and be smaller than PageSize
-TileSize=65
+TileSize=17
 
 # The maximum error allowed when determining which LOD to use
@@ -35,5 +35,5 @@
 PageWorldZ=1500
 # Maximum height of the terrain 
-MaxHeight=100
+MaxHeight=120
 
 # Upper LOD limit
@@ -69,5 +69,5 @@
 
 # The name of the material you will define to shade the terrain
-CustomMaterialName=TestTerrainMaterial
+CustomMaterialName=Demos/TerrainMixed
 
 
Index: GTP/trunk/App/Demos/Geom/OgreStuff/bin/debug/terrain.cfg
===================================================================
--- GTP/trunk/App/Demos/Geom/OgreStuff/bin/debug/terrain.cfg	(revision 1092)
+++ GTP/trunk/App/Demos/Geom/OgreStuff/bin/debug/terrain.cfg	(revision 1783)
@@ -1,10 +1,10 @@
 # The main world texture (if you wish the terrain manager to create a material for you)
-WorldTexture=terrain_texture.jpg
+WorldTexture=grass_1024.jpg
 
 # The detail texture (if you wish the terrain manager to create a material for you)
-DetailTexture=terrain_detail.jpg
+DetailTexture=grass.png
 
 #number of times the detail texture will tile in a terrain tile
-DetailTile=3
+DetailTile=8
 
 # Heightmap source
@@ -12,5 +12,5 @@
 
 # Heightmap-source specific settings
-Heightmap.image=terrain.png
+Heightmap.image=noise2.jpg
 
 # If you use RAW, fill in the below too
@@ -23,8 +23,8 @@
 
 # How large is a page of tiles (in vertices)? Must be (2^n)+1
-PageSize=513
+PageSize=33
 
 # How large is each tile? Must be (2^n)+1 and be smaller than PageSize
-TileSize=65
+TileSize=17
 
 # The maximum error allowed when determining which LOD to use
@@ -35,5 +35,5 @@
 PageWorldZ=1500
 # Maximum height of the terrain 
-MaxHeight=100
+MaxHeight=120
 
 # Upper LOD limit
@@ -69,3 +69,5 @@
 
 # The name of the material you will define to shade the terrain
-CustomMaterialName=TestTerrainMaterial
+CustomMaterialName=Demos/TerrainMixed
+
+
