diff options
Diffstat (limited to 'assets/javascripts/mx')
| -rw-r--r-- | assets/javascripts/mx/extensions/mx.movements.js | 8 | ||||
| -rw-r--r-- | assets/javascripts/mx/mx.js | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/assets/javascripts/mx/extensions/mx.movements.js b/assets/javascripts/mx/extensions/mx.movements.js index 164d747..2f377cb 100644 --- a/assets/javascripts/mx/extensions/mx.movements.js +++ b/assets/javascripts/mx/extensions/mx.movements.js @@ -222,10 +222,10 @@ MX.Movements = function (cam, viewHeight) { vz += v * Math.sin(ry) * s } if (moveUp) { - vy += v * scale + pos.y += v * scale } if (moveDown) { - vy -= v * scale + pos.y -= v * scale } if (turnUp) { @@ -242,7 +242,6 @@ MX.Movements = function (cam, viewHeight) { } pos.x += vx - pos.y += vy pos.z += vz } @@ -265,7 +264,6 @@ MX.Movements = function (cam, viewHeight) { pos.y = ceiling vz = vz || 1 } - } if (vx || vy || vz) { @@ -277,7 +275,7 @@ 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 }, + gravity: function(g){ return typeof g == "boolean" ? gravity = g : gravity }, velocity: function(n){ v = clamp(n, 1, 50) }, jumpVelocity: function(n){ jumpV = clamp(n, 1, 50) }, } diff --git a/assets/javascripts/mx/mx.js b/assets/javascripts/mx/mx.js index df9abe7..79423df 100644 --- a/assets/javascripts/mx/mx.js +++ b/assets/javascripts/mx/mx.js @@ -138,7 +138,7 @@ var MX = MX || (function (undefined) { // ======================================================================== function Object3D (el) { - +console.log(el) this.setupDomElement(el) this.setCSSTransformStyle('preserve-3d') this.el.classList.add('mx-object3d') @@ -222,6 +222,7 @@ var MX = MX || (function (undefined) { if (classes) { var i = classes.length while (i--) { + console.log(classes[i].slice(1)) this.el.classList.add(classes[i].slice(1)) } } |