diff webGL/dandy/resources/parse.js~ @ 26:933062d8e917

update library J3DI.js J3DMath.js
author NOBUYASU Oshiro
date Tue, 09 Nov 2010 00:03:42 +0900
parents 1f234cbb53f1
children
line wrap: on
line diff
--- a/webGL/dandy/resources/parse.js~	Fri Nov 05 08:40:26 2010 +0900
+++ b/webGL/dandy/resources/parse.js~	Tue Nov 09 00:03:42 2010 +0900
@@ -189,13 +189,14 @@
     
     ctx.bindBuffer(ctx.ARRAY_BUFFER, glObj.texCoordObject);
     ctx.vertexAttribPointer(1, 2, ctx.FLOAT, false, 0, 0);
-				
+
     ctx.bindBuffer(ctx.ELEMENT_ARRAY_BUFFER, glObj.indexObject);
 
+
     // generate the model-view matrix
     var mvMatrix = new J3DIMatrix4();
-    mvMatrix.translate( x, y, 1);
     mvMatrix.scale(scale, scale, scale);
+    mvMatrix.translate( x, y, 10);
     
     // construct the normal matrix from the model-view matrix
     var normalMatrix = new J3DIMatrix4(mvMatrix);
@@ -206,7 +207,7 @@
     // construct the model-view * projection matrix
     var mvpMatrix = new J3DIMatrix4(ctx.perspectiveMatrix);
     mvpMatrix.multiply(mvMatrix);
-     mvpMatrix.setUniform(ctx, ctx.getUniformLocation(ctx.program, "u_modelViewProjMatrix"), false);
+    mvpMatrix.setUniform(ctx, ctx.getUniformLocation(ctx.program, "u_modelViewProjMatrix"), false);
 
     
     ctx.bindTexture(ctx.TEXTURE_2D, glObj.texture);
@@ -215,7 +216,7 @@
 
 }
 
-function PutSpriteLock(ctx, x, y, scale, angle,  glObj)
+function PutSpriteA(ctx, x, y, scale, angle,  glObj)
 {
 
     // setup VBOs
@@ -236,20 +237,18 @@
     // generate the model-view matrix
     var mvMatrix = new J3DIMatrix4();
     mvMatrix.scale(scale, scale, scale);
+    mvMatrix.translate( x, y, 10);
     mvMatrix.rotate(angle, 0, 0, 1);
-    mvMatrix.translate( x, y, 10);
     
     // construct the normal matrix from the model-view matrix
     var normalMatrix = new J3DIMatrix4(mvMatrix);
     normalMatrix.invert();
     normalMatrix.transpose();
-//    ctx.uniformMatrix4fv(ctx.getUniformLocation(ctx.program, "u_normalMatrix"), false, normalMatrix.getAsFloat32Array());
     normalMatrix.setUniform(ctx, ctx.getUniformLocation(ctx.program, "u_normalMatrix"), false);
     
     // construct the model-view * projection matrix
-    var mvpMatrix = new J3DIMatrix4(mvMatrix);
-    mvpMatrix.multiply(ctx.perspectiveMatrix);
-//    ctx.uniformMatrix4fv(ctx.getUniformLocation(ctx.program, "u_modelViewProjMatrix"), false, mvpMatrix.getAsFloat32Array());
+    var mvpMatrix = new J3DIMatrix4(ctx.perspectiveMatrix);
+    mvpMatrix.multiply(mvMatrix);
      mvpMatrix.setUniform(ctx, ctx.getUniformLocation(ctx.program, "u_modelViewProjMatrix"), false);