diff options
author | hwc487 | 2012-07-09 16:08:02 -0700 |
---|---|---|
committer | hwc487 | 2012-07-09 16:08:02 -0700 |
commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/helper-classes/3D/Rectangle.js | |
parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/helper-classes/3D/Rectangle.js')
-rwxr-xr-x | js/helper-classes/3D/Rectangle.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/helper-classes/3D/Rectangle.js b/js/helper-classes/3D/Rectangle.js index 1922bd91..15f812ab 100755 --- a/js/helper-classes/3D/Rectangle.js +++ b/js/helper-classes/3D/Rectangle.js | |||
@@ -67,7 +67,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, { | |||
67 | getHeight: { value: function() { return this.m_height; } }, | 67 | getHeight: { value: function() { return this.m_height; } }, |
68 | setHeight: { value: function(h) { this.m_height = h; } }, | 68 | setHeight: { value: function(h) { this.m_height = h; } }, |
69 | 69 | ||
70 | geomType: { value: function() { return this.GEOM_TYPE_RECTANGLE; } }, | 70 | geomType: { value: function() { return this.GEOM_TYPE_RECTANGLE; } }, |
71 | 71 | ||
72 | /////////////////////////////////////////////////////////////////////// | 72 | /////////////////////////////////////////////////////////////////////// |
73 | // Methods | 73 | // Methods |
@@ -84,7 +84,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, { | |||
84 | } | 84 | } |
85 | }, | 85 | }, |
86 | 86 | ||
87 | dup: { | 87 | dup: { |
88 | value: function() | 88 | value: function() |
89 | { | 89 | { |
90 | var rtnRec = Object.create(Rectangle, {}); | 90 | var rtnRec = Object.create(Rectangle, {}); |
@@ -122,7 +122,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, { | |||
122 | } | 122 | } |
123 | }, | 123 | }, |
124 | 124 | ||
125 | setToBounds: { | 125 | setToBounds: { |
126 | value: function( bounds ) | 126 | value: function( bounds ) |
127 | { | 127 | { |
128 | var pt = bounds[0]; | 128 | var pt = bounds[0]; |
@@ -166,7 +166,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, { | |||
166 | } | 166 | } |
167 | }, | 167 | }, |
168 | 168 | ||
169 | getQuadrant: { | 169 | getQuadrant: { |
170 | value: function( iQuad ) | 170 | value: function( iQuad ) |
171 | { | 171 | { |
172 | // quadrant ordering starts at upper left and continues around counter-clockwise | 172 | // quadrant ordering starts at upper left and continues around counter-clockwise |
@@ -220,7 +220,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, { | |||
220 | this.setTop( yMin ); this.setHeight( yMax - yMin ); | 220 | this.setTop( yMin ); this.setHeight( yMax - yMin ); |
221 | } | 221 | } |
222 | }, | 222 | }, |
223 | 223 | ||
224 | 224 | ||
225 | translate: { | 225 | translate: { |
226 | value: function( dx, dy ) | 226 | value: function( dx, dy ) |