# HG changeset patch
# User NOBUYASU Oshiro
# Date 1279145317 -32400
# Node ID 61febc94fa628cd296215d6d4adeade9ed7f6dda
# Parent  680b5b0cd1e4f9af49257a51dab834d110e3fa9d
upload dandy4.html,new xmlFile

diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/dandy4.html
--- a/webGL/dandy/dandy4.html	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/dandy4.html	Thu Jul 15 07:08:37 2010 +0900
@@ -47,6 +47,7 @@
 		<script src="resources/pause.js"> </script> 
 		<script src="resources/tama.js"> </script> 
 		<script src="resources/sankaku.js"> </script> 
+		<script src="resources/syokika.js"> </script> 
         
 		<script id="vshader" type="x-shader/x-vertex"> 
 			uniform mat4 u_modelViewProjMatrix;
@@ -79,7 +80,9 @@
 			void main()
 			{
 				vec4 color = texture2D(sampler2d,v_texCoord);
-				color += vec4(0.1,0.1,0.1,1);
+//				color += vec4(0.1,0.1,0.1,1);
+//		        if(color.a == 1)color=vec4(1,0,0,1);
+//		        else color=vec4(0,1,1,1);
 				gl_FragColor = vec4(color.xyz * v_Dot, color.a);
 //				gl_FragColor = vec4(color.xyz * v_Dot, 0.5);
 			}
@@ -141,7 +144,8 @@
 				reshape(ctx, ortho);
 				ctx.clear(ctx.COLOR_BUFFER_BIT | ctx.DEPTH_BUFFER_BIT);
 			
-			       
+
+
 			        Player(ctx, jiki, pad, ortho);
 
 			        obj_draw(ctx);
@@ -172,14 +176,20 @@
 		        	PutSpriteF(ctx, 170, 50, 1, font[11]);
           			PutSpriteF(ctx, 40, 120, 1, font[12]);	
 
+
 			        ctx.flush();
-			        if(pad.start == 0) {setTimeout(o, 10);}
-			        if(pad.start != 0) { audio && audio.play();//audio Test
-			                             setInterval(f, 10);}
+
+			        if(pad.start == 0) {setTimeout(o, 100);}
+			        if(pad.start != 0) {
+          		               jiki.bf = true;
+                                       pad.st = 1;
+			               gameflage = 1;
+                                       audio && audio.play();
+      	                               setInterval(f, 10);
+			         }
 			}
 			function start()
 			{
-
                			var ortho = makeOrthoPara(0,200,140,0);
 
 				var c = document.getElementById("example");
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/Character.js
--- a/webGL/dandy/resources/Character.js	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/Character.js	Thu Jul 15 07:08:37 2010 +0900
@@ -8,10 +8,11 @@
 rinkf1 = 0;rinkf2 = 0;
 asteroidi = 0;
 enemyfaste = 0;
+enemycount = 0;
 sf = 0;
 amari = 0;
-fastebos = 0;
 tekino0 = new Character();
+gameflag = 0;
 
 function Character()
 {
@@ -106,4 +107,9 @@
 		    active_chara_list.enemy.splice(i,1);
 		}
 	}
+    for(i=0; Boolean(bchar[i]); i++ )
+	{
+	    //ボム(撃破)処理を終えたら配列から消す
+	    if(bchar[i].no == 8) bchar[i].no.splice(i,1);
+	}
 }
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/Character.js~
--- a/webGL/dandy/resources/Character.js~	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/Character.js~	Thu Jul 15 07:08:37 2010 +0900
@@ -1,3 +1,4 @@
+stage = 0;
 active_chara_list = new Object();
 active_chara_list.enemy = [];
 active_chara_list.tama = [];
