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

Merge branch 'master' into feature/vrm10

Browse Source
This commit is contained in:
ousttrue
2021-01-12 12:53:43 +09:00
committed by GitHub
parent d53942a7bd 2c190c39d9
commit 796470b17e
7 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/UniGLTF/Editor/UniGLTF/Serialization/StringKeyDictionarySerialization.cs
View File

@@ -42,7 +42,11 @@ public static $0 $2(ListTreeNode<JsonValue> parsed)
public override string CreateSerializationCondition(string argName, JsonSchemaAttribute t)
{
return $"{argName}!=null&&{argName}.Count>0";
// return $"{argName}!=null&&{argName}.Count>0";
// this check is only /extensions/VRM/materialProperties/*
// should export empty dictionary.
return $"{argName}!=null";
}
public override void GenerateSerializer(StreamWriter writer, string callName)

2
Assets/UniGLTF/package.json
View File

@@ -11,6 +11,6 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.63.1"
"com.vrmc.vrmshaders": "0.63.2"
}
}

2
Assets/VRM/Editor/VRMSerializerGenerator.cs
View File

@@ -16,7 +16,7 @@ namespace VRM
get
{
return Path.Combine(UnityEngine.Application.dataPath,
"VRM/UniVRM/Scripts/Format/VRMSerializer.g.cs");
"VRM/Runtime/Format/VRMSerializer.g.cs");
}
}

10
Assets/VRM/Runtime/Format/VRMSerializer.g.cs
View File

@@ -935,27 +935,27 @@ public static void Serialize_vrm_materialProperties_ITEM(JsonFormatter f, glTF_V
f.Value(value.renderQueue);
}
if(value.floatProperties!=null&&value.floatProperties.Count>0){
if(value.floatProperties!=null){
f.Key("floatProperties");
Serialize_vrm_materialProperties__floatProperties(f, value.floatProperties);
}
if(value.vectorProperties!=null&&value.vectorProperties.Count>0){
if(value.vectorProperties!=null){
f.Key("vectorProperties");
Serialize_vrm_materialProperties__vectorProperties(f, value.vectorProperties);
}
if(value.textureProperties!=null&&value.textureProperties.Count>0){
if(value.textureProperties!=null){
f.Key("textureProperties");
Serialize_vrm_materialProperties__textureProperties(f, value.textureProperties);
}
if(value.keywordMap!=null&&value.keywordMap.Count>0){
if(value.keywordMap!=null){
f.Key("keywordMap");
Serialize_vrm_materialProperties__keywordMap(f, value.keywordMap);
}
if(value.tagMap!=null&&value.tagMap.Count>0){
if(value.tagMap!=null){
f.Key("tagMap");
Serialize_vrm_materialProperties__tagMap(f, value.tagMap);
}

4
Assets/VRM/Runtime/Format/VRMVersion.cs
View File

@@ -5,7 +5,7 @@ namespace VRM
{
public const int MAJOR = 0;
public const int MINOR = 63;
public const int PATCH = 1;
public const string VERSION = "0.63.1";
public const int PATCH = 2;
public const string VERSION = "0.63.2";
}
}

4
Assets/VRM/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "com.vrmc.univrm",
"version": "0.63.0",
"version": "0.63.2",
"displayName": "VRM",
"description": "VRM importer",
"unity": "2018.4",
@@ -14,7 +14,7 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.63.0",
"com.vrmc.vrmshaders": "0.63.2",
"com.vrmc.unigltf": "2.0.0"
}
}

2
Assets/VRMShaders/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "com.vrmc.vrmshaders",
"version": "0.63.1",
"version": "0.63.2",
"displayName": "VRM Shaders",
"description": "VRM Shaders",
"unity": "2018.4",