diff options
| author | Julie Lala <jules@okfoc.us> | 2014-08-22 13:27:06 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-08-22 13:27:06 -0400 |
| commit | 41349226e763751311d3b0135086505a77f5472a (patch) | |
| tree | edec2928b8a7140a8fa9b1a33bb81f839bd3aafb /public/assets/javascripts/rectangles/models | |
| parent | 4ec4b0e42c06b63962658ae8b886ee9466d09a21 (diff) | |
drag and clamp
Diffstat (limited to 'public/assets/javascripts/rectangles/models')
| -rw-r--r-- | public/assets/javascripts/rectangles/models/surface.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/rectangles/models/wall.js | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/public/assets/javascripts/rectangles/models/surface.js b/public/assets/javascripts/rectangles/models/surface.js index 9c45eaf..5b411c0 100644 --- a/public/assets/javascripts/rectangles/models/surface.js +++ b/public/assets/javascripts/rectangles/models/surface.js @@ -97,8 +97,6 @@ } var top_edge = position.b + dimension.b + delta.b - bounds.y.b -// console.log(position.b, 0, delta.b, bounds.y.a, bottom_edge) -// console.log(position.b, dimension.b, delta.b, bounds.y.b, top_edge) if (top_edge > 0) { delta.b -= top_edge } diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js index f6742ad..8723c3c 100644 --- a/public/assets/javascripts/rectangles/models/wall.js +++ b/public/assets/javascripts/rectangles/models/wall.js @@ -122,7 +122,7 @@ rotationY: wall_rotation[ this.side ], } } - Wall.prototype.mxToPosition = function(mx) { + Wall.prototype.mxToPosition = function(mx, dimension) { var position = new vec2(0,0) switch (this.side) { case FRONT: @@ -136,6 +136,10 @@ position.b = mx.y break } + if (dimension) { + position.a -= dimension.a / 2 + position.b -= dimension.b / 2 + } // if (mx.width) { position.a -= mx.width / 2 } // if (mx.height) { position.b -= mx.height / 2 } return position |