mirror of
https://github.com/scratchfoundation/scratch-vm.git
synced 2025-06-11 04:51:15 -04:00
Add isDiscrete to monitor record, update sb2,3 and conversion tests
This commit is contained in:
parent
8c92d195f7
commit
6754fa9334
7 changed files with 6 additions and 2 deletions
src
test
|
@ -12,6 +12,7 @@ const MonitorRecord = Record({
|
|||
mode: 'default',
|
||||
sliderMin: 0,
|
||||
sliderMax: 100,
|
||||
isDiscrete: true,
|
||||
x: null, // (x: null, y: null) Indicates that the monitor should be auto-positioned
|
||||
y: null,
|
||||
width: 0,
|
||||
|
|
|
@ -381,6 +381,7 @@ const parseMonitorObject = (object, runtime, targets, extensions) => {
|
|||
mode: object.mode,
|
||||
sliderMin: object.sliderMin,
|
||||
sliderMax: object.sliderMax,
|
||||
isDiscrete: object.isDiscrete,
|
||||
x: object.x,
|
||||
y: object.y,
|
||||
width: object.width,
|
||||
|
|
|
@ -504,6 +504,7 @@ const serializeMonitors = function (monitors) {
|
|||
if (monitorData.mode !== 'list') {
|
||||
serializedMonitor.sliderMin = monitorData.sliderMin;
|
||||
serializedMonitor.sliderMax = monitorData.sliderMax;
|
||||
serializedMonitor.isDiscrete = monitorData.isDiscrete;
|
||||
}
|
||||
return serializedMonitor;
|
||||
});
|
||||
|
|
BIN
test/fixtures/monitors.sb2
vendored
BIN
test/fixtures/monitors.sb2
vendored
Binary file not shown.
|
@ -37,6 +37,7 @@ test('importing sb2 project with monitors', t => {
|
|||
t.equal(monitorRecord.mode, 'slider');
|
||||
t.equal(monitorRecord.sliderMin, -200); // Make sure these are imported for sliders.
|
||||
t.equal(monitorRecord.sliderMax, 30);
|
||||
t.equal(monitorRecord.isDiscrete, false);
|
||||
t.equal(monitorRecord.x, 5); // These are imported for all monitors, just check once.
|
||||
t.equal(monitorRecord.y, 59);
|
||||
t.equal(monitorRecord.visible, true);
|
||||
|
|
|
@ -54,6 +54,7 @@ test('saving and loading sb2 project with monitors preserves sliderMin and slide
|
|||
t.equal(monitorRecord.mode, 'slider');
|
||||
t.equal(monitorRecord.sliderMin, -200); // Make sure these are imported for sliders.
|
||||
t.equal(monitorRecord.sliderMax, 30);
|
||||
t.equal(monitorRecord.isDiscrete, false);
|
||||
t.equal(monitorRecord.x, 5); // These are imported for all monitors, just check once.
|
||||
t.equal(monitorRecord.y, 59);
|
||||
t.equal(monitorRecord.visible, true);
|
||||
|
|
|
@ -39,10 +39,9 @@ test('importing sb3 project with monitors', t => {
|
|||
t.equal(monitorRecord.opcode, 'data_variable');
|
||||
t.equal(monitorRecord.mode, 'default');
|
||||
// The following few properties are imported for all monitors, just check once.
|
||||
// sliderMin and sliderMax are currently not implemented,
|
||||
// but should still get default values serialized and deserialized correctly
|
||||
t.equal(monitorRecord.sliderMin, 0);
|
||||
t.equal(monitorRecord.sliderMax, 100);
|
||||
t.equal(monitorRecord.isDiscrete, true); // The default if not present
|
||||
t.equal(monitorRecord.x, 10);
|
||||
t.equal(monitorRecord.y, 62);
|
||||
// Height and width are only used for list monitors and should default to 0
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue