test-1

Author: FirePheonix

css/activities.css

@@ -2020,3 +2020,15 @@ table {
   min-width: 250px;
   max-width: 80%;
 }
+
+.lego-brick {
+    display: inline-block;
+    background-color: #FF0000;
+    border: 1px solid #880000;
+    margin: 2px;
+}
+
+.lego-size-1 { width: 20px; height: 10px; }
+.lego-size-2 { width: 40px; height: 10px; }
+/* ... more sizes ... */
+

css/style.css

@@ -99,3 +99,15 @@ input[type="range"]:focus::-ms-fill-lower {
 input[type="range"]:focus::-ms-fill-upper {
   background: #90c100;
 }
+
+.lego-brick {
+    display: inline-block;
+    background-color: #FF0000;
+    border: 1px solid #880000;
+    margin: 2px;
+}
+
+.lego-size-1 { width: 20px; height: 10px; }
+.lego-size-2 { width: 40px; height: 10px; }
+/* ... more sizes ... */
+

js/activity.js

@@ -172,6 +172,7 @@ if (_THIS_IS_MUSIC_BLOCKS_) {
         "widgets/timbre",
         "widgets/oscilloscope",
         "widgets/sampler",
+        "widgets/legobricks",
         "activity/lilypond",
         "activity/abc",
         "activity/midi",

js/block.js

@@ -4244,6 +4244,7 @@ class Block {
                         case "pitch staircase":
                         case "status":
                         case "phrase maker":
+                        case "lego bricks":
                         case "custom mode":
                         case "music keyboard":
                         case "pitch drum":

js/blocks.js

@@ -1579,6 +1579,7 @@ class Blocks {
                             case "pitch staircase":
                             case "status":
                             case "phrase maker":
+                            case "lego bricks":
                             case "custom mode":
                             case "music keyboard":
                             case "pitch drum":
@@ -2035,6 +2036,7 @@ class Blocks {
                                 case "pitch staircase":
                                 case "status":
                                 case "phrase maker":
+                                case "lego bricks":
                                 case "custom mode":
                                 case "music keyboard":
                                 case "pitch drum":

js/blocks/PitchBlocks.js

@@ -1614,6 +1614,17 @@ function setupPitchBlocks(activity) {
                 // convert hertz to note/octave
                 const note = obj;
                 tur.singer.lastNotePlayed = [note[0] + note[1], 4];
+            } else if (logo.inLegoWidget) {
+                logo.legoWidget.addRowBlock(blk);
+                if (!logo.pitchBlocks.includes(blk)) {
+                    logo.pitchBlocks.push(blk);
+                }
+
+                logo.legoWidget.rowLabels.push(activity.blocks.blockList[blk].name);
+                logo.legoWidget.rowArgs.push(arg.toFixed(0));
+                // convert hertz to note/octave
+                const note = obj;
+                tur.singer.lastNotePlayed = [note[0] + note[1], 4];
             } else if (logo.inMusicKeyboard) {
                 logo.musicKeyboard.instruments.push(last(tur.singer.instrumentNames));
                 logo.musicKeyboard.noteNames.push("hertz");

js/blocks/WidgetBlocks.js

@@ -19,7 +19,7 @@
    RhythmRuler, FILTERTYPES, instrumentsFilters, DEFAULTFILTERTYPE,
    TemperamentWidget, TimbreWidget, ModeWidget, PitchSlider,
    MusicKeyboard, PitchStaircase, SampleWidget, _THIS_IS_MUSIC_BLOCKS_,
-   Arpeggio
+   Arpeggio, LegoWidget
  */
 
 /*
@@ -60,6 +60,8 @@
     MusicKeyboard
    - js/widgets/pitchstaircase.js
     PitchStaircase
+   - js/widgets/legobricks.js
+    LegoWidget
  */
 
 /* exported setupWidgetBlocks */
@@ -1652,6 +1654,91 @@ function setupWidgetBlocks(activity) {
             return [args[0], 1];
         }
     }
+
+/**
+ * Represents a block for controlling LEGO brick parameters and visualization.
+ * @extends StackClampBlock
+ */
+class LegoBricksBlock extends StackClampBlock {
+    constructor() {
+        super("legobricks");
+        this.setPalette("widgets", activity);
+        this.parameter = true;
+        this.beginnerBlock(true);
+
+        this.setHelpString([
+            _("The LEGO Bricks block opens a widget for designing virtual LEGO creations."),
+            "documentation",
+            null,
+            "legobricks"
+        ]);
+
+        //.TRANS: LEGO bricks designer
+        this.formBlock({ name: _("LEGO Bricks"), canCollapse: true });
+        this.makeMacro((x, y) => [
+            [0, "legobricks", x, y, [null, 1, 18]],
+            [1, "pitch", 0, 0, [0, 2, 3, 4]],
+            [2, ["solfege", { value: "do" }], 0, 0, [1]],
+            [3, ["number", { value: 4 }], 0, 0, [1]],
+            [4, "pitch", 0, 0, [1, 5, 6, 7]],
+            [5, ["solfege", { value: "re" }], 0, 0, [4]],
+            [6, ["number", { value: 4 }], 0, 0, [4]],
+            [7, "pitch", 0, 0, [4, 8, 9, 10]],
+            [8, ["solfege", { value: "mi" }], 0, 0, [7]],
+            [9, ["number", { value: 4 }], 0, 0, [7]],
+            [10, "pitch", 0, 0, [7, 11, 12, 13]],
+            [11, ["solfege", { value: "fa" }], 0, 0, [10]],
+            [12, ["number", { value: 4 }], 0, 0, [10]],
+            [13, "pitch", 0, 0, [10, 14, 15, 16]],
+            [14, ["solfege", { value: "sol" }], 0, 0, [13]],
+            [15, ["number", { value: 4 }], 0, 0, [13]],
+            [16, "playdrum", 0, 0, [13, 17, null]],
+            [17, ["drumname", { value: "kick drum" }], 0, 0, [16]],
+            [18, "hiddennoflow", 0, 0, [0, null]]
+        ]);
+    }
+
+    /**
+     * Handles the flow of data for the LEGO bricks block.
+     * @param {any[]} args - The arguments passed to the block.
+     * @param {object} logo - The logo object.
+     * @param {object} turtle - The turtle object.
+     * @param {object} blk - The block object.
+     * @returns {number[]} - The output values.
+     */
+    flow(args, logo, turtle, blk) {
+        logo.inLegoWidget = true;
+
+        if (logo.legoWidget === null) {
+            logo.legoWidget = new LegoWidget();
+        }
+        logo.legoWidget.blockNo = blk;
+
+        logo.legoWidget.rowLabels = [];
+        logo.legoWidget.rowArgs = [];
+        logo.legoWidget.clearBlocks();
+
+        const listenerName = "_legobricks_" + turtle;
+        logo.setDispatchBlock(blk, turtle, listenerName);
+
+        const __listener = () => {
+            if (logo.legoWidget.rowLabels.length === 0) {
+                activity.errorMsg(
+                    _("You must have at least one pitch block in the LEGO bricks widget."),
+                    blk
+                );
+            } else {
+                logo.legoWidget.blockNo = blk;
+                logo.legoWidget.init(activity);
+            }
+            logo.inLegoWidget = false;
+        };
+
+        logo.setTurtleListener(turtle, listenerName, __listener);
+
+        if (args.length === 1) return [args[0], 1];
+    }
+}
     // Set up blocks if this is Music Blocks environment
     if (_THIS_IS_MUSIC_BLOCKS_) {
         new EnvelopeBlock().setup(activity);
@@ -1667,6 +1754,7 @@ function setupWidgetBlocks(activity) {
         new oscilloscopeWidgetBlock().setup(activity);
         new PitchSliderBlock().setup(activity);
         new ChromaticBlock().setup(activity);
+        new LegoBricksBlock().setup(activity);
         // new AIMusicBlocks().setup(activity);
         new MusicKeyboard2Block().setup(activity);
         new MusicKeyboardBlock().setup(activity);

js/logo.js

@@ -111,6 +111,7 @@ class Logo {
 
         // Widgets
         this.phraseMaker = null;
+        this.legoWidget = null;
         this.pitchDrumMatrix = null;
         this.arpeggio = null;
         this.rhythmRuler = null;
@@ -125,6 +126,7 @@ class Logo {
         this.oscilloscopeTurtles = [];
         this.meterWidget = null;
         this.statusMatrix = null;
+        this.legobricks = null;
 
         this.evalFlowDict = {};
         this.evalArgDict = {};
@@ -182,6 +184,7 @@ class Logo {
 
         // pitch-rhythm matrix
         this.inMatrix = false;
+        this.inLegoWidget = false;
         this.tupletRhythms = [];
         this.addingNotesToTuplet = false;
         this.drumBlocks = [];
@@ -1062,6 +1065,7 @@ class Logo {
 
         this.inPitchDrumMatrix = false;
         this.inMatrix = false;
+        this.inLegoWidget = false;
         this.inMusicKeyboard = false;
         this.inTimbre = false;
         this.inArpeggio = false;

js/turtle-singer.js

@@ -233,6 +233,14 @@ class Singer {
 
                 logo.phraseMaker.rowLabels.push(activity.logo.blocks.blockList[blk].name);
                 logo.phraseMaker.rowArgs.push(args[0]);
+            } else if (logo.inLegoWidget) {
+                logo.legoWidget.addRowBlock(blk);
+                if (!logo.pitchBlocks.includes(blk)) {
+                    logo.pitchBlocks.push(blk);
+                }
+
+                logo.legoWidget.rowLabels.push(activity.logo.blocks.blockList[blk].name);
+                logo.legoWidget.rowArgs.push(args[0]);
             } else if (logo.inPitchSlider) {
                 logo.pitchSlider.frequency = args[0];
             } else {
@@ -910,6 +918,56 @@ class Singer {
                     activity.logo.phraseMaker.rowArgs.push(noteObj[1]);
                 }
             }
+        } else if (activity.logo.inLegoWidget) {
+            if (note.toLowerCase() !== "rest") {
+                activity.logo.legoWidget.addRowBlock(blk);
+                if (!activity.logo.pitchBlocks.includes(blk)) {
+                    activity.logo.pitchBlocks.push(blk);
+                }
+            }
+
+            const duplicateFactor =
+                tur.singer.duplicateFactor.length > 0 ? tur.singer.duplicateFactor : 1;
+
+            for (let i = 0; i < duplicateFactor; i++) {
+                // Apply transpositions
+                const transposition = 2 * delta + tur.singer.transposition;
+                const alen = tur.singer.arpeggio.length;
+                let atrans = transposition + cents;
+                if (alen > 0 && i < alen) {
+                    atrans += tur.singer.arpeggio[i];
+                }
+                const noteObj = getNote(
+                    note,
+                    octave,
+                    atrans,  // transposition,
+                    tur.singer.keySignature,
+                    tur.singer.movable,
+                    null,
+                    activity.errorMsg,
+                    activity.logo.synth.inTemperament
+                );
+                tur.singer.previousNotePlayed = tur.singer.lastNotePlayed;
+                tur.singer.lastNotePlayed = [noteObj[0] + noteObj[1], 4];
+
+                if (
+                    tur.singer.keySignature[0] === "C" &&
+                    tur.singer.keySignature[1].toLowerCase() === "major" &&
+                    noteIsSolfege(note)
+                ) {
+                    noteObj[0] = getSolfege(noteObj[0]);
+                }
+
+                // If we are in a setdrum clamp, override the pitch.
+                if (tur.singer.drumStyle.length > 0) {
+                    activity.logo.legoWidget.rowLabels.push(last(tur.singer.drumStyle));
+                    activity.logo.legoWidget.rowArgs.push(-1);
+                } else {
+                    // Don't bother with the name conversions.
+                    activity.logo.legoWidget.rowLabels.push(noteObj[0]);
+                    activity.logo.legoWidget.rowArgs.push(noteObj[1]);
+                }
+            }
         } else if (tur.singer.inNoteBlock.length > 0) {
             // maybe of interest
             tur.singer.inverted = tur.singer.invertList.length > 0;
@@ -1479,6 +1537,12 @@ class Singer {
                     );
                 }
             }
+        } else if (activity.logo.inLegoWidget) {
+            // For LEGO widget, we don't need to handle rhythm blocks currently
+            // Just store the note information
+            if (tur.singer.inNoteBlock.length > 0) {
+                // Could add timing information here if needed in the future
+            }
 
             noteBeatValue *= tur.singer.beatFactor;
             if (activity.logo.tuplet) {