Merge pull request #3 from angela-zhou/glitch

Glitch
angela-zhou · Jul 31, 2020 · a7b7ecd · a7b7ecd
2 parents 7b9594b + 555e60c
commit a7b7ecd
Show file tree

Hide file tree

Showing 4 changed files with 220 additions and 55 deletions.
diff --git a/.glitch-assets b/.glitch-assets
@@ -25,3 +25,17 @@
 {"uuid":"IVxMDUZVcezdyHZ3","deleted":true}
 {"name":"1.png","date":"2020-07-27T16:46:32.779Z","url":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2F1.png","type":"image/png","size":723714,"imageWidth":2000,"imageHeight":1000,"thumbnail":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2Fthumbnails%2F1.png","thumbnailWidth":330,"thumbnailHeight":165,"uuid":"xNrhCqouXznv2FyB"}
 {"name":"2.png","date":"2020-07-27T16:46:35.603Z","url":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2F2.png","type":"image/png","size":239036,"imageWidth":2000,"imageHeight":1000,"thumbnail":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2Fthumbnails%2F2.png","thumbnailWidth":330,"thumbnailHeight":165,"uuid":"QaPba5kmRyDmETuC"}
+{"name":"backgroundMusic.mp3","date":"2020-07-27T19:19:43.435Z","url":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2FbackgroundMusic.mp3","type":"audio/mpeg","size":7537197,"thumbnail":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2Fthumbnails%2FbackgroundMusic.mp3","thumbnailWidth":210,"thumbnailHeight":210,"uuid":"K2svyEO7klqKm5eL"}
+{"uuid":"MaA1jcBwu3iqLri0","deleted":true}
+{"uuid":"K2svyEO7klqKm5eL","deleted":true}
+{"name":"mysteryMusic.mp3","date":"2020-07-27T20:09:11.246Z","url":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2FmysteryMusic.mp3","type":"audio/mpeg","size":5818567,"thumbnail":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2Fthumbnails%2FmysteryMusic.mp3","thumbnailWidth":210,"thumbnailHeight":210,"uuid":"5NuBiALva0aiC8jZ"}
+{"uuid":"5NuBiALva0aiC8jZ","deleted":true}
+{"name":"backgroundMusic.mp3","date":"2020-07-27T20:09:56.017Z","url":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2FbackgroundMusic.mp3","type":"audio/mpeg","size":7537197,"thumbnail":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2Fthumbnails%2FbackgroundMusic.mp3","thumbnailWidth":210,"thumbnailHeight":210,"uuid":"a99hKQN6AjjuhiBC"}
+{"name":"mysteryMusicTrim.mp3","date":"2020-07-27T20:11:09.023Z","url":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2FmysteryMusicTrim.mp3","type":"audio/mpeg","size":2401406,"thumbnail":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2Fthumbnails%2FmysteryMusicTrim.mp3","thumbnailWidth":210,"thumbnailHeight":210,"uuid":"idTccWGHubaGOrbZ"}
+{"uuid":"y1JCtB875iXAZWNw","deleted":true}
+{"uuid":"WtKJZJZ7DHfWzVea","deleted":true}
+{"uuid":"x7gNzdYBaO4sXHd0","deleted":true}
+{"name":"ff.png","date":"2020-07-29T15:49:40.416Z","url":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2Fff.png","type":"image/png","size":847,"imageWidth":95,"imageHeight":50,"thumbnail":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2Fff.png","thumbnailWidth":95,"thumbnailHeight":50,"uuid":"JCL3zCyGZWeWduCY"}
+{"name":"wa.png","date":"2020-07-29T15:49:40.546Z","url":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2Fwa.png","type":"image/png","size":750,"imageWidth":90,"imageHeight":55,"thumbnail":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2Fwa.png","thumbnailWidth":90,"thumbnailHeight":55,"uuid":"UfFjm4a6CzW9MP23"}
+{"name":"le.png","date":"2020-07-29T15:49:40.630Z","url":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2Fle.png","type":"image/png","size":742,"imageWidth":95,"imageHeight":55,"thumbnail":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2Fle.png","thumbnailWidth":95,"thumbnailHeight":55,"uuid":"kt6r88pQZTutlt16"}
+{"name":"screwdriver.png","date":"2020-07-29T16:06:34.743Z","url":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2Fscrewdriver.png","type":"image/png","size":84397,"imageWidth":600,"imageHeight":585,"thumbnail":"https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2Fthumbnails%2Fscrewdriver.png","thumbnailWidth":330,"thumbnailHeight":322,"uuid":"HQTY121MsWgacyFF"}
diff --git a/index.html b/index.html
@@ -12,6 +12,9 @@
     <!-- imports collision library into the html file -->
     <script src="https://unpkg.com/p5.collide2d"></script> 
 
+     <!-- imports sound library into the html file-->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.10.2/addons/p5.sound.min.js"></script>
+
      <!-- imports clickable class into the html file -->
     <script src="clickable.js"></script> 
 
@@ -25,14 +28,20 @@
     <script src="/script.js" defer></script>
   </head>  
   <body>
+
+    <audio id="beep" loop>
+   <source src="https://cdn.glitch.com/20d3db83-bd8e-43c1-8f8b-226c9bb666c5%2FmysteryMusicTrim.mp3?v=1595880669023" type="audio/wav" />
+</audio>
+
 
     <!-- include the Glitch button to show what the webpage is about and
           to make it easier for folks to view source and remix -->
     <!-- <div class="glitchButton" style="position:fixed;top:20px;right:20px;"></div> -->
 <!--     <script src="https://button.glitch.me/button.js" defer></script> -->
 
      <!-- show the timer on the screen -->
-      <div>Time left = <span id="timer"></span></div>  
+     <div>Time left = <span id="timer"></span></div>
+
 
   </body>
 </html>