# HG changeset patch # User e105711 # Date 1342683033 -32400 # Node ID 3f8305d6210678da6b3a765f3c828432ec9c42ef # Parent 30c23f93cbc0c04fff288a226a0a62452950e44c final commit at Game group. diff -r 30c23f93cbc0 -r 3f8305d62106 webGL/DrumSimulator.html --- a/webGL/DrumSimulator.html Sun Jul 15 01:07:34 2012 +0900 +++ b/webGL/DrumSimulator.html Thu Jul 19 16:30:33 2012 +0900 @@ -109,7 +109,7 @@ } function gameStart(){ - setInterval(loop,10); + setInterval(loop,15); } function init(){ diff -r 30c23f93cbc0 -r 3f8305d62106 webGL/music/1st_thrash.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webGL/music/1st_thrash.json Thu Jul 19 16:30:33 2012 +0900 @@ -0,0 +1,338 @@ +{ + "title":"1st thrash -Easy-", + "filepath":"sound/1st_thrash_4game", + "level":3, + "notes":[ + { "time":10.0 , "lane":8 , "BPM":120 }, + { "time":10.0 , "lane":3 , "BPM":120 }, + { "time":10.25 , "lane":3 , "BPM":120 }, + { "time":10.875 , "lane":3 , "BPM":120 }, + { "time":11.125 , "lane":3 , "BPM":120 }, + { "time":12.0 , "lane":3 , "BPM":120 }, + { "time":12.25 , "lane":3 , "BPM":120 }, + { "time":12.875 , "lane":3 , "BPM":120 }, + { "time":13.125 , "lane":3 , "BPM":120 }, + { "time":14.0 , "lane":3 , "BPM":120 }, + { "time":14.25 , "lane":3 , "BPM":120 }, + { "time":14.875 , "lane":3 , "BPM":120 }, + { "time":15.125 , "lane":3 , "BPM":120 }, + { "time":16.0 , "lane":3 , "BPM":120 }, + { "time":16.25 , "lane":3 , "BPM":120 }, + { "time":16.875 , "lane":3 , "BPM":120 }, + { "time":17.125 , "lane":3 , "BPM":120 }, + { "time":17.75 , "lane":3 , "BPM":120 }, + + { "time":10.5 , "lane":2 , "BPM":120 }, + { "time":11.5 , "lane":2 , "BPM":120 }, + { "time":12.5 , "lane":2 , "BPM":120 }, + { "time":13.5 , "lane":2 , "BPM":120 }, + { "time":14.5 , "lane":2 , "BPM":120 }, + { "time":15.5 , "lane":2 , "BPM":120 }, + { "time":16.5 , "lane":2 , "BPM":120 }, + { "time":17.5 , "lane":2 , "BPM":120 }, + + + { "time":18.0 , "lane":3 , "BPM":120 }, + { "time":18.25 , "lane":3 , "BPM":120 }, + { "time":18.875 , "lane":3 , "BPM":120 }, + { "time":19.125 , "lane":3 , "BPM":120 }, + { "time":20.0 , "lane":3 , "BPM":120 }, + { "time":20.25 , "lane":3 , "BPM":120 }, + { "time":20.875 , "lane":3 , "BPM":120 }, + { "time":21.125 , "lane":3 , "BPM":120 }, + { "time":22.0 , "lane":3 , "BPM":120 }, + { "time":22.25 , "lane":3 , "BPM":120 }, + { "time":22.875 , "lane":3 , "BPM":120 }, + { "time":23.125 , "lane":3 , "BPM":120 }, + { "time":24.0 , "lane":3 , "BPM":120 }, + { "time":24.25 , "lane":3 , "BPM":120 }, + { "time":24.875 , "lane":3 , "BPM":120 }, + { "time":25.125 , "lane":3 , "BPM":120 }, + + { "time":18.5 , "lane":2 , "BPM":120 }, + { "time":19.5 , "lane":2 , "BPM":120 }, + { "time":20.5 , "lane":2 , "BPM":120 }, + { "time":21.5 , "lane":2 , "BPM":120 }, + { "time":22.5 , "lane":2 , "BPM":120 }, + { "time":23.5 , "lane":2 , "BPM":120 }, + { "time":24.5 , "lane":2 , "BPM":120 }, + { "time":25.5 , "lane":2 , "BPM":120 }, + { "time":25.875 , "lane":2 , "BPM":120 }, + + + { "time":26.0 , "lane":8 , "BPM":120 }, + { "time":26.0 , "lane":3 , "BPM":120 }, + { "time":26.25 , "lane":3 , "BPM":120 }, + { "time":26.875 , "lane":3 , "BPM":120 }, + { "time":27.125 , "lane":3 , "BPM":120 }, + { "time":28.0 , "lane":3 , "BPM":120 }, + { "time":28.25 , "lane":3 , "BPM":120 }, + { "time":28.875 , "lane":3 , "BPM":120 }, + { "time":29.125 , "lane":3 , "BPM":120 }, + { "time":30.0 , "lane":3 , "BPM":120 }, + { "time":30.25 , "lane":3 , "BPM":120 }, + { "time":30.875 , "lane":3 , "BPM":120 }, + { "time":31.125 , "lane":3 , "BPM":120 }, + { "time":32.0 , "lane":3 , "BPM":120 }, + { "time":32.25 , "lane":3 , "BPM":120 }, + { "time":32.875 , "lane":3 , "BPM":120 }, + { "time":33.125 , "lane":3 , "BPM":120 }, + { "time":33.75 , "lane":3 , "BPM":120 }, + + { "time":26.5 , "lane":2 , "BPM":120 }, + { "time":27.5 , "lane":2 , "BPM":120 }, + { "time":28.5 , "lane":2 , "BPM":120 }, + { "time":29.5 , "lane":2 , "BPM":120 }, + { "time":30.5 , "lane":2 , "BPM":120 }, + { "time":31.5 , "lane":2 , "BPM":120 }, + { "time":32.5 , "lane":2 , "BPM":120 }, + { "time":33.5 , "lane":2 , "BPM":120 }, + + + { "time":34.0 , "lane":3 , "BPM":120 }, + { "time":34.25 , "lane":3 , "BPM":120 }, + { "time":34.875 , "lane":3 , "BPM":120 }, + { "time":35.125 , "lane":3 , "BPM":120 }, + { "time":36.0 , "lane":3 , "BPM":120 }, + { "time":36.25 , "lane":3 , "BPM":120 }, + { "time":36.875 , "lane":3 , "BPM":120 }, + { "time":37.125 , "lane":3 , "BPM":120 }, + { "time":38.0 , "lane":3 , "BPM":120 }, + { "time":38.25 , "lane":3 , "BPM":120 }, + { "time":38.875 , "lane":3 , "BPM":120 }, + { "time":39.125 , "lane":3 , "BPM":120 }, + { "time":40.0 , "lane":3 , "BPM":120 }, + { "time":40.25 , "lane":3 , "BPM":120 }, + { "time":40.875 , "lane":3 , "BPM":120 }, + { "time":41.125 , "lane":3 , "BPM":120 }, + + { "time":34.5 , "lane":2 , "BPM":120 }, + { "time":35.5 , "lane":2 , "BPM":120 }, + { "time":36.5 , "lane":2 , "BPM":120 }, + { "time":37.5 , "lane":2 , "BPM":120 }, + { "time":38.5 , "lane":2 , "BPM":120 }, + { "time":39.5 , "lane":2 , "BPM":120 }, + { "time":40.5 , "lane":2 , "BPM":120 }, + { "time":41.5 , "lane":2 , "BPM":120 }, + { "time":41.875 , "lane":2 , "BPM":120 }, + + + { "time":42.0 , "lane":8 , "BPM":120 }, + { "time":42.0 , "lane":3 , "BPM":120 }, + { "time":42.0 , "lane":6 , "BPM":120 }, + { "time":43.75 , "lane":3 , "BPM":120 }, + { "time":43.75 , "lane":6 , "BPM":120 }, + { "time":44.0 , "lane":3 , "BPM":120 }, + { "time":44.25 , "lane":3 , "BPM":120 }, + { "time":45.75 , "lane":3 , "BPM":120 }, + { "time":44.0 , "lane":6 , "BPM":120 }, + { "time":44.25 , "lane":6 , "BPM":120 }, + { "time":45.75 , "lane":6 , "BPM":120 }, + { "time":46.0 , "lane":6 , "BPM":120 }, + { "time":47.75 , "lane":6 , "BPM":120 }, + { "time":46.0 , "lane":3 , "BPM":120 }, + { "time":47.75 , "lane":3 , "BPM":120 }, + { "time":48.0 , "lane":3 , "BPM":120 }, + { "time":48.0 , "lane":8 , "BPM":120 }, + { "time":48.25 , "lane":3 , "BPM":120 }, + { "time":48.875 , "lane":3 , "BPM":120 }, + { "time":49.125 , "lane":3 , "BPM":120 }, + { "time":48.5 , "lane":2 , "BPM":120 }, + { "time":49.5 , "lane":2 , "BPM":120 }, + + + { "time":50.0 , "lane":8 , "BPM":120 }, + { "time":50.0 , "lane":3 , "BPM":120 }, + { "time":51.75 , "lane":3 , "BPM":120 }, + { "time":50.0 , "lane":6 , "BPM":120 }, + { "time":51.75 , "lane":6 , "BPM":120 }, + { "time":52.0 , "lane":6 , "BPM":120 }, + { "time":52.25 , "lane":6 , "BPM":120 }, + { "time":53.75 , "lane":6 , "BPM":120 }, + { "time":52.0 , "lane":3 , "BPM":120 }, + { "time":52.25 , "lane":3 , "BPM":120 }, + { "time":53.75 , "lane":3 , "BPM":120 }, + { "time":54.0 , "lane":3 , "BPM":120 }, + { "time":55.75 , "lane":3 , "BPM":120 }, + { "time":54.0 , "lane":6 , "BPM":120 }, + { "time":55.75 , "lane":6 , "BPM":120 }, + { "time":56.0 , "lane":8 , "BPM":120 }, + { "time":56.0 , "lane":3 , "BPM":120 }, + { "time":56.25 , "lane":3 , "BPM":120 }, + { "time":56.875 , "lane":3 , "BPM":120 }, + { "time":57.125 , "lane":3 , "BPM":120 }, + { "time":56.5 , "lane":2 , "BPM":120 }, + { "time":57.5 , "lane":2 , "BPM":120 }, + { "time":57.75 , "lane":2 , "BPM":120 }, + + + { "time":58.0 , "lane":8 , "BPM":120 }, + { "time":58.0 , "lane":3 , "BPM":120 }, + { "time":58.25 , "lane":3 , "BPM":120 }, + { "time":58.875 , "lane":3 , "BPM":120 }, + { "time":59.125 , "lane":3 , "BPM":120 }, + { "time":59.75 , "lane":3 , "BPM":120 }, + { "time":60.0 , "lane":3 , "BPM":120 }, + { "time":60.25 , "lane":3 , "BPM":120 }, + { "time":60.875 , "lane":3 , "BPM":120 }, + { "time":61.125 , "lane":3 , "BPM":120 }, + { "time":61.75 , "lane":3 , "BPM":120 }, + { "time":62.0 , "lane":3 , "BPM":120 }, + { "time":62.25 , "lane":3 , "BPM":120 }, + { "time":62.875 , "lane":3 , "BPM":120 }, + { "time":63.125 , "lane":3 , "BPM":120 }, + { "time":63.75 , "lane":3 , "BPM":120 }, + { "time":64.0 , "lane":3 , "BPM":120 }, + { "time":64.25 , "lane":3 , "BPM":120 }, + { "time":64.875 , "lane":3 , "BPM":120 }, + { "time":65.125 , "lane":3 , "BPM":120 }, + { "time":65.75 , "lane":3 , "BPM":120 }, + + { "time":58.5 , "lane":2 , "BPM":120 }, + { "time":59.5 , "lane":2 , "BPM":120 }, + { "time":60.5 , "lane":2 , "BPM":120 }, + { "time":61.5 , "lane":2 , "BPM":120 }, + { "time":62.5 , "lane":2 , "BPM":120 }, + { "time":63.5 , "lane":2 , "BPM":120 }, + { "time":64.5 , "lane":2 , "BPM":120 }, + { "time":65.5 , "lane":2 , "BPM":120 }, + + + { "time":66.0 , "lane":3 , "BPM":120 }, + { "time":66.25 , "lane":3 , "BPM":120 }, + { "time":66.875 , "lane":3 , "BPM":120 }, + { "time":67.125 , "lane":3 , "BPM":120 }, + { "time":67.75 , "lane":3 , "BPM":120 }, + { "time":68.0 , "lane":3 , "BPM":120 }, + { "time":68.25 , "lane":3 , "BPM":120 }, + { "time":68.875 , "lane":3 , "BPM":120 }, + { "time":69.125 , "lane":3 , "BPM":120 }, + { "time":69.75 , "lane":3 , "BPM":120 }, + { "time":70.0 , "lane":3 , "BPM":120 }, + { "time":70.25 , "lane":3 , "BPM":120 }, + { "time":70.875 , "lane":3 , "BPM":120 }, + { "time":71.125 , "lane":3 , "BPM":120 }, + { "time":71.75 , "lane":3 , "BPM":120 }, + { "time":72.0 , "lane":3 , "BPM":120 }, + { "time":72.25 , "lane":3 , "BPM":120 }, + { "time":72.875 , "lane":3 , "BPM":120 }, + { "time":73.125 , "lane":3 , "BPM":120 }, + { "time":73.375 , "lane":3 , "BPM":120 }, + { "time":73.75 , "lane":3 , "BPM":120 }, + + { "time":66.5 , "lane":2 , "BPM":120 }, + { "time":67.5 , "lane":2 , "BPM":120 }, + { "time":68.5 , "lane":2 , "BPM":120 }, + { "time":69.5 , "lane":2 , "BPM":120 }, + { "time":70.5 , "lane":2 , "BPM":120 }, + { "time":71.5 , "lane":2 , "BPM":120 }, + { "time":72.5 , "lane":2 , "BPM":120 }, + { "time":73.5 , "lane":2 , "BPM":120 }, + { "time":73.75 , "lane":2 , "BPM":120 }, + + + { "time":74.0 , "lane":8 , "BPM":120 }, + { "time":74.0 , "lane":3 , "BPM":120 }, + { "time":74.25 , "lane":3 , "BPM":120 }, + { "time":74.875 , "lane":3 , "BPM":120 }, + { "time":75.125 , "lane":3 , "BPM":120 }, + { "time":75.75 , "lane":3 , "BPM":120 }, + { "time":76.0 , "lane":3 , "BPM":120 }, + { "time":76.25 , "lane":3 , "BPM":120 }, + { "time":76.875 , "lane":3 , "BPM":120 }, + { "time":77.125 , "lane":3 , "BPM":120 }, + { "time":77.75 , "lane":3 , "BPM":120 }, + { "time":78.0 , "lane":3 , "BPM":120 }, + { "time":78.25 , "lane":3 , "BPM":120 }, + { "time":78.875 , "lane":3 , "BPM":120 }, + { "time":79.125 , "lane":3 , "BPM":120 }, + { "time":79.75 , "lane":3 , "BPM":120 }, + { "time":80.0 , "lane":3 , "BPM":120 }, + { "time":80.25 , "lane":3 , "BPM":120 }, + { "time":80.875 , "lane":3 , "BPM":120 }, + { "time":81.125 , "lane":3 , "BPM":120 }, + { "time":81.75 , "lane":3 , "BPM":120 }, + + { "time":74.5 , "lane":2 , "BPM":120 }, + { "time":75.5 , "lane":2 , "BPM":120 }, + { "time":76.5 , "lane":2 , "BPM":120 }, + { "time":77.5 , "lane":2 , "BPM":120 }, + { "time":78.5 , "lane":2 , "BPM":120 }, + { "time":79.5 , "lane":2 , "BPM":120 }, + { "time":80.5 , "lane":2 , "BPM":120 }, + { "time":81.5 , "lane":2 , "BPM":120 }, + + + { "time":82.0 , "lane":3 , "BPM":120 }, + { "time":82.25 , "lane":3 , "BPM":120 }, + { "time":82.875 , "lane":3 , "BPM":120 }, + { "time":83.125 , "lane":3 , "BPM":120 }, + { "time":83.75 , "lane":3 , "BPM":120 }, + { "time":84.0 , "lane":3 , "BPM":120 }, + { "time":84.25 , "lane":3 , "BPM":120 }, + { "time":84.875 , "lane":3 , "BPM":120 }, + { "time":85.125 , "lane":3 , "BPM":120 }, + { "time":85.75 , "lane":3 , "BPM":120 }, + { "time":86.0 , "lane":3 , "BPM":120 }, + { "time":86.25 , "lane":3 , "BPM":120 }, + { "time":86.875 , "lane":3 , "BPM":120 }, + { "time":87.125 , "lane":3 , "BPM":120 }, + { "time":87.75 , "lane":3 , "BPM":120 }, + { "time":88.0 , "lane":3 , "BPM":120 }, + { "time":88.25 , "lane":3 , "BPM":120 }, + { "time":88.875 , "lane":3 , "BPM":120 }, + { "time":89.125 , "lane":3 , "BPM":120 }, + { "time":89.375 , "lane":3 , "BPM":120 }, + { "time":89.75 , "lane":3 , "BPM":120 }, + + { "time":82.5 , "lane":2 , "BPM":120 }, + { "time":83.5 , "lane":2 , "BPM":120 }, + { "time":84.5 , "lane":2 , "BPM":120 }, + { "time":85.5 , "lane":2 , "BPM":120 }, + { "time":86.5 , "lane":2 , "BPM":120 }, + { "time":87.5 , "lane":2 , "BPM":120 }, + { "time":88.5 , "lane":2 , "BPM":120 }, + { "time":89.5 , "lane":2 , "BPM":120 }, + { "time":89.75 , "lane":2 , "BPM":120 }, + + + { "time":90.0 , "lane":8 , "BPM":120 }, + { "time":90.0 , "lane":3 , "BPM":120 }, + { "time":92.0 , "lane":3 , "BPM":120 }, + { "time":92.25 , "lane":3 , "BPM":120 }, + { "time":92.5 , "lane":3 , "BPM":120 }, + { "time":92.75 , "lane":3 , "BPM":120 }, + { "time":93.0 , "lane":3 , "BPM":120 }, + { "time":93.25 , "lane":3 , "BPM":120 }, + { "time":93.5 , "lane":2 , "BPM":120 }, + { "time":93.75 , "lane":2 , "BPM":120 }, + + + { "time":94.0 , "lane":8 , "BPM":120 }, + { "time":94.0 , "lane":3 , "BPM":120 }, + { "time":94.25 , "lane":3 , "BPM":120 }, + { "time":94.875 , "lane":3 , "BPM":120 }, + { "time":95.125 , "lane":3 , "BPM":120 }, + { "time":96.0 , "lane":8 , "BPM":120 }, + { "time":96.0 , "lane":3 , "BPM":120 }, + { "time":96.25 , "lane":3 , "BPM":120 }, + { "time":96.875 , "lane":3 , "BPM":120 }, + { "time":97.125 , "lane":3 , "BPM":120 }, + { "time":98.0 , "lane":8 , "BPM":120 }, + { "time":98.0 , "lane":3 , "BPM":120 }, + { "time":98.25 , "lane":3 , "BPM":120 }, + { "time":98.875 , "lane":3 , "BPM":120 }, + { "time":99.125 , "lane":3 , "BPM":120 }, + + { "time":94.5 , "lane":2 , "BPM":120 }, + { "time":95.5 , "lane":2 , "BPM":120 }, + { "time":95.75 , "lane":2 , "BPM":120 }, + { "time":96.5 , "lane":2 , "BPM":120 }, + { "time":97.5 , "lane":2 , "BPM":120 }, + { "time":97.75 , "lane":2 , "BPM":120 }, + { "time":98.5 , "lane":2 , "BPM":120 }, + { "time":99.5 , "lane":2 , "BPM":120 }, + { "time":99.75 , "lane":2 , "BPM":120 } + + ] +} diff -r 30c23f93cbc0 -r 3f8305d62106 webGL/music/Am.json --- a/webGL/music/Am.json Sun Jul 15 01:07:34 2012 +0900 +++ b/webGL/music/Am.json Thu Jul 19 16:30:33 2012 +0900 @@ -1,15 +1,13 @@ { "title":"Am", "filepath":"sound/Am", + "level":6, "notes":[ - { "time":0.0 , "lane":3 , "BPM":185 }, - { "time":0.32432 , "lane":3 , "BPM":185 }, - { "time":0.64865 , "lane":3 , "BPM":185 }, - { "time":0.97297 , "lane":3 , "BPM":185 }, - { "time":1.29730 , "lane":3 , "BPM":185 }, - { "time":1.62162 , "lane":3 , "BPM":185 }, - { "time":1.94595 , "lane":3 , "BPM":185 }, - { "time":2.27027 , "lane":3 , "BPM":185 }, + { "time":1.2972972972972974 , "lane":8 , "BPM":185 }, + { "time":1.2972972972972974 , "lane":3 , "BPM":185 }, + { "time":1.6216216216216217 , "lane":3 , "BPM":185 }, + { "time":1.945945945945946 , "lane":3 , "BPM":185 }, + { "time":2.27027027027027 , "lane":3 , "BPM":185 }, { "time":2.5945945945945947 , "lane":3 , "BPM":185 }, { "time":2.9189189189189193 , "lane":3 , "BPM":185 }, { "time":3.2432432432432434 , "lane":3 , "BPM":185 }, @@ -22,6 +20,8 @@ { "time":5.513513513513514 , "lane":3 , "BPM":185 }, { "time":5.837837837837839 , "lane":3 , "BPM":185 }, { "time":6.162162162162162 , "lane":3 , "BPM":185 }, + { "time":6.324324324324325 , "lane":3 , "BPM":185 }, + { "time":6.486486486486487 , "lane":3 , "BPM":185 }, { "time":6.810810810810811 , "lane":3 , "BPM":185 }, { "time":7.135135135135135 , "lane":3 , "BPM":185 }, @@ -38,6 +38,9 @@ { "time":10.702702702702704 , "lane":3 , "BPM":185 }, { "time":11.027027027027028 , "lane":3 , "BPM":185 }, { "time":11.351351351351353 , "lane":3 , "BPM":185 }, + { "time":11.513513513513514 , "lane":3 , "BPM":185 }, + + { "time":11.675675675675677 , "lane":8 , "BPM":185 }, { "time":11.675675675675677 , "lane":3 , "BPM":185 }, { "time":12.000000000000002 , "lane":3 , "BPM":185 }, { "time":12.324324324324326 , "lane":3 , "BPM":185 }, @@ -54,6 +57,8 @@ { "time":15.891891891891893 , "lane":3 , "BPM":185 }, { "time":16.216216216216218 , "lane":3 , "BPM":185 }, { "time":16.54054054054054 , "lane":3 , "BPM":185 }, + { "time":16.7027027027027 , "lane":3 , "BPM":185 }, + { "time":16.864864864864867 , "lane":3 , "BPM":185 }, { "time":17.18918918918919 , "lane":3 , "BPM":185 }, { "time":17.513513513513516 , "lane":3 , "BPM":185 }, @@ -66,17 +71,133 @@ { "time":19.783783783783782 , "lane":3 , "BPM":185 }, { "time":20.10810810810811 , "lane":3 , "BPM":185 }, { "time":20.43243243243243 , "lane":3 , "BPM":185 }, + { "time":20.756756756756758 , "lane":3 , "BPM":185 }, + { "time":21.08108108108108 , "lane":3 , "BPM":185 }, + { "time":21.405405405405407 , "lane":3 , "BPM":185 }, + { "time":21.56756756756757 , "lane":3 , "BPM":185 }, + { "time":21.72972972972973 , "lane":3 , "BPM":185 }, + { "time":21.891891891891895 , "lane":3 , "BPM":185 }, - { "time":0.32432 , "lane":2 , "BPM":185 }, - { "time":0.97297 , "lane":2 , "BPM":185 }, - { "time":1.62162 , "lane":2 , "BPM":185 }, - { "time":2.27027 , "lane":2 , "BPM":185 }, + + { "time":1.4594594594594597 , "lane":1 , "BPM":185 }, + { "time":1.7837837837837838 , "lane":1 , "BPM":185 }, + { "time":2.1081081081081083 , "lane":1 , "BPM":185 }, + { "time":2.4324324324324325 , "lane":1 , "BPM":185 }, + { "time":2.756756756756757 , "lane":1 , "BPM":185 }, + { "time":3.081081081081081 , "lane":1 , "BPM":185 }, + { "time":3.4054054054054057 , "lane":1 , "BPM":185 }, + { "time":3.486486486486487 , "lane":1 , "BPM":185 }, + { "time":3.72972972972973 , "lane":1 , "BPM":185 }, + { "time":4.054054054054054 , "lane":1 , "BPM":185 }, + { "time":4.378378378378379 , "lane":1 , "BPM":185 }, + { "time":4.702702702702703 , "lane":1 , "BPM":185 }, + { "time":5.027027027027027 , "lane":1 , "BPM":185 }, + { "time":5.351351351351352 , "lane":1 , "BPM":185 }, + { "time":5.675675675675676 , "lane":1 , "BPM":185 }, + { "time":6.0 , "lane":1 , "BPM":185 }, + { "time":6.081081081081082 , "lane":1 , "BPM":185 }, + { "time":6.324324324324325 , "lane":1 , "BPM":185 }, + + { "time":6.648648648648649 , "lane":1 , "BPM":185 }, + { "time":6.972972972972974 , "lane":1 , "BPM":185 }, + { "time":7.297297297297297 , "lane":1 , "BPM":185 }, + { "time":7.621621621621622 , "lane":1 , "BPM":185 }, + { "time":7.9459459459459465 , "lane":1 , "BPM":185 }, + { "time":8.27027027027027 , "lane":1 , "BPM":185 }, + { "time":8.594594594594595 , "lane":1 , "BPM":185 }, + { "time":8.675675675675675 , "lane":1 , "BPM":185 }, + { "time":8.91891891891892 , "lane":1 , "BPM":185 }, + { "time":9.243243243243242 , "lane":1 , "BPM":185 }, + { "time":9.567567567567567 , "lane":1 , "BPM":185 }, + { "time":9.891891891891891 , "lane":1 , "BPM":185 }, + { "time":10.216216216216216 , "lane":1 , "BPM":185 }, + { "time":10.54054054054054 , "lane":1 , "BPM":185 }, + { "time":10.864864864864865 , "lane":1 , "BPM":185 }, + { "time":11.18918918918919 , "lane":1 , "BPM":185 }, + { "time":11.27027027027027 , "lane":1 , "BPM":185 }, + { "time":11.513513513513514 , "lane":1 , "BPM":185 }, + + { "time":11.837837837837839 , "lane":1 , "BPM":185 }, + { "time":12.162162162162163 , "lane":1 , "BPM":185 }, + { "time":12.486486486486488 , "lane":1 , "BPM":185 }, + { "time":12.810810810810812 , "lane":1 , "BPM":185 }, + { "time":13.135135135135135 , "lane":1 , "BPM":185 }, + { "time":13.45945945945946 , "lane":1 , "BPM":185 }, + { "time":13.783783783783784 , "lane":1 , "BPM":185 }, + { "time":13.864864864864865 , "lane":1 , "BPM":185 }, + { "time":14.108108108108109 , "lane":1 , "BPM":185 }, + { "time":14.432432432432432 , "lane":1 , "BPM":185 }, + { "time":14.756756756756756 , "lane":1 , "BPM":185 }, + { "time":15.08108108108108 , "lane":1 , "BPM":185 }, + { "time":15.405405405405405 , "lane":1 , "BPM":185 }, + { "time":15.72972972972973 , "lane":1 , "BPM":185 }, + { "time":16.054054054054056 , "lane":1 , "BPM":185 }, + { "time":16.37837837837838 , "lane":1 , "BPM":185 }, + { "time":16.45945945945946 , "lane":1 , "BPM":185 }, + { "time":16.7027027027027 , "lane":1 , "BPM":185 }, + + { "time":17.027027027027028 , "lane":1 , "BPM":185 }, + { "time":17.351351351351354 , "lane":1 , "BPM":185 }, + { "time":17.675675675675677 , "lane":1 , "BPM":185 }, + { "time":18.0 , "lane":1 , "BPM":185 }, + { "time":18.324324324324323 , "lane":1 , "BPM":185 }, + { "time":18.64864864864865 , "lane":1 , "BPM":185 }, + { "time":18.972972972972972 , "lane":1 , "BPM":185 }, + { "time":19.054054054054053 , "lane":1 , "BPM":185 }, + { "time":19.2972972972973 , "lane":1 , "BPM":185 }, + { "time":19.62162162162162 , "lane":1 , "BPM":185 }, + { "time":19.945945945945947 , "lane":1 , "BPM":185 }, + { "time":20.27027027027027 , "lane":1 , "BPM":185 }, + { "time":20.594594594594597 , "lane":1 , "BPM":185 }, + { "time":20.91891891891892 , "lane":1 , "BPM":185 }, + { "time":21.243243243243246 , "lane":1 , "BPM":185 }, + { "time":21.56756756756757 , "lane":1 , "BPM":185 }, + { "time":21.891891891891895 , "lane":1 , "BPM":185 }, + + + { "time":12.000000000000002 , "lane":7 , "BPM":185 }, + { "time":12.324324324324326 , "lane":7 , "BPM":185 }, + { "time":12.648648648648651 , "lane":7 , "BPM":185 }, + { "time":12.972972972972974 , "lane":7 , "BPM":185 }, + { "time":13.297297297297298 , "lane":7 , "BPM":185 }, + { "time":13.621621621621623 , "lane":7 , "BPM":185 }, + { "time":13.945945945945947 , "lane":7 , "BPM":185 }, + { "time":14.27027027027027 , "lane":7 , "BPM":185 }, + { "time":14.594594594594595 , "lane":7 , "BPM":185 }, + { "time":14.91891891891892 , "lane":7 , "BPM":185 }, + { "time":15.243243243243244 , "lane":7 , "BPM":185 }, + { "time":15.567567567567568 , "lane":7 , "BPM":185 }, + { "time":15.891891891891893 , "lane":7 , "BPM":185 }, + { "time":16.216216216216218 , "lane":7 , "BPM":185 }, + { "time":16.54054054054054 , "lane":7 , "BPM":185 }, + + { "time":16.864864864864867 , "lane":7 , "BPM":185 }, + { "time":17.18918918918919 , "lane":7 , "BPM":185 }, + { "time":17.513513513513516 , "lane":7 , "BPM":185 }, + { "time":17.83783783783784 , "lane":7 , "BPM":185 }, + { "time":18.16216216216216 , "lane":7 , "BPM":185 }, + { "time":18.486486486486484 , "lane":7 , "BPM":185 }, + { "time":18.81081081081081 , "lane":7 , "BPM":185 }, + { "time":19.135135135135133 , "lane":7 , "BPM":185 }, + { "time":19.45945945945946 , "lane":7 , "BPM":185 }, + { "time":19.783783783783782 , "lane":7 , "BPM":185 }, + { "time":20.10810810810811 , "lane":7 , "BPM":185 }, + { "time":20.43243243243243 , "lane":7 , "BPM":185 }, + { "time":20.756756756756758 , "lane":7 , "BPM":185 }, + { "time":21.08108108108108 , "lane":7 , "BPM":185 }, + { "time":21.405405405405407 , "lane":7 , "BPM":185 }, + { "time":21.72972972972973 , "lane":7 , "BPM":185 }, + + + { "time":1.6216216216216217 , "lane":2 , "BPM":185 }, + { "time":2.27027027027027 , "lane":2 , "BPM":185 }, { "time":2.9189189189189193 , "lane":2 , "BPM":185 }, { "time":3.5675675675675675 , "lane":2 , "BPM":185 }, { "time":4.216216216216217 , "lane":2 , "BPM":185 }, { "time":4.864864864864865 , "lane":2 , "BPM":185 }, { "time":5.513513513513514 , "lane":2 , "BPM":185 }, { "time":6.162162162162162 , "lane":2 , "BPM":185 }, + { "time":6.810810810810811 , "lane":2 , "BPM":185 }, { "time":7.45945945945946 , "lane":2 , "BPM":185 }, { "time":8.108108108108109 , "lane":2 , "BPM":185 }, @@ -85,6 +206,7 @@ { "time":10.054054054054054 , "lane":2 , "BPM":185 }, { "time":10.702702702702704 , "lane":2 , "BPM":185 }, { "time":11.351351351351353 , "lane":2 , "BPM":185 }, + { "time":12.000000000000002 , "lane":2 , "BPM":185 }, { "time":12.648648648648651 , "lane":2 , "BPM":185 }, { "time":13.297297297297298 , "lane":2 , "BPM":185 }, @@ -93,12 +215,14 @@ { "time":15.243243243243244 , "lane":2 , "BPM":185 }, { "time":15.891891891891893 , "lane":2 , "BPM":185 }, { "time":16.54054054054054 , "lane":2 , "BPM":185 }, + { "time":17.18918918918919 , "lane":2 , "BPM":185 }, { "time":17.83783783783784 , "lane":2 , "BPM":185 }, { "time":18.486486486486484 , "lane":2 , "BPM":185 }, { "time":19.135135135135133 , "lane":2 , "BPM":185 }, { "time":19.783783783783782 , "lane":2 , "BPM":185 }, - { "time":20.43243243243243 , "lane":2 , "BPM":185 } - + { "time":20.43243243243243 , "lane":2 , "BPM":185 }, + { "time":21.08108108108108 , "lane":2 , "BPM":185 }, + { "time":21.72972972972973 , "lane":2 , "BPM":185 } ] } diff -r 30c23f93cbc0 -r 3f8305d62106 webGL/music/Am_easy.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webGL/music/Am_easy.json Thu Jul 19 16:30:33 2012 +0900 @@ -0,0 +1,113 @@ +{ + "title":"Am -Easy-", + "filepath":"sound/Am", + "level":2, + "notes":[ + { "time":1.2972972972972974 , "lane":8 , "BPM":185 }, + { "time":1.2972972972972974 , "lane":3 , "BPM":185 }, + { "time":1.6216216216216217 , "lane":3 , "BPM":185 }, + { "time":1.945945945945946 , "lane":3 , "BPM":185 }, + { "time":2.27027027027027 , "lane":3 , "BPM":185 }, + { "time":2.5945945945945947 , "lane":3 , "BPM":185 }, + { "time":2.9189189189189193 , "lane":3 , "BPM":185 }, + { "time":3.2432432432432434 , "lane":3 , "BPM":185 }, + { "time":3.5675675675675675 , "lane":3 , "BPM":185 }, + { "time":3.891891891891892 , "lane":3 , "BPM":185 }, + { "time":4.216216216216217 , "lane":3 , "BPM":185 }, + { "time":4.54054054054054 , "lane":3 , "BPM":185 }, + { "time":4.864864864864865 , "lane":3 , "BPM":185 }, + { "time":5.1891891891891895 , "lane":3 , "BPM":185 }, + { "time":5.513513513513514 , "lane":3 , "BPM":185 }, + { "time":5.837837837837839 , "lane":3 , "BPM":185 }, + { "time":6.162162162162162 , "lane":3 , "BPM":185 }, + + { "time":6.486486486486487 , "lane":3 , "BPM":185 }, + { "time":6.810810810810811 , "lane":3 , "BPM":185 }, + { "time":7.135135135135135 , "lane":3 , "BPM":185 }, + { "time":7.45945945945946 , "lane":3 , "BPM":185 }, + { "time":7.783783783783784 , "lane":3 , "BPM":185 }, + { "time":8.108108108108109 , "lane":3 , "BPM":185 }, + { "time":8.432432432432433 , "lane":3 , "BPM":185 }, + { "time":8.756756756756758 , "lane":3 , "BPM":185 }, + { "time":9.08108108108108 , "lane":3 , "BPM":185 }, + { "time":9.405405405405405 , "lane":3 , "BPM":185 }, + { "time":9.72972972972973 , "lane":3 , "BPM":185 }, + { "time":10.054054054054054 , "lane":3 , "BPM":185 }, + { "time":10.378378378378379 , "lane":3 , "BPM":185 }, + { "time":10.702702702702704 , "lane":3 , "BPM":185 }, + { "time":11.027027027027028 , "lane":3 , "BPM":185 }, + { "time":11.351351351351353 , "lane":3 , "BPM":185 }, + + { "time":11.675675675675677 , "lane":8 , "BPM":185 }, + { "time":11.675675675675677 , "lane":3 , "BPM":185 }, + { "time":12.000000000000002 , "lane":3 , "BPM":185 }, + { "time":12.324324324324326 , "lane":3 , "BPM":185 }, + { "time":12.648648648648651 , "lane":3 , "BPM":185 }, + { "time":12.972972972972974 , "lane":3 , "BPM":185 }, + { "time":13.297297297297298 , "lane":3 , "BPM":185 }, + { "time":13.621621621621623 , "lane":3 , "BPM":185 }, + { "time":13.945945945945947 , "lane":3 , "BPM":185 }, + { "time":14.27027027027027 , "lane":3 , "BPM":185 }, + { "time":14.594594594594595 , "lane":3 , "BPM":185 }, + { "time":14.91891891891892 , "lane":3 , "BPM":185 }, + { "time":15.243243243243244 , "lane":3 , "BPM":185 }, + { "time":15.567567567567568 , "lane":3 , "BPM":185 }, + { "time":15.891891891891893 , "lane":3 , "BPM":185 }, + { "time":16.216216216216218 , "lane":3 , "BPM":185 }, + { "time":16.54054054054054 , "lane":3 , "BPM":185 }, + + { "time":16.864864864864867 , "lane":3 , "BPM":185 }, + { "time":17.18918918918919 , "lane":3 , "BPM":185 }, + { "time":17.513513513513516 , "lane":3 , "BPM":185 }, + { "time":17.83783783783784 , "lane":3 , "BPM":185 }, + { "time":18.16216216216216 , "lane":3 , "BPM":185 }, + { "time":18.486486486486484 , "lane":3 , "BPM":185 }, + { "time":18.81081081081081 , "lane":3 , "BPM":185 }, + { "time":19.135135135135133 , "lane":3 , "BPM":185 }, + { "time":19.45945945945946 , "lane":3 , "BPM":185 }, + { "time":19.783783783783782 , "lane":3 , "BPM":185 }, + { "time":20.10810810810811 , "lane":3 , "BPM":185 }, + { "time":20.43243243243243 , "lane":3 , "BPM":185 }, + { "time":20.756756756756758 , "lane":3 , "BPM":185 }, + { "time":21.08108108108108 , "lane":3 , "BPM":185 }, + { "time":21.405405405405407 , "lane":3 , "BPM":185 }, + { "time":21.72972972972973 , "lane":3 , "BPM":185 }, + + + { "time":1.6216216216216217 , "lane":2 , "BPM":185 }, + { "time":2.27027027027027 , "lane":2 , "BPM":185 }, + { "time":2.9189189189189193 , "lane":2 , "BPM":185 }, + { "time":3.5675675675675675 , "lane":2 , "BPM":185 }, + { "time":4.216216216216217 , "lane":2 , "BPM":185 }, + { "time":4.864864864864865 , "lane":2 , "BPM":185 }, + { "time":5.513513513513514 , "lane":2 , "BPM":185 }, + { "time":6.162162162162162 , "lane":2 , "BPM":185 }, + + { "time":6.810810810810811 , "lane":2 , "BPM":185 }, + { "time":7.45945945945946 , "lane":2 , "BPM":185 }, + { "time":8.108108108108109 , "lane":2 , "BPM":185 }, + { "time":8.756756756756758 , "lane":2 , "BPM":185 }, + { "time":9.405405405405405 , "lane":2 , "BPM":185 }, + { "time":10.054054054054054 , "lane":2 , "BPM":185 }, + { "time":10.702702702702704 , "lane":2 , "BPM":185 }, + { "time":11.351351351351353 , "lane":2 , "BPM":185 }, + + { "time":12.000000000000002 , "lane":2 , "BPM":185 }, + { "time":12.648648648648651 , "lane":2 , "BPM":185 }, + { "time":13.297297297297298 , "lane":2 , "BPM":185 }, + { "time":13.945945945945947 , "lane":2 , "BPM":185 }, + { "time":14.594594594594595 , "lane":2 , "BPM":185 }, + { "time":15.243243243243244 , "lane":2 , "BPM":185 }, + { "time":15.891891891891893 , "lane":2 , "BPM":185 }, + { "time":16.54054054054054 , "lane":2 , "BPM":185 }, + + { "time":17.18918918918919 , "lane":2 , "BPM":185 }, + { "time":17.83783783783784 , "lane":2 , "BPM":185 }, + { "time":18.486486486486484 , "lane":2 , "BPM":185 }, + { "time":19.135135135135133 , "lane":2 , "BPM":185 }, + { "time":19.783783783783782 , "lane":2 , "BPM":185 }, + { "time":20.43243243243243 , "lane":2 , "BPM":185 }, + { "time":21.08108108108108 , "lane":2 , "BPM":185 }, + { "time":21.72972972972973 , "lane":2 , "BPM":185 } + ] +} diff -r 30c23f93cbc0 -r 3f8305d62106 webGL/sound/1st_thrash_4game.ogg Binary file webGL/sound/1st_thrash_4game.ogg has changed diff -r 30c23f93cbc0 -r 3f8305d62106 webGL/sound/1st_thrash_4game.wav Binary file webGL/sound/1st_thrash_4game.wav has changed diff -r 30c23f93cbc0 -r 3f8305d62106 webGL/sound/Am.ogg Binary file webGL/sound/Am.ogg has changed diff -r 30c23f93cbc0 -r 3f8305d62106 webGL/sound/Am.wav Binary file webGL/sound/Am.wav has changed diff -r 30c23f93cbc0 -r 3f8305d62106 webGL/src/Note.js --- a/webGL/src/Note.js Sun Jul 15 01:07:34 2012 +0900 +++ b/webGL/src/Note.js Thu Jul 19 16:30:33 2012 +0900 @@ -38,7 +38,7 @@ }; Note.prototype.kill = function(){ - console.log(this.time+","+audioBGM.currentTime); +// console.log(this.time+","+audioBGM.currentTime); this.alive = false; }; diff -r 30c23f93cbc0 -r 3f8305d62106 webGL/src/const.js --- a/webGL/src/const.js Sun Jul 15 01:07:34 2012 +0900 +++ b/webGL/src/const.js Thu Jul 19 16:30:33 2012 +0900 @@ -26,7 +26,7 @@ const keySpace = 32; // judges (s) -const PERFECT = 0.025; -const GREAT = 0.04; -const GOOD = 0.06; -const BAD = 0.1; +const PERFECT = 0.032; +const GREAT = 0.064; +const GOOD = 0.096; +const BAD = 0.128; diff -r 30c23f93cbc0 -r 3f8305d62106 webGL/src/f4notes.js --- a/webGL/src/f4notes.js Sun Jul 15 01:07:34 2012 +0900 +++ b/webGL/src/f4notes.js Thu Jul 19 16:30:33 2012 +0900 @@ -117,7 +117,7 @@ } if(note1==null){ // This input doesn't need judgement. - console.log("through the judgement"); +// console.log("through the judgement"); return; } diff1 = Math.abs(hitTime-note1.getTime()); @@ -147,7 +147,7 @@ badCount++; drawText(ctx,"judge","bad",35,"red","center"); }else{ - console.log("judge error: hit:"+hitTime+" diff:"+diff); +// console.log("judge error: hit:"+hitTime+" diff:"+diff); } } @@ -172,11 +172,18 @@ notesArray[lane-1].push(new Note(time,lane,BPM)); } +function initNotesArray(){ + for(var i=0;i extension. defined at sound.js for(i=0;i