Skip to content

Commit 808ff27

Browse files
committed
code review fix - return anonymous tuple
1 parent 1571d32 commit 808ff27

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

com.unity.formats.fbx/Tests/FbxTests/ModelExporterTest.cs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -542,10 +542,8 @@ private void CompareMeshComponentAttributes(Mesh mesh, Mesh fbxMesh)
542542
}
543543

544544
private delegate void SetImportSettings(ModelImporter importer);
545-
private string ExportSkinnedMesh(
545+
private (string filename, SkinnedMeshRenderer originalSkinnedMesh, SkinnedMeshRenderer exportedSkinnedMesh) ExportSkinnedMesh(
546546
string fileToExport,
547-
out SkinnedMeshRenderer originalSkinnedMesh,
548-
out SkinnedMeshRenderer exportedSkinnedMesh,
549547
SetImportSettings setImportSettings = null)
550548
{
551549
// change import settings of original FBX
@@ -577,13 +575,13 @@ private string ExportSkinnedMesh(
577575
GameObject fbxObj = AssetDatabase.LoadMainAssetAtPath(filename) as GameObject;
578576
Assert.IsTrue (fbxObj);
579577

580-
originalSkinnedMesh = originalGO.GetComponentInChildren<SkinnedMeshRenderer> ();
578+
var originalSkinnedMesh = originalGO.GetComponentInChildren<SkinnedMeshRenderer> ();
581579
Assert.IsNotNull (originalSkinnedMesh);
582580

583-
exportedSkinnedMesh = fbxObj.GetComponentInChildren<SkinnedMeshRenderer> ();
581+
var exportedSkinnedMesh = fbxObj.GetComponentInChildren<SkinnedMeshRenderer> ();
584582
Assert.IsNotNull (exportedSkinnedMesh);
585583

586-
return filename;
584+
return (filename, originalSkinnedMesh, exportedSkinnedMesh);
587585
}
588586

589587
public class SkinnedMeshTestDataClass
@@ -622,7 +620,9 @@ public void TestSkinnedMeshes (string fbxPath) {
622620
Assert.That (fbxPath, Is.Not.Null);
623621

624622
SkinnedMeshRenderer originalSkinnedMesh, exportedSkinnedMesh;
625-
ExportSkinnedMesh (fbxPath, out originalSkinnedMesh, out exportedSkinnedMesh);
623+
var exportResult = ExportSkinnedMesh (fbxPath);
624+
originalSkinnedMesh = exportResult.originalSkinnedMesh;
625+
exportedSkinnedMesh = exportResult.exportedSkinnedMesh;
626626

627627
Assert.IsTrue (originalSkinnedMesh.name == exportedSkinnedMesh.name ||
628628
(originalSkinnedMesh.transform.parent == null && exportedSkinnedMesh.transform.parent == null));
@@ -877,7 +877,11 @@ public void TestBlendShapeExport(string fbxPath)
877877
importer.weldVertices = true;
878878
};
879879

880-
var exportedFbxPath = ExportSkinnedMesh (fbxPath, out originalSMR, out exportedSMR, setImportSettings);
880+
var exportResult = ExportSkinnedMesh (fbxPath, setImportSettings);
881+
var exportedFbxPath = exportResult.filename;
882+
originalSMR = exportResult.originalSkinnedMesh;
883+
exportedSMR = exportResult.exportedSkinnedMesh;
884+
881885

882886
var originalMesh = originalSMR.sharedMesh;
883887
var exportedMesh = exportedSMR.sharedMesh;

0 commit comments

Comments
 (0)