mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-14 17:09:46 +00:00
dotCooCoo
5c2e182388
Commands that need an object id read it with `id_param`, which returns
None for a value that is not a non-negative integer, so `{"id": "5"}` or
`{"id": -1}` was refused with "missing id". They now read it with
`object_param`, which refuses such a value with "`id` must be a whole
number", naming the key. This covers `document.node`, the `path.*` anchor
and handle commands, the `text.*` range and path commands, the mesh,
envelope and slice point commands, `layer.target`, `layer.move`,
`node.move`, `select.magicWand`, and the `source`, `target`, `group` and
`path` keys of `appearance.transfer`, `appearance.copyFrom`, the
`livePaint.*` commands and `text.createInPath`.
The optional `group` of `livePaint.fill` and `parent` of `node.move` are
refused the same way when given. Before, a malformed `parent` moved the
object to the top level and a malformed `group` fell back to the
selection.
37 lines
1.4 KiB
Rust
37 lines
1.4 KiB
Rust
//! Live Blends (Object → Blend), Envelope Distort (Object → Envelope Distort) and Gradient Mesh
|
|
//! (Object → Create Gradient Mesh, Mesh tool edits).
|
|
//!
|
|
//! The objects are live document nodes (`NodeKind::Blend`, `NodeKind::Envelope`,
|
|
//! `NodeKind::Mesh`); evaluation lives in `vectorcraft_doc::live` and the renderer. **Expand**
|
|
//! replaces a live object by its evaluated geometry (`vectorcraft_render::expand_live`).
|
|
|
|
use std::sync::Arc;
|
|
|
|
use serde_json::{Value, json};
|
|
use vectorcraft_color::{Color, Paint};
|
|
use vectorcraft_doc::live::{
|
|
self, BlendDefaults, BlendEase, BlendEaseType, BlendOrientation, BlendSpacing, BlendSpec, EnvelopeKind, EnvelopeMap, EnvelopeOptions,
|
|
GradientMesh, MeshAppearance, PreserveShape, Spine,
|
|
};
|
|
use vectorcraft_doc::{Appearance, Document, Node, NodeId, NodeKind, Selection};
|
|
use vectorcraft_geom::{Affine, Anchor, PathData, Point, Vec2};
|
|
|
|
use super::edit::selected_roots;
|
|
use super::expand::gradient_sampler;
|
|
use super::pathops::Beside;
|
|
use super::{
|
|
CommandSpec, EngineError, Result, Session, always, bad, check_numbers, cmd, color_param, f64_or, f64_req, finite_numbers, has_doc, has_multi,
|
|
has_selection, named_ids, number_or, object_param, ok, str_param, switch_or, text_param,
|
|
};
|
|
|
|
mod blend;
|
|
mod commands;
|
|
mod common;
|
|
mod envelope;
|
|
mod mesh;
|
|
|
|
pub(crate) use blend::expand_blends;
|
|
pub use commands::specs;
|
|
pub(super) use common::fix_ids;
|
|
pub(super) use envelope::expand_envelopes_under;
|