griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: USD: Pass struct by ref and add more tests for scaling options

Browse Source 
- There's only a few unit conversion options, just test all of them
- Use reference instead of pointer when passing export settings struct
- Organize scaling struct fields to keep similar options together

Pull Request: https://projects.blender.org/blender/blender/pulls/133774
This commit is contained in:
Jesse Yurkovich
2025-01-29 20:03:36 +01:00
committed by Jesse Yurkovich
parent ca64f2f7e7
commit a6ad8f4fd9
6 changed files with 27 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
tests/python/bl_usd_export_test.py
View File

@@ -1326,40 +1326,23 @@ class USDExportTest(AbstractUSDTest):
"""Test specifying stage meters per unit on export."""
bpy.ops.wm.open_mainfile(filepath=str(self.testdir / "empty.blend"))
export_path = self.tempdir / "usd_export_units_test_cm.usda"
self.export_and_validate(
filepath=str(export_path),
convert_scene_units='CENTIMETERS'
units = (
("mm", 'MILLIMETERS', 0.001), ("cm", 'CENTIMETERS', 0.01), ("km", 'KILOMETERS', 1000),
("in", 'INCHES', 0.0254), ("ft", 'FEET', 0.3048), ("yd", 'YARDS', 0.9144),
("default", "", 1), ("custom", 'CUSTOM', 0.125)
)
for name, unit, value in units:
export_path = self.tempdir / f"usd_export_units_test_{name}.usda"
if name == "default":
self.export_and_validate(filepath=str(export_path))
elif name == "custom":
self.export_and_validate(filepath=str(export_path), convert_scene_units=unit, meters_per_unit=value)
else:
self.export_and_validate(filepath=str(export_path), convert_scene_units=unit)
# Verify that meters per unit were set correctly
stage = Usd.Stage.Open(str(export_path))
mpu = UsdGeom.GetStageMetersPerUnit(stage)
self.assertEqual(mpu, 0.01)
# Export with default meters units.
export_path = self.tempdir / "usd_export_units_test_default.usda"
self.export_and_validate(
filepath=str(export_path)
)
# Verify that meters per unit were set correctly
stage = Usd.Stage.Open(str(export_path))
mpu = UsdGeom.GetStageMetersPerUnit(stage)
self.assertEqual(mpu, 1.0)
# Export with custom meters per unit.
export_path = self.tempdir / "usd_export_units_test_custom.usda"
self.export_and_validate(
filepath=str(export_path),
convert_scene_units='CUSTOM',
meters_per_unit=0.1,
)
# Verify that meters per unit were set correctly
stage = Usd.Stage.Open(str(export_path))
mpu = UsdGeom.GetStageMetersPerUnit(stage)
self.assertAlmostEqual(mpu, 0.1)
# Verify that meters per unit were set correctly
stage = Usd.Stage.Open(str(export_path))
self.assertEqual(UsdGeom.GetStageMetersPerUnit(stage), value)
def test_export_native_instancing_true(self):
"""Test exporting instanced objects to native (scne graph) instances."""