Skip to content

Commit

Permalink
fix: use callbackScope for tweens in phaser 3
Browse files Browse the repository at this point in the history
  • Loading branch information
jsfehler committed Jan 26, 2024
1 parent 605c5eb commit f3306cf
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 25 deletions.
24 changes: 12 additions & 12 deletions docs/examples/js/phaser3/hscrollbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ var game = new Phaser.Game(config);

function preload() {
var assetRoot = '../../assets/horizontal/';
this.load.image("dummyButton", assetRoot + "sprite.png");
this.load.image("track", assetRoot + 'track.png');
this.load.spritesheet('bar', assetRoot + 'bar.png', { frameWidth: 44, frameHeight: 22 });
this.load.image('dummyButton', `${assetRoot}sprite.png`);
this.load.image('track', `${assetRoot}track.png`);
this.load.spritesheet('bar', `${assetRoot}bar.png`, { frameWidth: 44, frameHeight: 22 });
}

function create() {
Expand All @@ -25,15 +25,15 @@ function create() {
viewport.addNode(row);

// Add things to the row.
var dummy_sprite_a = this.add.image(0, 0, "dummyButton");
var dummy_sprite_b = this.add.image(0, 0, "dummyButton");
var dummy_sprite_c = this.add.image(0, 0, "dummyButton");
var dummy_sprite_d = this.add.image(0, 0, "dummyButton");
var dummy_sprite_e = this.add.image(0, 0, "dummyButton");
var dummy_sprite_f = this.add.image(0, 0, "dummyButton");
var dummy_sprite_g = this.add.image(0, 0, "dummyButton");
var dummy_sprite_h = this.add.image(0, 0, "dummyButton");
var dummy_sprite_i = this.add.image(0, 0, "dummyButton");
var dummy_sprite_a = this.add.image(0, 0, 'dummyButton');
var dummy_sprite_b = this.add.image(0, 0, 'dummyButton');
var dummy_sprite_c = this.add.image(0, 0, 'dummyButton');
var dummy_sprite_d = this.add.image(0, 0, 'dummyButton');
var dummy_sprite_e = this.add.image(0, 0, 'dummyButton');
var dummy_sprite_f = this.add.image(0, 0, 'dummyButton');
var dummy_sprite_g = this.add.image(0, 0, 'dummyButton');
var dummy_sprite_h = this.add.image(0, 0, 'dummyButton');
var dummy_sprite_i = this.add.image(0, 0, 'dummyButton');

row.addNode(dummy_sprite_a);
row.addNode(dummy_sprite_b);
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/lib/phaser-ui-tools.js

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions src/bars/draggable_bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,6 @@ export class DraggableBar extends Bar {
this.moveContent,
null,
this,
this,
null,
);
}

Expand Down
10 changes: 2 additions & 8 deletions src/phaserObjects/tween.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,15 @@ if (Phaser.Tween === undefined) {
this.game = game;
}

add(target, properties, duration, ease, onComplete, onUpdate, onStart, onCompleteScope, onUpdateScope, onStartScope) {
const completeScope = onCompleteScope || this;
const updateScope = onUpdateScope || this;
const startScope = onStartScope || this;

add(target, properties, duration, ease, onComplete, onUpdate, onStart, callbackScope) {
const config = {
targets: target,
duration,
ease,
onComplete,
onUpdate,
onStart,
onCompleteScope: completeScope,
onUpdateScope: updateScope,
onStartScope: startScope,
callbackScope,
};
const params = Object.assign(config, properties);
this.game.tweens.add(params);
Expand Down
2 changes: 0 additions & 2 deletions src/wheel3D.js
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,6 @@ export class Wheel3D {
null,
() => { this.dispatchOnStart(); },
this,
null,
null,
);
}
}
Expand Down

0 comments on commit f3306cf

Please sign in to comment.