From 9497ef36f7821052ce87c5aa066bc55ba3341d0b Mon Sep 17 00:00:00 2001
From: Jeffrey Sun <jrsun@mit.edu>
Date: Thu, 15 Dec 2016 18:34:42 -0800
Subject: [PATCH] mouth and cancel eyes

---
 js/fox.js | 15 +++++++++++++--
 server.js | 24 ++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/js/fox.js b/js/fox.js
index 22dc5df..68a559c 100644
--- a/js/fox.js
+++ b/js/fox.js
@@ -54,7 +54,8 @@ var Fox = function (IMG_WIDTH, IMG_HEIGHT) {
     return {
       height: eyeHeight,
       width: eyeHeight/2,
-      style: chance.pickone(['ellipse', 'smiley']),
+      style: 'ellipse',
+      // style: chance.pickone(['ellipse', 'smiley']),
       left: {
         x: origin.x + (headWidth/2) - offsetX,
         y: origin.y + (headHeight/2) + offsetY
@@ -75,6 +76,16 @@ var Fox = function (IMG_WIDTH, IMG_HEIGHT) {
     }
   }(eyes));
 
+  var mouth = (function (nose) {
+    return {
+      x: origin.x + (headWidth/2),
+      y: (nose.y + 0.15 * (origin.y + headHeight - nose.y)),
+      width: 0.08 * headWidth,
+      height: 0.04 * headWidth,
+      style: chance.pickone(['smirk', 'cat'])
+    }
+  }(nose));
+
   return {
     canvas: {
       height: IMG_HEIGHT,
@@ -98,7 +109,7 @@ var Fox = function (IMG_WIDTH, IMG_HEIGHT) {
     ears: ears,
     eyes: eyes,
     nose: nose,
-    // mouth: mouth
+    mouth: mouth
   };
 };
 
diff --git a/server.js b/server.js
index 9cfe4dc..5b4a8fb 100644
--- a/server.js
+++ b/server.js
@@ -52,6 +52,7 @@ var renderFox = function (canvas, opts) {
     // draw nose
     renderNose(ctx, opts.nose);
     // draw mouth
+    renderMouth(ctx, opts.mouth);
 };
 
 function renderHead(ctx, opts) {
@@ -116,10 +117,29 @@ function renderNose(ctx, opts) {
   ctx.bezierCurveTo(opts.x - opts.width/2, opts.y - opts.height/2, opts.x, opts.y - opts.height, opts.x + opts.width/2, opts.y - opts.height/2);
   ctx.bezierCurveTo(opts.x + opts.width/2, opts.y - opts.height/2, opts.x + opts.width/2, opts.y + opts.height/2, opts.x, opts.y + opts.height/2);
   ctx.bezierCurveTo(opts.x, opts.y + opts.height/2, opts.x - opts.width/2, opts.y + opts.height/2, opts.x - opts.width/2, opts.y - opts.height/2);
-    // drawEllipseByCenter(ctx, opts.x, opts.y, opts.width, opts.height, "black", null, 0.5);
   ctx.fillStyle = "black";
   ctx.fill();
-  //ctx.closePath(); // not used correctly, see comments (use to close off open path)
+  ctx.stroke();
+}
+
+function renderMouth(ctx, opts) {
+  ctx.strokeStyle = "black";
+  ctx.lineWidth = 2;
+  ctx.beginPath();
+  switch (opts.style) {
+    case "smirk":
+      ctx.moveTo(opts.x - opts.width/2, opts.y - opts.height/2);
+      ctx.bezierCurveTo(opts.x - opts.width/2, opts.y - opts.height/2,
+        opts.x - opts.width/2, opts.y + opts.height/2,
+        opts.x + opts.width/2, opts.y
+      )
+      break;
+    case "cat":
+      ctx.moveTo(opts.x - opts.width/2, opts.y + opts.height/2);
+      ctx.lineTo(opts.x, opts.y - opts.height/2);
+      ctx.lineTo(opts.x + opts.width/2, opts.y + opts.height/2);
+      break;
+  }
   ctx.stroke();
 }