scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-01-11 10:39:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1070 from paulkaplan/fix-bubbles

Browse source 
Fix drag and empty costume bugs with say bubbles
This commit is contained in:
Paul Kaplan 2018-04-20 11:43:15 -04:00 committed by GitHub
commit 0f16e2fe65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/blocks/scratch3_looks.js
View file

@ -20,7 +20,7 @@ class Scratch3LooksBlocks {
*/
this.runtime = runtime;
this._onTargetMoved = this._onTargetMoved.bind(this);
this._onTargetChanged = this._onTargetChanged.bind(this);
this._onResetBubbles = this._onResetBubbles.bind(this);
this._onTargetWillExit = this._onTargetWillExit.bind(this);
this._updateBubble = this._updateBubble.bind(this);
@ -75,7 +75,7 @@ class Scratch3LooksBlocks {
* @param {RenderedTarget} target - the target which has moved.
* @private
*/
_onTargetMoved (target) {
_onTargetChanged (target) {
const bubbleState = this._getBubbleState(target);
if (bubbleState.drawableId) {
this._positionBubble(target);
@ -97,7 +97,7 @@ class Scratch3LooksBlocks {
bubbleState.drawableVisible = true; // Reset back to default value
this.runtime.requestRedraw();
}
target.removeListener(RenderedTarget.EVENT_TARGET_MOVED, this._onTargetMoved);
target.removeListener(RenderedTarget.EVENT_TARGET_VISUAL_CHANGE, this._onTargetChanged);
}
/**
@ -117,9 +117,22 @@ class Scratch3LooksBlocks {
* @private
*/
_positionBubble (target) {
if (!target.visible) return;
const bubbleState = this._getBubbleState(target);
const [bubbleWidth, bubbleHeight] = this.runtime.renderer.getCurrentSkinSize(bubbleState.drawableId);
const targetBounds = target.getBoundsForBubble();
let targetBounds;
try {
targetBounds = target.getBoundsForBubble();
} catch (error_) {
// Bounds calculation could fail (e.g. on empty costumes), in that case
// use the x/y position of the target.
targetBounds = {
left: target.x,
right: target.x,
top: target.y,
bottom: target.y
};
}
const stageBounds = this.runtime.getTargetForStage().getBounds();
if (bubbleState.onSpriteRight && bubbleWidth + targetBounds.right > stageBounds.right &&
(targetBounds.left - bubbleWidth > stageBounds.left)) { // Only flip if it would fit
@ -178,7 +191,7 @@ class Scratch3LooksBlocks {
this.runtime.renderer.updateTextSkin(bubbleState.skinId, type, text, onSpriteRight, [0, 0]);
}
} else {
target.addListener(RenderedTarget.EVENT_TARGET_MOVED, this._onTargetMoved);
target.addListener(RenderedTarget.EVENT_TARGET_VISUAL_CHANGE, this._onTargetChanged);
// TODO is there a way to figure out before rendering whether to default left or right?
const targetBounds = target.getBounds();

18
src/sprites/rendered-target.js
View file

@ -193,6 +193,14 @@ class RenderedTarget extends Target {
return 'TARGET_MOVED';
}
/**
* Event which fires when a target changes visually, for updating say bubbles.
* @type {string}
*/
static get EVENT_TARGET_VISUAL_CHANGE () {
return 'EVENT_TARGET_VISUAL_CHANGE';
}
/**
* Rotation style for "all around"/spinning.
* @type {string}
@ -249,6 +257,7 @@ class RenderedTarget extends Target {
position: position
});
if (this.visible) {
this.emit(RenderedTarget.EVENT_TARGET_VISUAL_CHANGE, this);
this.runtime.requestRedraw();
}
} else {
@ -299,6 +308,7 @@ class RenderedTarget extends Target {
scale: renderedDirectionScale.scale
});
if (this.visible) {
this.emit(RenderedTarget.EVENT_TARGET_VISUAL_CHANGE, this);
this.runtime.requestRedraw();
}
}
@ -346,6 +356,7 @@ class RenderedTarget extends Target {
visible: this.visible
});
if (this.visible) {
this.emit(RenderedTarget.EVENT_TARGET_VISUAL_CHANGE, this);
this.runtime.requestRedraw();
}
}
@ -378,6 +389,7 @@ class RenderedTarget extends Target {
scale: renderedDirectionScale.scale
});
if (this.visible) {
this.emit(RenderedTarget.EVENT_TARGET_VISUAL_CHANGE, this);
this.runtime.requestRedraw();
}
}
@ -397,6 +409,7 @@ class RenderedTarget extends Target {
props[effectName] = this.effects[effectName];
this.renderer.updateDrawableProperties(this.drawableID, props);
if (this.visible) {
this.emit(RenderedTarget.EVENT_TARGET_VISUAL_CHANGE, this);
this.runtime.requestRedraw();
}
}
@ -413,6 +426,7 @@ class RenderedTarget extends Target {
if (this.renderer) {
this.renderer.updateDrawableProperties(this.drawableID, this.effects);
if (this.visible) {
this.emit(RenderedTarget.EVENT_TARGET_VISUAL_CHANGE, this);
this.runtime.requestRedraw();
}
}
@ -446,6 +460,7 @@ class RenderedTarget extends Target {
}
this.renderer.updateDrawableProperties(this.drawableID, drawableProperties);
if (this.visible) {
this.emit(RenderedTarget.EVENT_TARGET_VISUAL_CHANGE, this);
this.runtime.requestRedraw();
}
}
@ -573,6 +588,7 @@ class RenderedTarget extends Target {
scale: renderedDirectionScale.scale
});
if (this.visible) {
this.emit(RenderedTarget.EVENT_TARGET_VISUAL_CHANGE, this);
this.runtime.requestRedraw();
}
}
@ -645,6 +661,7 @@ class RenderedTarget extends Target {
}
this.renderer.updateDrawableProperties(this.drawableID, props);
if (this.visible) {
this.emit(RenderedTarget.EVENT_TARGET_VISUAL_CHANGE, this);
this.runtime.requestRedraw();
}
}
@ -1034,6 +1051,7 @@ class RenderedTarget extends Target {
if (this.renderer && this.drawableID !== null) {
this.renderer.destroyDrawable(this.drawableID);
if (this.visible) {
this.emit(RenderedTarget.EVENT_TARGET_VISUAL_CHANGE, this);
this.runtime.requestRedraw();
}
}