Skip to content
Open
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
7 changes: 7 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ spin = "0.10"
clap = "4.5"
spirv-std = { git = "https://github.com/Firestar99/rust-gpu-new", rev = "c12f216121820580731440ee79ebc7403d6ea04f", features = ["bytemuck"] }
cargo-gpu = { git = "https://github.com/Firestar99/cargo-gpu", rev = "3952a22d16edbd38689f3a876e417899f21e1fe7", default-features = false }
qrcodegen = "1.8"

[workspace.lints.rust]
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spirv"))'] }
Expand Down
1 change: 1 addition & 0 deletions node-graph/nodes/vector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ kurbo = { workspace = true }
rand = { workspace = true }
rustc-hash = { workspace = true }
log = { workspace = true }
qrcodegen = { workspace = true }

# Optional workspace dependencies
serde = { workspace = true, optional = true }
Expand Down
52 changes: 52 additions & 0 deletions node-graph/nodes/vector/src/generator_nodes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,51 @@ fn star<T: AsU64>(
Table::new_from_element(Vector::from_subpath(subpath::Subpath::new_star_polygon(DVec2::splat(-diameter), points, diameter, inner_diameter)))
}

/// Generates a QR code from the input text.
#[node_macro::node(category("Vector: Shape"), name("QR Code"))]
fn qr_code(
_: impl Ctx,
_primary: (),
#[default("https://graphite.art")] text: String,
/// Error correction level, from low (0) to high (3).
#[default(1)]
error_correction: u32,
#[default(false)] individual_squares: bool,
) -> Table<Vector> {
let ecc = match error_correction.max(3) {
Copy link
Contributor

@Ayush2k02 Ayush2k02 Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be

let ecc = match error_correction.min(3)

@TrueDoctor @timon-schelling @Keavon , let me know if I am wrong here , but since the intent here seems to be clamp the input to a valid range of 0 - 3 ,

by using max here , wouldn't it give wrong outputs

User Input: 0 (wants Low)
→ 0.max(3) = 3
User gets HIGH instead of LOW

User Input: 1 (wants Medium) [THE DEFAULT]
→ 1.max(3) = 3
User gets HIGH instead of MEDIUM

User Input: 2 (wants Quartile)
→ 2.max(3) = 3
User gets HIGH instead of QUARTILE

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you are right, the logic is currently wrong

0 => qrcodegen::QrCodeEcc::Low,
1 => qrcodegen::QrCodeEcc::Medium,
2 => qrcodegen::QrCodeEcc::Quartile,
3 => qrcodegen::QrCodeEcc::High,
_ => unreachable!(),
};

let Ok(qr_code) = qrcodegen::QrCode::encode_text(&text, ecc) else {
return Table::default();
};

let size = qr_code.size() as usize;
let mut vector = Vector::default();

if individual_squares {
for y in 0..size {
for x in 0..size {
if qr_code.get_module(x as i32, y as i32) {
let corner1 = DVec2::new(x as f64, y as f64);
let corner2 = corner1 + DVec2::splat(1.);
vector.append_subpath(
subpath::Subpath::from_anchors([corner1, DVec2::new(corner2.x, corner1.y), corner2, DVec2::new(corner1.x, corner2.y)], true),
false,
);
}
}
}
} else {
crate::merge_qr_squares::merge_qr_squares(&qr_code, &mut vector);
}
Table::new_from_element(vector)
}

/// Generates a line with endpoints at the two chosen coordinates.
#[node_macro::node(category("Vector: Shape"))]
fn arrow(
Expand Down Expand Up @@ -359,4 +404,11 @@ mod tests {
assert!([90., 150., 40.].into_iter().any(|target| (target - angle).abs() < 1e-10), "unexpected angle of {angle}")
}
}

