summaryrefslogtreecommitdiff
path: root/assets/javascripts/mx/extensions/mx.movements.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-04-22 18:39:14 -0400
committerJules Laplace <jules@okfoc.us>2014-04-22 18:39:14 -0400
commitf94cf0d133a5d426a20cb5ac7eeb60f72b690119 (patch)
treeb605578151d9d1118dc8921845d9bc205a6f1f3b /assets/javascripts/mx/extensions/mx.movements.js
parentd08f365e4deb3206fd3361c7395268983510d831 (diff)
turn on gravity
Diffstat (limited to 'assets/javascripts/mx/extensions/mx.movements.js')
-rw-r--r--assets/javascripts/mx/extensions/mx.movements.js14
1 files changed, 9 insertions, 5 deletions
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) },
}
}