Block serialization compression #32
Conversation
…itives. Update validation of sb3 projects to account for new block serialization that includes precompression of primitives like the math_number or text blocks.
…oject has been updated to use n
|
@cwillisf I think it would be good to get your review on this PR too before it gets pulled in |
lib/sb3_schema.json
Outdated
| }, | ||
| "videoState": { | ||
| "type": "string", | ||
| "enum": ["on", "off", "on_flipped"] |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
lib/sb3_schema.json
Outdated
| @@ -29,7 +41,7 @@ | |||
| }, | |||
| "dataFormat": { | |||
| "type": "string", | |||
| "enum": ["png", "PNG", "svg", "SVG", "jpeg", "JPEG", "jpg", "JPG", "bmp", "BMP"] | |||
| "enum": ["png", "PNG", "svg", "SVG", "jpeg", "JPEG", "jpg", "JPG", "bmp", "BMP", "gif", "GIF"] | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
lib/sb3_schema.json
Outdated
| "items": [ | ||
| { | ||
| "type":"number", | ||
| "enum":[1,2,3] |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
Only accept lowercase file extensions (serialization should ensure that these are saved lowercase), add description for some constants.
…sue in scratch-blocks and scrat Variables and lists are the only primitives that should exist at the top level.
|
@cwillisf, @rschamp, @thisandagain, made some changes addressing PR comments that were made and also undoing the validation workaround I had for the scratch-blocks/scratch-vm bug where orphan shadow blocks get created for custom procedure calls every time there is a pass through xml (scratchfoundation/scratch-vm#1011). This will be handled in VM instead (look out for a change coming soon to that PR. |
…r 'md5ext' property.
| }, | ||
| "format": { | ||
| "type": "string", | ||
| "enum": ["", "adpcm"] | ||
| }, | ||
| "md5ext": { | ||
| "type": "string", | ||
| "pattern": "^[a-fA-F0-9]{32}.[a-zA-Z]+$" | ||
| "pattern": "^[a-fA-F0-9]{32}.[a-zA-Z0-9]+$" |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
lib/sb3_schema.json
Outdated
| @@ -129,6 +129,7 @@ | |||
| { | |||
| "type": "number", | |||
| "enum": [4,5,6,7,8] | |||
|
|
|||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
lib/sb3_schema.json
Outdated
| @@ -232,7 +233,8 @@ | |||
| "items": [ | |||
| { | |||
| "type":"number", | |||
| "enum":[1,2,3] | |||
| "enum":[1,2,3], | |||
| "description": "1 = unobscured shadow, 2 = no shadow, 3 = obscured shadow" | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
kchadha
dismissed
rschamp’s stale review
Addressed the on_flipped vs. on-flipped issue.
Resolves #22
Resolves scratchfoundation/scratch-vm#194
Proposed Changes
This pull request is one of the last major changes for the save/load work and should solidify the 3.0 format. Specifically, the changes made here cover the pre-compression work for the Scratch 3.0 format (related to LLK/scratch-vm#).
Related Pull Requests
This pull request is tied to the following others in scratch-vm and scratch-gui and should only be merged when all are ready since there are dependencies in both directions.
Testing
Testing has been done manually on importing 2.0 projects into 3.0 with 2 rounds of saving and loading. Actual fixtures to be added in the near future for the 3.0 format. Tracking this as an issue in #31.