diff webGL/dandy/resources/Character.js~ @ 11:680b5b0cd1e4

upload
author NOBUYASU Oshiro
date Mon, 12 Jul 2010 08:01:12 +0900
parents 1d76f5717ba7
children 61febc94fa62
line wrap: on
line diff
--- a/webGL/dandy/resources/Character.js~	Sat Jul 10 16:38:23 2010 +0900
+++ b/webGL/dandy/resources/Character.js~	Mon Jul 12 08:01:12 2010 +0900
@@ -1,5 +1,6 @@
 active_chara_list = new Object();
 active_chara_list.enemy = [];
+active_chara_list.tama = [];
 count = 0;
 rinkx = 0;
 rinky = 0;
@@ -62,7 +63,8 @@
 
     // generate the model-view matrix
     var mvMatrix = new CanvasMatrix4();
-    mvMatrix.scale(jiki.scale, jiki.scale, jiki.scale);
+    //    mvMatrix.scale(jiki.scale, jiki.scale, jiki.scale);
+    mvMatrix.scale(glObj.scale, glObj.scale, glObj.scale);
     mvMatrix.translate(glObj.x,glObj.y,10);
     
     // construct the normal matrix from the model-view matrix
@@ -78,6 +80,8 @@
     
     ctx.bindTexture(ctx.TEXTURE_2D, glObj.texture);
     ctx.drawElements(ctx.TRIANGLES, glObj.image.numIndices, ctx.UNSIGNED_SHORT, 0);
+
+
 }
 
 function obj_draw( ctx )