toggle keyboard/orbit cam

2 files changed, 12 insertions, 7 deletions

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 9af2c8d..bc71fc4 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -39,7 +39,7 @@ MX.Movements = function (cam) {
   })
 
 	function clampRotation( vr ) {
-		if (Rooms.mover.noclip) {
+		if (window.Rooms && Rooms.mover.noclip) {
 			return clamp(vr, PI/-2, PI/2 )
 		}
 		else {
@@ -221,15 +221,19 @@ MX.Movements = function (cam) {
 
 /*					
 				case 48: // 0
-					cam.rotationX = 0
-					cam.rotationY = 0
-					cam.x = 0
-					cam.y = viewHeight
-					cam.z = 0
+					movements.center()
 					break
 */
 			}
 		},
+		
+		center: function(){
+      cam.rotationX = 0
+      cam.rotationY = 0
+      cam.x = 0
+      cam.y = viewHeight
+      cam.z = 0
+		},
 
 		mousedown: function (e) {
 			if (locked) return;
@@ -341,7 +345,7 @@ MX.Movements = function (cam) {
 					jumping = false
 				}
 
-				var ceiling = (Rooms.mover.room ? Rooms.mover.room.height : 5000)
+				var ceiling = ((window.Rooms && Rooms.mover.room) ? Rooms.mover.room.height : 5000)
 				
 				if (pos.y >= ceiling-5) {
 					vy = 0
diff --git a/public/assets/javascripts/mx/extensions/mx.orbitCamera.js b/public/assets/javascripts/mx/extensions/mx.orbitCamera.js
index 6dc5b6c..f4759fb 100644
--- a/public/assets/javascripts/mx/extensions/mx.orbitCamera.js
+++ b/public/assets/javascripts/mx/extensions/mx.orbitCamera.js
@@ -68,6 +68,7 @@ MX.OrbitCamera = function(opt){
 	  if (typeof x == "number") { opt.rotationX = x }
 	}
 	exports.update = function(){
+	  if (! bound) return
 	  if (abs(ry - opt.rotationY) > epsilon) {
       ry = avg(ry, opt.rotationY, opt.ease)
 	  }