From f94cf0d133a5d426a20cb5ac7eeb60f72b690119 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 22 Apr 2014 18:39:14 -0400 Subject: turn on gravity --- assets/javascripts/mx/extensions/mx.movements.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'assets/javascripts/mx') diff --git a/assets/javascripts/mx/extensions/mx.movements.js b/assets/javascripts/mx/extensions/mx.movements.js index 2f76e8c..6837637 100644 --- a/assets/javascripts/mx/extensions/mx.movements.js +++ b/assets/javascripts/mx/extensions/mx.movements.js @@ -17,11 +17,11 @@ MX.Movements = function (cam, viewHeight) { locked = false, gravity = false - var v = 20, + var v = 15, vr = Math.PI * 0.015 - jumpV = 30, + jumpV = 23, vx = vy = vz = 0, - creepFactor = 0.1 + creepFactor = 0.3 var DEFAULT_SCALE = scale = 1.0 @@ -77,9 +77,7 @@ MX.Movements = function (cam, viewHeight) { case 32: // space if (gravity) { jumping = true - vy = abs(vy) + jumpV * scale - if (e.shiftKey) { vy *= -1 } @@ -240,6 +238,9 @@ MX.Movements = function (cam, viewHeight) { cam.y += vy cam.z += vz + if (vx || vz) { + app.tube("move", cam) + } } if (gravity) { @@ -260,5 +261,8 @@ MX.Movements = function (cam, viewHeight) { unlock: function(){ locked = false }, scale: function(n){ if (n) scale = n; return scale }, resetScale: function(n){ scale = DEFAULT_SCALE }, + gravity: function(g){ gravity = g }, + velocity: function(n){ v = clamp(n, 1, 50) }, + jumpVelocity: function(n){ jumpV = clamp(n, 1, 50) }, } } -- cgit v1.2.3-70-g09d2