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.

Sign up for GitHub

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

Jump to bottom

support image editor for bmp in Monaco #9913

Merged
merged 7 commits into from
Mar 14, 2024
Merged

support image editor for bmp in Monaco #9913

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2841c27
check in
tballmsft Mar 8, 2024
dc7d399
Merge branch 'master' of https://github.com/microsoft/pxt into bmpMonaco
tballmsft Mar 8, 2024
20dfdd9
flow bmp/img through code
tballmsft Mar 8, 2024
ff8ebb3
updates
tballmsft Mar 12, 2024
c5c1b47
update
tballmsft Mar 12, 2024
edc16ea
oops!
tballmsft Mar 12, 2024
9dc39a5
Update pxteditor/monaco-fields/field_sprite.ts
tballmsft Mar 13, 2024
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
11 changes: 8 additions & 3 deletions pxteditor/monaco-fields/field_sprite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ const fieldEditorId = "image-editor";
export class MonacoSpriteEditor extends MonacoReactFieldEditor<pxt.ProjectImage> {
protected isPython: boolean;
protected isAsset: boolean;
protected template: string;

protected textToValue(text: string): pxt.ProjectImage {
this.isPython = text.indexOf("`") === -1
this.template = text.startsWith("bmp") ? "bmp" : "img"

const match = pxt.parseAssetTSReference(text);
if (match) {
Expand All @@ -31,7 +33,7 @@ export class MonacoSpriteEditor extends MonacoReactFieldEditor<pxt.ProjectImage>
}
}

return createFakeAsset(pxt.sprite.imageLiteralToBitmap(text));
return createFakeAsset(pxt.sprite.imageLiteralToBitmap(text, this.template));
}

protected resultToText(result: pxt.ProjectImage): string {
Expand All @@ -45,7 +47,10 @@ export class MonacoSpriteEditor extends MonacoReactFieldEditor<pxt.ProjectImage>
this.isAsset = true;
return pxt.getTSReferenceForAsset(result, this.isPython);
}
return pxt.sprite.bitmapToImageLiteral(pxt.sprite.Bitmap.fromData(result.bitmap), this.isPython ? "python" : "typescript");
return pxt.sprite.bitmapToImageLiteral(pxt.sprite.Bitmap.fromData(result.bitmap),
this.isPython ? "python" : "typescript",
this.template
)
}

protected getFieldEditorId() {
Expand Down Expand Up @@ -78,7 +83,7 @@ export const spriteEditorDefinition: MonacoFieldEditorDefinition = {
heightInPixels: 510,
matcher: {
// match both JS and python
searchString: "(?:img|assets\\s*\\.\\s*image)\\s*(?:`|\\(\\s*\"\"\")(?:(?:[^(){}:\\[\\]\"';?/,+\\-=*&|^%!`~]|\\n)*)\\s*(?:`|\"\"\"\\s*\\))",
searchString: "(?:img|bmp|assets\\s*\\.\\s*image)\\s*(?:`|\\(\\s*\"\"\")(?:(?:[^(){}:\\[\\]\"';?/,+\\-=*&|^%!`~]|\\n)*)\\s*(?:`|\"\"\"\\s*\\))",
isRegex: true,
matchCase: true,
matchWholeWord: false
Expand Down