Render workspace: focus view, compact docks, a Browser chip at narrow widths and a localisation pass (#7376)

This commit is contained in:
Nathan Dane
2026-10-28 07:29:53 +00:00
committed by GitHub
parent 372badfc1b
commit 18fe82ab26
22 changed files with 1301 additions and 103 deletions
+634
View File
@@ -0,0 +1,634 @@
{
"en": {
"cmd.view.render_focus": "Render Focus View",
"cmd.view.render_browser": "Render Browser",
"render.exit_focus": "Exit focus",
"render.fold_browser": "Fold Browser",
"render.spot_cone": "Spot cone",
"render.emitted_axis": "Emitted axis",
"render.inner_half_angle": "Inner half angle",
"render.outer_half_angle": "Outer half angle",
"render.layer_off_suffix": " (off)",
"render.tone_reinhard": "Reinhard",
"render.tone_aces_fitted": "ACES fitted",
"render.size_hd": "HD",
"render.size_full_hd": "Full HD",
"render.size_4k_uhd": "4K UHD",
"render.result_actual_size": "100%",
"render.property_unknown": "unknown",
"render.property_fallback": "property",
"render.property_source": "Source: {id} - {locator}",
"render.property_qualifier": "Qualifier: {value}",
"render.property_conditions": "Conditions: {value}",
"render.property_uncertainty": "Uncertainty: {value}",
"render.error_setup_panicked": "GPU path tracer setup panicked",
"render.error_setup_worker": "could not start setup worker: {error}",
"render.error_setup_stopped": "setup worker stopped without returning a host",
"render.error_gpu_samples": "unsupported GPU sample count",
"render.error_preview_device": "product preview requires an installed device with a depth buffer",
"render.error_finish_operation": "finish the current modelling operation before entering Render",
"render.error_no_completed_image": "render has no completed image",
"render.error_provisional_identity": "invalid provisional render identity or sample count",
"render.error_checkpoint_dimensions": "checkpoint dimensions differ from the captured request",
"render.error_display_dimensions": "invalid image display dimensions",
"render.error_display_fit": "image display cannot fit this device",
"render.error_display_width": "display width overflow",
"render.error_display_height": "display height overflow",
"render.error_image_profile": "render image exceeds its captured resource profile",
"render.error_decode_budget": "image decode budget overflow",
"render.error_image_dimensions": "render image dimensions do not match its job",
"render.error_upload_slot": "product preview upload slot unavailable",
"render.error_export_document": "The render export document changed while choosing its destination",
"render.error_geometry_size": "product geometry size overflow",
"render.error_vertex_envelope": "product preview exceeds its {limit} MiB vertex payload envelope; geometry was not simplified",
"render.error_body_bound": "product preview exceeds its captured-body bound",
"render.error_triangle_count": "product triangle count overflow",
"render.error_triangle_bound": "product preview exceeds its eight-million-triangle source bound",
"render.error_face_cap": "product preview exceeds the face-appearance admission cap",
"render.error_opacity": "invalid product appearance opacity",
"render.error_duplicate_face": "duplicate product face appearance",
"render.error_pbr_opacity": "opaque PBR requires opacity 1",
"render.error_vertex_allocation": "product preview vertex allocation failed",
"render.error_product_triangle": "invalid product triangle",
"render.error_surface_normals": "PBR requires nonzero surface normals",
"render.error_vertex_packing": "product preview packing differs from its admitted vertex payload",
"render.error_gpu_preview": "GPU product preview is unavailable on this host. Saved setups remain available.",
"render.error_fixed_preview": "fixed studio preview requires exposure 0, environment rotation 0 and intensity 1",
"render.error_finish_gesture": "finish the modelling gesture before previewing",
"render.error_no_scene": "no product scene",
"render.error_no_geometry": "no product geometry",
"render.error_visible_solid": "Create a visible solid in Design to preview it here.",
"render.error_area_samples": "area_samples must be 1, 4, 16 or 64",
"render.error_quality_method": "quality projection requires the same explicit GPU method",
"render.error_quality_projection": "invalid native quality projection",
"render.error_denoise_setting": "invalid native denoise setting",
"render.error_quality_bounds": "quality projection exceeds native bounds",
"render.error_library_reply": "invalid render-library response",
"render.error_source_preview": "source preview exceeds its byte envelope",
"render.error_glass_recipe": "unknown glass recipe",
"render.error_physical_glass": "the selected recipe is not physical glass",
"render.error_scene_bodies": "missing render scene bodies",
"render.error_scene_body_limit": "render scene exceeds its body limit",
"render.error_scene_identity": "invalid render scene identity",
"render.error_material_binding": "missing material binding",
"render.error_surface_reply": "invalid authored surface reply",
"render.error_binding_allocation": "could not reserve material binding",
"render.error_job_identity": "invalid render job identity: {error}",
"render.error_regrade_identity": "invalid regrade identity: {error}",
"render.error_job_action": "not an interactive image-job action",
"render.error_interactive_command": "unbound interactive Render command"
},
"ja": {
"cmd.view.render_focus": "Renderフォーカス表示",
"cmd.view.render_browser": "Renderブラウザー",
"render.exit_focus": "フォーカス表示を終了",
"render.fold_browser": "ブラウザーを折りたたむ",
"render.spot_cone": "スポット円錐",
"render.emitted_axis": "照射軸",
"render.inner_half_angle": "内側半角",
"render.outer_half_angle": "外側半角",
"render.layer_off_suffix": "(オフ)",
"render.tone_reinhard": "Reinhard",
"render.tone_aces_fitted": "ACES近似",
"render.size_hd": "HD",
"render.size_full_hd": "フルHD",
"render.size_4k_uhd": "4K UHD",
"render.result_actual_size": "100%",
"render.property_unknown": "不明",
"render.property_fallback": "プロパティ",
"render.property_source": "出典: {id} - {locator}",
"render.property_qualifier": "修飾条件: {value}",
"render.property_conditions": "条件: {value}",
"render.property_uncertainty": "不確かさ: {value}",
"render.error_setup_panicked": "GPUパストレーサーの初期化に失敗しました",
"render.error_setup_worker": "初期化ワーカーを開始できません: {error}",
"render.error_setup_stopped": "初期化ワーカーがホストを返さずに停止しました",
"render.error_gpu_samples": "未対応のGPUサンプル数",
"render.error_preview_device": "製品プレビューには深度バッファーを備えたデバイスが必要です",
"render.error_finish_operation": "Renderに入る前に現在のモデリング操作を完了してください",
"render.error_no_completed_image": "完了したレンダリング画像がありません",
"render.error_provisional_identity": "仮レンダリングの識別情報またはサンプル数が無効です",
"render.error_checkpoint_dimensions": "チェックポイントの寸法が取得済みリクエストと異なります",
"render.error_display_dimensions": "画像の表示寸法が無効です",
"render.error_display_fit": "このデバイスに画像表示を収められません",
"render.error_display_width": "表示幅が上限を超えています",
"render.error_display_height": "表示高さが上限を超えています",
"render.error_image_profile": "レンダリング画像が取得済みリソース枠を超えています",
"render.error_decode_budget": "画像デコードの容量が上限を超えています",
"render.error_image_dimensions": "レンダリング画像の寸法がジョブと一致しません",
"render.error_upload_slot": "製品プレビューのアップロード枠が利用できません",
"render.error_export_document": "出力先の選択中にレンダリング書き出し元のドキュメントが変更されました",
"render.error_geometry_size": "製品形状のサイズが上限を超えています",
"render.error_vertex_envelope": "製品プレビューが頂点データの上限{limit} MiBを超えています。形状は簡略化されていません",
"render.error_body_bound": "製品プレビューが取得ボディ数の上限を超えています",
"render.error_triangle_count": "製品の三角形数が上限を超えています",
"render.error_triangle_bound": "製品プレビューが元データの800万三角形の上限を超えています",
"render.error_face_cap": "製品プレビューが面の外観数の上限を超えています",
"render.error_opacity": "製品の外観の不透明度が無効です",
"render.error_duplicate_face": "製品の面の外観が重複しています",
"render.error_pbr_opacity": "不透明PBRには不透明度1が必要です",
"render.error_vertex_allocation": "製品プレビューの頂点メモリー確保に失敗しました",
"render.error_product_triangle": "製品の三角形が無効です",
"render.error_surface_normals": "PBRにはゼロでない面法線が必要です",
"render.error_vertex_packing": "製品プレビューの配置が許可済み頂点データと異なります",
"render.error_gpu_preview": "このホストではGPU製品プレビューを利用できません。保存済み設定は引き続き利用できます。",
"render.error_fixed_preview": "固定スタジオプレビューには露出0、環境回転0、強度1が必要です",
"render.error_finish_gesture": "プレビューの前にモデリング操作を完了してください",
"render.error_no_scene": "製品シーンがありません",
"render.error_no_geometry": "製品形状がありません",
"render.error_visible_solid": "ここでプレビューするにはDesignで表示可能なソリッドを作成してください。",
"render.error_area_samples": "area_samplesは1、4、16、64のいずれかです",
"render.error_quality_method": "品質設定の反映には同じ明示的なGPU方式が必要です",
"render.error_quality_projection": "ネイティブ品質設定の反映が無効です",
"render.error_denoise_setting": "ネイティブノイズ除去設定が無効です",
"render.error_quality_bounds": "品質設定の反映がネイティブ上限を超えています",
"render.error_library_reply": "Renderライブラリーの応答が無効です",
"render.error_source_preview": "ソースプレビューがデータ容量の上限を超えています",
"render.error_glass_recipe": "不明なガラスレシピ",
"render.error_physical_glass": "選択したレシピは物理ガラスではありません",
"render.error_scene_bodies": "レンダリングシーンのボディがありません",
"render.error_scene_body_limit": "レンダリングシーンがボディ数の上限を超えています",
"render.error_scene_identity": "レンダリングシーンの識別情報が無効です",
"render.error_material_binding": "マテリアルの割り当てがありません",
"render.error_surface_reply": "作成済みサーフェスの応答が無効です",
"render.error_binding_allocation": "マテリアルの割り当て領域を確保できません",
"render.error_job_identity": "レンダリングジョブの識別情報が無効です: {error}",
"render.error_regrade_identity": "再調整の識別情報が無効です: {error}",
"render.error_job_action": "対話型画像ジョブ操作ではありません",
"render.error_interactive_command": "未接続の対話型Renderコマンド"
},
"zh": {
"cmd.view.render_focus": "渲染专注视图",
"cmd.view.render_browser": "渲染浏览器",
"render.exit_focus": "退出专注视图",
"render.fold_browser": "折叠浏览器",
"render.spot_cone": "聚光锥",
"render.emitted_axis": "发射轴",
"render.inner_half_angle": "内半角",
"render.outer_half_angle": "外半角",
"render.layer_off_suffix": "(关闭)",
"render.tone_reinhard": "Reinhard",
"render.tone_aces_fitted": "ACES 拟合",
"render.size_hd": "HD",
"render.size_full_hd": "全高清",
"render.size_4k_uhd": "4K 超高清",
"render.result_actual_size": "100%",
"render.property_unknown": "未知",
"render.property_fallback": "属性",
"render.property_source": "来源:{id} - {locator}",
"render.property_qualifier": "限定条件:{value}",
"render.property_conditions": "条件:{value}",
"render.property_uncertainty": "不确定度:{value}",
"render.error_setup_panicked": "GPU 路径追踪器初始化异常",
"render.error_setup_worker": "无法启动初始化任务:{error}",
"render.error_setup_stopped": "初始化任务停止且未返回主机",
"render.error_gpu_samples": "不支持的 GPU 采样数",
"render.error_preview_device": "产品预览需要带深度缓冲区的设备",
"render.error_finish_operation": "请先完成当前建模操作再进入渲染",
"render.error_no_completed_image": "没有已完成的渲染图像",
"render.error_provisional_identity": "临时渲染标识或采样数无效",
"render.error_checkpoint_dimensions": "检查点尺寸与捕获的请求不同",
"render.error_display_dimensions": "图像显示尺寸无效",
"render.error_display_fit": "图像显示无法适配此设备",
"render.error_display_width": "显示宽度溢出",
"render.error_display_height": "显示高度溢出",
"render.error_image_profile": "渲染图像超出捕获的资源配置",
"render.error_decode_budget": "图像解码预算溢出",
"render.error_image_dimensions": "渲染图像尺寸与任务不匹配",
"render.error_upload_slot": "产品预览上传槽不可用",
"render.error_export_document": "选择目标位置时渲染导出文档已更改",
"render.error_geometry_size": "产品几何数据大小溢出",
"render.error_vertex_envelope": "产品预览超出 {limit} MiB 顶点数据上限;未简化几何形状",
"render.error_body_bound": "产品预览超出捕获实体数上限",
"render.error_triangle_count": "产品三角形数溢出",
"render.error_triangle_bound": "产品预览超出源数据八百万三角形上限",
"render.error_face_cap": "产品预览超出面外观数量上限",
"render.error_opacity": "产品外观不透明度无效",
"render.error_duplicate_face": "产品面外观重复",
"render.error_pbr_opacity": "不透明 PBR 要求不透明度为 1",
"render.error_vertex_allocation": "产品预览顶点内存分配失败",
"render.error_product_triangle": "产品三角形无效",
"render.error_surface_normals": "PBR 要求非零表面法线",
"render.error_vertex_packing": "产品预览打包与允许的顶点数据不符",
"render.error_gpu_preview": "此主机不支持 GPU 产品预览。已保存的设置仍可使用。",
"render.error_fixed_preview": "固定工作室预览要求曝光为 0、环境旋转为 0、强度为 1",
"render.error_finish_gesture": "请先完成建模操作再预览",
"render.error_no_scene": "没有产品场景",
"render.error_no_geometry": "没有产品几何形状",
"render.error_visible_solid": "请在设计中创建可见实体以在此预览。",
"render.error_area_samples": "area_samples 必须为 1、4、16 或 64",
"render.error_quality_method": "质量映射要求相同的显式 GPU 方法",
"render.error_quality_projection": "原生质量映射无效",
"render.error_denoise_setting": "原生降噪设置无效",
"render.error_quality_bounds": "质量映射超出原生限制",
"render.error_library_reply": "渲染库响应无效",
"render.error_source_preview": "源预览超出字节数上限",
"render.error_glass_recipe": "未知的玻璃配方",
"render.error_physical_glass": "所选配方不是物理玻璃",
"render.error_scene_bodies": "缺少渲染场景实体",
"render.error_scene_body_limit": "渲染场景超出实体数上限",
"render.error_scene_identity": "渲染场景标识无效",
"render.error_material_binding": "缺少材质绑定",
"render.error_surface_reply": "已创作表面响应无效",
"render.error_binding_allocation": "无法分配材质绑定",
"render.error_job_identity": "渲染任务标识无效:{error}",
"render.error_regrade_identity": "重新调色标识无效:{error}",
"render.error_job_action": "不是交互式图像任务操作",
"render.error_interactive_command": "未绑定的交互式渲染命令"
},
"de": {
"cmd.view.render_focus": "Render-Fokusansicht",
"cmd.view.render_browser": "Render-Browser",
"render.exit_focus": "Fokus beenden",
"render.fold_browser": "Browser einklappen",
"render.spot_cone": "Spotkegel",
"render.emitted_axis": "Abstrahlachse",
"render.inner_half_angle": "Innerer Halbwinkel",
"render.outer_half_angle": "Äußerer Halbwinkel",
"render.layer_off_suffix": " (aus)",
"render.tone_reinhard": "Reinhard",
"render.tone_aces_fitted": "ACES angepasst",
"render.size_hd": "HD",
"render.size_full_hd": "Full HD",
"render.size_4k_uhd": "4K UHD",
"render.result_actual_size": "100%",
"render.property_unknown": "unbekannt",
"render.property_fallback": "Eigenschaft",
"render.property_source": "Quelle: {id} - {locator}",
"render.property_qualifier": "Qualifikator: {value}",
"render.property_conditions": "Bedingungen: {value}",
"render.property_uncertainty": "Unsicherheit: {value}",
"render.error_setup_panicked": "GPU-Pfadverfolgung konnte nicht initialisiert werden",
"render.error_setup_worker": "Initialisierung konnte nicht gestartet werden: {error}",
"render.error_setup_stopped": "Initialisierung ohne Host beendet",
"render.error_gpu_samples": "Nicht unterstützte GPU-Sampleanzahl",
"render.error_preview_device": "Produktvorschau benötigt ein Gerät mit Tiefenpuffer",
"render.error_finish_operation": "Aktuellen Modellierungsvorgang vor Render abschließen",
"render.error_no_completed_image": "Kein fertiges Renderbild vorhanden",
"render.error_provisional_identity": "Ungültige vorläufige Renderkennung oder Sampleanzahl",
"render.error_checkpoint_dimensions": "Checkpoint-Abmessungen weichen von der erfassten Anfrage ab",
"render.error_display_dimensions": "Ungültige Bildanzeigeabmessungen",
"render.error_display_fit": "Bildanzeige passt nicht auf dieses Gerät",
"render.error_display_width": "Überlauf der Anzeigebreite",
"render.error_display_height": "Überlauf der Anzeigehöhe",
"render.error_image_profile": "Renderbild überschreitet das erfasste Ressourcenprofil",
"render.error_decode_budget": "Überlauf des Bilddekodierungsbudgets",
"render.error_image_dimensions": "Renderbildabmessungen stimmen nicht mit dem Auftrag überein",
"render.error_upload_slot": "Upload-Platz für Produktvorschau nicht verfügbar",
"render.error_export_document": "Das Render-Exportdokument wurde während der Zielauswahl geändert",
"render.error_geometry_size": "Überlauf der Produktgeometriegröße",
"render.error_vertex_envelope": "Produktvorschau überschreitet {limit} MiB Scheitelpunktdaten; Geometrie wurde nicht vereinfacht",
"render.error_body_bound": "Produktvorschau überschreitet die Grenze erfasster Körper",
"render.error_triangle_count": "Überlauf der Produktdreiecksanzahl",
"render.error_triangle_bound": "Produktvorschau überschreitet acht Millionen Quelldreiecke",
"render.error_face_cap": "Produktvorschau überschreitet die Grenze für Flächendarstellungen",
"render.error_opacity": "Ungültige Deckkraft der Produktdarstellung",
"render.error_duplicate_face": "Doppelte Produktflächendarstellung",
"render.error_pbr_opacity": "Undurchsichtiges PBR benötigt Deckkraft 1",
"render.error_vertex_allocation": "Scheitelpunktspeicher für Produktvorschau konnte nicht reserviert werden",
"render.error_product_triangle": "Ungültiges Produktdreieck",
"render.error_surface_normals": "PBR benötigt Oberflächennormalen ungleich null",
"render.error_vertex_packing": "Produktvorschau stimmt nicht mit den zugelassenen Scheitelpunktdaten überein",
"render.error_gpu_preview": "GPU-Produktvorschau ist auf diesem Host nicht verfügbar. Gespeicherte Setups bleiben verfügbar.",
"render.error_fixed_preview": "Feste Studiovorschau benötigt Belichtung 0, Umgebungsdrehung 0 und Intensität 1",
"render.error_finish_gesture": "Modellierungsgeste vor der Vorschau abschließen",
"render.error_no_scene": "Keine Produktszene",
"render.error_no_geometry": "Keine Produktgeometrie",
"render.error_visible_solid": "In Design einen sichtbaren Volumenkörper erstellen, um ihn hier anzuzeigen.",
"render.error_area_samples": "area_samples muss 1, 4, 16 oder 64 sein",
"render.error_quality_method": "Qualitätsübertragung benötigt dieselbe explizite GPU-Methode",
"render.error_quality_projection": "Ungültige native Qualitätsübertragung",
"render.error_denoise_setting": "Ungültige native Entrauschungseinstellung",
"render.error_quality_bounds": "Qualitätsübertragung überschreitet native Grenzen",
"render.error_library_reply": "Ungültige Render-Bibliotheksantwort",
"render.error_source_preview": "Quellvorschau überschreitet ihr Datenlimit",
"render.error_glass_recipe": "Unbekanntes Glasrezept",
"render.error_physical_glass": "Das gewählte Rezept ist kein physikalisches Glas",
"render.error_scene_bodies": "Körper der Renderszene fehlen",
"render.error_scene_body_limit": "Renderszene überschreitet ihre Körpergrenze",
"render.error_scene_identity": "Ungültige Renderszenenkennung",
"render.error_material_binding": "Materialzuordnung fehlt",
"render.error_surface_reply": "Ungültige Antwort der erstellten Oberfläche",
"render.error_binding_allocation": "Materialzuordnung konnte nicht reserviert werden",
"render.error_job_identity": "Ungültige Renderauftragskennung: {error}",
"render.error_regrade_identity": "Ungültige Nachbearbeitungskennung: {error}",
"render.error_job_action": "Keine interaktive Bildauftragsaktion",
"render.error_interactive_command": "Nicht zugeordneter interaktiver Renderbefehl"
},
"ko": {
"cmd.view.render_focus": "렌더 집중 보기",
"cmd.view.render_browser": "렌더 브라우저",
"render.exit_focus": "집중 보기 종료",
"render.fold_browser": "브라우저 접기",
"render.spot_cone": "스폿 원뿔",
"render.emitted_axis": "방출 축",
"render.inner_half_angle": "내부 반각",
"render.outer_half_angle": "외부 반각",
"render.layer_off_suffix": " (꺼짐)",
"render.tone_reinhard": "Reinhard",
"render.tone_aces_fitted": "ACES 근사",
"render.size_hd": "HD",
"render.size_full_hd": "풀 HD",
"render.size_4k_uhd": "4K UHD",
"render.result_actual_size": "100%",
"render.property_unknown": "알 수 없음",
"render.property_fallback": "속성",
"render.property_source": "출처: {id} - {locator}",
"render.property_qualifier": "한정 조건: {value}",
"render.property_conditions": "조건: {value}",
"render.property_uncertainty": "불확도: {value}",
"render.error_setup_panicked": "GPU 경로 추적기 초기화 오류",
"render.error_setup_worker": "초기화 작업을 시작할 수 없음: {error}",
"render.error_setup_stopped": "초기화 작업이 호스트를 반환하지 않고 중지됨",
"render.error_gpu_samples": "지원하지 않는 GPU 샘플 수",
"render.error_preview_device": "제품 미리 보기에는 깊이 버퍼가 있는 장치가 필요함",
"render.error_finish_operation": "렌더로 전환하기 전에 현재 모델링 작업을 완료하세요",
"render.error_no_completed_image": "완료된 렌더 이미지가 없음",
"render.error_provisional_identity": "임시 렌더 식별자 또는 샘플 수가 잘못됨",
"render.error_checkpoint_dimensions": "체크포인트 크기가 캡처된 요청과 다름",
"render.error_display_dimensions": "이미지 표시 크기가 잘못됨",
"render.error_display_fit": "이미지 표시가 이 장치에 맞지 않음",
"render.error_display_width": "표시 너비 초과",
"render.error_display_height": "표시 높이 초과",
"render.error_image_profile": "렌더 이미지가 캡처된 리소스 한도를 초과함",
"render.error_decode_budget": "이미지 디코딩 한도 초과",
"render.error_image_dimensions": "렌더 이미지 크기가 작업과 일치하지 않음",
"render.error_upload_slot": "제품 미리 보기 업로드 슬롯을 사용할 수 없음",
"render.error_export_document": "대상 위치를 선택하는 동안 렌더 내보내기 문서가 변경됨",
"render.error_geometry_size": "제품 형상 크기 초과",
"render.error_vertex_envelope": "제품 미리 보기가 {limit} MiB 꼭짓점 데이터 한도를 초과함. 형상은 단순화되지 않음",
"render.error_body_bound": "제품 미리 보기가 캡처된 바디 한도를 초과함",
"render.error_triangle_count": "제품 삼각형 수 초과",
"render.error_triangle_bound": "제품 미리 보기가 원본 삼각형 800만 개 한도를 초과함",
"render.error_face_cap": "제품 미리 보기가 면 모양 허용 한도를 초과함",
"render.error_opacity": "제품 모양 불투명도가 잘못됨",
"render.error_duplicate_face": "제품 면 모양이 중복됨",
"render.error_pbr_opacity": "불투명 PBR에는 불투명도 1이 필요함",
"render.error_vertex_allocation": "제품 미리 보기 꼭짓점 메모리 할당 실패",
"render.error_product_triangle": "제품 삼각형이 잘못됨",
"render.error_surface_normals": "PBR에는 0이 아닌 표면 법선이 필요함",
"render.error_vertex_packing": "제품 미리 보기 패킹이 허용된 꼭짓점 데이터와 다름",
"render.error_gpu_preview": "이 호스트에서는 GPU 제품 미리 보기를 사용할 수 없습니다. 저장된 설정은 계속 사용할 수 있습니다.",
"render.error_fixed_preview": "고정 스튜디오 미리 보기에는 노출 0, 환경 회전 0, 강도 1이 필요함",
"render.error_finish_gesture": "미리 보기 전에 모델링 동작을 완료하세요",
"render.error_no_scene": "제품 장면 없음",
"render.error_no_geometry": "제품 형상 없음",
"render.error_visible_solid": "여기서 미리 보려면 디자인에서 보이는 솔리드를 만드세요.",
"render.error_area_samples": "area_samples는 1, 4, 16 또는 64여야 함",
"render.error_quality_method": "품질 투영에는 동일한 명시적 GPU 방식이 필요함",
"render.error_quality_projection": "기본 품질 투영이 잘못됨",
"render.error_denoise_setting": "기본 노이즈 제거 설정이 잘못됨",
"render.error_quality_bounds": "품질 투영이 기본 한도를 초과함",
"render.error_library_reply": "렌더 라이브러리 응답이 잘못됨",
"render.error_source_preview": "원본 미리 보기가 바이트 한도를 초과함",
"render.error_glass_recipe": "알 수 없는 유리 레시피",
"render.error_physical_glass": "선택한 레시피가 물리 유리가 아님",
"render.error_scene_bodies": "렌더 장면 바디가 없음",
"render.error_scene_body_limit": "렌더 장면이 바디 한도를 초과함",
"render.error_scene_identity": "렌더 장면 식별자가 잘못됨",
"render.error_material_binding": "재질 연결이 없음",
"render.error_surface_reply": "작성된 표면 응답이 잘못됨",
"render.error_binding_allocation": "재질 연결을 할당할 수 없음",
"render.error_job_identity": "렌더 작업 식별자가 잘못됨: {error}",
"render.error_regrade_identity": "재보정 식별자가 잘못됨: {error}",
"render.error_job_action": "대화형 이미지 작업 동작이 아님",
"render.error_interactive_command": "연결되지 않은 대화형 렌더 명령"
},
"ar": {
"cmd.view.render_focus": "عرض تركيز التصيير",
"cmd.view.render_browser": "متصفح التصيير",
"render.exit_focus": "الخروج من التركيز",
"render.fold_browser": "طيّ المتصفح",
"render.spot_cone": "مخروط الكشّاف",
"render.emitted_axis": "المحور المنبعث",
"render.inner_half_angle": "نصف الزاوية الداخلية",
"render.outer_half_angle": "نصف الزاوية الخارجية",
"render.layer_off_suffix": " (متوقفة)",
"render.tone_reinhard": "راينهارد",
"render.tone_aces_fitted": "ACES مُلاءَم",
"render.size_hd": "HD",
"render.size_full_hd": "Full HD",
"render.size_4k_uhd": "4K UHD",
"render.result_actual_size": "100%",
"render.property_unknown": "غير معروف",
"render.property_fallback": "خاصية",
"render.property_source": "المصدر: {id} - {locator}",
"render.property_qualifier": "المؤهِّل: {value}",
"render.property_conditions": "الشروط: {value}",
"render.property_uncertainty": "عدم اليقين: {value}",
"render.error_setup_panicked": "حدث ذعر في إعداد متتبع المسار على بطاقة الرسومات",
"render.error_setup_worker": "تعذّر بدء عامل الإعداد: {error}",
"render.error_setup_stopped": "توقف عامل الإعداد دون إرجاع مضيف",
"render.error_gpu_samples": "عدد عينات GPU غير مدعوم",
"render.error_preview_device": "معاينة المنتج تتطلب جهازًا مثبّتًا بمخزن عمق",
"render.error_finish_operation": "أنهِ عملية النمذجة الحالية قبل الدخول إلى التصيير",
"render.error_no_completed_image": "لا توجد صورة مكتملة للتصيير",
"render.error_provisional_identity": "هوية تصيير مؤقتة أو عدد عينات غير صالح",
"render.error_checkpoint_dimensions": "أبعاد نقطة الحفظ تختلف عن الطلب الملتقط",
"render.error_display_dimensions": "أبعاد عرض الصورة غير صالحة",
"render.error_display_fit": "لا يمكن لعرض الصورة أن يلائم هذا الجهاز",
"render.error_display_width": "فيض في عرض العرض",
"render.error_display_height": "فيض في ارتفاع العرض",
"render.error_image_profile": "صورة التصيير تتجاوز ملف الموارد الملتقط",
"render.error_decode_budget": "فيض في ميزانية فك ترميز الصورة",
"render.error_image_dimensions": "أبعاد صورة التصيير لا تطابق مهمتها",
"render.error_upload_slot": "خانة رفع معاينة المنتج غير متاحة",
"render.error_export_document": "تغيّرت وثيقة تصدير التصيير أثناء اختيار وجهتها",
"render.error_geometry_size": "فيض في حجم هندسة المنتج",
"render.error_vertex_envelope": "معاينة المنتج تتجاوز غلاف حمولة الرؤوس البالغ {limit} ميبي بايت؛ لم تُبسَّط الهندسة",
"render.error_body_bound": "معاينة المنتج تتجاوز حد الأجسام الملتقطة",
"render.error_triangle_count": "فيض في عدد مثلثات المنتج",
"render.error_triangle_bound": "معاينة المنتج تتجاوز حد المصدر البالغ ثمانية ملايين مثلث",
"render.error_face_cap": "معاينة المنتج تتجاوز سقف قبول مظاهر الوجوه",
"render.error_opacity": "عتامة مظهر المنتج غير صالحة",
"render.error_duplicate_face": "مظهر وجه منتج مكرر",
"render.error_pbr_opacity": "PBR المعتم يتطلب عتامة 1",
"render.error_vertex_allocation": "فشل تخصيص رؤوس معاينة المنتج",
"render.error_product_triangle": "مثلث منتج غير صالح",
"render.error_surface_normals": "PBR يتطلب متجهات عادية غير صفرية للسطح",
"render.error_vertex_packing": "تغليف معاينة المنتج يختلف عن حمولة الرؤوس المقبولة",
"render.error_gpu_preview": "معاينة المنتج على GPU غير متاحة على هذا المضيف. تبقى الإعدادات المحفوظة متاحة.",
"render.error_fixed_preview": "معاينة الاستوديو الثابت تتطلب تعريضًا 0 وتدوير بيئة 0 وشدة 1",
"render.error_finish_gesture": "أنهِ إيماءة النمذجة قبل المعاينة",
"render.error_no_scene": "لا يوجد مشهد منتج",
"render.error_no_geometry": "لا توجد هندسة منتج",
"render.error_visible_solid": "أنشئ جسمًا مصمتًا مرئيًا في التصميم لمعاينته هنا.",
"render.error_area_samples": "يجب أن تكون area_samples 1 أو 4 أو 16 أو 64",
"render.error_quality_method": "إسقاط الجودة يتطلب طريقة GPU صريحة نفسها",
"render.error_quality_projection": "إسقاط جودة أصلي غير صالح",
"render.error_denoise_setting": "إعداد إزالة ضجيج أصلي غير صالح",
"render.error_quality_bounds": "إسقاط الجودة يتجاوز الحدود الأصلية",
"render.error_library_reply": "استجابة مكتبة التصيير غير صالحة",
"render.error_source_preview": "معاينة المصدر تتجاوز غلاف البايتات",
"render.error_glass_recipe": "وصفة زجاج غير معروفة",
"render.error_physical_glass": "الوصفة المحددة ليست زجاجًا فيزيائيًا",
"render.error_scene_bodies": "أجسام مشهد التصيير مفقودة",
"render.error_scene_body_limit": "مشهد التصيير يتجاوز حد الأجسام",
"render.error_scene_identity": "هوية مشهد التصيير غير صالحة",
"render.error_material_binding": "ربط المادة مفقود",
"render.error_surface_reply": "استجابة السطح المؤلَّف غير صالحة",
"render.error_binding_allocation": "تعذّر حجز ربط المادة",
"render.error_job_identity": "هوية مهمة التصيير غير صالحة: {error}",
"render.error_regrade_identity": "هوية إعادة التدرّج غير صالحة: {error}",
"render.error_job_action": "ليس إجراء مهمة صورة تفاعليًا",
"render.error_interactive_command": "أمر تصيير تفاعلي غير مربوط"
},
"he": {
"cmd.view.render_focus": "תצוגת מיקוד רינדור",
"cmd.view.render_browser": "דפדפן רינדור",
"render.exit_focus": "צא ממיקוד",
"render.fold_browser": "קפל דפדפן",
"render.spot_cone": "חרוט זרקור",
"render.emitted_axis": "ציר פליטה",
"render.inner_half_angle": "חצי זווית פנימית",
"render.outer_half_angle": "חצי זווית חיצונית",
"render.layer_off_suffix": " (כבוי)",
"render.tone_reinhard": "ריינהרד",
"render.tone_aces_fitted": "ACES מותאם",
"render.size_hd": "HD",
"render.size_full_hd": "Full HD",
"render.size_4k_uhd": "4K UHD",
"render.result_actual_size": "100%",
"render.property_unknown": "לא ידוע",
"render.property_fallback": "מאפיין",
"render.property_source": "מקור: {id} - {locator}",
"render.property_qualifier": "מגדיר: {value}",
"render.property_conditions": "תנאים: {value}",
"render.property_uncertainty": "אי-ודאות: {value}",
"render.error_setup_panicked": "הגדרת מעקב הנתיב ב-GPU קרסה",
"render.error_setup_worker": "לא ניתן להפעיל את עובד ההגדרה: {error}",
"render.error_setup_stopped": "עובד ההגדרה נעצר בלי להחזיר מארח",
"render.error_gpu_samples": "מספר דגימות GPU לא נתמך",
"render.error_preview_device": "תצוגה מקדימה של מוצר דורשת התקן מותקן עם מאגר עומק",
"render.error_finish_operation": "סיים את פעולת המידול הנוכחית לפני הכניסה לרינדור",
"render.error_no_completed_image": "לרינדור אין תמונה שהושלמה",
"render.error_provisional_identity": "זהות רינדור זמנית או מספר דגימות לא תקינים",
"render.error_checkpoint_dimensions": "ממדי נקודת הביקורת שונים מהבקשה שנקלטה",
"render.error_display_dimensions": "ממדי תצוגת התמונה לא תקינים",
"render.error_display_fit": "תצוגת התמונה אינה יכולה להתאים להתקן זה",
"render.error_display_width": "גלישה ברוחב התצוגה",
"render.error_display_height": "גלישה בגובה התצוגה",
"render.error_image_profile": "תמונת הרינדור חורגת מפרופיל המשאבים שנקלט",
"render.error_decode_budget": "גלישה בתקציב פענוח התמונה",
"render.error_image_dimensions": "ממדי תמונת הרינדור אינם תואמים למשימה שלה",
"render.error_upload_slot": "חריץ ההעלאה של תצוגת המוצר אינו זמין",
"render.error_export_document": "מסמך ייצוא הרינדור השתנה בזמן בחירת היעד שלו",
"render.error_geometry_size": "גלישה בגודל גאומטריית המוצר",
"render.error_vertex_envelope": "תצוגת המוצר חורגת ממעטפת עומס הקודקודים של {limit} MiB; הגאומטריה לא פושטה",
"render.error_body_bound": "תצוגת המוצר חורגת ממגבלת הגופים שנקלטו",
"render.error_triangle_count": "גלישה במספר משולשי המוצר",
"render.error_triangle_bound": "תצוגת המוצר חורגת ממגבלת המקור של שמונה מיליון משולשים",
"render.error_face_cap": "תצוגת המוצר חורגת ממכסת הקבלה של מראות פאות",
"render.error_opacity": "אטימות מראה מוצר לא תקינה",
"render.error_duplicate_face": "מראה פאת מוצר כפול",
"render.error_pbr_opacity": "PBR אטום דורש אטימות 1",
"render.error_vertex_allocation": "הקצאת קודקודי תצוגת המוצר נכשלה",
"render.error_product_triangle": "משולש מוצר לא תקין",
"render.error_surface_normals": "PBR דורש נורמלי משטח שאינם אפס",
"render.error_vertex_packing": "אריזת תצוגת המוצר שונה מעומס הקודקודים שהתקבל",
"render.error_gpu_preview": "תצוגת מוצר ב-GPU אינה זמינה במארח זה. הגדרות שמורות נשארות זמינות.",
"render.error_fixed_preview": "תצוגת סטודיו קבוע דורשת חשיפה 0, סיבוב סביבה 0 ועוצמה 1",
"render.error_finish_gesture": "סיים את מחוות המידול לפני התצוגה המקדימה",
"render.error_no_scene": "אין סצנת מוצר",
"render.error_no_geometry": "אין גאומטריית מוצר",
"render.error_visible_solid": "צור גוף מלא גלוי בעיצוב כדי לצפות בו כאן.",
"render.error_area_samples": "area_samples חייב להיות 1, 4, 16 או 64",
"render.error_quality_method": "הטלת איכות דורשת את אותה שיטת GPU מפורשת",
"render.error_quality_projection": "הטלת איכות מקורית לא תקינה",
"render.error_denoise_setting": "הגדרת הפחתת רעש מקורית לא תקינה",
"render.error_quality_bounds": "הטלת האיכות חורגת מהגבולות המקוריים",
"render.error_library_reply": "תגובת ספריית הרינדור לא תקינה",
"render.error_source_preview": "תצוגת המקור חורגת ממעטפת הבתים",
"render.error_glass_recipe": "מתכון זכוכית לא מוכר",
"render.error_physical_glass": "המתכון שנבחר אינו זכוכית פיזיקלית",
"render.error_scene_bodies": "גופי סצנת הרינדור חסרים",
"render.error_scene_body_limit": "סצנת הרינדור חורגת ממגבלת הגופים",
"render.error_scene_identity": "זהות סצנת הרינדור לא תקינה",
"render.error_material_binding": "קישור חומר חסר",
"render.error_surface_reply": "תגובת משטח מחבר לא תקינה",
"render.error_binding_allocation": "לא ניתן היה להקצות קישור חומר",
"render.error_job_identity": "זהות משימת רינדור לא תקינה: {error}",
"render.error_regrade_identity": "זהות כיול מחדש לא תקינה: {error}",
"render.error_job_action": "אינה פעולה אינטראקטיבית של משימת תמונה",
"render.error_interactive_command": "פקודת רינדור אינטראקטיבית לא קשורה"
},
"vi": {
"cmd.view.render_focus": "Chế độ xem tập trung kết xuất",
"cmd.view.render_browser": "Trình duyệt kết xuất",
"render.exit_focus": "Thoát tập trung",
"render.fold_browser": "Gập Trình duyệt",
"render.spot_cone": "Chóp đèn rọi",
"render.emitted_axis": "Trục phát",
"render.inner_half_angle": "Nửa góc trong",
"render.outer_half_angle": "Nửa góc ngoài",
"render.layer_off_suffix": " (tắt)",
"render.tone_reinhard": "Reinhard",
"render.tone_aces_fitted": "ACES khớp",
"render.size_hd": "HD",
"render.size_full_hd": "Full HD",
"render.size_4k_uhd": "4K UHD",
"render.result_actual_size": "100%",
"render.property_unknown": "không rõ",
"render.property_fallback": "thuộc tính",
"render.property_source": "Nguồn: {id} - {locator}",
"render.property_qualifier": "Bộ định tính: {value}",
"render.property_conditions": "Điều kiện: {value}",
"render.property_uncertainty": "Độ bất định: {value}",
"render.error_setup_panicked": "Thiết lập dò đường đi của tia bằng GPU bị lỗi nghiêm trọng",
"render.error_setup_worker": "không thể khởi động tiến trình thiết lập: {error}",
"render.error_setup_stopped": "tiến trình thiết lập dừng mà không trả về máy chủ",
"render.error_gpu_samples": "số mẫu GPU không được hỗ trợ",
"render.error_preview_device": "xem trước sản phẩm cần thiết bị đã cài có bộ đệm độ sâu",
"render.error_finish_operation": "hãy hoàn tất thao tác dựng mô hình hiện tại trước khi vào Kết xuất",
"render.error_no_completed_image": "kết xuất chưa có ảnh hoàn tất",
"render.error_provisional_identity": "danh tính kết xuất tạm hoặc số mẫu không hợp lệ",
"render.error_checkpoint_dimensions": "kích thước điểm kiểm tra khác với yêu cầu đã ghi",
"render.error_display_dimensions": "kích thước hiển thị ảnh không hợp lệ",
"render.error_display_fit": "hiển thị ảnh không thể vừa thiết bị này",
"render.error_display_width": "tràn chiều rộng hiển thị",
"render.error_display_height": "tràn chiều cao hiển thị",
"render.error_image_profile": "ảnh kết xuất vượt quá hồ sơ tài nguyên đã ghi",
"render.error_decode_budget": "tràn ngân sách giải mã ảnh",
"render.error_image_dimensions": "kích thước ảnh kết xuất không khớp với công việc của nó",
"render.error_upload_slot": "khe tải lên xem trước sản phẩm không khả dụng",
"render.error_export_document": "tài liệu xuất kết xuất đã đổi trong lúc chọn đích",
"render.error_geometry_size": "tràn kích thước hình học sản phẩm",
"render.error_vertex_envelope": "xem trước sản phẩm vượt quá giới hạn dữ liệu đỉnh {limit} MiB; hình học không được đơn giản hóa",
"render.error_body_bound": "xem trước sản phẩm vượt quá giới hạn thân đã ghi",
"render.error_triangle_count": "tràn số tam giác sản phẩm",
"render.error_triangle_bound": "xem trước sản phẩm vượt quá giới hạn nguồn tám triệu tam giác",
"render.error_face_cap": "xem trước sản phẩm vượt quá hạn mức chấp nhận diện mạo mặt",
"render.error_opacity": "độ đục diện mạo sản phẩm không hợp lệ",
"render.error_duplicate_face": "diện mạo mặt sản phẩm bị trùng",
"render.error_pbr_opacity": "PBR đục yêu cầu độ đục 1",
"render.error_vertex_allocation": "cấp phát đỉnh xem trước sản phẩm thất bại",
"render.error_product_triangle": "tam giác sản phẩm không hợp lệ",
"render.error_surface_normals": "PBR yêu cầu pháp tuyến bề mặt khác không",
"render.error_vertex_packing": "cách đóng gói xem trước sản phẩm khác dữ liệu đỉnh đã chấp nhận",
"render.error_gpu_preview": "Xem trước sản phẩm bằng GPU không khả dụng trên máy chủ này. Các thiết lập đã lưu vẫn dùng được.",
"render.error_fixed_preview": "xem trước studio cố định yêu cầu phơi sáng 0, xoay môi trường 0 và cường độ 1",
"render.error_finish_gesture": "hãy hoàn tất thao tác dựng mô hình trước khi xem trước",
"render.error_no_scene": "không có cảnh sản phẩm",
"render.error_no_geometry": "không có hình học sản phẩm",
"render.error_visible_solid": "Hãy tạo một khối đặc hiển thị trong Thiết kế để xem trước ở đây.",
"render.error_area_samples": "area_samples phải là 1, 4, 16 hoặc 64",
"render.error_quality_method": "phép chiếu chất lượng yêu cầu cùng phương pháp GPU tường minh",
"render.error_quality_projection": "phép chiếu chất lượng gốc không hợp lệ",
"render.error_denoise_setting": "cài đặt khử nhiễu gốc không hợp lệ",
"render.error_quality_bounds": "phép chiếu chất lượng vượt quá giới hạn gốc",
"render.error_library_reply": "phản hồi thư viện kết xuất không hợp lệ",
"render.error_source_preview": "xem trước nguồn vượt quá giới hạn byte",
"render.error_glass_recipe": "công thức kính không xác định",
"render.error_physical_glass": "công thức đã chọn không phải kính vật lý",
"render.error_scene_bodies": "thiếu các thân của cảnh kết xuất",
"render.error_scene_body_limit": "cảnh kết xuất vượt quá giới hạn thân",
"render.error_scene_identity": "danh tính cảnh kết xuất không hợp lệ",
"render.error_material_binding": "thiếu liên kết vật liệu",
"render.error_surface_reply": "phản hồi bề mặt tác giả không hợp lệ",
"render.error_binding_allocation": "không thể dành chỗ cho liên kết vật liệu",
"render.error_job_identity": "danh tính công việc kết xuất không hợp lệ: {error}",
"render.error_regrade_identity": "danh tính chỉnh lại màu không hợp lệ: {error}",
"render.error_job_action": "không phải hành động công việc ảnh tương tác",
"render.error_interactive_command": "lệnh Kết xuất tương tác chưa được gán"
}
}
+55
View File
@@ -4,8 +4,13 @@ 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};
use crate::schema::{TypedContract, output_schema_for};
use crate::{Result, Sel, Session};
const FOCUS_CONTRACT: TypedContract<RenderFocus> = TypedContract::new();
const BROWSER_CONTRACT: TypedContract<RenderBrowser> = 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"),
@@ -23,6 +28,14 @@ CommandSpec::new("view.ground_shadow", "Ground shadow", ground_shadow)
.icon("style").noundo().doc_only().params("on?: bool (omitted: toggle) → on?; show the ground shadow"),
CommandSpec::new("view.navigation_bar", "Navigation bar", navigation_bar)
.icon("pan").noundo().doc_only().params("visible?: bool (omitted: toggle) → visible?; show the navigation bar (window setting)"),
CommandSpec::new("view.render_focus", "Render Focus View", crate::checked!("view.render_focus", render_focus))
.icon("render_scene").noundo().doc_only()
.contract(&FOCUS_CONTRACT).output(output_schema_for::<RenderFocus>)
.params("on: bool → {on}; per-window UI state, never saved in the design; headless validation only"),
CommandSpec::new("view.render_browser", "Render Browser", crate::checked!("view.render_browser", render_browser))
.icon("list").noundo().doc_only()
.contract(&BROWSER_CONTRACT).output(output_schema_for::<RenderBrowser>)
.params("open: bool → {open}; narrow-window Browser card; per-window UI state, headless validation only"),
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"),
@@ -215,6 +228,16 @@ fn navigation_bar(_s: &mut Session, p: &Value) -> Result<Value> {
view_toggle(p, "view.navigation_bar", "visible")
}
fn render_focus(_s: &mut Session, p: &Value) -> Result<Value> {
let request: RenderFocus = serde_json::from_value(p.clone()).map_err(|e| bad("view.render_focus", e.to_string()))?;
Ok(json!(request))
}
fn render_browser(_s: &mut Session, p: &Value) -> Result<Value> {
let request: RenderBrowser = serde_json::from_value(p.clone()).map_err(|e| bad("view.render_browser", e.to_string()))?;
Ok(json!(request))
}
fn render_stage(_s: &mut Session, p: &Value) -> Result<Value> {
#[derive(serde::Deserialize)]
#[serde(deny_unknown_fields)]
@@ -885,6 +908,38 @@ fn workspace_layout_validates_modes_without_mutating_the_design() {
assert!(session.undo.is_empty());
}
#[cfg(test)]
#[test]
fn render_workspace_focus_and_browser_validate_without_side_effects() {
let mut session = Session { camera: Some(Camera::default()), ..Default::default() };
let camera = session.camera;
let document = session.doc.clone();
let before = (session.undo.len(), session.redo.len(), session.revision, session.evaluations, session.is_dirty());
for (id, field) in [("view.render_focus", "on"), ("view.render_browser", "open")] {
let command = crate::find_command(id).unwrap();
assert!(command.contract.is_some() && command.output.is_some());
for on in [true, false] {
let request = json!({field:on});
assert_eq!(session.execute(id, &request).unwrap(), request);
}
for params in [
Value::Null,
json!([]),
json!({}),
json!({field:null}),
json!({field:"true"}),
json!({field:1e300}),
json!({field:[]}),
json!({field:true,"unknown":false}),
] {
assert!(session.execute(id, &params).is_err(), "{id}: {params}");
}
}
assert!(std::sync::Arc::ptr_eq(&document, &session.doc));
assert_eq!(session.camera, camera);
assert_eq!(before, (session.undo.len(), session.redo.len(), session.revision, session.evaluations, session.is_dirty()));
}
#[cfg(test)]
#[test]
fn render_workspace_shots_strip_is_a_validated_headless_preference_request() {
+15 -1
View File
@@ -1,4 +1,4 @@
//! UI-only Render dock request and echo contract.
//! Render shell requests. The UI applies validated echoes without design edits.
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
@@ -22,3 +22,17 @@ pub enum DockSide {
Left,
Right,
}
#[derive(Debug, Deserialize, Serialize, JsonSchema)]
#[serde(deny_unknown_fields)]
pub struct RenderFocus {
/// Hide the Render docks while retaining their layout and the current camera.
pub on: bool,
}
#[derive(Debug, Deserialize, Serialize, JsonSchema)]
#[serde(deny_unknown_fields)]
pub struct RenderBrowser {
/// Open the floating Browser card in a narrow Render window.
pub open: bool,
}
+24 -2
View File
@@ -1067,15 +1067,37 @@ pub fn browser(app: &mut SolveApp, ui: &mut egui::Ui) {
fn render_card(app: &mut SolveApp, ui: &mut egui::Ui, acts: &mut Actions) {
let bounds = crate::shell::panel_bounds(app, ui.available_rect_before_wrap());
let narrow = bounds.width() < 800.0;
crate::shell::register_panel(app, "render:browser:show", None, None);
if narrow && !app.shell.render_browser_open {
app.shell.browser = None;
crate::shell::register_panel(app, "render:browser", None, None);
crate::render_ui::dock_chip(app, ui, "render:browser:show", "ui.browser_title", "view.render_browser", json!({"open":true}));
return;
}
let mut side = app.preferences.render_browser_side.clone();
let mut width = app.preferences.render_browser_width;
let title = app.tr("ui.browser_title").to_string();
let content = crate::ui_kit::Panel::workspace(
ui,
crate::ui_kit::WorkspaceOptions { id: "render:browser", title: &title, icon: "list", bounds, fill_height: true },
crate::ui_kit::WorkspaceOptions {
id: "render:browser",
title: &title,
icon: "list",
bounds,
fill_height: true,
compact: crate::render_ui::compact(app, bounds.width()),
},
&mut side,
&mut width,
|ui| {
if narrow {
let hide = crate::ui_kit::button(ui, app.tr("render.fold_browser"), crate::ui_kit::Button::Normal);
crate::scenario::publish_target("render:browser:hide", hide.rect);
if hide.clicked() {
let _ = app.run("view.render_browser", json!({"open":false}));
}
}
browser_contents(app, ui, acts, true);
},
);
@@ -1091,7 +1113,7 @@ fn render_card(app: &mut SolveApp, ui: &mut egui::Ui, acts: &mut Actions) {
app,
"render:browser",
rect,
Some(if side == "left" { crate::ui_kit::Edge::Left } else { crate::ui_kit::Edge::Right }),
if narrow { None } else { Some(if side == "left" { crate::ui_kit::Edge::Left } else { crate::ui_kit::Edge::Right }) },
);
if let Some(rect) = rect {
crate::scenario::publish_rect("browser:card", rect);
+23 -2
View File
@@ -1039,6 +1039,18 @@ impl SolveApp {
&strings("closed_by_default"),
);
}
if id == "view.render_focus"
&& let Some(on) = v.get("on").and_then(Value::as_bool)
{
self.shell.render_focus = on;
render_ui::reset_shell(self);
self.shell.content = None;
}
if id == "view.render_browser"
&& let Some(open) = v.get("open").and_then(Value::as_bool)
{
self.shell.render_browser_open = open;
}
if id == "view.render_stage"
&& let Some(stage) = v.get("stage").and_then(Value::as_str)
{
@@ -1279,6 +1291,14 @@ impl SolveApp {
let _ = self.run(id, json!({"mode":mode}));
return;
}
if id == "view.render_focus" {
let _ = self.run(id, json!({"on": !self.shell.render_focus}));
return;
}
if id == "view.render_browser" {
let _ = self.run(id, json!({"open": !self.shell.render_browser_open}));
return;
}
if id == "view.shots_strip" {
let _ = self.run(id, json!({"visible": !self.preferences.render_shots_strip}));
return;
@@ -2226,6 +2246,7 @@ impl SolveApp {
}
let floating = render_workspace::active(self) || ui_kit::Container::new(ui.ctx(), ui_kit::Surface::Panel).floating();
timeline::follow_view_pick(self);
render_ui::focus_shortcut(self, ui);
let show_timeline = self.ui.show_timeline && !render_workspace::active(self);
let left_timeline = show_timeline && self.preferences.timeline_left;
timeline_left::animate_folds(self, ui.ctx());
@@ -2240,7 +2261,7 @@ impl SolveApp {
timeline::timeline(self, ui);
}
// Browser hugs its contents in either layout; it never becomes a full-height blank column.
if !self.ui.show_browser {
if !self.ui.show_browser || render_ui::focused(self) {
self.shell.browser = None;
shell::register_panel(self, "render:browser", None, None);
}
@@ -2293,7 +2314,7 @@ impl SolveApp {
render_ui::shots_strip(self, ui);
render_workspace::panel(self, ui);
}
if self.ui.show_browser {
if self.ui.show_browser && !render_ui::focused(self) {
browser::browser(self, ui);
}
if floating {
+46 -4
View File
@@ -7,8 +7,23 @@ use crate::{
use egui::{Rect, vec2};
pub(crate) fn reset_shell(app: &mut SolveApp) {
for id in ["render:inspector", "render:browser", "render:shots_strip", "render:shots:show"] {
crate::shell::register_panel(app, id, None, None);
app.shell.workspace_panels.retain(|id, _| !id.starts_with("render:"));
app.shell.browser = None;
}
pub(crate) fn focused(app: &SolveApp) -> bool {
crate::render_workspace::active(app) && app.shell.render_focus
}
pub(crate) fn compact(app: &SolveApp, width: f32) -> bool {
width < 1100.0 || app.ui.layout == crate::shell::LayoutMode::Docked
}
pub(crate) fn focus_shortcut(app: &mut SolveApp, ui: &mut egui::Ui) {
if crate::render_workspace::active(app) && !ui.ctx().text_edit_focused() && ui.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Tab))
{
ui.ctx().memory_mut(|memory| memory.move_focus(egui::FocusDirection::None));
app.start("view.render_focus");
}
}
@@ -154,13 +169,40 @@ fn stage_tools(app: &mut SolveApp, ui: &mut egui::Ui) {
}
pub(crate) fn overlays(app: &mut SolveApp, ui: &mut egui::Ui) {
crate::shell::register_panel(app, "render:focus:exit", None, None);
if focused(app) {
dock_chip(app, ui, "render:focus:exit", "render.exit_focus", "view.render_focus", serde_json::json!({"on":false}));
}
let Some(viewport) = app.viewport.rect else { return };
let free = canvas(app, viewport);
if !free.is_positive() {
return;
}
crate::navigation_bar_view::show(app, ui, viewport);
shots_pill(app, ui, free);
if !focused(app) {
shots_pill(app, ui, free);
}
}
/// Shared kit chip at the Browser's remembered side, below the stage bar.
pub(crate) fn dock_chip(app: &mut SolveApp, ui: &mut egui::Ui, id: &'static str, label: &str, command: &str, params: serde_json::Value) {
let bounds = crate::shell::panel_bounds(app, ui.max_rect());
let t = Tokens::get();
if bounds.width() < t.control_height || bounds.height() < t.control_height {
return;
}
let left = app.preferences.render_browser_side == "left";
let position = if left { bounds.left_top() + vec2(t.space_8, 0.0) } else { bounds.right_top() - vec2(t.space_8, 0.0) };
let ctx = ui.ctx().clone();
let chip =
Container::navigation_card(&ctx, egui::Id::new(id), position, if left { egui::Align2::LEFT_TOP } else { egui::Align2::RIGHT_TOP }, |ui| {
let response = ui_kit::choice_chip(ui, id, app.tr(label), false);
crate::scenario::publish_target(id, response.rect);
if response.clicked() {
let _ = app.run(command, params);
}
});
crate::shell::register_panel(app, id, Some(chip.response.rect), None);
}
fn current_pick_mode(app: &SolveApp) -> &'static str {
@@ -199,7 +241,7 @@ fn shots_pill(app: &mut SolveApp, ui: &mut egui::Ui, free: Rect) {
/// Existing saved-shot and job actions inside the shared floating bottom-strip host.
pub(crate) fn shots_strip(app: &mut SolveApp, ui: &mut egui::Ui) {
crate::shell::register_panel(app, "render:shots_strip", None, None);
if !app.preferences.render_shots_strip {
if focused(app) || !app.preferences.render_shots_strip {
return;
}
let available = ui.available_rect_before_wrap();
+52 -46
View File
@@ -112,12 +112,12 @@ impl PathHost {
// Dropping the handle detaches: neither startup nor shutdown joins a driver
// that may spend minutes compiling or warming up its pipelines.
*self = match std::thread::Builder::new().name("gpu-path-setup".into()).spawn(move || {
let result =
std::panic::catch_unwind(std::panic::AssertUnwindSafe(create)).unwrap_or_else(|_| Err("GPU path tracer setup panicked".into()));
let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(create))
.unwrap_or_else(|_| Err(crate::i18n::tr("render.error_setup_panicked").into()));
let _ = tx.send(result);
}) {
Ok(_) => Self::Preparing(rx, std::time::Instant::now()),
Err(e) => Self::failed(format!("could not start setup worker: {e}")),
Err(e) => Self::failed(crate::i18n::format("render.error_setup_worker", &[("error", &e.to_string())])),
};
}
@@ -134,7 +134,7 @@ impl PathHost {
Ok(Ok(host)) => Self::Ready(host),
Ok(Err(error)) => Self::failed(error),
Err(std::sync::mpsc::TryRecvError::Empty) => return None,
Err(std::sync::mpsc::TryRecvError::Disconnected) => Self::failed("setup worker stopped without returning a host".into()),
Err(std::sync::mpsc::TryRecvError::Disconnected) => Self::failed(crate::i18n::tr("render.error_setup_stopped").into()),
};
matches!(self, Self::Ready(_)).then_some(took)
}
@@ -404,14 +404,14 @@ pub(crate) fn inspect_state(app: &SolveApp) -> serde_json::Value {
pub fn host_executor(max_dimension: u32, depth: bool, samples: u32) -> Result<ExecutorDescriptor, String> {
if !matches!(samples, 1 | 2 | 4 | 8 | 16) {
return Err("unsupported GPU sample count".into());
return Err(crate::i18n::tr("render.error_gpu_samples").into());
}
Ok(ExecutorDescriptor {
id: ExecutorId::new("gpu-viewport").map_err(|e| e.to_string())?,
availability: if depth && max_dimension > 0 {
Availability::Available
} else {
Availability::Unavailable { reason: "product preview requires an installed device with a depth buffer".into() }
Availability::Unavailable { reason: crate::i18n::tr("render.error_preview_device").into() }
},
profiles: vec![RenderProfile {
mode: RenderMode::Preview,
@@ -511,7 +511,7 @@ pub fn invalidate_scene(app: &mut SolveApp) {
pub fn enter(app: &mut SolveApp, render: bool) -> Result<(), String> {
if render {
if app.session.active_sketch.is_some() || app.tool.is_some() || app.dialog.is_some() || app.file_load.busy() {
return Err("finish the current modelling operation before entering Render".into());
return Err(crate::i18n::tr("render.error_finish_operation").into());
}
app.run("render.scene", json!({}))?;
if !active(app) {
@@ -584,6 +584,9 @@ pub(crate) fn job_ready(app: &SolveApp, id: &str) -> Result<(), String> {
}
pub fn panel(app: &mut SolveApp, ui: &mut egui::Ui) {
if crate::render_ui::focused(app) {
return;
}
inspector::panel(app, ui);
}
@@ -803,7 +806,7 @@ fn image_edit_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
if crate::ui_kit::button(ui, app.tr("render.result_fit"), crate::ui_kit::Button::Normal).clicked() {
fit_result(app);
}
if crate::ui_kit::button(ui, "100%", crate::ui_kit::Button::Enabled(!reduced_display(app)))
if crate::ui_kit::button(ui, crate::i18n::tr("render.result_actual_size"), crate::ui_kit::Button::Enabled(!reduced_display(app)))
.on_hover_text(app.tr("render.result_actual_help"))
.clicked()
{
@@ -906,7 +909,7 @@ fn job_controls(app: &mut SolveApp, ui: &mut egui::Ui, compact: bool) {
if let Some(job) = app.render_workspace.view.job {
match app.session.execute("render.status", &json!({"job":job})) {
Ok(status) => {
let phase = status["progress"]["phase"].as_str().unwrap_or("unknown");
let phase = status["progress"]["phase"].as_str().unwrap_or(crate::i18n::tr("render.property_unknown"));
busy = matches!(phase, "queued" | "preparing" | "running" | "encoding" | "cancelling");
if phase == "completed" {
app.render_workspace.view.completed = Some(job);
@@ -1051,7 +1054,7 @@ fn cache_completed_image(app: &mut SolveApp, ctx: &egui::Context) {
app.render_workspace.image_info = None;
let result = (|| -> Result<egui::TextureHandle, String> {
let handle = app.session.render_job_handle(job).map_err(|e| e.to_string())?;
let frame = handle.frame().map_err(|e| e.to_string())?.ok_or("render has no completed image")?;
let frame = handle.frame().map_err(|e| e.to_string())?.ok_or(crate::i18n::tr("render.error_no_completed_image"))?;
let captured = handle.status().map_err(|e| e.to_string())?;
let budget = if frame.info.executor.as_str() == "gpu-path" {
solidcraft_engine::render::job::GPU_PATH_LIMITS
@@ -1092,12 +1095,12 @@ fn cache_preview_frame(app: &mut SolveApp, ctx: &egui::Context, info: &PreviewIn
}
let result = (|| -> Result<egui::TextureHandle, String> {
if info.frame_sequence == 0 || !(1..=4096).contains(&info.samples_per_pixel) {
return Err("invalid provisional render identity or sample count".into());
return Err(crate::i18n::tr("render.error_provisional_identity").into());
}
let handle = app.session.render_job_handle(info.frame.job).map_err(|e| e.to_string())?;
let captured = handle.status().map_err(|e| e.to_string())?;
if (info.frame.width, info.frame.height) != (captured.request.width, captured.request.height) {
return Err("checkpoint dimensions differ from the captured request".into());
return Err(crate::i18n::tr("render.error_checkpoint_dimensions").into());
}
let options = solidcraft_engine::render::job::CpuProgressiveOptions { samples_per_pixel: info.samples_per_pixel, seed: 0 };
options.validate_image_with_budget(info.frame.width, info.frame.height, captured.request.cpu_budget()).map_err(|error| error.to_string())?;
@@ -1164,12 +1167,15 @@ fn captured_image_limits(request: &solidcraft_engine::render::job::ImageRequest)
/// full resolution. Avoid asking a viewport device for an unsupported texture.
fn display_dimensions(width: u32, height: u32, max_texture_side: usize) -> Result<(u32, u32), String> {
if width == 0 || height == 0 || max_texture_side == 0 {
return Err("invalid image display dimensions".into());
return Err(crate::i18n::tr("render.error_display_dimensions").into());
}
let max_side = max_texture_side.min(8192) as u64;
let display = RenderLimits { max_dimension: max_side, max_pixels: 16_777_216, max_scratch_bytes: 512 * 1024 * 1024 };
let (w, h) = display.fit(u64::from(width), u64::from(height), None).ok_or("image display cannot fit this device")?;
Ok((u32::try_from(w).map_err(|_| "display width overflow")?, u32::try_from(h).map_err(|_| "display height overflow")?))
let (w, h) = display.fit(u64::from(width), u64::from(height), None).ok_or(crate::i18n::tr("render.error_display_fit"))?;
Ok((
u32::try_from(w).map_err(|_| crate::i18n::tr("render.error_display_width"))?,
u32::try_from(h).map_err(|_| crate::i18n::tr("render.error_display_height"))?,
))
}
#[cfg(test)]
@@ -1180,18 +1186,18 @@ fn decode_image(png: &[u8], width: u32, height: u32) -> Result<egui::ColorImage,
fn decode_render_image(png: &[u8], width: u32, height: u32, budget: RenderLimits, max_texture_side: usize) -> Result<egui::ColorImage, String> {
let size = (u64::from(width), u64::from(height));
if budget.fit(size.0, size.1, None) != Some(size) {
return Err("render image exceeds its captured resource profile".into());
return Err(crate::i18n::tr("render.error_image_profile").into());
}
let display_size = display_dimensions(width, height, max_texture_side)?;
let mut reader = image::ImageReader::with_format(std::io::Cursor::new(png), image::ImageFormat::Png);
let mut limits = image::Limits::default();
limits.max_image_width = Some(width);
limits.max_image_height = Some(height);
limits.max_alloc = Some(size.0.checked_mul(size.1).and_then(|n| n.checked_mul(16)).ok_or("image decode budget overflow")?);
limits.max_alloc = Some(size.0.checked_mul(size.1).and_then(|n| n.checked_mul(16)).ok_or(crate::i18n::tr("render.error_decode_budget"))?);
reader.limits(limits);
let image = reader.decode().map_err(|e| e.to_string())?.to_rgba8();
if image.dimensions() != (width, height) {
return Err("render image dimensions do not match its job".into());
return Err(crate::i18n::tr("render.error_image_dimensions").into());
}
let image = if display_size != (width, height) {
image::imageops::resize(&image, display_size.0, display_size.1, image::imageops::FilterType::Triangle)
@@ -1358,7 +1364,7 @@ fn show_result(app: &mut SolveApp, ui: &mut egui::Ui) {
if let Some(display) = displayed_image(app)
&& let Ok(texture) = display.image
{
painter.image(texture.id(), image_rect, egui::Rect::from_min_max(egui::Pos2::ZERO, egui::pos2(1.0, 1.0)), Color32::WHITE);
painter.image(texture.id(), image_rect, egui::Rect::from_min_max(egui::Pos2::ZERO, egui::pos2(1.0, 1.0)), Tokens::get().file_image_tint);
}
painter.rect_stroke(image_rect, 0.0, egui::Stroke::new(1.0, t.border), egui::StrokeKind::Outside);
}
@@ -1390,7 +1396,7 @@ impl State {
Err(_) => false,
};
if !uploaded {
let error = "product preview upload slot unavailable".to_string();
let error = crate::i18n::tr("render.error_upload_slot").to_string();
self.scene = None;
self.key = None;
self.preview_upload_bytes = None;
@@ -1455,7 +1461,7 @@ fn export_image(app: &mut SolveApp, job: solidcraft_engine::render::job::JobId,
app.pick_save("render.png", &["png"], move |app, path| {
let Some(path) = path else { return };
if !Arc::ptr_eq(&origin, &app.session.doc) {
app.set_status("The render export document changed while choosing its destination", true);
app.set_status(crate::i18n::tr("render.error_export_document"), true);
return;
}
let _ = app.run("render.export", json!({"job":job,"path":path,"overwrite":overwrite}));
@@ -1470,7 +1476,7 @@ fn export_linear_image(app: &mut SolveApp, job: solidcraft_engine::render::job::
return;
};
if !Arc::ptr_eq(&origin, &app.session.doc) {
app.set_status("The render export document changed while choosing its destination", true);
app.set_status(crate::i18n::tr("render.error_export_document"), true);
return;
}
let _ = app.run("render.export", json!({"job":job,"path":path,"overwrite":overwrite,"format":"exr"}));
@@ -1487,11 +1493,11 @@ struct PreviewUploadPlan {
}
impl PreviewUploadPlan {
fn bytes(self) -> Result<usize, String> {
self.pbr.checked_add(self.tris).and_then(|n| n.checked_add(self.glass)).ok_or_else(|| "product geometry size overflow".into())
self.pbr.checked_add(self.tris).and_then(|n| n.checked_add(self.glass)).ok_or_else(|| crate::i18n::tr("render.error_geometry_size").into())
}
fn add(&mut self, pbr: bool, glass: bool, triangles: usize, limit: usize) -> Result<(), String> {
let stride = if pbr { crate::gpu::PBR_SIZE } else { crate::gpu::TRI_SIZE };
let bytes = triangles.checked_mul(3).and_then(|n| n.checked_mul(stride)).ok_or("product geometry size overflow")?;
let bytes = triangles.checked_mul(3).and_then(|n| n.checked_mul(stride)).ok_or(crate::i18n::tr("render.error_geometry_size"))?;
let count = if pbr {
&mut self.pbr
} else if glass {
@@ -1499,9 +1505,9 @@ impl PreviewUploadPlan {
} else {
&mut self.tris
};
*count = count.checked_add(bytes).ok_or("product geometry size overflow")?;
*count = count.checked_add(bytes).ok_or(crate::i18n::tr("render.error_geometry_size"))?;
if self.bytes()? > limit {
return Err(format!("product preview exceeds its {} MiB vertex payload envelope; geometry was not simplified", limit / (1024 * 1024)));
return Err(crate::i18n::format("render.error_vertex_envelope", &[("limit", &(limit / (1024 * 1024)).to_string())]));
}
Ok(())
}
@@ -1509,26 +1515,26 @@ impl PreviewUploadPlan {
fn preview_upload_plan(scene: &ProductScene, limit: usize) -> Result<PreviewUploadPlan, String> {
if scene.meshes.len() > solidcraft_engine::render::job::MAX_CPU_BODIES {
return Err("product preview exceeds its captured-body bound".into());
return Err(crate::i18n::tr("render.error_body_bound").into());
}
let mut plan = PreviewUploadPlan::default();
for body in &scene.meshes {
plan.source_triangles = plan.source_triangles.checked_add(body.mesh.triangles.len()).ok_or("product triangle count overflow")?;
plan.source_triangles = plan.source_triangles.checked_add(body.mesh.triangles.len()).ok_or(crate::i18n::tr("render.error_triangle_count"))?;
if plan.source_triangles > solidcraft_engine::render::job::MAX_CPU_TRIANGLES {
return Err("product preview exceeds its eight-million-triangle source bound".into());
return Err(crate::i18n::tr("render.error_triangle_bound").into());
}
if body.faces.len() > 262_144 {
return Err("product preview exceeds the face-appearance admission cap".into());
return Err(crate::i18n::tr("render.error_face_cap").into());
}
if !body.opacity.is_finite()
|| !(0.0..=1.0).contains(&body.opacity)
|| body.faces.iter().any(|face| !face.opacity.is_finite() || !(0.0..=1.0).contains(&face.opacity))
{
return Err("invalid product appearance opacity".into());
return Err(crate::i18n::tr("render.error_opacity").into());
}
let looks: std::collections::BTreeMap<_, _> = body.faces.iter().map(|face| (face.face, face)).collect();
if looks.len() != body.faces.len() {
return Err("duplicate product face appearance".into());
return Err(crate::i18n::tr("render.error_duplicate_face").into());
}
for index in 0..body.mesh.triangles.len() {
let face = body.mesh.tri_face.get(index).and_then(|id| looks.get(id));
@@ -1536,7 +1542,7 @@ fn preview_upload_plan(scene: &ProductScene, limit: usize) -> Result<PreviewUplo
(face.opacity, face.surface.is_some() && face.transmission.is_none())
});
if pbr && opacity != 1.0 {
return Err("opaque PBR requires opacity 1".into());
return Err(crate::i18n::tr("render.error_pbr_opacity").into());
}
if opacity > 0.0 {
plan.add(pbr, opacity < 0.999, 1, limit)?;
@@ -1554,17 +1560,17 @@ pub fn gpu_scene(scene: &ProductScene) -> Result<(u64, GpuScene), String> {
let mut hash = std::collections::hash_map::DefaultHasher::new();
let mut gpu = GpuScene::default();
for (buffer, bytes) in [(&mut gpu.pbr, plan.pbr), (&mut gpu.tris, plan.tris), (&mut gpu.glass, plan.glass)] {
buffer.try_reserve_exact(bytes).map_err(|_| "product preview vertex allocation failed".to_string())?;
buffer.try_reserve_exact(bytes).map_err(|_| crate::i18n::tr("render.error_vertex_allocation").to_string())?;
}
for body in &scene.meshes {
if body.faces.len() > 262_144 {
return Err("product preview exceeds the face-appearance admission cap".into());
return Err(crate::i18n::tr("render.error_face_cap").into());
}
if !body.opacity.is_finite()
|| !(0.0..=1.0).contains(&body.opacity)
|| body.faces.iter().any(|f| !f.opacity.is_finite() || !(0.0..=1.0).contains(&f.opacity))
{
return Err("invalid product appearance opacity".into());
return Err(crate::i18n::tr("render.error_opacity").into());
}
(Arc::as_ptr(&body.mesh) as usize).hash(&mut hash);
body.name.hash(&mut hash);
@@ -1586,7 +1592,7 @@ pub fn gpu_scene(scene: &ProductScene) -> Result<(u64, GpuScene), String> {
(l.color, l.opacity, l.surface.filter(|_| l.transmission.is_none()))
});
if surface.is_some() && opacity != 1.0 {
return Err("opaque PBR requires opacity 1".into());
return Err(crate::i18n::tr("render.error_pbr_opacity").into());
}
if opacity <= 0.0 {
continue;
@@ -1597,13 +1603,13 @@ pub fn gpu_scene(scene: &ProductScene) -> Result<(u64, GpuScene), String> {
let n = if surface.is_some() { solidcraft_engine::render::surface::unit_direction(n).ok()? } else { n }.to_f32();
p.into_iter().chain(n).all(f32::is_finite).then_some((p, n))
});
let [Some(a), Some(b), Some(c)] = vertices else { return Err("invalid product triangle".into()) };
let [Some(a), Some(b), Some(c)] = vertices else { return Err(crate::i18n::tr("render.error_product_triangle").into()) };
let rgba = [color[0], color[1], color[2], (opacity * 255.0).round() as u8];
let index = gpu.color(rgba);
for (p, n) in [a, b, c] {
if let Some(surface) = surface {
if n.iter().all(|v| *v == 0.0) {
return Err("PBR requires nonzero surface normals".into());
return Err(crate::i18n::tr("render.error_surface_normals").into());
}
gpu.pbr_tri(p, n, surface);
} else if opacity < 0.999 {
@@ -1615,7 +1621,7 @@ pub fn gpu_scene(scene: &ProductScene) -> Result<(u64, GpuScene), String> {
}
}
if (gpu.pbr.len(), gpu.tris.len(), gpu.glass.len()) != (plan.pbr, plan.tris, plan.glass) {
return Err("product preview packing differs from its admitted vertex payload".into());
return Err(crate::i18n::tr("render.error_vertex_packing").into());
}
Ok((hash.finish(), gpu))
}
@@ -1673,7 +1679,7 @@ pub fn show(app: &mut SolveApp, ui: &mut egui::Ui) {
ui.painter().rect_filled(rect, 0.0, Color32::from_rgb(bg[0], bg[1], bg[2]));
let result = (|| -> Result<(), String> {
if app.viewport.gpu.is_none() {
return Err("GPU product preview is unavailable on this host. Saved setups remain available.".into());
return Err(crate::i18n::tr("render.error_gpu_preview").into());
}
let ppp = ui.ctx().pixels_per_point();
let setup = &app.render_workspace.view.draft;
@@ -1681,7 +1687,7 @@ pub fn show(app: &mut SolveApp, ui: &mut egui::Ui) {
|| setup.environment_rotation != 0.0
|| setup.environment_intensity != 1.0
{
return Err("fixed studio preview requires exposure 0, environment rotation 0 and intensity 1".into());
return Err(crate::i18n::tr("render.error_fixed_preview").into());
}
// A 4K or 5K viewport is past the preview's pixel budget: draw it smaller and filter it
// up into the viewport rather than refusing the frame.
@@ -1699,7 +1705,7 @@ pub fn show(app: &mut SolveApp, ui: &mut egui::Ui) {
};
solidcraft_engine::render::resolve_request(&[app.session.render_backend()], &request).map_err(|e| e.to_string())?;
if app.session.model.is_stale() {
return Err("finish the modelling gesture before previewing".into());
return Err(crate::i18n::tr("render.error_finish_gesture").into());
}
let mut visibility = std::collections::hash_map::DefaultHasher::new();
app.session.visibility.hidden_bodies.hash(&mut visibility);
@@ -1707,12 +1713,12 @@ pub fn show(app: &mut SolveApp, ui: &mut egui::Ui) {
let signature = (app.session.revision, Arc::as_ptr(&app.session.world_state()) as usize, visibility.finish());
app.render_workspace
.prepare_preview(signature, || solidcraft_engine::product_scene::extract(&app.session).map_err(|error| error.to_string()))?;
let scene = app.render_workspace.scene.as_ref().ok_or("no product scene")?;
let scene = app.render_workspace.scene.as_ref().ok_or(crate::i18n::tr("render.error_no_scene"))?;
request.features = scene.required_features();
solidcraft_engine::render::resolve_request(&[app.session.render_backend()], &request).map_err(|e| e.to_string())?;
let key = app.render_workspace.key.ok_or("no product geometry")?;
let key = app.render_workspace.key.ok_or(crate::i18n::tr("render.error_no_geometry"))?;
if scene.bounds.is_empty() {
return Err("Create a visible solid in Design to preview it here.".into());
return Err(crate::i18n::tr("render.error_visible_solid").into());
}
let camera = app.cam;
let radius = scene.bounds.diagonal().max(10.0) + scene.bounds.center().dist(camera.target);
+7 -6
View File
@@ -288,7 +288,7 @@ pub(super) fn params(app: &SolveApp, params: &mut Value) -> Result<(), String> {
let view = &app.render_workspace.view.cpu;
let mut options = base.clone();
if options.area_samples.is_some_and(|n| !matches!(n, 1 | 4 | 16 | 64)) {
return Err("area_samples must be 1, 4, 16 or 64".into());
return Err(crate::i18n::tr("render.error_area_samples").into());
}
if options.area_lights.as_ref().is_none_or(Vec::is_empty) {
options.area_samples = None;
@@ -547,7 +547,7 @@ pub(super) fn light_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
ui.label(minimum);
ui_kit::number_field(ui, &mut light.minimum_distance_mm, 0.001..=1e6, 0.01, " mm");
let mut spot = light.cone.is_some();
if ui_kit::checkbox(ui, "Spot cone", &mut spot).changed() {
if ui_kit::checkbox(ui, crate::i18n::tr("render.spot_cone"), &mut spot).changed() {
light.cone = spot.then_some(solidcraft_engine::render::job::SpotConeOptions {
emitted_axis: [0.0, 0.0, -1.0],
inner_half_angle_radians: 0.2,
@@ -555,10 +555,11 @@ pub(super) fn light_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
});
}
if let Some(cone) = &mut light.cone {
vector(ui, "Emitted axis", &mut cone.emitted_axis, -1e8..=1e8, 0.01, "");
for (label, value) in
[("Inner half angle", &mut cone.inner_half_angle_radians), ("Outer half angle", &mut cone.outer_half_angle_radians)]
{
vector(ui, crate::i18n::tr("render.emitted_axis"), &mut cone.emitted_axis, -1e8..=1e8, 0.01, "");
for (label, value) in [
(crate::i18n::tr("render.inner_half_angle"), &mut cone.inner_half_angle_radians),
(crate::i18n::tr("render.outer_half_angle"), &mut cone.outer_half_angle_radians),
] {
ui.label(label);
let mut degrees = value.to_degrees();
if ui_kit::number_field(ui, &mut degrees, 0.0..=90.0, 0.1, " deg").changed() {
@@ -80,7 +80,8 @@ pub(super) fn aging_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
}
editor.selected_aging = editor.selected_aging.min(stack.len().saturating_sub(1));
for (index, layer) in stack.iter().enumerate() {
let label = format!("{} · {}{}", index + 1, app.tr(layer.kind.key()), if layer.enabled { "" } else { " (off)" });
let label =
format!("{} · {}{}", index + 1, app.tr(layer.kind.key()), if layer.enabled { "" } else { crate::i18n::tr("render.layer_off_suffix") });
let response = ui_kit::list_picker(ui, &format!("aging-layer-{index}"), &label, index == editor.selected_aging);
crate::scenario::publish_target(&format!("render:aging-layer:{index}"), response.rect);
if response.clicked() {
@@ -226,7 +226,14 @@ pub(super) fn panel(app: &mut SolveApp, ui: &mut egui::Ui) {
let icon = app.render_workspace.view.inspector.page.icon();
let content = ui_kit::Panel::workspace(
ui,
ui_kit::WorkspaceOptions { id: "render:inspector", title: &title, icon, bounds, fill_height: true },
ui_kit::WorkspaceOptions {
id: "render:inspector",
title: &title,
icon,
bounds,
fill_height: true,
compact: crate::render_ui::compact(app, bounds.width()),
},
&mut side,
&mut width,
|ui| {
@@ -678,7 +685,7 @@ fn camera_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
if ui_kit::button(ui, app.tr("render.result_fit"), ui_kit::Button::Normal).clicked() {
super::fit_result(app);
}
if ui_kit::button(ui, "100%", ui_kit::Button::Enabled(!super::reduced_display(app))).clicked() {
if ui_kit::button(ui, crate::i18n::tr("render.result_actual_size"), ui_kit::Button::Enabled(!super::reduced_display(app))).clicked() {
app.render_workspace.view.result_scale = super::ResultScale::Actual;
}
}
@@ -729,7 +736,11 @@ fn output_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
ui_kit::text(ui, app.tr("render.output_ratio_refused"), ui_kit::Text::Error("render.output_ratio_refused"));
}
ui.horizontal_wrapped(|ui| {
for (label, width, height) in [("HD", 1280, 720), ("Full HD", 1920, 1080), ("4K UHD", 3840, 2160)] {
for (label, width, height) in [
(crate::i18n::tr("render.size_hd"), 1280, 720),
(crate::i18n::tr("render.size_full_hd"), 1920, 1080),
(crate::i18n::tr("render.size_4k_uhd"), 3840, 2160),
] {
if ui_kit::button(ui, label, ui_kit::Button::Normal).clicked() {
app.render_workspace.view.draft.width = width;
app.render_workspace.view.draft.height = height;
@@ -857,10 +868,10 @@ pub(super) fn quality_resource(app: &mut SolveApp, ui: &mut egui::Ui, id: &str)
}
fn apply_quality(app: &mut SolveApp, plan: &Value) -> Result<(), String> {
if app.render_workspace.view.method != ImageMethod::GpuRaytrace || plan["variant"] != "fixed_samples_png" {
return Err("quality projection requires the same explicit GPU method".into());
return Err(crate::i18n::tr("render.error_quality_method").into());
}
let u32_at = |section: &str, key: &str| {
plan[section][key].as_u64().and_then(|n| u32::try_from(n).ok()).ok_or_else(|| "invalid native quality projection".to_string())
plan[section][key].as_u64().and_then(|n| u32::try_from(n).ok()).ok_or_else(|| crate::i18n::tr("render.error_quality_projection").to_string())
};
let (width, height, samples, depth, seed) = (
u32_at("settings", "width")?,
@@ -869,13 +880,13 @@ fn apply_quality(app: &mut SolveApp, plan: &Value) -> Result<(), String> {
u32_at("gpu_options", "max_depth")?,
u32_at("gpu_options", "seed")?,
);
let denoise = plan["gpu_options"]["denoise"].as_bool().ok_or("invalid native denoise setting")?;
let denoise = plan["gpu_options"]["denoise"].as_bool().ok_or(crate::i18n::tr("render.error_denoise_setting"))?;
if !(1..=4096).contains(&samples)
|| !(1..=16).contains(&depth)
|| solidcraft_engine::render::job::GPU_PATH_LIMITS.fit(u64::from(width), u64::from(height), None)
!= Some((u64::from(width), u64::from(height)))
{
return Err("quality projection exceeds native bounds".into());
return Err(crate::i18n::tr("render.error_quality_bounds").into());
}
let view = &mut app.render_workspace.view;
view.draft.width = width;
+18 -8
View File
@@ -112,7 +112,7 @@ impl Default for View {
fn refresh(app: &mut SolveApp, view: &mut View) -> Result<(), String> {
let reply = app.run("render.library.list", json!({"kind":view.kind,"query":view.query,"offset":view.offset,"limit":48,"availability":if view.kind=="physical_profiles" {"all"} else {&view.availability}}))?;
view.entries = reply["items"].as_array().cloned().ok_or_else(|| "invalid render-library response".to_string())?;
view.entries = reply["items"].as_array().cloned().ok_or_else(|| crate::i18n::tr("render.error_library_reply").to_string())?;
view.total = reply["total"].as_u64().and_then(|n| usize::try_from(n).ok()).unwrap_or(0);
view.next = reply["next_offset"].as_u64().and_then(|n| usize::try_from(n).ok());
view.loaded = true;
@@ -480,7 +480,11 @@ pub(super) fn inspect(app: &mut SolveApp, ui: &mut egui::Ui) {
}
if let Some(omitted) = detail["projection"]["omitted"].as_array() {
for item in omitted {
ui.small(format!("{}: {}", app.tr("render.library_omitted"), item.as_str().unwrap_or("unknown")));
ui.small(format!(
"{}: {}",
app.tr("render.library_omitted"),
item.as_str().unwrap_or(crate::i18n::tr("render.property_unknown"))
));
}
}
}
@@ -516,7 +520,7 @@ fn source_preview(app: &mut SolveApp, ui: &mut egui::Ui, view: &mut View, id: &s
let reply = app.run("render.library.preview", json!({"id":id}))?;
let bytes: Vec<u8> = serde_json::from_value(reply["bytes"].clone()).map_err(|e| e.to_string())?;
if bytes.len() > 2 * 1024 * 1024 {
return Err("source preview exceeds its byte envelope".into());
return Err(crate::i18n::tr("render.error_source_preview").into());
}
let mut reader = image::ImageReader::with_format(std::io::Cursor::new(bytes), image::ImageFormat::Png);
let mut limits = image::Limits::default();
@@ -804,13 +808,19 @@ fn physical_controls(app: &mut SolveApp, ui: &mut egui::Ui, view: &mut View, id:
ui.small(resource["reference_state"].as_str().unwrap_or(""));
if let Some(properties) = resource["properties"].as_array() {
for (index, property) in properties.iter().enumerate() {
let name = property["quantity"].as_str().unwrap_or("property");
let name = property["quantity"].as_str().unwrap_or(crate::i18n::tr("render.property_fallback"));
let title = format!("{}: {} {}", name, property["value"], property["unit"].as_str().unwrap_or(""));
ui_kit::section(ui, ("physical_property", id, index), &title, false, |ui| {
ui.small(format!("Source: {} - {}", property["source_id"].as_str().unwrap_or(""), property["source_locator"].as_str().unwrap_or("")));
ui.small(format!("Qualifier: {}", property["qualifier"].as_str().unwrap_or("unknown")));
ui.small(format!("Conditions: {}", property["conditions"]));
ui.small(format!("Uncertainty: {}", property["uncertainty"]));
ui.small(crate::i18n::format(
"render.property_source",
&[("id", property["source_id"].as_str().unwrap_or("")), ("locator", property["source_locator"].as_str().unwrap_or(""))],
));
ui.small(crate::i18n::format(
"render.property_qualifier",
&[("value", property["qualifier"].as_str().unwrap_or(crate::i18n::tr("render.property_unknown")))],
));
ui.small(crate::i18n::format("render.property_conditions", &[("value", &property["conditions"].to_string())]));
ui.small(crate::i18n::format("render.property_uncertainty", &[("value", &property["uncertainty"].to_string())]));
ui.small(property["note"].as_str().unwrap_or(""));
});
}
@@ -71,8 +71,8 @@ impl Default for Glass {
}
impl Glass {
pub(super) fn recipe(id: &str) -> Result<Self, String> {
let preset = appearance_pack::find(id).ok_or_else(|| "unknown glass recipe".to_string())?;
let Recipe::Glass(recipe) = preset.recipe else { return Err("the selected recipe is not physical glass".into()) };
let preset = appearance_pack::find(id).ok_or_else(|| crate::i18n::tr("render.error_glass_recipe").to_string())?;
let Recipe::Glass(recipe) = preset.recipe else { return Err(crate::i18n::tr("render.error_physical_glass").into()) };
recipe.validate().map_err(|e| e.to_string())?;
let (boundary, thickness) = match recipe.boundary {
GlassBoundary::Thin { thickness_mm } => (Boundary::Thin, thickness_mm),
@@ -180,9 +180,9 @@ pub(super) struct View {
pub(super) fn read_targets(app: &mut SolveApp) -> Result<Vec<Target>, String> {
let reply = app.run("render.scene", json!({}))?;
let values = reply.get("bodies").and_then(Value::as_array).ok_or_else(|| "missing render scene bodies".to_string())?;
let values = reply.get("bodies").and_then(Value::as_array).ok_or_else(|| crate::i18n::tr("render.error_scene_bodies").to_string())?;
if values.len() > solidcraft_engine::render::job::MAX_GPU_PATH_BODIES {
return Err("render scene exceeds its body limit".into());
return Err(crate::i18n::tr("render.error_scene_body_limit").into());
}
let targets: Vec<Target> = serde_json::from_value(Value::Array(values.clone())).map_err(|e| e.to_string())?;
if targets.iter().any(|t| {
@@ -191,7 +191,7 @@ pub(super) fn read_targets(app: &mut SolveApp) -> Result<Vec<Target>, String> {
|| t.name.len() > 1024
|| t.name.chars().any(char::is_control)
}) {
return Err("invalid render scene identity".into());
return Err(crate::i18n::tr("render.error_scene_identity").into());
}
Ok(targets)
}
@@ -600,7 +600,8 @@ pub(super) fn install_library_surface(app: &mut SolveApp, id: &str, target: Targ
}
let existing = app.render_workspace.view.materials.bindings.iter().position(|b| b.target == target);
if let Some(index) = existing {
let binding = app.render_workspace.view.materials.bindings.get(index).ok_or_else(|| "missing material binding".to_string())?;
let binding =
app.render_workspace.view.materials.bindings.get(index).ok_or_else(|| crate::i18n::tr("render.error_material_binding").to_string())?;
if !binding.current(app) {
return Err(app.tr("render.material_revalidate_needed").into());
}
@@ -614,7 +615,7 @@ pub(super) fn install_library_surface(app: &mut SolveApp, id: &str, target: Targ
app.run("render.library.surface.prepare", json!({"id":id,"body_index":target.ordinal,"body_name":target.name,"plane":plane,"scale":scale}))?;
let texture = &reply["texture"];
let frame: PlanarFrame = serde_json::from_value(texture["frame"].clone()).map_err(|e| e.to_string())?;
let path = |key: &str| texture[key].as_str().map(str::to_string).ok_or_else(|| "invalid authored surface reply".to_string());
let path = |key: &str| texture[key].as_str().map(str::to_string).ok_or_else(|| crate::i18n::tr("render.error_surface_reply").to_string());
let maps = Maps {
color: path("base_color_srgb")?,
normal: path("normal_opengl")?,
@@ -626,7 +627,13 @@ pub(super) fn install_library_surface(app: &mut SolveApp, id: &str, target: Targ
flip_v: true,
};
let mut binding = if let Some(index) = existing {
app.render_workspace.view.materials.bindings.get(index).cloned().ok_or_else(|| "missing material binding".to_string())?
app.render_workspace
.view
.materials
.bindings
.get(index)
.cloned()
.ok_or_else(|| crate::i18n::tr("render.error_material_binding").to_string())?
} else {
Binding::new(target, app)
};
@@ -635,10 +642,10 @@ pub(super) fn install_library_surface(app: &mut SolveApp, id: &str, target: Targ
binding.enabled = true;
let view = &mut app.render_workspace.view.materials;
if let Some(index) = existing {
*view.bindings.get_mut(index).ok_or_else(|| "missing material binding".to_string())? = binding;
*view.bindings.get_mut(index).ok_or_else(|| crate::i18n::tr("render.error_material_binding").to_string())? = binding;
view.selected = Some(index);
} else {
view.bindings.try_reserve(1).map_err(|_| "could not reserve material binding".to_string())?;
view.bindings.try_reserve(1).map_err(|_| crate::i18n::tr("render.error_binding_allocation").to_string())?;
view.bindings.push(binding);
view.selected = Some(view.bindings.len() - 1);
}
@@ -130,13 +130,15 @@ pub(super) fn perform_job(app: &mut SolveApp, id: &str) -> Result<(), String> {
"render.start" => {
let request = super::image_params(app)?;
let reply = app.run(id, request)?;
let job = serde_json::from_value(reply["job"].clone()).map_err(|e| format!("invalid render job identity: {e}"))?;
let job = serde_json::from_value(reply["job"].clone())
.map_err(|e| crate::i18n::format("render.error_job_identity", &[("error", &e.to_string())]))?;
app.render_workspace.view.job = Some(job);
}
"render.result.regrade" => {
let source = app.render_workspace.view.completed.ok_or_else(|| app.tr("render.ribbon_no_result").to_string())?;
let reply = app.run(id, json!({"job":source,"presentation":presentation(app)}))?;
let job = serde_json::from_value(reply["job"].clone()).map_err(|error| format!("invalid regrade identity: {error}"))?;
let job = serde_json::from_value(reply["job"].clone())
.map_err(|error| crate::i18n::format("render.error_regrade_identity", &[("error", &error.to_string())]))?;
app.render_workspace.view.job = Some(job);
}
"render.cancel" => {
@@ -152,7 +154,7 @@ pub(super) fn perform_job(app: &mut SolveApp, id: &str) -> Result<(), String> {
super::export_image(app, job, overwrite);
}
}
_ => return Err("not an interactive image-job action".into()),
_ => return Err(crate::i18n::tr("render.error_job_action").into()),
}
Ok(())
}
@@ -231,7 +233,7 @@ fn navigate(app: &mut SolveApp, id: &str) -> Result<(), String> {
"render.camera.get" | "render.camera.set" => focus(app, Page::Camera, None),
"render.quality.prepare" => focus(app, Page::Output, Some("quality")),
"render.status" | "render.backends" => focus(app, Page::Diagnostics, None),
_ => return Err("unbound interactive Render command".into()),
_ => return Err(crate::i18n::tr("render.error_interactive_command").into()),
}
Ok(())
}
@@ -138,11 +138,13 @@ pub(super) fn finishing_controls(app: &mut SolveApp, ui: &mut egui::Ui) {
ui.label(app.tr("render.studio_tone_map"));
let selected = app.render_workspace.view.studio.tone_map;
let label = match selected {
ToneMap::Reinhard => "Reinhard",
ToneMap::AcesFitted => "ACES fitted",
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| {
for (map, label) in [(ToneMap::Reinhard, "Reinhard"), (ToneMap::AcesFitted, "ACES fitted")] {
for (map, label) in
[(ToneMap::Reinhard, crate::i18n::tr("render.tone_reinhard")), (ToneMap::AcesFitted, crate::i18n::tr("render.tone_aces_fitted"))]
{
if ui_kit::list_picker(ui, label, label, map == selected).clicked() {
app.render_workspace.view.studio.tone_map = map;
ui.close();
+309 -5
View File
@@ -2877,7 +2877,20 @@ fn render_workspace_stage_shell_degrades_without_overlap_at_small_window_sizes()
let mut h = Harness::new();
enter(&mut h.app, true).unwrap();
h.app.ui.layout = mode;
for (width, height) in [(1440, 900), (1100, 700), (800, 600), (640, 480), (320, 240), (240, 160), (120, 80), (32, 32), (1, 1)] {
for (width, height) in [
(1440, 900),
(1400, 900),
(1100, 700),
(900, 700),
(800, 600),
(700, 600),
(640, 480),
(320, 240),
(240, 160),
(120, 80),
(32, 32),
(1, 1),
] {
h.call("ui.resize", json!({"width":width,"height":height}));
for stage in Stage::ALL {
h.app.run("view.render_stage", json!({"stage":stage.key()})).unwrap();
@@ -2906,15 +2919,25 @@ fn render_workspace_stage_shell_degrades_without_overlap_at_small_window_sizes()
assert!((browser.top() - inspector.top()).abs() < 1.0);
assert!((browser.bottom() - inspector.bottom()).abs() < 1.0);
assert!(!browser.intersect(*inspector).is_positive());
if width >= 1100 {
assert_eq!(browser.width(), 266.0);
assert_eq!(inspector.width(), 305.0);
if width >= 800 {
let compact = crate::render_ui::compact(&h.app, width as f32);
assert_eq!(browser.width(), if compact { crate::frame::DIALOG_MIN_W } else { 266.0 });
assert_eq!(inspector.width(), if compact { crate::frame::DIALOG_MIN_W } else { 305.0 });
assert_eq!(browser.top() - bar.bottom(), 8.0);
let (strip, _) = h.app.shell.workspace_panels.get("render:shots_strip").unwrap();
assert_eq!(strip.top() - browser.bottom(), 8.0);
assert_eq!(strip.height(), 48.0);
}
}
if (640..800).contains(&width) {
assert!(crate::scenario::rect_of("render:browser:show").is_some());
assert!(!h.app.shell.workspace_panels.contains_key("render:browser"));
}
if width >= 700 {
for dock in &docks {
assert!(!dock.x_range().contains(h.app.viewport.rect.unwrap().center().x), "{width}: {dock:?}");
}
}
for dock in docks {
assert!(!dock.intersect(bar).is_positive(), "{width}×{height}: {dock:?} {bar:?}");
if let Some((strip, _)) = h.app.shell.workspace_panels.get("render:shots_strip") {
@@ -2926,6 +2949,279 @@ fn render_workspace_stage_shell_degrades_without_overlap_at_small_window_sizes()
}
}
#[test]
fn render_workspace_focus_restores_docks_without_design_history_or_camera_changes() {
for (side, folded, shots) in [("left", false, true), ("right", true, false)] {
let mut h = Harness::new();
h.call("ui.resize", json!({"width":1400,"height":900}));
enter(&mut h.app, true).unwrap();
h.app.preferences.render_browser_side = side.into();
h.app.preferences.render_inspector_side = if side == "left" { "right" } else { "left" }.into();
h.app.preferences.render_browser_width = 350.0;
h.app.preferences.render_inspector_width = 390.0;
h.app.preferences.render_shots_strip = shots;
h.app.tree.panel_collapsed = folded;
h.app.shell.render_browser_open = folded;
h.frames(3);
let dock_preferences = h.app.prefs();
let docks = h.app.shell.workspace_panels.clone();
let camera = (h.app.cam, h.app.session.camera);
let document = 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());
let before = h.app.viewport.layout.as_ref().unwrap().content;
h.app.run("view.render_focus", json!({"on":true})).unwrap();
h.frames(3);
assert!(crate::render_ui::focused(&h.app));
crate::shell::register_panel(&mut h.app, "render:stage_panel", Some(before), Some(crate::ui_kit::Edge::Left));
assert!(!h.app.shell.workspace_panels.contains_key("render:stage_panel"));
for id in ["render:browser", "render:inspector", "render:shots_strip", "render:shots:show"] {
assert!(!h.app.shell.workspace_panels.contains_key(id));
assert!(crate::scenario::rect_of(id).is_none());
}
for id in ["render:focus:exit", "render:stage_bar", "ribbon:workspace"] {
assert!(crate::scenario::rect_of(id).is_some(), "{id}");
}
let layout = h.app.viewport.layout.as_ref().unwrap();
assert!(layout.content.width() > before.width());
assert!(layout.axis_view.is_positive() && layout.navigation.is_positive());
assert_eq!(h.app.prefs(), dock_preferences);
h.step(&json!({"click":{"handle":"render:focus:exit"}})).unwrap();
h.frames(3);
assert!(!h.app.shell.render_focus);
assert_eq!(h.app.shell.workspace_panels.len(), docks.len());
for (id, (rect, edge)) in docks {
let (restored_rect, restored_edge) = h.app.shell.workspace_panels.get(id).unwrap();
assert_eq!(*restored_rect, rect);
assert_eq!(restored_edge.as_ref().map(std::mem::discriminant), edge.as_ref().map(std::mem::discriminant));
}
assert_eq!(h.app.prefs(), dock_preferences);
assert_eq!(h.app.tree.panel_collapsed, folded);
assert_eq!(h.app.shell.render_browser_open, folded);
assert_eq!((h.app.cam, h.app.session.camera), camera);
assert!(Arc::ptr_eq(&h.app.session.doc, &document));
assert_eq!((h.app.session.revision, h.app.session.undo.len(), h.app.session.redo.len(), h.app.session.is_dirty()), state);
assert!(!Harness::new().app.shell.render_focus);
}
}
#[test]
fn render_workspace_focus_tab_only_toggles_render_without_text_focus() {
let mut h = Harness::new();
h.step(&json!({"key":"Tab"})).unwrap();
assert!(!h.app.shell.render_focus);
enter(&mut h.app, true).unwrap();
h.frames(3);
h.ctx.memory_mut(|memory| {
if let Some(id) = memory.focused() {
memory.surrender_focus(id);
}
});
h.step(&json!({"key":"Tab"})).unwrap();
assert!(h.app.shell.render_focus);
h.step(&json!({"key":"Tab"})).unwrap();
assert!(!h.app.shell.render_focus);
h.frames(3);
h.step(&json!({"click":{"handle":"render:setup-name"}})).unwrap();
assert!(h.ctx.egui_wants_keyboard_input());
h.step(&json!({"key":"Tab"})).unwrap();
assert!(!h.app.shell.render_focus);
}
#[test]
fn render_workspace_compact_browser_card_and_focus_preserve_remembered_widths() {
for side in ["left", "right"] {
let mut h = Harness::new();
h.call("ui.resize", json!({"width":1400,"height":900}));
enter(&mut h.app, true).unwrap();
h.app.preferences.render_browser_side = side.into();
h.app.preferences.render_inspector_side = if side == "left" { "right" } else { "left" }.into();
h.app.preferences.render_browser_width = 320.0;
h.app.preferences.render_inspector_width = 360.0;
h.frames(3);
for width in [1100, 900, 700] {
h.call("ui.resize", json!({"width":width,"height":700}));
h.frames(3);
if width == 700 {
h.step(&json!({"click":{"handle":"render:browser:show"}})).unwrap();
h.frames(3);
let (browser, reservation) = h.app.shell.workspace_panels["render:browser"];
let (inspector, _) = h.app.shell.workspace_panels["render:inspector"];
assert!(reservation.is_none(), "narrow Browser overlays the canvas");
assert!(!browser.intersect(inspector).is_positive());
h.app.run("view.render_focus", json!({"on":true})).unwrap();
h.frames(3);
h.app.run("view.render_focus", json!({"on":false})).unwrap();
h.frames(3);
assert!(h.app.shell.render_browser_open);
assert!(h.app.shell.workspace_panels.contains_key("render:browser"));
h.step(&json!({"click":{"handle":"render:browser:hide"}})).unwrap();
h.frames(3);
assert!(!h.app.shell.workspace_panels.contains_key("render:browser"));
}
assert_eq!(h.app.preferences.render_browser_width, 320.0);
assert_eq!(h.app.preferences.render_inspector_width, 360.0);
}
h.call("ui.resize", json!({"width":1400,"height":900}));
h.frames(3);
assert_eq!(h.app.shell.workspace_panels["render:browser"].0.width(), 320.0);
assert_eq!(h.app.shell.workspace_panels["render:inspector"].0.width(), 360.0);
}
}
#[test]
fn render_workspace_focus_messages_have_five_complete_locales() {
let keys = [
"cmd.view.render_focus",
"cmd.view.render_browser",
"render.exit_focus",
"render.fold_browser",
"render.spot_cone",
"render.emitted_axis",
"render.inner_half_angle",
"render.outer_half_angle",
"render.layer_off_suffix",
"render.tone_reinhard",
"render.tone_aces_fitted",
"render.size_hd",
"render.size_full_hd",
"render.size_4k_uhd",
"render.result_actual_size",
"render.property_unknown",
"render.property_fallback",
"render.property_source",
"render.property_qualifier",
"render.property_conditions",
"render.property_uncertainty",
"render.error_setup_panicked",
"render.error_setup_worker",
"render.error_setup_stopped",
"render.error_gpu_samples",
"render.error_preview_device",
"render.error_finish_operation",
"render.error_no_completed_image",
"render.error_provisional_identity",
"render.error_checkpoint_dimensions",
"render.error_display_dimensions",
"render.error_display_fit",
"render.error_display_width",
"render.error_display_height",
"render.error_image_profile",
"render.error_decode_budget",
"render.error_image_dimensions",
"render.error_upload_slot",
"render.error_export_document",
"render.error_geometry_size",
"render.error_vertex_envelope",
"render.error_body_bound",
"render.error_triangle_count",
"render.error_triangle_bound",
"render.error_face_cap",
"render.error_opacity",
"render.error_duplicate_face",
"render.error_pbr_opacity",
"render.error_vertex_allocation",
"render.error_product_triangle",
"render.error_surface_normals",
"render.error_vertex_packing",
"render.error_gpu_preview",
"render.error_fixed_preview",
"render.error_finish_gesture",
"render.error_no_scene",
"render.error_no_geometry",
"render.error_visible_solid",
"render.error_area_samples",
"render.error_quality_method",
"render.error_quality_projection",
"render.error_denoise_setting",
"render.error_quality_bounds",
"render.error_library_reply",
"render.error_source_preview",
"render.error_glass_recipe",
"render.error_physical_glass",
"render.error_scene_bodies",
"render.error_scene_body_limit",
"render.error_scene_identity",
"render.error_material_binding",
"render.error_surface_reply",
"render.error_binding_allocation",
"render.error_job_identity",
"render.error_regrade_identity",
"render.error_job_action",
"render.error_interactive_command",
];
for (language, source) in [
("en", include_str!(concat!(env!("OUT_DIR"), "/locales/en.json"))),
("ja", include_str!(concat!(env!("OUT_DIR"), "/locales/ja.json"))),
("zh", include_str!(concat!(env!("OUT_DIR"), "/locales/zh.json"))),
("de", include_str!(concat!(env!("OUT_DIR"), "/locales/de.json"))),
("ko", include_str!(concat!(env!("OUT_DIR"), "/locales/ko.json"))),
] {
let translated: std::collections::BTreeMap<String, String> = serde_json::from_str(source).unwrap();
let locale = crate::i18n::Locale::for_language(language);
for key in keys {
let value = translated.get(key).unwrap_or_else(|| panic!("{language}: missing {key}"));
assert!(!value.is_empty());
assert_eq!(locale.text(key), value);
}
let sentence = locale.format("render.property_source", &[("id", "A"), ("locator", "B")]);
assert!(sentence.contains('A') && sentence.contains('B') && !sentence.contains('{'));
}
}
#[test]
fn render_workspace_chrome_uses_tokens_instead_of_literal_colours() {
use syn::visit::{self, Visit};
#[derive(Default)]
struct Colours(Vec<String>);
impl<'ast> Visit<'ast> for Colours {
fn visit_expr_path(&mut self, expr: &'ast syn::ExprPath) {
let names: Vec<_> = expr.path.segments.iter().map(|s| s.ident.to_string()).collect();
if names.iter().any(|s| s == "Color32") && names.last().is_some_and(|s| matches!(s.as_str(), "WHITE" | "BLACK" | "GRAY")) {
self.0.push(names.join("::"));
}
visit::visit_expr_path(self, expr);
}
fn visit_expr_call(&mut self, expr: &'ast syn::ExprCall) {
if let syn::Expr::Path(path) = expr.func.as_ref() {
let names: Vec<_> = path.path.segments.iter().map(|s| s.ident.to_string()).collect();
if names.iter().any(|s| s == "Color32")
&& names.last().is_some_and(|s| s.starts_with("from_rgb") || s == "from_gray")
&& expr.args.iter().all(|arg| matches!(arg, syn::Expr::Lit(_)))
{
self.0.push(names.join("::"));
}
}
visit::visit_expr_call(self, expr);
}
}
let root = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("src");
let mut files: Vec<_> = std::fs::read_dir(&root)
.unwrap()
.map(|e| e.unwrap().path())
.filter(|path| {
let name = path.file_name().unwrap().to_string_lossy();
name.starts_with("render_workspace") && name.ends_with(".rs") && !name.contains("tests")
})
.collect();
let mut folders = vec![root.join("render_ui")];
while let Some(folder) = folders.pop() {
for entry in std::fs::read_dir(folder).unwrap() {
let path = entry.unwrap().path();
if path.is_dir() {
folders.push(path);
} else if path.extension().is_some_and(|e| e == "rs") {
files.push(path);
}
}
}
for path in files {
let source = std::fs::read_to_string(&path).unwrap();
let mut colours = Colours::default();
colours.visit_file(&syn::parse_file(&source).unwrap());
assert!(colours.0.is_empty(), "{}: {:?}", path.display(), colours.0);
}
}
#[test]
fn render_workspace_shots_toggle_persists_and_design_roundtrip_preserves_state() {
let mut h = Harness::new();
@@ -3153,10 +3449,18 @@ fn render_workspace_card_grips_swap_sides_and_resize_without_design_edits() {
assert_eq!(h.app.preferences.render_browser_side, "right");
assert!(h.app.shell.workspace_panels["render:inspector"].0.right() < h.app.shell.workspace_panels["render:browser"].0.left());
let width = h.app.preferences.render_inspector_width;
let card_width = h.app.shell.workspace_panels["render:inspector"].0.width();
let rail = crate::scenario::handle_at("render:inspector:resize").unwrap();
h.step(&json!({"drag":[[rail.x,rail.y],[rail.x+50.0,rail.y]],"steps":8})).unwrap();
h.frames(3);
assert!(h.app.preferences.render_inspector_width > width);
// A compact dock keeps its minimum width and leaves the remembered width alone.
if layout == crate::shell::LayoutMode::Docked {
assert_eq!(h.app.preferences.render_inspector_width, width);
assert_eq!(h.app.shell.workspace_panels["render:inspector"].0.width(), card_width);
} else {
assert!(h.app.preferences.render_inspector_width > width);
assert!(h.app.shell.workspace_panels["render:inspector"].0.width() > card_width);
}
h.step(&json!({"click":{"handle":"render:browser-library"}})).unwrap();
h.frames(3);
h.step(&json!({"drag":[{"handle":"render:browser:grip"},[100.0,350.0]],"steps":8})).unwrap();
+7
View File
@@ -91,6 +91,9 @@ impl Cards {
/// Shell panels measured after drawing the full-bleed viewport. No design or preferences data.
#[derive(Default)]
pub(crate) struct State {
/// Per-window Render view state; neither preferences nor document data.
pub render_focus: bool,
pub render_browser_open: bool,
pub cards: Vec<Rect>,
pub panels: Vec<Rect>,
/// Actual floating workspace surfaces and their optional canvas reservation.
@@ -113,6 +116,7 @@ pub(crate) struct State {
/// Register the actual card, so fitting and pointer shielding use the same rectangle.
pub(crate) fn register_panel(app: &mut SolveApp, id: &'static str, rect: Option<Rect>, edge: Option<crate::ui_kit::Edge>) {
let rect = rect.filter(|_| !crate::render_ui::focused(app) || !id.starts_with("render:") || id == "render:focus:exit");
if let Some(rect) = rect.filter(|r| r.is_finite() && r.is_positive()) {
app.shell.workspace_panels.insert(id, (rect, edge));
} else {
@@ -193,6 +197,9 @@ pub(crate) fn content_rect(app: &SolveApp, viewport: Rect) -> Rect {
/// their allocation; content-hugging Browser and floating overlays reserve their measured span.
pub(crate) fn workspace_content(app: &SolveApp, mut content: Rect) -> Rect {
if crate::render_workspace::active(app) {
if crate::render_ui::focused(app) {
return content;
}
let gap = Container::floating_card(Surface::Panel).gap();
for (rect, edge) in app.shell.workspace_panels.values() {
match edge {
+11 -4
View File
@@ -217,6 +217,8 @@ pub(crate) struct WorkspaceOptions<'a> {
pub icon: &'a str,
pub bounds: egui::Rect,
pub fill_height: bool,
/// Use the minimum dock width without overwriting its remembered width.
pub compact: bool,
}
pub(crate) struct FeatureOptions<'a> {
@@ -306,11 +308,16 @@ impl<'a> Panel<'a> {
return None;
}
let minimum = crate::frame::DIALOG_MIN_W.min(maximum);
*width = if width.is_finite() { width.clamp(minimum, maximum) } else { t.form_card_width.min(maximum) };
let display_width = if options.compact {
minimum
} else {
*width = if width.is_finite() { width.clamp(minimum, maximum) } else { t.form_card_width.min(maximum) };
*width
};
let left = side == "left";
let rect = egui::Rect::from_min_size(
egui::pos2(if left { bounds.left() } else { bounds.right() - *width }, bounds.top()),
vec2(*width, bounds.height()),
egui::pos2(if left { bounds.left() } else { bounds.right() - display_width }, bounds.top()),
vec2(display_width, bounds.height()),
);
let ctx = ui.ctx().clone();
let mut move_side = None;
@@ -372,7 +379,7 @@ impl<'a> Panel<'a> {
);
let resize = ui.interact(rail, ui.id().with("workspace_resize"), egui::Sense::drag()).on_hover_cursor(egui::CursorIcon::ResizeHorizontal);
scenario::publish_target(&format!("{}:resize", options.id), rail);
if resize.dragged() {
if resize.dragged() && !options.compact {
let delta = ui.input(|i| i.pointer.delta().x) * if left { 1.0 } else { -1.0 };
if delta.is_finite() {
*width = (*width + delta).clamp(minimum, maximum);
+7
View File
@@ -5408,6 +5408,13 @@ pub(crate) fn refresh_layout(app: &mut SolveApp, ctx: &egui::Context) {
if let Some(rect) = app.viewport.rect {
let docks = crate::shell::covered_rects(app);
let mut content = crate::shell::content_rect(app, rect);
if crate::render_ui::focused(app) {
// Focus releases dock reservations while keeping controls below the stage bar.
content = rect;
for card in &app.shell.cards {
content.min.y = (card.bottom() + Tokens::get().space_8).clamp(content.top(), content.bottom());
}
}
// The full-height Assistant reserves control space, while rendering and picking
// keep the original viewport projection. Ordinary feature dialogs do not move controls.
if app.ui.layout == crate::shell::LayoutMode::Floating
+12
View File
@@ -128,6 +128,18 @@ impl Layout {
} else {
Rect::NOTHING
};
if fit_in_content {
// A focus-exit or folded-dock chip may occupy the compass's corner.
for _ in 0..obstacles.len() {
let bottom = obstacles.iter().filter(|dock| axis_view.intersect(**dock).is_positive()).map(Rect::bottom).max_by(f32::total_cmp);
let Some(bottom) = bottom else { break };
axis_view = if available.bottom() - bottom >= cube_size {
Rect::from_min_size(pos2(axis_view.left(), bottom), vec2(cube_size, cube_size))
} else {
Rect::NOTHING
};
}
}
// On tiny viewports keep the bottom controls usable rather than overlapping them.
// This decision depends only on viewport size, never on an overlay.
if axis_view.intersect(navigation).is_positive() {
@@ -39,6 +39,21 @@ fn layout(viewport: Rect, docks: &[Rect], scale: f32, style: crate::prefs::Navig
Layout::with_content(viewport, viewport, docks, scale, style, egui::Vec2::ZERO, navigation)
}
#[test]
fn render_focus_compass_keeps_clear_of_an_exit_chip_on_either_side() {
let viewport = Rect::from_min_size(pos2(0.0, 0.0), vec2(1400.0, 900.0));
let content = Rect::from_min_max(pos2(0.0, 104.0), viewport.max);
let navigation = crate::navigation_bar_view::measure(content, &Default::default(), crate::navigation::NavCaps::RENDER, |_| 0.0).rect;
for x in [8.0, 1250.0] {
let chip = Rect::from_min_size(pos2(x, content.top()), vec2(142.0, 40.0));
let layout = Layout::product(viewport, content, &[chip], 1.0, crate::prefs::NavigatorStyle::Axes, egui::Vec2::ZERO, navigation);
assert!(layout.axis_view.is_positive() && layout.navigation.is_positive());
assert!(!layout.axis_view.intersect(chip).is_positive());
assert!(content.contains_rect(layout.axis_view));
assert!(content.contains_rect(layout.navigation));
}
}
#[test]
fn thin_rotated_bounds_fit_using_the_original_full_projection() {
for (width, height, scale) in [(1400.0, 900.0, 1.0), (700.0, 450.0, 2.0), (700.0, 360.0, 2.0), (900.0, 720.0, 1.0)] {
+14
View File
@@ -42,6 +42,20 @@ remains. The Shots strip's independent `view.shots_strip` preference is unchange
The current model/library Browser can reveal model bodies for Look; scene-specific
Lights, Shots and Output expansion awaits the scene Browser change.
`view.render_focus {on: true}` hides the Browser, Inspector and Shots strip and
releases their canvas reservations. Tab toggles focus while Render is active and
no text field has focus; the **Exit focus** chip sits at the Browser's remembered
side below the stage bar. The workspace card, stage bar, compass and view bar
remain available. Focus belongs to the window, is never saved in a design or
preferences, and retains the docks' sides, widths and folded state.
Below 1100 pt, or with `view.layout {mode: compact}`, the docks use their shared
minimum width without overwriting the remembered width. Below 800 pt the Browser
folds into a chip. Its floating card opens through
`view.render_browser {open: true}` and closes through **Fold Browser**; it shields
navigation beneath the card without reserving a canvas column. Neither command
edits or evaluates the design, moves the camera or creates an undo step.
## Image methods and controls
**CPU raster** produces the existing preview PNG with approximate transparency.
+4
View File
@@ -528,6 +528,10 @@ closed/opening/open/closing transition in both themes with
### Compact workspace composition
`Panel::workspace` accepts `WorkspaceOptions::compact` to display the minimum
dock width while retaining the remembered width. Compact widths do not resize
the saved preference; returning to a wider floating layout restores it.
`Container::gap` and `Container::frame` supply the layout policy for every adaptive
surface. Compact has no gaps or shadows between edge-bound panels; floating uses
the shared card spacing and frame. `Panel` bounds draggable compact sheets to the workspace. The shared frame rounds