diff --git a/Cargo.lock b/Cargo.lock index ce8fe123..acf02e13 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1243,6 +1243,7 @@ dependencies = [ "effectcraft-psd", "effectcraft-raster", "effectcraft-render", + "effectcraft-rustmotion-common", "effectcraft-segment", "effectcraft-svg", "effectcraft-text", @@ -1273,6 +1274,7 @@ dependencies = [ "effectcraft-project", "effectcraft-raster", "effectcraft-render", + "effectcraft-rustmotion-common", "effectcraft-time", "effectcraft-vp9enc", "filmcraft-aac", @@ -1541,6 +1543,7 @@ dependencies = [ "effectcraft-path", "effectcraft-project", "effectcraft-raster", + "effectcraft-rustmotion-common", "effectcraft-text", "effectcraft-time", "kurbo", @@ -1551,6 +1554,10 @@ dependencies = [ "web-time", ] +[[package]] +name = "effectcraft-rustmotion-common" +version = "0.10.0" + [[package]] name = "effectcraft-script" version = "0.10.0" @@ -1635,6 +1642,7 @@ dependencies = [ "effectcraft-path", "effectcraft-project", "effectcraft-render", + "effectcraft-rustmotion-common", "effectcraft-text", "effectcraft-time", "eframe", diff --git a/Cargo.toml b/Cargo.toml index 9f4e9d17..1363a21f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,6 +12,7 @@ repository = "https://github.com/storytold/effectcraft" [workspace.dependencies] # internal +effectcraft-rustmotion-common = { path = "crates/rustmotion-common" } effectcraft-time = { path = "crates/time" } effectcraft-geom = { path = "crates/geom" } effectcraft-color = { path = "crates/color" } diff --git a/apps/effectcraft/src/main.rs b/apps/effectcraft/src/main.rs index 2f99bd5e..1087b6c8 100644 --- a/apps/effectcraft/src/main.rs +++ b/apps/effectcraft/src/main.rs @@ -31,6 +31,8 @@ mod window; use effectcraft_ui_egui::EffectcraftApp; use serde_json::json; +const APP_NAME: &str = "EffectCraft"; + /// The app icon for the window, taskbar and Dock (assets/app-icon, regenerated by /// `packaging/icons.sh`). macOS gets the padded variant so it sits on Apple's icon grid in the Dock. /// The 256 px app icon (Windows, Linux; the AppImage's desktop integration installs it too). @@ -161,7 +163,7 @@ fn main() -> eframe::Result { let notice = launch.notice.take(); let options = eframe::NativeOptions { viewport: egui::ViewportBuilder::default() - .with_title("EffectCraft") + .with_title(APP_NAME) .with_inner_size(window::DEFAULT_SIZE) .with_min_inner_size(window::MIN_SIZE) .with_drag_and_drop(true) @@ -184,7 +186,7 @@ fn main() -> eframe::Result { #[cfg(target_os = "macos")] let apple_events = &apple_events; let result = eframe::run_native( - "EffectCraft", + APP_NAME, options, Box::new(move |cc| { match &cc.wgpu_render_state { @@ -386,7 +388,7 @@ fn startup_failed(e: &eframe::Error, gl_next: bool) { } let _ = rfd::MessageDialog::new() .set_level(rfd::MessageLevel::Error) - .set_title("EffectCraft") + .set_title(APP_NAME) .set_description(message) .set_buttons(rfd::MessageButtons::Ok) .show(); diff --git a/crates/engine/Cargo.toml b/crates/engine/Cargo.toml index 68e761ab..05af8a6e 100644 --- a/crates/engine/Cargo.toml +++ b/crates/engine/Cargo.toml @@ -10,6 +10,7 @@ rust-version.workspace = true workspace = true [dependencies] +effectcraft-rustmotion-common = { workspace = true } effectcraft-time = { workspace = true } effectcraft-geom = { workspace = true } effectcraft-color = { workspace = true } diff --git a/crates/engine/src/links.rs b/crates/engine/src/links.rs index 0a0ad482..9333d1e9 100644 --- a/crates/engine/src/links.rs +++ b/crates/engine/src/links.rs @@ -1,7 +1,8 @@ //! Community and project links (shown in Help ▸, the About dialog, the start screen and the //! header's Discord button). -pub const APP_NAME: &str = "EffectCraft"; +use effectcraft_rustmotion_common::APP_NAME; + pub const APP_SLUG: &str = "effectcraft"; pub const DISCORD: &str = "https://discord.gg/artcraft"; pub const WEBSITE: &str = "https://getartcraft.com"; diff --git a/crates/export/Cargo.toml b/crates/export/Cargo.toml index 2ef6f5ad..b8bbc2ca 100644 --- a/crates/export/Cargo.toml +++ b/crates/export/Cargo.toml @@ -10,6 +10,7 @@ rust-version.workspace = true workspace = true [dependencies] +effectcraft-rustmotion-common = { workspace = true } effectcraft-time = { workspace = true } effectcraft-project = { workspace = true } effectcraft-raster = { workspace = true } diff --git a/crates/export/src/lib.rs b/crates/export/src/lib.rs index eda97995..edceff76 100644 --- a/crates/export/src/lib.rs +++ b/crates/export/src/lib.rs @@ -28,10 +28,12 @@ //! (plan ADR 0001); nothing outside this crate touches them. //! //! H.264 requires even dimensions: odd output sizes are cropped by one pixel (padded when the -//! output is a single pixel wide/high). + #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)] +use effectcraft_rustmotion_common::APP_NAME; + mod encode; mod hevc_av1; mod out; diff --git a/crates/export/src/webm.rs b/crates/export/src/webm.rs index a12bd4e1..0766eb3c 100644 --- a/crates/export/src/webm.rs +++ b/crates/export/src/webm.rs @@ -182,8 +182,8 @@ pub(crate) async fn webm(job: &Cx<'_>, comp: &Comp, w: u32, h: u32, st: &mut Sta let mut info = vec![]; el_uint(&mut info, 0x2AD7B1, 1_000_000); el_float(&mut info, 0x4489, duration_ms); - el_str(&mut info, 0x4D80, "EffectCraft"); - el_str(&mut info, 0x5741, "EffectCraft"); + el_str(&mut info, 0x4D80, crate::APP_NAME); + el_str(&mut info, 0x5741, crate::APP_NAME); el(&mut head, INFO, &info); let mut tracks = vec![]; let mut v = vec![]; diff --git a/crates/export/src/webm_av1.rs b/crates/export/src/webm_av1.rs index ca06a3e5..6e1e7bfe 100644 --- a/crates/export/src/webm_av1.rs +++ b/crates/export/src/webm_av1.rs @@ -69,8 +69,8 @@ pub(crate) async fn webm_av1(job: &Cx<'_>, comp: &Comp, w: u32, h: u32, st: &mut let mut info = vec![]; el_uint(&mut info, 0x2AD7B1, 1_000_000); el_float(&mut info, 0x4489, duration_ms); - el_str(&mut info, 0x4D80, "EffectCraft"); - el_str(&mut info, 0x5741, "EffectCraft"); + el_str(&mut info, 0x4D80, crate::APP_NAME); + el_str(&mut info, 0x5741, crate::APP_NAME); el(&mut head, INFO, &info); let mut tracks = vec![]; let mut v = vec![]; diff --git a/crates/lottie/src/export.rs b/crates/lottie/src/export.rs index eeb6e273..02843f6a 100644 --- a/crates/lottie/src/export.rs +++ b/crates/lottie/src/export.rs @@ -509,7 +509,8 @@ pub fn export_comp(project: &Project, comp: ItemId, opts: &ExportOptions, read: pub fn to_dotlottie(res: &ExportResult, id: &str) -> Vec { let id: String = id.chars().map(|c| if c.is_ascii_alphanumeric() || c == '_' || c == '-' { c } else { '_' }).collect(); let id = if id.is_empty() { "animation".to_string() } else { id }; - let manifest = json!({"version": "1", "generator": "EffectCraft", "author": "", "animations": [{"id": id, "speed": 1, "loop": true}]}); + const GENERATOR: &str = "EffectCraft"; + let manifest = json!({"version": "1", "generator": GENERATOR, "author": "", "animations": [{"id": id, "speed": 1, "loop": true}]}); crate::zip::store(&[ ("manifest.json".into(), serde_json::to_vec(&manifest).unwrap_or_default()), (format!("animations/{id}.json"), serde_json::to_vec(&res.json).unwrap_or_default()), diff --git a/crates/render/Cargo.toml b/crates/render/Cargo.toml index db2fa9dd..0979db22 100644 --- a/crates/render/Cargo.toml +++ b/crates/render/Cargo.toml @@ -10,6 +10,7 @@ rust-version.workspace = true workspace = true [dependencies] +effectcraft-rustmotion-common = { workspace = true } effectcraft-time = { workspace = true } effectcraft-geom = { workspace = true } effectcraft-color = { workspace = true } diff --git a/crates/render/src/disk_cache.rs b/crates/render/src/disk_cache.rs index 4140b792..705b802e 100644 --- a/crates/render/src/disk_cache.rs +++ b/crates/render/src/disk_cache.rs @@ -27,6 +27,9 @@ use std::sync::{Arc, Condvar, Mutex}; use effectcraft_effects::Buf; use effectcraft_raster::Image; +use effectcraft_rustmotion_common::{self, APP_NAME}; + +// Uses effectcraft_rustmotion_common::APP_NAME (see its definition) /// File format version (part of the folder layout). const VERSION: &str = "v1"; @@ -281,7 +284,7 @@ pub fn default_folder() -> PathBuf { if cfg!(windows) && let Some(l) = std::env::var_os("LOCALAPPDATA") { - return PathBuf::from(l).join("EffectCraft").join("Disk Cache"); + return PathBuf::from(l).join(APP_NAME).join("Disk Cache"); } if let Some(x) = std::env::var_os("XDG_CACHE_HOME") { return PathBuf::from(x).join("effectcraft/disk-cache"); diff --git a/crates/rustmotion-common/Cargo.toml b/crates/rustmotion-common/Cargo.toml new file mode 100644 index 00000000..27df174b --- /dev/null +++ b/crates/rustmotion-common/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "effectcraft-rustmotion-common" +version.workspace = true +edition.workspace = true +license.workspace = true +rust-version.workspace = true \ No newline at end of file diff --git a/crates/rustmotion-common/src/lib.rs b/crates/rustmotion-common/src/lib.rs new file mode 100644 index 00000000..5d229246 --- /dev/null +++ b/crates/rustmotion-common/src/lib.rs @@ -0,0 +1,4 @@ +//! Shared constants for the EffectCraft/rustMotion application suite. + +/// The application name (used in UI, export metadata, and app paths). +pub const APP_NAME: &str = "rustMotion"; \ No newline at end of file diff --git a/crates/ui-egui/Cargo.toml b/crates/ui-egui/Cargo.toml index be02fef5..96be3b6c 100644 --- a/crates/ui-egui/Cargo.toml +++ b/crates/ui-egui/Cargo.toml @@ -10,6 +10,7 @@ rust-version.workspace = true workspace = true [dependencies] +effectcraft-rustmotion-common = { workspace = true } craft-ui = { workspace = true } effectcraft-time = { workspace = true } effectcraft-geom = { workspace = true } diff --git a/crates/ui-egui/src/header.rs b/crates/ui-egui/src/header.rs index fb381cfd..f8874e29 100644 --- a/crates/ui-egui/src/header.rs +++ b/crates/ui-egui/src/header.rs @@ -656,18 +656,18 @@ fn ws_menu(app: &mut EffectcraftApp, ui: &mut egui::Ui) { /// The ArtCraft mark as supplied in `docs/brand` (the README's and getartcraft.com's logo; used /// unmodified, see `docs/brand/LICENSE-brand.txt`). -static ARTCRAFT_MARK: &[u8] = include_bytes!("../../../docs/brand/artcraft-mark.png"); +static ARTCRAFT_MARK: &[u8] = include_bytes!("../../../docs/brand/rustmotion-mark.png"); /// The ArtCraft mark in `r` (decoded once into a mipmapped texture, so it stays crisp from the /// 24 px Tools bar to the About dialog). Nothing is drawn if it can't be decoded. pub fn paint_logo(p: &egui::Painter, r: Rect) { let ctx = p.ctx(); - let id = egui::Id::new("artcraft-mark"); + let id = egui::Id::new("rustmotion-mark"); let tex = ctx.data(|d| d.get_temp::>(id)).unwrap_or_else(|| { let tex = image::load_from_memory_with_format(ARTCRAFT_MARK, image::ImageFormat::Png).ok().map(|img| { let img = img.to_rgba8(); let ci = egui::ColorImage::from_rgba_unmultiplied([img.width() as usize, img.height() as usize], img.as_raw()); - ctx.load_texture("artcraft-mark", ci, egui::TextureOptions::LINEAR.with_mipmap_mode(Some(egui::TextureFilter::Linear))) + ctx.load_texture("rustmotion-mark", ci, egui::TextureOptions::LINEAR.with_mipmap_mode(Some(egui::TextureFilter::Linear))) }); ctx.data_mut(|d| d.insert_temp(id, tex.clone())); tex diff --git a/crates/ui-egui/src/i18n.rs b/crates/ui-egui/src/i18n.rs index 4caae8dd..18d44ac3 100644 --- a/crates/ui-egui/src/i18n.rs +++ b/crates/ui-egui/src/i18n.rs @@ -278,7 +278,7 @@ pub(crate) fn submenu(app: &EffectcraftApp, source: &str, shown: String) -> Stri /// Chinese After Effects documentation and the catalogs the sibling Craft apps ship; see the /// pull request for the rows taken from #321. const SIMPLIFIED_CHINESE: &[(&str, &str, &str)] = &[ - ("", "EffectCraft", "EffectCraft"), + ("", crate::APP_NAME, crate::APP_NAME), ("app.about", "About EffectCraft...", "关于 EffectCraft..."), ("", "Settings...", "设置..."), ("app.settings", "General...", "常规..."), @@ -912,7 +912,7 @@ const SIMPLIFIED_CHINESE: &[(&str, &str, &str)] = &[ /// entry per fixed menu row of the engine's menu tree, mirroring `SIMPLIFIED_CHINESE` in the /// vocabulary the sibling Craft apps' zh-hant catalogs use. const TRADITIONAL_CHINESE: &[(&str, &str, &str)] = &[ - ("", "EffectCraft", "EffectCraft"), + ("", "crate::APP_NAME", "crate::APP_NAME"), ("app.about", "About EffectCraft...", "關於 EffectCraft..."), ("", "Settings...", "設定..."), ("app.settings", "General...", "一般..."), @@ -1543,7 +1543,7 @@ const TRADITIONAL_CHINESE: &[(&str, &str, &str)] = &[ ]; const JAPANESE: &[(&str, &str, &str)] = &[ - ("", "EffectCraft", "EffectCraft"), + ("", "crate::APP_NAME", "crate::APP_NAME"), ("app.about", "About EffectCraft...", "EffectCraftについて..."), ("", "Settings...", "設定..."), ("app.settings", "General...", "一般..."), @@ -2177,7 +2177,7 @@ const JAPANESE: &[(&str, &str, &str)] = &[ /// Ukrainian motion-graphics vocabulary. Product names and technical identifiers stay verbatim. /// The (command, source) keys match the other catalogs; no proprietary localization was used. const UKRAINIAN: &[(&str, &str, &str)] = &[ - ("", "EffectCraft", "EffectCraft"), + ("", "crate::APP_NAME", "crate::APP_NAME"), ("app.about", "About EffectCraft...", "Про EffectCraft..."), ("", "Settings...", "Налаштування..."), ("app.settings", "General...", "Загальні..."), @@ -2812,7 +2812,7 @@ const UKRAINIAN: &[(&str, &str, &str)] = &[ /// Wording follows Adobe's Spanish After Effects documentation (helpx.adobe.com/es) where it /// names the feature, and macOS Spanish for the app menu. const SPANISH: &[(&str, &str, &str)] = &[ - ("", "EffectCraft", "EffectCraft"), + ("", "crate::APP_NAME", "crate::APP_NAME"), ("app.about", "About EffectCraft...", "Acerca de EffectCraft..."), ("", "Settings...", "Ajustes..."), ("app.settings", "General...", "General..."), @@ -3445,7 +3445,7 @@ const SPANISH: &[(&str, &str, &str)] = &[ /// Brazilian Portuguese: the same (command, English label) keys as `JAPANESE`, one entry /// per fixed menu row of the engine's menu tree. const PORTUGUESE: &[(&str, &str, &str)] = &[ - ("", "EffectCraft", "EffectCraft"), + ("", "crate::APP_NAME", "crate::APP_NAME"), ("app.about", "About EffectCraft...", "Sobre o EffectCraft..."), ("", "Settings...", "Configurações..."), ("app.settings", "General...", "Geral..."), @@ -4086,7 +4086,7 @@ const RUSSIAN: &[(&str, &str, &str)] = &[ ("", "Side", "Боковая грань"), ("", "Back", "Задняя грань"), ("layer.addTextAnimator", "Color", "Цвет"), - ("", "EffectCraft", "EffectCraft"), + ("", "crate::APP_NAME", "crate::APP_NAME"), ("app.about", "About EffectCraft...", "О EffectCraft..."), ("", "Settings...", "Настройки..."), ("app.settings", "General...", "Общие..."), @@ -4719,7 +4719,7 @@ const FRENCH: &[(&str, &str, &str)] = &[ ("", "Side", "Côté"), ("", "Back", "Arrière"), ("layer.addTextAnimator", "Color", "Couleur"), - ("", "EffectCraft", "EffectCraft"), + ("", "crate::APP_NAME", "crate::APP_NAME"), ("app.about", "About EffectCraft...", "À propos d’EffectCraft..."), ("", "Settings...", "Préférences..."), ("app.settings", "General...", "Général..."), @@ -5352,7 +5352,7 @@ const GERMAN: &[(&str, &str, &str)] = &[ ("", "Side", "Seite"), ("", "Back", "Rückseite"), ("layer.addTextAnimator", "Color", "Farbe"), - ("", "EffectCraft", "EffectCraft"), + ("", "crate::APP_NAME", "crate::APP_NAME"), ("app.about", "About EffectCraft...", "Über EffectCraft..."), ("", "Settings...", "Voreinstellungen..."), ("app.settings", "General...", "Allgemein..."), @@ -5985,7 +5985,7 @@ const CZECH: &[(&str, &str, &str)] = &[ ("", "Side", "Boční strana"), ("", "Back", "Zadní strana"), ("layer.addTextAnimator", "Color", "Barva"), - ("", "EffectCraft", "EffectCraft"), + ("", "crate::APP_NAME", "crate::APP_NAME"), ("app.about", "About EffectCraft...", "O aplikaci EffectCraft..."), ("", "Settings...", "Nastavení..."), ("app.settings", "General...", "Obecné..."), diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs index 105a075e..c095a50f 100644 --- a/crates/ui-egui/src/lib.rs +++ b/crates/ui-egui/src/lib.rs @@ -47,6 +47,8 @@ use serde_json::json; use state::UiState; use theme::Tokens; +use effectcraft_rustmotion_common::APP_NAME; + const SCREENSHOT_TIMEOUT_S: f64 = 4.0; /// Seconds without a project change before paused prefetch resumes (see /// [`EffectcraftApp::editing`]). diff --git a/crates/ui-egui/src/panels/dialogs.rs b/crates/ui-egui/src/panels/dialogs.rs index f9f2e4d2..b6054692 100644 --- a/crates/ui-egui/src/panels/dialogs.rs +++ b/crates/ui-egui/src/panels/dialogs.rs @@ -327,7 +327,7 @@ fn about_main(app: &mut EffectcraftApp, ui: &mut egui::Ui, t: &Tokens, cmd: &mut let p = ui.painter(); p.rect_filled(r, 10.0, Color32::from_rgb(0x1b, 0x22, 0x3c)); crate::header::paint_logo(p, Rect::from_min_size(r.min + vec2(18.0, 20.0), vec2(56.0, 56.0))); - p.text(r.min + vec2(90.0, 34.0), Align2::LEFT_CENTER, "EffectCraft", Tokens::semibold(24.0), Color32::WHITE); + p.text(r.min + vec2(90.0, 34.0), Align2::LEFT_CENTER, crate::APP_NAME, Tokens::semibold(24.0), Color32::WHITE); p.text( r.min + vec2(90.0, 62.0), Align2::LEFT_CENTER, diff --git a/docs/brand/rustcraft-logo-white.png b/docs/brand/rustcraft-logo-white.png new file mode 100644 index 00000000..90811afd Binary files /dev/null and b/docs/brand/rustcraft-logo-white.png differ diff --git a/docs/brand/rustcraft-logo-white.svg b/docs/brand/rustcraft-logo-white.svg new file mode 100644 index 00000000..c9d85cf0 --- /dev/null +++ b/docs/brand/rustcraft-logo-white.svg @@ -0,0 +1,70 @@ + + + + + ArtCraft + rustCraft + + + + + ArtCraft + + + + diff --git a/docs/brand/rustcraft-logo.png b/docs/brand/rustcraft-logo.png new file mode 100644 index 00000000..9ddeee67 Binary files /dev/null and b/docs/brand/rustcraft-logo.png differ diff --git a/docs/brand/rustcraft-logo.svg b/docs/brand/rustcraft-logo.svg new file mode 100644 index 00000000..1790b599 --- /dev/null +++ b/docs/brand/rustcraft-logo.svg @@ -0,0 +1,70 @@ + + + + + ArtCraft + rustCraft + + + + + ArtCraft + + + + diff --git a/docs/brand/rustdesign.svg b/docs/brand/rustdesign.svg new file mode 100644 index 00000000..ab812087 --- /dev/null +++ b/docs/brand/rustdesign.svg @@ -0,0 +1,101 @@ + + + + + + + +rMrMotionrMotionrustCraft + diff --git a/docs/brand/rustmotion-mark-black.png b/docs/brand/rustmotion-mark-black.png new file mode 100644 index 00000000..0e7ecce4 Binary files /dev/null and b/docs/brand/rustmotion-mark-black.png differ diff --git a/docs/brand/rustmotion-mark-black.svg b/docs/brand/rustmotion-mark-black.svg new file mode 100644 index 00000000..c604e86c --- /dev/null +++ b/docs/brand/rustmotion-mark-black.svg @@ -0,0 +1,74 @@ + + + + + ArtCraft + + + + + + + + + ArtCraft + + + + diff --git a/docs/brand/rustmotion-mark.png b/docs/brand/rustmotion-mark.png new file mode 100644 index 00000000..60004d41 Binary files /dev/null and b/docs/brand/rustmotion-mark.png differ diff --git a/docs/brand/rustmotion-mark.svg b/docs/brand/rustmotion-mark.svg new file mode 100644 index 00000000..93d268e2 --- /dev/null +++ b/docs/brand/rustmotion-mark.svg @@ -0,0 +1,132 @@ + + + + + + + + + + + ArtCraft + + + + + + + + + + + + + ArtCraft + + + +