@@ -86,12 +87,19 @@
 
 function obj_draw( ctx )
 {
-    for(var i = 0; Boolean(active_chara_list.enemy[i]) ; i++)
+    for(var i = 0; Boolean(active_chara_list.enemy[i]); i++)
 	{
 	    if(active_chara_list.enemy[i].flag == true)
 		{
 		    PutSprite(ctx,active_chara_list.enemy[i]);
 		}
+	}
+}
+
+function delete_obj( ctx )
+{
+    for(var i = 0; Boolean(active_chara_list.enemy[i]); i++)
+	{
 	    //敵が消えたら配列から消す
 	    if(active_chara_list.enemy[i].flag == false)
 		{
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/Character_state.js
--- a/webGL/dandy/resources/Character_state.js	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/Character_state.js	Thu Jul 15 07:08:37 2010 +0900
@@ -69,7 +69,7 @@
     if(p.y < jiki.y && p.y + 16 > jiki.y)
 	{
 	    p.vy = -2;
-	    p.vx = ((Jiki.x > p.x ) ? 4 : -4);
+	    p.vx = ((jiki.x > p.x ) ? 4 : -4);
 	    p.state = chara_state7;
 	}
     else p.state = chara_state4;
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/Character_state.js~
--- a/webGL/dandy/resources/Character_state.js~	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/Character_state.js~	Thu Jul 15 07:08:37 2010 +0900
@@ -62,11 +62,70 @@
     return p;
 }
 
+chara_state4 = function character_state4(p)
+{
+    p.y += p.vy;
+    p.x += p.vx;
+    if(p.y < jiki.y && p.y + 16 > jiki.y)
+	{
+	    p.vy = -2;
+	    p.vx = ((Jiki.x > p.x ) ? 4 : -4);
+	    p.state = chara_state7;
+	}
+    else p.state = chara_state4;
+    return p;
+}
 
+chara_state5 = function character_state5(p)
+{
+    p.y += p.vy;
+    p.x += p.vx;
+    if(p.y + 96 < jiki.y
+       && p.y + 128 > jiki.y)
+	{
+	    p.vy = -2;
+	    p.vx = ((jiki.x > p.x) ? 4 : -4);
+	    p.state = chara_state0;
+	}
+    else p.state = chara_state5;
+    //PutSprite(count, p.x, p.y, p.charano);                                                                           
+    return p;
+}
 
+chara_state6 = function character_state7(p)
+{
+    p.y += p.vy;
+    p.x += p.vx;
+    if(p.y + 96 < jiki.y
+       && p.y + 128 > jiki.y)
+	{
+	    p.vy = 2;
+	    p.vx = ((jiki.x > p.x) ? 4 : -4);
+	    p.state = chara_state0;
+	}
+    else p.state = chara_state6;
+    //PutSprite(count, p.x, p.y, p.charano);                                                                           
+    return p;
+}
+
+chara_state7 = function character_state7(p)
+{
+    p.x += p.vx;
+    p.y += p.vy;
+    if((p.dt1 == 60) || (p.dt1 == 90)
+       || (p.dt1 == 30))
+	{
+	    Puttama(1, p.x, p.y);
+	}
+    p.dt1++;
+    p.state = chara_state7;
+    return p;
+}
+
+// stage1 boss patern
 chara_state8 = function character_state8( p )
 {
-    if(p.y > 0)
+    if(p.y < 520*d_y)
 	{
 	    p.y -= p.vy;
 	    /*
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/Player.js
--- a/webGL/dandy/resources/Player.js	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/Player.js	Thu Jul 15 07:08:37 2010 +0900
@@ -1,3 +1,14 @@
+lg = new Object();
+lg.stg = 0;//レーザーゲージ
+pg = new Object();
+pg.stg = 0;
+infg = new Object();
+infg.stg = 0;
+infg_level = 0;
+p_extend = 0;
+fastebos = 0;
+se_key = [-1,-1,-1,-1,-1,-1];
+
 rswait = 0;
 
 function Pad()
@@ -7,6 +18,7 @@
     this.right=0;
     this.left=0;
     this.count=0;
+    this.ccount=0;
     this.state=0;
     this.k0=0;
     this.k1=0;
@@ -33,6 +45,7 @@
     this.x = 100;
     this.y = 100;
     this.z = 10;
+    this.ch = 0;
     this.dx = 0;
     this.dy = 0;
     this.scale = 1.0;
@@ -40,6 +53,7 @@
     this.bf = true;
     this.zanki = 3;
     this.point = 0;
+    this.count = 0;
     this.ccount = 0;
     this.idle = object["player_idle"];
     this.rightmove = object["player_rightmove"];
@@ -55,6 +69,8 @@
 
 function drawPlayer(ctx, jiki)
 {
+
+
     // setup VBOs
     ctx.enableVertexAttribArray(0);
     ctx.enableVertexAttribArray(1);
@@ -150,6 +166,9 @@
     if(jiki.muteki > 0) jiki.muteki--;
 
 
+    
+
+
     //玉レベル1登録
     if ((pad.k4 % 3 == 1) && (pad.k3 % 3 == 0)){
  	pad.k4 = 1;
@@ -159,31 +178,59 @@
 	tama_lv1_end++;
 
 	//	if(tama_lv1_end > 19) tama_lv1_end = 0;
-	var i = tama_lv1_end;
+	i = tama_lv1_end;
 	//     	if(tama_lv1_end > 50) alert(tama_lv1_end);
 
-	var tama = new Tama1();
+	tama = new tama1();
 	tama.x = jiki.x;
 	tama.y = jiki.y;
 	tama.r = 1;
 	tama.l = 1;
+	tama.scale = 0.5; //玉がでかいので調整
 	tama_lv1[i] = tama;
     }
 
+    /*玉レベル2登録--------------------------------------*/
+    if((pad.k3 % 3 == 1) && (pad.k4 == 0) && (pg.stg > 64)) {
+	    //	    PlaySdlMixer(0, SHOT_B);
+	    
+	    //	    se_key[1] = SsUtKeyOn(vab[SHOT_B], 0, 0, 65, 0, 80, 80);
+	    
+	    pad.k3 = 1;
+	    tama_lv2_end++;
+	    i = tama_lv2_end;
+	    
+	    tama = new tama2();
+	    tama.x = jiki.x;
+	    tama.y = jiki.y;
+	    tama.rr = 1;
+	    tama.sr = 1;
+	    tama.sl = 1;
+	    tama.ll = 1;
+	    tama.scale = 1.0;//少し画像がでかいので調整
+	    
+	    tama_lv2[i] = tama;
+	    
+	    pg.stg -= 64;
+	}
+
+    /*押してないときの玉ゲージ回復-------------------*/
+    if ((pad.k3 == 0) && (pad.k4 == 0))
+	if(pg.stg <= MAXP)
+	    pg.stg += 4;
+
     //玉レベル1表示
     for (i = 0; i < tama_lv1_end + 1; i++) 
 	{
 	    tama_lv1[i].y -= 10;
-
-		
 	    if (tama_lv1[i].r == 1) {
 		tama_lv1[i].x -= 5;//右に5ずらす
-		PutSpriteBullet(ctx, tama_lv1[i], bullets[1]);
+		PutSpriteBullet(ctx, tama_lv1[i], bullets[2]);
 		tama_lv1[i].x += 5;//ずらした分戻す
 	    }
 	    if (tama_lv1[i].l == 1) {
 		tama_lv1[i].x += 5;//左に5ずらす
-		PutSpriteBullet(ctx, tama_lv1[i], bullets[1]);
+		PutSpriteBullet(ctx, tama_lv1[i], bullets[2]);
 		tama_lv1[i].x -= 5;//ずらし分を戻す
 	    }
 	    if (tama_lv1[i].y < ortho.top) {
@@ -200,10 +247,149 @@
 	    }
 
 	}
+    
+    /*玉レベル2表示--------------------------*/
+    for(i = 0; i < tama_lv2_end + 1; i++) {
+	tama_lv2[i].y -= 10;
+	if(tama_lv2[i].rr == 1) {
+	    count++;
+	    tama_lv2[i].x += 10;
+	    PutSpriteBullet(ctx, tama_lv2[i], bullets[4]);
+	    tama_lv2[i].x -= 10;
+	}
+	if(tama_lv2[i].sr == 1) {
+	    count++;
+	    tama_lv2[i].x += 5;
+	    PutSpriteBullet(ctx, tama_lv2[i], bullets[4]);
+	    tama_lv2[i].x -= 5;
+	}
+	if(tama_lv2[i].sl == 1) {
+	    count++;
+	    tama_lv2[i].x -= 5;
+	    PutSpriteBullet(ctx, tama_lv2[i], bullets[4]);
+	    tama_lv2[i].x += 5;
+	}
+	if(tama_lv2[i].ll == 1) {
+	    count++;
+	    tama_lv2[i].x -= 10;
+	    PutSpriteBullet(ctx, tama_lv2[i], bullets[4]);
+	    tama_lv2[i].x += 10;
+	}
+	if(tama_lv2[i].y < 0) {
+	    if(tama_lv2_end == i) {
+		tama_lv2_end--;
+		break;
+	    }
+	    if(tama_lv2_end > i) {
+		tama_lv2[i] = tama_lv2[tama_lv2_end];
+		tama_lv2_end--;
+		i--;
+	    }
+	}
+    }
+
+
+    /* 照準コントロール--------------------- */
+    if(pad.r1 == 1) {
+	pad.r1 = 1;
+	jiki.point += 10;
+    }
+    if(pad.l1 == 1) {
+	pad.l1 = 1;
+	jiki.point -= 10;
+    }
+    jiki.point %= 360;
+    //    var siny = 50 * Mysin(jiki.point - 90) / SANKAKU;
+    //    var cosx = 30 + 50 * Mycos(jiki.point - 90) / SANKAKU;
+    var siny = -100 + 50 * Mysin(jiki.point - 90) / SANKAKU;
+    var cosx = -80 + 50 * Mycos(jiki.point - 90) / SANKAKU;
+    count++;
+    PutSpriteLock(ctx, jiki.x + (cosx * d_x), jiki.y + (siny * d_y), 1.5, jiki.point, bullets[1]);
+
+    /* 押してないときレーザーゲージ回復--------------------  */
+    if((pad.k1 == 0) && (pad.k0 == 0))
+	if (lg.stg <= MAXP)
+	    lg.stg += 4;
+    
+    /* レーザーレベル1登録---------------------------------- */
+    if((pad.k1 %3 == 1) && (pad.k0 == 0) && (lg.stg > 16)) {
+	//	PlaySdlMixer(0, RING)
+	pad.k1 = 1;
+	laser_lv1_end++;
+	var i = laser_lv1_end;
+
+	var tama = new laser();
+	tama.sx = ( 32 * Mysin(jiki.point) / SANKAKU ) * d_x;
+	tama.sy = (32 * Mycos(jiki.point) / SANKAKU) * d_y;
+	tama.x = jiki.x + 128*d_x;
+	tama.y = jiki.y + 128*d_y;
+	tama.r = 1000;
+	tama.s = 0.08;
+	tama.scale = 0.5;
+	lg.stg -= 16;
+	
+	laser_lv1[i] = tama;
+
+    }
+    /*laser_lv1表示----------------------------------*/
+    for(i = 0; i < laser_lv1_end + 1; i++) {
+	if(laser_lv1[i].r != -1) {
+	    laser_lv1[i].y -= laser_lv1[i].sy;
+	    laser_lv1[i].x += laser_lv1[i].sx;
+	    laser_lv1[i].r += 100;
+	    laser_lv1[i].s += 0.05;
+	    count++;
+	    //	    DefSpriteEx(16, 16, 16);
+	    //            PutSpriteEx(16, laser_lv1[i].x, laser_lv1[i].y, laser_lv1[i].s, laser_lv1[i].s, 1);
+	    PutSpriteBullet(ctx, laser_lv1[i], bullets[5]);
+	}
+	//	if(waku(laser_lv1[i].x, laser_lv1[i].y)) {
+	if( (laser_lv1[i].y < ortho.top ) || (laser_lv1[i].y > ortho.bottom)
+	    || (laser_lv1[i].x < ortho.left) || (laser_lv1[i].x > ortho.right)) {
+	    if(laser_lv1_end == i) {
+		laser_lv1_end--;
+		break;
+	    }
+	    if(laser_lv1_end > i) {
+		laser_lv1[i] = laser_lv1[laser_lv1_end];
+		laser_lv1_end--;
+		i--;
+	    }
+	}
+    }
+
+    /*レーザーレベル２登録--------------------------*/
+    if((pad.k1 == 0) && (pad.k0 != 0) && (lg.stg > 200)) {
+	    //	    PlaySdlMixer(0. NEW);
+	    if(laser_lv2[0].r == 0) {
+		laser_lv2[0].r = 1;
+		lg.stg -= 100;
+	    } else {
+		laser_lv2[0].r %= 45;
+		laser_lv2[0].r++;
+		lg.stg -= 10;
+	    }
+	} else {
+	    laser_lv2[0].r = 0;
+    }
+
+    /*レーザーレベル２表示 -----------------------*/
+    if(laser_lv2[0].r != 0) {
+	laser_lv2[0].x = jiki.x + jiki.w + jiki.w*2 * Mysin(jiki.point) / SANKAKU;
+	laser_lv2[0].y = jiki.y + jiki.w - jiki.w*2 * Mycos(jiki.point) / SANKAKU;
+	laser_lv2[0].scale = 2.0;
+	count++;
+	PutSpriteBullet(ctx, laser_lv2[0], bullets[0]);
+    }
+
 
 }
 
 
+
+
+
+
 function PutSpriteBullet( ctx, tama, glObj)
 {
 
@@ -224,7 +410,7 @@
 
     // generate the model-view matrix
     var mvMatrix = new CanvasMatrix4();
-    mvMatrix.scale(1, 1, 1);
+    mvMatrix.scale(tama.scale, tama.scale, tama.scale);
     mvMatrix.translate(tama.x,tama.y,10);
     
     // construct the normal matrix from the model-view matrix
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/Player.js~
--- a/webGL/dandy/resources/Player.js~	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/Player.js~	Thu Jul 15 07:08:37 2010 +0900
@@ -24,6 +24,7 @@
 
     //勝手につけた
     this.quit=0;
+    this.start=0;
     return this;
 }
 
@@ -54,6 +55,8 @@
 
 function drawPlayer(ctx, jiki)
 {
+
+
     // setup VBOs
     ctx.enableVertexAttribArray(0);
     ctx.enableVertexAttribArray(1);
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/bom.js
--- a/webGL/dandy/resources/bom.js	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/bom.js	Thu Jul 15 07:08:37 2010 +0900
@@ -50,6 +50,7 @@
 		PutSpriteEx(gl, bchar[i], bomImage[bchar[i].no]);
 		bchar[i].no++;
 	    }
+	    /* bchar[] の中身は Character.js の celete_obj() で消す
 	    if(bchar[i].no == 8){
 		if(bomend == i-1 ){
 		    bomend--;
@@ -61,6 +62,7 @@
 		    i--;
 		}
 	    }
+	    */
 	}
 }
 
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/bom.js~
--- a/webGL/dandy/resources/bom.js~	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/bom.js~	Thu Jul 15 07:08:37 2010 +0900
@@ -1,16 +1,107 @@
 bomend = 0;
 bchar = [];
+function bcharClass()
+{
+    this.x = 0;
+    this.y = 0;
+    this.no = 0;
+    this.scale = 2.0;
+    this.flag = 0;
+    this.image = new Object();
+    this.texture = new Object();
+    return this;
+}
+
+function Bom(x, y)
+{
+    var i;
+    if ( bomend > 49) {
+	bomend = 49;
+	return ;
+    }
+    i = bomend;
+    bchar[i] = new bcharClass();
+    bchar[i].x = x;
+    bchar[i].y = y;
+    bchar[i].scale = 2.0;
+    bchar[i].no = 0;
+    bchar[i].flag = 0;
+    bomend++;
+    return ;
+}
+
+function loadBomImage(charano, p)
+{
+    p.image = bomImage[charano];
+    p.texture = bomImage[charano].texture;
+    p.w = bomImage[charano].w;
+    p.h = bomImage[charano].h;
+}
 
 
-function bom()
+function PutBom(gl)
+{
+    for(var i=0; i < bomend ; i++)
+	{
+	    if(bchar[i].no != 8) {
+		count++;
+		//		DefSpriteEx(30 + bchar[i].no, 8, 8);
+		//		PutSpriteEx(30 + bchar[i].no, bchar[i].x+96, bchar[i].y+96, 2, 2, 1);
+		PutSpriteEx(gl, bchar[i], bomImage[bchar[i].no]);
+		bchar[i].no++;
+	    }
+	    if(bchar[i].no == 8){
+		if(bomend == i-1 ){
+		    bomend--;
+		    break;
+		}
+		if(bomend > i) {
+		    bchar[i] = bchar[bomend];
+		    bomend--;
+		    i--;
+		}
+	    }
+	}
+}
+
+//function PutSpriteEx(number, x, y, scalex, scaley, angle)
+function PutSpriteEx( ctx, glObj, image)
 {
 
+    // setup VBOs
+    ctx.enableVertexAttribArray(0);
+    ctx.enableVertexAttribArray(1);
+    ctx.enableVertexAttribArray(2);
+				
+    ctx.bindBuffer(ctx.ARRAY_BUFFER, image.vertexObject);
+    ctx.vertexAttribPointer(2, 3, ctx.FLOAT, false, 0, 0);
+    ctx.bindBuffer(ctx.ARRAY_BUFFER, image.normalObject);
+    ctx.vertexAttribPointer(0, 3, ctx.FLOAT, false, 0, 0);
+    
+    ctx.bindBuffer(ctx.ARRAY_BUFFER, image.texCoordObject);
+    ctx.vertexAttribPointer(1, 2, ctx.FLOAT, false, 0, 0);
+
+    ctx.bindBuffer(ctx.ELEMENT_ARRAY_BUFFER, image.indexObject);
+
+    // generate the model-view matrix
+    var mvMatrix = new CanvasMatrix4();
+    mvMatrix.scale(glObj.scale, glObj.scale, glObj.scale);
+    mvMatrix.translate(glObj.x,glObj.y,10);
+
+    // construct the normal matrix from the model-view matrix
+    var normalMatrix = new CanvasMatrix4(mvMatrix);
+    normalMatrix.invert();
+    normalMatrix.transpose();
+    ctx.uniformMatrix4fv(ctx.getUniformLocation(ctx.program, "u_normalMatrix"), false, normalMatrix.getAsWebGLFloatArray());
+    
+    // construct the model-view * projection matrix
+    var mvpMatrix = new CanvasMatrix4(mvMatrix);
+    mvpMatrix.multRight(ctx.perspectiveMatrix);
+    ctx.uniformMatrix4fv(ctx.getUniformLocation(ctx.program, "u_modelViewProjMatrix"), false, mvpMatrix.getAsWebGLFloatArray());
+    
+
+    ctx.bindTexture(ctx.TEXTURE_2D, image.texture);
+    ctx.drawElements(ctx.TRIANGLES, image.numIndices, ctx.UNSIGNED_SHORT, 0);
+
 
 }
-
-function Putbom()
-{
-
-
-
-}
\ No newline at end of file
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/bullet.js
--- a/webGL/dandy/resources/bullet.js	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/bullet.js	Thu Jul 15 07:08:37 2010 +0900
@@ -1,23 +1,35 @@
 tama_lv1 = [];
+tama_lv2 = [];
+
+laser_lv1 = [];
+laser_lv2 = [];
+laser_lv2.push(new laser());
+laser_lv3 = [];
+
+tlv3 = [];
+
+laser_lv1_end = -1;
 tama_lv1_end = -1;
-k4count = 0;
-tama_lv2 = [];
 tama_lv2_end = -1;
 
-function Tama()
+k4count = 0;
+
+function tama()
 {
     this.x=0;
     this.y=0;
+    this.scale = 1.0;
     return this;
 }
 
 
-function Tama1()
+function tama1()
 {
     this.x=0;
     this.y=0;
     this.r=0;
     this.l=0;
+    this.scale = 1.0;
     return this;
 }
 
@@ -31,5 +43,19 @@
     this.sr=0;
     this.sl=0;
     this.ll=0;
+    this.scale = 1.0;
     return this;
 }
