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

Support hollow circle slot shape #154

Merged
merged 2 commits into from
Sep 22, 2024
Merged

Support hollow circle slot shape #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce03dd9
Support hollow circle slot shape
huchenlei Sep 21, 2024
34b5660
Fix stroke
huchenlei Sep 22, 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
130 changes: 130 additions & 0 deletions src/draw.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
import type { Vector2, INodeSlot } from "../public/litegraph";

export enum SlotType {
Array = "array",
Event = -1,
}

export enum SlotShape {
Box = 1,
Arrow = 5,
Grid = 6,
Circle = 3,
HollowCircle = 7,
}

export enum SlotDirection {
Up = 1,
Right = 2,
Down = 3,
Left = 4,
}

export enum LabelPosition {
Left = "left",
Right = "right",
}

export function drawSlot(
ctx: CanvasRenderingContext2D,
slot: INodeSlot,
pos: Vector2,
{
label_color = "#AAA",
label_position = LabelPosition.Right,
horizontal = false,
low_quality = false,
render_text = true,
do_stroke = false,
}: {
label_color?: string;
label_position?: LabelPosition;
horizontal?: boolean;
low_quality?: boolean;
render_text?: boolean;
do_stroke?: boolean;
} = {}
) {
// Save the current fillStyle and strokeStyle
const originalFillStyle = ctx.fillStyle;
const originalStrokeStyle = ctx.strokeStyle;

const slot_type = slot.type as SlotType;
const slot_shape = (
slot_type === SlotType.Array ? SlotShape.Grid : slot.shape
) as SlotShape;

ctx.beginPath();
let doStroke = do_stroke;
let doFill = true;

if (slot_type === SlotType.Event || slot_shape === SlotShape.Box) {
if (horizontal) {
ctx.rect(pos[0] - 5 + 0.5, pos[1] - 8 + 0.5, 10, 14);
} else {
ctx.rect(pos[0] - 6 + 0.5, pos[1] - 5 + 0.5, 14, 10);
}
} else if (slot_shape === SlotShape.Arrow) {
ctx.moveTo(pos[0] + 8, pos[1] + 0.5);
ctx.lineTo(pos[0] - 4, pos[1] + 6 + 0.5);
ctx.lineTo(pos[0] - 4, pos[1] - 6 + 0.5);
ctx.closePath();
} else if (slot_shape === SlotShape.Grid) {
const gridSize = 3;
const cellSize = 2;
const spacing = 3;

for (let x = 0; x < gridSize; x++) {
for (let y = 0; y < gridSize; y++) {
ctx.rect(
pos[0] - 4 + x * spacing,
pos[1] - 4 + y * spacing,
cellSize,
cellSize
);
}
}
doStroke = false;
} else {
// Default rendering for circle, hollow circle.
if (low_quality) {
ctx.rect(pos[0] - 4, pos[1] - 4, 8, 8);
} else {
ctx.arc(pos[0], pos[1], 4, 0, Math.PI * 2);
if (slot_shape === SlotShape.HollowCircle) {
doFill = false;
doStroke = true;
ctx.strokeStyle = ctx.fillStyle;
}
}
}

if (doFill) ctx.fill();
if (!low_quality && doStroke) ctx.stroke();

// render slot label
if (render_text) {
const text = slot.label != null ? slot.label : slot.name;
if (text) {
ctx.fillStyle = label_color;

if (label_position === LabelPosition.Right) {
if (horizontal || slot.dir == SlotDirection.Up) {
ctx.fillText(text, pos[0], pos[1] - 10);
} else {
ctx.fillText(text, pos[0] + 10, pos[1] + 5);
}
} else {
if (horizontal || slot.dir == SlotDirection.Down) {
ctx.fillText(text, pos[0], pos[1] - 8);
} else {
ctx.fillText(text, pos[0] - 10, pos[1] + 5);
}
}
}
}

// Restore the original fillStyle and strokeStyle
ctx.fillStyle = originalFillStyle;
ctx.strokeStyle = originalStrokeStyle;
}
156 changes: 24 additions & 132 deletions src/litegraph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { BadgePosition } from "./LGraphBadge";
import { drawSlot, SlotShape, SlotDirection, SlotType, LabelPosition } from "./draw";

const globalExport = {};

Expand All @@ -15,6 +16,12 @@ const globalExport = {};
*/

