# HG changeset patch
# User NOBUYASU Oshiro
# Date 1275243870 -32400
# Node ID 94c790cbd9300c51ba8d84149c8ea5def2fb73e2
# Parent  b67b790dcf4f090550fe4b741fdeae692e27e438
update TestXml3.html

diff -r b67b790dcf4f -r 94c790cbd930 webGL/test/TestXml3.html
--- a/webGL/test/TestXml3.html	Mon May 24 21:38:02 2010 +0900
+++ b/webGL/test/TestXml3.html	Mon May 31 03:24:30 2010 +0900
@@ -50,7 +50,8 @@
 				gl_Position = u_modelViewProjMatrix * vPosition;
 				v_texCoord = vTexCoord.st;
 				vec4 transNormal = u_normalMatrix * vec4(vNormal,1);
-				v_Dot = max(dot(transNormal.xyz, lightDir), 0.0);
+//				v_Dot = max(dot(transNormal.xyz, lightDir), 0.0);
+				v_Dot = min(dot(transNormal.xyz, lightDir), 1.0);
 			}
 			</script> 
 		
@@ -82,15 +83,15 @@
 				gl.obj = new Object();
 				for (var name in xmlObj) {
 					gl.obj[name] = makeXmlObj(gl, xmlObj[name]);
-				}
+					gl.obj[name].texture = loadImageTexture(gl, xmlObj[name].image);
+                 		}
 				
+			
 				// get the images
 				earthTexture = loadImageTexture(gl, "resources/earthmap1k.jpg");
 				marsTexture = loadImageTexture(gl, "resources/mars500x250.png");
 				
 				
-				testTexture = loadImageTexture(gl, testImage);
-				
 				return gl;
 			}
 			
@@ -113,7 +114,7 @@
 				ctx.perspectiveMatrix.perspective(30, width/height, 1, 10000);
 			}
 			
-			function drawOne(ctx, glObj, angle, x, y, z, scale, texture)
+			function drawOne(ctx, glObj, angle, x, y, z, scale)
 			{
 				// setup VBOs
 				ctx.enableVertexAttribArray(0);
@@ -149,7 +150,8 @@
 				mvpMatrix.multRight(ctx.perspectiveMatrix);
 				ctx.uniformMatrix4fv(ctx.getUniformLocation(ctx.program, "u_modelViewProjMatrix"), false, mvpMatrix.getAsWebGLFloatArray());
 				
-				ctx.bindTexture(ctx.TEXTURE_2D, texture);
+//				ctx.bindTexture(ctx.TEXTURE_2D, texture);
+				ctx.bindTexture(ctx.TEXTURE_2D, glObj.texture);
 				ctx.drawElements(ctx.TRIANGLES, glObj.numIndices, ctx.UNSIGNED_SHORT, 0);
 			}
 			
@@ -159,8 +161,8 @@
 				ctx.clear(ctx.COLOR_BUFFER_BIT | ctx.DEPTH_BUFFER_BIT);
 				
 				for (var name in ctx.obj) {
-					//      drawOne(ctx, ctx.obj[name], currentAngle, 0, 0, 0, 0.005, testTexture);
-					drawOne(ctx, ctx.obj[name], currentAngle, 0, 0, 0, 0.005, marsTexture);
+				      drawOne(ctx, ctx.obj[name], currentAngle, 0, 0, 0, 0.005);
+//				      drawOne(ctx, ctx.obj[name], currentAngle, 0, -5, -30, 0.5);
 				}
 				
 				ctx.flush();
@@ -175,16 +177,13 @@
 			function start()
 			{
 				//xmlファイル読み込み
-				xmlObj = parseXml("./xml/Companioncube.xml");
-				
-				var url = "./xml/Companioncube.xml";
-				var http = new JKL.ParseXML( url );
-				var data = http.parse();
-				xmlObjImage = data["OBJECT-3D"]["surface"]["image"];
-				testImage = 'data:image/png;base64,'+xmlObjImage["#text"];
-				
-				document.getElementById("test").src=testImage;
-				
+//				xmlObj = parseXml("./xml/Companioncube.xml");
+//				xmlObj = parseXml("./xml/head.xml");
+				xmlObj = parseXml("./xml/dandy/character.xml");
+
+			        for (var name in xmlObj ){
+			          document.getElementById("test").src=xmlObj[name].image;
+			        }
 				var c = document.getElementById("example");
 				var w = Math.floor(window.innerWidth * 0.9);
 				var h = Math.floor(window.innerHeight * 0.9);