Render output: Effects and Check sections, Size presets panel and the Check chip (#6281) (#7233)

* Render output: Effects and Check sections, Size presets panel and the Check tool chip

* Render output: Sampling, Effects and Check editors as child rows under Output

* fix: restrict legacy Output controls to test builds

* fix: cover status controls and reveal Effects test targets

* fix: include shared quality reviews in copied check reports

* fix: remove the obsolete Effects GPU guard after Wear integration
This commit is contained in:
Nathan Dane authored and GitHub committed 2026-10-29 04:39:34 +00:00
1 parent c1925bb219
commit bd8cb4e6d6
23 files changed
+2149 -418

No files matched your search

@@ -0,0 +1,618 @@
{
"en": {
"render.children.adaptive": "Adaptive",
"render.children.all_shots": "All shots",
"render.children.check": "Check",
"render.children.check_now": "Check now",
"render.children.cpu": "CPU ray tracing",
"render.children.denoise": "Reduce noise in the finished image",
"render.children.depth": "Path depth",
"render.children.effects_banner": "These effects need GPU path tracing. Opening this never changes the method.",
"render.children.enable_adaptive": "Enable independent pilots to edit the adaptive limits.",
"render.children.enable_bloom": "Enable bloom to edit its strength, threshold and radius.",
"render.children.finishing": "Finishing",
"render.children.fresnel": "Fresnel strata",
"render.children.glass": "Glass transport",
"render.children.go_to": "Go to {editor}",
"render.children.hdr": "HDR",
"render.children.look_summary": "{tone} · {count} looks",
"render.children.method": "Method",
"render.children.needs_cpu": "Needs CPU ray tracing. Opening this never changes the method.",
"render.children.nested": "Certified nested dielectrics",
"render.children.not_checked": "Not checked",
"render.children.path": "Path tracing",
"render.children.preview": "Preview payload",
"render.children.reflect_depth": "Reflect depth",
"render.children.reflect_samples": "Reflect samples",
"render.children.regrade": "Regrade",
"render.children.render": "Render",
"render.children.render_shot": "Render shot",
"render.children.renderer": "Renderer",
"render.children.renderers": "Renderers",
"render.children.request": "This request",
"render.children.reset_finishing": "Reset finishing",
"render.children.review_quality": "Review a quality specification…",
"render.children.rgb_gain": "RGB gain",
"render.children.samples": "Samples",
"render.children.sampling": "Sampling",
"render.children.seed": "Seed",
"render.children.tone": "Tone",
"render.children.under_hood": "Under the hood",
"render.children.copy_request": "Copy request JSON",
"render.children.copy_job": "Copy job JSON",
"render.children.copy_image": "Copy",
"render.children.looks": "Creative looks",
"render.children.lens_effects": "Lens effects",
"render.children.flare": "Flare",
"render.children.threshold": "Threshold",
"render.children.halo": "Halo",
"render.children.streak": "Streak",
"render.children.chromatic": "Chromatic",
"render.children.distortion": "Distortion",
"render.children.soft_focus": "Soft focus",
"render.children.sharpening": "Sharpening",
"render.children.grain": "Grain",
"render.children.contrast": "Contrast",
"render.children.saturation": "Saturation",
"render.children.vignette": "Vignette",
"render.children.bloom": "Bloom",
"render.children.strength": "Strength",
"render.children.radius": "Radius",
"render.children.memory": "Memory",
"render.children.keep_master": "Keep raw linear master",
"render.children.add_look_reason": "Add a look to edit its enabled state and strength.",
"render.children.compact": "Compact",
"render.children.studio": "Studio",
"render.children.workstation": "Workstation",
"render.children.single_image": "Single image",
"render.children.progressive_reason": "Choose Progressive to edit its sample count and seed.",
"render.children.pilots": "Pilot samples",
"render.children.minimum": "Minimum",
"render.children.relative_error": "Relative error",
"render.children.absolute_floor": "Absolute floor",
"render.children.coverage_error": "Coverage error",
"render.children.ghosts": "Ghost rings",
"render.children.edge_samples": "Edge samples",
"render.children.last_result": "Last: {number} · {width} × {height} · {phase}",
"render.children.scene_summary": "{bodies} bodies · {triangles} triangles"
},
"de": {
"render.children.adaptive": "Adaptiv",
"render.children.all_shots": "Alle Aufnahmen",
"render.children.check": "Prüfen",
"render.children.check_now": "Jetzt prüfen",
"render.children.cpu": "CPU-Raytracing",
"render.children.denoise": "Rauschen im fertigen Bild reduzieren",
"render.children.depth": "Pfadtiefe",
"render.children.effects_banner": "Diese Effekte benötigen GPU-Pathtracing. Das Öffnen ändert die Methode nicht.",
"render.children.enable_adaptive": "Unabhängige Pilotabtastung aktivieren, um adaptive Grenzen zu bearbeiten.",
"render.children.enable_bloom": "Bloom aktivieren, um Stärke, Schwelle und Radius zu bearbeiten.",
"render.children.finishing": "Nachbearbeitung",
"render.children.fresnel": "Fresnel-Schichten",
"render.children.glass": "Glastransport",
"render.children.go_to": "Zu {editor}",
"render.children.hdr": "HDR",
"render.children.look_summary": "{tone} · {count} Looks",
"render.children.method": "Methode",
"render.children.needs_cpu": "Benötigt CPU-Raytracing. Das Öffnen ändert die Methode nicht.",
"render.children.nested": "Zertifizierte verschachtelte Dielektrika",
"render.children.not_checked": "Nicht geprüft",
"render.children.path": "Pathtracing",
"render.children.preview": "Vorschaudaten",
"render.children.reflect_depth": "Reflexionstiefe",
"render.children.reflect_samples": "Reflexionssamples",
"render.children.regrade": "Neu graden",
"render.children.render": "Rendern",
"render.children.render_shot": "Aufnahme rendern",
"render.children.renderer": "Renderer",
"render.children.renderers": "Renderer",
"render.children.request": "Diese Anfrage",
"render.children.reset_finishing": "Nachbearbeitung zurücksetzen",
"render.children.review_quality": "Qualitätsspezifikation prüfen…",
"render.children.rgb_gain": "RGB-Verstärkung",
"render.children.samples": "Samples",
"render.children.sampling": "Abtastung",
"render.children.seed": "Startwert",
"render.children.tone": "Tonwert",
"render.children.under_hood": "Technische Details",
"render.children.copy_request": "Anfrage-JSON kopieren",
"render.children.copy_job": "Auftrags-JSON kopieren",
"render.children.copy_image": "Kopieren",
"render.children.looks": "Kreative Looks",
"render.children.lens_effects": "Objektiveffekte",
"render.children.flare": "Lichtreflexe",
"render.children.threshold": "Schwelle",
"render.children.halo": "Lichthof",
"render.children.streak": "Streifen",
"render.children.chromatic": "Chromatisch",
"render.children.distortion": "Verzeichnung",
"render.children.soft_focus": "Weichzeichnung",
"render.children.sharpening": "Schärfen",
"render.children.grain": "Korn",
"render.children.contrast": "Kontrast",
"render.children.saturation": "Sättigung",
"render.children.vignette": "Vignette",
"render.children.bloom": "Bloom",
"render.children.strength": "Stärke",
"render.children.radius": "Radius",
"render.children.memory": "Speicher",
"render.children.keep_master": "Lineares Rohbild behalten",
"render.children.add_look_reason": "Einen Look hinzufügen, um Aktivierung und Stärke zu bearbeiten.",
"render.children.compact": "Kompakt",
"render.children.studio": "Studio",
"render.children.workstation": "Workstation",
"render.children.single_image": "Einzelbild",
"render.children.progressive_reason": "Progressiv wählen, um Sampleanzahl und Startwert zu bearbeiten.",
"render.children.pilots": "Pilot-Samples",
"render.children.minimum": "Minimum",
"render.children.relative_error": "Relativer Fehler",
"render.children.absolute_floor": "Absolute Untergrenze",
"render.children.coverage_error": "Abdeckungsfehler",
"render.children.ghosts": "Geisterringe",
"render.children.edge_samples": "Kanten-Samples",
"render.children.last_result": "Zuletzt: {number} · {width} × {height} · {phase}",
"render.children.scene_summary": "{bodies} Körper · {triangles} Dreiecke"
},
"ja": {
"render.children.adaptive": "適応サンプリング",
"render.children.all_shots": "すべてのショット",
"render.children.check": "チェック",
"render.children.check_now": "今すぐチェック",
"render.children.cpu": "CPUレイトレーシング",
"render.children.denoise": "完成画像のノイズを低減",
"render.children.depth": "パス深度",
"render.children.effects_banner": "これらの効果にはGPUパストレーシングが必要です。開いても方式は変わりません。",
"render.children.enable_adaptive": "適応制限を編集するには独立パイロットを有効にします。",
"render.children.enable_bloom": "強度、しきい値、半径を編集するにはブルームを有効にします。",
"render.children.finishing": "仕上げ",
"render.children.fresnel": "フレネル層数",
"render.children.glass": "ガラスの光輸送",
"render.children.go_to": "{editor}へ移動",
"render.children.hdr": "HDR",
"render.children.look_summary": "{tone} · {count}ルック",
"render.children.method": "方式",
"render.children.needs_cpu": "CPUレイトレーシングが必要です。開いても方式は変わりません。",
"render.children.nested": "認証済みの入れ子誘電体",
"render.children.not_checked": "未チェック",
"render.children.path": "パストレーシング",
"render.children.preview": "プレビューデータ",
"render.children.reflect_depth": "反射深度",
"render.children.reflect_samples": "反射サンプル数",
"render.children.regrade": "再グレーディング",
"render.children.render": "レンダリング",
"render.children.render_shot": "ショットをレンダリング",
"render.children.renderer": "レンダラー",
"render.children.renderers": "レンダラー",
"render.children.request": "このリクエスト",
"render.children.reset_finishing": "仕上げをリセット",
"render.children.review_quality": "品質仕様を確認…",
"render.children.rgb_gain": "RGBゲイン",
"render.children.samples": "サンプル数",
"render.children.sampling": "サンプリング",
"render.children.seed": "シード",
"render.children.tone": "トーン",
"render.children.under_hood": "内部情報",
"render.children.copy_request": "リクエストJSONをコピー",
"render.children.copy_job": "ジョブJSONをコピー",
"render.children.copy_image": "コピー",
"render.children.looks": "クリエイティブルック",
"render.children.lens_effects": "レンズ効果",
"render.children.flare": "フレア",
"render.children.threshold": "しきい値",
"render.children.halo": "ハロー",
"render.children.streak": "光条",
"render.children.chromatic": "色収差",
"render.children.distortion": "歪み",
"render.children.soft_focus": "ソフトフォーカス",
"render.children.sharpening": "シャープ",
"render.children.grain": "粒子",
"render.children.contrast": "コントラスト",
"render.children.saturation": "彩度",
"render.children.vignette": "周辺減光",
"render.children.bloom": "ブルーム",
"render.children.strength": "強度",
"render.children.radius": "半径",
"render.children.memory": "メモリ",
"render.children.keep_master": "リニアRAWマスターを保持",
"render.children.add_look_reason": "有効状態と強度を編集するにはルックを追加します。",
"render.children.compact": "コンパクト",
"render.children.studio": "スタジオ",
"render.children.workstation": "ワークステーション",
"render.children.single_image": "単一画像",
"render.children.progressive_reason": "サンプル数とシードを編集するにはプログレッシブを選択します。",
"render.children.pilots": "パイロットサンプル",
"render.children.minimum": "最小数",
"render.children.relative_error": "相対誤差",
"render.children.absolute_floor": "絶対下限",
"render.children.coverage_error": "カバレッジ誤差",
"render.children.ghosts": "ゴーストリング",
"render.children.edge_samples": "エッジサンプル",
"render.children.last_result": "前回: {number} · {width} × {height} · {phase}",
"render.children.scene_summary": "{bodies}ボディ · {triangles}三角形"
},
"ko": {
"render.children.adaptive": "적응형",
"render.children.all_shots": "모든 샷",
"render.children.check": "검사",
"render.children.check_now": "지금 검사",
"render.children.cpu": "CPU 레이 트레이싱",
"render.children.denoise": "완성 이미지의 노이즈 줄이기",
"render.children.depth": "경로 깊이",
"render.children.effects_banner": "이 효과에는 GPU 경로 추적이 필요합니다. 열어도 방식은 바뀌지 않습니다.",
"render.children.enable_adaptive": "적응형 한도를 편집하려면 독립 파일럿을 활성화하세요.",
"render.children.enable_bloom": "강도, 임계값, 반경을 편집하려면 블룸을 활성화하세요.",
"render.children.finishing": "마무리",
"render.children.fresnel": "프레넬 계층",
"render.children.glass": "유리 광 전송",
"render.children.go_to": "{editor}(으)로 이동",
"render.children.hdr": "HDR",
"render.children.look_summary": "{tone} · 룩 {count}개",
"render.children.method": "방식",
"render.children.needs_cpu": "CPU 레이 트레이싱이 필요합니다. 열어도 방식은 바뀌지 않습니다.",
"render.children.nested": "인증된 중첩 유전체",
"render.children.not_checked": "검사 안 됨",
"render.children.path": "경로 추적",
"render.children.preview": "미리보기 데이터",
"render.children.reflect_depth": "반사 깊이",
"render.children.reflect_samples": "반사 샘플",
"render.children.regrade": "다시 그레이딩",
"render.children.render": "렌더링",
"render.children.render_shot": "샷 렌더링",
"render.children.renderer": "렌더러",
"render.children.renderers": "렌더러",
"render.children.request": "이 요청",
"render.children.reset_finishing": "마무리 초기화",
"render.children.review_quality": "품질 사양 검토…",
"render.children.rgb_gain": "RGB 게인",
"render.children.samples": "샘플",
"render.children.sampling": "샘플링",
"render.children.seed": "시드",
"render.children.tone": "톤",
"render.children.under_hood": "내부 정보",
"render.children.copy_request": "요청 JSON 복사",
"render.children.copy_job": "작업 JSON 복사",
"render.children.copy_image": "복사",
"render.children.looks": "크리에이티브 룩",
"render.children.lens_effects": "렌즈 효과",
"render.children.flare": "플레어",
"render.children.threshold": "임계값",
"render.children.halo": "후광",
"render.children.streak": "광선",
"render.children.chromatic": "색수차",
"render.children.distortion": "왜곡",
"render.children.soft_focus": "소프트 포커스",
"render.children.sharpening": "선명도",
"render.children.grain": "입자",
"render.children.contrast": "대비",
"render.children.saturation": "채도",
"render.children.vignette": "비네트",
"render.children.bloom": "블룸",
"render.children.strength": "강도",
"render.children.radius": "반경",
"render.children.memory": "메모리",
"render.children.keep_master": "원시 선형 마스터 유지",
"render.children.add_look_reason": "활성 상태와 강도를 편집하려면 룩을 추가하세요.",
"render.children.compact": "소형",
"render.children.studio": "스튜디오",
"render.children.workstation": "워크스테이션",
"render.children.single_image": "단일 이미지",
"render.children.progressive_reason": "샘플 수와 시드를 편집하려면 점진적 모드를 선택하세요.",
"render.children.pilots": "파일럿 샘플",
"render.children.minimum": "최소값",
"render.children.relative_error": "상대 오차",
"render.children.absolute_floor": "절대 하한",
"render.children.coverage_error": "커버리지 오차",
"render.children.ghosts": "고스트 링",
"render.children.edge_samples": "모서리 샘플",
"render.children.last_result": "최근: {number} · {width} × {height} · {phase}",
"render.children.scene_summary": "바디 {bodies}개 · 삼각형 {triangles}개"
},
"zh": {
"render.children.adaptive": "自适应",
"render.children.all_shots": "所有镜头",
"render.children.check": "检查",
"render.children.check_now": "立即检查",
"render.children.cpu": "CPU光线追踪",
"render.children.denoise": "降低成品图像噪点",
"render.children.depth": "路径深度",
"render.children.effects_banner": "这些效果需要GPU路径追踪。打开此编辑器不会更改渲染方式。",
"render.children.enable_adaptive": "启用独立预采样以编辑自适应限制。",
"render.children.enable_bloom": "启用泛光以编辑强度、阈值和半径。",
"render.children.finishing": "后期处理",
"render.children.fresnel": "菲涅耳分层",
"render.children.glass": "玻璃光传输",
"render.children.go_to": "转到{editor}",
"render.children.hdr": "HDR",
"render.children.look_summary": "{tone} · {count}个风格",
"render.children.method": "方式",
"render.children.needs_cpu": "需要CPU光线追踪。打开此编辑器不会更改渲染方式。",
"render.children.nested": "已认证的嵌套电介质",
"render.children.not_checked": "尚未检查",
"render.children.path": "路径追踪",
"render.children.preview": "预览数据",
"render.children.reflect_depth": "反射深度",
"render.children.reflect_samples": "反射采样数",
"render.children.regrade": "重新调色",
"render.children.render": "渲染",
"render.children.render_shot": "渲染镜头",
"render.children.renderer": "渲染器",
"render.children.renderers": "渲染器",
"render.children.request": "此请求",
"render.children.reset_finishing": "重置后期处理",
"render.children.review_quality": "查看质量规范…",
"render.children.rgb_gain": "RGB增益",
"render.children.samples": "采样数",
"render.children.sampling": "采样",
"render.children.seed": "种子",
"render.children.tone": "色调",
"render.children.under_hood": "内部信息",
"render.children.copy_request": "复制请求JSON",
"render.children.copy_job": "复制作业JSON",
"render.children.copy_image": "复制",
"render.children.looks": "创意风格",
"render.children.lens_effects": "镜头效果",
"render.children.flare": "眩光",
"render.children.threshold": "阈值",
"render.children.halo": "光晕",
"render.children.streak": "光条",
"render.children.chromatic": "色差",
"render.children.distortion": "畸变",
"render.children.soft_focus": "柔焦",
"render.children.sharpening": "锐化",
"render.children.grain": "颗粒",
"render.children.contrast": "对比度",
"render.children.saturation": "饱和度",
"render.children.vignette": "暗角",
"render.children.bloom": "泛光",
"render.children.strength": "强度",
"render.children.radius": "半径",
"render.children.memory": "内存",
"render.children.keep_master": "保留原始线性母版",
"render.children.add_look_reason": "添加风格以编辑启用状态和强度。",
"render.children.compact": "紧凑",
"render.children.studio": "工作室",
"render.children.workstation": "工作站",
"render.children.single_image": "单幅图像",
"render.children.progressive_reason": "选择渐进模式以编辑采样数和种子。",
"render.children.pilots": "预采样数",
"render.children.minimum": "最小数",
"render.children.relative_error": "相对误差",
"render.children.absolute_floor": "绝对下限",
"render.children.coverage_error": "覆盖误差",
"render.children.ghosts": "鬼影环",
"render.children.edge_samples": "边缘采样",
"render.children.last_result": "上次:{number} · {width} × {height} · {phase}",
"render.children.scene_summary": "{bodies}个实体 · {triangles}个三角形"
},
"ar": {
"render.children.adaptive": "تكيّفي",
"render.children.all_shots": "كل اللقطات",
"render.children.check": "فحص",
"render.children.check_now": "افحص الآن",
"render.children.cpu": "تتبّع الأشعة على المعالج",
"render.children.denoise": "تقليل الضجيج في الصورة النهائية",
"render.children.depth": "عمق المسار",
"render.children.effects_banner": "هذه المؤثرات تتطلب تتبّع المسار على بطاقة الرسومات. فتح هذا لا يغيّر الطريقة أبدًا.",
"render.children.enable_adaptive": "فعّل المجسّات المستقلة لتعديل الحدود التكيفية.",
"render.children.enable_bloom": "فعّل التوهّج لتعديل قوته وعتبته ونصف قطره.",
"render.children.finishing": "اللمسات الأخيرة",
"render.children.fresnel": "طبقات فرينل",
"render.children.glass": "نقل الضوء في الزجاج",
"render.children.go_to": "انتقل إلى {editor}",
"render.children.hdr": "HDR",
"render.children.look_summary": "{tone} · {count} مظهرًا",
"render.children.method": "الطريقة",
"render.children.needs_cpu": "يتطلب تتبّع الأشعة على المعالج. فتح هذا لا يغيّر الطريقة أبدًا.",
"render.children.nested": "عوازل متداخلة معتمدة",
"render.children.not_checked": "لم يُفحص",
"render.children.path": "تتبّع المسار",
"render.children.preview": "حمولة المعاينة",
"render.children.reflect_depth": "عمق الانعكاس",
"render.children.reflect_samples": "عينات الانعكاس",
"render.children.regrade": "إعادة تدرّج",
"render.children.render": "تصيير",
"render.children.render_shot": "تصيير اللقطة",
"render.children.renderer": "المصيّر",
"render.children.renderers": "المصيّرات",
"render.children.request": "هذا الطلب",
"render.children.reset_finishing": "إعادة ضبط اللمسات الأخيرة",
"render.children.review_quality": "مراجعة مواصفة الجودة…",
"render.children.rgb_gain": "كسب RGB",
"render.children.samples": "العينات",
"render.children.sampling": "أخذ العينات",
"render.children.seed": "البذرة",
"render.children.tone": "النغمة",
"render.children.under_hood": "تحت الغطاء",
"render.children.copy_request": "نسخ JSON الطلب",
"render.children.copy_job": "نسخ JSON المهمة",
"render.children.copy_image": "نسخ",
"render.children.looks": "مظاهر إبداعية",
"render.children.lens_effects": "مؤثرات العدسة",
"render.children.flare": "وهج العدسة",
"render.children.threshold": "العتبة",
"render.children.halo": "هالة",
"render.children.streak": "خطوط",
"render.children.chromatic": "الزيغ اللوني",
"render.children.distortion": "التشويه",
"render.children.soft_focus": "تركيز ناعم",
"render.children.sharpening": "شحذ",
"render.children.grain": "حبيبات",
"render.children.contrast": "التباين",
"render.children.saturation": "التشبّع",
"render.children.vignette": "التعتيم عند الحواف",
"render.children.bloom": "توهّج",
"render.children.strength": "القوة",
"render.children.radius": "نصف القطر",
"render.children.memory": "الذاكرة",
"render.children.keep_master": "الاحتفاظ بالنسخة الرئيسية الخطية الخام",
"render.children.add_look_reason": "أضف مظهرًا لتعديل حالة تفعيله وقوته.",
"render.children.compact": "مدمج",
"render.children.studio": "استوديو",
"render.children.workstation": "محطة عمل",
"render.children.single_image": "صورة واحدة",
"render.children.progressive_reason": "اختر «تدريجي» لتعديل عدد عيناته وبذرته.",
"render.children.pilots": "عينات المجسّات",
"render.children.minimum": "الحد الأدنى",
"render.children.relative_error": "الخطأ النسبي",
"render.children.absolute_floor": "الحد المطلق",
"render.children.coverage_error": "خطأ التغطية",
"render.children.ghosts": "حلقات الأشباح",
"render.children.edge_samples": "عينات الحواف",
"render.children.last_result": "الأخيرة: {number} · {width} × {height} · {phase}",
"render.children.scene_summary": "{bodies} أجسام · {triangles} مثلثات"
},
"he": {
"render.children.adaptive": "מסתגל",
"render.children.all_shots": "כל הצילומים",
"render.children.check": "בדיקה",
"render.children.check_now": "בדוק עכשיו",
"render.children.cpu": "מעקב קרניים במעבד",
"render.children.denoise": "הפחת רעש בתמונה המוגמרת",
"render.children.depth": "עומק נתיב",
"render.children.effects_banner": "האפקטים האלה דורשים מעקב נתיב ב-GPU. פתיחה כאן לעולם אינה משנה את השיטה.",
"render.children.enable_adaptive": "הפעל גששים עצמאיים כדי לערוך את הגבולות המסתגלים.",
"render.children.enable_bloom": "הפעל הילה כדי לערוך את עוצמתה, הסף והרדיוס שלה.",
"render.children.finishing": "גימור",
"render.children.fresnel": "שכבות פרנל",
"render.children.glass": "הולכת אור בזכוכית",
"render.children.go_to": "עבור אל {editor}",
"render.children.hdr": "HDR",
"render.children.look_summary": "{tone} · {count} מראות",
"render.children.method": "שיטה",
"render.children.needs_cpu": "דורש מעקב קרניים במעבד. פתיחה כאן לעולם אינה משנה את השיטה.",
"render.children.nested": "דיאלקטריים מקוננים מאושרים",
"render.children.not_checked": "לא נבדק",
"render.children.path": "מעקב נתיב",
"render.children.preview": "מטען תצוגה מקדימה",
"render.children.reflect_depth": "עומק החזרה",
"render.children.reflect_samples": "דגימות החזרה",
"render.children.regrade": "כיול מחדש",
"render.children.render": "רינדור",
"render.children.render_shot": "רנדר צילום",
"render.children.renderer": "מעבד רינדור",
"render.children.renderers": "מעבדי רינדור",
"render.children.request": "בקשה זו",
"render.children.reset_finishing": "אפס גימור",
"render.children.review_quality": "סקור מפרט איכות…",
"render.children.rgb_gain": "הגברת RGB",
"render.children.samples": "דגימות",
"render.children.sampling": "דגימה",
"render.children.seed": "זרע",
"render.children.tone": "גוון",
"render.children.under_hood": "מתחת למכסה",
"render.children.copy_request": "העתק JSON של הבקשה",
"render.children.copy_job": "העתק JSON של המשימה",
"render.children.copy_image": "העתק",
"render.children.looks": "מראות יצירתיים",
"render.children.lens_effects": "אפקטי עדשה",
"render.children.flare": "הבהוב",
"render.children.threshold": "סף",
"render.children.halo": "הילה",
"render.children.streak": "פסים",
"render.children.chromatic": "כרומטי",
"render.children.distortion": "עיוות",
"render.children.soft_focus": "מיקוד רך",
"render.children.sharpening": "חידוד",
"render.children.grain": "גרעיניות",
"render.children.contrast": "ניגודיות",
"render.children.saturation": "רוויה",
"render.children.vignette": "האפלת שוליים",
"render.children.bloom": "הילה זוהרת",
"render.children.strength": "עוצמה",
"render.children.radius": "רדיוס",
"render.children.memory": "זיכרון",
"render.children.keep_master": "שמור מאסטר לינארי גולמי",
"render.children.add_look_reason": "הוסף מראה כדי לערוך את מצב ההפעלה והעוצמה שלו.",
"render.children.compact": "קומפקטי",
"render.children.studio": "סטודיו",
"render.children.workstation": "תחנת עבודה",
"render.children.single_image": "תמונה בודדת",
"render.children.progressive_reason": "בחר הדרגתי כדי לערוך את מספר הדגימות והזרע שלו.",
"render.children.pilots": "דגימות גשש",
"render.children.minimum": "מינימום",
"render.children.relative_error": "שגיאה יחסית",
"render.children.absolute_floor": "רצפה מוחלטת",
"render.children.coverage_error": "שגיאת כיסוי",
"render.children.ghosts": "טבעות רפאים",
"render.children.edge_samples": "דגימות קצה",
"render.children.last_result": "אחרון: {number} · {width} × {height} · {phase}",
"render.children.scene_summary": "{bodies} גופים · {triangles} משולשים"
},
"vi": {
"render.children.adaptive": "Thích ứng",
"render.children.all_shots": "Mọi cảnh chụp",
"render.children.check": "Kiểm tra",
"render.children.check_now": "Kiểm tra ngay",
"render.children.cpu": "Dò tia bằng CPU",
"render.children.denoise": "Giảm nhiễu trong ảnh hoàn chỉnh",
"render.children.depth": "Độ sâu đường đi",
"render.children.effects_banner": "Các hiệu ứng này cần dò đường đi của tia bằng GPU. Mở mục này không bao giờ đổi phương pháp.",
"render.children.enable_adaptive": "Bật các thử nghiệm độc lập để chỉnh giới hạn thích ứng.",
"render.children.enable_bloom": "Bật bloom để chỉnh cường độ, ngưỡng và bán kính.",
"render.children.finishing": "Hoàn thiện",
"render.children.fresnel": "Lớp Fresnel",
"render.children.glass": "Truyền sáng trong kính",
"render.children.go_to": "Đến {editor}",
"render.children.hdr": "HDR",
"render.children.look_summary": "{tone} · {count} diện mạo",
"render.children.method": "Phương pháp",
"render.children.needs_cpu": "Cần dò tia bằng CPU. Mở mục này không bao giờ đổi phương pháp.",
"render.children.nested": "Điện môi lồng nhau đã chứng nhận",
"render.children.not_checked": "Chưa kiểm tra",
"render.children.path": "Dò đường đi của tia",
"render.children.preview": "Dữ liệu xem trước",
"render.children.reflect_depth": "Độ sâu phản xạ",
"render.children.reflect_samples": "Số mẫu phản xạ",
"render.children.regrade": "Chỉnh lại màu",
"render.children.render": "Kết xuất",
"render.children.render_shot": "Kết xuất cảnh chụp",
"render.children.renderer": "Bộ kết xuất",
"render.children.renderers": "Các bộ kết xuất",
"render.children.request": "Yêu cầu này",
"render.children.reset_finishing": "Đặt lại hoàn thiện",
"render.children.review_quality": "Xem lại đặc tả chất lượng…",
"render.children.rgb_gain": "Độ lợi RGB",
"render.children.samples": "Số mẫu",
"render.children.sampling": "Lấy mẫu",
"render.children.seed": "Hạt giống",
"render.children.tone": "Tông màu",
"render.children.under_hood": "Bên trong",
"render.children.copy_request": "Sao chép JSON yêu cầu",
"render.children.copy_job": "Sao chép JSON công việc",
"render.children.copy_image": "Sao chép",
"render.children.looks": "Diện mạo sáng tạo",
"render.children.lens_effects": "Hiệu ứng ống kính",
"render.children.flare": "Chói",
"render.children.threshold": "Ngưỡng",
"render.children.halo": "Quầng",
"render.children.streak": "Vệt sáng",
"render.children.chromatic": "Sắc sai",
"render.children.distortion": "Méo",
"render.children.soft_focus": "Nét mềm",
"render.children.sharpening": "Làm nét",
"render.children.grain": "Hạt",
"render.children.contrast": "Tương phản",
"render.children.saturation": "Bão hòa",
"render.children.vignette": "Tối góc",
"render.children.bloom": "Bloom",
"render.children.strength": "Cường độ",
"render.children.radius": "Bán kính",
"render.children.memory": "Bộ nhớ",
"render.children.keep_master": "Giữ bản gốc tuyến tính thô",
"render.children.add_look_reason": "Thêm một diện mạo để chỉnh trạng thái bật và cường độ của nó.",
"render.children.compact": "Gọn",
"render.children.studio": "Studio",
"render.children.workstation": "Máy trạm",
"render.children.single_image": "Một ảnh",
"render.children.progressive_reason": "Chọn Lũy tiến để chỉnh số mẫu và hạt giống.",
"render.children.pilots": "Mẫu thử",
"render.children.minimum": "Tối thiểu",
"render.children.relative_error": "Sai số tương đối",
"render.children.absolute_floor": "Ngưỡng tuyệt đối",
"render.children.coverage_error": "Sai số độ phủ",
"render.children.ghosts": "Vòng bóng ma",
"render.children.edge_samples": "Mẫu cạnh",
"render.children.last_result": "Gần nhất: {number} · {width} × {height} · {phase}",
"render.children.scene_summary": "{bodies} thân · {triangles} tam giác"
}
}
@@ -0,0 +1,66 @@
{
"en": {
"cmd.render_preflight_copy": "Copy Render Check Report",
"render.output_check_failed": "Check · error",
"render.output_copy_report": "Copy report",
"render.output_grading": "Grading",
"render.output_run_check": "Run check",
"render.output_size_limit": "{method}: up to {dimension} px per side and {pixels} pixels. Largest fitting size: {width} × {height}."
},
"de": {
"cmd.render_preflight_copy": "Render-Prüfbericht kopieren",
"render.output_check_failed": "Prüfung · Fehler",
"render.output_copy_report": "Bericht kopieren",
"render.output_grading": "Farbkorrektur",
"render.output_run_check": "Prüfung starten",
"render.output_size_limit": "{method}: bis zu {dimension} px pro Seite und {pixels} Pixel. Größte passende Größe: {width} × {height}."
},
"ja": {
"cmd.render_preflight_copy": "レンダーチェックレポートをコピー",
"render.output_check_failed": "チェック · エラー",
"render.output_copy_report": "レポートをコピー",
"render.output_grading": "カラーグレーディング",
"render.output_run_check": "チェックを実行",
"render.output_size_limit": "{method}:各辺 {dimension} px、合計 {pixels} ピクセルまで。対応する最大サイズ:{width} × {height}。"
},
"ko": {
"cmd.render_preflight_copy": "렌더 검사 보고서 복사",
"render.output_check_failed": "검사 · 오류",
"render.output_copy_report": "보고서 복사",
"render.output_grading": "색 보정",
"render.output_run_check": "검사 실행",
"render.output_size_limit": "{method}: 한 변 최대 {dimension} px, 총 {pixels} 픽셀. 가능한 최대 크기: {width} × {height}."
},
"zh": {
"cmd.render_preflight_copy": "复制渲染检查报告",
"render.output_check_failed": "检查 · 错误",
"render.output_copy_report": "复制报告",
"render.output_grading": "调色",
"render.output_run_check": "运行检查",
"render.output_size_limit": "{method}:每边最多 {dimension} px,总计 {pixels} 像素。可用的最大尺寸:{width} × {height}。"
},
"ar": {
"cmd.render_preflight_copy": "نسخ تقرير فحص التصيير",
"render.output_check_failed": "الفحص · خطأ",
"render.output_copy_report": "نسخ التقرير",
"render.output_grading": "تدرّج الألوان",
"render.output_run_check": "تشغيل الفحص",
"render.output_size_limit": "{method}: حتى {dimension} بكسل لكل ضلع و{pixels} بكسل. أكبر حجم مناسب: {width} × {height}."
},
"he": {
"cmd.render_preflight_copy": "העתק דוח בדיקת רינדור",
"render.output_check_failed": "בדיקה · שגיאה",
"render.output_copy_report": "העתק דוח",
"render.output_grading": "גריידינג",
"render.output_run_check": "הפעל בדיקה",
"render.output_size_limit": "{method}: עד {dimension} פיקסלים לצלע ו-{pixels} פיקסלים. הגודל הגדול ביותר שמתאים: {width} × {height}."
},
"vi": {
"cmd.render_preflight_copy": "Sao chép báo cáo kiểm tra kết xuất",
"render.output_check_failed": "Kiểm tra · lỗi",
"render.output_copy_report": "Sao chép báo cáo",
"render.output_grading": "Chỉnh màu",
"render.output_run_check": "Chạy kiểm tra",
"render.output_size_limit": "{method}: tối đa {dimension} px mỗi cạnh và {pixels} điểm ảnh. Kích thước lớn nhất vừa khít: {width} × {height}."
}
}
+33
View File
@@ -1,5 +1,6 @@
//! Planned Render interactions, with explicit non-mutating refusals.
use super::CommandSpec;
use crate::schema::{TypedContract, output_schema_for, render_ui::CheckReport};
use crate::{Result, Session, params::bad};
use serde::Deserialize;
use serde_json::{Value, json};
@@ -17,7 +18,16 @@ macro_rules! waiting {
};
}
const CHECK_REPORT: TypedContract<CheckReport> = TypedContract::new();
pub static COMMANDS: &[CommandSpec] = &[
CommandSpec::new("render.preflight.copy", "Copy Render Check Report", crate::checked!("render.preflight.copy", copy_check))
.icon("copy")
.contract(&CHECK_REPORT)
.output(output_schema_for::<CheckReport>)
.noundo()
.doc_only()
.params("text: nonempty report, at most 65536 bytes. Validated clipboard request; headless echo only, never renders or edits a design."),
CommandSpec::new("render.output.size", "Set Render Output Size", output_size)
.icon("settings")
.noundo()
@@ -47,6 +57,14 @@ pub static COMMANDS: &[CommandSpec] = &[
waiting!("render.batch", "Render All Shots", "RENDER", "BATCH", "render_image", "the saved-shot render queue"),
];
fn copy_check(_: &mut Session, params: &Value) -> Result<Value> {
let report: CheckReport = serde_json::from_value(params.clone()).map_err(|e| bad("render.preflight.copy", e.to_string()))?;
if report.text.is_empty() || report.text.len() > 65536 {
return Err(bad("render.preflight.copy", "report must contain 1..65536 bytes"));
}
Ok(json!({"text":report.text}))
}
#[cfg(test)]
#[test]
fn render_workspace_planned_commands_refuse_without_mutation() {
@@ -142,3 +160,18 @@ fn output_viewer_requests_are_validated_headless_echoes() {
assert!(std::sync::Arc::ptr_eq(&document, &s.doc));
assert_eq!(before, (s.revision, s.undo.len(), s.evaluations));
}
#[cfg(test)]
#[test]
fn output_sections_copy_report_validates_without_design_history_or_job_changes() {
let mut s = Session::default();
let doc = s.doc.clone();
let before = (s.revision, s.undo.len(), s.redo.len(), s.evaluations, s.is_dirty());
let report = json!({"text":"Check\n✓ Size is within the renderer limit"});
assert_eq!(s.execute("render.preflight.copy", &report).unwrap(), report);
for request in [json!({}), json!({"text":""}), json!({"text":true}), json!({"text":"check","job":1}), json!({"text":"x".repeat(65537)})] {
assert!(s.execute("render.preflight.copy", &request).is_err());
}
assert!(std::sync::Arc::ptr_eq(&doc, &s.doc));
assert_eq!(before, (s.revision, s.undo.len(), s.redo.len(), s.evaluations, s.is_dirty()));
}
+12 -8
View File
@@ -4,7 +4,7 @@ use solidcraft_render::{Camera, StandardView};
use super::CommandSpec;
use crate::params::{bad, num, req_vec2, req_vec3, vec3};
use crate::schema::view_navigation::{RenderBrowser, RenderFocus, TabStep, TabStepParams};
use crate::schema::view_navigation::{RenderBrowser, RenderFocus, RenderSelect, TabStep, TabStepParams};
use crate::schema::{TypedContract, output_schema_for};
use crate::{Result, Sel, Session};
@@ -31,6 +31,8 @@ struct RenderBrowserControls {
query: Option<String>,
}
const RENDER_SELECT: TypedContract<RenderSelect> = TypedContract::new();
pub static COMMANDS: &[CommandSpec] = &[
CommandSpec::new("view.fit", "Fit", fit)
.icon("fit").key("F6").noundo().doc_only().params("no parameters → frame the active canvas or selection; display only"),
@@ -60,10 +62,9 @@ CommandSpec::new("view.render_inspector", "Render Inspector", render_inspector)
.icon("inspect").noundo().doc_only()
.params("visible: bool → {visible}; per-document Inspector visibility; never edits the design or opens a dialog"),
CommandSpec::new("view.render_select", "Render selection", crate::checked!("view.render_select", render_select))
.contract(&RENDER_SELECT_CONTRACT)
.output(crate::schema::output_schema_for::<crate::schema::view_navigation::RenderSelect>)
.contract(&RENDER_SELECT).output(output_schema_for::<RenderSelect>)
.icon("select").noundo().doc_only()
.params("kind: nothing|environment|light|shot|output|wear; id?: bounded nonempty string for light/shot → validated transient Browser focus; never edits the design or opens a dialog"),
.params("kind: nothing|environment|light|shot|output|wear|sampling|effects|check; id?: bounded nonempty string for light/shot → validated transient Browser focus; never edits the design or opens a dialog"),
CommandSpec::new("view.render_stage", "Render Stage", render_stage)
.icon("render_scene").noundo().doc_only()
.params("stage: look|light|frame|output → {stage}; per-document UI state, never edits or evaluates the design; headless validation only"),
@@ -269,11 +270,8 @@ fn render_focus(_s: &mut Session, p: &Value) -> Result<Value> {
Ok(json!(request))
}
const RENDER_SELECT_CONTRACT: crate::schema::TypedContract<crate::schema::view_navigation::RenderSelect> = crate::schema::TypedContract::new();
fn render_select(s: &mut Session, p: &Value) -> Result<Value> {
let request: crate::schema::view_navigation::RenderSelect =
serde_json::from_value(p.clone()).map_err(|e| bad("view.render_select", e.to_string()))?;
let request: RenderSelect = serde_json::from_value(p.clone()).map_err(|e| bad("view.render_select", e.to_string()))?;
let result = serde_json::to_value(request).map_err(|e| bad("view.render_select", e.to_string()))?;
if !s.selection.is_empty() {
s.selection.clear();
@@ -1143,6 +1141,9 @@ fn render_browser_focus_validates_without_document_changes_or_evaluation() {
json!({"kind":"light","id":"sun:0"}),
json!({"kind":"shot","id":"Hero"}),
json!({"kind":"output"}),
json!({"kind":"sampling"}),
json!({"kind":"effects"}),
json!({"kind":"check"}),
] {
assert_eq!(session.execute("view.render_select", &request).unwrap(), request);
}
@@ -1159,6 +1160,9 @@ fn render_browser_focus_validates_without_document_changes_or_evaluation() {
json!({"kind":"light","id":" "}),
json!({"kind":"shot","id":"x".repeat(1025)}),
json!({"kind":"output","id":"extra"}),
json!({"kind":"sampling","id":"extra"}),
json!({"kind":"effects","id":"extra"}),
json!({"kind":"check","id":"extra"}),
json!({"kind":"environment","extra":true}),
] {
assert!(session.execute("view.render_select", &request).is_err(), "{request}");
+1
View File
@@ -59,6 +59,7 @@ pub mod edit;
pub mod features;
pub mod inspect;
pub mod render;
pub mod render_ui;
pub mod sheet;
pub mod sketch_constraints;
pub mod sketch_create;
+11
View File
@@ -0,0 +1,11 @@
//! Clipboard requests for the Render workspace; headless calls only echo validated text.
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
#[derive(Debug, Deserialize, Serialize, JsonSchema)]
#[serde(deny_unknown_fields)]
pub struct CheckReport {
/// Report text, bounded to 65536 UTF-8 bytes by the command handler.
#[schemars(length(min = 1, max = 65536))]
pub text: String,
}
+2 -2
View File
@@ -104,7 +104,7 @@ impl<'de> Deserialize<'de> for RenderSelect {
}
let request = Request::deserialize(d)?;
let identified = matches!(request.kind.as_str(), "light" | "shot");
if !matches!(request.kind.as_str(), "nothing" | "environment" | "light" | "shot" | "output" | "wear")
if !matches!(request.kind.as_str(), "nothing" | "environment" | "light" | "shot" | "output" | "wear" | "sampling" | "effects" | "check")
|| identified != request.id.is_some()
|| request.id.as_ref().is_some_and(|id| id.trim().is_empty() || id.len() > 1024)
{
@@ -124,7 +124,7 @@ impl JsonSchema for RenderSelect {
{
"type": "object",
"properties": {
"kind": {"type": "string", "enum": ["nothing", "environment", "output", "wear"]},
"kind": {"type": "string", "enum": ["nothing", "environment", "output", "wear", "sampling", "effects", "check"]},
"id": {"type": "null"}
},
"required": ["kind"],
+3
View File
@@ -1118,6 +1118,9 @@ impl SolveApp {
Some("environment") => RenderSelection::Environment,
Some("wear") => RenderSelection::Wear,
Some("output") => RenderSelection::Output,
Some("sampling") => RenderSelection::Sampling,
Some("effects") => RenderSelection::Effects,
Some("check") => RenderSelection::Check,
Some("light") => RenderSelection::Light(v.get("id").and_then(Value::as_str).unwrap_or_default().into()),
Some("shot") => RenderSelection::Shot(v.get("id").and_then(Value::as_str).unwrap_or_default().into()),
_ => RenderSelection::Nothing,
+25
View File
@@ -320,6 +320,31 @@ pub(crate) fn output(app: &mut SolveApp, ui: &mut egui::Ui) {
if row.clicked {
select(app, "output", None);
}
for (kind, key, selection) in [
("sampling", "render.children.sampling", RenderSelection::Sampling),
("effects", "render.output_effects", RenderSelection::Effects),
("check", "render.children.check", RenderSelection::Check),
] {
let subtitle = crate::render_workspace::output_child_summary(app, kind);
let row = browser::draw_row(
ui,
ui.id().with(("render_output_child", kind)),
&Row {
depth: 1,
label: app.tr(key),
name: true,
subtitle: &subtitle,
selected: app.render_workspace.view.selection == selection,
..Default::default()
},
);
if let Some(rect) = row.rect {
crate::scenario::publish_target(&format!("render:tree:output:{kind}"), rect);
}
if row.clicked {
select(app, kind, None);
}
}
}
#[derive(Debug)]
+54 -9
View File
@@ -94,6 +94,7 @@ pub struct State {
image_info: Option<solidcraft_engine::render::job::FrameInfo>,
preview_image: Option<PreviewImage>,
clipboard_image: Option<egui::ColorImage>,
clipboard_text: Option<String>,
}
/// Provisional pixels are never an export source and never replace the retained final image.
@@ -271,6 +272,9 @@ pub enum RenderSelection {
Light(String),
Shot(String),
Output,
Sampling,
Effects,
Check,
}
/// Small per-document editor state; GPU uploads and host capabilities stay outside tabs.
@@ -398,6 +402,7 @@ impl Default for State {
image_info: None,
preview_image: None,
clipboard_image: None,
clipboard_text: None,
}
}
}
@@ -512,6 +517,9 @@ pub fn sync_backend(app: &mut SolveApp) {
/// Cooperative work belongs to the frame loop, never to a status/control request. Keep
/// scheduling frames even after leaving Render so a browser job can finish in Design.
pub fn tick(app: &mut SolveApp, ctx: &egui::Context) {
if let Some(text) = app.render_workspace.clipboard_text.take() {
ctx.copy_text(text);
}
if let Some(image) = app.render_workspace.clipboard_image.take() {
ctx.copy_image(image);
}
@@ -646,6 +654,30 @@ pub(crate) fn output_summary(app: &SolveApp) -> (String, &'static str) {
(format!("{} × {}", view.draft.width, view.draft.height), if view.studio.export_exr { "EXR" } else { "PNG" })
}
pub(crate) fn output_child_summary(app: &SolveApp, kind: &str) -> String {
let view = &app.render_workspace.view;
match kind {
"sampling" => format!(
"{} · {} spp",
app.tr("render.quality_custom"),
if view.method == ImageMethod::GpuRaytrace {
view.samples
} else {
view.raytrace.progressive.map_or(u32::from(view.raytrace.primary_samples), |p| p.samples_per_pixel)
}
),
"effects" => crate::i18n::format(
"render.children.look_summary",
&[
("tone", if view.studio.tone_map == solidcraft_engine::render::job::ToneMap::AcesFitted { "ACES" } else { "Reinhard" }),
("count", &view.studio.finishing.looks.len().to_string()),
],
),
"check" => inspector::check_summary(app),
_ => String::new(),
}
}
pub(crate) fn job_busy(app: &SolveApp) -> bool {
ribbon::busy(app)
}
@@ -784,8 +816,20 @@ fn select_image_method(app: &mut SolveApp, method: ImageMethod) {
app.render_workspace.view.dirty = true;
}
#[cfg(test)]
fn method_selector(app: &mut SolveApp, ui: &mut egui::Ui) {
ui.label(app.tr("render.image_method"));
method_dropdown(app, ui);
if image_host(app, app.render_workspace.view.method).is_err() {
crate::ui_kit::text(ui, app.tr("render.setup_offline_help"), crate::ui_kit::Text::Note("render.setup_offline_help"));
}
if app.render_workspace.view.method != ImageMethod::Raster {
crate::ui_kit::text(ui, app.tr("render.preview_image_settings_help"), crate::ui_kit::Text::Note("render.preview_image_settings_help"));
}
}
/// The same method authority in an aligned editor row or the legacy master form.
fn method_dropdown(app: &mut SolveApp, ui: &mut egui::Ui) -> egui::Response {
let current = app.render_workspace.view.method;
let label = app.tr(current.label()).to_string();
let response = crate::ui_kit::dropdown_menu(ui, "render_image_method", &label, |ui| {
@@ -808,18 +852,16 @@ fn method_selector(app: &mut SolveApp, ui: &mut egui::Ui) {
}
});
crate::scenario::publish_handle("render:method", response.rect.center());
if image_host(app, app.render_workspace.view.method).is_err() {
crate::ui_kit::text(ui, app.tr("render.setup_offline_help"), crate::ui_kit::Text::Note("render.setup_offline_help"));
}
if app.render_workspace.view.method != ImageMethod::Raster {
crate::ui_kit::text(ui, app.tr("render.preview_image_settings_help"), crate::ui_kit::Text::Note("render.preview_image_settings_help"));
}
response
}
fn cpu_sampling_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let progressive = cpu::progressive_controls(app, ui);
if !progressive {
ui.label(app.tr("render.cpu_primary_samples"));
if progressive {
crate::ui_kit::text(ui, app.tr("render.cpu_progressive_help"), crate::ui_kit::Text::Note("render.cpu_progressive_help"));
}
ui.add_enabled_ui(!progressive, |ui| {
crate::ui_kit::text(ui, app.tr("render.children.edge_samples"), crate::ui_kit::Text::Inline);
let samples = app.render_workspace.view.raytrace.primary_samples;
let aa = crate::ui_kit::dropdown_menu(ui, "render_cpu_samples", &format!("{samples}×"), |ui| {
for count in [1, 4, 16] {
@@ -834,7 +876,7 @@ fn cpu_sampling_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
});
crate::scenario::publish_handle("render:aa", aa.rect.center());
ui.small(app.tr("render.cpu_aa_help"));
}
});
}
fn cpu_lighting_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
@@ -1945,6 +1987,9 @@ pub fn show(app: &mut SolveApp, ui: &mut egui::Ui) {
/// Apply validated UI requests after the same registry call used by automation.
pub(crate) fn apply_command(app: &mut SolveApp, id: &str, reply: &serde_json::Value) -> Result<(), String> {
match id {
"render.preflight.copy" => {
app.render_workspace.clipboard_text = Some(reply["text"].as_str().ok_or("invalid check report")?.to_string());
}
"render.output.size" => {
let width = reply["width"].as_u64().and_then(|v| u32::try_from(v).ok()).ok_or("invalid output width")?;
let height = reply["height"].as_u64().and_then(|v| u32::try_from(v).ok()).ok_or("invalid output height")?;
+72 -63
View File
@@ -32,42 +32,50 @@ pub(super) fn image_limits(app: &SolveApp) -> solidcraft_engine::render::RenderL
fn budget_key(budget: CpuBudget) -> &'static str {
match budget {
CpuBudget::Compact => "render.cpu_budget_compact",
CpuBudget::Studio => "render.cpu_budget_studio",
CpuBudget::Workstation => "render.cpu_budget_workstation",
CpuBudget::Compact => "render.children.compact",
CpuBudget::Studio => "render.children.studio",
CpuBudget::Workstation => "render.children.workstation",
}
}
fn budget_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
ui.label(app.tr("render.cpu_budget"));
let selected = app.render_workspace.view.raytrace.budget;
let label = app.tr(budget_key(selected)).to_string();
let control = ui_kit::dropdown_menu(ui, "render_cpu_budget", &label, |ui| {
for budget in CpuBudget::ALL {
let key = budget_key(budget);
let response = ui_kit::list_picker(ui, key, app.tr(key), budget == selected);
crate::scenario::publish_handle(key, response.rect.center());
if response.clicked() {
// Preserve incompatible dimensions/samples for explicit correction.
app.render_workspace.view.raytrace.budget = budget;
app.render_workspace.view.dirty = true;
ui.close();
}
}
});
crate::scenario::publish_target("render:cpu-budget", control.rect);
ui.small(app.tr("render.cpu_budget_help"));
let title = app.tr("render.cpu_budget_details").to_string();
ui_kit::section(ui, "render_cpu_budget_details", &title, false, |ui| {
let limits = app.render_workspace.view.raytrace.budget.limits();
ui.label(format!("{}: {:.2} GiB", app.tr("render.cpu_budget_memory"), limits.max_job_bytes as f64 / 1_073_741_824.0));
ui.label(format!("{}: {}", app.tr("render.cpu_budget_triangles"), limits.max_triangles));
ui.label(format!("{}: {}", app.tr("render.cpu_budget_bodies"), limits.max_bodies));
ui.label(format!("{}: {}", app.tr("render.cpu_progressive_spp"), limits.max_samples_per_pixel));
ui.small(app.tr("render.cpu_budget_not_guarantee"));
let budgets = CpuBudget::ALL;
let mut selected = budgets.iter().position(|b| *b == app.render_workspace.view.raytrace.budget).unwrap_or(0);
let labels = budgets.map(|b| app.tr(budget_key(b)).to_string());
let response = ui.scope(|ui| {
ui_kit::segmented(
ui,
&mut selected,
&labels.iter().map(String::as_str).collect::<Vec<_>>(),
ui_kit::Segments {
compact: true,
targets: &["render.cpu_budget_compact", "render.cpu_budget_studio", "render.cpu_budget_workstation"],
..Default::default()
},
)
});
crate::scenario::publish_rect("render:cpu-budget", response.response.rect);
if response.inner
&& let Some(budget) = budgets.get(selected)
{
app.render_workspace.view.raytrace.budget = *budget;
app.render_workspace.view.dirty = true;
}
let limits = app.render_workspace.view.raytrace.budget.limits();
let note = format!(
"{}: {:.2} GiB · {}: {} · {}: {} · {}: {}. {}",
app.tr("render.cpu_budget_memory"),
limits.max_job_bytes as f64 / 1_073_741_824.0,
app.tr("render.cpu_budget_triangles"),
limits.max_triangles,
app.tr("render.cpu_budget_bodies"),
limits.max_bodies,
app.tr("render.cpu_progressive_spp"),
limits.max_samples_per_pixel,
app.tr("render.cpu_budget_not_guarantee")
);
ui_kit::text(ui, &note, ui_kit::Text::Note("render.cpu_budget_help"));
}
fn set_progressive(app: &mut SolveApp, enabled: bool) {
let options = &mut app.render_workspace.view.raytrace;
if enabled {
@@ -81,42 +89,43 @@ fn set_progressive(app: &mut SolveApp, enabled: bool) {
pub(super) fn progressive_controls(app: &mut SolveApp, ui: &mut egui::Ui) -> bool {
budget_controls(app, ui);
ui.label(app.tr("render.cpu_sampling_mode"));
let selected = app.render_workspace.view.raytrace.progressive.is_some();
let label = app.tr(if selected { "render.cpu_progressive" } else { "render.cpu_fixed" }).to_string();
let response = ui_kit::dropdown_menu(ui, "render_cpu_sampling", &label, |ui| {
for (enabled, key, handle) in [(false, "render.cpu_fixed", "render:cpu-fixed"), (true, "render.cpu_progressive", "render:cpu-progressive")] {
let response = ui_kit::list_picker(ui, handle, app.tr(key), selected == enabled);
crate::scenario::publish_handle(handle, response.rect.center());
if response.clicked() {
set_progressive(app, enabled);
ui.close();
}
}
let mut selected = usize::from(app.render_workspace.view.raytrace.progressive.is_some());
let labels = [app.tr("render.children.single_image").to_string(), app.tr("render.cpu_progressive").to_string()];
let response = ui.scope(|ui| {
ui_kit::row(ui, app.tr("render.children.sampling"), |ui| {
ui_kit::segmented(
ui,
&mut selected,
&labels.iter().map(String::as_str).collect::<Vec<_>>(),
ui_kit::Segments { compact: true, targets: &["render:cpu-fixed", "render:cpu-progressive"], ..Default::default() },
)
})
});
crate::scenario::publish_handle("render:cpu-sampling", response.rect.center());
let spp = app.tr("render.cpu_progressive_spp").to_string();
let seed = app.tr("render.cpu_progressive_seed").to_string();
if let Some(options) = &mut app.render_workspace.view.raytrace.progressive {
ui.label(spp);
let response = ui_kit::number_field(ui, &mut options.samples_per_pixel, 1..=4096, 1.0, "");
app.render_workspace.view.dirty |= response.changed();
crate::scenario::publish_handle("render:cpu-spp", response.rect.center());
ui.label(seed);
let response = ui_kit::number_field(ui, &mut options.seed, 0..=u32::MAX, 1.0, "");
app.render_workspace.view.dirty |= response.changed();
crate::scenario::publish_handle("render:cpu-seed", response.rect.center());
ui.small(app.tr("render.cpu_progressive_help"));
if app.render_workspace.view.raytrace.budget == CpuBudget::Compact {
ui.small(app.tr("render.cpu_progressive_limits"));
} else {
ui.small(app.tr("render.cpu_budget_not_guarantee"));
}
return true;
crate::scenario::publish_target("render:cpu-sampling", response.response.rect);
if response.inner {
set_progressive(app, selected == 1);
}
false
let enabled = app.render_workspace.view.raytrace.progressive.is_some();
let mut options = app.render_workspace.view.raytrace.progressive.unwrap_or_default();
if !enabled {
ui_kit::text(ui, app.tr("render.children.progressive_reason"), ui_kit::Text::Note("render.children.progressive_reason"));
}
ui.add_enabled_ui(enabled, |ui| {
let response =
ui_kit::row(ui, app.tr("render.cpu_progressive_spp"), |ui| ui_kit::number_field(ui, &mut options.samples_per_pixel, 1..=4096, 1.0, ""));
app.render_workspace.view.dirty |= response.changed();
crate::scenario::publish_target("render:cpu-spp", response.rect);
let response =
ui_kit::row(ui, app.tr("render.cpu_progressive_seed"), |ui| ui_kit::number_field(ui, &mut options.seed, 0..=u32::MAX, 1.0, ""));
app.render_workspace.view.dirty |= response.changed();
crate::scenario::publish_target("render:cpu-seed", response.rect);
});
if enabled {
app.render_workspace.view.raytrace.progressive = Some(options);
}
ui_kit::text(ui, app.tr("render.cpu_progressive_help"), ui_kit::Text::Note("render.cpu_progressive_help"));
enabled
}
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
pub(super) enum Environment {
#[default]
+146 -31
View File
@@ -1,6 +1,6 @@
//! Shared-kit layered weathering and photographic presentation editors.
//! Numerical edits remain one render draft until the ordinary Save action.
use super::{ImageMethod, materials, studio};
//! Output presentation edits patch the saved job; legacy master controls retain their draft.
use super::{ImageMethod, materials, setups, studio};
use crate::{SolveApp, ui_kit};
use solidcraft_engine::render::job::looks::{LookKind, LookLayer};
@@ -18,18 +18,41 @@ pub(super) fn number(app: &SolveApp, ui: &mut egui::Ui, key: &str, value: &mut f
let response = ui_kit::row(ui, app.tr(key), |ui| ui_kit::number_field(ui, value, range, speed, suffix));
crate::scenario::publish_target(key, response.rect);
}
fn slider(app: &SolveApp, ui: &mut egui::Ui, key: &str, value: &mut f64, range: std::ops::RangeInclusive<f64>, speed: f64, suffix: &str) {
let label = match key {
"render.flare_strength" => "render.children.flare",
"render.flare_threshold" | "render.bloom_threshold" => "render.children.threshold",
"render.flare_halo" => "render.children.halo",
"render.flare_streak" => "render.children.streak",
"render.chromatic_offset" => "render.children.chromatic",
"render.radial_distortion" => "render.children.distortion",
"render.soft_focus" => "render.children.soft_focus",
"render.sharpening" => "render.children.sharpening",
"render.film_grain" => "render.children.grain",
"render.post_contrast" => "render.children.contrast",
"render.post_saturation" => "render.children.saturation",
"render.post_vignette" => "render.children.vignette",
"render.bloom_strength" => "render.children.strength",
_ => key,
};
let mut edited = if value.is_finite() { value.clamp(*range.start(), *range.end()) } else { *range.start() };
let response = ui_kit::row(ui, app.tr(label), |ui| {
if key == "render.chromatic_offset" {
ui_kit::number_field(ui, &mut edited, range, speed, suffix)
} else {
ui_kit::slider(ui, &mut edited, range, Default::default())
}
});
if response.changed() {
*value = edited;
}
crate::scenario::publish_target(key, response.rect);
}
pub(super) fn failure(app: &mut SolveApp, result: Result<(), String>) {
if let Err(error) = result {
app.set_status(error, true);
}
}
fn gpu(app: &SolveApp, ui: &mut egui::Ui) -> bool {
if app.render_workspace.view.method != ImageMethod::GpuRaytrace {
note(app, ui, "render.effects_gpu_only");
return false;
}
true
}
pub(super) fn layer_actions(app: &SolveApp, ui: &mut egui::Ui, prefix: &str, selected: usize, length: usize) -> (i32, bool) {
let mut movement = 0;
let mut remove = false;
@@ -64,15 +87,37 @@ pub(super) fn aging_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
}
pub(super) fn presentation_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
if !gpu(app, ui) {
return;
}
studio::tone_controls(app, ui);
note(app, ui, "render.effects_help");
ui_kit::banner(ui, ui_kit::AssistantTone::Neutral, |ui| note(app, ui, "render.children.effects_banner"));
let enabled = app.render_workspace.view.method == ImageMethod::GpuRaytrace;
ui.add_enabled_ui(enabled, |ui| presentation_editor(app, ui));
}
fn presentation_editor(app: &mut SolveApp, ui: &mut egui::Ui) {
let presentation_before = super::ribbon::presentation(app);
let title = app.tr("render.children.tone").to_string();
ui_kit::section(ui, "render_effects_tone", &title, true, |ui| {
let mut selected = usize::from(app.render_workspace.view.studio.tone_map == solidcraft_engine::render::job::ToneMap::AcesFitted);
let response = ui.scope(|ui| {
ui_kit::row(ui, app.tr("render.studio_tone_map"), |ui| {
if ui_kit::segmented(
ui,
&mut selected,
&["Reinhard", "ACES fitted"],
ui_kit::Segments { compact: true, targets: &["render:tone:reinhard", "render:tone:aces"], ..Default::default() },
) {
app.render_workspace.view.studio.tone_map = if selected == 0 {
solidcraft_engine::render::job::ToneMap::Reinhard
} else {
solidcraft_engine::render::job::ToneMap::AcesFitted
};
}
});
});
crate::scenario::publish_target("render:tone-map", response.response.rect);
});
let mut editor = std::mem::take(&mut app.render_workspace.view.inspector.effects);
let before = app.render_workspace.view.studio.finishing;
let mut finish = before;
let title = app.tr("render.look_title").to_string();
let title = app.tr("render.children.looks").to_string();
ui_kit::section(ui, "render_creative_looks", &title, true, |ui| {
let add = ui_kit::dropdown_menu(ui, "render_look_add", app.tr("render.look_add"), |ui| {
for (index, kind) in LookKind::ALL.into_iter().enumerate() {
@@ -87,6 +132,17 @@ pub(super) fn presentation_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
});
crate::scenario::publish_target("render:look-add", add.rect);
editor.selected_look = editor.selected_look.min(finish.looks.len().saturating_sub(1));
let (movement, remove) = layer_actions(app, ui, "look", editor.selected_look, finish.looks.len());
if !finish.looks.is_empty() {
if remove {
failure(app, finish.looks.remove(editor.selected_look).map_err(|e| e.to_string()));
editor.selected_look = editor.selected_look.min(finish.looks.len().saturating_sub(1));
} else if movement != 0 {
let next = if movement < 0 { editor.selected_look.saturating_sub(1) } else { editor.selected_look + 1 };
failure(app, finish.looks.move_layer(editor.selected_look, next).map_err(|e| e.to_string()));
editor.selected_look = next;
}
}
for index in 0..finish.looks.len() {
if let Some(layer) = finish.looks.get(index) {
let label = format!("{} · {}", index + 1, app.tr(layer.kind.key()));
@@ -97,24 +153,22 @@ pub(super) fn presentation_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
}
}
}
if !finish.looks.is_empty() {
let (movement, remove) = layer_actions(app, ui, "look", editor.selected_look, finish.looks.len());
if remove {
failure(app, finish.looks.remove(editor.selected_look).map_err(|e| e.to_string()));
editor.selected_look = editor.selected_look.min(finish.looks.len().saturating_sub(1));
} else if movement != 0 {
let next = if movement < 0 { editor.selected_look.saturating_sub(1) } else { editor.selected_look + 1 };
failure(app, finish.looks.move_layer(editor.selected_look, next).map_err(|e| e.to_string()));
editor.selected_look = next;
}
if finish.looks.is_empty() {
note(app, ui, "render.children.add_look_reason");
ui.add_enabled_ui(false, |ui| {
let mut enabled = true;
let mut strength = 1.0;
ui_kit::checkbox(ui, app.tr("render.layer_enabled"), &mut enabled);
slider(app, ui, "render.look_strength", &mut strength, 0.0..=1.0, 0.01, "");
});
}
if let Some(layer) = finish.looks.get_mut(editor.selected_look) {
let response = ui_kit::checkbox(ui, app.tr("render.layer_enabled"), &mut layer.enabled);
crate::scenario::publish_target("render:look-enabled", response.rect);
number(app, ui, "render.look_strength", &mut layer.strength, 0.0..=1.0, 0.01, "");
slider(app, ui, "render.look_strength", &mut layer.strength, 0.0..=1.0, 0.01, "");
}
});
let title = app.tr("render.lens_effects_title").to_string();
let title = app.tr("render.children.lens_effects").to_string();
ui_kit::section(ui, "render_photographic_effects", &title, true, |ui| {
let photo = &mut finish.photographic;
for key in [
@@ -139,10 +193,13 @@ pub(super) fn presentation_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
"render.sharpening" => (&mut photo.sharpening, 0.0..=1.0, 0.01, ""),
_ => (&mut photo.grain, 0.0..=0.15, 0.001, ""),
};
number(app, ui, key, field, range, speed, suffix);
slider(app, ui, key, field, range, speed, suffix);
if key == "render.flare_streak" {
let response =
ui_kit::row(ui, app.tr("render.children.ghosts"), |ui| ui_kit::number_field(ui, &mut photo.flare.ghosts, 0..=4, 1.0, ""));
crate::scenario::publish_target("render:flare-ghosts", response.rect);
}
}
let response = ui_kit::row(ui, app.tr("render.flare_ghosts"), |ui| ui_kit::number_field(ui, &mut photo.flare.ghosts, 0..=4, 1.0, ""));
crate::scenario::publish_target("render:flare-ghosts", response.rect);
let response = ui_kit::row(ui, app.tr("render.effects_seed"), |ui| ui_kit::number_field(ui, &mut photo.seed, 0..=u32::MAX, 1.0, ""));
crate::scenario::publish_target("render:photo-seed", response.rect);
note(app, ui, "render.lens_effects_help");
@@ -150,10 +207,68 @@ pub(super) fn presentation_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
*photo = Default::default();
}
});
let title = app.tr("render.children.finishing").to_string();
ui_kit::section(ui, "render_effects_finishing", &title, true, |ui| {
studio::vector(ui, app.tr("render.children.rgb_gain"), &mut finish.rgb_gain, 0.1..=8.0, 0.01);
slider(app, ui, "render.post_contrast", &mut finish.contrast, 0.25..=4.0, 0.01, "");
slider(app, ui, "render.post_saturation", &mut finish.saturation, 0.0..=2.0, 0.01, "");
slider(app, ui, "render.post_vignette", &mut finish.vignette, 0.0..=1.0, 0.01, "");
let mut bloom = finish.bloom.unwrap_or(solidcraft_engine::render::job::bloom::Bloom { strength: 0.15, ..Default::default() });
let mut enabled = finish.bloom.is_some();
let response = ui_kit::checkbox(ui, app.tr("render.children.bloom"), &mut enabled);
crate::scenario::publish_target("render:bloom-enable", response.rect);
if !enabled {
note(app, ui, "render.children.enable_bloom");
}
ui.add_enabled_ui(enabled, |ui| {
slider(app, ui, "render.bloom_strength", &mut bloom.strength, 0.0..=2.0, 0.01, "");
slider(app, ui, "render.bloom_threshold", &mut bloom.threshold, 0.0..=1e6, 0.05, "");
let response = ui_kit::row(ui, app.tr("render.children.radius"), |ui| ui_kit::number_field(ui, &mut bloom.radius, 1..=64, 1.0, " px"));
crate::scenario::publish_target("render.bloom_radius", response.rect);
});
finish.bloom = enabled.then_some(bloom);
if app.render_workspace.view.transparent && enabled {
note(app, ui, "render.bloom_opaque");
}
let response = ui_kit::button(ui, app.tr("render.children.reset_finishing"), ui_kit::Button::Normal);
crate::scenario::publish_target("render:post-reset", response.rect);
if response.clicked() {
finish.rgb_gain = [1.0; 3];
finish.contrast = 1.0;
finish.saturation = 1.0;
finish.vignette = 0.0;
finish.bloom = None;
}
});
if before != finish {
app.render_workspace.view.studio.finishing = finish;
app.render_workspace.view.dirty = true;
}
app.render_workspace.view.inspector.effects = editor;
studio::post_controls(app, ui);
let title = app.tr("render.children.regrade").to_string();
ui_kit::section(ui, "render_effects_regrade", &title, true, |ui| studio::regrade_action(app, ui));
app.render_workspace.view.dirty |= presentation_before != super::ribbon::presentation(app);
}
/// Output edits save one numerical job patch; merely revealing Effects is read-only.
/// Both the legacy page and the Browser child use this command-backed editor.
pub(super) fn output_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let before = app.render_workspace.view.studio.clone();
let dirty = app.render_workspace.view.dirty;
presentation_controls(app, ui);
let after = &app.render_workspace.view.studio;
if (before.finishing, before.tone_map, before.denoise, before.linear_exr) == (after.finishing, after.tone_map, after.denoise, after.linear_exr) {
return;
}
let result = setups::snapshot(app).and_then(|setup| {
let name = app.render_workspace.view.name.clone();
app.run("render.settings.set", serde_json::json!({"name":name,"set":{"job":setup.job}})).map(|_| ())
});
if let Err(error) = result {
app.render_workspace.view.studio = before;
app.render_workspace.view.dirty = dirty;
app.set_status(error, true);
} else {
app.render_workspace.view.dirty = true;
}
}
+513 -168
View File
@@ -20,13 +20,14 @@ pub(super) enum Page {
Background,
Camera,
Output,
Sampling,
Diagnostics,
#[cfg(test)]
All,
}
impl Page {
#[cfg(test)]
const ALL: [Self; 10] = [
const ALL: [Self; 11] = [
Self::Scene,
Self::Appearance,
Self::Lighting,
@@ -35,6 +36,7 @@ impl Page {
Self::Camera,
Self::Effects,
Self::Output,
Self::Sampling,
Self::Diagnostics,
Self::All,
];
@@ -48,6 +50,7 @@ impl Page {
Self::Background => "render.page_background",
Self::Camera => "render.page_camera",
Self::Output => "render.page_output",
Self::Sampling => "render.children.sampling",
Self::Diagnostics => "render.page_diagnostics",
#[cfg(test)]
Self::All => "render.page_all",
@@ -63,6 +66,7 @@ impl Page {
Self::Background => "background",
Self::Camera => "camera",
Self::Output => "output",
Self::Sampling => "sampling",
Self::Diagnostics => "diagnostics",
#[cfg(test)]
Self::All => "all",
@@ -78,6 +82,7 @@ impl Page {
Self::Background => "render_scene",
Self::Camera => "camera",
Self::Output => "export",
Self::Sampling => "settings",
Self::Diagnostics => "inspect",
#[cfg(test)]
Self::All => "list",
@@ -216,9 +221,8 @@ pub(super) fn panel(app: &mut SolveApp, ui: &mut egui::Ui) {
let mut side = app.preferences.render_inspector_side.clone();
let mut width = app.preferences.render_inspector_width;
let wear = app.render_workspace.view.selection == super::RenderSelection::Wear;
let output =
!wear && (app.render_workspace.view.inspector.page == Page::Output || app.render_workspace.view.selection == super::RenderSelection::Output);
let page = if output { Page::Output } else { app.render_workspace.view.inspector.page };
let page = selected_page(app);
let output = !wear && matches!(page, Page::Output | Page::Sampling | Page::Effects | Page::Diagnostics);
let appearance_editor = !wear && page == Page::Appearance;
let selection_appearance = appearance_editor && !app.session.selection.is_empty();
let title = if wear {
@@ -234,7 +238,14 @@ pub(super) fn panel(app: &mut SolveApp, ui: &mut egui::Ui) {
})
.unwrap_or_else(|| app.tr("render.inspector").to_owned())
} else {
app.tr(if output { "render.page_output" } else { "render.studio_title" }).to_string()
app.tr(if page == Page::Diagnostics {
"render.children.check"
} else if output {
page.key()
} else {
"render.studio_title"
})
.to_string()
};
let icon = if wear {
"appearance"
@@ -301,12 +312,13 @@ pub(super) fn panel(app: &mut SolveApp, ui: &mut egui::Ui) {
match page {
Page::Scene => scene_controls(app, ui),
Page::Appearance => appearance_controls(app, ui),
Page::Effects => super::effects::presentation_controls(app, ui),
Page::Effects => super::effects::output_controls(app, ui),
Page::Lighting => lighting_controls(app, ui),
Page::Environment | Page::Background => super::environment::editor(app, ui),
Page::Camera => camera_controls(app, ui),
Page::Output => output_editor(app, ui),
Page::Diagnostics => diagnostics(app, ui),
Page::Sampling => sampling_editor(app, ui),
Page::Diagnostics => check_editor(app, ui),
#[cfg(test)]
Page::All => {
ui_kit::text(ui, app.tr("render.all_controls_help"), ui_kit::Text::Note("render.all_controls_help"));
@@ -483,6 +495,9 @@ fn browse_button(app: &mut SolveApp, ui: &mut egui::Ui, kind: &str, key: &str) {
}
fn scene_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
ui_kit::text(ui, app.tr("render.scene_preserves_design"), ui_kit::Text::Note("render.scene_preserves_design"));
let label = app.tr("render.children.method").to_string();
ui_kit::row(ui, &label, |ui| super::method_dropdown(app, ui));
gpu_status(app, ui);
browse_button(app, ui, "native_scenes", "render.browse_native_scenes");
browse_button(app, ui, "scenes", "render.browse_scene_specs");
physical_stage_controls(app, ui);
@@ -670,6 +685,16 @@ fn camera_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
if app.render_workspace.view.method == ImageMethod::GpuRaytrace {
studio::lens_controls(app, ui);
}
editor_section(app, ui, "render_shot_exposure", "render.image_exposure", |app, ui| {
let enabled = app.render_workspace.view.method != ImageMethod::Raster;
if !enabled {
ui_kit::text(ui, app.tr("render.method_limit_raster"), ui_kit::Text::Note("render.method_limit_raster"));
}
let label = app.tr("render.image_exposure").to_string();
ui.add_enabled_ui(enabled, |ui| {
ui_kit::row(ui, &label, |ui| ui_kit::number_field(ui, &mut app.render_workspace.view.draft.exposure_ev, -32.0..=32.0, 0.1, " EV"));
});
});
if app.render_workspace.view.result {
if ui_kit::button(ui, app.tr("render.result_fit"), ui_kit::Button::Normal).clicked() {
super::fit_result(app);
@@ -679,52 +704,50 @@ fn camera_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
}
}
}
/// The selection owns the editor independently of the active stage.
fn selected_page(app: &SolveApp) -> Page {
match app.render_workspace.view.selection {
super::RenderSelection::Output => Page::Output,
super::RenderSelection::Sampling => Page::Sampling,
super::RenderSelection::Effects => Page::Effects,
super::RenderSelection::Check => Page::Diagnostics,
_ => app.render_workspace.view.inspector.page,
}
}
fn editor_section(app: &mut SolveApp, ui: &mut egui::Ui, id: &'static str, key: &'static str, draw: fn(&mut SolveApp, &mut egui::Ui)) {
reveal_section(app, ui, id);
let title = app.tr(key).to_string();
ui_kit::section(ui, id, &title, true, |ui| draw(app, ui));
}
fn output_editor(app: &mut SolveApp, ui: &mut egui::Ui) {
let summary = check_summary(app);
let notes = ui_kit::button(ui, &summary, ui_kit::Button::Normal);
crate::scenario::publish_target("render:output:check", notes.rect);
if notes.clicked() {
let _ = app.run("view.render_select", json!({"kind":"check"}));
}
for (id, key, draw) in [
("render_output_image", "render.output_image", output_controls as fn(&mut SolveApp, &mut egui::Ui)),
("render_output_effects", "render.output_effects", super::effects::presentation_controls),
("render_output_check", "render.output_check", check_controls),
("render_output_renderer", "render.children.renderer", renderer_controls as fn(&mut SolveApp, &mut egui::Ui)),
("render_output_image", "render.output_image", output_controls),
("render_output_destination", "render.output_destination", destination_controls),
("render_output_render", "render.children.render", render_controls),
] {
reveal_section(app, ui, id);
let title = app.tr(key).to_string();
ui_kit::section(ui, id, &title, id != "render_output_effects", |ui| draw(app, ui));
editor_section(app, ui, id, key, draw);
}
}
fn check_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let ready = super::ribbon::action_ready(app, "render.preflight");
let check = ui_kit::button(ui, app.tr("render.output_check"), ui_kit::Button::Enabled(ready.is_ok()));
crate::scenario::publish_target("render:check", check.rect);
if check.clicked() {
app.start("render.preflight");
}
if let Err(reason) = ready {
check.on_disabled_hover_text(reason);
}
output_check(app, ui);
let title = app.tr("cmd.render_backends").to_string();
ui_kit::section(ui, "render_output_backends", &title, false, |ui| {
gpu_status(app, ui);
let backend = app.session.render_backend();
ui_kit::text(ui, &backend.label, ui_kit::Text::Inline);
for executor in backend.executors.iter().take(16) {
let status = match &executor.availability {
super::Availability::Available => app.tr("render.output_backend_ready"),
super::Availability::Unavailable { reason } => reason,
};
let label = format!("{} · {status}", executor.id.as_str());
ui_kit::text(ui, &label, ui_kit::Text::Report(executor.id.as_str(), false));
}
if let Some(job) = app.render_workspace.view.job
&& let Ok(status) = app.session.execute("render.status", &json!({"job":job}))
&& let Some(phase) = status["progress"]["phase"].as_str()
{
ui_kit::text(ui, app.tr(&format!("render.image_{phase}")), ui_kit::Text::Inline);
}
});
let title = app.tr("render.page_diagnostics").to_string();
ui_kit::section(ui, "render_output_diagnostics", &title, false, |ui| diagnostics(app, ui));
fn renderer_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let label = app.tr("render.children.method").to_string();
ui_kit::row(ui, &label, |ui| super::method_dropdown(app, ui));
gpu_status(app, ui);
let status = super::image_host(app, app.render_workspace.view.method).map_or_else(|e| e, |_| app.tr("render.output_backend_ready").into());
ui_kit::text(ui, &status, ui_kit::Text::Inline);
let key = match app.render_workspace.view.method {
ImageMethod::Raster => "render.opaque_image_summary",
ImageMethod::CpuRaytrace => "render.cpu_summary",
ImageMethod::GpuRaytrace => "render.progressive_image_summary",
};
ui_kit::text(ui, app.tr(key), ui_kit::Text::Note(key));
}
fn output_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let side = match app.render_workspace.view.method {
ImageMethod::CpuRaytrace => 16384,
@@ -735,7 +758,7 @@ fn output_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
app.render_workspace.view.inspector.resolution.observe(before);
let mut width = before[0];
let mut height = before[1];
let [w, h] = ui_kit::number_pair(ui, app.tr("render.output_dimensions"), [&mut width, &mut height], 1..=side, 1.0, "");
let [w, h] = ui_kit::number_pair(ui, app.tr("render.output_dimensions"), [&mut width, &mut height], 1..=side, 1.0, " px");
crate::scenario::publish_target("render:output-width", w.rect);
crate::scenario::publish_target("render:output-height", h.rect);
let edit = if w.changed() {
@@ -747,7 +770,7 @@ fn output_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
};
if let Some((axis, value)) = edit
&& let Some([width, height]) = app.render_workspace.view.inspector.resolution.edit(before, axis, value, side)
&& let Err(error) = app.run("render.output.size", json!({"width":width,"height":height,"custom":true}))
&& let Err(error) = apply_size(app, width, height, true)
{
app.render_workspace.view.inspector.resolution.observe(before);
app.render_workspace.view.inspector.resolution.rejected = true;
@@ -779,53 +802,39 @@ fn output_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
crate::scenario::publish_target(&format!("render:size:{key}"), response.rect);
if response.on_disabled_hover_text(app.tr("render.output_over_budget")).clicked()
&& let Some((w, h)) = allowed
&& let (Ok(w), Ok(h)) = (u32::try_from(w), u32::try_from(h))
&& let Err(error) = apply_size(app, w, h, false)
{
let _ = app.run("render.output.size", json!({"width":w,"height":h}));
app.set_status(error, true);
}
}
})
});
}
studio::export_controls(app, ui);
ui_kit::text(ui, app.tr("render.output_quality"), ui_kit::Text::Inline);
quality_choices(app, ui);
ui.scope(|ui| super::method_selector(app, ui)).response.on_hover_text(app.tr("render.method_limit_raster"));
let size = (u64::from(app.render_workspace.view.draft.width), u64::from(app.render_workspace.view.draft.height));
let size = (u64::from(before[0]), u64::from(before[1]));
if cpu::image_limits(app).fit(size.0, size.1, None) != Some(size) {
ui_kit::text(ui, app.tr("render.output_over_budget"), ui_kit::Text::Error("render.output_over_budget"));
ui_kit::text(ui, &size_limit_reason(app, before[0], before[1]), ui_kit::Text::Error("render.output_over_budget"));
}
match app.render_workspace.view.method {
ImageMethod::GpuRaytrace => {
super::transport::sampling_controls(app, ui);
let label = app.tr("render.image_samples").to_string();
ui_kit::row(ui, &label, |ui| ui_kit::number_field(ui, &mut app.render_workspace.view.samples, 1..=4096, 1.0, ""));
let label = app.tr("render.gpu_depth").to_string();
ui_kit::row(ui, &label, |ui| ui_kit::number_field(ui, &mut app.render_workspace.view.max_depth, 1..=16, 1.0, ""));
let label = app.tr("render.gpu_seed").to_string();
ui_kit::row(ui, &label, |ui| ui_kit::number_field(ui, &mut app.render_workspace.view.seed, 0..=u32::MAX, 1.0, ""));
}
ImageMethod::CpuRaytrace => super::cpu_sampling_controls(app, ui),
ImageMethod::Raster => {}
studio::export_controls(app, ui);
let gpu = app.render_workspace.view.method == ImageMethod::GpuRaytrace;
if !gpu {
ui_kit::text(ui, app.tr("render.effects_gpu_only"), ui_kit::Text::Note("render.effects_gpu_only"));
}
if app.render_workspace.view.method != ImageMethod::Raster {
let label = app.tr("render.image_exposure").to_string();
ui_kit::row(ui, &label, |ui| ui_kit::number_field(ui, &mut app.render_workspace.view.draft.exposure_ev, -32.0..=32.0, 0.1, " EV"));
}
let label = app.tr("render.image_transparent").to_string();
ui_kit::checkbox(ui, &label, &mut app.render_workspace.view.transparent);
let label = app.tr("render.image_overwrite").to_string();
ui_kit::checkbox(ui, &label, &mut app.render_workspace.view.overwrite);
let label = app.tr("render.output_destination").to_string();
let export = ui_kit::row(ui, &label, |ui| {
ui_kit::button(ui, studio::export_label(app), ui_kit::Button::Enabled(super::ribbon::action_ready(app, "render.export").is_ok()))
ui.add_enabled_ui(gpu, |ui| {
let label = app.tr("render.children.keep_master").to_string();
let response = ui_kit::checkbox(ui, &label, &mut app.render_workspace.view.studio.linear_exr);
crate::scenario::publish_target("render:retain-exr", response.rect);
app.render_workspace.view.dirty |= response.changed();
});
if export.on_hover_text(app.tr("render.output_destination_help")).clicked() {
app.start("render.export");
}
if app.render_workspace.view.completed.is_some() && ui_kit::button(ui, app.tr("render.output_view_image"), ui_kit::Button::Normal).clicked() {
let _ = app.run("render.result.view", json!({"view":"image"}));
let label = app.tr("render.image_transparent").to_string();
let cpu = app.render_workspace.view.method == ImageMethod::CpuRaytrace;
if cpu {
ui_kit::text(ui, app.tr("render.cpu_opaque_required"), ui_kit::Text::Note("render.cpu_opaque_required"));
}
// An incompatible retained value can always be cleared without switching method.
ui.add_enabled_ui(!cpu || app.render_workspace.view.transparent, |ui| {
ui_kit::checkbox(ui, &label, &mut app.render_workspace.view.transparent);
});
reveal_section(app, ui, "render_output_advanced");
let title = app.tr("render.output_advanced").to_string();
ui_kit::section(ui, "render_output_advanced", &title, false, |ui| {
@@ -835,28 +844,276 @@ fn output_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let swap = ui_kit::button(ui, app.tr("render.output_swap_orientation"), ui_kit::Button::Normal);
crate::scenario::publish_target("render:swap-size", swap.rect);
if swap.clicked() {
let _ = app.run("render.output.size", json!({"width":before[1],"height":before[0],"custom":true}));
if let Err(error) = apply_size(app, before[1], before[0], true) {
app.set_status(error, true);
}
let draft = &app.render_workspace.view.draft;
app.render_workspace.view.inspector.resolution.observe([draft.width, draft.height]);
}
ui_kit::text(ui, app.tr("render.output_format_status"), ui_kit::Text::Note("render.output_format_status"));
browse_button(app, ui, "quality", "render.browse_quality");
library::inspect_kinds(app, ui, &["quality"]);
ui_kit::text(ui, app.tr("render.adaptive_pending"), ui_kit::Text::Note("render.adaptive_pending"));
});
}
fn destination_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let label = app.tr("render.image_overwrite").to_string();
ui_kit::checkbox(ui, &label, &mut app.render_workspace.view.overwrite);
ui.horizontal_wrapped(|ui| {
for (id, label) in
[("render.export", studio::export_label(app).to_string()), ("render.result.copy", app.tr("render.children.copy_image").to_string())]
{
let ready = super::ribbon::action_ready(app, id);
let button = ui_kit::button(ui, &label, ui_kit::Button::Enabled(ready.is_ok()));
if button.clicked() {
app.start(id);
}
if let Err(reason) = ready {
button.on_disabled_hover_text(reason);
}
}
});
}
fn render_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let last = app.render_workspace.view.completed.and_then(|job| app.session.render_job_handle(job).ok()).and_then(|h| h.status().ok());
let text = last.map_or_else(
|| app.tr("render.shots_no_result").to_string(),
|s| {
crate::i18n::format(
"render.children.last_result",
&[
("number", &s.job.serial.to_string()),
("width", &s.request.width.to_string()),
("height", &s.request.height.to_string()),
("phase", app.tr(&format!("render.image_{:?}", s.progress.phase).to_lowercase())),
],
)
},
);
ui_kit::completion_text(ui, &text, app.render_workspace.view.completed.is_some());
if super::ribbon::busy(app) {
super::progress_pill(app, ui);
return;
}
ui.horizontal_wrapped(|ui| {
let ready = super::ribbon::action_ready(app, "render.start");
let button = ui_kit::button(ui, app.tr("render.children.render_shot"), ui_kit::Button::Enabled(ready.is_ok()));
if button.clicked() {
app.start("render.start");
}
if let Err(reason) = ready {
button.on_disabled_hover_text(reason);
}
ui_kit::button(ui, app.tr("render.children.all_shots"), ui_kit::Button::Enabled(false))
.on_disabled_hover_text(app.tr("render.queue_pending"));
});
ui_kit::text(ui, app.tr("render.queue_pending"), ui_kit::Text::Note("render.queue_pending"));
if ui_kit::button(ui, app.tr("render.output_view_image"), ui_kit::Button::Enabled(app.render_workspace.view.completed.is_some())).clicked() {
let _ = app.run("render.result.view", json!({"view":"image"}));
}
}
fn sampling_editor(app: &mut SolveApp, ui: &mut egui::Ui) {
editor_section(app, ui, "render_sampling_quality", "render.output_quality", |app, ui| {
quality_choices(app, ui);
ui_kit::text(ui, app.tr("render.output_quality_waiting"), ui_kit::Text::Note("render.output_quality_waiting"));
browse_button(app, ui, "quality", "render.children.review_quality");
library::inspect_kinds(app, ui, &["quality"]);
});
for (id, key, method, draw) in [
("render_sampling_path", "render.children.path", ImageMethod::GpuRaytrace, path_controls as fn(&mut SolveApp, &mut egui::Ui)),
("render_sampling_adaptive", "render.children.adaptive", ImageMethod::GpuRaytrace, super::transport::adaptive_controls),
("render_sampling_glass", "render.children.glass", ImageMethod::GpuRaytrace, super::transport::glass_controls),
("render_sampling_cpu", "render.children.cpu", ImageMethod::CpuRaytrace, cpu_sampling),
] {
let title = app.tr(key).to_string();
let reason = (app.render_workspace.view.method != method)
.then(|| app.tr(if method == ImageMethod::GpuRaytrace { "render.effects_gpu_only" } else { "render.children.needs_cpu" }).to_string());
ui_kit::method_section(ui, id, &title, if method == ImageMethod::GpuRaytrace { "GPU" } else { "CPU" }, reason.as_deref(), |ui| draw(app, ui));
}
}
fn path_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let label = app.tr("render.children.samples").to_string();
let mut samples = app.render_workspace.view.samples.clamp(1, 4096);
if ui_kit::row(ui, &label, |ui| {
ui_kit::slider(
ui,
&mut samples,
1..=4096,
ui_kit::Slider { integer: true, step: Some(1.0), format: |v| format!("{v:.0}"), ..Default::default() },
)
})
.changed()
{
app.render_workspace.view.samples = samples.checked_next_power_of_two().unwrap_or(4096).min(4096);
}
let label = app.tr("render.children.depth").to_string();
let mut depth = app.render_workspace.view.max_depth.clamp(1, 16);
if ui_kit::row(ui, &label, |ui| ui_kit::number_field(ui, &mut depth, 1..=16, 1.0, "")).changed() {
app.render_workspace.view.max_depth = depth;
}
let label = app.tr("render.children.seed").to_string();
ui_kit::row(ui, &label, |ui| ui_kit::number_field(ui, &mut app.render_workspace.view.seed, 0..=u32::MAX, 1.0, ""));
let label = app.tr("render.children.denoise").to_string();
ui_kit::checkbox(ui, &label, &mut app.render_workspace.view.studio.denoise);
ui_kit::text(ui, app.tr("render.studio_denoise_help"), ui_kit::Text::Note("render.studio_denoise_help"));
}
fn cpu_sampling(app: &mut SolveApp, ui: &mut egui::Ui) {
super::cpu_sampling_controls(app, ui);
let mut reflections = app.render_workspace.view.raytrace.reflections.clone().unwrap_or_default();
if app.render_workspace.view.raytrace.reflections.is_none() {
ui_kit::text(ui, app.tr("render.cpu_reflection_empty"), ui_kit::Text::Note("render.cpu_reflection_empty"));
}
let depth = app.tr("render.children.reflect_depth").to_string();
let samples = app.tr("render.children.reflect_samples").to_string();
ui.add_enabled_ui(app.render_workspace.view.raytrace.reflections.is_some(), |ui| {
ui_kit::row(ui, &depth, |ui| ui_kit::number_field(ui, &mut reflections.max_bounces, 1..=8, 1.0, ""));
ui_kit::row(ui, &samples, |ui| ui_kit::number_field(ui, &mut reflections.samples, 1..=64, 1.0, ""));
});
if let Some(value) = &mut app.render_workspace.view.raytrace.reflections {
*value = reflections;
}
}
fn check_editor(app: &mut SolveApp, ui: &mut egui::Ui) {
editor_section(app, ui, "render_check_check", "render.children.check", check_controls);
editor_section(app, ui, "render_check_request", "render.children.request", request_controls);
editor_section(app, ui, "render_check_renderers", "render.children.renderers", renderer_status);
let title = app.tr("render.children.under_hood").to_string();
ui_kit::section(ui, "render_check_under_hood", &title, false, |ui| diagnostics(app, ui));
}
fn check_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let ready = super::ribbon::action_ready(app, "render.preflight");
let check = ui_kit::button(ui, app.tr("render.children.check_now"), ui_kit::Button::Enabled(ready.is_ok()));
crate::scenario::publish_target("render:check", check.rect);
if check.clicked() {
app.start("render.preflight");
}
if let Err(reason) = ready {
check.on_disabled_hover_text(reason);
}
output_check(app, ui);
let report = check_report(app);
let copy = ui_kit::button(ui, app.tr("render.output_copy_report"), ui_kit::Button::Enabled(report.is_some()));
crate::scenario::publish_target("render:check:copy", copy.rect);
if copy.clicked()
&& let Some(text) = report
&& let Err(error) = app.run("render.preflight.copy", json!({"text":text}))
{
app.set_status(error, true);
}
}
fn check_note_link(app: &mut SolveApp, ui: &mut egui::Ui, index: usize, line: &CheckLine) {
if line.status == ui_kit::CheckStatus::Ok {
return;
}
let message = line.label.to_ascii_lowercase();
let (kind, key) = match line.key {
"transparency" => ("nothing", "render.page_appearance"),
"stale" => ("check", "render.children.check"),
_ if ["sample", "sampling", "depth", "budget", "memory", "denois"].iter().any(|word| message.contains(word)) => {
("sampling", "render.children.sampling")
}
_ if ["hdr", "environment"].iter().any(|word| message.contains(word)) => ("environment", "render.page_environment"),
_ if ["exposure", "camera", "lens"].iter().any(|word| message.contains(word)) => ("nothing", "render.page_camera"),
_ if ["bloom", "tone", "look", "effect"].iter().any(|word| message.contains(word)) => ("effects", "render.output_effects"),
_ if ["glass", "optic", "material", "texture", "coat"].iter().any(|word| message.contains(word)) => ("nothing", "render.page_appearance"),
_ => ("output", "render.page_output"),
};
let label = crate::i18n::format("render.children.go_to", &[("editor", app.tr(key))]);
let response = ui_kit::button(ui, &label, ui_kit::Button::Normal);
crate::scenario::publish_target(&format!("render:check:go-to:{index}"), response.rect);
if response.clicked() {
let _ = app.run("view.render_select", json!({"kind":kind}));
if kind == "nothing" {
app.render_workspace.view.inspector.page = if key == "render.page_camera" { Page::Camera } else { Page::Appearance };
}
if kind == "environment" {
app.render_workspace.view.inspector.page = Page::Environment;
}
}
}
fn request_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let view = &app.render_workspace.view;
let check = view.inspector.checked.as_ref().filter(|c| c.current(app) && super::image_params(app).as_ref().ok() == Some(&c.request));
let memory = check
.and_then(|c| c.reply["admission"]["estimated_total_bytes"].as_u64())
.map_or_else(|| app.tr("render.children.not_checked").into(), |b| format!("{:.2} MiB", b as f64 / 1048576.0));
let hdr = check.map_or_else(
|| app.tr("render.children.not_checked").into(),
|c| if c.reply["environment"].is_null() { app.tr("render.studio_environment_none").to_string() } else { c.reply["environment"].to_string() },
);
let sampling = if view.method == ImageMethod::GpuRaytrace {
format!("{} spp · {}", view.samples, view.max_depth)
} else {
format!("{} spp", view.raytrace.progressive.map_or(u32::from(view.raytrace.primary_samples), |p| p.samples_per_pixel))
};
let scene = view.inspector.scene_info.as_ref().filter(|s| s.current(app)).map_or_else(
|| app.tr("render.children.not_checked").to_string(),
|s| {
let bodies = s.reply["bodies"].as_array();
let triangles = bodies.map_or(0, |b| b.iter().filter_map(|v| v["triangles"].as_u64()).fold(0u64, u64::saturating_add));
crate::i18n::format(
"render.children.scene_summary",
&[("bodies", &bodies.map_or(0, Vec::len).to_string()), ("triangles", &triangles.to_string())],
)
},
);
let preview = app.render_workspace.preview_upload_bytes.map_or_else(
|| app.tr("render.children.not_checked").to_string(),
|b| format!("{:.2} / {} MiB", b as f64 / 1048576.0, super::MAX_GEOMETRY_BYTES / 1048576),
);
for (key, value) in [
("render.children.method", app.tr(view.method.label()).to_string()),
("render.output_image", format!("{} × {} · {}", view.draft.width, view.draft.height, if view.studio.export_exr { "EXR" } else { "PNG" })),
("render.children.sampling", sampling),
("render.children.memory", memory),
("render.children.hdr", hdr),
("render.page_scene", scene),
("render.children.preview", preview),
] {
ui_kit::row(ui, app.tr(key), |ui| ui_kit::text(ui, &value, ui_kit::Text::Inline));
}
if ui_kit::button(ui, app.tr("render.inspect_scene"), ui_kit::Button::Normal).clicked() {
match app.run("render.scene", json!({})) {
Ok(reply) => {
app.render_workspace.view.inspector.scene_info =
Some(Review { request: json!({}), reply, revision: app.session.revision, document: Arc::downgrade(&app.session.doc) })
}
Err(error) => app.set_status(error, true),
}
}
}
fn renderer_status(app: &mut SolveApp, ui: &mut egui::Ui) {
gpu_status(app, ui);
let backend = app.session.render_backend();
for method in [ImageMethod::GpuRaytrace, ImageMethod::CpuRaytrace, ImageMethod::Raster] {
let status = super::image_host(app, method).map_or_else(|e| e, |_| app.tr("render.output_backend_ready").to_string());
ui_kit::row(ui, app.tr(method.label()), |ui| ui_kit::text(ui, &status, ui_kit::Text::Inline));
}
ui_kit::text(ui, &backend.label, ui_kit::Text::Inline);
for executor in backend.executors.iter().take(16) {
let status = match &executor.availability {
super::Availability::Available => app.tr("render.output_backend_ready"),
super::Availability::Unavailable { reason } => reason,
};
ui_kit::check_status_line(
ui,
&format!("render:check:backend:{}", executor.id.as_str()),
&format!("{} · {status}", executor.id.as_str()),
if matches!(executor.availability, super::Availability::Available) { ui_kit::CheckStatus::Ok } else { ui_kit::CheckStatus::Warning },
);
}
if let Some(error) = &app.render_workspace.scene_error {
ui_kit::text(ui, error, ui_kit::Text::Error("render.preview_cached_error"));
}
}
/// Fit an oversized same-aspect candidate, since fit deliberately never upscales.
pub(super) fn largest_output(app: &SolveApp) -> Option<(u64, u64)> {
let limits = cpu::image_limits(app);
let draft = &app.render_workspace.view.draft;
limits.fit(u64::from(draft.width).checked_mul(limits.max_dimension)?, u64::from(draft.height).checked_mul(limits.max_dimension)?, None)
}
pub(super) fn quality_choices(app: &SolveApp, ui: &mut egui::Ui) {
pub(super) fn quality_choices(app: &mut SolveApp, ui: &mut egui::Ui) {
let reason = app.tr("render.output_quality_waiting");
let labels = ["render.quality_draft", "render.quality_balanced", "render.quality_high", "render.quality_custom"].map(|key| app.tr(key));
let mut quality = 3;
ui_kit::segmented(
if ui_kit::segmented(
ui,
&mut quality,
&labels,
@@ -864,20 +1121,26 @@ pub(super) fn quality_choices(app: &SolveApp, ui: &mut egui::Ui) {
workspace_accent: true,
intrinsic: true,
compact: true,
targets: &["render:quality:draft", "render:quality:balanced", "render:quality:high", "render:quality:custom"],
disabled_reasons: &[Some(reason), Some(reason), Some(reason), None],
..Default::default()
},
);
) {
let _ = app.run("view.render_select", json!({"kind":"sampling"}));
}
}
pub(super) fn check_summary(app: &SolveApp) -> String {
let state = match &app.render_workspace.view.inspector.checked {
Some(check) if check.current(app) && super::image_params(app).as_ref().ok() == Some(&check.request) => {
if check.reply["error"].is_string() {
return app.tr("render.output_check_failed").into();
}
let count = check.reply["warnings"].as_array().map_or(0, Vec::len)
+ usize::from(check.reply["transparency"].as_str().is_some_and(|value| value != "physical_transmission"));
+ usize::from(check.reply["transparency"].as_str() == Some("sorted_alpha_approximation"));
return crate::i18n::format("render.output_check_summary", &[("count", &count.to_string())]);
}
Some(_) => "render.studio_needs_review",
None => return app.tr("render.output_check").into(),
None => return app.tr("render.children.not_checked").into(),
};
format!("{} · {}", app.tr("render.output_check"), app.tr(state))
}
@@ -892,13 +1155,53 @@ const SIZE_PRESETS: [(&str, &str, Option<(u32, u32)>); 5] = [
fn choose_size(app: &mut SolveApp, size: Option<(u32, u32)>) {
let custom = size.is_none();
let (width, height) = size.unwrap_or((app.render_workspace.view.draft.width, app.render_workspace.view.draft.height));
if let Err(error) = app.run("render.output.size", json!({"width":width,"height":height,"custom":custom})) {
let result = if custom {
app.run("render.output.size", json!({"width":width,"height":height,"custom":true})).map(|_| ())
} else {
apply_size(app, width, height, false)
};
if let Err(error) = result {
app.set_status(error, true);
} else if custom {
let _ = app.run("view.render_select", json!({"kind":"output"}));
reveal(app, "render_output_image");
}
}
fn apply_size(app: &mut SolveApp, width: u32, height: u32, custom: bool) -> Result<(), String> {
if cpu::image_limits(app).fit(u64::from(width), u64::from(height), None) != Some((u64::from(width), u64::from(height))) {
return Err(size_limit_reason(app, width, height));
}
let name = app.render_workspace.view.name.clone();
let mut patch = json!({"width":width,"height":height});
let mut saved = app.session.doc.render.setups.get(&name).cloned().unwrap_or_default();
saved.width = width;
saved.height = height;
if saved.validate().is_err() {
// A larger preset needs the explicitly selected executor's resource profile,
// rather than the smaller raster profile of an older saved shot.
patch["job"] = serde_json::to_value(setups::snapshot(app)?.job).map_err(|error| error.to_string())?;
}
app.run("render.settings.set", json!({"name":name,"set":patch}))?;
app.render_workspace.view.draft.width = width;
app.render_workspace.view.draft.height = height;
app.render_workspace.view.inspector.resolution.custom = custom;
app.render_workspace.view.dirty = true;
Ok(())
}
fn size_limit_reason(app: &SolveApp, width: u32, height: u32) -> String {
let limits = cpu::image_limits(app);
let (w, h) = limits.fit(u64::from(width), u64::from(height), None).unwrap_or((0, 0));
crate::i18n::format(
"render.output_size_limit",
&[
("method", app.tr(app.render_workspace.view.method.label())),
("dimension", &limits.max_dimension.to_string()),
("pixels", &limits.max_pixels.to_string()),
("width", &w.to_string()),
("height", &h.to_string()),
],
)
}
pub(super) fn size_presets(app: &mut SolveApp, ui: &mut egui::Ui) {
ui_kit::scope(ui, |ui| {
let current = (app.render_workspace.view.draft.width, app.render_workspace.view.draft.height);
@@ -921,7 +1224,8 @@ pub(super) fn size_presets(app: &mut SolveApp, ui: &mut egui::Ui) {
)
})
.inner;
if response.on_disabled_hover_text(app.tr("render.output_over_budget")).clicked() {
let reason = size.map_or_else(String::new, |(w, h)| size_limit_reason(app, w, h));
if response.on_disabled_hover_text(reason).clicked() {
choose_size(app, size);
}
}
@@ -936,7 +1240,8 @@ pub(super) fn stage_tools(app: &mut SolveApp, ui: &mut egui::Ui) {
size.is_none_or(|(w, h)| cpu::image_limits(app).fit(u64::from(w), u64::from(h), None) == Some((u64::from(w), u64::from(h))));
let response = ui.add_enabled_ui(enabled, |ui| ui_kit::list_picker(ui, key, app.tr(label), false)).inner;
crate::scenario::publish_target(&format!("render:stage:size:{key}"), response.rect);
if response.on_disabled_hover_text(app.tr("render.output_over_budget")).clicked() {
let reason = size.map_or_else(String::new, |(w, h)| size_limit_reason(app, w, h));
if response.on_disabled_hover_text(reason).clicked() {
choose_size(app, size);
ui.close();
}
@@ -946,26 +1251,36 @@ pub(super) fn stage_tools(app: &mut SolveApp, ui: &mut egui::Ui) {
studio::format_choices(app, ui);
quality_choices(app, ui);
let summary = check_summary(app);
let response = ui_kit::choice_chip(ui, "render_stage_check", &summary, false).on_hover_text(app.tr("render.output_check_help"));
let response = ui_kit::button(ui, &summary, ui_kit::Button::Normal).on_hover_text(app.tr("render.output_check_help"));
crate::scenario::publish_target("render:stage:check", response.rect);
if response.clicked() {
app.start("render.preflight");
let _ = app.run("view.render_select", json!({"kind":"check"}));
}
}
fn output_check(app: &SolveApp, ui: &mut egui::Ui) {
struct CheckLine {
key: &'static str,
label: String,
status: ui_kit::CheckStatus,
}
fn check_lines(app: &SolveApp) -> Vec<CheckLine> {
use ui_kit::CheckStatus::{Error, Ok, Warning};
if let Err(error) = super::image_params(app) {
return vec![CheckLine { key: "error", label: error, status: Error }];
}
let Some(check) = &app.render_workspace.view.inspector.checked else {
ui_kit::text(ui, app.tr("render.output_check_help"), ui_kit::Text::Note("render.output_check_help"));
return;
return Vec::new();
};
if !check.current(app) || super::image_params(app).as_ref().ok() != Some(&check.request) {
ui_kit::check_line(ui, "render:check:stale", app.tr("render.review_stale"), true);
return;
return vec![CheckLine { key: "stale", label: app.tr("render.review_stale").into(), status: Warning }];
}
ui_kit::check_line(ui, "render:check:ready", app.tr("render.output_ready"), false);
if let Some(error) = check.reply["error"].as_str() {
return vec![CheckLine { key: "error", label: error.into(), status: Error }];
}
let mut lines = vec![CheckLine { key: "ready", label: app.tr("render.output_ready").into(), status: Ok }];
if let (Some(w), Some(h)) = (check.reply["request"]["width"].as_u64(), check.reply["request"]["height"].as_u64()) {
let label = crate::i18n::format("render.output_size_ok", &[("width", &w.to_string()), ("height", &h.to_string())]);
ui_kit::check_line(ui, "render:check:size", &label, false);
lines.push(CheckLine { key: "size", label, status: Ok });
}
if let Some(transparency) = check.reply["transparency"].as_str() {
let key = match transparency {
@@ -973,13 +1288,69 @@ fn output_check(app: &SolveApp, ui: &mut egui::Ui) {
"opaque_only" => "render.check_opaque",
_ => "render.check_sorted_alpha",
};
ui_kit::check_line(ui, "render:check:transparency", app.tr(key), transparency != "physical_transmission");
lines.push(CheckLine {
key: "transparency",
label: app.tr(key).into(),
status: if transparency == "sorted_alpha_approximation" { Warning } else { Ok },
});
}
if let Some(warnings) = check.reply["warnings"].as_array() {
for warning in warnings.iter().take(32) {
ui_kit::check_line(ui, "render:check:warning", &warning.to_string(), true);
lines.push(CheckLine { key: "warning", label: warning.as_str().map_or_else(|| warning.to_string(), str::to_string), status: Warning });
}
}
lines
}
fn output_check(app: &mut SolveApp, ui: &mut egui::Ui) {
let lines = check_lines(app);
if lines.is_empty() {
ui_kit::text(ui, app.tr("render.children.not_checked"), ui_kit::Text::Inline);
ui_kit::text(ui, app.tr("render.output_check_help"), ui_kit::Text::Note("render.output_check_help"));
}
for (index, line) in lines.iter().enumerate() {
let key = format!("render:check:{}:{index}", line.key);
let response = if line.status == ui_kit::CheckStatus::Error {
ui_kit::check_status_line(ui, &key, &line.label, line.status)
} else {
ui_kit::check_line(ui, &key, &line.label, line.status == ui_kit::CheckStatus::Warning)
};
crate::scenario::publish_rect(&format!("render:check:{}", line.key), response.rect);
check_note_link(app, ui, index, line);
}
}
fn check_report(app: &SolveApp) -> Option<String> {
let lines = check_lines(app);
if lines.is_empty() {
return None;
}
let mut report = app.tr("render.output_check").to_string();
for line in lines {
let status = line.status.text_marker();
report.push_str(&format!("\n{status} {}", line.label));
}
let backend = app.session.render_backend();
report.push_str(&format!("\n{}: {}", app.tr("cmd.render_backends"), backend.label));
for executor in backend.executors.iter().take(16) {
let status = match &executor.availability {
super::Availability::Available => app.tr("render.output_backend_ready"),
super::Availability::Unavailable { reason } => reason,
};
report.push_str(&format!("\n{}: {status}", executor.id.as_str()));
}
if let Some(check) = &app.render_workspace.view.inspector.checked {
report.push_str(&format!("\n{}", check.reply));
}
if let Some(review) = &app.render_workspace.view.library.review
&& let library::review::Apply::Quality(quality) = &review.action
{
report.push_str(&format!("\n{}: {quality}", app.tr("render.quality_review")));
}
// The clipboard command accepts at most 64 KiB; truncate on character boundaries.
let end = report.char_indices().map(|(i, _)| i).take_while(|i| *i <= 65536).last().unwrap_or(0);
if report.len() > 65536 {
report.truncate(end);
}
Some(report)
}
pub(super) fn scene_resource(app: &mut SolveApp, ui: &mut egui::Ui, id: &str) {
@@ -1034,65 +1405,38 @@ pub(super) fn apply_quality(app: &mut SolveApp, plan: &Value) -> Result<(), Stri
Ok(())
}
fn diagnostics(app: &mut SolveApp, ui: &mut egui::Ui) {
if let Some(bytes) = app.render_workspace.preview_upload_bytes {
ui.label(format!("{}: {:.2} / {} MiB", app.tr("render.preview_upload"), bytes as f64 / 1048576.0, super::MAX_GEOMETRY_BYTES / 1048576));
ui_kit::text(ui, app.tr("render.preview_upload_help"), ui_kit::Text::Note("render.preview_upload_help"));
}
if let Some(error) = &app.render_workspace.scene_error {
ui_kit::text(ui, error, ui_kit::Text::Error("render.preview_cached_error"));
}
let request = super::image_request(app);
ui.strong(app.tr(app.render_workspace.view.method.label()));
if let Err(error) = super::image_params(app) {
ui_kit::text(ui, &error.to_string(), ui_kit::Text::Error("render.native-error"));
}
if ui_kit::button(ui, app.tr("render.inspect_scene"), ui_kit::Button::Normal).clicked() {
match app.run("render.scene", json!({})) {
Ok(reply) => {
app.render_workspace.view.inspector.scene_info =
Some(Review { request: json!({}), reply, revision: app.session.revision, document: Arc::downgrade(&app.session.doc) })
}
Err(error) => app.set_status(error, true),
let job = app
.render_workspace
.view
.job
.or(app.render_workspace.view.completed)
.and_then(|job| app.session.execute("render.status", &json!({"job":job})).ok());
for (key, value) in [("render.children.copy_request", request.as_ref().ok()), ("render.children.copy_job", job.as_ref())] {
let response = ui_kit::button(ui, app.tr(key), ui_kit::Button::Enabled(value.is_some()));
crate::scenario::publish_target(
if key == "render.children.copy_request" { "render:check:copy-request" } else { "render:check:copy-job" },
response.rect,
);
if response.clicked()
&& let Some(value) = value
{
copy_json(app, ui, value);
}
}
if let Some(info) = &app.render_workspace.view.inspector.scene_info {
if !info.current(app) {
ui_kit::text(ui, app.tr("render.review_stale"), ui_kit::Text::Note("render.review_stale"));
}
let bodies = info.reply["bodies"].as_array();
let count = bodies.map_or(0, Vec::len);
let triangles = bodies.map_or(0, |b| b.iter().filter_map(|v| v["triangles"].as_u64()).sum::<u64>());
ui.label(format!("{}: {count} / {}: {triangles}", app.tr("render.diag_bodies"), app.tr("render.diag_triangles")));
if let Err(error) = &request {
ui_kit::text(ui, error, ui_kit::Text::Error("render.native-error"));
}
if let Ok(value) = request {
let text = serde_json::to_string_pretty(&value).unwrap_or_default();
ui_kit::read_only_text(ui, &text);
}
if let Some(check) = &app.render_workspace.view.inspector.checked {
ui.strong(app.tr("render.diag_last_check"));
if !check.current(app) || request.as_ref().ok() != Some(&check.request) {
ui_kit::text(ui, app.tr("render.review_stale"), ui_kit::Text::Note("render.review_stale"));
}
if let Some(bytes) = check.reply["admission"]["estimated_total_bytes"].as_u64() {
ui.label(format!("{}: {:.2} MiB", app.tr("render.diag_memory"), bytes as f64 / 1048576.0));
}
if let Some(warnings) = check.reply["warnings"].as_array() {
for warning in warnings {
ui_kit::text(ui, &warning.to_string(), ui_kit::Text::Note("render.native-warning"));
}
}
let detail = check.reply.clone();
json_details(app, ui, "render.diag_preflight_details", &detail);
json_details(app, ui, "render.diag_preflight_details", &check.reply);
}
if let Some(job) = app.render_workspace.view.job
&& let Ok(status) = app.session.execute("render.status", &json!({"job":job}))
{
if let Some(error) = status["error"]["message"].as_str() {
ui_kit::text(ui, error, ui_kit::Text::Error("render.native-error"));
}
json_details(app, ui, "render.diag_job_details", &status);
if let Some(job) = job {
json_details(app, ui, "render.diag_job_details", &job);
}
if let Ok(request) = &request {
json_details(app, ui, "render.diag_request", request);
}
ui.separator();
ui.strong(app.tr("render.diag_not_implemented"));
for key in
["render.adaptive_pending", "render.exr_pending", "render.transmission_scope", "render.advanced_material_scope", "render.queue_pending"]
{
@@ -1101,19 +1445,20 @@ fn diagnostics(app: &mut SolveApp, ui: &mut egui::Ui) {
browse_button(app, ui, "capabilities", "render.browse_capabilities");
library::inspect_kinds(app, ui, &["capabilities"]);
}
fn copy_json(app: &mut SolveApp, _ui: &mut egui::Ui, value: &Value) {
if let Ok(text) = serde_json::to_string_pretty(value)
&& let Err(error) = app.run("render.preflight.copy", json!({"text":text}))
{
app.set_status(error, true);
}
}
fn json_details(app: &SolveApp, ui: &mut egui::Ui, key: &str, value: &Value) {
let title = app.tr(key).to_string();
ui_kit::section(ui, key, &title, false, |ui| {
let text = serde_json::to_string_pretty(value).unwrap_or_default();
if ui_kit::button(ui, app.tr("render.copy_request"), ui_kit::Button::Normal).clicked() {
ui.ctx().copy_text(text.clone());
}
egui::ScrollArea::vertical().max_height(280.0).show(ui, |ui| {
ui.monospace(text);
});
ui_kit::read_only_text(ui, &text);
});
}
#[derive(Clone, Debug)]
struct Appearance {
query: String,
@@ -9,6 +9,23 @@ fn fixture() -> Harness {
h.frames(3);
h
}
fn reveal_inspector_target(h: &mut Harness, target: &str) -> egui::Rect {
for _ in 0..8 {
let rect = crate::scenario::rect_of(target).unwrap();
let inspector = crate::scenario::rect_of("render:inspector").unwrap();
let top = crate::scenario::rect_of("render:inspector:header").unwrap().bottom() + Tokens::get().space_8;
let bottom = inspector.bottom() - Tokens::get().space_8;
if rect.top() >= top && rect.bottom() <= bottom {
return rect;
}
let at = rect.center();
let delta = at.y.clamp(top + rect.height() / 2.0, bottom - rect.height() / 2.0) - at.y;
h.call("ui.scroll", json!({"x":inspector.center().x,"y":(top+bottom)/2.0,"delta":delta}));
h.frames(20);
}
panic!("inspector target {target} is still clipped");
}
#[test]
fn native_inspector_keeps_stage_actions_on_screen_and_output_has_no_pinned_footer() {
for dark in [false, true] {
@@ -34,7 +51,7 @@ fn native_inspector_keeps_stage_actions_on_screen_and_output_has_no_pinned_foote
assert!(crate::scenario::rect_of("render:job-footer").is_none());
continue;
}
if page == Page::Output {
if matches!(page, Page::Output | Page::Effects | Page::Diagnostics | Page::Sampling) {
assert!(crate::scenario::rect_of("render:job-footer").is_none());
let bar = crate::scenario::rect_of("render:stage_bar").unwrap();
for name in ["render:stage:render.start", "render:stage:render.cancel"] {
@@ -515,7 +532,7 @@ fn resolution_lock_reanchors_for_explicit_presets_and_does_not_affect_other_inte
}
#[test]
fn actual_output_ratio_and_orientation_controls_are_local_and_preserve_saved_capture() {
fn actual_output_ratio_is_local_and_orientation_saves_once_preserving_other_capture_fields() {
let mut h = fixture();
super::super::select_image_method(&mut h.app, ImageMethod::GpuRaytrace);
h.app.render_workspace.view.draft.width = 1920;
@@ -523,22 +540,29 @@ fn actual_output_ratio_and_orientation_controls_are_local_and_preserve_saved_cap
h.app.render_workspace.view.samples = 37;
h.app.render_workspace.view.inspector.page = Page::Output;
setups::save(&mut h.app).unwrap();
let saved = h.app.session.doc.to_json();
let saved = h.app.session.doc.clone();
let undo = h.app.session.undo.len();
let camera = h.app.cam;
reveal(&mut h.app, "render_output_advanced");
h.frames(24);
h.step(&json!({"click":{"handle":"render:aspect-lock"}})).unwrap();
assert!(h.app.render_workspace.view.inspector.resolution.locked);
assert!(!h.app.render_workspace.view.dirty, "coupling editor coordinates is not a saved numerical edit");
assert!(Arc::ptr_eq(&saved, &h.app.session.doc));
assert_eq!(undo, h.app.session.undo.len());
h.step(&json!({"click":{"handle":"render:swap-size"}})).unwrap();
assert_eq!((h.app.render_workspace.view.draft.width, h.app.render_workspace.view.draft.height), (1080, 1920));
assert_eq!(h.app.render_workspace.view.samples, 37);
assert_eq!(h.app.cam, camera);
assert_eq!(h.app.session.doc.to_json(), saved);
let mut expected = saved.render.setups[&h.app.render_workspace.view.name].clone();
expected.width = 1080;
expected.height = 1920;
assert_eq!(h.app.session.doc.render.setups[&h.app.render_workspace.view.name], expected);
assert_eq!(h.app.session.undo.len(), undo + 1);
assert!(h.app.render_workspace.view.dirty);
setups::load(&mut h.app);
h.frames(3);
assert_eq!(h.app.render_workspace.view.inspector.resolution.anchor, Some([1920, 1080]));
assert_eq!(h.app.render_workspace.view.inspector.resolution.anchor, Some([1080, 1920]));
}
#[test]
@@ -621,7 +645,7 @@ fn ribbon_navigation_reuses_inspector_and_preserves_exact_unsaved_intent() {
("render.library.environment.apply", Page::Environment),
("render.stage.backdrop", Page::Background),
("render.quality.prepare", Page::Output),
("render.status", Page::Output),
("render.status", Page::Diagnostics),
("render.camera.get", Page::Camera),
("render.camera.set", Page::Camera),
("render.preset.apply", Page::Scene),
@@ -639,8 +663,8 @@ fn ribbon_navigation_reuses_inspector_and_preserves_exact_unsaved_intent() {
("render.environment.set", Page::Environment),
("render.settings.capture_hdr", Page::Environment),
("render.aging.describe", Page::Appearance),
("render.effects.describe", Page::Output),
("render.backends", Page::Output),
("render.effects.describe", Page::Effects),
("render.backends", Page::Diagnostics),
] {
h.app.start(id);
h.frames(3);
@@ -1063,7 +1087,10 @@ fn output_effects_retains_ordered_looks_and_photographic_intent_across_save_and_
let before = h.app.session.doc.to_json();
h.app.start("render.effects.describe");
h.frames(24);
assert_eq!(h.app.render_workspace.view.inspector.page, Page::Output);
assert_eq!(h.app.render_workspace.view.inspector.page, Page::Effects);
assert_eq!(h.app.session.doc.to_json(), before, "opening Effects is read-only");
let undo = h.app.session.undo.len();
for code in [3, 6] {
h.step(&json!({"click":{"handle":"render:look-add"}})).unwrap();
h.frames(2);
@@ -1075,7 +1102,8 @@ fn output_effects_retains_ordered_looks_and_photographic_intent_across_save_and_
h.step(&json!({"click":{"handle":"render:look-up"}})).unwrap();
h.frames(2);
assert_eq!(h.app.render_workspace.view.studio.finishing.looks.get(0).unwrap().kind, LookKind::Faded);
assert_eq!(h.app.session.doc.to_json(), before);
assert_eq!(h.app.session.undo.len(), undo + 3);
assert_eq!(setups::snapshot(&h.app).unwrap().job, h.app.session.doc.render.setups[&h.app.render_workspace.view.name].job);
h.app.render_workspace.view.studio.finishing.photographic.chromatic_pixels = 1.5;
h.app.render_workspace.view.studio.finishing.photographic.flare.strength = 0.4;
let expected = setups::snapshot(&h.app).unwrap();
@@ -1212,6 +1240,115 @@ fn shots_strip_uses_the_existing_dirty_shot_confirmation() {
assert_eq!(h.app.render_workspace.view.draft.width, 321);
}
#[test]
fn output_sections_bloom_tone_and_grading_save_one_command_per_edit_without_starting() {
use solidcraft_engine::render::job::ToneMap;
let mut h = fixture();
h.call("ui.resize", json!({"width":1440,"height":3000}));
super::super::select_image_method(&mut h.app, ImageMethod::GpuRaytrace);
let document = h.app.session.doc.clone();
let undo = h.app.session.undo.len();
h.app.start("render.effects.describe");
h.frames(24);
assert!(Arc::ptr_eq(&document, &h.app.session.doc));
assert_eq!(undo, h.app.session.undo.len());
let tone = crate::scenario::rect_of(&format!("dialog:section:{}", h.app.tr("render.children.tone"))).unwrap();
let grading = crate::scenario::rect_of(&format!("dialog:section:{}", h.app.tr("render.children.finishing"))).unwrap();
let bloom = crate::scenario::rect_of("render:bloom-enable").unwrap();
let reset = crate::scenario::rect_of("render:post-reset").unwrap();
assert!(tone.bottom() <= grading.top());
assert!(grading.bottom() <= bloom.top() && bloom.bottom() <= reset.top(), "Bloom belongs to the Finishing section");
reveal_inspector_target(&mut h, "render:bloom-enable");
h.step(&json!({"click":{"handle":"render:bloom-enable"}})).unwrap();
assert_eq!(undo + 1, h.app.session.undo.len());
assert!(h.app.render_workspace.view.studio.finishing.bloom.is_some());
let (next, expected) = if h.app.render_workspace.view.studio.tone_map == ToneMap::Reinhard {
("render:tone:aces", ToneMap::AcesFitted)
} else {
("render:tone:reinhard", ToneMap::Reinhard)
};
reveal_inspector_target(&mut h, next);
h.step(&json!({"click":{"handle":next}})).unwrap();
assert_eq!(h.app.render_workspace.view.studio.tone_map, expected);
assert_eq!(undo + 2, h.app.session.undo.len());
let contrast = reveal_inspector_target(&mut h, "render.post_contrast");
h.step(&json!({"click":[contrast.right()-10.0,contrast.center().y],"double":true})).unwrap();
h.step(&json!({"key":"A","cmd":true})).unwrap();
h.step(&json!({"text":"1.4"})).unwrap();
h.step(&json!({"key":"Enter"})).unwrap();
assert_eq!(h.app.render_workspace.view.studio.finishing.contrast, 1.4);
assert_eq!(undo + 3, h.app.session.undo.len());
assert_eq!(setups::snapshot(&h.app).unwrap().job, h.app.session.doc.render.setups[&h.app.render_workspace.view.name].job);
assert!(h.app.render_workspace.view.job.is_none());
assert_eq!(h.app.session.doc.features, document.features);
}
#[test]
fn output_sections_check_report_copies_success_staleness_and_errors_through_platform_queue() {
let mut h = fixture();
h.app.session.set_render_job_host(Some(solidcraft_engine::render::job::CpuHost::cooperative())).unwrap();
let doc = h.app.session.doc.clone();
let state = (h.app.session.revision, h.app.session.undo.len(), h.app.session.redo.len(), h.app.session.is_dirty());
super::super::ribbon::perform_job(&mut h.app, "render.preflight").unwrap();
let report = check_report(&h.app).unwrap();
assert!(report.contains(h.app.tr("render.output_ready")));
assert!(report.contains("cpu-raster"));
h.app.run("render.preflight.copy", json!({"text":report})).unwrap();
assert_eq!(h.app.render_workspace.clipboard_text.as_deref(), Some(report.as_str()));
h.frames(1);
assert!(h.output.commands.iter().any(|command| matches!(command, egui::OutputCommand::CopyText(text) if text == &report)));
assert!(h.app.render_workspace.clipboard_text.is_none());
assert!(h.app.render_workspace.view.job.is_none());
assert_eq!(h.app.session.render_job_host().unwrap().admitted_bytes(), 0);
assert!(Arc::ptr_eq(&doc, &h.app.session.doc));
assert_eq!(state, (h.app.session.revision, h.app.session.undo.len(), h.app.session.redo.len(), h.app.session.is_dirty()));
h.app.render_workspace.view.draft.width = 32;
let lines = check_lines(&h.app);
assert_eq!(lines[0].key, "stale");
assert_eq!(lines[0].status, ui_kit::CheckStatus::Warning);
assert!(check_report(&h.app).unwrap().contains(h.app.tr("render.review_stale")));
let request = super::super::image_params(&h.app).unwrap();
record_check(&mut h.app, &request, &json!({"error":"host refused the request"}));
let lines = check_lines(&h.app);
assert_eq!(lines[0].status, ui_kit::CheckStatus::Error);
assert_eq!(lines[0].label, "host refused the request");
assert!(check_report(&h.app).unwrap().contains("host refused the request"));
let quality = json!({"name":"Quality report regression", "gpu_options":{"samples":128}});
library::review::open(&mut h.app, "quality", "Quality".into(), quality.clone(), library::review::Apply::Quality(quality.clone())).unwrap();
let report = check_report(&h.app).unwrap();
assert!(report.contains(h.app.tr("render.quality_review")));
assert!(report.contains(&quality.to_string()));
h.app.run("render.preflight.copy", json!({"text":report})).unwrap();
assert_eq!(h.app.render_workspace.clipboard_text.as_deref(), Some(report.as_str()));
assert!(Arc::ptr_eq(&doc, &h.app.session.doc));
assert_eq!(state, (h.app.session.revision, h.app.session.undo.len(), h.app.session.redo.len(), h.app.session.is_dirty()));
}
#[test]
fn output_sections_sizes_refuse_hostile_input_and_4k_follows_the_selected_budget() {
let mut h = fixture();
let before = h.app.render_workspace.view.draft.clone();
let doc = h.app.session.doc.clone();
let undo = h.app.session.undo.len();
for (width, height) in [(0, 1), (1, 0), (u32::MAX, 1), (4096, 4096), (3840, 2160)] {
assert!(apply_size(&mut h.app, width, height, false).is_err());
assert_eq!(h.app.render_workspace.view.draft, before);
assert!(Arc::ptr_eq(&doc, &h.app.session.doc));
assert_eq!(h.app.session.undo.len(), undo);
}
let reason = size_limit_reason(&h.app, 3840, 2160);
assert!(reason.contains("4194304"));
assert!(reason.contains("2730 × 1536"));
super::super::select_image_method(&mut h.app, ImageMethod::CpuRaytrace);
h.app.render_workspace.view.raytrace.budget = solidcraft_engine::render::job::CpuBudget::Studio;
h.frames(3);
h.step(&json!({"click":{"handle":"render:preset:4k"}})).unwrap();
assert_eq!((h.app.render_workspace.view.draft.width, h.app.render_workspace.view.draft.height), (3840, 2160));
assert_eq!(h.app.session.undo.len(), undo + 1);
assert!(h.app.render_workspace.view.job.is_none());
}
#[test]
fn shots_strip_render_submits_the_current_job_request() {
let mut h = fixture();
@@ -1896,6 +2033,78 @@ fn appearance_editor_e2_sections_are_ordered_collapsed_and_expand_for_each_metho
}
}
#[test]
fn output_children_select_their_editor_with_all_sections_in_design_order() {
use super::super::RenderSelection;
for method in [ImageMethod::Raster, ImageMethod::CpuRaytrace, ImageMethod::GpuRaytrace] {
let mut h = fixture();
h.call("ui.resize", json!({"width":1440,"height":3000}));
super::super::select_image_method(&mut h.app, method);
let doc = h.app.session.doc.clone();
let history = (h.app.session.revision, h.app.session.undo.len(), h.app.session.redo.len());
for (kind, selection, page, sections) in [
(
"sampling",
RenderSelection::Sampling,
Page::Sampling,
vec!["render.output_quality", "render.children.path", "render.children.adaptive", "render.children.glass", "render.children.cpu"],
),
(
"effects",
RenderSelection::Effects,
Page::Effects,
vec![
"render.children.tone",
"render.children.looks",
"render.children.lens_effects",
"render.children.finishing",
"render.children.regrade",
],
),
(
"check",
RenderSelection::Check,
Page::Diagnostics,
vec!["render.children.check", "render.children.request", "render.children.renderers", "render.children.under_hood"],
),
(
"output",
RenderSelection::Output,
Page::Output,
vec!["render.children.renderer", "render.output_image", "render.output_destination", "render.children.render"],
),
] {
let handle = if kind == "output" { "render:tree:output".to_string() } else { format!("render:tree:output:{kind}") };
h.step(&json!({"click":{"handle":handle}})).unwrap();
h.frames(3);
assert_eq!(h.app.render_workspace.view.selection, selection);
assert_eq!(selected_page(&h.app), page);
let mut bottom = 0.0;
for key in sections {
let rect = crate::scenario::rect_of(&format!("dialog:section:{}", h.app.tr(key)))
.unwrap_or_else(|| panic!("missing {key} for {method:?}/{kind}"));
assert!(rect.top() >= bottom, "section order for {method:?}/{kind}/{key}");
bottom = rect.bottom();
}
assert!(crate::scenario::rect_of("render:job-footer").is_none());
assert!(crate::scenario::rect_of("render:page:output").is_none());
assert_eq!(h.app.render_workspace.view.method, method);
assert!(Arc::ptr_eq(&doc, &h.app.session.doc));
assert_eq!(history, (h.app.session.revision, h.app.session.undo.len(), h.app.session.redo.len()));
}
h.step(&json!({"click":{"handle":"render:output:check"}})).unwrap();
assert_eq!(h.app.render_workspace.view.selection, RenderSelection::Check);
h.app.run("view.render_select", json!({"kind":"output"})).unwrap();
h.frames(3);
h.step(&json!({"click":{"handle":"render:stage:check"}})).unwrap();
assert_eq!(h.app.render_workspace.view.selection, RenderSelection::Check);
assert!(h.app.render_workspace.view.inspector.checked.is_none(), "opening Check never runs preflight");
h.frames(3);
h.step(&json!({"click":{"handle":"render:quality:custom"}})).unwrap();
assert_eq!(h.app.render_workspace.view.selection, RenderSelection::Sampling);
}
}
#[test]
fn appearance_editor_reset_restores_each_picked_saved_look() {
use solidcraft_engine::Sel;
@@ -1987,3 +2196,124 @@ fn appearance_editor_save_optics_keeps_other_temporary_bindings() {
assert_eq!(h.app.session.undo.len(), undo + 1);
assert_eq!(h.app.run("component.properties", json!({})).unwrap(), geometry);
}
#[test]
fn output_children_unsupported_controls_stay_visible_with_reason_and_cannot_edit() {
fn has_text(shape: &egui::Shape, text: &str) -> bool {
match shape {
egui::Shape::Text(s) => s.galley.text().contains(text),
egui::Shape::Vec(s) => s.iter().any(|s| has_text(s, text)),
_ => false,
}
}
let mut h = fixture();
h.call("ui.resize", json!({"width":1440,"height":3000}));
let doc = h.app.session.doc.clone();
h.app.run("view.render_select", json!({"kind":"sampling"})).unwrap();
h.frames(3);
assert!(h.shapes.iter().any(|s| has_text(&s.shape, h.app.tr("render.effects_gpu_only"))));
assert!(h.shapes.iter().any(|s| has_text(&s.shape, h.app.tr("render.children.needs_cpu"))));
h.step(&json!({"click":{"handle":format!("dialog:section:{}", h.app.tr("render.children.adaptive"))}})).unwrap();
h.frames(3);
let before = h.app.render_workspace.view.studio.clone();
let point = reveal_inspector_target(&mut h, "render:adaptive-enable").center();
h.step(&json!({"click":[point.x,point.y]})).unwrap();
assert_eq!(h.app.render_workspace.view.studio.adaptive, before.adaptive);
h.app.run("view.render_select", json!({"kind":"effects"})).unwrap();
h.frames(3);
assert!(h.shapes.iter().any(|s| has_text(&s.shape, h.app.tr("render.children.effects_banner"))));
let point = reveal_inspector_target(&mut h, "render:bloom-enable").center();
h.step(&json!({"click":[point.x,point.y]})).unwrap();
assert_eq!(h.app.render_workspace.view.studio.finishing, before.finishing);
assert_eq!(h.app.render_workspace.view.method, ImageMethod::Raster);
assert!(Arc::ptr_eq(&doc, &h.app.session.doc));
}
#[test]
fn output_children_hostile_drafts_are_readable_without_normalizing_or_saving() {
let mut h = fixture();
super::super::select_image_method(&mut h.app, ImageMethod::GpuRaytrace);
h.app.render_workspace.view.samples = u32::MAX;
h.app.render_workspace.view.max_depth = u32::MAX;
h.app.render_workspace.view.studio.finishing.contrast = f64::NAN;
h.app.render_workspace.view.dirty = true;
let doc = h.app.session.doc.clone();
for kind in ["sampling", "effects", "check", "output"] {
h.app.run("view.render_select", json!({"kind":kind})).unwrap();
h.frames(3);
assert!(Arc::ptr_eq(&doc, &h.app.session.doc));
assert_eq!(h.app.render_workspace.view.samples, u32::MAX);
assert_eq!(h.app.render_workspace.view.max_depth, u32::MAX);
assert!(h.app.render_workspace.view.studio.finishing.contrast.is_nan());
assert!(h.app.render_workspace.view.job.is_none());
}
}
#[test]
fn output_children_check_diagnostics_are_collapsed_and_copy_the_current_request() {
let mut h = fixture();
h.call("ui.resize", json!({"width":1440,"height":3000}));
h.app.session.set_render_job_host(Some(solidcraft_engine::render::job::CpuHost::cooperative())).unwrap();
h.app.pending_fit = None;
h.app.cancel_view_animation();
h.app.run("view.render_select", json!({"kind":"check"})).unwrap();
h.frames(3);
assert!(h.widget(h.app.tr("render.children.copy_request")).is_none());
h.step(&json!({"click":{"handle":"render:check"}})).unwrap();
assert!(h.app.render_workspace.view.inspector.checked.is_some());
assert!(h.app.render_workspace.view.job.is_none());
let request = super::super::image_request(&h.app).unwrap();
let expected = serde_json::to_string_pretty(&request).unwrap();
h.step(&json!({"click":{"handle":format!("dialog:section:{}",h.app.tr("render.children.under_hood"))}})).unwrap();
h.frames(3);
let button = crate::scenario::rect_of("render:check:copy-request").unwrap();
assert!(crate::scenario::rect_of("render:inspector").unwrap().contains_rect(button));
// The control-channel click helper settles four extra frames, which discards
// one-frame platform events. Drive the native button and observe every frame.
let at = button.center();
h.frame_with(vec![egui::Event::PointerMoved(at)]);
for pressed in [true, false] {
h.frame_with(vec![egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() }]);
}
let copied = |h: &Harness| {
h.output.commands.iter().find_map(|c| match c {
egui::OutputCommand::CopyText(text) => Some(text.clone()),
_ => None,
})
};
let mut text = copied(&h);
if text.is_none() {
assert_eq!(h.app.render_workspace.clipboard_text.as_deref(), Some(expected.as_str()));
h.frame();
text = copied(&h);
}
assert_eq!(text.as_deref(), Some(expected.as_str()));
let request = super::super::image_params(&h.app).unwrap();
record_check(&mut h.app, &request, &json!({"warnings":["Sampling budget needs review"]}));
h.frames(3);
assert!(crate::scenario::rect_of("render:check:go-to:1").is_some());
h.step(&json!({"click":{"handle":"render:check:go-to:1"}})).unwrap();
assert_eq!(h.app.render_workspace.view.selection, super::super::RenderSelection::Sampling);
h.app.run("view.render_select", json!({"kind":"check"})).unwrap();
record_check(&mut h.app, &request, &json!({"error":"Exposure exceeds the CPU limit"}));
h.frames(3);
h.step(&json!({"click":{"handle":"render:check:go-to:0"}})).unwrap();
assert_eq!(selected_page(&h.app), Page::Camera);
}
#[test]
fn output_children_focus_survives_clearing_an_object_pick() {
let mut h = fixture();
let document = h.app.session.doc.clone();
for (kind, selection) in [
("sampling", super::super::RenderSelection::Sampling),
("effects", super::super::RenderSelection::Effects),
("check", super::super::RenderSelection::Check),
] {
h.app.run("select.set", json!({"bodies":["Subject"]})).unwrap();
h.app.run("view.render_select", json!({"kind":kind})).unwrap();
assert_eq!(h.app.render_workspace.view.selection, selection);
assert!(h.app.session.selection.is_empty());
assert!(Arc::ptr_eq(&document, &h.app.session.doc));
}
}
+14 -6
View File
@@ -130,7 +130,13 @@ pub(super) fn perform_job(app: &mut SolveApp, id: &str) -> Result<(), String> {
match id {
"render.preflight" => {
let request = super::image_params(app)?;
let reply = app.run(id, request.clone())?;
let reply = match app.run(id, request.clone()) {
Ok(reply) => reply,
Err(error) => {
inspector::record_check(app, &request, &json!({"error":error}));
return Err(error);
}
};
cpu::record_checked(app, &request, &reply);
inspector::record_check(app, &request, &reply);
app.set_status(app.tr("render.image_supported").to_string(), false);
@@ -186,12 +192,14 @@ pub(super) fn presentation(app: &SolveApp) -> solidcraft_engine::render::job::pr
fn focus(app: &mut SolveApp, page: inspector::Page, category: Option<&str>) {
app.render_workspace.view.inspector.hidden = false;
let page = if matches!(page, inspector::Page::Effects | inspector::Page::Diagnostics) {
inspector::reveal(app, if page == inspector::Page::Effects { "render_output_effects" } else { "render_output_check" });
inspector::Page::Output
} else {
page
let kind = match page {
inspector::Page::Sampling => "sampling",
inspector::Page::Effects => "effects",
inspector::Page::Diagnostics => "check",
inspector::Page::Output => "output",
_ => "nothing",
};
let _ = app.run("view.render_select", json!({"kind":kind}));
app.render_workspace.view.inspector.page = page;
if let Some(category) = category {
library::open_category(app, category);
+54 -31
View File
@@ -138,6 +138,7 @@ pub(super) fn finishing_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
post_controls(app, ui);
tone_controls(app, ui);
}
#[cfg(test)]
pub(super) fn tone_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
ui_kit::text(ui, app.tr("render.studio_tone_map"), ui_kit::Text::Inline);
let selected = app.render_workspace.view.studio.tone_map;
@@ -145,7 +146,7 @@ pub(super) fn tone_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
ToneMap::Reinhard => crate::i18n::tr("render.tone_reinhard"),
ToneMap::AcesFitted => crate::i18n::tr("render.tone_aces_fitted"),
};
ui_kit::dropdown_menu(ui, "render_tone_map", label, |ui| {
let response = ui_kit::dropdown_menu(ui, "render_tone_map", label, |ui| {
for (map, label) in
[(ToneMap::Reinhard, crate::i18n::tr("render.tone_reinhard")), (ToneMap::AcesFitted, crate::i18n::tr("render.tone_aces_fitted"))]
{
@@ -155,6 +156,7 @@ pub(super) fn tone_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
}
}
});
crate::scenario::publish_target("render:tone-map", response.rect);
let denoise = app.tr("render.studio_denoise").to_string();
ui_kit::checkbox(ui, &denoise, &mut app.render_workspace.view.studio.denoise);
if app.render_workspace.view.studio.denoise {
@@ -311,11 +313,49 @@ pub(super) fn lighting_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
}
/// Presentation is opt-in; raw radiance and engineering appearance stay untouched.
#[cfg(test)]
pub(super) fn post_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let title = app.tr("render.post_title").to_string();
let before = app.render_workspace.view.studio.finishing;
bloom_controls(app, ui);
grading_controls(app, ui);
regrade_controls(app, ui);
app.render_workspace.view.dirty |= before != app.render_workspace.view.studio.finishing;
}
#[cfg(test)]
pub(super) fn bloom_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let mut enabled = app.render_workspace.view.studio.finishing.bloom.is_some();
let label = app.tr("render.bloom_enable").to_string();
let toggle = ui_kit::checkbox(ui, &label, &mut enabled);
crate::scenario::publish_target("render:bloom-enable", toggle.rect);
if toggle.changed() {
app.render_workspace.view.studio.finishing.bloom =
enabled.then_some(solidcraft_engine::render::job::bloom::Bloom { strength: 0.15, ..Default::default() });
}
if enabled {
for key in ["render.bloom_strength", "render.bloom_threshold", "render.bloom_radius"] {
let label = app.tr(key).to_string();
if let Some(bloom) = &mut app.render_workspace.view.studio.finishing.bloom {
let response = ui_kit::row(ui, &label, |ui| match key {
"render.bloom_strength" => ui_kit::number_field(ui, &mut bloom.strength, 0.0..=2.0, 0.01, ""),
"render.bloom_threshold" => ui_kit::number_field(ui, &mut bloom.threshold, 0.0..=1e6, 0.05, ""),
_ => ui_kit::number_field(ui, &mut bloom.radius, 1..=64, 1.0, " px"),
});
crate::scenario::publish_target(key, response.rect);
}
}
ui_kit::text(ui, app.tr("render.bloom_help"), ui_kit::Text::Note("render.bloom_help"));
if app.render_workspace.view.transparent {
ui_kit::text(ui, app.tr("render.bloom_opaque"), ui_kit::Text::Error("render.bloom_opaque"));
}
}
}
#[cfg(test)]
pub(super) fn grading_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let title = app.tr("render.output_grading").to_string();
ui_kit::section(ui, "render_post_filters", &title, false, |ui| {
ui_kit::text(ui, app.tr("render.post_help"), ui_kit::Text::Note("render.post_help"));
let before = app.render_workspace.view.studio.finishing;
for (channel, key) in ["render.post_gain_r", "render.post_gain_g", "render.post_gain_b"].into_iter().enumerate() {
let label = app.tr(key).to_string();
let Some(value) = app.render_workspace.view.studio.finishing.rgb_gain.get_mut(channel) else {
@@ -335,40 +375,20 @@ pub(super) fn post_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let r = ui_kit::row(ui, &label, |ui| ui_kit::number_field(ui, value, range, 0.01, ""));
crate::scenario::publish_target(key, r.rect);
}
let mut enabled = app.render_workspace.view.studio.finishing.bloom.is_some();
let label = app.tr("render.bloom_enable").to_string();
let toggle = ui_kit::checkbox(ui, &label, &mut enabled);
crate::scenario::publish_target("render:bloom-enable", toggle.rect);
if toggle.changed() {
app.render_workspace.view.studio.finishing.bloom =
enabled.then_some(solidcraft_engine::render::job::bloom::Bloom { strength: 0.15, ..Default::default() });
}
if enabled {
for key in ["render.bloom_strength", "render.bloom_threshold", "render.bloom_radius"] {
let label = app.tr(key).to_string();
if let Some(bloom) = &mut app.render_workspace.view.studio.finishing.bloom {
let response = ui_kit::row(ui, &label, |ui| match key {
"render.bloom_strength" => ui_kit::number_field(ui, &mut bloom.strength, 0.0..=2.0, 0.01, ""),
"render.bloom_threshold" => ui_kit::number_field(ui, &mut bloom.threshold, 0.0..=1e6, 0.05, ""),
_ => ui_kit::number_field(ui, &mut bloom.radius, 1..=64, 1.0, " px"),
});
crate::scenario::publish_target(key, response.rect);
}
}
ui_kit::text(ui, app.tr("render.bloom_help"), ui_kit::Text::Note("render.bloom_help"));
if app.render_workspace.view.transparent {
ui_kit::text(ui, app.tr("render.bloom_opaque"), ui_kit::Text::Error("render.bloom_opaque"));
}
}
let reset = ui_kit::button(ui, app.tr("render.post_reset"), ui_kit::Button::Normal);
crate::scenario::publish_target("render:post-reset", reset.rect);
if reset.clicked() {
app.render_workspace.view.studio.finishing = Default::default();
}
if before != app.render_workspace.view.studio.finishing {
app.render_workspace.view.dirty = true;
}
});
}
#[cfg(test)]
pub(super) fn regrade_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
regrade_action(app, ui);
retain_controls(app, ui);
}
pub(super) fn regrade_action(app: &mut SolveApp, ui: &mut egui::Ui) {
let regrade = ui_kit::button(
ui,
app.tr("render.regrade_action"),
@@ -382,6 +402,9 @@ pub(super) fn post_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
ui.ctx().request_repaint();
}
ui_kit::text(ui, app.tr("render.regrade_help"), ui_kit::Text::Note("render.regrade_help"));
}
#[cfg(test)]
fn retain_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let label = app.tr("render.linear_retain").to_string();
let r = ui_kit::checkbox(ui, &label, &mut app.render_workspace.view.studio.linear_exr);
crate::scenario::publish_target("render:retain-exr", r.rect);
+30 -22
View File
@@ -2576,9 +2576,11 @@ fn clicked_setup_save_reload_and_switch_keep_gpu_numeric_intent_without_a_host()
}
h.step(&json!({"click":{"handle":handle}})).unwrap();
};
for key in ["render.output_advanced", "render.output_effects"] {
open_section(&mut h, format!("dialog:section:{}", crate::i18n::tr(key)));
}
h.app.run("view.render_select", json!({"kind":"sampling"})).unwrap();
h.frames(3);
h.app.run("view.render_select", json!({"kind":"effects"})).unwrap();
h.frames(3);
h.app.run("view.render_select", json!({"kind":"nothing"})).unwrap();
h.app.run("view.render_stage", json!({"stage":"light"})).unwrap();
h.frames(3);
open_section(&mut h, format!("dialog:section:{} 1", crate::i18n::tr("render.studio_area")));
@@ -3057,7 +3059,7 @@ fn cpu_resource_profile_edits_preserve_resolution_samples_and_saved_intent() {
setups::save(&mut h.app).unwrap();
setups::load(&mut h.app);
assert_eq!(setups::snapshot(&h.app).unwrap(), expected);
h.step(&json!({"click":{"handle":"render:cpu-budget"}})).unwrap();
h.step(&json!({"click":{"handle":"render.cpu_budget_compact"}})).unwrap();
h.frames(3);
assert_eq!((h.app.render_workspace.view.draft.width, h.app.render_workspace.view.draft.height), (3840, 2160));
@@ -3293,18 +3295,17 @@ fn finishing_backdrop_and_raw_retention_save_reload_without_a_gpu_or_hidden_tran
h.app.render_workspace.view.transparent = false;
let before = h.app.session.doc.to_json();
h.frames(3);
let effects = h.app.tr("render.output_effects").to_string();
h.step(&json!({"click":{"handle":format!("dialog:section:{effects}")}})).unwrap();
let title = h.app.tr("render.post_title").to_string();
h.step(&json!({"click":{"handle":format!("dialog:section:{title}")}})).unwrap();
h.app.run("view.render_select", json!({"kind":"effects"})).unwrap();
h.frames(3);
h.step(&json!({"click":{"handle":"render:post-reset"}})).unwrap();
assert_eq!(h.app.render_workspace.view.studio.finishing, Finishing::default());
assert!(h.app.render_workspace.view.studio.linear_exr);
assert!(h.app.render_workspace.view.studio.backdrop_enabled);
assert!(h.app.render_workspace.view.dirty);
assert_eq!(h.app.session.doc.to_json(), before, "reset only edits the render draft");
assert_ne!(h.app.session.doc.to_json(), before, "Effects saves its job patch through the shared editor");
let reset = setups::snapshot(&h.app).unwrap();
setups::load(&mut h.app);
assert_eq!(setups::snapshot(&h.app).unwrap(), expected);
assert_eq!(setups::snapshot(&h.app).unwrap(), reset);
}
#[test]
@@ -3365,11 +3366,11 @@ fn render_workspace_stage_chips_dispatch_without_mutations_and_remember_each_doc
assert_eq!((h.app.session.revision, h.app.session.undo.len(), h.app.session.redo.len()), history);
assert!(h.app.render_workspace.view.job.is_none());
assert!(h.app.render_workspace.view.completed.is_none());
// Stage selection preserves access to the other command-driven editors.
// Registered editor navigation remains available independently of the stage.
for command in ["render.status", "render.backends"] {
h.app.start(command);
h.frames(2);
assert_eq!(h.app.render_workspace.view.inspector.page, inspector::Page::Output);
assert_eq!(h.app.render_workspace.view.inspector.page, inspector::Page::Diagnostics);
}
}
h.app.run("view.render_stage", json!({"stage":"frame"})).unwrap();
@@ -4377,7 +4378,7 @@ fn render_workspace_browser_sections_and_lights_describe_only_current_job_entrie
#[test]
fn render_workspace_browser_look_lens_counts_distinct_objects_and_selects_them() {
let mut h = Harness::new();
h.call("ui.resize", json!({"width":1440,"height":1100}));
h.call("ui.resize", json!({"width":1440,"height":1400}));
for (name, x) in [("A", 0), ("B", 20), ("C", 40)] {
h.app.run("solid.box", json!({"corner":[x,0,0],"length":10,"width":10,"height":10,"body_name":name})).unwrap();
}
@@ -5172,7 +5173,7 @@ fn output_viewer_size_chips_obey_limits_and_largest_upscales_at_the_current_aspe
let document = h.app.session.doc.clone();
let undo = h.app.session.undo.len();
for (key, expected) in [("720", (1280, 720)), ("1080", (1920, 1080))] {
h.step(&json!({"click":{"handle":format!("render:size:{key}")}})).unwrap();
h.step(&json!({"click":{"handle":format!("render:preset:{key}")}})).unwrap();
let draft = &h.app.render_workspace.view.draft;
assert_eq!((draft.width, draft.height), expected);
}
@@ -5185,8 +5186,8 @@ fn output_viewer_size_chips_obey_limits_and_largest_upscales_at_the_current_aspe
let before = h.app.render_workspace.view.draft.clone();
assert!(h.app.run("render.output.size", json!({"width":4096,"height":4096})).is_err());
assert_eq!(h.app.render_workspace.view.draft, before);
assert!(Arc::ptr_eq(&document, &h.app.session.doc));
assert_eq!(undo, h.app.session.undo.len());
assert_eq!(h.app.session.doc.features, document.features);
assert_eq!(undo + 3, h.app.session.undo.len());
assert!(h.app.render_workspace.view.job.is_none());
}
@@ -5197,6 +5198,8 @@ fn output_viewer_check_lists_preflight_results_without_starting_and_marks_edits_
let document = h.app.session.doc.clone();
let undo = h.app.session.undo.len();
h.step(&json!({"click":{"handle":"render:stage:check"}})).unwrap();
assert!(h.app.render_workspace.view.inspector.checked.is_none());
h.step(&json!({"click":{"handle":"render:check"}})).unwrap();
assert!(h.app.render_workspace.view.job.is_none());
assert_eq!(host.admitted_bytes(), 0);
assert!(Arc::ptr_eq(&document, &h.app.session.doc));
@@ -5311,7 +5314,7 @@ fn output_viewer_evidence() {
let mut textures = std::collections::HashMap::new();
for (index, state) in ["settings", "check", "effects", "running", "completed"].into_iter().enumerate() {
if state == "check" {
inspector::reveal(&mut h.app, "render_output_check");
h.app.run("view.render_select", json!({"kind":"check"})).unwrap();
h.app.cancel_view_animation();
ribbon::perform_job(&mut h.app, "render.preflight").unwrap();
}
@@ -5321,7 +5324,7 @@ fn output_viewer_evidence() {
}
if state == "running" {
select_image_method(&mut h.app, ImageMethod::Raster);
inspector::reveal(&mut h.app, "render_output_image");
h.app.run("view.render_select", json!({"kind":"output"})).unwrap();
// Retain a real first image while the next job makes bounded progress.
ribbon::perform_job(&mut h.app, "render.start").unwrap();
let host = h.app.session.render_job_host().unwrap().clone();
@@ -5409,17 +5412,22 @@ fn output_viewer_presets_are_commands_with_limits_and_custom_keeps_the_size() {
let mut h = output_viewer_fixture();
let document = h.app.session.doc.clone();
let undo = h.app.session.undo.len();
for (key, expected) in [("720", (1280, 720)), ("1080", (1920, 1080)), ("square", (2048, 2048))] {
h.frames(6);
assert!(Arc::ptr_eq(&document, &h.app.session.doc), "opening Size presets does not apply anything");
for (index, (key, expected)) in [("720", (1280, 720)), ("1080", (1920, 1080)), ("square", (2048, 2048))].into_iter().enumerate() {
h.step(&json!({"click":{"handle":format!("render:preset:{key}")}})).unwrap();
assert_eq!((h.app.render_workspace.view.draft.width, h.app.render_workspace.view.draft.height), expected);
assert_eq!(h.app.session.undo.len(), undo + index + 1);
let saved = &h.app.session.doc.render.setups[&h.app.render_workspace.view.name];
assert_eq!((saved.width, saved.height), expected);
}
h.step(&json!({"click":{"handle":"render:preset:4k"}})).unwrap();
assert_eq!((h.app.render_workspace.view.draft.width, h.app.render_workspace.view.draft.height), (2048, 2048));
h.step(&json!({"click":{"handle":"render:preset:custom"}})).unwrap();
assert!(h.app.render_workspace.view.inspector.resolution.custom);
assert_eq!((h.app.render_workspace.view.draft.width, h.app.render_workspace.view.draft.height), (2048, 2048));
assert!(Arc::ptr_eq(&document, &h.app.session.doc));
assert_eq!(undo, h.app.session.undo.len());
assert_eq!(document.features, h.app.session.doc.features);
assert_eq!(undo + 3, h.app.session.undo.len());
assert!(h.app.render_workspace.view.job.is_none());
}
@@ -5431,7 +5439,7 @@ fn output_viewer_has_sections_without_pages_or_footer_and_selected_row_routes_to
h.app.ui.dark = dark;
h.call("ui.resize", json!({"width":1440,"height":900}));
h.frames(3);
for key in ["render.output_image", "render.output_effects", "render.output_check"] {
for key in ["render.children.renderer", "render.output_image", "render.output_destination", "render.children.render"] {
assert!(crate::scenario::rect_of(&format!("dialog:section:{}", h.app.tr(key))).is_some(), "{key}");
}
assert!(crate::scenario::rect_of("render:job-footer").is_none());
@@ -2,62 +2,70 @@
use crate::{SolveApp, ui_kit};
/// Pilot allocation and conditional transmission sampling share portable intent.
#[cfg(test)]
pub(super) fn sampling_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let changed = ui_kit::checkbox(ui, app.tr("render.nested_enable"), &mut app.render_workspace.view.studio.nested_media);
crate::scenario::publish_target("render:nested-enable", changed.rect);
if changed.changed() {
app.render_workspace.view.dirty = true;
adaptive_controls(app, ui);
glass_controls(app, ui);
}
pub(super) fn adaptive_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let before = app.render_workspace.view.studio.adaptive;
let mut enabled = before.is_some();
let response = ui_kit::checkbox(ui, app.tr("render.adaptive_enable"), &mut enabled);
crate::scenario::publish_target("render:adaptive-enable", response.rect);
if response.changed() {
app.render_workspace.view.studio.adaptive = enabled.then(Default::default);
}
if app.render_workspace.view.studio.nested_media {
ui_kit::text(ui, app.tr("render.nested_help"), ui_kit::Text::Note("render.nested_help"));
let mut options = app.render_workspace.view.studio.adaptive.unwrap_or_default();
if !enabled {
ui_kit::text(ui, app.tr("render.children.enable_adaptive"), ui_kit::Text::Note("render.children.enable_adaptive"));
}
let title = app.tr("render.sampling_title").to_string();
ui_kit::section(ui, "render_independent_sampling", &title, false, |ui| {
let before = (app.render_workspace.view.studio.adaptive, app.render_workspace.view.studio.transmission_samples);
let mut enabled = app.render_workspace.view.studio.adaptive.is_some();
let response = ui_kit::checkbox(ui, app.tr("render.adaptive_enable"), &mut enabled);
crate::scenario::publish_target("render:adaptive-enable", response.rect);
if response.changed() {
app.render_workspace.view.studio.adaptive = enabled.then(Default::default);
}
if enabled {
for key in [
"render.adaptive_pilots",
"render.adaptive_minimum",
"render.adaptive_relative",
"render.adaptive_absolute",
"render.adaptive_coverage",
] {
let label = app.tr(key).to_string();
if let Some(options) = &mut app.render_workspace.view.studio.adaptive {
let response = ui_kit::row(ui, &label, |ui| match key {
"render.adaptive_pilots" => ui_kit::number_field(ui, &mut options.pilot_samples, 16..=256, 1.0, ""),
"render.adaptive_minimum" => ui_kit::number_field(ui, &mut options.min_samples, 16..=4096, 1.0, ""),
"render.adaptive_relative" => ui_kit::number_field(ui, &mut options.relative_error, 0.0..=1.0, 0.005, ""),
"render.adaptive_absolute" => ui_kit::number_field(ui, &mut options.absolute_error, 0.000001..=1e6, 0.001, ""),
_ => ui_kit::number_field(ui, &mut options.coverage_error, 0.001..=0.25, 0.001, ""),
});
crate::scenario::publish_target(key, response.rect);
}
}
ui_kit::text(ui, app.tr("render.adaptive_help"), ui_kit::Text::Note("render.adaptive_help"));
}
ui.label(app.tr("render.transmission_strata"));
let current = app.render_workspace.view.studio.transmission_samples;
let selected = current.to_string();
let response = ui_kit::dropdown_menu(ui, "render_transmission_strata", &selected, |ui| {
for count in [1, 2, 4] {
let label = count.to_string();
if ui_kit::list_picker(ui, &label, &label, current == count).clicked() {
app.render_workspace.view.studio.transmission_samples = count;
ui.close();
}
}
});
crate::scenario::publish_target("render:transmission-strata", response.rect);
ui_kit::text(ui, app.tr("render.transmission_strata_help"), ui_kit::Text::Note("render.transmission_strata_help"));
if before != (app.render_workspace.view.studio.adaptive, app.render_workspace.view.studio.transmission_samples) {
app.render_workspace.view.dirty = true;
ui.add_enabled_ui(enabled, |ui| {
for key in
["render.adaptive_pilots", "render.adaptive_minimum", "render.adaptive_relative", "render.adaptive_absolute", "render.adaptive_coverage"]
{
let label = match key {
"render.adaptive_pilots" => "render.children.pilots",
"render.adaptive_minimum" => "render.children.minimum",
"render.adaptive_relative" => "render.children.relative_error",
"render.adaptive_absolute" => "render.children.absolute_floor",
_ => "render.children.coverage_error",
};
let response = ui_kit::row(ui, app.tr(label), |ui| match key {
"render.adaptive_pilots" => ui_kit::number_field(ui, &mut options.pilot_samples, 16..=256, 1.0, ""),
"render.adaptive_minimum" => ui_kit::number_field(ui, &mut options.min_samples, 16..=4096, 1.0, ""),
"render.adaptive_relative" => ui_kit::number_field(ui, &mut options.relative_error, 0.0..=1.0, 0.005, ""),
"render.adaptive_absolute" => ui_kit::number_field(ui, &mut options.absolute_error, 0.000001..=1e6, 0.001, ""),
_ => ui_kit::number_field(ui, &mut options.coverage_error, 0.001..=0.25, 0.001, ""),
});
crate::scenario::publish_target(key, response.rect);
}
});
if enabled {
app.render_workspace.view.studio.adaptive = Some(options);
}
ui_kit::text(ui, app.tr("render.adaptive_help"), ui_kit::Text::Note("render.adaptive_help"));
app.render_workspace.view.dirty |= before != app.render_workspace.view.studio.adaptive;
}
pub(super) fn glass_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
let before = (app.render_workspace.view.studio.nested_media, app.render_workspace.view.studio.transmission_samples);
let mut strata = match before.1 {
2 => 1,
4 => 2,
_ => 0,
};
ui_kit::row(ui, app.tr("render.children.fresnel"), |ui| {
if ui_kit::segmented(ui, &mut strata, &["1", "2", "4"], Default::default()) {
app.render_workspace.view.studio.transmission_samples = match strata {
1 => 2,
2 => 4,
_ => 1,
};
}
});
let label = app.tr("render.children.nested").to_string();
let response = ui_kit::checkbox(ui, &label, &mut app.render_workspace.view.studio.nested_media);
crate::scenario::publish_target("render:nested-enable", response.rect);
ui_kit::text(ui, app.tr("render.nested_help"), ui_kit::Text::Note("render.nested_help"));
app.render_workspace.view.dirty |=
before != (app.render_workspace.view.studio.nested_media, app.render_workspace.view.studio.transmission_samples);
}
+10
View File
@@ -618,6 +618,16 @@ pub(crate) struct Slider {
pub workspace_accent: bool,
}
/// Bounded read-only code box for diagnostic payloads. Native selection and copying
/// remain available; the caller's source cannot be edited. Uses shared form styling.
pub(crate) fn read_only_text(ui: &mut Ui, text: &str) -> Response {
let mut source = text;
egui::ScrollArea::vertical()
.max_height(160.0)
.show(ui, |ui| ui.add(egui::TextEdit::multiline(&mut source).code_editor().desired_width(ui.available_width()).desired_rows(8)))
.inner
}
impl Default for Slider {
fn default() -> Self {
Self { step: None, format: |v| format!("{v:.2}"), show_value: true, integer: false, workspace_accent: false }
+16
View File
@@ -145,6 +145,14 @@ const ELEMENTS: &[Element] = &[
Segments { enabled: &[false, true, false, true], compact: true, ..Default::default() },
);
}),
element!("read_only_text", |ui, _| {
read_only_text(ui, "{\n \"samples\": 256\n}");
}),
element!("method_section_sampling", |ui, state| {
method_section(ui, "gallery_method", "Path tracing", "GPU", Some("Needs GPU path tracing"), |ui| {
checkbox(ui, "Reduce noise", &mut state.checked);
});
}),
element!("tree_row_rect", |ui, _| {
for (index, row) in [
Row { label: "Objects", ..Default::default() },
@@ -304,6 +312,14 @@ const ELEMENTS: &[Element] = &[
element!("check_line_warning", |ui, _s| {
check_line(ui, "gallery:check_warning", "Transparency approximation", true);
}),
element!("check_line_error", |ui, _s| {
check_status_line(ui, "gallery:check_error", "Image size exceeds the renderer limit", CheckStatus::Error);
}),
element!("check_status_line", |ui, _| {
check_status_line(ui, "gallery:status_ok", "Ready", CheckStatus::Ok);
check_status_line(ui, "gallery:status_warning", "Transparency approximation", CheckStatus::Warning);
check_status_line(ui, "gallery:status_error", "Image size exceeds the renderer limit", CheckStatus::Error);
}),
element!("segmented_unavailable", |ui, s| {
segmented(
ui,
+36 -1
View File
@@ -91,11 +91,46 @@ pub(crate) fn completion_text(ui: &mut egui::Ui, label: &str, complete: bool) ->
/// Read-only check row with shared success/warning artwork and token-sized icon.
pub(crate) fn check_line(ui: &mut egui::Ui, key: &str, label: &str, warning: bool) -> egui::Response {
check_status_line(ui, key, label, if warning { CheckStatus::Warning } else { CheckStatus::Ok })
}
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub(crate) enum CheckStatus {
Ok,
Warning,
Error,
}
impl CheckStatus {
/// Plain-text marker for copied check reports.
pub(crate) fn text_marker(self) -> &'static str {
match self {
Self::Ok => "✓",
Self::Warning => "!",
Self::Error => "×",
}
}
}
/// Semantic status glyphs use the same geometry and theme colours in every report.
pub(crate) fn check_status_line(ui: &mut egui::Ui, key: &str, label: &str, status: CheckStatus) -> egui::Response {
let t = Tokens::get();
let response = ui
.horizontal(|ui| {
let (rect, _) = ui.allocate_exact_size(vec2(t.form_icon_size, t.form_icon_size), egui::Sense::hover());
crate::icons::paint_icon(ui.painter(), rect, if warning { "status_warning" } else { "finish" }, 1.0);
match status {
CheckStatus::Ok => super::checks::paint_check_glyph(ui.painter(), rect, false, t.form_success),
CheckStatus::Warning | CheckStatus::Error => {
let ink = if status == CheckStatus::Warning { t.warning } else { t.form_error };
ui.painter().text(
rect.center(),
egui::Align2::CENTER_CENTER,
if status == CheckStatus::Warning { "!" } else { "×" },
egui::FontId::proportional(t.font_subtitle),
ink,
);
}
}
super::text(ui, label, super::Text::Report(key, false));
})
.response;
+27 -14
View File
@@ -119,16 +119,16 @@ anisotropy, area lights and spot cones remain API capabilities without panel edi
Its independent image device requires Vulkan; the live viewport may use another backend.
When no compatible Vulkan device is available, GPU settings remain editable and
saveable, while Check and Start explain why GPU execution is unavailable.
The panel exposes progressive sample counts from 1 to 4096 and an Advanced section
for maximum path depth (1–16), random seed and exposure (−32 to +32 EV). One setup
Sampling > Path tracing exposes progressive sample counts from 1 to 4096,
maximum path depth (1–16) and random seed. Exposure (−32 to +32 EV) lives in Shot. One setup
exposure field controls the selected image method. Switching methods retains their
local numeric drafts while submitting and saving only the active method. Reloading
or choosing another setup replaces those drafts with the saved numeric intent.
The live product preview keeps its fixed studio response and does not apply image
exposure, environments, lens or material overrides.
The GPU Advanced section also exposes Reinhard / ACES fitted tone mapping, optional
final edge-aware denoising, and a thin-lens depth-of-field control. Positive aperture
Effects > Tone exposes Reinhard / ACES fitted tone mapping. Sampling > Path tracing
owns optional final edge-aware denoising; Shot owns thin-lens depth of field. Positive aperture
requires a perspective product camera. Denoising preserves raw accumulation but can
soften detail; glass and sharp specular first hits bypass its final spatial filter.
@@ -493,17 +493,30 @@ remains deferred.
The Output stage offers size, format, quality and a Check summary in the stage bar's
second row. Its lower-left Size presets card offers Preview (1280 × 720), Full HD,
4K, Square and Custom. Presets outside the selected executor's limits stay visible
with a disabled explanation. Custom retains the current size and reveals its fields.
Numerical size edits and presets use `render.output.size`; they never save a shot
or start a job.
with a disabled explanation showing the selected method's dimension/pixel limits and
largest fitting size. The default raster limit is 4,194,304 pixels, so 4K exceeds it;
methods with larger resource profiles can admit 4K. Custom retains the current size
and reveals its fields through `render.output.size`. Numerical size edits and preset
clicks patch width and height with `render.settings.set`, as one undo step. Opening
the panel never applies a preset or starts a job.
Selecting Output in the Browser shows one editor with Image, Effects and Check
sections, without page navigation or pinned job actions. Image retains size/aspect,
format, sampling, method, transparency and export destination controls. Effects owns
tone, bloom, grading and regrade. Check retains the preflight list, freshness checks,
installed backend/status metadata and expandable diagnostics. Named quality presets
and EXR settings remain unavailable with their existing reasons. Destination selection
uses the existing completed-image export picker.
Selecting Output in the Browser shows a short editor with Renderer, Image,
Destination and Render sections. Sampling, Effects and Check are child rows under
Output, each with a summary and its own editor. Sampling owns Quality, GPU Path
tracing, Adaptive, Glass transport and CPU ray tracing. Method-specific controls
stay visible and faded with their reason on other methods. Effects owns Tone,
Creative looks, Lens effects, Finishing and Regrade, in that order; its controls
need GPU path tracing. Effect edits patch the saved job with `render.settings.set`;
opening an editor never saves or switches methods. Check owns the preflight notes,
This request, Renderers and collapsed Under the hood diagnostics. The legacy
Effects, Output and Diagnostics pages call the same editors.
The stage bar's Check chip and Output's note count open Check. Check now runs the
read-only `render.preflight` without admitting a job. Notes offer links to their
owning editor. Copy report and diagnostic JSON use `render.preflight.copy` and the
platform clipboard queue; headless calls only validate and echo bounded text.
Named quality presets, EXR export and rendering all shots remain faded with their
existing reasons. Destination selection uses the completed-image export picker.
Render and Cancel stay in the stage bar. Active jobs also show a single-row progress
pill with Cancel. The result viewer retains Copy, export, close, Fit/100% and shared
+5
View File
@@ -7,6 +7,11 @@ The row keeps supplied order and anchors to the top centre of the free viewport.
Its presentation state only remembers which key card is open. The `ui.status_fixture`
control method provides named specimens for UI scenarios and live visual review.
| Component | Use |
| --- | --- |
| `method_section` | Section with a GPU/CPU tag; unsupported contents stay faded with a readable reason. |
| `read_only_text` | Bounded, selectable code box for read-only diagnostic JSON. |
`crates/ui-egui/src/ui_kit/` contains the tokenised controls used by feature dialogs,
preferences, manager cards, prompts, context menus and the sketch palette. Import through
`crate::ui_kit::{...}`. Most controls are crate-visible; the container API is public so platform apps use the same hosts.