var LiteGraph = (globalThis.LiteGraph = {
// Enums
SlotShape,
SlotDirection,
SlotType,
LabelPosition,

VERSION: 0.4,

CANVAS_GRID_SIZE: 10,
Expand Down Expand Up @@ -9562,7 +9569,6 @@ const globalExport = {};
var slot = node.inputs[i];

var slot_type = slot.type;
var slot_shape = slot.shape;

ctx.globalAlpha = editor_alpha;
//change opacity of incompatible slots when dragging a connection
Expand All @@ -9587,68 +9593,15 @@ const globalExport = {};
max_y = pos[1] + LiteGraph.NODE_SLOT_HEIGHT * 0.5;
}

ctx.beginPath();

if (slot_type == "array") {
slot_shape = LiteGraph.GRID_SHAPE; // place in addInput? addOutput instead?
}

var doStroke = true;

if (slot.type === LiteGraph.EVENT ||
slot.shape === LiteGraph.BOX_SHAPE) {
if (horizontal) {
ctx.rect(
pos[0] - 5 + 0.5,
pos[1] - 8 + 0.5,
10,
14
);
} else {
ctx.rect(
pos[0] - 6 + 0.5,
pos[1] - 5 + 0.5,
14,
10
);
}
} else if (slot_shape === LiteGraph.ARROW_SHAPE) {
ctx.moveTo(pos[0] + 8, pos[1] + 0.5);
ctx.lineTo(pos[0] - 4, pos[1] + 6 + 0.5);
ctx.lineTo(pos[0] - 4, pos[1] - 6 + 0.5);
ctx.closePath();
} else if (slot_shape === LiteGraph.GRID_SHAPE) {
ctx.rect(pos[0] - 4, pos[1] - 4, 2, 2);
ctx.rect(pos[0] - 1, pos[1] - 4, 2, 2);
ctx.rect(pos[0] + 2, pos[1] - 4, 2, 2);
ctx.rect(pos[0] - 4, pos[1] - 1, 2, 2);
ctx.rect(pos[0] - 1, pos[1] - 1, 2, 2);
ctx.rect(pos[0] + 2, pos[1] - 1, 2, 2);
ctx.rect(pos[0] - 4, pos[1] + 2, 2, 2);
ctx.rect(pos[0] - 1, pos[1] + 2, 2, 2);
ctx.rect(pos[0] + 2, pos[1] + 2, 2, 2);
doStroke = false;
} else {
if (low_quality)
ctx.rect(pos[0] - 4, pos[1] - 4, 8, 8); //faster

else
ctx.arc(pos[0], pos[1], 4, 0, Math.PI * 2);
}
ctx.fill();

//render name
if (render_text) {
var text = slot.label != null ? slot.label : slot.name;
if (text) {
ctx.fillStyle = LiteGraph.NODE_TEXT_COLOR;
if (horizontal || slot.dir == LiteGraph.UP) {
ctx.fillText(text, pos[0], pos[1] - 10);
} else {
ctx.fillText(text, pos[0] + 10, pos[1] + 5);
}
}
}
drawSlot(ctx, slot, pos, {
horizontal,
low_quality,
render_text,
label_color: LiteGraph.NODE_TEXT_COLOR,
label_position: LabelPosition.Right,
// Input slot is not stroked.
do_stroke: false,
});
}
}

Expand All @@ -9660,7 +9613,6 @@ const globalExport = {};
var slot = node.outputs[i];

var slot_type = slot.type;
var slot_shape = slot.shape;

//change opacity of incompatible slots when dragging a connection
if (in_slot && !LiteGraph.isValidConnection(slot_type, in_slot.type)) {
Expand All @@ -9683,75 +9635,15 @@ const globalExport = {};
this.default_connection_color_byTypeOff[slot_type] ||
this.default_connection_color_byType[slot_type] ||
this.default_connection_color.output_off;
ctx.beginPath();
//ctx.rect( node.size[0] - 14,i*14,10,10);
if (slot_type == "array") {
slot_shape = LiteGraph.GRID_SHAPE;
}

var doStroke = true;

if (slot_type === LiteGraph.EVENT ||
slot_shape === LiteGraph.BOX_SHAPE) {
if (horizontal) {
ctx.rect(
pos[0] - 5 + 0.5,
pos[1] - 8 + 0.5,
10,
14
);
} else {
ctx.rect(
pos[0] - 6 + 0.5,
pos[1] - 5 + 0.5,
14,
10
);
}
} else if (slot_shape === LiteGraph.ARROW_SHAPE) {
ctx.moveTo(pos[0] + 8, pos[1] + 0.5);
ctx.lineTo(pos[0] - 4, pos[1] + 6 + 0.5);
ctx.lineTo(pos[0] - 4, pos[1] - 6 + 0.5);
ctx.closePath();
} else if (slot_shape === LiteGraph.GRID_SHAPE) {
ctx.rect(pos[0] - 4, pos[1] - 4, 2, 2);
ctx.rect(pos[0] - 1, pos[1] - 4, 2, 2);
ctx.rect(pos[0] + 2, pos[1] - 4, 2, 2);
ctx.rect(pos[0] - 4, pos[1] - 1, 2, 2);
ctx.rect(pos[0] - 1, pos[1] - 1, 2, 2);
ctx.rect(pos[0] + 2, pos[1] - 1, 2, 2);
ctx.rect(pos[0] - 4, pos[1] + 2, 2, 2);
ctx.rect(pos[0] - 1, pos[1] + 2, 2, 2);
ctx.rect(pos[0] + 2, pos[1] + 2, 2, 2);
doStroke = false;
} else {
if (low_quality)
ctx.rect(pos[0] - 4, pos[1] - 4, 8, 8);

else
ctx.arc(pos[0], pos[1], 4, 0, Math.PI * 2);
}

//trigger
//if(slot.node_id != null && slot.slot == -1)
// ctx.fillStyle = "#F85";
//if(slot.links != null && slot.links.length)
ctx.fill();
if (!low_quality && doStroke)
ctx.stroke();

//render output name
if (render_text) {
var text = slot.label != null ? slot.label : slot.name;
if (text) {
ctx.fillStyle = LiteGraph.NODE_TEXT_COLOR;
if (horizontal || slot.dir == LiteGraph.DOWN) {
ctx.fillText(text, pos[0], pos[1] - 8);
} else {
ctx.fillText(text, pos[0] - 10, pos[1] + 5);
}
}
}
drawSlot(ctx, slot, pos, {
horizontal,
low_quality,
render_text,
label_color: LiteGraph.NODE_TEXT_COLOR,
label_position: LabelPosition.Left,
do_stroke: true,
});
}
}

Expand Down
Loading