Skip to content

Commit 645cccd

Browse files
lee-aandrewlee-aandrew
committed
Applies review comments
1 parent 8deb028 commit 645cccd

File tree

3 files changed

+49
-54
lines changed

3 files changed

+49
-54
lines changed

‎package/com.unity.formats.usd/Tests/Common/CustomAsserts/ExportAssert.cs‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,27 @@ namespace Unity.Formats.USD.Tests
55
{
66
public static class ExportAssert
77
{
8-
public static class Runtime
8+
public static void IsDataStructureKeptInUsdz(GameObject importedObject, string expectedObjectName, string expectedRootPrimName, string expectedMaterialsName)
99
{
10-
public static void IsDataStructureKeptInUsdz(GameObject importedObject, string expectedObjectName, string expectedRootPrimName, string expectedMaterialsName)
11-
{
12-
Assert.AreEqual(importedObject.name, expectedObjectName);
10+
Assert.AreEqual(importedObject.name, expectedObjectName);
1311

14-
var rootPrim = importedObject.transform.Find(expectedRootPrimName);
15-
var materials = importedObject.transform.Find(expectedMaterialsName);
12+
var rootPrim = importedObject.transform.Find(expectedRootPrimName);
13+
var materials = importedObject.transform.Find(expectedMaterialsName);
1614

17-
Assert.IsNotNull(rootPrim, string.Format("Root Prim was not found under expected name '{0}'", expectedRootPrimName));
18-
Assert.IsNotNull(materials, string.Format("Materials was not found under expected name '{0}'", expectedMaterialsName));
15+
Assert.IsNotNull(rootPrim, string.Format("Root Prim was not found under expected name '{0}'", expectedRootPrimName));
16+
Assert.IsNotNull(materials, string.Format("Materials was not found under expected name '{0}'", expectedMaterialsName));
1917

20-
Assert.IsNotNull(rootPrim.GetComponent<UsdPrimSource>(), "Root Prim GameObject did not contain UsdPrimSource component");
21-
Assert.IsNotNull(materials.GetComponent<UsdPrimSource>(), "Materials GameObject did not contain UsdPrimSource component");
18+
Assert.IsNotNull(rootPrim.GetComponent<UsdPrimSource>(), "Root Prim GameObject did not contain UsdPrimSource component");
19+
Assert.IsNotNull(materials.GetComponent<UsdPrimSource>(), "Materials GameObject did not contain UsdPrimSource component");
2220

23-
var materialsData = materials.transform.Find(expectedObjectName);
24-
var rootPrimData = rootPrim.transform.Find(expectedObjectName);
21+
var materialsData = materials.transform.Find(expectedObjectName);
22+
var rootPrimData = rootPrim.transform.Find(expectedObjectName);
2523

26-
Assert.IsNotNull(rootPrimData, string.Format("Root Prim Data was not found under expected name '{0}'", expectedObjectName));
27-
Assert.IsNotNull(materialsData, string.Format("Materials Data was not found under expected name '{0}'", expectedObjectName));
24+
Assert.IsNotNull(rootPrimData, string.Format("Root Prim Data was not found under expected name '{0}'", expectedObjectName));
25+
Assert.IsNotNull(materialsData, string.Format("Materials Data was not found under expected name '{0}'", expectedObjectName));
2826

29-
Assert.IsNotNull(rootPrimData.GetComponent<UsdPrimSource>(), "Root Prim Data GameObject did not contain UsdPrimSource component");
30-
Assert.IsNotNull(materialsData.GetComponent<UsdPrimSource>(), "Materials Data GameObject did not contain UsdPrimSource component");
31-
}
27+
Assert.IsNotNull(rootPrimData.GetComponent<UsdPrimSource>(), "Root Prim Data GameObject did not contain UsdPrimSource component");
28+
Assert.IsNotNull(materialsData.GetComponent<UsdPrimSource>(), "Materials Data GameObject did not contain UsdPrimSource component");
3229
}
3330
}
3431
}

