mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-16 23:42:27 +00:00
Merge pull request #1710 from storytold/codex/fbx-rotation-options
Allow FBX pre and post rotations without the active flag
This commit is contained in:
2 files changed
+29
-3
No files matched your search
+16
-3
@@ -638,9 +638,9 @@ fn euler(d: [f64; 3], order: i64) -> Mat4 {
|
||||
}
|
||||
|
||||
/// A Model's local transform: `T · Roff · Rp · Rpre · R · Rpost⁻¹ · Rp⁻¹ · Soff · Sp · S · Sp⁻¹`.
|
||||
fn model_local(p: &Props) -> Mat4 {
|
||||
fn model_local(p: &Props, apply_inactive_rotation: bool) -> Mat4 {
|
||||
let order = p.f("RotationOrder").map_or(0, |o| o as i64);
|
||||
let active = p.f("RotationActive").is_some_and(|a| a != 0.0);
|
||||
let active = apply_inactive_rotation || p.f("RotationActive").is_some_and(|a| a != 0.0);
|
||||
let (pre, post) =
|
||||
if active { (euler(p.v3("PreRotation", [0.0; 3]), 0), transpose(&euler(p.v3("PostRotation", [0.0; 3]), 0))) } else { (IDENTITY, IDENTITY) };
|
||||
let rp = p.v3("RotationPivot", [0.0; 3]);
|
||||
@@ -671,6 +671,14 @@ fn geometric(p: &Props) -> Option<Mat4> {
|
||||
Some(chain(&[translate(t), euler(r, 0), scale(s)]))
|
||||
}
|
||||
|
||||
/// Optional FBX scene compatibility behavior.
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
|
||||
pub struct SceneOptions {
|
||||
/// Apply pre/post rotations even when `RotationActive` is missing or zero. Some importers
|
||||
/// retain these values regardless of the flag.
|
||||
pub apply_inactive_rotation: bool,
|
||||
}
|
||||
|
||||
impl Document {
|
||||
/// The top-level record of this name.
|
||||
pub fn top(&self, name: &str) -> Option<&Record> {
|
||||
@@ -720,6 +728,11 @@ impl Document {
|
||||
/// The scene the records describe. `resolve` is asked for texture image files (see the
|
||||
/// module documentation).
|
||||
pub fn scene(&self, limits: &Limits, resolve: Resolver) -> Result<Scene> {
|
||||
self.scene_with_options(limits, resolve, &SceneOptions::default())
|
||||
}
|
||||
|
||||
/// Build a scene with explicitly selected compatibility behavior.
|
||||
pub fn scene_with_options(&self, limits: &Limits, resolve: Resolver, options: &SceneOptions) -> Result<Scene> {
|
||||
if self.version != 0 && self.version < 6000 {
|
||||
return Err(crate::Error::Unsupported(format!(
|
||||
"FBX {}.{} (only FBX 6.x and 7.x files are read)",
|
||||
@@ -761,7 +774,7 @@ impl Document {
|
||||
node_of.insert(*id, b.scene.nodes.len());
|
||||
b.scene.nodes.push(Node {
|
||||
name: short_name(o.first_str().unwrap_or("")).to_string(),
|
||||
transform: model_local(&Props::of(o)),
|
||||
transform: model_local(&Props::of(o), options.apply_inactive_rotation),
|
||||
..Node::default()
|
||||
});
|
||||
}
|
||||
|
||||
@@ -627,3 +627,16 @@ fn fbx6_model_holds_its_mesh() {
|
||||
assert_eq!(d.unit_scale(), Some(100.0));
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn optional_inactive_pre_rotation_keeps_legacy_placements() {
|
||||
let text = "FBXHeaderExtension: { FBXVersion: 7400 } Objects: { Model: 1, \"Model::A\", \"Null\" { Properties70: { P: \"PreRotation\", \"\", \"\", \"\", 0,0,90 } } }";
|
||||
let doc = document(text.as_bytes());
|
||||
let normal = doc.scene(&Limits::default(), &mut no_external).unwrap();
|
||||
let options = crate::fbx::SceneOptions { apply_inactive_rotation: true };
|
||||
let legacy = doc.scene_with_options(&Limits::default(), &mut no_external, &options).unwrap();
|
||||
let p = [1.0, 0.0, 0.0];
|
||||
assert_eq!(transform_point(&normal.nodes[0].transform, p), p);
|
||||
let turned = transform_point(&legacy.nodes[0].transform, p);
|
||||
assert!((turned[0]).abs() < 1e-12 && (turned[1] - 1.0).abs() < 1e-12);
|
||||
}
|
||||
Reference in new issue
Block a user