diff --git a/Assets/VRM10/Editor/Vrm10SerializerGenerator.cs b/Assets/VRM10/Editor/Vrm10SerializerGenerator.cs index e1c22f856..7814af216 100644 --- a/Assets/VRM10/Editor/Vrm10SerializerGenerator.cs +++ b/Assets/VRM10/Editor/Vrm10SerializerGenerator.cs @@ -70,7 +70,7 @@ namespace UniVRM10 // VRMC_node_constraint new GenerateInfo( - $"{SPEC_DIR}/VRMC_node_constraint-1.0_draft/schema/VRMC_node_constraint.schema.json", + $"{SPEC_DIR}/VRMC_node_constraint-1.0_beta/schema/VRMC_node_constraint.schema.json", "Assets/VRM10/Runtime/Format/Constraints" ), }; diff --git a/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs b/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs index 2b6d643c5..4ee8e1ece 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs @@ -13,7 +13,8 @@ namespace UniVRM10 { public const string VRM_SPEC_VERSION = "1.0-beta"; public const string SPRINGBONE_SPEC_VERSION = "1.0-beta"; - public const string NODE_CONSTRAINT_SPEC_VERSION = "1.0-draft"; + public const string NODE_CONSTRAINT_SPEC_VERSION = "1.0-beta"; + public const string MTOON_SPEC_VERSION = "1.0-draft"; public const string LICENSE_URL_JA = "https://vrm.dev/licenses/1.0/"; public const string LICENSE_URL_EN = "https://vrm.dev/licenses/1.0/en/"; diff --git a/Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs b/Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs index 8068dd0f3..1d4ef5ee3 100644 --- a/Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs +++ b/Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs @@ -14,8 +14,6 @@ namespace UniVRM10 { internal static class MigrationMToonMaterial { - private const string MigrationMToon10SpecVersion = "1.0-draft"; - public static void Migrate(glTF gltf, JsonNode vrm0) { // Create MToonDefinition(0.x) from JSON(0.x) @@ -91,7 +89,7 @@ namespace UniVRM10 // var dst = new VRMC_materials_mtoon { - SpecVersion = MigrationMToon10SpecVersion, + SpecVersion = Vrm10Exporter.MTOON_SPEC_VERSION, }; // Texture Transform diff --git a/Assets/VRM10/Runtime/Migration/Materials/MigrationUnlitTransparentZWriteMaterial.cs b/Assets/VRM10/Runtime/Migration/Materials/MigrationUnlitTransparentZWriteMaterial.cs index 18295ec50..b0d2c809c 100644 --- a/Assets/VRM10/Runtime/Migration/Materials/MigrationUnlitTransparentZWriteMaterial.cs +++ b/Assets/VRM10/Runtime/Migration/Materials/MigrationUnlitTransparentZWriteMaterial.cs @@ -15,7 +15,6 @@ namespace UniVRM10 /// internal static class MigrationUnlitTransparentZWriteMaterial { - private const string MigrationMToon10SpecVersion = "1.0-draft"; // NOTE: vrm-1.0 spec private const int MaxRenderQueueOffset = 9; // NOTE: vrm-1.0 spec private const string Unity0XShaderName = "VRM/UnlitTransparentZWrite"; @@ -110,7 +109,7 @@ namespace UniVRM10 ), pbrMetallicRoughness = new glTFPbrMetallicRoughness { - baseColorFactor = new[] {0f, 0f, 0f, baseColorFactor[3]}, // black + _Color.a + baseColorFactor = new[] { 0f, 0f, 0f, baseColorFactor[3] }, // black + _Color.a baseColorTexture = baseColorTexture, // _MainTex metallicFactor = 0f, roughnessFactor = 1f, @@ -118,16 +117,16 @@ namespace UniVRM10 alphaMode = "BLEND", alphaCutoff = 0.5f, doubleSided = false, - emissiveFactor = new[] {baseColorFactor[0], baseColorFactor[1], baseColorFactor[2]}, // _Color.rgb + emissiveFactor = new[] { baseColorFactor[0], baseColorFactor[1], baseColorFactor[2] }, // _Color.rgb emissiveTexture = emissiveTexture, }; var mtoon10 = new VRMC_materials_mtoon { - SpecVersion = MigrationMToon10SpecVersion, + SpecVersion = Vrm10Exporter.MTOON_SPEC_VERSION, TransparentWithZWrite = true, // transparent with zWrite RenderQueueOffsetNumber = renderQueueOffset, - ShadeColorFactor = new[] {0f, 0f, 0f}, // black + ShadeColorFactor = new[] { 0f, 0f, 0f }, // black OutlineWidthMode = OutlineWidthMode.none // disable outline }; UniGLTF.Extensions.VRMC_materials_mtoon.GltfSerializer.SerializeTo(ref mtoonMaterial.extensions, diff --git a/vrm-specification b/vrm-specification index e93a3a077..741b0c3f3 160000 --- a/vrm-specification +++ b/vrm-specification @@ -1 +1 @@ -Subproject commit e93a3a0776660e38bbced4c8219217c21f743628 +Subproject commit 741b0c3f3cb44111d9e9ea179de9e3fc545ac50a