diff options
Diffstat (limited to 'public/assets/javascripts/mx')
| -rw-r--r-- | public/assets/javascripts/mx/extensions/mx.movements.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/mx/primitives/mx.image.js | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js index d02b2d2..f176e8b 100644 --- a/public/assets/javascripts/mx/extensions/mx.movements.js +++ b/public/assets/javascripts/mx/extensions/mx.movements.js @@ -25,7 +25,7 @@ MX.Movements = function (cam, viewHeight) { vx = vy = vz = 0, creepFactor = 0.3 - var DEFAULT_SCALE = scale = 1.0 + var DEFAULT_SCALE = 1.0, scale = DEFAULT_SCALE var pos = { x: 0, y: 0, z: 0, rotationX: 0, rotationY: 0 } diff --git a/public/assets/javascripts/mx/primitives/mx.image.js b/public/assets/javascripts/mx/primitives/mx.image.js index 8b11473..e36c857 100644 --- a/public/assets/javascripts/mx/primitives/mx.image.js +++ b/public/assets/javascripts/mx/primitives/mx.image.js @@ -9,6 +9,7 @@ MX.Image = MX.Object3D.extend({ layer.x = ops.x || 0 layer.y = ops.y || 0 layer.z = ops.z || 0 + layer.scale = ops.scale || 1 layer.backface = ops.backface || false layer.media = ops.media @@ -37,8 +38,8 @@ MX.Image = MX.Object3D.extend({ var image = new Image() image.onload = function(){ layer.scale = layer.ops.scale || 1 - layer.width = image.naturalWidth - layer.height = image.naturalHeight + layer.width = layer.ops.width || image.naturalWidth + layer.height = layer.ops.height || image.naturalHeight layer.x = layer.ops.x || 0 layer.y = layer.ops.y || 0 layer.z = layer.ops.z || 0 |