scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 23:12:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove "visible" state flag and use target visibility directly.

Browse source 
This fixes several other bugs like "saying" from a hidden sprite.
This commit is contained in:
Paul Kaplan 2017-10-23 13:03:10 -04:00
parent 5ca58c7ceb
commit 24d550d860
1 changed files with 10 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/blocks/scratch3_looks.js
View file

@ -8,7 +8,6 @@ const RenderedTarget = require('../sprites/rendered-target');
* @property {?int} drawableId - the ID of the associated bubble Drawable, null if none. * @property {?int} drawableId - the ID of the associated bubble Drawable, null if none.
* @property {string} text - the text of the bubble. * @property {string} text - the text of the bubble.
* @property {string} type - the type of the bubble, "say" or "think" * @property {string} type - the type of the bubble, "say" or "think"
* @property {Boolean} visible - whether the bubble is hidden along with its sprite.
*/ */
class Scratch3LooksBlocks { class Scratch3LooksBlocks {
@ -38,8 +37,7 @@ class Scratch3LooksBlocks {
onSpriteRight: true, onSpriteRight: true,
skinId: null, skinId: null,
text: '', text: '',
type: 'say', type: 'say'
visible: true
}; };
} }
@ -72,7 +70,7 @@ class Scratch3LooksBlocks {
*/ */
_onTargetMoved (target) { _onTargetMoved (target) {
const bubbleState = this._getBubbleState(target); const bubbleState = this._getBubbleState(target);
if (bubbleState.drawableId && bubbleState.visible) { if (bubbleState.drawableId) {
this._positionBubble(target); this._positionBubble(target);
} }
} }
@ -84,16 +82,14 @@ class Scratch3LooksBlocks {
*/ */
_onTargetWillExit (target) { _onTargetWillExit (target) {
const bubbleState = this._getBubbleState(target); const bubbleState = this._getBubbleState(target);
if (bubbleState.drawableId) { if (bubbleState.drawableId && bubbleState.skinId) {
this.runtime.renderer.destroyDrawable(bubbleState.drawableId); this.runtime.renderer.destroyDrawable(bubbleState.drawableId);
bubbleState.drawableId = null;
}
if (bubbleState.skinId) {
this.runtime.renderer.destroySkin(bubbleState.skinId); this.runtime.renderer.destroySkin(bubbleState.skinId);
bubbleState.drawableId = null;
bubbleState.skinId = null; bubbleState.skinId = null;
this.runtime.requestRedraw();
} }
target.removeListener(RenderedTarget.EVENT_TARGET_MOVED, this._onTargetMoved); target.removeListener(RenderedTarget.EVENT_TARGET_MOVED, this._onTargetMoved);
clearTimeout(this._bubbleTimeout);
} }
/** /**
@ -104,6 +100,7 @@ class Scratch3LooksBlocks {
for (let n = 0; n < this.runtime.targets.length; n++) { for (let n = 0; n < this.runtime.targets.length; n++) {
this._onTargetWillExit(this.runtime.targets[n]); this._onTargetWillExit(this.runtime.targets[n]);
} }
clearTimeout(this._bubbleTimeout);
} }
/** /**
@ -150,17 +147,12 @@ class Scratch3LooksBlocks {
_renderBubble (target) { _renderBubble (target) {
const bubbleState = this._getBubbleState(target); const bubbleState = this._getBubbleState(target);
const {type, text, onSpriteRight} = bubbleState; const {type, text, onSpriteRight} = bubbleState;
if (text === '') { // Remove the bubble if empty text or sprite is not visible
return this._setBubbleVisibility(target, false); if (text === '' || !target.visible) {
return this._onTargetWillExit(target);
} }
if (bubbleState.skinId) { if (bubbleState.skinId) {
if (!bubbleState.visible) {
bubbleState.visible = true;
this.runtime.renderer.updateDrawableProperties(bubbleState.drawableId, {
visible: bubbleState.visible
});
}
this.runtime.renderer.updateTextSkin(bubbleState.skinId, type, text, onSpriteRight, [0, 0]); this.runtime.renderer.updateTextSkin(bubbleState.skinId, type, text, onSpriteRight, [0, 0]);
} else { } else {
target.addListener(RenderedTarget.EVENT_TARGET_MOVED, this._onTargetMoved); target.addListener(RenderedTarget.EVENT_TARGET_MOVED, this._onTargetMoved);
@ -174,7 +166,6 @@ class Scratch3LooksBlocks {
bubbleState.drawableId = this.runtime.renderer.createDrawable(); bubbleState.drawableId = this.runtime.renderer.createDrawable();
bubbleState.skinId = this.runtime.renderer.createTextSkin(type, text, bubbleState.onSpriteRight, [0, 0]); bubbleState.skinId = this.runtime.renderer.createTextSkin(type, text, bubbleState.onSpriteRight, [0, 0]);
bubbleState.visible = true;
this.runtime.renderer.setDrawableOrder(bubbleState.drawableId, Infinity); this.runtime.renderer.setDrawableOrder(bubbleState.drawableId, Infinity);
this.runtime.renderer.updateDrawableProperties(bubbleState.drawableId, { this.runtime.renderer.updateDrawableProperties(bubbleState.drawableId, {
@ -200,23 +191,6 @@ class Scratch3LooksBlocks {
this._renderBubble(target); this._renderBubble(target);
} }
/**
* Hide the bubble for a given target.
* @param {!Target} target Target that say/think blocks are being called on.
* @param {!boolean} visibility Visible or not.
* @private
*/
_setBubbleVisibility (target, visibility) {
const bubbleState = this._getBubbleState(target);
bubbleState.visible = visibility;
if (bubbleState.drawableId) {
this.runtime.renderer.updateDrawableProperties(bubbleState.drawableId, {
visible: bubbleState.visible
});
}
this.runtime.requestRedraw();
}
/** /**
* Retrieve the block primitives implemented by this package. * Retrieve the block primitives implemented by this package.
* @return {object.<string, Function>} Mapping of opcode to Function. * @return {object.<string, Function>} Mapping of opcode to Function.
@ -288,7 +262,7 @@ class Scratch3LooksBlocks {
hide (args, util) { hide (args, util) {
util.target.setVisible(false); util.target.setVisible(false);
this._setBubbleVisibility(util.target, false); this._renderBubble(util.target);
} }
/** /**