Added animal images and error recording

ubc-cpsc · Jan 2, 2018 · 44c6c92 · 44c6c92
1 parent c05a2d1
commit 44c6c92
Show file tree

Hide file tree

Showing 43 changed files with 21 additions and 2 deletions.
diff --git a/Programming/2018/starter/canvas.js b/Programming/2018/starter/canvas.js
@@ -38,8 +38,8 @@ let R_KEY = 82;
 function preload() {
   // If you want to use other images, put them in the images folder
   // and change the panda.png part to be the image file name
-  petImage = loadImage("images/panda.png");
-  foodImage = loadImage("images/bamboo.png");
+  petImage = loadImage("images/animal/panda.png");
+  foodImage = loadImage("images/food/bamboo.png");
 }
 
 function setup() {

diff --git a/Programming/2018/starter/images/animal/alligator.png b/Programming/2018/starter/images/animal/alligator.png
diff --git a/Programming/2018/starter/images/animal/bear.png b/Programming/2018/starter/images/animal/bear.png
diff --git a/Programming/2018/starter/images/animal/bird.png b/Programming/2018/starter/images/animal/bird.png
diff --git a/Programming/2018/starter/images/animal/cat.png b/Programming/2018/starter/images/animal/cat.png
diff --git a/Programming/2018/starter/images/animal/cow.png b/Programming/2018/starter/images/animal/cow.png
diff --git a/Programming/2018/starter/images/animal/deer.png b/Programming/2018/starter/images/animal/deer.png
diff --git a/Programming/2018/starter/images/animal/dinosaur.png b/Programming/2018/starter/images/animal/dinosaur.png
diff --git a/Programming/2018/starter/images/animal/dolphin.png b/Programming/2018/starter/images/animal/dolphin.png
diff --git a/Programming/2018/starter/images/animal/dragon.png b/Programming/2018/starter/images/animal/dragon.png
diff --git a/Programming/2018/starter/images/animal/elephant.png b/Programming/2018/starter/images/animal/elephant.png
diff --git a/Programming/2018/starter/images/animal/fish.png b/Programming/2018/starter/images/animal/fish.png
diff --git a/Programming/2018/starter/images/animal/fox.png b/Programming/2018/starter/images/animal/fox.png
diff --git a/Programming/2018/starter/images/animal/frog.png b/Programming/2018/starter/images/animal/frog.png
diff --git a/Programming/2018/starter/images/animal/giraffe.png b/Programming/2018/starter/images/animal/giraffe.png
diff --git a/Programming/2018/starter/images/animal/horse.png b/Programming/2018/starter/images/animal/horse.png
diff --git a/Programming/2018/starter/images/animal/lion.png b/Programming/2018/starter/images/animal/lion.png
diff --git a/Programming/2018/starter/images/animal/monkey.png b/Programming/2018/starter/images/animal/monkey.png
diff --git a/Programming/2018/starter/images/animal/mouse.png b/Programming/2018/starter/images/animal/mouse.png
diff --git a/Programming/2018/starter/images/panda.png → ...ming/2018/starter/images/animal/panda.png b/Programming/2018/starter/images/panda.png → ...ming/2018/starter/images/animal/panda.png
diff --git a/Programming/2018/starter/images/animal/penguin.png b/Programming/2018/starter/images/animal/penguin.png
diff --git a/Programming/2018/starter/images/animal/pig.png b/Programming/2018/starter/images/animal/pig.png
diff --git a/Programming/2018/starter/images/animal/rabbit.png b/Programming/2018/starter/images/animal/rabbit.png
diff --git a/Programming/2018/starter/images/animal/shark.png b/Programming/2018/starter/images/animal/shark.png
diff --git a/Programming/2018/starter/images/animal/sheep.png b/Programming/2018/starter/images/animal/sheep.png
diff --git a/Programming/2018/starter/images/animal/squirrel.png b/Programming/2018/starter/images/animal/squirrel.png
diff --git a/Programming/2018/starter/images/animal/tiger.png b/Programming/2018/starter/images/animal/tiger.png
diff --git a/Programming/2018/starter/images/animal/whale.png b/Programming/2018/starter/images/animal/whale.png
diff --git a/Programming/2018/starter/images/animal/wolf.png b/Programming/2018/starter/images/animal/wolf.png
diff --git a/Programming/2018/starter/images/animal/worm.png b/Programming/2018/starter/images/animal/worm.png
diff --git a/Programming/2018/starter/images/animal/zebra.png b/Programming/2018/starter/images/animal/zebra.png
diff --git a/Programming/2018/starter/images/bamboo.png → ...mming/2018/starter/images/food/bamboo.png b/Programming/2018/starter/images/bamboo.png → ...mming/2018/starter/images/food/bamboo.png
diff --git a/Programming/2018/starter/images/food/bananas.png b/Programming/2018/starter/images/food/bananas.png
diff --git a/Programming/2018/starter/images/food/berries.png b/Programming/2018/starter/images/food/berries.png
diff --git a/Programming/2018/starter/images/food/carrot.png b/Programming/2018/starter/images/food/carrot.png
diff --git a/Programming/2018/starter/images/food/cheese.png b/Programming/2018/starter/images/food/cheese.png
diff --git a/Programming/2018/starter/images/food/chestnut.png b/Programming/2018/starter/images/food/chestnut.png
diff --git a/Programming/2018/starter/images/food/grass.png b/Programming/2018/starter/images/food/grass.png
diff --git a/Programming/2018/starter/images/food/hay.png b/Programming/2018/starter/images/food/hay.png
diff --git a/Programming/2018/starter/images/food/leaves.png b/Programming/2018/starter/images/food/leaves.png
diff --git a/Programming/2018/starter/images/food/meat.png b/Programming/2018/starter/images/food/meat.png
diff --git a/Programming/2018/starter/index.html b/Programming/2018/starter/index.html
@@ -5,7 +5,17 @@
     <link rel="stylesheet" href="style.css">
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.5.11/p5.js"></script>
+    <div  id="errorBox">
+    	<p>An error occured inside your game. Go back to the editor to see what it is.</p>
+    </div>
+    <script>
+    	window.onerror = function (msg, url, lineNo, columnNo, error) {
+    		document.getElementById('errorBox').style.display = 'block';
+  			return false;
+		}
+	</script>
     <script src="canvas.js"></script> <!-- this line is not needed on codepen-->
+
   </head>
   <body>
   </body>

diff --git a/Programming/2018/starter/style.css b/Programming/2018/starter/style.css
@@ -2,6 +2,15 @@ html, body {
   height: 100%;
 }
 
+#errorBox{
+	display: none;
+	position: fixed;
+	top: 50%;
+	width: 100%;
+	font-size: 20px;
+	background-color: red;
+}
+
 body {
   margin: 0;
   display: flex;