Skip to content

Commit 688e76d

Browse files
committed
Update VJson to v0.9.10. Follow new interfaces
1 parent 4c6837e commit 688e76d

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"com.unity.ide.vscode": "1.2.3",
55
"com.unity.test-framework": "1.1.22",
66
"com.unity.ugui": "1.0.0",
7-
"net.yutopp.vjson": "0.9.8",
7+
"net.yutopp.vjson": "0.9.10",
88
"com.unity.modules.ai": "1.0.0",
99
"com.unity.modules.androidjni": "1.0.0",
1010
"com.unity.modules.animation": "1.0.0",

Packages/net.yutopp.vgltf/Runtime/GltfReader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static Types.Gltf Read(Stream s, JsonSchemaRegistry reg, bool withRepairm
3232
// If JsonSchemaRegistry is passed, we interpret it as an intention to validate JsonSchema
3333
if (reg != null)
3434
{
35-
var schema = JsonSchemaAttribute.CreateFromClass<Types.Gltf>(reg);
35+
var schema = JsonSchema.CreateFromType<Types.Gltf>(reg);
3636
var ex = schema.Validate(gltf, reg);
3737
if (ex != null)
3838
{

Packages/net.yutopp.vgltf/Runtime/GltfWriter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class GltfWriter
1717
{
1818
public static void Write(Stream s, Types.Gltf gltf, JsonSchemaRegistry reg)
1919
{
20-
var schema = JsonSchemaAttribute.CreateFromClass<Types.Gltf>(reg);
20+
var schema = JsonSchema.CreateFromType<Types.Gltf>(reg);
2121
var ex = schema.Validate(gltf, reg);
2222
if (ex != null)
2323
{

Packages/net.yutopp.vgltf/Runtime/Types/GltfProperty.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public bool TryGetExtension<T>(string name, JsonSchemaRegistry reg, out T value)
5151
return false;
5252
}
5353

54-
var v = JsonSchemaAttribute.CreateFromClass<T>(reg);
54+
var v = JsonSchema.CreateFromType<T>(reg);
5555
var ex = v.Validate(node, reg);
5656
if (ex != null)
5757
{
@@ -95,7 +95,7 @@ public bool TryGetExtra<T>(string name, JsonSchemaRegistry reg, out T value)
9595
return false;
9696
}
9797

98-
var v = JsonSchemaAttribute.CreateFromClass<T>(reg);
98+
var v = JsonSchema.CreateFromType<T>(reg);
9999
var ex = v.Validate(node, reg);
100100
if (ex != null)
101101
{

Packages/net.yutopp.vgltf/Tests/Runtime/GltfContainerTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void FromGltfTest(string[] modelPath, ModelTester.IModelTester tester)
2525
{
2626
var c = GltfContainer.FromGltf(fs);
2727

28-
var schema = VJson.Schema.JsonSchemaAttribute.CreateFromClass<Types.Gltf>(c.JsonSchemas);
28+
var schema = VJson.Schema.JsonSchema.CreateFromType<Types.Gltf>(c.JsonSchemas);
2929
var ex = schema.Validate(c.Gltf, c.JsonSchemas);
3030
Assert.Null(ex);
3131

@@ -47,7 +47,7 @@ public void FromGlbTest(string[] modelPath, ModelTester.IModelTester tester)
4747
{
4848
var c = GltfContainer.FromGlb(fs);
4949

50-
var schema = VJson.Schema.JsonSchemaAttribute.CreateFromClass<Types.Gltf>(c.JsonSchemas);
50+
var schema = VJson.Schema.JsonSchema.CreateFromType<Types.Gltf>(c.JsonSchemas);
5151
var ex = schema.Validate(c.Gltf, c.JsonSchemas);
5252
Assert.Null(ex);
5353

Packages/net.yutopp.vgltf/Tests/Runtime/Types/SchemaTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class SchemaTests
1717
public void GLTFTest(Type ty, string expectedSchema)
1818
{
1919
var serializer = new VJson.JsonSerializer(typeof(VJson.Schema.JsonSchemaAttribute));
20-
var schema = serializer.Serialize(VJson.Schema.JsonSchemaAttribute.CreateFromType(ty));
20+
var schema = serializer.Serialize(VJson.Schema.JsonSchema.CreateFromType(ty));
2121

2222
//Assert.AreEqual(expectedSchema, schema);
2323
}

Packages/packages-lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"dependencies": {}
6767
},
6868
"net.yutopp.vjson": {
69-
"version": "0.9.8",
69+
"version": "0.9.10",
7070
"depth": 0,
7171
"source": "registry",
7272
"dependencies": {},

0 commit comments

Comments
 (0)