HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-12 16:48:10 +00:00
Code Actions Packages Releases Activity

Merge pull request #261 from thewhodidthis/bf#114--pixi

Browse Source 
Clean up PIXI.Texture and Sprite creation & removal for movies and images
This commit is contained in:
Alain Pitiot 2021-02-18 13:23:18 +01:00 committed by GitHub
commit aa5a47a7d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/visual/ImageStim.js
View File

@ -255,7 +255,11 @@ export class ImageStim extends util.mix(VisualStim).with(ColorMixin)
if (typeof this._pixi !== 'undefined')
{
this._pixi.destroy(true);
this._pixi.destroy({
children: true,
texture: true,
baseTexture: false
});
}
this._pixi = undefined;
@ -265,14 +269,13 @@ export class ImageStim extends util.mix(VisualStim).with(ColorMixin)
return;
}
this._texture = new PIXI.Texture(new PIXI.BaseTexture(this._image));
this._pixi = new PIXI.Sprite(this._texture);
this._texture = PIXI.Texture.from(this._image);
this._pixi = PIXI.Sprite.from(this._texture);
// add a mask if need be:
if (typeof this._mask !== 'undefined')
{
this._maskTexture = new PIXI.Texture(new PIXI.BaseTexture(this._mask));
this._pixi.mask = new PIXI.Sprite(this._maskTexture);
this._pixi.mask = PIXI.Sprite.from(this._mask);
// a 0.5, 0.5 anchor is required for the mask to be aligned with the image
this._pixi.mask.anchor.x = 0.5;