jeena/pixi.js
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

fix up some merge issues

Browse source
This commit is contained in:
Chad Engler 2014-02-10 11:57:15 -08:00
parent 009122b6c6
commit 743f9279b3
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pixi/InteractionManager.js
View file

@ -401,7 +401,7 @@ PIXI.InteractionManager.prototype.onMouseOut = function()
{ {
var length = this.interactiveItems.length; var length = this.interactiveItems.length;
this.currentCursor = 'inherit'; this.interactionDOMElement.style.cursor = 'inherit';
for (var i = 0; i < length; i++) for (var i = 0; i < length; i++)
{ {

10
src/pixi/extras/TilingSprite.js
View file

@ -238,9 +238,7 @@ PIXI.TilingSprite.prototype._renderCanvas = function(renderSession)
context.beginPath(); context.beginPath();
var tilePositionX = this.tilePosition.x % this.tilingTexture.width; var tilePosition = this.tilePosition;
var tilePositionY = this.tilePosition.y % this.tilingTexture.height;
var tileScale = this.tileScale; var tileScale = this.tileScale;
tilePosition.x %= this.tilingTexture.baseTexture.width; tilePosition.x %= this.tilingTexture.baseTexture.width;
@ -248,13 +246,13 @@ PIXI.TilingSprite.prototype._renderCanvas = function(renderSession)
// offset // offset
context.scale(tileScale.x,tileScale.y); context.scale(tileScale.x,tileScale.y);
context.translate(tilePositionX, tilePositionY); context.translate(tilePosition.x, tilePosition.y);
context.fillStyle = this.__tilePattern; context.fillStyle = this.__tilePattern;
context.fillRect(-tilePositionX,-tilePositionY,this.width / tileScale.x, this.height / tileScale.y); context.fillRect(-tilePosition.x,-tilePosition.y,this.width / tileScale.x, this.height / tileScale.y);
context.scale(1/tileScale.x, 1/tileScale.y); context.scale(1/tileScale.x, 1/tileScale.y);
context.translate(-tilePositionX, -tilePositionY); context.translate(-tilePosition.x, -tilePosition.y);
context.closePath(); context.closePath();