Render: integrated workspace, preview image jobs and opaque PBR (#1046)
Lands the Render workspace (R3), bounded preview-image jobs with cancellation and atomic PNG export (R4a), and opaque PBR looks as one change. - Render workspace: an overlay-free product preview on the installed GPU device. Returning to Design restores its camera. render.scene and render.settings.apply are added. - Image jobs: render.preflight/start/status/cancel/export run bounded CPU preview jobs. Export captures the job, overwrite choice and document, and checks the caller's file scope before writing. - Opaque PBR: looks can carry metal fraction, roughness and dielectric IOR. The product viewport and preview PNG use them; geometry and mass are unchanged. The v1 catalog export refuses PBR rather than dropping it. - Render setups and PBR looks are saved under design format 21. Labels are in en/de/ja/ko/zh/ru. Supersedes #706 and #800. Refs #620, #673, #756, #1004. Contributed by @0xlillith. Co-authored-by: lillith <[email protected]>
This commit is contained in:
1 parent
e4ef6cfe29
commit
a261aaa841
70 files changed
+5860
-101
No files matched your search
@@ -57,11 +57,14 @@ pub struct ScalarLook {
|
||||
pub opacity: f64,
|
||||
}
|
||||
impl ScalarLook {
|
||||
pub fn from_look(look: &Look) -> Self {
|
||||
Self { name: look.name.clone(), color: look.color, opacity: look.opacity }
|
||||
pub fn from_look(look: &Look) -> Result<Self> {
|
||||
if look.pbr.is_some() {
|
||||
return Err(invalid("scalar catalog v1 cannot preserve PBR parameters; export refused"));
|
||||
}
|
||||
Ok(Self { name: look.name.clone(), color: look.color, opacity: look.opacity })
|
||||
}
|
||||
pub fn to_look(&self) -> Look {
|
||||
Look { name: self.name.clone(), color: self.color, opacity: self.opacity }
|
||||
Look { name: self.name.clone(), color: self.color, opacity: self.opacity, pbr: None }
|
||||
}
|
||||
fn validate(&self) -> Result<()> {
|
||||
if !text(&self.name, 128) || !self.opacity.is_finite() || !(0.0..=1.0).contains(&self.opacity) {
|
||||
@@ -80,8 +83,12 @@ pub struct ScalarMaterial {
|
||||
pub appearance: Option<ScalarLook>,
|
||||
}
|
||||
impl ScalarMaterial {
|
||||
pub fn from_material(material: &UserMaterial) -> Self {
|
||||
Self { name: material.name.clone(), density_g_cm3: material.density, appearance: material.appearance.as_ref().map(ScalarLook::from_look) }
|
||||
pub fn from_material(material: &UserMaterial) -> Result<Self> {
|
||||
Ok(Self {
|
||||
name: material.name.clone(),
|
||||
density_g_cm3: material.density,
|
||||
appearance: material.appearance.as_ref().map(ScalarLook::from_look).transpose()?,
|
||||
})
|
||||
}
|
||||
pub fn to_material(&self, name: String) -> UserMaterial {
|
||||
UserMaterial { name, density: self.density_g_cm3, appearance: self.appearance.as_ref().map(ScalarLook::to_look) }
|
||||
@@ -266,12 +273,12 @@ impl Catalog {
|
||||
Ok(())
|
||||
};
|
||||
for look in doc.appearances.bodies.values().chain(doc.appearances.components.values()).chain(doc.appearances.faces.iter().map(|f| &f.look)) {
|
||||
insert(Definition::Appearance(ScalarLook::from_look(look)))?;
|
||||
insert(Definition::Appearance(ScalarLook::from_look(look)?))?;
|
||||
}
|
||||
for material in &doc.user_materials {
|
||||
insert(Definition::Material(ScalarMaterial::from_material(material)))?;
|
||||
insert(Definition::Material(ScalarMaterial::from_material(material)?))?;
|
||||
if let Some(look) = &material.appearance {
|
||||
insert(Definition::Appearance(ScalarLook::from_look(look)))?;
|
||||
insert(Definition::Appearance(ScalarLook::from_look(look)?))?;
|
||||
}
|
||||
}
|
||||
let out = Self { format: FORMAT.into(), id: id.into(), name: name.into(), entries: entries.into_values().collect() };
|
||||
|
||||
@@ -123,3 +123,34 @@ fn design_export_deduplicates_exact_looks_and_keeps_physical_properties_distinct
|
||||
assert_eq!(library, Catalog::decode(&library.encode().unwrap()).unwrap());
|
||||
assert!(Catalog::from_document(&Document::default(), "user.test", "Test", Provenance { license: String::new(), ..Default::default() }).is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scalar_export_refuses_pbr_in_every_design_owned_appearance_location() {
|
||||
use solidcraft_doc::{appearance::FaceLook, pbr_appearance::PbrParameters};
|
||||
let mut look = ScalarLook { name: "Original PBR specimen".into(), color: [180, 120, 70], opacity: 1.0 }.to_look();
|
||||
look.pbr = Some(PbrParameters::new(1.0, 0.3, 1.5).unwrap());
|
||||
for location in 0..4 {
|
||||
let mut doc = Document::default();
|
||||
match location {
|
||||
0 => {
|
||||
doc.appearances.bodies.insert("Specimen".into(), look.clone());
|
||||
}
|
||||
1 => {
|
||||
doc.appearances.components.insert(1, look.clone());
|
||||
}
|
||||
2 => doc.appearances.faces.push(FaceLook {
|
||||
body: "Specimen".into(),
|
||||
point: Default::default(),
|
||||
look: look.clone(),
|
||||
name: None,
|
||||
strict_name: false,
|
||||
certificate: None,
|
||||
}),
|
||||
_ => doc.user_materials.push(UserMaterial { name: "Original material".into(), density: 1.2, appearance: Some(look.clone()) }),
|
||||
}
|
||||
let before = doc.clone();
|
||||
let error = Catalog::from_document(&doc, "user.test", "Test", Provenance::default()).unwrap_err();
|
||||
assert!(error.to_string().contains("cannot preserve PBR"));
|
||||
assert_eq!(doc, before);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user