changed category for "switch to scene" to control

snap7
jmoenig 2021-09-08 15:45:02 +02:00
rodzic 770cf68cf3
commit 72d8000f57
3 zmienionych plików z 17 dodań i 12 usunięć

Wyświetl plik

@ -33,6 +33,9 @@
* German
* Chinese, thanks, Simon!
### 2021-09-08
* objects: changed category for "switch to scene" to control
### 2021-09-07
* blocks, objects, threads: new change-of-scene event
* gui, threads: enabled change-of-scene events for user-induced scene switches, made them user-stoppable

Wyświetl plik

@ -18,7 +18,7 @@
<script src="src/widgets.js?version=2021-07-21"></script>
<script src="src/blocks.js?version=2021-09-07"></script>
<script src="src/threads.js?version=2021-09-07"></script>
<script src="src/objects.js?version=2021-09-07"></script>
<script src="src/objects.js?version=2021-09-08"></script>
<script src="src/scenes.js?version=2021-07-21"></script>
<script src="src/gui.js?version=2021-09-07"></script>
<script src="src/paint.js?version=2021-07-05"></script>

Wyświetl plik

@ -86,7 +86,7 @@ AlignmentMorph, Process, WorldMap, copyCanvas, useBlurredShadows*/
/*jshint esversion: 6*/
modules.objects = '2021-September-07';
modules.objects = '2021-September-08';
var SpriteMorph;
var StageMorph;
@ -438,12 +438,6 @@ SpriteMorph.prototype.initBlocks = function () {
spec: 'go back %n layers',
defaults: [1]
},
doSwitchToScene: {
type: 'command',
category: 'looks',
spec: 'switch to scene %scn',
defaults: [['next']]
},
// Looks - Debugging primitives for development mode
doScreenshot: {
@ -908,6 +902,14 @@ SpriteMorph.prototype.initBlocks = function () {
spec: 'pause all %pause'
},
// Scenes
doSwitchToScene: {
type: 'command',
category: 'control',
spec: 'switch to scene %scn',
defaults: [['next']]
},
// Sensing
reportTouchingObject: {
only: SpriteMorph,
@ -2421,8 +2423,6 @@ SpriteMorph.prototype.blockTemplates = function (category = 'motion') {
blocks.push('-');
blocks.push(block('goToLayer'));
blocks.push(block('goBack'));
blocks.push('-');
blocks.push(block('doSwitchToScene'));
// for debugging: ///////////////
if (devMode) {
@ -2548,6 +2548,8 @@ SpriteMorph.prototype.blockTemplates = function (category = 'motion') {
blocks.push(block('removeClone'));
blocks.push('-');
blocks.push(block('doPauseAll'));
blocks.push('-');
blocks.push(block('doSwitchToScene'));
} else if (category === 'sensing') {
@ -8643,8 +8645,6 @@ StageMorph.prototype.blockTemplates = function (category = 'motion') {
blocks.push(block('hide'));
blocks.push(watcherToggle('reportShown'));
blocks.push(block('reportShown'));
blocks.push('-');
blocks.push(block('doSwitchToScene'));
// for debugging: ///////////////
if (this.world().isDevMode) {
@ -8755,6 +8755,8 @@ StageMorph.prototype.blockTemplates = function (category = 'motion') {
blocks.push(block('newClone'));
blocks.push('-');
blocks.push(block('doPauseAll'));
blocks.push('-');
blocks.push(block('doSwitchToScene'));
} else if (category === 'sensing') {