2023-AndroidPlatform · haeun-pyo · Dec 9, 2023 · Dec 9, 2023 · Dec 9, 2023
diff --git a/.DS_Store b/.DS_Store
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/buttonimages/effect.png b/buttonimages/effect.png
diff --git a/buttonimages/piano.png b/buttonimages/piano.png
diff --git a/buttons/.DS_Store b/buttons/.DS_Store
diff --git a/buttons/bpm.png b/buttons/bpm.png
diff --git a/buttons/download.png b/buttons/download.png
diff --git a/buttons/effect.png b/buttons/effect.png
diff --git a/buttons/effect_b.png b/buttons/effect_b.png
diff --git a/buttons/piano.png b/buttons/piano.png
diff --git a/buttons/piano_b.png b/buttons/piano_b.png
diff --git a/buttons/play.png b/buttons/play.png
diff --git a/buttons/reset.png b/buttons/reset.png
diff --git a/buttons/stop.png b/buttons/stop.png
diff --git a/buttons/volume.png b/buttons/volume.png
diff --git a/icons/.DS_Store b/icons/.DS_Store
diff --git a/icons/icon0.png b/icons/icon0.png
diff --git a/icons/icon1.png b/icons/icon1.png
diff --git a/icons/icon10.png b/icons/icon10.png
diff --git a/icons/icon11.png b/icons/icon11.png
diff --git a/icons/icon12.png b/icons/icon12.png
diff --git a/icons/icon13.png b/icons/icon13.png
diff --git a/icons/icon14.png b/icons/icon14.png
diff --git a/icons/icon15.png b/icons/icon15.png
diff --git a/icons/icon16.png b/icons/icon16.png
diff --git a/icons/icon17.png b/icons/icon17.png
diff --git a/icons/icon18.png b/icons/icon18.png
diff --git a/icons/icon19.png b/icons/icon19.png
diff --git a/icons/icon2.png b/icons/icon2.png
diff --git a/icons/icon20.png b/icons/icon20.png
diff --git a/icons/icon21.png b/icons/icon21.png
diff --git a/icons/icon22.png b/icons/icon22.png
diff --git a/icons/icon23.png b/icons/icon23.png
diff --git a/icons/icon24.png b/icons/icon24.png
diff --git a/icons/icon25.png b/icons/icon25.png
diff --git a/icons/icon26.png b/icons/icon26.png
diff --git a/icons/icon27.png b/icons/icon27.png
diff --git a/icons/icon28.png b/icons/icon28.png
diff --git a/icons/icon29.png b/icons/icon29.png
diff --git a/icons/icon3.png b/icons/icon3.png
diff --git a/icons/icon30.png b/icons/icon30.png
diff --git a/icons/icon31.png b/icons/icon31.png
diff --git a/icons/icon32.png b/icons/icon32.png
diff --git a/icons/icon33.png b/icons/icon33.png
diff --git a/icons/icon34.png b/icons/icon34.png
diff --git a/icons/icon35.png b/icons/icon35.png
diff --git a/icons/icon36.png b/icons/icon36.png
diff --git a/icons/icon37.png b/icons/icon37.png
diff --git a/icons/icon38.png b/icons/icon38.png
diff --git a/icons/icon39.png b/icons/icon39.png
diff --git a/icons/icon4.png b/icons/icon4.png
diff --git a/icons/icon40.png b/icons/icon40.png
diff --git a/icons/icon41.png b/icons/icon41.png
diff --git a/icons/icon5.png b/icons/icon5.png
diff --git a/icons/icon6.png b/icons/icon6.png
diff --git a/icons/icon7.png b/icons/icon7.png
diff --git a/icons/icon8.png b/icons/icon8.png
diff --git a/icons/icon9.png b/icons/icon9.png
diff --git a/pianoImg/.DS_Store b/pianoImg/.DS_Store
diff --git a/pianoImg/green1.png b/pianoImg/green1.png
diff --git a/pianoImg/green2.png b/pianoImg/green2.png
diff --git a/pianoImg/green3.png b/pianoImg/green3.png
diff --git a/pianoImg/img0.png b/pianoImg/img0.png
diff --git a/pianoImg/img1.png b/pianoImg/img1.png
diff --git a/pianoImg/img10.png b/pianoImg/img10.png
diff --git a/pianoImg/img11.png b/pianoImg/img11.png
diff --git a/pianoImg/img12.png b/pianoImg/img12.png
diff --git a/pianoImg/img13.png b/pianoImg/img13.png
diff --git a/pianoImg/img14.png b/pianoImg/img14.png
diff --git a/pianoImg/img15.png b/pianoImg/img15.png
diff --git a/pianoImg/img16.png b/pianoImg/img16.png
diff --git a/pianoImg/img17.png b/pianoImg/img17.png
diff --git a/pianoImg/img18.png b/pianoImg/img18.png
diff --git a/pianoImg/img19.png b/pianoImg/img19.png
diff --git a/pianoImg/img2.png b/pianoImg/img2.png
diff --git a/pianoImg/img20.png b/pianoImg/img20.png
diff --git a/pianoImg/img3.png b/pianoImg/img3.png
diff --git a/pianoImg/img4.png b/pianoImg/img4.png
diff --git a/pianoImg/img5.png b/pianoImg/img5.png
diff --git a/pianoImg/img6.png b/pianoImg/img6.png
diff --git a/pianoImg/img7.png b/pianoImg/img7.png
diff --git a/pianoImg/img8.png b/pianoImg/img8.png
diff --git a/pianoImg/img9.png b/pianoImg/img9.png
diff --git a/sketch.js b/sketch.js
@@ -19,7 +19,7 @@ function preload() {
   soundFormats("mp3", "ogg");
   for (var i = 0; i < 57; i++) {
     if (i < 36) sounds[i] = loadSound(`sound/piano${i}.mp3`);
-    else sounds[i] = loadSound(`sound/effect${i-if_effect}.mp3`);
+    else sounds[i] = loadSound(`sound/effect${i - if_effect}.mp3`);
   }
   // 추가한 부분
   // 이미지 불러와서 iconImage배열에 순서대로 저장
@@ -36,50 +36,82 @@ function setup() {
   stroke(220);
   strokeWeight(windowWidth / 300);
   for (var i = 0; i < 21; i++) {
-    rect(i * width / 21, height - height / 3, width / 21, height / 3, 0, 0, 10, 10);
+    rect(
+      (i * width) / 21,
+      height - height / 3,
+      width / 21,
+      height / 3,
+      0,
+      0,
+      10,
+      10
+    );
   }
   fill(0);
   for (var i = 0; i < 6; i++) {
     if (i % 4 != 2) {
-      rect(width / 42 + i * width / 21, height - height / 3, width / 21, height / 6, 0, 0, 10, 10);
-      rect(width / 42 + i * width / 21 + width / 3, height - height / 3, width / 21, height / 6, 0, 0, 10, 10);
-      rect(width / 42 + i * width / 21 + (width / 3)*2, height - height / 3, width / 21, height / 6, 0, 0, 10, 10);
+      rect(
+        width / 42 + (i * width) / 21,
+        height - height / 3,
+        width / 21,
+        height / 6,
+        0,
+        0,
+        10,
+        10
+      );
+      rect(
+        width / 42 + (i * width) / 21 + width / 3,
+        height - height / 3,
+        width / 21,
+        height / 6,
+        0,
+        0,
+        10,
+        10
+      );
+      rect(
+        width / 42 + (i * width) / 21 + (width / 3) * 2,
+        height - height / 3,
+        width / 21,
+        height / 6,
+        0,
+        0,
+        10,
+        10
+      );
     }
   }
-  noStroke()
-  fill(210)
-  rect(width *0.05+3, height/5+5, width * 0.82, height/6, 40)
-  fill(230)
-  rect(width *0.05, height/5, width * 0.82, height/6, 40)
+  noStroke();
+  fill(210);
+  rect(width * 0.05 + 3, height / 5 + 5, width * 0.82, height / 6, 40);
+  fill(230);
+  rect(width * 0.05, height / 5, width * 0.82, height / 6, 40);
 
   //button
-  button = createImg('buttonimages/piano.png');
-  button.size(width*0.1, height*0.06); 
-  button.position(width*0.03, height*0.57);
-  button.mousePressed(
-    function(){
-      mainMode=true;
-      console.log("changepiano");
-    }
-  );
-  button2 = createImg('buttonimages/effect.png');
-  button2.size(width*0.18, height*0.06); 
-  button2.position(width*0.15, height*0.57);
-  button2.mousePressed(
-    function(){
-      mainMode=false;
-      console.log("changeeffect");
-    }); 
+  button = createImg("buttons/piano.png");
+  button.size(width * 0.1, height * 0.06);
+  button.position(width * 0.03, height * 0.57);
+  button.mousePressed(function () {
+    mainMode = true;
+    console.log("changepiano");
+  });
+  button2 = createImg("buttons/effect.png");
+  button2.size(width * 0.18, height * 0.06);
+  button2.position(width * 0.15, height * 0.57);
+  button2.mousePressed(function () {
+    mainMode = false;
+    console.log("changeeffect");
+  });
 }
 
-function draw() {
-
-}
+function draw() {}
 
 function changeMode_piano() {
   if (mouseY > windowHeight - height / 6) {
     for (var i = 0; i < 21; i++) {
-      if (mouseX > i * width / 21 && mouseX < (i + 1) * width / 21) mode = i;
+      if (mouseX > (i * width) / 21 && mouseX < ((i + 1) * width) / 21)
+        mode = i;
     }
   }
   if (mouseY < windowHeight - height / 6) {
@@ -113,36 +145,52 @@ function changeMode_piano() {
   }
 }
 
-function changeMode_soundEffect(){
+function changeMode_soundEffect() {
   if (mouseY > windowHeight - height / 6) {
     for (var i = 0; i < 21; i++) {
-      if (mouseX > i * width / 21 && mouseX < (i + 1) * width / 21) mode = i+if_effect;
+      if (mouseX > (i * width) / 21 && mouseX < ((i + 1) * width) / 21)
+        mode = i + if_effect;
     }
   }
   if (mouseY < windowHeight - height / 6) {
     if (mouseX < width / 42) mode = if_effect;
-    if (mouseX > (width / 42) * 5 && mouseX < (width / 42) * 6) mode = 2+if_effect;
-    if (mouseX > (width / 42) * 6 && mouseX < (width / 42) * 7) mode = 3+if_effect;
-    if (mouseX > (width / 42) * 13 && mouseX < (width / 42) * 14) mode = 6+if_effect;
-    if (mouseX > (width / 42) * 14 && mouseX < (width / 42) * 15) mode = 7+if_effect;
-    if (mouseX > (width / 42) * 19 && mouseX < (width / 42) * 20) mode = 9+if_effect;
-    if (mouseX > (width / 42) * 20 && mouseX < (width / 42) * 21) mode = 10+if_effect;
-    if (mouseX > (width / 42) * 27 && mouseX < (width / 42) * 28) mode = 13+if_effect;
-    if (mouseX > (width / 42) * 28 && mouseX < (width / 42) * 29) mode = 14+if_effect;
-    if (mouseX > (width / 42) * 33 && mouseX < (width / 42) * 34) mode = 16+if_effect;
-    if (mouseX > (width / 42) * 34 && mouseX < (width / 42) * 35) mode = 17+if_effect;
-    if (mouseX > (width / 42) * 41 && mouseX < (width / 42) * 42) mode = 20+if_effect;
+    if (mouseX > (width / 42) * 5 && mouseX < (width / 42) * 6)
+      mode = 2 + if_effect;
+    if (mouseX > (width / 42) * 6 && mouseX < (width / 42) * 7)
+      mode = 3 + if_effect;
+    if (mouseX > (width / 42) * 13 && mouseX < (width / 42) * 14)
+      mode = 6 + if_effect;
+    if (mouseX > (width / 42) * 14 && mouseX < (width / 42) * 15)
+      mode = 7 + if_effect;
+    if (mouseX > (width / 42) * 19 && mouseX < (width / 42) * 20)
+      mode = 9 + if_effect;
+    if (mouseX > (width / 42) * 20 && mouseX < (width / 42) * 21)
+      mode = 10 + if_effect;
+    if (mouseX > (width / 42) * 27 && mouseX < (width / 42) * 28)
+      mode = 13 + if_effect;
+    if (mouseX > (width / 42) * 28 && mouseX < (width / 42) * 29)
+      mode = 14 + if_effect;
+    if (mouseX > (width / 42) * 33 && mouseX < (width / 42) * 34)
+      mode = 16 + if_effect;
+    if (mouseX > (width / 42) * 34 && mouseX < (width / 42) * 35)
+      mode = 17 + if_effect;
+    if (mouseX > (width / 42) * 41 && mouseX < (width / 42) * 42)
+      mode = 20 + if_effect;
   }
 }
 
 function soundPlay() {
-  if (mouseX < windowWidth && mouseY > windowHeight - height / 3 && mouseY < windowHeight) {
+  if (
+    mouseX < windowWidth &&
+    mouseY > windowHeight - height / 3 &&
+    mouseY < windowHeight
+  ) {
     if (mainMode == true) changeMode_piano();
     else changeMode_soundEffect();
     sounds[mode].play();
     sounds[mode].amp(1);
-    if (musicData.length < 12){
-      musicData.push(mode)
+    if (musicData.length < 12) {
+      musicData.push(mode);
     }
   }
 }
@@ -153,4 +201,4 @@ function mousePressed() {
 
 function mouseReleased() {
   sounds[mode].amp(0, 1);
-}
+}