Index: Cube.as
===================================================================
--- Cube.as	(revision 62)
+++ Cube.as	(working copy)
@@ -40,6 +40,7 @@
 import org.papervision3d.core.*;
 import org.papervision3d.core.proto.*;
 import org.papervision3d.core.geom.*;
+import org.papervision3d.materials.MaterialsList;
 
 import flash.display.BitmapData;
 
@@ -66,6 +67,13 @@
 	* Number of segments horizontally. Defaults to 1.
 	*/
 	public var segmentsH :Number;
+	
+	/**
+	* Whether we are using the same material on every face of the cube or we should check
+	* through the materialsList for a material for each face as we construct the cube
+	*/
+	private var oneMaterial:Boolean = true;
+	
 
 	/**
 	* Default size of Cube if not texture is defined.
@@ -114,8 +122,21 @@
 	* <p/>
 	* If extra is not an object, it is ignored. All properties of the extra field are copied into the new instance. The properties specified with extra are publicly available.
 	*/
-	public function Cube( material:MaterialObject3D=null, width:Number=500, depth:Number=500, height:Number=500, segmentsS:Number=1, segmentsT:Number=1, segmentsH:Number=1, initObject:Object=null )
+	public function Cube( materialArg:Object=null, width:Number=500, depth:Number=500, height:Number=500, segmentsS:Number=1, segmentsT:Number=1, segmentsH:Number=1, initObject:Object=null )
 	{
+		var material:MaterialObject3D;
+		if (materialArg) {
+			if (materialArg is MaterialsList) {
+				material = null;
+				this.materials = materialArg as MaterialsList;
+				oneMaterial = false;
+			} else if (materialArg is MaterialObject3D) {
+				material = materialArg as MaterialObject3D;
+			} else {
+				// Throw some kind of type error?
+				
+			}
+		}
 		super( material, new Array(), new Array(), null, initObject );
 
 		this.segmentsS = segmentsS;//!=null?segmentsW:DEFAULT_SEGMENTS; // Defaults to 1
@@ -229,6 +250,8 @@
 		var aP1:Vertex3D, aP2:Vertex3D, aP3:Vertex3D, aP4:Vertex3D;
 		var aP4uv:NumberUV, aP1uv:NumberUV, aP2uv:NumberUV, aP3uv:NumberUV;
 
+		var faceMaterialName:String;
+					
 		var iVerNum:int = aVtc.length;
 		for (i=0;i<iVerNum;i++) {
 			var iHorNum:int = aVtc[i].length;
@@ -245,16 +268,23 @@
 					if (jj<iSag) {						// side 1
 						iJsbs = jj;
 						iTrSg = iSag;
+						faceMaterialName = 'face1'; 
 					} else if (jj<(iTrv+iSag)) {		// side 2
 						iJsbs = jj-iSag;
 						iTrSg = iTrv;
+						faceMaterialName = 'face2';
 					} else if (jj<(iTrv+2*iSag))	{	// side 3
 						iJsbs = jj-iTrv-iSag;
 						iTrSg = iSag;
+						faceMaterialName = 'face3';
 					} else {							// side 4
 						iJsbs = jj-iTrv-2*iSag;
 						iTrSg = iTrv;
+						faceMaterialName = 'face4';
 					}
+					if (oneMaterial || materials.getMaterialByName(faceMaterialName) == null) {
+						faceMaterialName = null;
+					}
 					var fI0:Number = (i-1)/(iVerNum-1);
 					var fI1:Number = (i+0)/(iVerNum-1);
 					var fJ0:Number = (1-(iJsbs+1)*(1/iTrSg));
@@ -264,8 +294,8 @@
 					aP2uv = new NumberUV(fJ1,fI1);
 					aP3uv = new NumberUV(fJ1,fI0);
 					// 2 faces
-					aFace.push( new Face3D(new Array(aP1,aP3,aP2), null, new Array(aP1uv,aP3uv,aP2uv)) );
-					aFace.push( new Face3D(new Array(aP1,aP4,aP3), null, new Array(aP1uv,aP4uv,aP3uv)) );
+					aFace.push( new Face3D(new Array(aP1,aP3,aP2), faceMaterialName, new Array(aP1uv,aP3uv,aP2uv)) );
+					aFace.push( new Face3D(new Array(aP1,aP4,aP3), faceMaterialName, new Array(aP1uv,aP4uv,aP3uv)) );
 				}
 			}
 		}
@@ -296,11 +326,13 @@
 					aP3uv = new NumberUV( (bTop?1:0)+(bTop?-1:1)*((j-1)/iTrv) ,(k-1)/iSag );
 					aP4uv = new NumberUV( (bTop?1:0)+(bTop?-1:1)*((j-1)/iTrv) ,(k+0)/iSag );
 					if (i==0) {
-						aFace.push( new Face3D(new Array(aP1,aP2,aP3), null, new Array(aP1uv,aP2uv,aP3uv)) );
-						aFace.push( new Face3D(new Array(aP1,aP3,aP4), null, new Array(aP1uv,aP3uv,aP4uv)) );
+						faceMaterialName = oneMaterial || materials.getMaterialByName(faceMaterialName) == null ? null : 'face5';
+						aFace.push( new Face3D(new Array(aP1,aP2,aP3), faceMaterialName, new Array(aP1uv,aP2uv,aP3uv)) );
+						aFace.push( new Face3D(new Array(aP1,aP3,aP4), faceMaterialName, new Array(aP1uv,aP3uv,aP4uv)) );
 					} else {
-						aFace.push( new Face3D(new Array(aP1,aP3,aP2), null, new Array(aP1uv,aP3uv,aP2uv)) );
-						aFace.push( new Face3D(new Array(aP1,aP4,aP3), null, new Array(aP1uv,aP4uv,aP3uv)) );
+						faceMaterialName = oneMaterial || materials.getMaterialByName(faceMaterialName) == null ? null : 'face6';
+						aFace.push( new Face3D(new Array(aP1,aP3,aP2), faceMaterialName, new Array(aP1uv,aP3uv,aP2uv)) );
+						aFace.push( new Face3D(new Array(aP1,aP4,aP3), faceMaterialName, new Array(aP1uv,aP4uv,aP3uv)) );
 					}
 				}
 			}