Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scratch package refactor merge music creation #378

Open
wants to merge 1 commit into
base: scratch-package-refactor-merge
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion extensions/src/common/extension/decorators/taggedTemplate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { BlockMetadata, Argument, ReturnTypeByBlockType, ScratchBlockType, NoArg
import { block } from "$common/extension/decorators/blocks";
import { ExtensionInstance } from "..";
import { TypedMethodDecorator } from ".";
import type BlockUtility from "$scratch-vm/engine/block-utility";

const process = (type: ScratchBlockType, strings: TemplateStringsArray, ...args: any[]) => {
if (args.length === 0) return { type, text: strings[0], } satisfies NoArgsBlock;
Expand Down Expand Up @@ -41,7 +42,7 @@ namespace Argument {
type TRemoveUtil<T extends any[]> = T extends [...infer R extends any[], BlockUtilityWithID] ? R : T;
export type MapToScratch<T extends any[], Internal extends TRemoveUtil<T> = TRemoveUtil<T>> = {
[k in keyof Internal]:
Internal[k] extends BlockUtilityWithID ? never :
Internal[k] extends (BlockUtilityWithID | BlockUtility) ? never :
Internal[k] extends InlineImageSpecifier ? InlineImage :
Argument<Internal[k]>
}
Expand Down
2 changes: 1 addition & 1 deletion scratch-packages/scratch-vm
Submodule scratch-vm updated 75 files
+3 −0 package.json
+814 −0 pnpm-lock.yaml
+37 −0 src/engine/blocks.js
+36 −0 src/engine/runtime.js
+1 −0 src/extension-support/extension-manager.js
+70 −0 src/extension-support/prg/block-relationships.js
+127 −0 src/extension-support/prg/xml-builder.js
+89 −0 src/extensions/scratch3_musiccreation/analysishelpers.js
+ src/extensions/scratch3_musiccreation/assets/instruments/1-piano/108.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/1-piano/24.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/1-piano/36.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/1-piano/48.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/1-piano/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/1-piano/72.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/1-piano/84.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/1-piano/96.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/10-clarinet/48.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/10-clarinet/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/11-saxophone/36.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/11-saxophone/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/11-saxophone/84.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/12-flute/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/12-flute/72.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/13-wooden-flute/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/13-wooden-flute/72.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/14-bassoon/36.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/14-bassoon/48.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/14-bassoon/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/15-choir/48.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/15-choir/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/15-choir/72.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/16-vibraphone/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/16-vibraphone/72.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/17-music-box/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/18-steel-drum/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/19-marimba/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/2-electric-piano/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/20-synth-lead/108.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/20-synth-lead/120.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/20-synth-lead/24.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/20-synth-lead/36.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/20-synth-lead/48.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/20-synth-lead/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/20-synth-lead/72.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/20-synth-lead/84.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/20-synth-lead/96.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/21-synth-pad/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/3-organ/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/4-guitar/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/5-electric-guitar/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/6-bass/36.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/6-bass/48.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/7-pizzicato/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/8-cello/36.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/8-cello/48.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/8-cello/60.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/9-trombone/36.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/9-trombone/48.mp3
+ src/extensions/scratch3_musiccreation/assets/instruments/9-trombone/60.mp3
+421 −0 src/extensions/scratch3_musiccreation/fft.js
+14 −0 src/extensions/scratch3_musiccreation/freqtonote.js
+871 −0 src/extensions/scratch3_musiccreation/index.js
+40 −0 src/extensions/scratch3_musiccreation/letters.js
+55 −0 src/extensions/scratch3_musiccreation/manifest.js
+108 −0 src/extensions/scratch3_musiccreation/musicaccompanimenthelpers.js
+768 −0 src/extensions/scratch3_musiccreation/musiccreationhelpers.js
+552 −0 src/extensions/scratch3_musiccreation/musicplayer.js
+1,068 −0 src/extensions/scratch3_musiccreation/sheetmusic.js
+417 −0 src/extensions/scratch3_musiccreation/spectrogram.js
+13 −0 src/extensions/scratch3_musiccreation/symbols.js
+122 −0 src/extensions/scratch3_musiccreation/textrender.js
+486 −0 src/extensions/scratch3_musiccreation/vizhelpers.js
+507 −0 src/extensions/scratch3_musiccreation/waveform.js
+51 −51 src/extensions/scratch3_pen/index.js
+40 −11 src/virtual-machine.js
Loading