scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2025-03-14 06:59:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

New skin handling in Watermark

Browse source 
Graphic elements that are part of a person's body will include "Body" in the id. When generating the watermark, do not fill those elements, just keep the outline.
This commit is contained in:
Chris Garrity 2021-08-13 11:59:52 -04:00
parent 1ec553e197
commit 0f909781c4
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
editions/free/src/localizations/en.json
View file

@ -226,10 +226,27 @@
"CHARACTER_TeenBoy2V2.svg": "Person",
"CHARACTER_TeenBoy3V2.svg": "Person",
"CHARACTER_BabyV2.svg": "Baby",
"CHARACTER_Baby2V2.svg": "Baby",
"CHARACTER_Baby3V2.svg": "Baby",
"CHARACTER_MotherV2.svg": "Person",
"CHARACTER_FatherV2.svg": "Person",
"CHARACTER_GrandmotherV2.svg": "Person",
"CHARACTER_GrandfatherV2.svg": "Person",
"CHARACTER_GirlV2.svg": "Child",
"CHARACTER_BoyV2.svg": "Child",
"CHARACTER_Teen2V2.svg": "Person",
"CHARACTER_Teen3V2.svg": "Person",
"CHARACTER_Farmer1V2.svg": "Rancher",
"CHARACTER_FarmerV2.svg": "Rancher",
"CHARACTER_Bike2V2.svg": "Cyclist",
"CHARACTER_BikeV2.svg": "Cyclist",
"CHARACTER_Car2V2.svg": "Driver",
"CHARACTER_Car1V2.svg": "Driver",
"CHARACTER_AeroplaneV2.svg": "Pilot",
"CHARACTER_AstronautV2.svg": "Astronaut",
"CHARACTER_InuitV2.svg": "Northerner",
"CHARACTER_ScubadiverV2.svg": "Scuba Diver",
"CHARACTER_RowboatV2.svg": "Rower",
"CHARACTER_Girl1.svg": "Child",
"CHARACTER_Girl2.svg": "Child",
"CHARACTER_Girl3.svg": "Child",

3
src/painteditor/SVGTools.js
View file

@ -923,6 +923,9 @@ export default class SVGTools {
if (elem.id.indexOf('Border') > -1) {
return true;
}
if (elem.id.indexOf('Body') > -1) {
return false;
}
if (elem.id.indexOf('Skip') > -1) {
return false;
}

1
src/tablet/MediaLib.js
View file

@ -81,7 +81,6 @@ export default class MediaLib {
// when we change sprites (or remove them) the old ones still need to be in keys
// for projects that were created before the change
console.log('add legacy sprites to the keys');
for (let i = 0; i < legacySprites.length; i++) {
var legacySpr = legacySprites[i];
keys[legacySpr.md5] = {width: legacySpr.width, height: legacySpr.height, name: legacySpr.name};