pxt-core 7.5.23 → 7.5.26

package/built/pxt.js

@@ -114473,11 +114473,10 @@ var pxt;
 (function (pxt) {
     var assets;
     (function (assets) {
+        assets.MAX_FREQUENCY = 5000;
+        assets.MAX_VOLUME = 255;
         function renderSoundPath(sound, width, height) {
             const { startFrequency, endFrequency, startVolume, endVolume, wave, interpolation } = sound;
-            const scale = (start, end, percent) => {
-                return Math.pow(start, 1 - percent) * Math.pow(end, percent);
-            };
             // To make the graph appear consistent with the implementation, use a seeded random for the noise waveform.
             // The numbers are still nonsense but at least this reflects that it's deterministic.
             const random = new SeededRandom(startFrequency + endFrequency + 1);
@@ -114494,11 +114493,13 @@ var pxt;
                     break;
             }
             if (wave === "noise") {
-                getFrequencyAt = () => random.randomRange(500, 1000);
+                getFrequencyAt = () => random.randomRange(500, 5000);
             }
-            const getVolumeAt = (x) => ((endVolume - startVolume) / width) * x + startVolume;
-            const volumeToAmplitude = (volume) => (volume / 1023) * (height - 2) / 2;
-            const frequencyToWidth = (frequency) => Math.min(width, Math.max(10, (1 / scale(1, 4000, frequency / 4000)) * width / 2));
+            const getVolumeAt = (x) => Math.max(Math.min(((endVolume - startVolume) / width) * x + startVolume, assets.MAX_VOLUME), 0);
+            const minWaveWidth = 10;
+            const maxWaveWidth = width / 2;
+            const volumeToAmplitude = (volume) => (volume / assets.MAX_VOLUME) * (height - 2) / 2;
+            const frequencyToWidth = (frequency) => (1 - frequency / assets.MAX_FREQUENCY) * (maxWaveWidth - minWaveWidth) + minWaveWidth;
             const parts = [`M ${2} ${height / 2}`];
             let currentX = 0;
             while (currentX < width) {
@@ -114515,8 +114516,8 @@ var pxt;
             // The numbers are still nonsense but at least this reflects that it's deterministic.
             const random = new SeededRandom(frequency);
             if (wave === "noise")
-                frequency = random.randomRange(500, 1000);
-            const amplitude = (volume / 1023) * (height - 2) / 2;
+                frequency = random.randomRange(500, 5000);
+            const amplitude = (volume / assets.MAX_VOLUME) * (height - 2) / 2;
             const waveHalfWidth = (width / (frequency * timeBase / 1000)) / 2;
             let numSegments = Math.ceil(width / (waveHalfWidth * 2));
             if (numSegments % 2 === 1)
@@ -126870,7 +126871,12 @@ ${output}</xml>`;
                     if (optionalCount) {
                         if (!r.mutation)
                             r.mutation = {};
-                        r.mutation["_expanded"] = optionalCount.toString();
+                        if (attributes.compileHiddenArguments) {
+                            r.mutation["_expanded"] = "0";
+                        }
+                        else {
+                            r.mutation["_expanded"] = optionalCount.toString();
+                        }
                     }
                     return r;
                 }

package/built/pxtblockly.js

@@ -15246,6 +15246,7 @@ var pxtblockly;
                 .size(TOTAL_WIDTH, TOTAL_HEIGHT)
                 .setClass("blocklySpriteField")
                 .stroke("#fff", 1)
+                .fill("#dedede")
                 .corner(TOTAL_HEIGHT / 2);
             const clipPathId = "preview-clip-" + pxt.U.guidGen();
             const clip = new svg.ClipPath()
@@ -15480,8 +15481,8 @@ var pxtblockly;
                 sound = {
                     duration: 1000,
                     startFrequency: 100,
-                    endFrequency: 1800,
-                    startVolume: 1023,
+                    endFrequency: 4800,
+                    startVolume: 100,
                     endVolume: 0,
                     wave: "sine",
                     interpolation: "linear",

package/built/pxtblocks.js

@@ -11684,6 +11684,7 @@ var pxtblockly;
                 .size(TOTAL_WIDTH, TOTAL_HEIGHT)
                 .setClass("blocklySpriteField")
                 .stroke("#fff", 1)
+                .fill("#dedede")
                 .corner(TOTAL_HEIGHT / 2);
             const clipPathId = "preview-clip-" + pxt.U.guidGen();
             const clip = new svg.ClipPath()
@@ -11918,8 +11919,8 @@ var pxtblockly;
                 sound = {
                     duration: 1000,
                     startFrequency: 100,
-                    endFrequency: 1800,
-                    startVolume: 1023,
+                    endFrequency: 4800,
+                    startVolume: 100,
                     endVolume: 0,
                     wave: "sine",
                     interpolation: "linear",

package/built/pxtcompiler.js

@@ -5818,7 +5818,12 @@ ${output}</xml>`;
                     if (optionalCount) {
                         if (!r.mutation)
                             r.mutation = {};
-                        r.mutation["_expanded"] = optionalCount.toString();
+                        if (attributes.compileHiddenArguments) {
+                            r.mutation["_expanded"] = "0";
+                        }
+                        else {
+                            r.mutation["_expanded"] = optionalCount.toString();
+                        }
                     }
                     return r;
                 }

package/built/pxtlib.d.ts

@@ -2313,6 +2313,8 @@ declare namespace pxt.assets {
         endVolume: number;
         duration: number;
     }
+    const MAX_FREQUENCY = 5000;
+    const MAX_VOLUME = 255;
     function renderSoundPath(sound: pxt.assets.Sound, width: number, height: number): string;
     function renderWaveSnapshot(frequency: number, volume: number, wave: SoundWaveForm, width: number, height: number, timeBase: number): string;
 }

package/built/pxtlib.js

@@ -16787,11 +16787,10 @@ var pxt;
 (function (pxt) {
     var assets;
     (function (assets) {
+        assets.MAX_FREQUENCY = 5000;
+        assets.MAX_VOLUME = 255;
         function renderSoundPath(sound, width, height) {
             const { startFrequency, endFrequency, startVolume, endVolume, wave, interpolation } = sound;
-            const scale = (start, end, percent) => {
-                return Math.pow(start, 1 - percent) * Math.pow(end, percent);
-            };
             // To make the graph appear consistent with the implementation, use a seeded random for the noise waveform.
             // The numbers are still nonsense but at least this reflects that it's deterministic.
             const random = new SeededRandom(startFrequency + endFrequency + 1);
@@ -16808,11 +16807,13 @@ var pxt;
                     break;
             }
             if (wave === "noise") {
-                getFrequencyAt = () => random.randomRange(500, 1000);
+                getFrequencyAt = () => random.randomRange(500, 5000);
             }
-            const getVolumeAt = (x) => ((endVolume - startVolume) / width) * x + startVolume;
-            const volumeToAmplitude = (volume) => (volume / 1023) * (height - 2) / 2;
-            const frequencyToWidth = (frequency) => Math.min(width, Math.max(10, (1 / scale(1, 4000, frequency / 4000)) * width / 2));
+            const getVolumeAt = (x) => Math.max(Math.min(((endVolume - startVolume) / width) * x + startVolume, assets.MAX_VOLUME), 0);
+            const minWaveWidth = 10;
+            const maxWaveWidth = width / 2;
+            const volumeToAmplitude = (volume) => (volume / assets.MAX_VOLUME) * (height - 2) / 2;
+            const frequencyToWidth = (frequency) => (1 - frequency / assets.MAX_FREQUENCY) * (maxWaveWidth - minWaveWidth) + minWaveWidth;
             const parts = [`M ${2} ${height / 2}`];
             let currentX = 0;
             while (currentX < width) {
@@ -16829,8 +16830,8 @@ var pxt;
             // The numbers are still nonsense but at least this reflects that it's deterministic.
             const random = new SeededRandom(frequency);
             if (wave === "noise")
-                frequency = random.randomRange(500, 1000);
-            const amplitude = (volume / 1023) * (height - 2) / 2;
+                frequency = random.randomRange(500, 5000);
+            const amplitude = (volume / assets.MAX_VOLUME) * (height - 2) / 2;
             const waveHalfWidth = (width / (frequency * timeBase / 1000)) / 2;
             let numSegments = Math.ceil(width / (waveHalfWidth * 2));
             if (numSegments % 2 === 1)