mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-20 01:14:23 +01:00
Brushes: Add original Ornamental library
This commit is contained in:
1 parent
36b5a5920c
commit
895f17fdac
34 files changed
+240
-6
No files matched your search
@@ -174,6 +174,7 @@ pub const BUILTIN: &[BuiltinBrushLibrary] = &[
|
||||
BuiltinBrushLibrary { id: "calligraphic-nibs", name: "Calligraphic Nibs", make: calligraphic_nibs },
|
||||
BuiltinBrushLibrary { id: "bristle-brushes", name: "Bristle Brushes", make: bristle_brushes },
|
||||
BuiltinBrushLibrary { id: "pattern-borders", name: "Pattern Borders", make: pattern_borders },
|
||||
BuiltinBrushLibrary { id: "ornamental", name: "Ornamental", make: ornamental },
|
||||
BuiltinBrushLibrary { id: "scatter-shapes", name: "Scatter Shapes", make: scatter_shapes },
|
||||
BuiltinBrushLibrary { id: "game-trails", name: "Game Trails", make: game_trails },
|
||||
BuiltinBrushLibrary { id: "energy-beams", name: "Energy Beams", make: energy_beams },
|
||||
@@ -475,6 +476,52 @@ fn pattern_borders() -> BrushLibrary {
|
||||
built("Pattern Borders", Document::new(100.0, 100.0), brushes)
|
||||
}
|
||||
|
||||
/// Ornamental: one-pass flourishes and arrow accents that stretch with the path rather than
|
||||
/// repeating a pattern tile. Every shape is original filled vector art.
|
||||
fn ornamental() -> BrushLibrary {
|
||||
let scrollwork = group(vec![
|
||||
black(band(100.0, 1.2, 64, |x| 2.6 * (x / 100.0 * std::f64::consts::TAU).sin())),
|
||||
ring(Point::new(7.0, 0.0), 4.0, 2.0),
|
||||
ring(Point::new(93.0, 0.0), 4.0, 2.0),
|
||||
black(polygon(&[(28.0, 1.0), (34.0, -5.0), (40.0, -3.0), (33.0, 2.0)])),
|
||||
black(polygon(&[(60.0, 3.0), (66.0, 5.0), (72.0, -1.0), (67.0, -2.0)])),
|
||||
]);
|
||||
let arrow = group(vec![
|
||||
black(shapes::rectangle(Rect::new(4.0, -0.7, 84.0, 0.7))),
|
||||
black(polygon(&[(80.0, -6.5), (100.0, 0.0), (80.0, 6.5), (85.0, 0.0)])),
|
||||
ring(Point::new(7.0, 0.0), 4.0, 1.7),
|
||||
black(polygon(&[(25.0, -0.4), (31.0, -4.4), (37.0, -2.0), (31.0, 0.8)])),
|
||||
black(polygon(&[(43.0, 0.4), (49.0, 4.4), (55.0, 2.0), (49.0, -0.8)])),
|
||||
]);
|
||||
let mut petals = vec![black(band(100.0, 1.0, 48, |x| 1.8 * (x / 100.0 * std::f64::consts::PI).sin()))];
|
||||
for x in [19.0, 43.0, 67.0, 87.0] {
|
||||
let y = 1.8 * (x / 100.0 * std::f64::consts::PI).sin();
|
||||
petals.push(black(shapes::ellipse(Rect::new(x - 4.5, y - 7.5, x + 4.5, y - 0.3))));
|
||||
petals.push(black(shapes::ellipse(Rect::new(x - 3.5, y + 0.3, x + 3.5, y + 5.5))));
|
||||
}
|
||||
let petal_sweep = group(petals);
|
||||
let twin_curl = group(vec![
|
||||
black(band(100.0, 0.9, 64, |x| -3.8 + 1.6 * (x / 100.0 * 2.0 * std::f64::consts::TAU).sin())),
|
||||
black(band(100.0, 0.9, 64, |x| 3.8 - 1.6 * (x / 100.0 * 2.0 * std::f64::consts::TAU).sin())),
|
||||
ring(Point::new(8.0, -3.8), 3.0, 1.5),
|
||||
ring(Point::new(92.0, 3.8), 3.0, 1.5),
|
||||
]);
|
||||
let ornament = |name: &str, art: Node| Brush {
|
||||
name: name.into(),
|
||||
kind: BrushKind::Art(ArtBrush { art, width: 300.0, colorization: Colorization::Tints, ..Default::default() }),
|
||||
};
|
||||
built(
|
||||
"Ornamental",
|
||||
Document::new(100.0, 100.0),
|
||||
vec![
|
||||
ornament("Scrollwork", scrollwork),
|
||||
ornament("Filigree Arrow", arrow),
|
||||
ornament("Petal Sweep", petal_sweep),
|
||||
ornament("Twin Curl", twin_curl),
|
||||
],
|
||||
)
|
||||
}
|
||||
|
||||
fn scatter(name: &str, art: Node, s: Scatter) -> Brush {
|
||||
Brush { name: name.into(), kind: BrushKind::Scatter(Scatter { art, ..s }) }
|
||||
}
|
||||
|
||||
@@ -112,6 +112,7 @@ fn the_builtin_libraries_are_original_brushes_generated_in_code() {
|
||||
"calligraphic-nibs",
|
||||
"bristle-brushes",
|
||||
"pattern-borders",
|
||||
"ornamental",
|
||||
"scatter-shapes",
|
||||
"game-trails",
|
||||
"energy-beams",
|
||||
@@ -131,19 +132,19 @@ fn the_builtin_libraries_are_original_brushes_generated_in_code() {
|
||||
trails["brushes"].as_array().unwrap().iter().map(|b| b["name"].as_str().unwrap()).collect::<Vec<_>>(),
|
||||
["Speed Line", "Dash Trail", "Burst Ray", "Zigzag"]
|
||||
);
|
||||
assert_eq!(libs[6]["count"].as_u64(), Some(4));
|
||||
assert_eq!(libs[7]["count"].as_u64(), Some(4));
|
||||
let beams = run(&mut s, "brush.library", json!({"library": "energy-beams"}));
|
||||
assert_eq!(
|
||||
beams["brushes"].as_array().unwrap().iter().map(|b| b["name"].as_str().unwrap()).collect::<Vec<_>>(),
|
||||
["Laser Bolt", "Plasma Arc", "Charge Wave", "Spark Trail"]
|
||||
);
|
||||
assert_eq!(libs[7]["count"].as_u64(), Some(4));
|
||||
assert_eq!(libs[8]["count"].as_u64(), Some(4));
|
||||
let dry = run(&mut s, "brush.library", json!({"library": "Dry Media"}));
|
||||
assert_eq!(
|
||||
dry["brushes"].as_array().unwrap().iter().map(|b| (b["name"].as_str().unwrap(), b["type"].as_str().unwrap())).collect::<Vec<_>>(),
|
||||
[("Chalk Grain", "art"), ("Graphite Pencil", "art"), ("Wax Crayon", "art"), ("Charcoal Dust", "art")]
|
||||
);
|
||||
assert_eq!((libs[8]["name"].as_str(), libs[8]["count"].as_u64()), (Some("Dry Media"), Some(4)));
|
||||
assert_eq!((libs[9]["name"].as_str(), libs[9]["count"].as_u64()), (Some("Dry Media"), Some(4)));
|
||||
run(&mut s, "file.new", json!({"width": 200, "height": 200}));
|
||||
let id = run(&mut s, "shape.rectangle", json!({"x": 10, "y": 20, "width": 40, "height": 8}))["id"].as_u64().unwrap();
|
||||
let added = run(&mut s, "brush.addFromLibrary", json!({"library": "energy-beams", "name": "Laser Bolt", "apply": true, "ids": [id]}));
|
||||
@@ -156,6 +157,7 @@ fn the_builtin_libraries_are_original_brushes_generated_in_code() {
|
||||
("calligraphic-nibs", "calligraphic"),
|
||||
("bristle-brushes", "bristle"),
|
||||
("pattern-borders", "pattern"),
|
||||
("ornamental", "art"),
|
||||
("scatter-shapes", "scatter"),
|
||||
("game-trails", "art"),
|
||||
("energy-beams", "art"),
|
||||
@@ -299,6 +301,37 @@ fn the_tech_circuit_library_constructs_adds_and_applies_each_brush() {
|
||||
assert_eq!(vectorcraft_brush::library(&reopened), lib.brushes);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ornamental_brushes_draw_flourishes_and_survive_a_saved_library() {
|
||||
let mut s = session();
|
||||
let (_, lib) = cmd::brushlib::library(&s, "Ornamental").unwrap();
|
||||
let names = ["Scrollwork", "Filigree Arrow", "Petal Sweep", "Twin Curl"];
|
||||
assert_eq!(lib.brushes.iter().map(|b| b.name.as_str()).collect::<Vec<_>>(), names);
|
||||
let path = run(&mut s, "shape.line", json!({"x1": 10, "y1": 40, "x2": 190, "y2": 40}))["id"].as_u64().unwrap();
|
||||
let mut curve = line_to(20.0);
|
||||
curve.curve_to((60.0, -25.0), (140.0, 25.0), (180.0, 0.0));
|
||||
for b in &lib.brushes {
|
||||
let BrushKind::Art(art) = &b.kind else { panic!("{} is not an art brush", b.name) };
|
||||
assert_eq!(art.colorization, vectorcraft_brush::Colorization::Tints);
|
||||
assert_eq!(art.width, 300.0);
|
||||
for line in [line_to(2.0), line_to(180.0), curve.clone()] {
|
||||
let pieces = vectorcraft_brush::stroke_pieces(&lib.doc, b, &line, &black_stroke());
|
||||
let points = anchors(&pieces.iter().collect::<Vec<_>>());
|
||||
assert!(!points.is_empty() && points.iter().all(|p| p.x.is_finite() && p.y.is_finite()), "{}", b.name);
|
||||
}
|
||||
let before = undo_len(&s);
|
||||
let added = run(&mut s, "brush.addFromLibrary", json!({"library": "ornamental", "name": b.name, "apply": true, "ids": [path]}));
|
||||
assert_eq!(strs(&added["added"]), [b.name.as_str()]);
|
||||
assert_eq!(added["applied"], json!([path]));
|
||||
assert_eq!(undo_len(&s), before + 1);
|
||||
assert_eq!(doc(&s).node(NodeId(path)).unwrap().appearance.stroke().unwrap().brush.as_deref(), Some(b.name.as_str()));
|
||||
}
|
||||
let saved = run(&mut s, "brush.saveLibrary", json!({"names": names}));
|
||||
let bytes = vectorcraft_format::base64_decode(saved["dataBase64"].as_str().unwrap()).unwrap();
|
||||
let reopened = vectorcraft_format::load(&bytes).unwrap();
|
||||
assert_eq!(vectorcraft_brush::library(&reopened), lib.brushes);
|
||||
}
|
||||
|
||||
/// Ink and Wash: a tapered ink art brush, a brush pen whose size follows the pen pressure and two
|
||||
/// translucent washes, with names of their own and a few paths of art each.
|
||||
#[test]
|
||||
|
||||
@@ -7237,3 +7237,8 @@ breakText Glyphs Глифи
|
||||
@msg A fold line is on a non-printing layer. Линия на сгъване е на слой, който не се печата.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Панели: {panels}, панти: {hinges}, грешки: {errors}, предупреждения: {warnings}
|
||||
@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer трябва да е "singleLine", "everyLine", "standardSingleLine" или "standardEveryLine"
|
||||
Ornamental Орнаментални
|
||||
Scrollwork Завитък
|
||||
Filigree Arrow Филигранна стрела
|
||||
Petal Sweep Венчелистен замах
|
||||
Twin Curl Двоен завитък
|
||||
|
Can't render this file because it is too large.
|
@@ -7291,3 +7291,8 @@ shape Open Otvoren
|
||||
@msg A fold line is on a non-printing layer. Linija savijanja je na sloju koji se ne štampa.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Paneli: {panels}, šarke: {hinges}, greške: {errors}, upozorenja: {warnings}
|
||||
@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer mora biti "singleLine", "everyLine", "standardSingleLine" ili "standardEveryLine"
|
||||
Ornamental Ornamentalno
|
||||
Scrollwork Ukrasni zavoj
|
||||
Filigree Arrow Filigranska strelica
|
||||
Petal Sweep Potez latica
|
||||
Twin Curl Dvostruki zavoj
|
||||
|
Can't render this file because it contains an unexpected character in line 2 and column 73.
|
@@ -8126,3 +8126,8 @@ breakText Glyphs Glifs
|
||||
@msg A fold line is on a non-printing layer. Una línia de plegat és en una capa que no s’imprimeix.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panells: {panels}, frontisses: {hinges}, errors: {errors}, avisos: {warnings}
|
||||
@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer ha de ser "singleLine", "everyLine", "standardSingleLine" o "standardEveryLine"
|
||||
Ornamental Ornamental
|
||||
Scrollwork Voluta
|
||||
Filigree Arrow Fletxa de filigrana
|
||||
Petal Sweep Traç de pètals
|
||||
Twin Curl Voluta doble
|
||||
|
Can't render this file because it contains an unexpected character in line 2 and column 73.
|
@@ -9917,3 +9917,8 @@ breakText Glyphs Glyfy
|
||||
@msg A panel is not joined to the rest by a crease. Panel není se zbytkem spojen žádnou linií bigu.
|
||||
@msg A fold line is on a non-printing layer. Linie skladu je na netisknutelné vrstvě.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panely: {panels}, panty: {hinges}, chyby: {errors}, upozornění: {warnings}
|
||||
Ornamental Ornamentální
|
||||
Scrollwork Rozvilina
|
||||
Filigree Arrow Filigránový šíp
|
||||
Petal Sweep Tah okvětních lístků
|
||||
Twin Curl Dvojitá rozvilina
|
||||
|
Can't render this file because it is too large.
|
@@ -10025,3 +10025,8 @@ breakText Glyphs Glyffer
|
||||
@msg A fold line is on a non-printing layer. En foldelinje ligger på et lag, der ikke udskrives.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Paneler: {panels}, hængsler: {hinges}, fejl: {errors}, advarsler: {warnings}
|
||||
@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer skal være "singleLine", "everyLine", "standardSingleLine" eller "standardEveryLine"
|
||||
Ornamental Ornamentik
|
||||
Scrollwork Slyngværk
|
||||
Filigree Arrow Filigranpil
|
||||
Petal Sweep Kronbladssvirp
|
||||
Twin Curl Dobbelt slyng
|
||||
|
Can't render this file because it is too large.
|
@@ -9516,3 +9516,8 @@ breakText Glyphs Glyphen
|
||||
@msg A panel is not joined to the rest by a crease. Ein Feld ist durch keine Rilllinie mit den übrigen verbunden.
|
||||
@msg A fold line is on a non-printing layer. Eine Faltlinie liegt auf einer nicht druckbaren Ebene.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Felder: {panels}, Scharniere: {hinges}, Fehler: {errors}, Warnungen: {warnings}
|
||||
Ornamental Ornamental
|
||||
Scrollwork Schnörkel
|
||||
Filigree Arrow Filigranpfeil
|
||||
Petal Sweep Blütenblattschwung
|
||||
Twin Curl Doppelschnörkel
|
||||
|
Can't render this file because it is too large.
|
@@ -8100,3 +8100,8 @@ breakText Glyphs Γλύφοι
|
||||
@msg A fold line is on a non-printing layer. Μια γραμμή δίπλωσης βρίσκεται σε επίπεδο που δεν εκτυπώνεται.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Πάνελ: {panels}, μεντεσέδες: {hinges}, σφάλματα: {errors}, προειδοποιήσεις: {warnings}
|
||||
@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" το composer πρέπει να είναι "singleLine", "everyLine", "standardSingleLine" ή "standardEveryLine"
|
||||
Ornamental Διακοσμητικά μοτίβα
|
||||
Scrollwork Σπείρα
|
||||
Filigree Arrow Φιλιγκράν βέλος
|
||||
Petal Sweep Καμπύλη πετάλων
|
||||
Twin Curl Διπλή σπείρα
|
||||
|
Can't render this file because it is too large.
|
@@ -8087,3 +8087,8 @@ breakText Glyphs Glifos
|
||||
@msg A fold line is on a non-printing layer. Una línea de plegado está en una capa que no se imprime.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Paneles: {panels}, bisagras: {hinges}, errores: {errors}, advertencias: {warnings}
|
||||
@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer debe ser "singleLine", "everyLine", "standardSingleLine" o "standardEveryLine"
|
||||
Ornamental Ornamental
|
||||
Scrollwork Voluta
|
||||
Filigree Arrow Flecha de filigrana
|
||||
Petal Sweep Trazo de pétalos
|
||||
Twin Curl Voluta doble
|
||||
|
Can't render this file because it contains an unexpected character in line 2 and column 73.
|
@@ -8183,3 +8183,8 @@ breakText Glyphs Merkit
|
||||
@msg A fold line is on a non-printing layer. Taittoviiva on tasolla, jota ei tulosteta.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Paneelit: {panels}, saranat: {hinges}, virheet: {errors}, varoitukset: {warnings}
|
||||
@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer on oltava "singleLine", "everyLine", "standardSingleLine" tai "standardEveryLine"
|
||||
Ornamental Koristekuviot
|
||||
Scrollwork Kiemura
|
||||
Filigree Arrow Filigraanin nuoli
|
||||
Petal Sweep Terälehtipyyhkäisy
|
||||
Twin Curl Kaksoiskiemura
|
||||
|
Can't render this file because it contains an unexpected character in line 2 and column 73.
|
@@ -9902,3 +9902,8 @@ breakText Glyphs Glyphes
|
||||
@msg A fold line is on a non-printing layer. Une ligne de pliage se trouve sur un calque non imprimable.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} {panels} panneau(x), {hinges} charnière(s), {errors} erreur(s), {warnings} avertissement(s)
|
||||
@msg {_1} × {_2} pixels is too large for GIF (at most 65535 pixels a side): lower the resolution {_1} × {_2} pixels, c’est trop grand pour le GIF (65535 pixels par côté au plus) : réduisez la résolution
|
||||
Ornamental Ornemental
|
||||
Scrollwork Volute
|
||||
Filigree Arrow Flèche filigrane
|
||||
Petal Sweep Courbe de pétales
|
||||
Twin Curl Double volute
|
||||
|
Can't render this file because it is too large.
|
@@ -4987,3 +4987,8 @@ swatch [Registration] [રજિસ્ટ્રેશન]
|
||||
Standard Single-line Composer સ્ટાન્ડર્ડ સિંગલ-લાઇન કમ્પોઝર
|
||||
Standard Every-line Composer સ્ટાન્ડર્ડ એવરી-લાઇન કમ્પોઝર
|
||||
@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer આમાંથી એક હોવું જોઈએ: "singleLine", "everyLine", "standardSingleLine" અથવા "standardEveryLine"
|
||||
Ornamental અલંકારિક
|
||||
Scrollwork વળાંકવાળી સજાવટ
|
||||
Filigree Arrow નાજુક કોતરણીવાળું તીર
|
||||
Petal Sweep પાંખડીઓનો વળાંક
|
||||
Twin Curl બેવડો વળાંક
|
||||
|
Can't render this file because it contains an unexpected character in line 72 and column 5.
|
@@ -9524,3 +9524,8 @@ theme Appearance अपीयरेंस
|
||||
@msg A panel is not joined to the rest by a crease. कोई पैनल किसी क्रीज़ लाइन से बाकी से जुड़ा नहीं है।
|
||||
@msg A fold line is on a non-printing layer. एक फ़ोल्ड लाइन नॉन-प्रिंटिंग लेयर पर है।
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} पैनल: {panels}, हिंज: {hinges}, एरर: {errors}, वॉर्निंग: {warnings}
|
||||
Ornamental अलंकरण
|
||||
Scrollwork अलंकारी घुमाव
|
||||
Filigree Arrow जालीदार तीर
|
||||
Petal Sweep पंखुड़ियों का घुमाव
|
||||
Twin Curl दोहरा घुमाव
|
||||
|
Can't render this file because it is too large.
|
@@ -9905,3 +9905,8 @@ breakText Glyphs Glifák
|
||||
@msg A panel is not joined to the rest by a crease. Egy panelt egyetlen bigvonal sem köt a többihez.
|
||||
@msg A fold line is on a non-printing layer. Egy hajtásvonal nem nyomtatható rétegen van.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panelek: {panels}, zsanérok: {hinges}, hibák: {errors}, figyelmeztetések: {warnings}
|
||||
Ornamental Díszítőmotívumok
|
||||
Scrollwork Kacskaringó
|
||||
Filigree Arrow Filigrán nyíl
|
||||
Petal Sweep Sziromív
|
||||
Twin Curl Kettős kacskaringó
|
||||
|
Can't render this file because it is too large.
|
@@ -7252,3 +7252,8 @@ breakText Glyphs Glif
|
||||
@msg A fold line is on a non-printing layer. Sebuah garis lipat berada di lapisan yang tidak dicetak.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panel: {panels}, engsel: {hinges}, galat: {errors}, peringatan: {warnings}
|
||||
@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer harus "singleLine", "everyLine", "standardSingleLine", atau "standardEveryLine"
|
||||
Ornamental Ornamental
|
||||
Scrollwork Sulur Hias
|
||||
Filigree Arrow Panah Filigran
|
||||
Petal Sweep Sapuan Kelopak
|
||||
Twin Curl Sulur Ganda
|
||||
|
Can't render this file because it contains an unexpected character in line 2511 and column 5.
|
@@ -9550,3 +9550,8 @@ breakText Glyphs Glifi
|
||||
@msg A panel is not joined to the rest by a crease. Un pannello non è unito al resto da alcuna linea di cordonatura.
|
||||
@msg A fold line is on a non-printing layer. Una linea di piega si trova su un livello non stampabile.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Pannelli: {panels}, cerniere: {hinges}, errori: {errors}, avvisi: {warnings}
|
||||
Ornamental Ornamentale
|
||||
Scrollwork Voluta
|
||||
Filigree Arrow Freccia filigranata
|
||||
Petal Sweep Tratto a petali
|
||||
Twin Curl Doppia voluta
|
||||
|
Can't render this file because it is too large.
|
@@ -9617,3 +9617,8 @@ breakText Glyphs 字形
|
||||
@msg A panel is not joined to the rest by a crease. パネルがどの筋入れ線でも他とつながっていません。
|
||||
@msg A fold line is on a non-printing layer. 折り線が印刷しないレイヤーにあります。
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} パネル: {panels}、ヒンジ: {hinges}、エラー: {errors}、警告: {warnings}
|
||||
Ornamental 装飾模様
|
||||
Scrollwork スクロール装飾
|
||||
Filigree Arrow フィリグリーの矢
|
||||
Petal Sweep 花びらの流線
|
||||
Twin Curl 二重カール
|
||||
|
Can't render this file because it is too large.
|
@@ -10285,3 +10285,8 @@ font-script Japanese იაპონური
|
||||
@msg A fold line is on a non-printing layer. მოკეცვის ხაზი არაბეჭდვად შრეზეა.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} პანელები: {panels}, ანჯამები: {hinges}, შეცდომები: {errors}, გაფრთხილებები: {warnings}
|
||||
@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer უნდა იყოს "singleLine", "everyLine", "standardSingleLine" ან "standardEveryLine"
|
||||
Ornamental ორნამენტული
|
||||
Scrollwork ხვეული
|
||||
Filigree Arrow ფილიგრანული ისარი
|
||||
Petal Sweep ფურცლების რკალი
|
||||
Twin Curl ორმაგი ხვეული
|
||||
|
Can't render this file because it is too large.
|
@@ -9514,3 +9514,8 @@ breakText Glyphs 글리프
|
||||
@msg A panel is not joined to the rest by a crease. 패널이 어떤 오시선으로도 나머지와 연결되어 있지 않습니다.
|
||||
@msg A fold line is on a non-printing layer. 접는 선이 인쇄되지 않는 레이어에 있습니다.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} 패널: {panels}, 힌지: {hinges}, 오류: {errors}, 경고: {warnings}
|
||||
Ornamental 장식 문양
|
||||
Scrollwork 소용돌이 장식
|
||||
Filigree Arrow 세공 화살표
|
||||
Petal Sweep 꽃잎 곡선
|
||||
Twin Curl 이중 소용돌이
|
||||
|
Can't render this file because it is too large.
|
@@ -9953,3 +9953,8 @@ breakText Glyphs Glyphs
|
||||
@msg A panel is not joined to the rest by a crease. Een paneel is door geen rillijn met de rest verbonden.
|
||||
@msg A fold line is on a non-printing layer. Een vouwlijn staat op een laag die niet wordt afgedrukt.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panelen: {panels}, scharnieren: {hinges}, fouten: {errors}, waarschuwingen: {warnings}
|
||||
Ornamental Ornamentaal
|
||||
Scrollwork Krulwerk
|
||||
Filigree Arrow Filigraanpijl
|
||||
Petal Sweep Bloemblaadjeszwaai
|
||||
Twin Curl Dubbele krul
|
||||
|
Can't render this file because it is too large.
|
@@ -9770,3 +9770,8 @@ breakText Glyphs Glify
|
||||
@msg A panel is not joined to the rest by a crease. Panel nie jest połączony z resztą żadną linią bigowania.
|
||||
@msg A fold line is on a non-printing layer. Linia zgięcia znajduje się na warstwie niedrukowanej.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panele: {panels}, zawiasy: {hinges}, błędy: {errors}, ostrzeżenia: {warnings}
|
||||
Ornamental Ornamentalne
|
||||
Scrollwork Zawijas
|
||||
Filigree Arrow Filigranowa strzałka
|
||||
Petal Sweep Smuga płatków
|
||||
Twin Curl Podwójny zawijas
|
||||
|
Can't render this file because it is too large.
|
@@ -9988,3 +9988,8 @@ swatch Yellow Green Verde-amarelado
|
||||
@msg A panel is not joined to the rest by a crease. Um painel não está unido ao restante por nenhuma linha de vinco.
|
||||
@msg A fold line is on a non-printing layer. Uma linha de dobra está em uma camada não imprimível.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Painéis: {panels}, dobradiças: {hinges}, erros: {errors}, avisos: {warnings}
|
||||
Ornamental Ornamental
|
||||
Scrollwork Voluta
|
||||
Filigree Arrow Seta filigranada
|
||||
Petal Sweep Traço de pétalas
|
||||
Twin Curl Voluta dupla
|
||||
|
Can't render this file because it is too large.
|
@@ -10011,3 +10011,8 @@ shape Open Открытый
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Панели: {panels}, шарниры: {hinges}, ошибки: {errors}, предупреждения: {warnings}
|
||||
@msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} пикселей — слишком большой размер для PSD (не более {MAX_SIDE} пикселей по стороне): уменьшите разрешение
|
||||
@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer должен быть "singleLine", "everyLine", "standardSingleLine" или "standardEveryLine"
|
||||
Ornamental Орнаментальные
|
||||
Scrollwork Завиток
|
||||
Filigree Arrow Филигранная стрела
|
||||
Petal Sweep Лепестковый росчерк
|
||||
Twin Curl Двойной завиток
|
||||
|
Can't render this file because it is too large.
|
@@ -9601,3 +9601,8 @@ digits Hindi Hindi
|
||||
@msg A fold line is on a non-printing layer. En falslinje ligger på ett lager som inte skrivs ut.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Paneler: {panels}, gångjärn: {hinges}, fel: {errors}, varningar: {warnings}
|
||||
@msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} pixlar är för stort för PSD (högst {MAX_SIDE} pixlar per sida): sänk upplösningen
|
||||
Ornamental Ornament
|
||||
Scrollwork Snirkel
|
||||
Filigree Arrow Filigranpil
|
||||
Petal Sweep Kronbladssvep
|
||||
Twin Curl Dubbel snirkel
|
||||
|
Can't render this file because it is too large.
|
@@ -501,8 +501,9 @@ fn built_in_library_brush_names_are_in_complete_catalogs() {
|
||||
.flat_map(|(_, lib)| lib.brushes.iter().map(|b| b.name.clone()).collect::<Vec<_>>())
|
||||
.collect();
|
||||
names.sort();
|
||||
let duplicates: Vec<&str> = names.windows(2).filter(|pair| pair[0] == pair[1]).map(|pair| pair[0].as_str()).collect();
|
||||
assert_eq!(duplicates, ["Zigzag"], "only the established Pattern Borders / Game Trails name is shared");
|
||||
names.dedup();
|
||||
assert_eq!(names.len(), 46, "{names:?}");
|
||||
let mut bad = vec![];
|
||||
for lang in LANGUAGES.iter().filter(|lang| lang.complete_menus) {
|
||||
let missing: Vec<&String> = names.iter().filter(|n| lang.catalog().plain(n).is_none()).collect();
|
||||
|
||||
@@ -9875,3 +9875,8 @@ breakText Glyphs Glifler
|
||||
@msg A panel is not joined to the rest by a crease. Bir panel geri kalanlara hiçbir pilyaj çizgisiyle bağlı değil.
|
||||
@msg A fold line is on a non-printing layer. Bir katlama çizgisi yazdırılmayan bir katmanda.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Paneller: {panels}, menteşeler: {hinges}, hatalar: {errors}, uyarılar: {warnings}
|
||||
Ornamental Süslemeli
|
||||
Scrollwork Kıvrım süsü
|
||||
Filigree Arrow Telkari ok
|
||||
Petal Sweep Yaprakçık kıvrımı
|
||||
Twin Curl Çift kıvrım
|
||||
|
Can't render this file because it is too large.
|
@@ -9526,3 +9526,8 @@ breakText Glyphs Гліфи
|
||||
@msg A panel is not joined to the rest by a crease. Панель не з’єднана з рештою жодною лінією біговки.
|
||||
@msg A fold line is on a non-printing layer. Лінія згину лежить на шарі, що не друкується.
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Панелі: {panels}, шарніри: {hinges}, помилки: {errors}, попередження: {warnings}
|
||||
Ornamental Орнаментальні
|
||||
Scrollwork Завиток
|
||||
Filigree Arrow Філігранна стріла
|
||||
Petal Sweep Пелюстковий розчерк
|
||||
Twin Curl Подвійний завиток
|
||||
|
Can't render this file because it is too large.
|
@@ -7759,3 +7759,8 @@ breakText Glyphs Glyph
|
||||
@msg {width} × {height} pixels is too large for Targa (at most 65535 pixels a side): lower the resolution {width} × {height} điểm ảnh quá lớn cho Targa (tối đa 65535 điểm ảnh mỗi cạnh): hãy giảm độ phân giải
|
||||
@msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} điểm ảnh quá lớn cho PSD (tối đa {MAX_SIDE} điểm ảnh mỗi cạnh): hãy giảm độ phân giải
|
||||
@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer phải là "singleLine", "everyLine", "standardSingleLine" hoặc "standardEveryLine"
|
||||
Ornamental Hoa văn
|
||||
Scrollwork Nét cuộn
|
||||
Filigree Arrow Mũi tên hoa văn
|
||||
Petal Sweep Nét cánh hoa
|
||||
Twin Curl Nét cuộn đôi
|
||||
|
Can't render this file because it contains an unexpected character in line 205 and column 5.
|
@@ -9758,3 +9758,8 @@ breakText Glyphs 字形
|
||||
@msg A fold line is on a non-printing layer. 一条折线位于不打印的图层上。
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} 面板:{panels},铰链:{hinges},错误:{errors},警告:{warnings}
|
||||
@msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} 像素对 PSD 而言过大 (每边最多 {MAX_SIDE} 像素):请降低分辨率
|
||||
Ornamental 装饰纹样
|
||||
Scrollwork 卷饰
|
||||
Filigree Arrow 花丝箭头
|
||||
Petal Sweep 花瓣曲线
|
||||
Twin Curl 双重卷饰
|
||||
|
Can't render this file because it is too large.
|
@@ -9568,3 +9568,8 @@ breakText Glyphs 字符
|
||||
@msg A fold line is on a non-printing layer. 一條摺線位於不列印的圖層上。
|
||||
@msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} 面板:{panels},鉸鏈:{hinges},錯誤:{errors},警告:{warnings}
|
||||
@msg {what} would print on more than {MAX_TILES} tiles: scale it down {what} 會列印在超過 {MAX_TILES} 個拼貼上:請縮小
|
||||
Ornamental 裝飾紋樣
|
||||
Scrollwork 卷飾
|
||||
Filigree Arrow 花絲箭頭
|
||||
Petal Sweep 花瓣曲線
|
||||
Twin Curl 雙重卷飾
|
||||
|
Can't render this file because it is too large.
|
@@ -197,6 +197,7 @@ fn the_window_menu_and_the_brushes_panel_open_brush_libraries() {
|
||||
json!("calligraphic-nibs"),
|
||||
json!("bristle-brushes"),
|
||||
json!("pattern-borders"),
|
||||
json!("ornamental"),
|
||||
json!("scatter-shapes"),
|
||||
json!("game-trails"),
|
||||
json!("energy-beams"),
|
||||
@@ -232,6 +233,17 @@ fn the_window_menu_and_the_brushes_panel_open_brush_libraries() {
|
||||
click(&mut app, &ctx, "Circuit Trace", Modifiers::NONE, 2.0);
|
||||
assert!(has(&app, "Circuit Trace") && !has(&app, "Bus Lines"));
|
||||
assert_eq!(undo_len(&app), undo + 1);
|
||||
let r = app.run("window.brushLibrary", json!({"library": "Ornamental"})).unwrap();
|
||||
assert_eq!((r["open"].as_str(), r["count"].as_u64()), (Some("ornamental"), Some(4)));
|
||||
let path = app.run("shape.line", json!({"x1": 10, "y1": 100, "x2": 180, "y2": 100})).unwrap()["id"].as_u64().unwrap();
|
||||
let undo = undo_len(&app);
|
||||
click(&mut app, &ctx, "Scrollwork", Modifiers::NONE, 3.0);
|
||||
assert!(has(&app, "Scrollwork") && !has(&app, "Twin Curl"));
|
||||
assert_eq!(undo_len(&app), undo + 1);
|
||||
assert_eq!(
|
||||
app.session.doc().unwrap().doc.node(vectorcraft_doc::NodeId(path)).unwrap().appearance.stroke().unwrap().brush.as_deref(),
|
||||
Some("Scrollwork")
|
||||
);
|
||||
// Without brushes there is nothing to save.
|
||||
let all: Vec<String> = vectorcraft_brush::library(&app.session.doc().unwrap().doc).into_iter().map(|b| b.name).collect();
|
||||
app.run("brush.delete", json!({ "names": all })).unwrap();
|
||||
|
||||
+2
-2
@@ -5035,8 +5035,8 @@ error.
|
||||
|
||||
## Brush libraries
|
||||
|
||||
Brush libraries are read-only sets of brushes: ten generated in code (Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle
|
||||
Brushes with one bristle brush for each tip shape, Pattern Borders, Scatter Shapes, Game Trails, Energy Beams, and Dry Media with the Chalk Grain, Graphite Pencil, Wax Crayon and
|
||||
Brush libraries are read-only sets of brushes: eleven generated in code (Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle
|
||||
Brushes with one bristle brush for each tip shape, Pattern Borders, Ornamental with Scrollwork, Filigree Arrow, Petal Sweep and Twin Curl, Scatter Shapes, Game Trails, Energy Beams, and Dry Media with the Chalk Grain, Graphite Pencil, Wax Crayon and
|
||||
Charcoal Dust art brushes, id `dry-media`, and Tech Circuit with Circuit Trace (art), Bus Lines and Terminal Nodes (pattern), id `tech-circuit`), the `.vectorcraft` files in the user library folder of the desktop app (User
|
||||
Defined) and the brushes of any document loaded with `brush.loadLibrary` (a document without brushes of its own has
|
||||
the default ones). `brush.libraries` lists them (`id`, `name`, `category`: `builtIn`, `user` or `loaded`, `count`) and
|
||||
|
||||
@@ -1102,6 +1102,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
|
||||
- **Brush libraries** ([public source](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/create-new-brush-libraries.html), [import](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/import-brushes-from-brush-libraries-or-other-files.html), [Brushes panel](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/brushes-panel-overview.html)): Window › Brush Libraries, the Brushes panel's Brush Libraries Menu and its menu's Open Brush Library open each library in a library panel of its own, as swatch, graphic style and symbol libraries do. The built-in libraries (Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle Brushes, Pattern Borders, Scatter Shapes, Game Trails, Energy Beams, Dry Media, Tech Circuit) are original brushes generated in code (`crates/engine/src/cmd/brushlib.rs`); Striped Ribbon's art is filled with the library's own pattern and Sparkles scatters the library's own symbol; Ink and Wash adds ink and wash brushes (the [help page](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/about-brushes.html) lists an Ink brush library of strokes with varied thickness and texture; the names, shapes and opacities are VectorCraft's own): Tapered Ink, an art brush broad near its start that thins to a fine tip; Brush Pen, a calligraphic brush whose size follows the pen pressure; and Soft Wash and Pooling Wash, art brushes of translucent gray layers that take the stroke color as tints; Game Trails adds motion art brushes (Speed Line, Dash Trail, Burst Ray, Zigzag); Energy Beams adds laser and plasma art brushes (Laser Bolt, Plasma Arc, Charge Wave, Spark Trail); Dry Media adds grainy art brushes (Chalk Grain, Graphite Pencil, Wax Crayon, Charcoal Dust). A click on a brush adds it to the document's Brushes as one undo step with every resource its art uses (patterns, symbols, swatches, graphic styles, images), makes it the current brush and, with paths selected, applies it to them in the same step; a brush the document already has is not added again and a different brush of the same name comes in numbered ("Wave 2"). Shift/Cmd-clicks select brushes for Add to Brushes; a brush dragged onto a path is added and applied to it, and one dragged onto the Brushes panel is added. Save Brushes… / the Brushes panel's Save Brush Library… write the document's brushes (or the selected ones) as a `.vectorcraft` library into the `Brushes` folder next to the preferences, listed under User Defined, or to a file; Other Library… reads the brushes of any document VectorCraft opens. Thumbnails, in the library panels, the Brushes panel and Brush Options, render brush art with the patterns and symbols it uses. Copying brushed art now carries the patterns and symbols its brush's art uses too. Tests: `crates/engine/src/tests/brushlib.rs`, `crates/ui-egui/src/panels/tests_brush_libraries.rs`, `panels::brushes::tests::library_brush_previews_show_the_patterns_their_art_uses`, `canvas::tests::a_library_brush_dropped_on_a_path_is_added_and_applied_in_one_step`.
|
||||
- **Bristle Brushes library** ([What's new](https://helpx.adobe.com/illustrator/desktop/new-features/whats-new.html), [About brushes](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/about-brushes.html)): Window › Brush Libraries › Bristle Brushes holds ten bristle brushes, one for each tip shape (Fine Liner, Pointed Flat, Stubby Round, Dry Scrub, Soft Dome, Filbert, Angled Round, Angled Flat, Fan Blender, Grass Fan). The brushes, their names and their values are VectorCraft's own, and every value lies inside the range the bristle brush keeps (`brush.libraries`, `brush.addFromLibrary`; `the_bristle_brushes_library_covers_every_tip_shape_within_the_bristle_ranges`).
|
||||
- **Tech Circuit library:** Circuit Trace is a chamfered art brush with 45-degree elbows and terminal pads; Bus Lines repeats three parallel conductor lanes; Terminal Nodes repeats solder pads, circular test points and connecting leads. Original vector geometry generated in code, with Tints colorization and continuous pattern tile edges. Evidence: `the_tech_circuit_library_constructs_adds_and_applies_each_brush` in `crates/engine/src/tests/brushlib.rs` covers listing, finite geometry on straight, curved, short and closed paths, add/apply, undo/redo, deduplication and saved-library round trips. G5 remaining estimate 3–13 h (estimated); area scores unchanged.
|
||||
- **Ornamental library** ([About brushes](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/about-brushes.html)): Window › Brush Libraries › Ornamental offers Scrollwork, Filigree Arrow, Petal Sweep and Twin Curl. These four original art brushes stretch curled lines, arrow-like accents and petal details along a path instead of repeating tiles; they take the stroke color as tints. The public source describes the Ornamental category, while the preset designs and names are VectorCraft's own. Evidence: `ornamental_brushes_draw_flourishes_and_survive_a_saved_library` in `crates/engine/src/tests/brushlib.rs` covers finite output on short, long and curved paths, add/apply and saved-library reopening; `the_window_menu_and_the_brushes_panel_open_brush_libraries` covers opening and clicking from the UI.
|
||||
- **Dry Media library** ([help page](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/about-brushes.html)): Window › Brush Libraries › Dry Media holds four art brushes with textured strokes like dry drawing materials, each 100 pt long: Chalk Grain (about 8 pt high), Graphite Pencil (about 2.3 pt), Wax Crayon (about 5.5 pt) and Charcoal Dust (about 7 pt). The brushes, their names, sizes and art are VectorCraft's own: each is filled vector paths from a fixed seed, at most 80 paths and 500 anchors, stretched along the path with Tints colorization, and the chalk and crayon art has even-odd gaps where the paper shows (`brush.libraries`, `brush.addFromLibrary`; `the_dry_media_library_holds_grainy_art_brushes_with_bounded_art`).
|
||||
- **Brush names in library panels**: a built-in brush library's panel shows its brushes' names in the UI language, in its list rows and tooltips, and its Find field matches the name shown or the English name. This is VectorCraft's own rule. A User Defined or Other Library… library's brushes, and the document's Brushes panel, show names as they are stored. A click, a drag, Add to Brushes and `brush.addFromLibrary` still use the English name, so the brush comes into the document under that name (`built_in_library_brushes_are_listed_in_the_ui_language`, `built_in_library_brush_names_are_in_complete_catalogs`).
|
||||
- A canvas context menu: right-click selects the object under the pointer and lists what applies to the selection (Undo/Redo, clipboard, group, isolation, join, Remove Anchor Points when anchors are selected, masks, compound paths, guides, Transform, Arrange, Select, Export Selection, and on type Bullets and Numbering and Spelling › Auto Spell Check, checked while it is on), or the view commands on empty canvas.
|
||||
|
||||
Reference in new issue
Block a user