Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-13 14:29:38 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

update vrm-specification. NODE_CONSTRAINT_SPEC_VERSION has been upgraded from draft to beta.

Browse Source
This commit is contained in:
ousttrue
2022-05-13 13:27:31 +09:00
parent 9b18213535
commit f4ef947607
5 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/VRM10/Editor/Vrm10SerializerGenerator.cs
View File

@@ -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"
),
};

3
Assets/VRM10/Runtime/IO/Vrm10Exporter.cs
View File

@@ -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/";

4
Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs
View File

@@ -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

9
Assets/VRM10/Runtime/Migration/Materials/MigrationUnlitTransparentZWriteMaterial.cs
View File

@@ -15,7 +15,6 @@ namespace UniVRM10
/// </summary>
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,

2
vrm-specification

Submodule vrm-specification updated: e93a3a0776...741b0c3f3c