# HG changeset patch
# User NOBUYASU Oshiro
# Date 1288914026 -32400
# Node ID e8c591a01a8e02c921c57d58f6ea468646935564
# Parent 7c1ff1927da36670f8533402014dc8cedff0188c
update makePanel
diff -r 7c1ff1927da3 -r e8c591a01a8e keyConfig.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/keyConfig.txt Fri Nov 05 08:40:26 2010 +0900
@@ -0,0 +1,34 @@
+・Axis 1
+Low Left
+High Right
+・Axis 2
+Low Up
+High Down
+・Button1 ~ Button4
+UP
+Right
+Down
+Left
+・Button 5 ~ Button 8
+UP
+Right
+Down
+Left
+・Button 9
+Right
+・Button 10
+Up
+・Button 11
+W
+・Button12
+E
+・Button13
+A
+・Button14
+S
+・Button15
+X
+・Button16
+Z
+・Button17
+Return
\ No newline at end of file
diff -r 7c1ff1927da3 -r e8c591a01a8e webGL/dandy/dandy5.html
--- a/webGL/dandy/dandy5.html Tue Oct 26 08:41:45 2010 +0900
+++ b/webGL/dandy/dandy5.html Fri Nov 05 08:40:26 2010 +0900
@@ -7,7 +7,7 @@
-
+
diff -r 7c1ff1927da3 -r e8c591a01a8e webGL/dandy/dandy5.html~
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/webGL/dandy/dandy5.html~ Fri Nov 05 08:40:26 2010 +0900
@@ -0,0 +1,205 @@
+
+
+
+
+ WebGL dandy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
diff -r 7c1ff1927da3 -r e8c591a01a8e webGL/dandy/resources/makePanel.js
--- a/webGL/dandy/resources/makePanel.js Tue Oct 26 08:41:45 2010 +0900
+++ b/webGL/dandy/resources/makePanel.js Fri Nov 05 08:40:26 2010 +0900
@@ -77,9 +77,9 @@
}
for(i=0; xmlObj.normal[i]; i+=3){
- normalData.push(parseFloat(xmlObj.normal[i]) - model.x);
- normalData.push(parseFloat(xmlObj.normal[i+1]) - model.y);
- normalData.push(parseFloat(xmlObj.normal[i+2]) - model.z);
+ normalData.push(parseFloat(xmlObj.normal[i]));
+ normalData.push(parseFloat(xmlObj.normal[i+1]));
+ normalData.push(parseFloat(xmlObj.normal[i+2]));
}
var retval = { };
@@ -89,20 +89,20 @@
retval.normalObject = ctx.createBuffer();
ctx.bindBuffer(ctx.ARRAY_BUFFER, retval.normalObject);
- ctx.bufferData(ctx.ARRAY_BUFFER, new WebGLFloatArray(normalData), ctx.STATIC_DRAW);
+ ctx.bufferData(ctx.ARRAY_BUFFER, new Float32Array(normalData), ctx.STATIC_DRAW);
retval.texCoordObject = ctx.createBuffer();
ctx.bindBuffer(ctx.ARRAY_BUFFER, retval.texCoordObject);
- ctx.bufferData(ctx.ARRAY_BUFFER, new WebGLFloatArray(texCoordData), ctx.STATIC_DRAW);
+ ctx.bufferData(ctx.ARRAY_BUFFER, new Float32Array(texCoordData), ctx.STATIC_DRAW);
retval.vertexObject = ctx.createBuffer();
ctx.bindBuffer(ctx.ARRAY_BUFFER, retval.vertexObject);
- ctx.bufferData(ctx.ARRAY_BUFFER, new WebGLFloatArray(geometryData), ctx.STATIC_DRAW);
+ ctx.bufferData(ctx.ARRAY_BUFFER, new Float32Array(geometryData), ctx.STATIC_DRAW);
retval.numIndices = indexData.length;
retval.indexObject = ctx.createBuffer();
ctx.bindBuffer(ctx.ELEMENT_ARRAY_BUFFER, retval.indexObject);
- ctx.bufferData(ctx.ELEMENT_ARRAY_BUFFER, new WebGLUnsignedShortArray(indexData), ctx.STREAM_DRAW);
+ ctx.bufferData(ctx.ELEMENT_ARRAY_BUFFER, new Uint16Array(indexData), ctx.STREAM_DRAW);
return retval;
}
diff -r 7c1ff1927da3 -r e8c591a01a8e webGL/dandy/resources/makePanel.js~
--- a/webGL/dandy/resources/makePanel.js~ Tue Oct 26 08:41:45 2010 +0900
+++ b/webGL/dandy/resources/makePanel.js~ Fri Nov 05 08:40:26 2010 +0900
@@ -49,6 +49,7 @@
var ymax = 0;
var ymin = 0;
+
for(var i=0; xmlObj.vertex[i]; i+=3){
geometryData.push(parseFloat(xmlObj.vertex[i]) - model.x);
geometryData.push(parseFloat(xmlObj.vertex[i+1]) - model.y);
@@ -88,20 +89,20 @@
retval.normalObject = ctx.createBuffer();
ctx.bindBuffer(ctx.ARRAY_BUFFER, retval.normalObject);
- ctx.bufferData(ctx.ARRAY_BUFFER, new WebGLFloatArray(normalData), ctx.STATIC_DRAW);
+ ctx.bufferData(ctx.ARRAY_BUFFER, new Float32Array(normalData), ctx.STATIC_DRAW);
retval.texCoordObject = ctx.createBuffer();
ctx.bindBuffer(ctx.ARRAY_BUFFER, retval.texCoordObject);
- ctx.bufferData(ctx.ARRAY_BUFFER, new WebGLFloatArray(texCoordData), ctx.STATIC_DRAW);
+ ctx.bufferData(ctx.ARRAY_BUFFER, new Float32Array(texCoordData), ctx.STATIC_DRAW);
retval.vertexObject = ctx.createBuffer();
ctx.bindBuffer(ctx.ARRAY_BUFFER, retval.vertexObject);
- ctx.bufferData(ctx.ARRAY_BUFFER, new WebGLFloatArray(geometryData), ctx.STATIC_DRAW);
+ ctx.bufferData(ctx.ARRAY_BUFFER, new Float32Array(geometryData), ctx.STATIC_DRAW);
retval.numIndices = indexData.length;
retval.indexObject = ctx.createBuffer();
ctx.bindBuffer(ctx.ELEMENT_ARRAY_BUFFER, retval.indexObject);
- ctx.bufferData(ctx.ELEMENT_ARRAY_BUFFER, new WebGLUnsignedShortArray(indexData), ctx.STREAM_DRAW);
+ ctx.bufferData(ctx.ELEMENT_ARRAY_BUFFER, new Uint16Array(indexData), ctx.STREAM_DRAW);
return retval;
}
diff -r 7c1ff1927da3 -r e8c591a01a8e 問題点
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/問題点 Fri Nov 05 08:40:26 2010 +0900
@@ -0,0 +1,6 @@
+敵のテーブルの作成(重要)
+scheduleのなかで rinkx,rinky に値を渡すときにd_x,d_yをわる
+ゲームオーバーの作成
+スコア表示の作成
+各ステージの作成
+敵の位置を修正