mirror of
https://github.com/wassname/phaser.git
synced 2026-06-30 16:40:20 +08:00
Updated the Gruntfile. Also:
InputHandler.pixelPerfectOver - performs a pixel perfect check to see if any pointer is over the current object (warning: very expensive!) InputHandler.pixelPerfectClick - performs a pixel perfect check but only when the pointer touches/clicks on the current object. Previously using a Pixel Perfect check didn't work if the Sprite was rotated or had a non-zero anchor point, now works under all conditions + atlas frames.
This commit is contained in:
+11
-8
@@ -72,16 +72,17 @@ Phaser.Loader = function (game) {
|
||||
|
||||
/**
|
||||
* You can optionally link a sprite to the preloader.
|
||||
* If you do so the Sprite's width or height will be cropped based on the percentage loaded.
|
||||
* @property {Phaser.Sprite} preloadSprite
|
||||
* If you do so the Sprites width or height will be cropped based on the percentage loaded.
|
||||
* @property {Phaser.Sprite|Phaser.Image} preloadSprite
|
||||
* @default
|
||||
*/
|
||||
this.preloadSprite = null;
|
||||
|
||||
/**
|
||||
* @property {string} crossOrigin - The crossOrigin value applied to loaded images
|
||||
* @property {boolean|string} crossOrigin - The crossOrigin value applied to loaded images.
|
||||
* @default
|
||||
*/
|
||||
this.crossOrigin = '';
|
||||
this.crossOrigin = false;
|
||||
|
||||
/**
|
||||
* If you want to append a URL before the path of any asset you can set this here.
|
||||
@@ -160,8 +161,7 @@ Phaser.Loader.prototype = {
|
||||
this.preloadSprite.crop = new Phaser.Rectangle(0, 0, sprite.width, 1);
|
||||
}
|
||||
|
||||
sprite.crop = this.preloadSprite.crop;
|
||||
sprite.cropEnabled = true;
|
||||
sprite.crop(this.preloadSprite.crop);
|
||||
|
||||
},
|
||||
|
||||
@@ -773,7 +773,10 @@ Phaser.Loader.prototype = {
|
||||
file.data.onerror = function () {
|
||||
return _this.fileError(_this._fileIndex);
|
||||
};
|
||||
file.data.crossOrigin = this.crossOrigin;
|
||||
if (this.crossOrigin)
|
||||
{
|
||||
file.data.crossOrigin = this.crossOrigin;
|
||||
}
|
||||
file.data.src = this.baseURL + file.url;
|
||||
break;
|
||||
|
||||
@@ -1244,7 +1247,7 @@ Phaser.Loader.prototype = {
|
||||
this.preloadSprite.crop.height = Math.floor((this.preloadSprite.height / 100) * this.progress);
|
||||
}
|
||||
|
||||
this.preloadSprite.sprite.crop = this.preloadSprite.crop;
|
||||
// this.preloadSprite.sprite.crop = this.preloadSprite.crop;
|
||||
}
|
||||
|
||||
this.onFileComplete.dispatch(this.progress, this._fileList[previousIndex].key, success, this.totalLoadedFiles(), this._fileList.length);
|
||||
|
||||
Reference in New Issue
Block a user