merge master

1 files changed, 9 insertions, 8 deletions

diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js
index 1419d1d..ad3c601 100644
--- a/public/assets/javascripts/app.js
+++ b/public/assets/javascripts/app.js
@@ -27,11 +27,7 @@ app.init = function () {
 }
 
 app.launch = function () {
-	var mainbox,
-			coords,
-			box, size,
-			floor,
-			movements
+	var movements
 
 	scene = new MX.Scene().addTo('#scene')
 	scene.width = window.innerWidth
@@ -50,14 +46,19 @@ app.launch = function () {
 	
 	if (MX.Map) map = app.map = new MX.Map()
 	
-	movements = app.movements = new MX.Movements(cam, viewHeight)
-	movements.init()
+	if (is_mobile) {
+		app.movements = new MX.MobileMovements(cam, viewHeight)
+	}
+	else {
+		app.movements = new MX.Movements(cam, viewHeight)
+	}
+	app.movements.init()
 	
 	function animate (t) {
 		requestAnimationFrame(animate)
 		environment.update(t)
 		window.path && path.update(t)
-		movements.update()
+		app.movements.update()
 		scene.update()
 	}