From e725329648dd8454dd2a98b34342cddd47e34a49 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 17 Jun 2024 13:57:22 +0900 Subject: [PATCH] fix editor test for null material export. related #2313 --- Assets/UniGLTF/Tests/UniGLTF/MeshExportValidatorTests.cs | 4 ++-- Assets/UniGLTF/Tests/UniGLTF/UniGLTFTests.cs | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Assets/UniGLTF/Tests/UniGLTF/MeshExportValidatorTests.cs b/Assets/UniGLTF/Tests/UniGLTF/MeshExportValidatorTests.cs index 78e5bad92..96d2acece 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/MeshExportValidatorTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/MeshExportValidatorTests.cs @@ -48,7 +48,7 @@ namespace UniGLTF { validator.SetRoot(root, new GltfExportSettings(), new DefualtBlendShapeExportFilter()); var vs = validator.Validate(root); - Assert.False(vs.All(x => x.CanExport)); + Assert.True(vs.All(x => x.CanExport)); } finally { @@ -68,7 +68,7 @@ namespace UniGLTF { validator.SetRoot(root, new GltfExportSettings(), new DefualtBlendShapeExportFilter()); var vs = validator.Validate(root); - Assert.False(vs.All(x => x.CanExport)); + Assert.True(vs.All(x => x.CanExport)); } finally { diff --git a/Assets/UniGLTF/Tests/UniGLTF/UniGLTFTests.cs b/Assets/UniGLTF/Tests/UniGLTF/UniGLTFTests.cs index d2770cd22..af7ae8b20 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/UniGLTFTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/UniGLTFTests.cs @@ -272,7 +272,7 @@ namespace UniGLTF }; var json = model.ToJson(); - Assert.AreEqual(@"{""name"":""mesh"",""primitives"":[{""mode"":0,""indices"":0,""attributes"":{""POSITION"":1},""material"":0}]}", json); + Assert.AreEqual(@"{""name"":""mesh"",""primitives"":[{""mode"":0,""indices"":0,""attributes"":{""POSITION"":1}}]}", json); Debug.Log(json); } @@ -290,7 +290,7 @@ namespace UniGLTF }; var json = model.ToJson(); - Assert.AreEqual(@"{""mode"":0,""indices"":0,""attributes"":{""POSITION"":1},""material"":0,""extras"":{""targetNames"":[""aaa""]}}", json); + Assert.AreEqual(@"{""mode"":0,""indices"":0,""attributes"":{""POSITION"":1},""extras"":{""targetNames"":[""aaa""]}}", json); Debug.Log(json); } @@ -378,8 +378,6 @@ namespace UniGLTF primitive.AddValue(Utf8String.From("0").Bytes, ValueNodeType.Integer); primitive.AddKey(Utf8String.From("indices")); primitive.AddValue(Utf8String.From("0").Bytes, ValueNodeType.Integer); - primitive.AddKey(Utf8String.From("material")); - primitive.AddValue(Utf8String.From("0").Bytes, ValueNodeType.Integer); primitive.AddKey(Utf8String.From("attributes")); primitive.AddValue(default(ArraySegment), ValueNodeType.Object); primitive["attributes"].AddKey(Utf8String.From("POSITION"));