Skip to content
This repository has been archived by the owner on Feb 23, 2023. It is now read-only.

Commit

Permalink
updated to v4.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@adireddy
adireddy committed Feb 28, 2017
1 parent dee60f7 commit 0de61e7
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 42 deletions.
4 changes: 2 additions & 2 deletions haxelib.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"contributors": [
"adireddy"
],
"releasenote": "updated to v4.4.0",
"version": "4.4.0",
"releasenote": "updated to v4.4.1",
"version": "4.4.1",
"url": "https://github.com/pixijs/pixi-haxe",
"dependencies": {
"perf.js": ""
Expand Down
28 changes: 15 additions & 13 deletions libs/pixi.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* pixi.js - v4.4.0
* Compiled Wed, 22 Feb 2017 17:50:51 UTC
* pixi.js - v4.4.1
* Compiled Tue, 28 Feb 2017 13:42:01 UTC
*
* pixi.js is licensed under the MIT License.
* http://www.opensource.org/licenses/mit-license
Expand Down Expand Up @@ -8089,7 +8089,7 @@
* @name VERSION
* @type {string}
*/
var VERSION = exports.VERSION = '4.4.0';
var VERSION = exports.VERSION = '4.4.1';

/**
* Two Pi.
Expand Down Expand Up @@ -24972,7 +24972,7 @@


Texture.fromLoader = function fromLoader(source, imageUrl, name) {
var baseTexture = new _BaseTexture2.default(source, null, (0, _utils.getResolutionOfUrl)(imageUrl));
var baseTexture = new _BaseTexture2.default(source, undefined, (0, _utils.getResolutionOfUrl)(imageUrl));
var texture = new Texture(baseTexture);

baseTexture.imageUrl = imageUrl;
Expand Down Expand Up @@ -32901,7 +32901,7 @@
for (var i = 0; i < eventLen; i++) {
var event = events[i];

var interactionData = this.getInteractionDataForPointerId(event.pointerId);
var interactionData = this.getInteractionDataForPointerId(event);

var interactionEvent = this.configureInteractionEventForDOMEvent(this.eventData, event, interactionData);

Expand Down Expand Up @@ -32975,7 +32975,7 @@
for (var i = 0; i < eventLen; i++) {
var event = events[i];

var interactionData = this.getInteractionDataForPointerId(event.pointerId);
var interactionData = this.getInteractionDataForPointerId(event);

var interactionEvent = this.configureInteractionEventForDOMEvent(this.eventData, event, interactionData);

Expand Down Expand Up @@ -33073,7 +33073,7 @@

var test = isRightButton ? flags.RIGHT_DOWN : flags.LEFT_DOWN;

var isDown = trackingData !== undefined && trackingData.flags | test;
var isDown = trackingData !== undefined && trackingData.flags & test;

if (hit) {
this.dispatchEvent(displayObject, isRightButton ? 'rightup' : 'mouseup', interactionEvent);
Expand Down Expand Up @@ -33140,7 +33140,7 @@
for (var i = 0; i < eventLen; i++) {
var event = events[i];

var interactionData = this.getInteractionDataForPointerId(event.pointerId);
var interactionData = this.getInteractionDataForPointerId(event);

var interactionEvent = this.configureInteractionEventForDOMEvent(this.eventData, event, interactionData);

Expand Down Expand Up @@ -33208,7 +33208,7 @@
this.setCursorMode(null);
}

var interactionData = this.getInteractionDataForPointerId(event.pointerId);
var interactionData = this.getInteractionDataForPointerId(event);

var interactionEvent = this.configureInteractionEventForDOMEvent(this.eventData, event, interactionData);

Expand Down Expand Up @@ -33289,7 +33289,7 @@
// Only mouse and pointer can call onPointerOver, so events will always be length 1
var event = events[0];

var interactionData = this.getInteractionDataForPointerId(event.pointerId);
var interactionData = this.getInteractionDataForPointerId(event);

var interactionEvent = this.configureInteractionEventForDOMEvent(this.eventData, event, interactionData);

Expand All @@ -33309,13 +33309,15 @@
* Get InteractionData for a given pointerId. Store that data as well
*
* @private
* @param {number} pointerId - Identifier from a pointer event
* @param {PointerEvent} event - Normalized pointer event, output from normalizeToPointerData
* @return {InteractionData} - Interaction data for the given pointer identifier
*/


InteractionManager.prototype.getInteractionDataForPointerId = function getInteractionDataForPointerId(pointerId) {
if (pointerId === MOUSE_POINTER_ID) {
InteractionManager.prototype.getInteractionDataForPointerId = function getInteractionDataForPointerId(event) {
var pointerId = event.pointerId;

if (pointerId === MOUSE_POINTER_ID || event.pointerType === 'mouse') {
return this.mouse;
} else if (this.activeInteractionData[pointerId]) {
return this.activeInteractionData[pointerId];
Expand Down
2 changes: 1 addition & 1 deletion libs/pixi.js.map
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions libs/pixi.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion libs/pixi.min.js.map
View file

Large diffs are not rendered by default.

28 changes: 15 additions & 13 deletions samples/_output/libs/pixi.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* pixi.js - v4.4.0
* Compiled Wed, 22 Feb 2017 17:50:51 UTC
* pixi.js - v4.4.1
* Compiled Tue, 28 Feb 2017 13:42:01 UTC
*
* pixi.js is licensed under the MIT License.
* http://www.opensource.org/licenses/mit-license
Expand Down Expand Up @@ -8089,7 +8089,7 @@
* @name VERSION
* @type {string}
*/
var VERSION = exports.VERSION = '4.4.0';
var VERSION = exports.VERSION = '4.4.1';

/**
* Two Pi.
Expand Down Expand Up @@ -24972,7 +24972,7 @@


Texture.fromLoader = function fromLoader(source, imageUrl, name) {
var baseTexture = new _BaseTexture2.default(source, null, (0, _utils.getResolutionOfUrl)(imageUrl));
var baseTexture = new _BaseTexture2.default(source, undefined, (0, _utils.getResolutionOfUrl)(imageUrl));
var texture = new Texture(baseTexture);

baseTexture.imageUrl = imageUrl;
Expand Down Expand Up @@ -32901,7 +32901,7 @@
for (var i = 0; i < eventLen; i++) {
var event = events[i];

var interactionData = this.getInteractionDataForPointerId(event.pointerId);
var interactionData = this.getInteractionDataForPointerId(event);

var interactionEvent = this.configureInteractionEventForDOMEvent(this.eventData, event, interactionData);

Expand Down Expand Up @@ -32975,7 +32975,7 @@
for (var i = 0; i < eventLen; i++) {
var event = events[i];

var interactionData = this.getInteractionDataForPointerId(event.pointerId);
var interactionData = this.getInteractionDataForPointerId(event);

var interactionEvent = this.configureInteractionEventForDOMEvent(this.eventData, event, interactionData);

Expand Down Expand Up @@ -33073,7 +33073,7 @@

var test = isRightButton ? flags.RIGHT_DOWN : flags.LEFT_DOWN;

var isDown = trackingData !== undefined && trackingData.flags | test;
var isDown = trackingData !== undefined && trackingData.flags & test;

if (hit) {
this.dispatchEvent(displayObject, isRightButton ? 'rightup' : 'mouseup', interactionEvent);
Expand Down Expand Up @@ -33140,7 +33140,7 @@
for (var i = 0; i < eventLen; i++) {
var event = events[i];

var interactionData = this.getInteractionDataForPointerId(event.pointerId);
var interactionData = this.getInteractionDataForPointerId(event);

var interactionEvent = this.configureInteractionEventForDOMEvent(this.eventData, event, interactionData);

Expand Down Expand Up @@ -33208,7 +33208,7 @@
this.setCursorMode(null);
}

var interactionData = this.getInteractionDataForPointerId(event.pointerId);
var interactionData = this.getInteractionDataForPointerId(event);

var interactionEvent = this.configureInteractionEventForDOMEvent(this.eventData, event, interactionData);

Expand Down Expand Up @@ -33289,7 +33289,7 @@
// Only mouse and pointer can call onPointerOver, so events will always be length 1
var event = events[0];

var interactionData = this.getInteractionDataForPointerId(event.pointerId);
var interactionData = this.getInteractionDataForPointerId(event);

var interactionEvent = this.configureInteractionEventForDOMEvent(this.eventData, event, interactionData);

Expand All @@ -33309,13 +33309,15 @@
* Get InteractionData for a given pointerId. Store that data as well
*
* @private
* @param {number} pointerId - Identifier from a pointer event
* @param {PointerEvent} event - Normalized pointer event, output from normalizeToPointerData
* @return {InteractionData} - Interaction data for the given pointer identifier
*/


InteractionManager.prototype.getInteractionDataForPointerId = function getInteractionDataForPointerId(pointerId) {
if (pointerId === MOUSE_POINTER_ID) {
InteractionManager.prototype.getInteractionDataForPointerId = function getInteractionDataForPointerId(event) {
var pointerId = event.pointerId;

if (pointerId === MOUSE_POINTER_ID || event.pointerType === 'mouse') {
return this.mouse;
} else if (this.activeInteractionData[pointerId]) {
return this.activeInteractionData[pointerId];
Expand Down
12 changes: 6 additions & 6 deletions samples/_output/libs/pixi.min.js
View file

Large diffs are not rendered by default.

0 comments on commit 0de61e7

Please sign in to comment.