diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md index ffba2154..43bc182b 100644 --- a/ATTRIBUTION.md +++ b/ATTRIBUTION.md @@ -34,9 +34,9 @@ These come from Rust crate dependencies (not files in this repository) and keep | Phosphor Icons (regular), via the `egui-phosphor` crate (vendored in `vendor/egui-phosphor` for egui 0.37) | Every UI icon (tools, layers, panels) | Phosphor Icons (Helena Zhang, Tobias Fried) | https://phosphoricons.com, https://github.com/amPerl/egui-phosphor | MIT (icons); crate MIT OR Apache-2.0 | | egui default fonts (Ubuntu-Light, Hack, Noto Emoji, emoji-icon-font), via `epaint_default_fonts` | UI text | Canonical / Source Foundry / Google / Jessie Jung | https://github.com/emilk/egui | Ubuntu Font Licence 1.0, MIT + Bitstream Vera License, OFL 1.1, MIT | | Only in builds made with `CRAFT_FONTS_DIR`: Inter Regular and SemiBold (desktop and web), from storytold/craft-fonts' Latin catalog (`crates/ui-egui/build.rs`) | Interface text | The Inter Project Authors | https://github.com/storytold/craft-fonts (pinned sources in its `fonts/latin-manifest.txt` and `ATTRIBUTION.md`) | OFL 1.1 | -| Only in builds made with `CRAFT_FONTS_DIR`: BIZ UDPGothic Regular (desktop and web) and Noto Sans CJK SC Regular (desktop), from storytold/craft-fonts (`crates/ui-egui/build.rs`) | Japanese and Chinese UI text | The BIZ UDGothic Project Authors (Morisawa Inc.); The Noto Project Authors | https://github.com/storytold/craft-fonts (pinned sources in its `fonts/manifest.txt` and `ATTRIBUTION.md`) | OFL 1.1 | +| Only in builds made with `CRAFT_FONTS_DIR`: BIZ UDPGothic Regular (desktop and web), Noto Sans CJK SC Regular (desktop) and Noto Sans Arabic Regular (desktop and web), from storytold/craft-fonts (`crates/ui-egui/build.rs`) | Japanese, Chinese and Arabic UI text | The BIZ UDGothic Project Authors (Morisawa Inc.); The Noto Project Authors | https://github.com/storytold/craft-fonts (pinned sources in its `fonts/manifest.txt` and `ATTRIBUTION.md`) | OFL 1.1 | -Without craft-fonts, Chinese, Japanese and Korean UI text uses the operating system's fonts at run +Without craft-fonts, Chinese, Japanese, Korean and Arabic UI text uses the operating system's fonts at run time (nothing is bundled); see [docs/localization-parity.md](docs/localization-parity.md). ## Procedural content (no asset files) diff --git a/README.md b/README.md index ea45b817..e6a08036 100644 --- a/README.md +++ b/README.md @@ -154,7 +154,7 @@ cargo xtask ci # fmt, clippy, test You need Rust 1.95 or newer. The app opens with a baked sample project; **File ▸ New project** starts from a built-in mesh, a project template or your own mesh file (UVs are generated if it has none). -Japanese, Chinese and Korean interface text uses the fonts of +Japanese, Chinese, Korean and Arabic interface text uses the fonts of [storytold/craft-fonts](https://github.com/storytold/craft-fonts) where it has them, an optional build input (releases always use it): `CRAFT_FONTS_DIR="$PWD/../craft-fonts" cargo run --release -p texturecraft` (an absolute path). Without it, the desktop app uses the installed system fonts. @@ -184,7 +184,7 @@ area, the remaining work and what's next. to end, weighted by how much of the day each area carries: importing meshes, texture sets and UDIM tiles, the layer stack with masks, effects and smart materials, every painting tool, baking, the PBR viewport and Rendering mode, export presets and templates, and the full menu set. The interface -speaks English, French, German, Spanish, Portuguese, Italian, Japanese, Chinese and Korean; +speaks English, French, German, Spanish, Portuguese, Italian, Japanese, Chinese, Korean and Arabic; [localization-parity.md](docs/localization-parity.md) has the details. The scores are self-assessed from our code against public documentation. diff --git a/ROADMAP.md b/ROADMAP.md index b739669d..007c96bd 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -20,7 +20,7 @@ end to end today (engine + UI + automation + tests), not what is planned. | Viewport and display | 12 | 95% | PBR with image-based lighting, 6 procedural environments or imported HDR/EXR panoramas with exposure, rotation, blur, opacity, ACES/linear tone mapping, HDR pipeline with bloom, vignette, sharpen and grain, key-light shadows, 4× MSAA plus idle temporal accumulation, channel / mesh-map / mask / UV checker views, 3D and 2D wireframes, brush cursor, axis gizmos, subsurface scattering blur, **depth of field**, saved cameras and cameras from glTF, FBX, COLLADA and USD files, displacement (also in shadows and the path tracers), **path-traced Rendering mode** (F10, on the GPU or the CPU) with environment importance sampling and an edge-aware **denoiser** | Hardware ray tracing | | Shader | 6 | 100% | Metallic/roughness and specular/glossiness PBR, **clear coat, sheen, anisotropy and subsurface scattering** (viewport and path tracer), height-to-normal, painted normals, parallax occlusion, emissive, opacity (dithered), AO intensity | — | | Export | 8 | 92% | 10 presets (incl. Godot 4 and **OpenPBR** with every shading lobe) plus **user output templates** (per-channel packing, converted maps, JSON import/export), PNG/JPEG/TGA/TIFF/BMP/WEBP/EXR/HDR, 8/16/32-bit, padding modes, size override, OpenGL/DirectX normals, `$udim` tiles, OBJ, textured GLB (with clearcoat/sheen) and USD (with clear coat) mesh export, zip download in the browser | Sheen and anisotropy in USD (UsdPreviewSurface has no inputs for them; GLB and OpenPBR maps carry them) | -| UI and UX | 8 | 95% | Painter-style layout with **dockable, tabbed, floating panels**, menus, tool shelf, tool bar, asset shelf, texture set list, layer stack with context menu, properties, display/shader/history/log panels, export dialog, new project dialog, bake mode, rendering mode, settings (interface scale, autosave, viewport texture resolution, system title bar), **own title bar** with the app icon and window buttons (Windows, GNOME; integrated with the macOS traffic lights), saved UI layouts, **shortcut editor** with conflict detection, tooltips with shortcuts; all menu items live ([docs/parity.md](docs/parity.md)); **9 UI languages** with CJK fonts ([docs/localization-parity.md](docs/localization-parity.md)); closed panels reopen where they were; frame-budgeted compositing and uploads keep 8K sets responsive | Native-speaker review of the translations | +| UI and UX | 8 | 95% | Painter-style layout with **dockable, tabbed, floating panels**, menus, tool shelf, tool bar, asset shelf, texture set list, layer stack with context menu, properties, display/shader/history/log panels, export dialog, new project dialog, bake mode, rendering mode, settings (interface scale, autosave, viewport texture resolution, system title bar), **own title bar** with the app icon and window buttons (Windows, GNOME; integrated with the macOS traffic lights), saved UI layouts, **shortcut editor** with conflict detection, tooltips with shortcuts; all menu items live ([docs/parity.md](docs/parity.md)); **10 UI languages** with CJK and Arabic fonts ([docs/localization-parity.md](docs/localization-parity.md)); closed panels reopen where they were; frame-budgeted compositing and uploads keep 8K sets responsive | Native-speaker review of the translations | | Platforms | 4 | 75% | Windows, macOS (universal, signed and notarized), Linux (AppImage, deb, rpm, tar.gz, Flatpak), FreeBSD and web release workflows | First real release run; web build polish | | **Total** | **100** | **≈ 93%** | | | diff --git a/crates/ui-egui/build.rs b/crates/ui-egui/build.rs index 4888d580..86168323 100644 --- a/crates/ui-egui/build.rs +++ b/crates/ui-egui/build.rs @@ -1,5 +1,5 @@ //! Embeds the optional craft-fonts UI fonts (storytold/craft-fonts) when `CRAFT_FONTS_DIR` points -//! at a checkout: Inter for the interface (from its Latin catalog) and the CJK +//! at a checkout: Inter for the interface (from its Latin catalog) and the CJK and Arabic //! faces; without it `CRAFT_FONTS` is empty and the UI uses egui's and the system's fonts. The //! recipe follows craft-fonts' `docs/integration.md`; no font file is committed here. The Latin //! faces are embedded without their Private Use Area ([`without_private_use`]). @@ -10,10 +10,12 @@ use std::path::PathBuf; /// The UI faces TextureCraft embeds (family, style) per manifest: desktop, then web (the web build /// has a download budget: of the CJK faces only the Japanese one, ~4.5 MB). const MANIFESTS: &[(&str, Faces, Faces)] = &[ - ("fonts/manifest.txt", &[("BIZ UDPGothic", "Regular"), ("Noto Sans CJK SC", "Regular")], &[("BIZ UDPGothic", "Regular")]), + ("fonts/manifest.txt", &[("BIZ UDPGothic", "Regular"), ("Noto Sans CJK SC", "Regular"), ARABIC], &[("BIZ UDPGothic", "Regular"), ARABIC]), // The interface font, regular and semibold (0.8 MB). (LATIN_MANIFEST, LATIN, LATIN), ]; +/// The Arabic face (0.8 MB, so the web build has it too). +const ARABIC: (&str, &str) = ("Noto Sans Arabic", "Regular"); /// Newer than the core catalog: a checkout without it keeps the default interface font. const LATIN_MANIFEST: &str = "fonts/latin-manifest.txt"; const LATIN: Faces = &[("Inter", "Regular"), ("Inter", "SemiBold")]; diff --git a/crates/ui-egui/src/fonts.rs b/crates/ui-egui/src/fonts.rs index 444bcdfc..b31b423a 100644 --- a/crates/ui-egui/src/fonts.rs +++ b/crates/ui-egui/src/fonts.rs @@ -1,15 +1,17 @@ -//! CJK fallback fonts for the UI. egui's default fonts have no Japanese, Chinese or Korean -//! glyphs, so translated UIs (and CJK layer or file names) need more fonts. They come from: +//! CJK and Arabic fallback fonts for the UI. egui's default fonts have no Japanese, Chinese, +//! Korean or Arabic glyphs, so translated UIs (and such layer or file names) need more fonts. +//! They come from: //! //! 1. craft-fonts, embedded at build time when `CRAFT_FONTS_DIR` points at a checkout (optional; //! see `build.rs` and storytold/craft-fonts' `docs/integration.md`); -//! 2. on desktop, the operating system's CJK fonts (Windows, macOS, Linux and BSD paths). +//! 2. on desktop, the operating system's fonts (Windows, macOS, Linux and BSD paths). //! -//! Fonts load lazily: one script when the UI language needs it, all three while the language +//! Fonts load lazily: one script when the UI language needs it, all of them while the language //! picker shows every language's own name. They are appended after the app's fonts //! (`theme::font_definitions`), so Latin text and row heights keep the interface font; the current language's script goes first, so -//! shared Han characters take that language's glyph forms. In the browser only craft-fonts -//! can supply them (without it, a CJK language shows its English name in the picker). +//! shared Han characters take that language's glyph forms. egui shapes Arabic and orders +//! right-to-left runs itself. In the browser only craft-fonts can supply them (without it, the +//! language shows its English name in the picker). use std::sync::Arc; @@ -35,10 +37,11 @@ pub enum Script { Japanese, Chinese, Korean, + Arabic, } impl Script { - pub const ALL: [Script; 3] = [Script::Japanese, Script::Chinese, Script::Korean]; + pub const ALL: [Script; 4] = [Script::Japanese, Script::Chinese, Script::Korean, Script::Arabic]; /// The script a UI language needs beyond Latin. pub fn of_language(code: &str) -> Option