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

More Paint Functions #957

Merged
merged 1 commit into from
Sep 2, 2024
Merged
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
5 changes: 5 additions & 0 deletions features/features.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
[
{
"version": 2,
"id": "more-paint-functions",
"versionAdded": "v4.0.0"
},
{
"version": 2,
"id": "asset-size",
Expand Down
1 change: 1 addition & 0 deletions features/more-editor-fonts/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export default async function ({ feature, console }) {
feature.page.waitForElements(
"div[class^='asset-panel_wrapper_'] div[class^='action-menu_more-buttons_']",
function (menu) {
if (feature.traps.gui().editorTab.activeTabIndex !== 1) return;
if (menu.querySelector(".ste-more-fonts")) return;

let div = document.createElement("div");
Expand Down
22 changes: 22 additions & 0 deletions features/more-paint-functions/data.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"title": "More Paint Functions",
"description": "Adds new functions to the paint editor. The new functions include unite (combining them into one), subtract (removing one shape from another), exclude (removing the overlap of 2 items), and intersect (removing everything but the overlap of 2 items). Each function only works with 2 items.",
"credits": [
{ "username": "rgantzos", "url": "https://scratch.mit.edu/users/rgantzos/" }
],
"type": ["Editor"],
"tags": ["New", "Featured"],
"dynamic": true,
"scripts": [{ "file": "script.js", "runOn": "/projects/*" }],
"styles": [{ "file": "style.css", "runOn": "/projects/*" }],
"resources": [
{ "name": "function-exclude", "path": "/icons/exclude.svg" },
{ "name": "function-intersect", "path": "/icons/intersect.svg" },
{ "name": "function-subtract", "path": "/icons/subtract.svg" },
{ "name": "function-unite", "path": "/icons/unite.svg" }
],
"components": [{
"type": "warning",
"content": "In order to avoid clutter in the paint editor, this feature replaces the Copy, Paste and Delete buttons. However, hotkeys still work."
}]
}
13 changes: 13 additions & 0 deletions features/more-paint-functions/icons/exclude.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions features/more-paint-functions/icons/intersect.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions features/more-paint-functions/icons/subtract.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions features/more-paint-functions/icons/unite.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
161 changes: 161 additions & 0 deletions features/more-paint-functions/script.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
export default async function ({ feature, console }) {
function unite() {
let paper = feature.traps.getPaper();
let items = paper.project.selectedItems;

if (items.length !== 2) return;

for (var i in items) {
if (i > 0) {
items[0].unite(items[i]);
}
}

for (var i in items) {
items[i].remove();
}

paper.tool.onUpdateImage();
}

function subtract() {
let paper = feature.traps.getPaper();
let items = paper.project.selectedItems;

if (items.length !== 2) return;

for (var i in items) {
if (i > 0) {
items[0].subtract(items[i]);
}
}

for (var i in items) {
items[i].remove();
}

paper.tool.onUpdateImage();
}

function exclude() {
let paper = feature.traps.getPaper();
let items = paper.project.selectedItems;

if (items.length !== 2) return;

for (var i in items) {
if (i > 0) {
items[0].exclude(items[i]);
}
}

for (var i in items) {
items[i].remove();
}

paper.tool.onUpdateImage();
}

function intersect() {
let paper = feature.traps.getPaper();
let items = paper.project.selectedItems;

if (items.length !== 2) return;

for (var i in items) {
if (i > 0) {
items[0].intersect(items[i]);
}
}

for (var i in items) {
items[i].remove();
}

paper.tool.onUpdateImage();
}

ScratchTools.waitForElements(
"div[class^='mode-tools_mod-labeled-icon-height_']",
async function (row) {
if (row.querySelector(".ste-more-functions")) return;

let functions = [
{
name: "Unite",
icon: "function-unite",
callback: unite,
},
{
name: "Subtract",
icon: "function-subtract",
callback: subtract,
},
{
name: "Exclude",
icon: "function-exclude",
callback: exclude,
},
{
name: "Intersect",
icon: "function-intersect",
callback: intersect,
},
];

for (var i in functions) {
row.appendChild(makeButton(functions[i]));
}

let align = await ScratchTools.waitForElement(".ste-align-items");
row.appendChild(align);
}
);

feature.redux.subscribe(function () {
if (document.querySelector(".ste-more-functions")) {
let span = document.querySelector(".ste-more-functions");
if (
feature.traps.paint().format === "BITMAP" ||
feature.traps.paint().selectedItems?.length < 2
) {
document.querySelectorAll(".ste-more-functions").forEach(function (el) {
el.classList.add("button_mod-disabled_1rf31");
});
} else {
document.querySelectorAll(".ste-more-functions").forEach(function (el) {
el.classList.remove("button_mod-disabled_1rf31");
});
}
}
});

function makeButton({ name, icon, callback }) {
let span = document.createElement("span");
span.className =
"button_button_u6SE2 labeled-icon-button_mod-edit-field_1bXYC ste-more-functions";
span.role = "button";

let img = document.createElement("img");
img.src = feature.self.getResource(icon);
img.className = "labeled-icon-button_edit-field-icon_3j-Pf";
img.alt = name;
img.title = name;
img.draggable = false;
span.appendChild(img);

let label = document.createElement("span");
label.textContent = name;
label.className = "labeled-icon-button_edit-field-title_1ZoEV";
span.appendChild(label);

span.addEventListener("click", function (e) {
if (span.className.includes("disabled")) return;
callback();
});

feature.self.hideOnDisable(span);

return span;
}
}
7 changes: 7 additions & 0 deletions features/more-paint-functions/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
div[class*='mode-tools_mode-tools_'] > div[class*='mode-tools_mod-dashed-border_']:nth-child(1), div[class*='mode-tools_mode-tools_'] > div[class*='mode-tools_mod-dashed-border_']:nth-child(2) {
display: none;
}

div[class*='mode-tools_mode-tools_'] > div[class*='mode-tools_mod-labeled-icon-height_']:nth-child(3) {
margin-left: 0px !important;
}
Loading