Merge pull request #38 from 201flaviosilva/32-engine-scale-game-object

[Engine]: Scale Game Object #32

src/GameObjects/Circle/Circle.js

@@ -10,8 +10,8 @@ export default class Circle extends GameObject {
 		this._type = Types.circle;
 	}
 
-	get x() { return this._x - this.radius * this.origin.x; } // Get the position X relative to the origin
-	get y() { return this._y - this.radius * this.origin.y; } // Get the position Y relative to the origin
+	get x() { return this._x - this.radius * this.origin.x * this.scale.x; } // Get the position X relative to the origin
+	get y() { return this._y - this.radius * this.origin.y * this.scale.y; } // Get the position Y relative to the origin
 }
 
 Object.assign(Circle.prototype, CommonMethods);

src/GameObjects/Circle/PhysicsCircle.js

@@ -10,8 +10,8 @@ export default class PhysicsCircle extends GameObject {
 		this._type = Types.circle;
 	}
 
-	get x() { return this._x - this.radius * this.origin.x; } // Get the position X relative to the origin
-	get y() { return this._y - this.radius * this.origin.y; } // Get the position Y relative to the origin
+	get x() { return this._x - this.radius * this.origin.x * this.scale.x; } // Get the position X relative to the origin
+	get y() { return this._y - this.radius * this.origin.y * this.scale.y; } // Get the position Y relative to the origin
 
 	_debugBody() {
 		if (!this.active) return;

src/GameObjects/GameObjectBase.js

@@ -12,6 +12,8 @@ export default class GameObject {
 		this.z = 0;
 		this.rotation = 0; // Rotation in radians
 		this.angle = 0; // Rotation in degrees
+		this.scale = { x: 1, y: 1 };
+
 		this.lastPosition = { x: this._x, y: this._y, z: this.z };
 		this.origin = { x: 0, y: 0 };
 		this.fillColor = fillColor;
@@ -72,6 +74,21 @@ export default class GameObject {
 		return this;
 	}
 
+	// Scale
+	// Origin
+	setScaleX(x) {
+		this.setScale(x, this.scale.y);
+		return this;
+	}
+	setScaleY(y) {
+		this.setScale(this.scale.x, y);
+		return this;
+	}
+	setScale(x = 0, y = x) {
+		this.scale = { x, y };
+		return this;
+	}
+
 	// Origin
 	setOriginX(x) {
 		this.setOrigin(x, this.origin.y);
@@ -124,6 +141,12 @@ export default class GameObject {
 
 		CanvasStateInstance.context.save();
 
+		// Scale
+		CanvasStateInstance.context.translate(this.x, this.y);
+		CanvasStateInstance.context.scale(this.scale.x, this.scale.y);
+		CanvasStateInstance.context.translate(-this.x, -this.y);
+
+		// Rotation
 		CanvasStateInstance.context.translate(this._x, this._y);
 		CanvasStateInstance.context.rotate(this.rotation);
 		CanvasStateInstance.context.translate(-this._x, -this._y);

src/GameObjects/Line/Line.js

@@ -15,8 +15,8 @@ export default class Line extends GameObject {
 	get height() { return this.endY - this._y; }
 
 	// Positions Based in the origin
-	get x() { return this._x - this.width * this.origin.x; }
-	get y() { return this._y - this.height * this.origin.y; }
+	get x() { return this._x - this.width * this.origin.x * this.scale.x; }
+	get y() { return this._y - this.height * this.origin.y * this.scale.y; }
 
 	getTop() { return this.y; }
 	getBottom() { return this.y + this.height; }

src/GameObjects/Polygon/Polygon.js

@@ -11,8 +11,8 @@ export default class Polygon extends GameObject {
 		this._type = Types.polygon;
 	}
 
-	get x() { return this._x - this.width * this.origin.x; } // Get the position X relative to the origin
-	get y() { return this._y - this.height * this.origin.y; } // Get the position Y relative to the origin
+	get x() { return this._x - this.width * this.origin.x * this.scale.x; } // Get the position X relative to the origin
+	get y() { return this._y - this.height * this.origin.y * this.scale.y; } // Get the position Y relative to the origin
 
 	get width() {
 		if (this.vertices.length === 0) return 0;

src/GameObjects/Rectangle/PhysicsRectangle.js

@@ -14,8 +14,8 @@ export default class PhysicsRectangle extends PhysicsGameObject {
 		this._type = Types.rectangle;
 	}
 
-	get x() { return this._x - this.width * this.origin.x; } // Get the position X relative to the origin
-	get y() { return this._y - this.height * this.origin.y; } // Get the position Y relative to the origin
+	get x() { return this._x - this.width * this.origin.x * this.scale.x; } // Get the position X relative to the origin
+	get y() { return this._y - this.height * this.origin.y * this.scale.y; } // Get the position Y relative to the origin
 
 	// ----- Private methods -----
 	_debugBody() {

src/GameObjects/Rectangle/Rectangle.js

@@ -13,8 +13,8 @@ export default class Rectangle extends GameObject {
 		this._type = Types.rectangle;
 	}
 
-	get x() { return this._x - this.width * this.origin.x; } // Get the position X relative to the origin
-	get y() { return this._y - this.height * this.origin.y; } // Get the position Y relative to the origin
+	get x() { return this._x - this.width * this.origin.x * this.scale.x; } // Get the position X relative to the origin
+	get y() { return this._y - this.height * this.origin.y * this.scale.y; } // Get the position Y relative to the origin
 }
 
 Object.assign(Rectangle.prototype, CommonMethods);

src/GameObjects/Text/Text.js

@@ -31,8 +31,8 @@ export default class Text extends GameObject {
 		return this.fontSize;
 	}
 
-	get x() { return this._x - this.width * this.origin.x; } // Get the position X relative to the origin
-	get y() { return this._y - this.height * this.origin.y; } // Get the position Y relative to the origin
+	get x() { return this._x - this.width * this.origin.x * this.scale.x; } // Get the position X relative to the origin
+	get y() { return this._y - this.height * this.origin.y * this.scale.y; } // Get the position Y relative to the origin
 
 	// Get positions based on the origin
 	getTop() { return this.y; }

src/GameObjects/Triangle/Triangle.js

@@ -12,8 +12,8 @@ export default class Triangle extends GameObject {
 	}
 
 	// Positions Based in the origin
-	get x() { return this._x - this.width * this.origin.x; }
-	get y() { return this._y - this.height * this.origin.y; }
+	get x() { return this._x - this.width * this.origin.x * this.scale.x; }
+	get y() { return this._y - this.height * this.origin.y * this.scale.y; }
 
 	getTop() { return this.y; }
 	getBottom() { return this.y + this.height; }