fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-16 06:38:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add Freehand tool drawing new subpaths on an existing layer with Shift held

Browse Source
This commit is contained in:
Keavon Chambers
2024-12-17 22:01:42 -08:00
parent 3423c8ec13
commit ee7d498241
5 changed files with 77 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
node-graph/gcore/src/transform.rs
View File

@@ -168,6 +168,15 @@ impl Footprint {
pub fn offset(&self) -> DVec2 {
self.transform.transform_point2(DVec2::ZERO)
}
pub fn from_point(point: DVec2) -> Self {
Self {
// TODO: Make the scale 0?
transform: DAffine2::from_translation(point),
resolution: glam::UVec2::ONE,
..Default::default()
}
}
}
impl From<()> for Footprint {

36
node-graph/gcore/src/vector/vector_nodes.rs
View File

@@ -1,6 +1,7 @@
use super::misc::CentroidType;
use super::style::{Fill, Gradient, GradientStops, Stroke};
use super::{PointId, SegmentDomain, SegmentId, StrokeId, VectorData};
use crate::raster::Bitmap;
use crate::registry::types::{Angle, Fraction, IntegerCount, Length, SeedValue};
use crate::renderer::GraphicElementRendered;
use crate::transform::{Footprint, Transform, TransformMut};
@@ -901,24 +902,41 @@ async fn jitter_points<F: 'n + Send>(
Footprint -> VectorData,
)]
vector_data: impl Node<F, Output = VectorData>,
// TODO: Make amount per-axis
#[default(5.)] amount: f64,
seed: SeedValue,
#[implementations(
Footprint -> crate::raster::ImageFrame<Color>,
)]
image: impl Node<Footprint, Output = crate::raster::ImageFrame<Color>>,
) -> VectorData {
let mut vector_data = vector_data.eval(footprint).await;
let mut rng = rand::rngs::StdRng::seed_from_u64(seed.into());
// let mut rng = rand::rngs::StdRng::seed_from_u64(seed.into());
let deltas = (0..vector_data.point_domain.positions().len())
.map(|_| {
let angle = rng.gen::<f64>() * std::f64::consts::TAU;
DVec2::from_angle(angle) * rng.gen::<f64>() * amount
})
.collect::<Vec<_>>();
// let deltas = (0..vector_data.point_domain.positions().len())
// .map(|_| {
// let angle = rng.gen::<f64>() * std::f64::consts::TAU;
// DVec2::from_angle(angle) * rng.gen::<f64>() * amount
// })
// .collect::<Vec<_>>();
let mut already_applied = vec![false; vector_data.point_domain.positions().len()];
for (handles, start, end) in vector_data.segment_domain.handles_and_points_mut() {
let start_delta = deltas[*start];
let end_delta = deltas[*end];
let sample_start = image
.eval(Footprint::from_point(vector_data.point_domain.positions()[*start]))
.await
.image
.get_pixel(0, 0)
.expect("Broke at A");
let start_delta = DVec2::new((sample_start.r() as f64 - 0.5) * amount, (sample_start.g() as f64 - 0.5) * amount);
let sample_end = image
.eval(Footprint::from_point(vector_data.point_domain.positions()[*end]))
.await
.image
.get_pixel(0, 0)
.expect("Broke at A");
let end_delta = DVec2::new((sample_end.r() as f64 - 0.5) * amount, (sample_end.g() as f64 - 0.5) * amount);
if !already_applied[*start] {
let start_position = vector_data.point_domain.positions()[*start];