[Opal-commits] opal/samples/data/materials textured.material,NONE,1.1 basic.material,1.4,1.5

[tylerstreeter <tyl...@us...>]

Update of /cvsroot/opal/opal/samples/data/materials
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10352/samples/data/materials

Modified Files:
	basic.material 
Added Files:
	textured.material 
Log Message:
changed Simulator::instantiateBlueprint to apply scaling (of Shape dimensions and Solid transforms) before applying the additional Blueprint transform; made the playpen sample app cool

--- NEW FILE: textured.material ---
material Textured/Wood
{
	receive_shadows on

	technique
	{
		pass
		{
			texture_unit
			{
				scale 1 1
				texture wood.jpg
			}
		}
	}
}

Index: basic.material
===================================================================
RCS file: /cvsroot/opal/opal/samples/data/materials/basic.material,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** basic.material	6 Apr 2005 04:48:43 -0000	1.4
--- basic.material	15 Apr 2005 08:50:40 -0000	1.5
***************
*** 15,18 ****
--- 15,34 ----
  }
  
+ material Plastic/Green
+ {
+ 	receive_shadows on
+ 
+ 	technique
+ 	{
+ 		pass
+ 		{
+ 			ambient 0 1 0
+ 			diffuse 0 1 0
+ 			specular 0.2 0.2 0.2 50
+ 			emissive 0 0 0
+ 		}
+ 	}
+ }
+ 
  material Plastic/Blue
  {
***************
*** 31,34 ****
--- 47,66 ----
  }
  
+ material Plastic/LightBlue
+ {
+ 	receive_shadows on
+ 
+ 	technique
+ 	{
+ 		pass
+ 		{
+ 			ambient 0.5 0.5 1
+ 			diffuse 0.5 0.5 1
+ 			specular 0.2 0.2 0.2 50
+ 			emissive 0 0 0
+ 		}
+ 	}
+ }
+ 
  material Plastic/Orange
  {
***************
*** 47,50 ****
--- 79,114 ----
  }
  
+ material Plastic/Yellow
+ {
+ 	receive_shadows on
+ 
+ 	technique
+ 	{
+ 		pass
+ 		{
+ 			ambient 1 1 0
+ 			diffuse 1 1 0
+ 			specular 0.2 0.2 0.2 50
+ 			emissive 0 0 0
+ 		}
+ 	}
+ }
+ 
+ material Plastic/Purple
+ {
+ 	receive_shadows on
+ 
+ 	technique
+ 	{
+ 		pass
+ 		{
+ 			ambient 0.5 0 1
+ 			diffuse 0.5 0 1
+ 			specular 0.2 0.2 0.2 50
+ 			emissive 0 0 0
+ 		}
+ 	}
+ }
+ 
  material Plastic/Gray
  {
***************
*** 63,66 ****
--- 127,198 ----
  }
  
+ material Plastic/LightGray
+ {
+ 	receive_shadows on
+ 
+ 	technique
+ 	{
+ 		pass
+ 		{
+ 			ambient 0.8 0.8 0.8
+ 			diffuse 0.8 0.8 0.8
+ 			specular 0.2 0.2 0.2 50
+ 			emissive 0 0 0
+ 		}
+ 	}
+ }
+ 
+ material Plastic/DarkGray
+ {
+ 	receive_shadows on
+ 
+ 	technique
+ 	{
+ 		pass
+ 		{
+ 			ambient 0.3 0.3 0.3
+ 			diffuse 0.3 0.3 0.3
+ 			specular 0.2 0.2 0.2 50
+ 			emissive 0 0 0
+ 		}
+ 	}
+ }
+ 
+ material Unlit/Yellow
+ {
+ 	receive_shadows off
+ 
+ 	technique
+ 	{
+ 		pass
+ 		{
+ 			lighting on
+ 
+ 			ambient 0 0 0
+ 			diffuse 0 0 0
+ 			specular 0 0 0 0
+ 			emissive 1 1 0
+ 		}
+ 	}
+ }
+ 
+ material Unlit/White
+ {
+ 	receive_shadows off
+ 
+ 	technique
+ 	{
+ 		pass
+ 		{
+ 			lighting on
+ 
+ 			ambient 0 0 0
+ 			diffuse 0 0 0
+ 			specular 0 0 0 0
+ 			emissive 1 1 1
+ 		}
+ 	}
+ }
+ 
  material Special/Crosshair
  {