summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/mx/primitives
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-06-19 16:01:25 -0400
committerJules Laplace <jules@okfoc.us>2014-06-19 16:01:25 -0400
commit615e285aba96554d0e29063d7491645810cb08b8 (patch)
treeddc409898299dd90611c73a2ddf62a149c369734 /public/assets/javascripts/mx/primitives
parent9a4730ac59f0cf83b2fdca3672a9f622db6c8aa2 (diff)
serialize/deserialize scenery
Diffstat (limited to 'public/assets/javascripts/mx/primitives')
-rw-r--r--public/assets/javascripts/mx/primitives/mx.image.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/public/assets/javascripts/mx/primitives/mx.image.js b/public/assets/javascripts/mx/primitives/mx.image.js
index 15bf050..8b11473 100644
--- a/public/assets/javascripts/mx/primitives/mx.image.js
+++ b/public/assets/javascripts/mx/primitives/mx.image.js
@@ -33,13 +33,14 @@ MX.Image = MX.Object3D.extend({
loadTexture: function(ops){
var layer = this
layer.ops = defaults(ops, layer.ops)
+ console.log(layer.ops.y, layer.y)
var image = new Image()
image.onload = function(){
layer.scale = layer.ops.scale || 1
layer.width = image.naturalWidth
layer.height = image.naturalHeight
layer.x = layer.ops.x || 0
- layer.y = (layer.ops.y || 0) + layer.scale * layer.height/2 + 1
+ layer.y = layer.ops.y || 0
layer.z = layer.ops.z || 0
layer.rotationX = layer.ops.rotationX || 0
layer.rotationY = layer.ops.rotationY || 0