diff options
author | hwc487 | 2012-03-06 16:03:26 -0800 |
---|---|---|
committer | hwc487 | 2012-03-06 16:03:26 -0800 |
commit | 855e8727b147771ff7b05e71bed481e65fe4b6b0 (patch) | |
tree | 60d7f091fcf0870495aeaa63748492dbd558619d /js/helper-classes/3D/Rectangle.js | |
parent | 1207735f05f202b5bdc5f70c73445f8e0934a227 (diff) | |
parent | 4f498b43264327f5886e0370bd3536453d47570a (diff) | |
download | ninja-855e8727b147771ff7b05e71bed481e65fe4b6b0.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts:
js/preloader/Preloader.js
Diffstat (limited to 'js/helper-classes/3D/Rectangle.js')
-rwxr-xr-x | js/helper-classes/3D/Rectangle.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/3D/Rectangle.js b/js/helper-classes/3D/Rectangle.js index e797eedf..b8906f18 100755 --- a/js/helper-classes/3D/Rectangle.js +++ b/js/helper-classes/3D/Rectangle.js | |||
@@ -35,7 +35,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, { | |||
35 | getTop: { value: function() { return this.m_top; } }, | 35 | getTop: { value: function() { return this.m_top; } }, |
36 | setTop: { value: function(t) { this.m_top = t; } }, | 36 | setTop: { value: function(t) { this.m_top = t; } }, |
37 | 37 | ||
38 | getCenter: { value: function() { return Vector.create( [this.m_left + 0.5*this.m_width, this.m_top + 0.5*this.m_height] ); } }, | 38 | getCenter: { value: function() { return [this.m_left + 0.5*this.m_width, this.m_top + 0.5*this.m_height]; } }, |
39 | 39 | ||
40 | getWidth: { value: function() { return this.m_width; } }, | 40 | getWidth: { value: function() { return this.m_width; } }, |
41 | setWidth: { value: function(w) { this.m_width = w; } }, | 41 | setWidth: { value: function(w) { this.m_width = w; } }, |