+
+function laser()
+{
+    this.x = 0;
+    this.y = 0;
+    this.sx = 0;
+    this.sy = 0;
+    this.r = 0;
+    this.enemyno = 0;
+    this.s = 0;
+    this.scale = 1.0;
+    return this;
+}
\ No newline at end of file
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/bullet.js~
--- a/webGL/dandy/resources/bullet.js~	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/bullet.js~	Thu Jul 15 07:08:37 2010 +0900
@@ -4,28 +4,6 @@
 tama_lv2 = [];
 tama_lv2_end = -1;
 
-function loadBulletXml(gl,url)
-{
-    if(gl.bullet == undefined)gl.bullet = new Object();
-    var xmlChara = new Object();
-    xmlChara = parsePanel(url);
-    for (var name in xmlChara) 
-	{
-	    gl.bullet[name] = makeXmlObj(gl, xmlChara[name]);
-	    gl.bullet[name].texture = loadImageTexture(gl, xmlChara[name].image);
-	}
-}
-
-function parseBullet(gl)
-{
-    var bullets = [];
-    for(var name in gl.bullet)
-	{
-	    bullets.push(gl.bullet[name]);
-	}
-    return bullets;
-}
-
 function Tama()
 {
     this.x=0;
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/collision.js
--- a/webGL/dandy/resources/collision.js	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/collision.js	Thu Jul 15 07:08:37 2010 +0900
@@ -13,6 +13,9 @@
 
 atari = function collision(p)
 {
+    var i1=0; 
+    var i2=0;
+    var n = 0;
     var ex = p.x;
     var ey = p.y;
     var charano = p.charano;
@@ -42,17 +45,18 @@
 	    return p;
 	}
 
+    /*玉レベル１の当たり判定-------------------------*/
     //    for (var i1 = 0; tama_lv1[i1]; i1++) {	
-    for (var i1 = 0; i1 < tama_lv1_end + 1; i1++) {
+    for ( i1 = 0; i1 < tama_lv1_end + 1; i1++) {
         if ((tama_lv1[i1].x + w/2 > ex )
 	    && ( ex + w > tama_lv1[i1].x + bullets[1].w)
 	    && (tama_lv1[i1].y + jiki.w > ey) && (tama_lv1[i1].y < ey + h)
 	    && (tama_lv1[i1].r != -1)) {
 	    tama_lv1[i1].r = -1;
 	    p.vit -= TAMALV1P;
-	    //	    infg.stg += 4;
+	    infg.stg += 4;
 	    if (p.vit <= 0) {
-		//		infg.stg += 4;
+		infg.stg += 4;
 		Bom(p.x, p.y);
 		//		enemycount += (p.score * ((infg.stg / 128) + infg_level + 1));
 		p.state = delete_chara;
@@ -67,9 +71,9 @@
 	    tama_lv1[i1].l = -1;
 	    p.vit -= TAMALV1P;
 
-	    //	    infg.stg++;
+	    infg.stg++;
 	    if (p.vit <= 0) {
-		//		infg.stg += 4;
+		infg.stg += 4;
 		Bom(p.x, p.y);
 		//		enemycount += (p.score * ((infg.stg / 128) + infg_lvel + 1));
 		p.state = delete_chara;
@@ -77,11 +81,117 @@
 		p.flag = false;
 		return p;
 	    }
-	    //	    p.flag = false;
-	    //	    return p;
 	}
     }
 
+    /*玉レベル２--------------------------------*/
+    for(i1 = 0; i1 < tama_lv2_end + 1; i1++) {
+	if((tama_lv2[i1].x + 10 + bullets[4].w/2 > ex - w/2 )
+	   && (ex + w/2 > tama_lv2[i1].x + 10 - bullets[4].w/2)
+	   && (tama_lv2[i1].y + bullets[4].h/2 > ey - h/2 )
+	   && (tama_lv2[i1].y - bullets[4].h/2 < ey + h/2) 
+	   && (tama_lv2[i1].rr != -1)) {
+	   tama_lv2[i1].rr = -1;
+	   p.vit -= TAMALV2P;
+	   infg.stg++;
+	   if(p.vit <= 0) {
+	       infg.stg += 4;
+	       Bom(p.x, p.y);
+	       //	       enemycount += (p.score * ((infg.stg / 128) + infg_level + 1));
+	       p.state = delete_chara;
+	       p.collision = noaction;
+	       p.f = false;
+	       return p;
+	   }
+	}
+
+	if((tama_lv2[i1].x + 5 + bullets[4].w/2 > ex - w/2 )
+	   && (ex + w/2 > tama_lv2[i1].x + 5 - bullets[4].w/2)
+	   && (tama_lv2[i1].y + bullets[4].h/2 > ey - h/2 )
+	   && (tama_lv2[i1].y - bullets[4].h/2 < ey + h/2) 
+	   && (tama_lv2[i1].sr != -1)) {
+	   tama_lv2[i1].sr = -1;
+	   p.vit -= TAMALV2P;
+	   infg.stg++;
+	   if(p.vit <= 0) {
+	       infg.stg += 4;
+	       Bom(p.x, p.y);
+	       //	       enemycount += (p.score * ((infg.stg / 128) + infg_level + 1));
+	       p.state = delete_chara;
+	       p.collision = noaction;
+	       p.f = false;
+	       return p;
+	   }
+	}
+	if((tama_lv2[i1].x - 10 + bullets[4].w/2 > ex - w/2 )
+	   && (ex + w/2 > tama_lv2[i1].x - 10 - bullets[4].w/2)
+	   && (tama_lv2[i1].y + bullets[4].h/2 > ey - h/2 )
+	   && (tama_lv2[i1].y - bullets[4].h/2 < ey + h/2) 
+	   && (tama_lv2[i1].ll != -1)) {
+	   tama_lv2[i1].ll = -1;
+	   p.vit -= TAMALV2P;
+	   infg.stg++;
+	   if(p.vit <= 0) {
+	       infg.stg += 4;
+	       Bom(p.x, p.y);
+	       //	       enemycount += (p.score * ((infg.stg / 128) + infg_level + 1));
+	       p.state = delete_chara;
+	       p.collision = noaction;
+	       p.f = false;
+	       return p;
+	   }
+	}
+
+	if((tama_lv2[i1].x - 5 + bullets[4].w/2 > ex - w/2 )
+	   && (ex + w/2 > tama_lv2[i1].x - 5 - bullets[4].w/2)
+	   && (tama_lv2[i1].y + bullets[4].h/2 > ey - h/2 )
+	   && (tama_lv2[i1].y - bullets[4].h/2 < ey + h/2) 
+	   && (tama_lv2[i1].sl != -1)) {
+	   tama_lv2[i1].sl = -1;
+	   p.vit -= TAMALV2P;
+	   infg.stg++;
+	   if(p.vit <= 0) {
+	       infg.stg += 4;
+	       Bom(p.x, p.y);
+	       //	       enemycount += (p.score * ((infg.stg / 128) + infg_level + 1));
+	       p.state = delete_chara;
+	       p.collision = noaction;
+	       p.f = false;
+	       return p;
+	   }
+	}
+    }
+
+
+
+
+    /*レーザーレベル１------------------------*/
+    for(i1 = 0; i1 < laser_lv1_end + 1; i1++) {
+	n = laser_lv1[i1].r * 128 / 4096;
+	//	var nx = laser_lv1[i1].w + laser_lv1[i1].scale;
+	//	var ny = laser_lv1[i1].h + laser_lv1[i1].scale;
+
+	if ((laser_lv1[i1].x + n*d_x > ex) && (ex + w > laser_lv1[i1].x)
+	    && (laser_lv1[i1].y + n*d_y > ey) && (laser_lv1[i1].y < ey + h)
+	    && (laser_lv1[i1].r != -1)) {
+	    laser_lv1[i1].r = -1;
+	    laser_lv1[i1].y = -1;
+	    p.vit -= LASERLV1P;	    
+	    infg.stg++;
+	    if(p.vit <= 0) {
+		infg.stg += 4;
+		Bom(p.x, p.y);
+		//		enemycount += (p.score * ((infg.stg / 128) + infg_level + 1));
+		p.state = delete_chara;
+		p.collision = noaction;
+		p.f = false;
+		return 1;
+	    }
+
+	}
+    }
+
+
 }
 
 
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/collision.js~
--- a/webGL/dandy/resources/collision.js~	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/collision.js~	Thu Jul 15 07:08:37 2010 +0900
@@ -21,12 +21,16 @@
 
     //自機やられ
     if ((ex < jiki.x + jiki.w /2 ) && (ex + w > jiki.x + jiki.w /2) 
-	&& ( ey < jiki.y + jiki.h / 2) && (ey + h > jiki.y + jiki.h / 2))
+	&& ( ey < jiki.y + jiki.h / 2) && (ey + h > jiki.y + jiki.h / 2)
+	&& (jiki.muteki <= 0))
 	{
-
+	    Bom(jiki.x,jiki.y);
+	    
 	    jiki.bf = false;
+	    
 	    jiki.zanki--;
 	    jiki.muteki = 120;
+	    //	    jiki.muteki = 0;
 
 	    /*
 	    infg.stg = 0;
@@ -49,7 +53,7 @@
 	    //	    infg.stg += 4;
 	    if (p.vit <= 0) {
 		//		infg.stg += 4;
-		//		Bom(p.x, p.y);
+		Bom(p.x, p.y);
 		//		enemycount += (p.score * ((infg.stg / 128) + infg_level + 1));
 		p.state = delete_chara;
 		p.collision= noaction;
@@ -66,7 +70,7 @@
 	    //	    infg.stg++;
 	    if (p.vit <= 0) {
 		//		infg.stg += 4;
-		//		Bom(p.x, p.y);
+		Bom(p.x, p.y);
 		//		enemycount += (p.score * ((infg.stg / 128) + infg_lvel + 1));
 		p.state = delete_chara;
 		p.collision = noaction;
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/constKey.js
--- a/webGL/dandy/resources/constKey.js	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/constKey.js	Thu Jul 15 07:08:37 2010 +0900
@@ -7,16 +7,20 @@
 const KEY_D = 68;
 const KEY_A = 65;
 const KEY_W = 87;
-const KEY_S = 83;
+const KEY_E = 69;
+const KEY_Q = 81;
 const KEY_Z = 90;
 const KEY_X = 88;
-const KEY_Z = 90;
 const KEY_R = 82;
 const KEY_E = 69;
 const KEY_W = 87;
 const KEY_S = 83;
 const ENTER = 13;
 
+
+
+const MAXP = 4090;
+
 //弾の威力
 const TAMALV1P = 14;
 const TAMALV2P = 50;
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/constKey.js~
--- a/webGL/dandy/resources/constKey.js~	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/constKey.js~	Thu Jul 15 07:08:37 2010 +0900
@@ -15,6 +15,7 @@
 const KEY_E = 69;
 const KEY_W = 87;
 const KEY_S = 83;
+const ENTER = 13;
 
 //弾の威力
 const TAMALV1P = 14;
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/enemy.js
--- a/webGL/dandy/resources/enemy.js	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/enemy.js	Thu Jul 15 07:08:37 2010 +0900
@@ -10,7 +10,7 @@
     var p = new Character();
 
     p.collision = atari;
-    p.x = x * d_x; //旧 dandy 座標を合わせるため
+    p.x = x * d_x; //旧 dandy に座標を合わせるため
     p.y = y * d_y; //上に同じく
     p.vx = vx * d_x;
     p.vy = vy * d_y;
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/enemy.js~
--- a/webGL/dandy/resources/enemy.js~	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/enemy.js~	Thu Jul 15 07:08:37 2010 +0900
@@ -1,14 +1,21 @@
+//旧 dandy の画面との調整
+//(1920,1080) を (200,140) として扱うため 
+d_x = 0.104;//200 / 1920
+d_y = 0.129;//140 / 1080
+tf = false;
+
+
 function Putenemy(charano, x, y, vx, vy, chara_state)
 {
     var p = new Character();
 
     p.collision = atari;
-    p.x = x;
-    p.y = y;
-    p.vx = vx;
-    p.vy = vy;
+    p.x = x * d_x; //旧 dandy 座標を合わせるため
+    p.y = y * d_y; //上に同じく
+    p.vx = vx * d_x;
+    p.vy = vy * d_y;
     p.charano = charano;
-    //    p.tama = tf;
+    p.tama = tf;
     //    p.vit = enemystate[charano].p;
     p.vit = 240;
     //    p.score = enemystate[charano].sc;
@@ -32,4 +39,3 @@
 }
 
 
-
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/keybord.js
--- a/webGL/dandy/resources/keybord.js	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/keybord.js	Thu Jul 15 07:08:37 2010 +0900
@@ -2,17 +2,18 @@
 {
     var code = event.keyCode;
     if(code == KEY_D) {}
-    if(code == KEY_A) {}
-    if(code == KEY_W) {}
-    if(code == KEY_S) {}
-    if(code == KEY_Z) {}
-    if(code == KEY_X) pad.k4=1;
-    if(code == KEY_S) pad.k3=1;
-    if(code == LEFT_ARROW) {pad.left+=0.5;pad.count++}
-    if(code == RIGHT_ARROW) {pad.right+=0.5;pad.count++}
-    if(code == UP_ARROW) {pad.up+=1;}
-    if(code == DOWN_ARROW) {pad.down+=1;}
-    if(code == KEY_D) {alert("x:"+jiki.x+" y:"+jiki.y);}
+    if(code == KEY_E) { pad.r1 = 1; }
+    if(code == KEY_R) { pad.r2 = 1; }
+    if(code == KEY_A) { pad.k0 = 1; }
+    if(code == KEY_Z) { pad.k1 = 1; }
+    if(code == KEY_S) { pad.k3 = 1; }
+    if(code == KEY_X) { pad.k4 = 1; }
+    if(code == KEY_W) { pad.l1 = 1; }
+    if(code == KEY_Q) { pad.l2 = 1; }
+    if(code == LEFT_ARROW) {　pad.left += 0.5;　pad.count++;　}
+    if(code == RIGHT_ARROW) { pad.right += 0.5; pad.count++; }
+    if(code == UP_ARROW) { pad.up += 1; }
+    if(code == DOWN_ARROW) { pad.down += 1; }
     if(code == ENTER) pad.start = 1;
 }
 function keybordPress()
@@ -23,10 +24,14 @@
 {
     var code = event.keyCode;
     if(code == KEY_D) {}
-    if(code == KEY_A) {}
-    if(code == KEY_W) {}
-    if(code == KEY_S) {}
-    if(code == KEY_X) {pad.k4=0;}
+    if(code == KEY_A) { pad.k0 = 0; }
+    if(code == KEY_W) { pad.l1 = 0; }
+    if(code == KEY_R) { pad.r2 = 0; }
+    if(code == KEY_E) { pad.r1 = 0; }
+    if(code == KEY_S) { pad.k3 = 0; }
+    if(code == KEY_Z) { pad.k1 = 0; }
+    if(code == KEY_X) { pad.k4 = 0; }
+    if(code == KEY_Q) { pad.l2 = 0; }
     if(code == LEFT_ARROW) pad.left = 0;
     if(code == RIGHT_ARROW) pad.right = 0;
     if(code == UP_ARROW) pad.up = 0;
@@ -34,5 +39,4 @@
 
     pad.state=0;
     pad.count=0;
-
 }
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/keybord.js~
--- a/webGL/dandy/resources/keybord.js~	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/keybord.js~	Thu Jul 15 07:08:37 2010 +0900
@@ -13,6 +13,7 @@
     if(code == UP_ARROW) {pad.up+=1;}
     if(code == DOWN_ARROW) {pad.down+=1;}
     if(code == KEY_D) {alert("x:"+jiki.x+" y:"+jiki.y);}
+    if(code == ENTER) pad.start = 1;
 }
 function keybordPress()
 {
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/makePanel.js~
--- a/webGL/dandy/resources/makePanel.js~	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/makePanel.js~	Thu Jul 15 07:08:37 2010 +0900
@@ -57,12 +57,12 @@
 			indexData.push(index);
 			index++;
 		}
-		//オブジェクトの横幅、縦幅を得るための動作
+		//オブジェクトの最大・最小のx,y座標を求める
 		if ( i == 0) {
 		    xmax = geometryData[0];
 		    xmin = geometryData[0];
 		    ymax = geometryData[1];
-		    xmin = geometryData[1];
+		    ymin = geometryData[1];
 		}
 		if ( i > 0 ){
 		    xmax = Math.max( xmax, geometryData[i]);
@@ -82,8 +82,9 @@
     }
 
     var retval = { };
+    //オブジェクトの横幅,縦幅を求める
     retval.w = xmax - xmin;
-    retval.h = ymin - ymin;
+    retval.h = ymax - ymin;
 
     retval.normalObject = ctx.createBuffer();
     ctx.bindBuffer(ctx.ARRAY_BUFFER, retval.normalObject);
diff -r 680b5b0cd1e4 -r 61febc94fa62 webGL/dandy/resources/parse.js
--- a/webGL/dandy/resources/parse.js	Mon Jul 12 08:01:12 2010 +0900
+++ b/webGL/dandy/resources/parse.js	Thu Jul 15 07:08:37 2010 +0900
@@ -2,7 +2,12 @@
 {
 
     loadCharaXml(gl, "./xml/character.xml");//gl.charaにxmlファイルの中身を入れる
+    loadCharaXml(gl, "./xml2/enemy.xml");//gl.charaにxmlファイルの中身を入れる
+
     loadEffectXml(gl, "./xml/effect.xml");//gl.effectにxmlファイルの中身をいれる
+    loadEffectXml(gl, "./xml2/bullets.xml");//gl.effectにxmlファイルの中身をいれる
+
+
     loadBossXml(gl, "./xml/boss.xml");//gl.bossにxmlファイルの中身を入れる
 
     loadCharaXml(gl, "./xml/titlefont.xml");//gl.effectにxmlファイルの中身をいれる
@@ -11,8 +16,20 @@
     loadCharaXml(gl, "./xml/font_0.xml");//gl.effectにxmlファイルの中身をいれる
     loadCharaXml(gl, "./xml/font_1.xml");//gl.effectにxmlファイルの中身をいれる
     loadCharaXml(gl, "./xml/font_2.xml");//gl.effectにxmlファイルの中身をいれる
+    loadCharaXml(gl, "./xml/font_3.xml");//gl.effectにxmlファイルの中身をいれる