merge

1 files changed, 32 insertions, 3 deletions

diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js
index 3221bac..b3c7d66 100644
--- a/public/assets/javascripts/rectangles/_env.js
+++ b/public/assets/javascripts/rectangles/_env.js
@@ -1,6 +1,22 @@
 var environment = new function(){}
 environment.init = function(){
 
+	scene = new MX.Scene().addTo('#scene')
+	scene.width = window.innerWidth
+	scene.height = window.innerHeight
+	scene.perspective = window.innerHeight
+
+	cam = scene.camera
+	cam.y = viewHeight
+	
+	if (is_mobile) {
+		app.movements = new MX.MobileMovements(cam, viewHeight)
+	}
+	else {
+		app.movements = new MX.Movements(cam, viewHeight)
+	}
+	app.movements.init()
+	
 	map = new Map ()
 
 	if (window.scene) {
@@ -16,10 +32,18 @@ environment.init = function(){
 		
 		scene.camera.radius = 20
 	}
-	
+
+	window.onresize = function () {
+		scene.width = window.innerWidth
+		scene.height = window.innerHeight
+		scene.perspective = window.innerHeight
+		scene.update()
+	}
+
 	Rooms.init()
 	Walls.init()
 	Scenery.init()
+	Sculpture.init()
 	
 	scene.update()
 	environment.update()
@@ -51,8 +75,13 @@ environment.init = function(){
     }
   })
 }
-environment.update = function(t){
+environment.minimal = function(){
+  environment.update = function(t){}
+}
+environment.update = function(t, dt){
+  app.movements.update(dt || 0)
+  scene.update()
 	map.update()
-	window.minimap && window.minimap.update && minimap.update()
+	window.minimap && minimap.update && minimap.update()
 	z = false
 }