tweaked perish() animation

snap7
jmoenig 2021-07-07 12:20:00 +02:00
rodzic 042b5e0ae0
commit 431ac7c000
4 zmienionych plików z 14 dodań i 11 usunięć

Wyświetl plik

@ -19,6 +19,9 @@
* **Translation Updates:** * **Translation Updates:**
* German * German
### 2021-07-07
* morphic, gui: tweaked perish() animation
### 2021-07-06 ### 2021-07-06
* byob, objects: new feature: hide custom helper blocks in palette * byob, objects: new feature: hide custom helper blocks in palette
* German translation update (hiding helper blocks in the palette) * German translation update (hiding helper blocks in the palette)

Wyświetl plik

@ -5,14 +5,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Snap! 7 - dev - Build Your Own Blocks</title> <title>Snap! 7 - dev - Build Your Own Blocks</title>
<link rel="icon" href="src/favicon.ico"> <link rel="icon" href="src/favicon.ico">
<script src="src/morphic.js?version=2021-07-05"></script> <script src="src/morphic.js?version=2021-07-07"></script>
<script src="src/symbols.js?version=2021-03-03"></script> <script src="src/symbols.js?version=2021-03-03"></script>
<script src="src/widgets.js?version=2021-07-05"></script> <script src="src/widgets.js?version=2021-07-05"></script>
<script src="src/blocks.js?version=2021-07-05"></script> <script src="src/blocks.js?version=2021-07-05"></script>
<script src="src/threads.js?version=2021-07-05"></script> <script src="src/threads.js?version=2021-07-05"></script>
<script src="src/objects.js?version=2021-07-06"></script> <script src="src/objects.js?version=2021-07-06"></script>
<script src="src/scenes.js?version=2021-07-06"></script> <script src="src/scenes.js?version=2021-07-06"></script>
<script src="src/gui.js?version=2021-07-06"></script> <script src="src/gui.js?version=2021-07-07"></script>
<script src="src/paint.js?version=2021-07-05"></script> <script src="src/paint.js?version=2021-07-05"></script>
<script src="src/lists.js?version=2021-07-05"></script> <script src="src/lists.js?version=2021-07-05"></script>
<script src="src/byob.js?version=2021-07-06"></script> <script src="src/byob.js?version=2021-07-06"></script>

Wyświetl plik

@ -85,7 +85,7 @@ Animation, BoxMorph, BlockDialogMorph, RingMorph, Project, ZERO, BLACK*/
// Global stuff //////////////////////////////////////////////////////// // Global stuff ////////////////////////////////////////////////////////
modules.gui = '2021-July-06'; modules.gui = '2021-July-07';
// Declarations // Declarations
@ -1426,7 +1426,7 @@ IDE_Morph.prototype.createPalette = function (forSearching) {
this.removeSprite(droppedMorph.object); this.removeSprite(droppedMorph.object);
} else if (droppedMorph instanceof CostumeIconMorph) { } else if (droppedMorph instanceof CostumeIconMorph) {
this.currentSprite.wearCostume(null); this.currentSprite.wearCostume(null);
droppedMorph.perish(); droppedMorph.perish(myself.isAnimating ? 200 : 0);
} else if (droppedMorph instanceof BlockMorph) { } else if (droppedMorph instanceof BlockMorph) {
this.stage.threads.stopAllForBlock(droppedMorph); this.stage.threads.stopAllForBlock(droppedMorph);
if (hand && hand.grabOrigin.origin instanceof ScriptsMorph) { if (hand && hand.grabOrigin.origin instanceof ScriptsMorph) {
@ -1434,9 +1434,9 @@ IDE_Morph.prototype.createPalette = function (forSearching) {
hand.grabOrigin.origin.lastDroppedBlock = droppedMorph; hand.grabOrigin.origin.lastDroppedBlock = droppedMorph;
hand.grabOrigin.origin.recordDrop(hand.grabOrigin); hand.grabOrigin.origin.recordDrop(hand.grabOrigin);
} }
droppedMorph.perish(); droppedMorph.perish(myself.isAnimating ? 200 : 0);
} else { } else {
droppedMorph.perish(); droppedMorph.perish(myself.isAnimating ? 200 : 0);
} }
}; };

Wyświetl plik

@ -1291,7 +1291,7 @@
/*jshint esversion: 6*/ /*jshint esversion: 6*/
var morphicVersion = '2021-July-05'; var morphicVersion = '2021-July-07';
var modules = {}; // keep track of additional loaded modules var modules = {}; // keep track of additional loaded modules
var useBlurredShadows = true; var useBlurredShadows = true;
@ -4073,7 +4073,7 @@ Morph.prototype.glideTo = function (endPoint, msecs, easing, onComplete) {
x => this.setLeft(x), x => this.setLeft(x),
() => this.left(), () => this.left(),
-(this.left() - endPoint.x), -(this.left() - endPoint.x),
msecs || 100, msecs === 0 ? 0 : msecs || 100,
easing easing
); );
world.animations.push(horizontal); world.animations.push(horizontal);
@ -4081,7 +4081,7 @@ Morph.prototype.glideTo = function (endPoint, msecs, easing, onComplete) {
y => this.setTop(y), y => this.setTop(y),
() => this.top(), () => this.top(),
-(this.top() - endPoint.y), -(this.top() - endPoint.y),
msecs || 100, msecs === 0 ? 0 : msecs || 100,
easing, easing,
() => { () => {
horizontal.setter(horizontal.destination); horizontal.setter(horizontal.destination);
@ -4105,7 +4105,7 @@ Morph.prototype.fadeTo = function (endAlpha, msecs, easing, onComplete) {
}, },
() => this.alpha, () => this.alpha,
endAlpha - this.alpha, endAlpha - this.alpha,
msecs || 200, msecs === 0 ? 0 : msecs || 200,
easing, easing,
() => { () => {
this.alpha = oldAlpha; this.alpha = oldAlpha;
@ -4117,7 +4117,7 @@ Morph.prototype.fadeTo = function (endAlpha, msecs, easing, onComplete) {
Morph.prototype.perish = function (msecs, onComplete) { Morph.prototype.perish = function (msecs, onComplete) {
this.fadeTo( this.fadeTo(
0, 0,
msecs || 100, msecs === 0 ? 0 : msecs || 100,
null, null,
() => { () => {
this.destroy(); this.destroy();