From d67ead4ebbe27dc66d89927ff3ab91662fabdae4 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 3 Feb 2015 13:25:23 -0500
Subject: fix tests

---
 public/assets/test/intersect2.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'public/assets/test/intersect2.html')

diff --git a/public/assets/test/intersect2.html b/public/assets/test/intersect2.html
index 3df9f30..9a6deb2 100644
--- a/public/assets/test/intersect2.html
+++ b/public/assets/test/intersect2.html
@@ -6,9 +6,10 @@ body,html{margin:0;padding:0;}
 <div id="hud"></div>
 
 <script src="/assets/javascripts/util.js"></script>
-<script src="/assets/javascripts/vendor/tube.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script>
-<script src="/assets/javascripts/vendor/bower_components/lodash/dist/lodash.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/lodash/lodash.min.js"></script>
+<script src="/assets/javascripts/vendor/polyfill.js"></script>
+<script src="/assets/javascripts/vendor/tube.js"></script>
 <script src="/assets/javascripts/mx/mx.js"></script>
 <script src="/assets/javascripts/mx/extensions/mx.scene.js"></script>
 <script src="/assets/javascripts/rectangles/util/constants.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 7da20303ba24f40366e94586b45efd2f04734338 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 3 Feb 2015 13:45:31 -0500
Subject: hidpi canvas polyfill

---
 bower.json                         | 3 ++-
 public/assets/test/bg.html         | 1 +
 public/assets/test/intersect.html  | 5 +++--
 public/assets/test/intersect2.html | 7 ++++---
 public/assets/test/intersect3.html | 7 ++++---
 public/assets/test/surface.html    | 5 +++--
 6 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'public/assets/test/intersect2.html')

diff --git a/bower.json b/bower.json
index 5f35d6c..c78310d 100644
--- a/bower.json
+++ b/bower.json
@@ -9,6 +9,7 @@
     "fiber": "",
     "jquery-jsonview": "1.2.0",
     "prefixfree": "",
-    "marked": "0.3.2"
+    "marked": "0.3.2",
+    "hidpi-canvas": "~1.0.9"
   }
 }
diff --git a/public/assets/test/bg.html b/public/assets/test/bg.html
index fecf811..65dd5d9 100644
--- a/public/assets/test/bg.html
+++ b/public/assets/test/bg.html
@@ -5,6 +5,7 @@
 <div id="cursor" style="width:30px;height:30px;background:blue;display:inline-block;"></div>
 </div>
 <script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
 <script src="/assets/javascripts/vendor/tube.js"></script>
 <script src="/assets/javascripts/vendor/loader.js"></script>
 <script src="/assets/javascripts/rectangles/util/constants.js"></script>
diff --git a/public/assets/test/intersect.html b/public/assets/test/intersect.html
index 4e5b0bb..92f1d5d 100644
--- a/public/assets/test/intersect.html
+++ b/public/assets/test/intersect.html
@@ -2,6 +2,7 @@
 <div id="hud"></div>
 
 <script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
 <script src="/assets/javascripts/vendor/tube.js"></script>
 <script src="/assets/javascripts/rectangles/util/constants.js"></script>
 <script src="/assets/javascripts/rectangles/util/mouse.js"></script>
@@ -10,11 +11,11 @@
 <script src="/assets/javascripts/vendor/canvasutilities.js"></script>
 <script>
 
-var ctx = canvas.getContext('2d')
-
 var w = canvas.width = 600
 var h = canvas.height = 400
 
+var ctx = canvas.getContext('2d')
+
 var vec_a = new Rect( 100, 120, 50, 100 )
 var vec_b = new Rect( 20, 200, 120, 120 )
 var vecs = [ vec_a, vec_b ]
diff --git a/public/assets/test/intersect2.html b/public/assets/test/intersect2.html
index 9a6deb2..553e2f7 100644
--- a/public/assets/test/intersect2.html
+++ b/public/assets/test/intersect2.html
@@ -8,6 +8,7 @@ body,html{margin:0;padding:0;}
 <script src="/assets/javascripts/util.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/lodash/lodash.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
 <script src="/assets/javascripts/vendor/polyfill.js"></script>
 <script src="/assets/javascripts/vendor/tube.js"></script>
 <script src="/assets/javascripts/mx/mx.js"></script>
@@ -30,12 +31,12 @@ body,html{margin:0;padding:0;}
 <script src="/assets/javascripts/vendor/canvasutilities.js"></script>
 <script>
 
-var ctx = canvas.getContext('2d')
-var scene = new MX.Scene()
-
 var w = canvas.width = window.innerWidth
 var h = canvas.height = window.innerHeight
 
+var ctx = canvas.getContext('2d')
+var scene = new MX.Scene()
+
 var cursor = new Rect( 150, 250, 150, 250 )
 var wall_vec = new Rect ( 0, 0, 0, 0 )
 var points = [ cursor.x, cursor.y ]
diff --git a/public/assets/test/intersect3.html b/public/assets/test/intersect3.html
index 0db85f0..b8f9a0d 100644
--- a/public/assets/test/intersect3.html
+++ b/public/assets/test/intersect3.html
@@ -8,6 +8,7 @@ body,html{margin:0;padding:0;}
 <script src="/assets/javascripts/util.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/lodash/lodash.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
 <script src="/assets/javascripts/vendor/polyfill.js"></script>
 <script src="/assets/javascripts/vendor/tube.js"></script>
 <script src="/assets/javascripts/mx/mx.js"></script>
@@ -30,12 +31,12 @@ body,html{margin:0;padding:0;}
 <script src="/assets/javascripts/vendor/canvasutilities.js"></script>
 <script>
 
-var ctx = canvas.getContext('2d')
-var scene = new MX.Scene()
-
 var w = canvas.width = window.innerWidth
 var h = canvas.height = window.innerHeight
 
+var ctx = canvas.getContext('2d')
+var scene = new MX.Scene()
+
 var cursor = new Rect( new vec2(400, 200), new vec2(800, 500) )
 var wall_vec = new Rect ( 0, 0, 0, 0 )
 var points = [ cursor.x, cursor.y ]
diff --git a/public/assets/test/surface.html b/public/assets/test/surface.html
index 02be479..02b473d 100644
--- a/public/assets/test/surface.html
+++ b/public/assets/test/surface.html
@@ -1,6 +1,7 @@
 <canvas id="canvas"></canvas>
 
 <script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
 <script src="/assets/javascripts/vendor/vendor/tube.js"></script>
 <script src="/assets/javascripts/rectangles/util/constants.js"></script>
 <script src="/assets/javascripts/rectangles/util/mouse.js"></script>
@@ -9,11 +10,11 @@
 <script src="/assets/javascripts/rectangles/models/surface.js"></script>
 <script>
 
-var ctx = canvas.getContext('2d')
-
 var w = canvas.width = 600
 var h = canvas.height = 400
 
+var ctx = canvas.getContext('2d')
+
 var surface = new Surface ()
 surface.add( new Rect( new vec2(10, 100), new vec2(0, 400) ) )
 surface.add( new Rect( new vec2(100, 300), new vec2(200, 400) ) )
-- 
cgit v1.2.3-70-g09d2