From 2ce3b6e70339a3a15d2d76f6d9a85a9d13aec95b Mon Sep 17 00:00:00 2001
From: Andrew Lohr <ajlohr@us.ibm.com>
Date: Sun, 12 May 2019 21:03:09 -0400
Subject: [PATCH] mobile updates

---
 css/coaster.css |  6 ++++++
 index.html      |  4 +---
 js/coaster.js   | 25 ++++++++++++++-----------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/css/coaster.css b/css/coaster.css
index a8066d5..b20a527 100644
--- a/css/coaster.css
+++ b/css/coaster.css
@@ -1,3 +1,9 @@
+html, body {
+	width:  100%;
+	height: 100%;
+	margin: 0;
+}
+
 body{
 	background-color: #EBFCFB;
 }
diff --git a/index.html b/index.html
index 69c2e21..292b78a 100644
--- a/index.html
+++ b/index.html
@@ -9,8 +9,6 @@
 		gtag('js', new Date());
 
 		gtag('config', 'UA-76140962-6');
-		ga('set', 'checkProtocolTask', null); // Disable file protocol checking.
-
 	</script>
 
 	<title>Rounding Rollercoaster</title>
@@ -70,7 +68,7 @@ <h1 id="numDisplay" class="large"></h1>
 	<!-- Coaster image space-->
 	<div class="grid-x grid-padding-x">
 		<div class="large-12 cell">
-			<div class="callout">
+			<div id="canvasContainer" class="callout">
 				<canvas id="canvas">Canvas is not supported in your browser.</canvas>
 			</div>
 		</div>
diff --git a/js/coaster.js b/js/coaster.js
index bced8a9..c363d85 100644
--- a/js/coaster.js
+++ b/js/coaster.js
@@ -4,8 +4,8 @@ $(document).foundation();
 const UP_CHOICE = "up";
 const DOWN_CHOICE = "down";
 const SAME_CHOICE = "same";
-const CANVAS_HEIGHT = 300;
-const CANVAS_WIDTH = 1150;
+const CANVAS_HEIGHT = 350;
+const CANVAS_WIDTH = $("#canvasContainer").width();
 
 let OPTIONS = {
 	minInt: 0,
@@ -14,16 +14,16 @@ let OPTIONS = {
 
 // Points used to create the bezier curve coaster track
 const downhillPoints = {
-	start: {x: 5, y: 50},
- 	cp1: {x: 300, y: 50},
- 	cp2: {x: 400, y: CANVAS_HEIGHT},
- 	end: {x: CANVAS_WIDTH, y: 260},
+	start: {x: 0, y: 20},
+ 	cp1: {x: CANVAS_WIDTH * .25, y: 50},
+ 	cp2: {x: CANVAS_WIDTH * .5, y: CANVAS_HEIGHT},
+ 	end: {x: CANVAS_WIDTH, y: CANVAS_HEIGHT},
 };
 
 const uphillPoints = {
 	start: {x: 0, y: CANVAS_HEIGHT},
-	cp1: {x: 300, y: CANVAS_HEIGHT},
-	cp2: {x: 900, y: 0},
+	cp1: {x: CANVAS_WIDTH * .25, y: CANVAS_HEIGHT},
+	cp2: {x: CANVAS_WIDTH  * .5, y: 0},
 	end: {x: CANVAS_WIDTH, y: 0},
 };
 
@@ -173,8 +173,9 @@ function draw(doUphill, points, sliderValue) {
 	ctx.bezierCurveTo(points.cp1.x, points.cp1.y, points.cp2.x, points.cp2.y, points.end.x, points.end.y);
 	ctx.stroke();
 
+	// raise the coaster up above the track so the wheels are touching it
 	let offset = -(coasterHeight + (wheel1.y / 2));
-	let t = (sliderValue - 5) / 20;
+	let t = (sliderValue - 10) / 20;
 
 	let bezierPoint = getQuadraticBezierXYatT(
 		{
@@ -208,10 +209,12 @@ function drawCoaster(doUphill, points, bezierPoint) {
 
 	// When the coaster will rotate downward will be right as the curve dips and then back to normal
 	// (no rotation) when the track evens out at the end
-	if((bezierPoint.x > points.cp1.x / 4) && (bezierPoint.x < points.cp2.x * 1.7)) {
-		let rotation = doUphill ? -20 : 20;
+	if((bezierPoint.x > points.cp1.x / 4) && (bezierPoint.x < points.cp2.x * 1.45)) {
+		let rotationNum = CANVAS_WIDTH < 400 ? 55 : 25;
+		let rotation = doUphill ? -(rotationNum) : rotationNum;
 		ctx.rotate(rotation * Math.PI / 180);
 	}
+
 	let coasterHalfWidth = coasterWidth / 2;
 
 	// coaster cart