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

Tweaked getLocalPosition

Browse source 
Also cahced css cursor reference in js
This commit is contained in:
Mat Groves 2014-01-31 00:34:53 +00:00
parent 958afe142a
commit 854ccf54fa
3 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
bin/pixi.dev.js
View file

@ -3082,8 +3082,8 @@ PIXI.InteractionData.prototype.getLocalPosition = function(displayObject)
var global = this.global; var global = this.global;
// do a cheeky transform to get the mouse coords; // do a cheeky transform to get the mouse coords;
var a00 = worldTransform[0], a01 = worldTransform[1], a02 = worldTransform[2], var a00 = worldTransform.a, a01 = worldTransform.b, a02 = worldTransform.tx,
a10 = worldTransform[3], a11 = worldTransform[4], a12 = worldTransform[5], a10 = worldTransform.c, a11 = worldTransform.d, a12 = worldTransform.ty,
id = 1 / (a00 * a11 + a01 * -a10); id = 1 / (a00 * a11 + a01 * -a10);
// set the mouse coords... // set the mouse coords...
return new PIXI.Point(a11 * id * global.x + -a01 * id * global.y + (a12 * a01 - a02 * a11) * id, return new PIXI.Point(a11 * id * global.x + -a01 * id * global.y + (a12 * a01 - a02 * a11) * id,
@ -3153,6 +3153,8 @@ PIXI.InteractionManager = function(stage)
this.onTouchEnd = this.onTouchEnd.bind(this); this.onTouchEnd = this.onTouchEnd.bind(this);
this.onTouchMove = this.onTouchMove.bind(this); this.onTouchMove = this.onTouchMove.bind(this);
this.last = 0; this.last = 0;
this.currentCursorStyle = "inherit";
}; };
// constructor // constructor
@ -3327,8 +3329,9 @@ PIXI.InteractionManager.prototype.update = function()
// loop through interactive objects! // loop through interactive objects!
var length = this.interactiveItems.length; var length = this.interactiveItems.length;
this.interactionDOMElement.style.cursor = 'inherit';
var cursor = 'inherit'
var over = false; var over = false;
for (i = 0; i < length; i++) for (i = 0; i < length; i++)
@ -3350,7 +3353,7 @@ PIXI.InteractionManager.prototype.update = function()
// looks like there was a hit! // looks like there was a hit!
if(item.__hit && !over) if(item.__hit && !over)
{ {
if(item.buttonMode) this.interactionDOMElement.style.cursor = item.defaultCursor; if(item.buttonMode) cursor = item.defaultCursor;
if(!item.interactiveChildren)over = true; if(!item.interactiveChildren)over = true;
@ -3379,6 +3382,13 @@ PIXI.InteractionManager.prototype.update = function()
// } // }
// ---> // --->
} }
if( this.currentCursorStyle != cursor )
{
this.currentCursorStyle = cursor;
this.interactionDOMElement.style.cursor = cursor;
}
}; };
/** /**

4
src/pixi/InteractionData.js
View file

@ -51,8 +51,8 @@ PIXI.InteractionData.prototype.getLocalPosition = function(displayObject)
var global = this.global; var global = this.global;
// do a cheeky transform to get the mouse coords; // do a cheeky transform to get the mouse coords;
var a00 = worldTransform[0], a01 = worldTransform[1], a02 = worldTransform[2], var a00 = worldTransform.a, a01 = worldTransform.b, a02 = worldTransform.tx,
a10 = worldTransform[3], a11 = worldTransform[4], a12 = worldTransform[5], a10 = worldTransform.c, a11 = worldTransform.d, a12 = worldTransform.ty,
id = 1 / (a00 * a11 + a01 * -a10); id = 1 / (a00 * a11 + a01 * -a10);
// set the mouse coords... // set the mouse coords...
return new PIXI.Point(a11 * id * global.x + -a01 * id * global.y + (a12 * a01 - a02 * a11) * id, return new PIXI.Point(a11 * id * global.x + -a01 * id * global.y + (a12 * a01 - a02 * a11) * id,

14
src/pixi/InteractionManager.js
View file

@ -59,6 +59,8 @@ PIXI.InteractionManager = function(stage)
this.onTouchEnd = this.onTouchEnd.bind(this); this.onTouchEnd = this.onTouchEnd.bind(this);
this.onTouchMove = this.onTouchMove.bind(this); this.onTouchMove = this.onTouchMove.bind(this);
this.last = 0; this.last = 0;
this.currentCursorStyle = "inherit";
}; };
// constructor // constructor
@ -233,8 +235,9 @@ PIXI.InteractionManager.prototype.update = function()
// loop through interactive objects! // loop through interactive objects!
var length = this.interactiveItems.length; var length = this.interactiveItems.length;
this.interactionDOMElement.style.cursor = 'inherit';
var cursor = 'inherit'
var over = false; var over = false;
for (i = 0; i < length; i++) for (i = 0; i < length; i++)
@ -256,7 +259,7 @@ PIXI.InteractionManager.prototype.update = function()
// looks like there was a hit! // looks like there was a hit!
if(item.__hit && !over) if(item.__hit && !over)
{ {
if(item.buttonMode) this.interactionDOMElement.style.cursor = item.defaultCursor; if(item.buttonMode) cursor = item.defaultCursor;
if(!item.interactiveChildren)over = true; if(!item.interactiveChildren)over = true;
@ -285,6 +288,13 @@ PIXI.InteractionManager.prototype.update = function()
// } // }
// ---> // --->
} }
if( this.currentCursorStyle != cursor )
{
this.currentCursorStyle = cursor;
this.interactionDOMElement.style.cursor = cursor;
}
}; };
/** /**