diff --git a/src/basic/Point.js b/src/basic/Point.js index 1d7d409e..d56990b6 100644 --- a/src/basic/Point.js +++ b/src/basic/Point.js @@ -24,7 +24,7 @@ var Point = Base.extend({ this.x = this.y = 0; } } else { - this.x = this.y = 0; + this.x = this.y = 0; } }, @@ -107,7 +107,7 @@ var Point = Base.extend({ this.y *= scale; } }, - + normalize: function(length) { if (length === null) length = 1; @@ -118,16 +118,16 @@ var Point = Base.extend({ res._angle = this._angle; return res; }, - + getAngleInRadians: function() { return Math.atan2(this.y, this.x); }, - + getAngleInDegrees: function() { return Math.atan2(this.y, this.x) * 180 / Math.PI; }, - - + + getQuadrant: function() { if (this.x >= 0) { if (this.y >= 0) { @@ -143,7 +143,7 @@ var Point = Base.extend({ } } }, - + setAngle: function(angle) { angle = this._angle = angle * Math.PI / 180; if (!this.isZero()) { @@ -183,7 +183,7 @@ var Point = Base.extend({ return angle; } }, - + rotate: function(angle) { angle = angle * Math.PI / 180; var s = Math.sin(angle); diff --git a/src/basic/Rectangle.js b/src/basic/Rectangle.js index 1730a8b8..300f7c76 100644 --- a/src/basic/Rectangle.js +++ b/src/basic/Rectangle.js @@ -45,182 +45,182 @@ Rectangle = Base.extend({ this.x = this.y = this.width = this.height = 0; } }, - + getPoint: function() { return new Point(this.x, this.y); }, - + setPoint: function() { var point = Point.read(arguments); this.x = point.x; this.y = point.y; }, - + getSize: function() { return new Size(this.width, this.height); }, - + setSize: function() { var size = Size.read(arguments); this.width = size.width; this.height = size.height; }, - + getLeft: function() { return this.x; }, - + setLeft: function(left) { // right should not move this.width -= left - this.x; this.x = left; }, - + getTop: function() { return this.y; }, - + setTop: function(top) { this.height -= top - this.y; this.y = top; }, - + getRight: function() { return this.x + this.width; }, - + setRight: function(right) { this.width = right - this.x; }, - + getBottom: function() { return this.y + this.height; }, - + setBottom: function(bottom) { this.height = bottom - this.y; }, - + getCenterX: function() { return this.x + this.width * 0.5; }, - + setCenterX: function(x) { this.x = x - this.width * 0.5; }, - + getCenterY: function() { return this.y + this.height * 0.5; }, - + setCenterY: function(y) { this.y = y - this.height * 0.5; }, - + getCenter: function() { return new Point(this.x - this.width / 2, this.y - this.height / 2); }, - + setCenter: function() { var center = Point.read(arguments); this.x = center.x - this.width / 2; this.y = center.y - this.height / 2; }, - + getTopLeft: function() { return new Point(this.left, this.top); }, - + setTopLeft: function() { var topLeft = Point.read(arguments); this.left = topLeft.x; this.top = topLeft.y; }, - + getTopRight: function() { return new Point(this.right, this.top); }, - + setTopRight: function() { var topRight = Point.read(arguments); this.right = topRight.x; this.top = topRight.y; }, - + getBottomLeft: function() { return new Point(this.left, this.bottom); }, - + setBottomLeft: function() { var bottomLeft = Point.read(arguments); this.left = bottomLeft.x; this.bottom = bottomLeft.y; }, - + getBottomRight: function() { return new Point(this.right, this.bottom); }, - + setBottomRight: function() { var bottomRight = Point.read(arguments); this.bottom = bottomRight.y; this.right = bottomRight.x; }, - + getLeftCenter: function() { return new Point(this.left, this.centerY); }, - + setLeftCenter: function() { var leftCenter = Point.read(arguments); this.left = leftCenter.x; this.centerY = leftCenter.y; }, - + getTopCenter: function() { return new Point(this.centerX, this.top); }, - + setTopCenter: function() { var topCenter = Point.read(arguments); this.centerX = topCenter.x; this.top = topCenter.y; }, - + getRightCenter: function() { return new Point(this.right, this.centerY); }, - + setRightCenter: function() { var rightCenter = Point.read(arguments); this.right = rightCenter.x; this.centerY = rightCenter.y; }, - + getBottomCenter: function() { return new Point(this.centerX, this.bottom); }, - + setBottomCenter: function() { var bottomCenter = Point.read(arguments); this.bottom = bottomCenter.y; this.centerX = bottomCenter.x; }, - + clone: function() { return new Rectangle(this); }, - + equals: function() { var rect = Rectangle.read(arguments); return this.x == rect.x && this.y == rect.y && this.width == rect.width && this.height == rect.height; }, - + isEmpty: function() { return this.width == 0 || this.height == 0; }, - + contains: function(rect) { if (rect.width !== undefined) { return rect.x >= this.x && rect.y >= this.y @@ -233,7 +233,7 @@ Rectangle = Base.extend({ && point.y <= this.y + this.height; } }, - + intersects: function() { var rect = Rectangle.read(arguments); return rect.x + rect.width > this.x @@ -241,7 +241,7 @@ Rectangle = Base.extend({ && rect.x < this.x + this.width && rect.y < this.y + this.height; }, - + intersect: function() { var rect = Rectangle.read(arguments); var x1 = Math.max(this.x, rect.x); @@ -250,7 +250,7 @@ Rectangle = Base.extend({ var y2 = Math.min(this.y + this.height, rect.y + rect.height); return new Rectangle(x1, y1, x2 - x1, y2 - y1); }, - + unite: function() { var rect = Rectangle.read(arguments); var x1 = Math.min(this.x, rect.x); @@ -259,7 +259,7 @@ Rectangle = Base.extend({ var y2 = Math.max(this.y + this.height, rect.y + rect.height); return new Rectangle(x1, y1, x2 - x1, y2 - y1); }, - + include: function() { var point = Point.read(arguments); var x1 = Math.min(this.x, point.x); @@ -268,7 +268,7 @@ Rectangle = Base.extend({ var y2 = Math.max(this.y + this.height, point.y); return new Rectangle(x1, y1, x2 - x1, y2 - y1); }, - + toString: function() { return '{ x: ' + this.x + ', y: ' + this.y @@ -276,7 +276,7 @@ Rectangle = Base.extend({ + ', height: ' + this.height + ' }'; }, - + statics: { read: function(args, index) { var index = index || 0, length = args.length - index; diff --git a/src/basic/Size.js b/src/basic/Size.js index a953cb0b..bba0a88d 100644 --- a/src/basic/Size.js +++ b/src/basic/Size.js @@ -20,10 +20,10 @@ var Size = Base.extend({ this.width = this.height = 0; } } else { - this.width = this.height = 0; + this.width = this.height = 0; } }, - + add: function() { var size = Size.read(arguments); return new Size(this.width + size.width, this.height + size.height);