Skip to content

ProCraft for Android: An Android native painting app written in Rust

Rust

feat(layers): drawing assist per layer, kept in files and tagged Assisted

Joshc6f50aaecd8b
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasViewModel.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasViewModel.kt
index c87dbcf..2dab810 100644
--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasViewModel.kt
+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasViewModel.kt
@@ -1929,8 +1929,10 @@ class CanvasViewModel(app: Application) : AndroidViewModel(app) {
guide = session?.setGuideSymmetry(kind, rotational)
}
+ /** Drawing assist on the current layer. */
fun setGuideAssisted(on: Boolean) {
guide = session?.setGuideAssisted(on)
+ refresh()
}
/** What a touch at [p] in the guide editor takes: the turn handle (-2), the centre (-1), or a vanishing point (its index); a tap elsewhere in perspective adds one. */
@@ -5403,6 +5405,8 @@ class CanvasViewModel(app: Application) : AndroidViewModel(app) {
quickShapeEditing = false
}
layers = s.layers()
+ // drawing assist is the current layer's
+ if (guide != null) guide = s.guide()
background = s.background()
// undoing may put the canvas back in another profile
refreshCanvasSpace(s)
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/LayersPanel.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/LayersPanel.kt
index ddb10e0..776ba52 100644
--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/LayersPanel.kt
+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/LayersPanel.kt
@@ -619,11 +619,13 @@ private fun LayerRow(
else -> 0.dp
}
Box(Modifier.padding(start = 4.dp).offset(y = shift)) { Thumb(vm, l, thumbShape) }
- // what the layer is, under its name (which stays in the middle): the reference layer, a
- // private one, a model's layer shared by its texture set's meshes
+ // what the layer is, under its name (which stays in the middle): the reference layer, one
+ // drawing assist is on for, a private one, a model's layer shared by its texture set's meshes
val tag = when {
+ l.reference && l.assisted -> "Assisted Reference"
l.reference -> subtitle?.let { "$it Reference" } ?: "Reference"
subtitle != null -> subtitle
+ l.assisted -> "Assisted"
l.private -> "Private"
else -> null
}
@@ -890,7 +892,7 @@ private fun LayerOptions(open: Boolean, vm: CanvasViewModel, l: LayerInfo, rowY:
Option("Mask", enabled = !vm.hasMask(l), onClick = then { vm.addMask(l) })
if (l.canClip) Option("Clipping Mask", checked = l.clipped) { vm.toggleClipped(l) }
// offered with the drawing guide on or off
- Option("Drawing Assist", checked = vm.guide?.assisted == true) { vm.setGuideAssisted(vm.guide?.assisted != true) }
+ Option("Drawing Assist", checked = l.assisted) { vm.setGuideAssisted(!l.assisted) }
if (!l.text) Option("Invert", enabled = !l.locked, onClick = then { vm.invertLayer(l) })
Option("Reference", checked = l.reference) { vm.toggleReference(l) }
}
diff --git a/apps/procraft-android/src/guide.rs b/apps/procraft-android/src/guide.rs
index ede100c..a4eb177 100644
--- a/apps/procraft-android/src/guide.rs
+++ b/apps/procraft-android/src/guide.rs
@@ -96,7 +96,8 @@ impl State {
g.assisted = true;
g
});
- let guide = forced.as_ref().unwrap_or(&self.doc.guide);
+ let layer_guide = self.doc.stroke_guide();
+ let guide = forced.as_ref().unwrap_or(&layer_guide);
for s in &mut samples {
s.pos = guide.assist(start, s.pos);
}
@@ -130,7 +131,7 @@ impl State {
SymmetryKind::Radial => SymmetryType::Radial,
},
rotational: g.rotational,
- assisted: g.assisted,
+ assisted: self.doc.layer(self.doc.current()).is_some_and(|l| l.assisted),
centre: point(c).to_vec(),
handle: point(c + up).to_vec(),
vanishing: g.vanishing.iter().flat_map(|v| point(Vec2::new(v[0], v[1]))).collect(),
@@ -196,8 +197,15 @@ impl CanvasSession {
self.shared.lock().force_assist = on;
}
+ /// Drawing assist on the current layer: strokes on it follow the guide.
pub fn set_guide_assisted(&self, assisted: bool) -> GuideInfo {
- self.change_guide(|g| g.assisted = assisted)
+ let mut guard = self.shared.lock();
+ let st = &mut *guard;
+ let current = st.doc.current();
+ st.doc.set_assisted(current, assisted);
+ st.revision += 1;
+ self.shared.frame(st);
+ st.guide_info()
}
/// The guide's centre dragged to window point (`x`, `y`).
diff --git a/apps/procraft-android/src/layers.rs b/apps/procraft-android/src/layers.rs
index cb13dda..20d249b 100644
--- a/apps/procraft-android/src/layers.rs
+++ b/apps/procraft-android/src/layers.rs
@@ -22,6 +22,8 @@ pub struct LayerInfo {
pub reference: bool,
/// Left out of the gallery's thumbnail (put in by a private insert or paste).
pub private: bool,
+ /// Strokes on it follow the drawing guide.
+ pub assisted: bool,
pub kind: LayerType,
/// A mask's layer, or the group a layer is in.
pub parent: Option<u64>,
@@ -173,6 +175,7 @@ impl CanvasSession {
picked: st.doc.is_picked(l.id),
reference: l.reference,
private: l.private,
+ assisted: l.assisted,
kind: match l.kind {
LayerKind::Paint => LayerType::Paint,
LayerKind::Group => LayerType::Group,
diff --git a/apps/procraft-android/src/lib.rs b/apps/procraft-android/src/lib.rs
index b6ddb3e..b4a0d62 100644
--- a/apps/procraft-android/src/lib.rs
+++ b/apps/procraft-android/src/lib.rs
@@ -417,7 +417,7 @@ impl State {
fn finish_stroke(&mut self) {
self.shape = None;
if let (Some(open), Some(canvas)) = (self.stroke.take(), self.canvas.as_mut()) {
- close_stroke(canvas, open, &self.doc.guide);
+ close_stroke(canvas, open, &self.doc.stroke_guide());
self.bake_painted_on();
}
}
@@ -917,7 +917,7 @@ impl CanvasSession {
});
let Some(canvas) = st.canvas.as_mut() else { return };
canvas.begin_stroke(current, style);
- draw_samples(canvas, &mut builder, &canvas_samples, &st.doc.guide);
+ draw_samples(canvas, &mut builder, &canvas_samples, &st.doc.stroke_guide());
st.stroke = Some(builder);
self.shared.frame(st);
}
@@ -939,7 +939,7 @@ impl CanvasSession {
}
st.remember_input(&canvas_samples);
let (Some(builder), Some(canvas)) = (st.stroke.as_mut(), st.canvas.as_mut()) else { return };
- if draw_samples(canvas, builder, &canvas_samples, &st.doc.guide) {
+ if draw_samples(canvas, builder, &canvas_samples, &st.doc.stroke_guide()) {
st.redraw_painted_on();
self.shared.frame(st);
}
@@ -957,7 +957,7 @@ impl CanvasSession {
let (Some(builder), Some(canvas)) = (st.stroke.as_ref(), st.canvas.as_mut()) else { return };
// a stroke shown with its tip ends it where the input is predicted to go
if canvas.shows_tip() && builder.shows_tip() {
- canvas.set_tip(&guide::mirrored(&st.doc.guide, &builder.preview_tip(&canvas_samples)));
+ canvas.set_tip(&guide::mirrored(&st.doc.stroke_guide(), &builder.preview_tip(&canvas_samples)));
} else {
canvas.set_prediction(&builder.preview(&canvas_samples));
}
@@ -982,8 +982,8 @@ impl CanvasSession {
}
let (Some(mut builder), Some(canvas)) = (st.stroke.take(), st.canvas.as_mut()) else { return };
let stamps = builder.add(&canvas_samples);
- canvas.add_stamps(&guide::mirrored(&st.doc.guide, &stamps));
- close_stroke(canvas, builder, &st.doc.guide);
+ canvas.add_stamps(&guide::mirrored(&st.doc.stroke_guide(), &stamps));
+ close_stroke(canvas, builder, &st.doc.stroke_guide());
st.redraw_painted_on();
st.bake_painted_on();
st.remember_last_stroke();
diff --git a/apps/procraft-android/src/tests.rs b/apps/procraft-android/src/tests.rs
index 2c31f46..1f1ea8d 100644
--- a/apps/procraft-android/src/tests.rs
+++ b/apps/procraft-android/src/tests.rs
@@ -1035,6 +1035,18 @@ fn the_drawing_guide_mirrors_and_assists_strokes() {
assert_eq!(pixel(&s, 60, 80), [255, 255, 255, 255]);
let info = s.guide();
assert!(info.on && info.assisted && !info.lines.is_empty());
+ // drawing assist belongs to the layer: a new one draws freely
+ let assisted = s.layers().iter().find(|l| l.current).map(|l| l.id).unwrap();
+ assert!(s.layers().iter().any(|l| l.id == assisted && l.assisted));
+ s.add_layer();
+ assert!(!s.guide().assisted);
+ s.stroke_begin(PointerKind::Finger, vec![sample(10.0, 90.0, 0.0)]);
+ s.stroke_add((1..=20).map(|i| sample(10.0 + i as f32 * 3.0, 90.0 - i as f32 * 0.6, f64::from(i) * 8.0)).collect());
+ s.stroke_end(vec![]);
+ assert_eq!(pixel(&s, 70, 78)[0], 0);
+ assert_eq!(pixel(&s, 70, 90), [255, 255, 255, 255]);
+ assert!(s.select_layer(assisted));
+ assert!(s.guide().assisted);
// the editor fits the canvas inside a rectangle, and cancelling puts the guide back
let before = s.view_matrix();
s.guide_edit_begin(10.0, 10.0, 60.0, 60.0);
diff --git a/crates/engine/src/document.rs b/crates/engine/src/document.rs
index 498ed59..22f38a8 100644
--- a/crates/engine/src/document.rs
+++ b/crates/engine/src/document.rs
@@ -280,6 +280,9 @@ pub struct Layer {
/// paste).
#[serde(default)]
pub private: bool,
+ /// Strokes on it follow the drawing guide (drawing assist).
+ #[serde(default)]
+ pub assisted: bool,
}
/// Largest canvas edge, pixels.
@@ -794,6 +797,7 @@ impl Document {
collapsed: false,
text: None,
private: false,
+ assisted: false,
}
}
@@ -1197,6 +1201,22 @@ impl Document {
self.layer_mut(id).map(|l| l.visible = visible).is_some()
}
+ /// Drawing assist on layer `id`: strokes on it follow the drawing guide.
+ pub fn set_assisted(&mut self, id: LayerId, on: bool) -> bool {
+ self.layer_mut(id).map(|l| l.assisted = on).is_some()
+ }
+
+ /// The drawing guide as strokes on the current layer follow it: assisted when that layer
+ /// has drawing assist.
+ pub fn stroke_guide(&self) -> std::borrow::Cow<'_, crate::guide::Guide> {
+ let assisted = self.layer(self.current).is_some_and(|l| l.assisted);
+ if self.guide.assisted == assisted {
+ std::borrow::Cow::Borrowed(&self.guide)
+ } else {
+ std::borrow::Cow::Owned(crate::guide::Guide { assisted, ..self.guide.clone() })
+ }
+ }
+
pub fn set_private(&mut self, id: LayerId, private: bool) -> bool {
self.layer_mut(id).map(|l| l.private = private).is_some()
}
@@ -1304,6 +1324,13 @@ impl Document {
if self.solo.is_some_and(|s| self.layer(s).is_none()) {
self.solo = None;
}
+ // drawing assist was once the guide's, not each layer's: it goes to the current layer
+ if self.guide.assisted && !self.layers.iter().any(|l| l.assisted) {
+ let current = self.current;
+ if let Some(l) = self.layer_mut(current) {
+ l.assisted = true;
+ }
+ }
let (current, ids): (LayerId, Vec<LayerId>) = (self.current, self.layers.iter().map(|l| l.id).collect());
self.picked.retain(|p| *p != current && ids.contains(p));
self
diff --git a/crates/engine/src/native.rs b/crates/engine/src/native.rs
index fa9ef62..61d5cde 100644
--- a/crates/engine/src/native.rs
+++ b/crates/engine/src/native.rs
@@ -257,6 +257,7 @@ fn add_item(
collapsed: item.bool("isCollapsed").unwrap_or(false),
text: None,
private: false,
+ assisted: false,
});
}
_ => {
@@ -285,6 +286,7 @@ fn add_item(
collapsed: false,
text: None,
private: item.bool("private").unwrap_or(false),
+ assisted: item.bool("perspectiveAssisted").unwrap_or(false),
});
if !uuid.is_empty() {
pixels.push((lid, canvas.pixels(&uuid, 4, 0)?));
@@ -307,6 +309,7 @@ fn add_item(
collapsed: false,
text: None,
private: false,
+ assisted: false,
});
if let Some(m) = mask.string("UUID") {
// a mask stores only the tiles painted on: the rest shows the layer
@@ -560,6 +563,7 @@ fn write_item(
alpha_lock: false,
private: false,
held: 0,
+ assisted: false,
};
Some(layer_record(b, doc_ref, &mask_uuid, None, rec, w, h))
});
@@ -575,6 +579,7 @@ fn write_item(
alpha_lock: l.alpha_lock,
private: l.private,
held: held(doc, id),
+ assisted: l.assisted,
};
let r = layer_record(b, doc_ref, &uuid, mask, rec, w, h);
if id == doc.current() {
@@ -601,6 +606,8 @@ struct LayerRecord<'a> {
private: bool,
/// Animation Assist: how many more frames this frame is held for.
held: i64,
+ /// Drawing assist on.
+ assisted: bool,
}
/// How many more frames Animation Assist holds layer `id` for (0 without a hold).
@@ -622,6 +629,7 @@ impl LayerRecord<'_> {
alpha_lock: false,
private: false,
held: 0,
+ assisted: false,
}
}
}
@@ -673,7 +681,7 @@ fn layer_record(
("mask", mask.unwrap_or_else(Builder::null)),
("name", name),
("opacity", Value::Real(f64::from(r.opacity))),
- ("perspectiveAssisted", Value::Bool(false)),
+ ("perspectiveAssisted", Value::Bool(r.assisted)),
("preserve", Value::Bool(r.alpha_lock)),
("private", Value::Bool(r.private)),
("sizeHeight", Value::Int(i64::from(h))),
@@ -797,6 +805,7 @@ mod tests {
doc.rename(top, "Ink");
doc.set_clipped(top, true);
doc.set_private(top, true);
+ doc.set_assisted(top, true);
let mask = doc.add_mask(base).unwrap();
doc.background = [0.2, 0.4, 0.6];
let mut pixels = HashMap::new();
@@ -834,6 +843,7 @@ mod tests {
let sk = d.layers().first().unwrap();
assert_eq!((sk.blend, sk.opacity), (BlendMode::Multiply, 0.75));
assert!(d.layers().get(2).unwrap().clipped && d.layers().get(2).unwrap().private);
+ assert!(d.layers().get(2).unwrap().assisted && !d.layers().first().unwrap().assisted);
assert!(!d.layers().first().unwrap().private);
let px = |i: usize| &back.pixels.iter().find(|(id, _)| *id == d.layers().get(i).unwrap().id).unwrap().1;
assert_eq!(px(0), &sketch);
diff --git a/crates/engine/src/psd.rs b/crates/engine/src/psd.rs
index e6c70b9..e311f74 100644
--- a/crates/engine/src/psd.rs
+++ b/crates/engine/src/psd.rs
@@ -563,6 +563,7 @@ fn paint_layer(id: LayerId, name: String, parent: Option<LayerId>) -> Layer {
collapsed: false,
text: None,
private: false,
+ assisted: false,
}
}