fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-19 10:58:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve type handling for ints/floats with the #[hard/soft_min/max(...)] node macro parameter attributes (#4041)

Browse Source
This commit is contained in:
Keavon Chambers
2026-04-23 15:49:30 -07:00
committed by GitHub
parent fcf9396a71
commit f42d12da9e
7 changed files with 114 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
node-graph/nodes/raster/src/adjustments.rs
View File

@@ -962,7 +962,7 @@ fn posterize<T: Adjust<Color>>(
#[gpu_image]
mut input: T,
#[default(4)]
#[hard_min(2.)]
#[hard_min(2)]
levels: u32,
) -> T {
input.adjust(|color| {

9
node-graph/nodes/raster/src/image_color_palette.rs
View File

@@ -1,11 +1,16 @@
use core_types::color::Color;
use core_types::context::Ctx;
use core_types::registry::types::IntegerCount;
use core_types::table::{Table, TableRow};
use raster_types::{CPU, Raster};
#[node_macro::node(category("Color"))]
async fn image_color_palette(_: impl Ctx, image: Table<Raster<CPU>>, #[default(4)] count: IntegerCount) -> Table<Color> {
async fn image_color_palette(
_: impl Ctx,
image: Table<Raster<CPU>>,
#[default(4)]
#[hard_min(1)]
count: u32,
) -> Table<Color> {
const GRID: f32 = 3.;
let bins = GRID * GRID * GRID;

14
node-graph/nodes/repeat/src/repeat_nodes.rs
View File

@@ -1,6 +1,6 @@
use crate::gcore::Context;
use core::f64::consts::TAU;
use core_types::registry::types::{Angle, IntegerCount, PixelSize};
use core_types::registry::types::{Angle, PixelSize};
use core_types::table::{Table, TableRowRef};
use core_types::{CloneVarArgs, Color, Ctx, ExtractAll, InjectVarArgs, OwnedContextImpl};
use glam::{DAffine2, DVec2};
@@ -19,7 +19,9 @@ async fn repeat<T: Into<Graphic> + Default + Send + Clone + 'static>(
Context -> Table<GradientStops>,
)]
instance: impl Node<'n, Context<'static>, Output = Table<T>>,
#[default(1)] count: u64,
#[default(1)]
#[hard_min(1)]
count: u32,
reverse: bool,
) -> Table<T> {
// Someday this node can have the option to generate infinitely instead of a fixed count (basically `std::iter::repeat`).
@@ -57,7 +59,9 @@ pub async fn repeat_array<T: Into<Graphic> + Default + Send + Clone + 'static>(
// TODO: When using a custom Properties panel layout in document_node_definitions.rs and this default is set, the widget weirdly doesn't show up in the Properties panel. Investigation is needed.
direction: PixelSize,
angle: Angle,
#[default(5)] count: IntegerCount,
#[default(5)]
#[hard_min(1)]
count: u32,
) -> Table<T> {
let angle = angle.to_radians();
let count = count.max(1);
@@ -102,7 +106,9 @@ async fn repeat_radial<T: Into<Graphic> + Default + Send + Clone + 'static>(
#[unit(" px")]
#[default(5)]
radius: f64,
#[default(5)] count: IntegerCount,
#[default(5)]
#[hard_min(1)]
count: u32,
) -> Table<T> {
let count = count.max(1);