#[test]
fn qr_code_test() {
let qr = qr_code((), (), "https://graphite.art".to_string(), 1, true);
assert!(qr.iter().next().unwrap().element.point_domain.ids().len() > 0);
assert!(qr.iter().next().unwrap().element.segment_domain.ids().len() > 0);
}
}
1 change: 1 addition & 0 deletions node-graph/nodes/vector/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pub mod generator_nodes;
pub mod instance;
pub mod merge_qr_squares;
pub mod vector_modification_nodes;
mod vector_nodes;

Expand Down
118 changes: 118 additions & 0 deletions node-graph/nodes/vector/src/merge_qr_squares.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
use glam::DVec2;
use graphic_types::Vector;
use std::collections::VecDeque;
use vector_types::subpath;

pub fn merge_qr_squares(qr_code: &qrcodegen::QrCode, vector: &mut Vector) {
let size = qr_code.size() as usize;

// 0 = empty
// 1 = black, unvisited
// 2 = black, current island
let mut remaining = vec![vec![0u8; size]; size];

for y in 0..size {
for x in 0..size {
if qr_code.get_module(x as i32, y as i32) {
remaining[y][x] = 1;
}
}
}

for y in 0..size {
for x in 0..size {
if remaining[y][x] != 1 {
continue;
}

// fill island
let mut island = Vec::new();
let mut queue = VecDeque::new();
queue.push_back((x, y));
remaining[y][x] = 2;

while let Some((ix, iy)) = queue.pop_front() {
island.push((ix, iy));

for (dx, dy) in [(0, 1), (0, -1), (1, 0), (-1, 0)] {
let nx = ix as i32 + dx;
let ny = iy as i32 + dy;

if nx >= 0 && nx < size as i32 && ny >= 0 && ny < size as i32 && remaining[ny as usize][nx as usize] == 1 {
remaining[ny as usize][nx as usize] = 2;
queue.push_back((nx as usize, ny as usize));
}
}
}

// boundary detection
let mut outbound = vec![vec![0u8; size + 1]; size + 1];

for &(ix, iy) in &island {
if iy == 0 || remaining[iy - 1][ix] != 2 {
outbound[iy][ix] |= 1 << 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit : consider adding constants here for directions

const DIR_TOP: u8 = 1 << 0;
const DIR_RIGHT: u8 = 1 << 1;
const DIR_BOTTOM: u8 = 1 << 2;
const DIR_LEFT: u8 = 1 << 3;

}
if ix == size - 1 || remaining[iy][ix + 1] != 2 {
outbound[iy][ix + 1] |= 1 << 1;
}
if iy == size - 1 || remaining[iy + 1][ix] != 2 {
outbound[iy + 1][ix + 1] |= 1 << 2;
}
if ix == 0 || remaining[iy][ix - 1] != 2 {
outbound[iy + 1][ix] |= 1 << 3;
}
}

// tracing loops
for vy in 0..=size {
for vx in 0..=size {
while outbound[vy][vx] != 0 {
let mut dir = outbound[vy][vx].trailing_zeros() as usize;
let start = (vx, vy);
let mut current = start;
let mut points = Vec::new();

loop {
points.push(DVec2::new(current.0 as f64, current.1 as f64));
outbound[current.1][current.0] &= !(1 << dir);

current = match dir {
0 => (current.0 + 1, current.1),
1 => (current.0, current.1 + 1),
2 => (current.0 - 1, current.1),
3 => (current.0, current.1 - 1),
_ => unreachable!(),
};

if current == start {
break;
}
dir = outbound[current.1][current.0].trailing_zeros() as usize;
}

if points.len() > 2 {
let mut simplified = Vec::new();
for i in 0..points.len() {
let prev = points[(i + points.len() - 1) % points.len()];
let curr = points[i];
let next = points[(i + 1) % points.len()];
if (curr - prev).perp_dot(next - curr).abs() > 1e-6 {
simplified.push(curr);
}
}

if !simplified.is_empty() {
vector.append_subpath(subpath::Subpath::from_anchors(simplified, true), false);
}
}
}
}
}

// marking island as processed
for &(ix, iy) in &island {
remaining[iy][ix] = 0;
}
}
}
}
Loading