‎package/com.unity.formats.usd/Tests/Editor/ExportTests.cs‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,5 +117,40 @@ public void ExportMultipleSiblingGameObjectsWithSameName_AllGameObjectsHaveCorre
117117
}
118118
Assert.AreEqual(cubes.Length, exportedPrims.Count, "One or more GameObjects don't have a corresponding Prim");
119119
}
120+
121+
[Test]
122+
[Ignore("[USDU-275] | [USDU-279]")]
123+
public void ExportAsUsdz_DataStructureKeptOnImport()
124+
{
125+
var scene = ImportHelpers.InitForOpen(GetTestAssetPath(TestAssetData.FileName.TexturedOpaque));
126+
var importedUsdObject = ImportHelpers.ImportSceneAsGameObject(scene, importOptions:
127+
new SceneImportOptions()
128+
{
129+
materialImportMode = MaterialImportMode.ImportPreviewSurface
130+
}
131+
);
132+
133+
var usdzPath = GetUSDScenePath(importedUsdObject.name + ".usdz");
134+
UsdzExporter.ExportUsdz(usdzPath, importedUsdObject);
135+
136+
var usdObjectRootPath = importedUsdObject.GetComponent<UsdAsset>().m_usdRootPath;
137+
138+
var usdzScene = ImportHelpers.InitForOpen(usdzPath);
139+
var usdzObject = ImportHelpers.ImportSceneAsGameObject(usdzScene, importOptions:
140+
new SceneImportOptions()
141+
{
142+
materialImportMode = MaterialImportMode.ImportPreviewSurface
143+
}
144+
);
145+
146+
Assert.AreEqual(usdzObject.GetComponent<UsdAsset>().m_usdRootPath, usdObjectRootPath);
147+
148+
ExportAssert.IsDataStructureKeptInUsdz(
149+
usdzObject,
150+
expectedMaterialsName: TestAssetData.ImportGameObjectName.Material,
151+
expectedRootPrimName: TestAssetData.ImportGameObjectName.RootPrim,
152+
expectedObjectName: TestAssetData.FileName.TexturedOpaque
153+
);
154+
}
120155
}
121156
}

‎package/com.unity.formats.usd/Tests/Runtime/ExportHelpersTests.cs‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -110,42 +110,5 @@ public void ExportGameObjects_SceneClosedAfterExport()
110110
ExportHelpers.ExportGameObjects(new[] { new GameObject("test") }, scene, BasisTransformation.SlowAndSafe);
111111
Assert.IsNull(scene.Stage);
112112
}
113-
114-
[Ignore("[USDU-275] | [USDU-279]")]
115-
[Test]
116-
public void ExportAsUsdz_DataStructureKeptOnImport()
117-
{
118-
var scene = ImportHelpers.InitForOpen(GetTestAssetPath(TestAssetData.FileName.TexturedOpaque));
119-
var importedUsdObject = ImportHelpers.ImportSceneAsGameObject(scene, importOptions:
120-
new SceneImportOptions()
121-
{
122-
materialImportMode = MaterialImportMode.ImportPreviewSurface
123-
}
124-
);
125-
126-
var usdzPath = GetUSDScenePath(importedUsdObject.name + ".usdz");
127-
UsdzExporter.ExportUsdz(usdzPath, importedUsdObject);
128-
129-
var usdObjectRootPath = importedUsdObject.GetComponent<UsdAsset>().m_usdRootPath;
130-
131-
Assert.AreEqual(usdObjectRootPath, "/");
132-
133-
var usdzScene = ImportHelpers.InitForOpen(usdzPath);
134-
var usdzObject = ImportHelpers.ImportSceneAsGameObject(usdzScene, importOptions:
135-
new SceneImportOptions()
136-
{
137-
materialImportMode = MaterialImportMode.ImportPreviewSurface
138-
}
139-
);
140-
141-
Assert.AreEqual(usdzObject.GetComponent<UsdAsset>().m_usdRootPath, usdObjectRootPath);
142-
143-
ExportAssert.Runtime.IsDataStructureKeptInUsdz(
144-
usdzObject,
145-
expectedMaterialsName: TestAssetData.ImportGameObjectName.Material,
146-
expectedRootPrimName: TestAssetData.ImportGameObjectName.RootPrim,
147-
expectedObjectName: TestAssetData.FileName.TexturedOpaque
148-
);
149-
}
150113
}
151114
}

0 commit comments

Comments
 (0)