Skip to content

Commit 7305948

Browse files
committed
New Texture and Transform components which are now used by Sprite, Group and Camera.
1 parent 2f03f5f commit 7305948

89 files changed

Lines changed: 16029 additions & 14836 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Phaser/Motion.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ module Phaser {
210210
* @return {number} Distance (in pixels)
211211
*/
212212
public distanceToPoint(a: Sprite, target: Point): number {
213-
var dx: number = (a.x + a.origin.x) - (target.x);
214-
var dy: number = (a.y + a.origin.y) - (target.y);
213+
var dx: number = (a.x + a.transform.origin.x) - (target.x);
214+
var dy: number = (a.y + a.transform.origin.y) - (target.y);
215215

216216
return this.game.math.vectorLength(dx, dy);
217217
}
@@ -223,8 +223,8 @@ module Phaser {
223223
* @return {number} The distance between the given sprite and the mouse coordinates
224224
*/
225225
public distanceToMouse(a: Sprite): number {
226-
var dx: number = (a.x + a.origin.x) - this.game.input.x;
227-
var dy: number = (a.y + a.origin.y) - this.game.input.y;
226+
var dx: number = (a.x + a.transform.origin.x) - this.game.input.x;
227+
var dy: number = (a.y + a.transform.origin.y) - this.game.input.y;
228228

229229
return this.game.math.vectorLength(dx, dy);
230230
}
@@ -240,8 +240,8 @@ module Phaser {
240240
* @return {number} The angle (in radians unless asDegrees is true)
241241
*/
242242
public angleBetweenPoint(a: Sprite, target: Point, asDegrees: bool = false): number {
243-
var dx: number = (target.x) - (a.x + a.origin.x);
244-
var dy: number = (target.y) - (a.y + a.origin.y);
243+
var dx: number = (target.x) - (a.x + a.transform.origin.x);
244+
var dy: number = (target.y) - (a.y + a.transform.origin.y);
245245

246246
if (asDegrees)
247247
{
@@ -265,8 +265,8 @@ module Phaser {
265265
*/
266266
public angleBetween(a: Sprite, b: Sprite, asDegrees: bool = false): number {
267267

268-
var dx: number = (b.x + b.origin.x) - (a.x + a.origin.x);
269-
var dy: number = (b.y + b.origin.y) - (a.y + a.origin.y);
268+
var dx: number = (b.x + b.transform.origin.x) - (a.x + a.transform.origin.x);
269+
var dy: number = (b.y + b.transform.origin.y) - (a.y + a.transform.origin.y);
270270

271271
if (asDegrees)
272272
{

Phaser/Phaser.csproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,26 @@
7474
<Content Include="components\sprite\Input.js">
7575
<DependentUpon>Input.ts</DependentUpon>
7676
</Content>
77+
<TypeScriptCompile Include="components\Texture.ts" />
78+
<Content Include="components\Texture.js">
79+
<DependentUpon>Texture.ts</DependentUpon>
80+
</Content>
7781
<Content Include="components\Tile.ts" />
7882
<Content Include="components\TilemapLayer.ts" />
83+
<TypeScriptCompile Include="components\Transform.ts" />
84+
<Content Include="components\Transform.js">
85+
<DependentUpon>Transform.ts</DependentUpon>
86+
</Content>
7987
<Content Include="Game.js">
8088
<DependentUpon>Game.ts</DependentUpon>
8189
</Content>
8290
<TypeScriptCompile Include="core\Rectangle.ts" />
8391
<TypeScriptCompile Include="core\Point.ts" />
84-
<TypeScriptCompile Include="components\sprite\Texture.ts" />
8592
<TypeScriptCompile Include="components\camera\CameraFX.ts" />
8693
<Content Include="components\camera\CameraFX.js">
8794
<DependentUpon>CameraFX.ts</DependentUpon>
8895
</Content>
8996
<TypeScriptCompile Include="components\ScrollRegion.ts" />
90-
<Content Include="components\sprite\Texture.js">
91-
<DependentUpon>Texture.ts</DependentUpon>
92-
</Content>
9397
<Content Include="core\Point.js">
9498
<DependentUpon>Point.ts</DependentUpon>
9599
</Content>

Phaser/Stage.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ module Phaser {
5353
this.context = this.canvas.getContext('2d');
5454

5555
this.scaleMode = StageScaleMode.NO_SCALE;
56-
this.scale = new StageScaleMode(this._game);
56+
this.scale = new StageScaleMode(this._game, width, height);
5757

5858
this.getOffset(this.canvas);
5959
this.bounds = new Rectangle(this.offset.x, this.offset.y, width, height);
@@ -167,6 +167,8 @@ module Phaser {
167167
this.pauseScreen = new PauseScreen(this._game, this.width, this.height);
168168
this.orientationScreen = new OrientationScreen(this._game);
169169

170+
this.scale.setScreenSize(true);
171+
170172
}
171173

172174
/**
@@ -253,6 +255,13 @@ module Phaser {
253255

254256
}
255257

258+
public setImageRenderingCrisp() {
259+
this.canvas.style['image-rendering'] = 'crisp-edges';
260+
this.canvas.style['image-rendering'] = '-moz-crisp-edges';
261+
this.canvas.style['image-rendering'] = '-webkit-optimize-contrast';
262+
this.canvas.style['-ms-interpolation-mode'] = 'nearest-neighbor';
263+
}
264+
256265
public pauseGame() {
257266

258267
if (this.disablePauseScreen == false && this.pauseScreen)

Phaser/Statics.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module Phaser {
2020

2121
static GEOM_POINT: number = 0;
2222
static GEOM_CIRCLE: number = 1;
23-
static GEOM_RECTANGLE: number = 2;
23+
static GEOM_Rectangle: number = 2;
2424
static GEOM_LINE: number = 3;
2525
static GEOM_POLYGON: number = 4;
2626

0 commit comments

Comments
 (0)