Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-30 06:43:21 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ジェネレーターの名前競合の回避

Browse Source
This commit is contained in:
ousttrue
2021-04-30 13:02:20 +09:00
parent d85cc70a64
commit 502628b768
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/UniGLTF/Editor/JsonSchema/Schemas/ObjectJsonSchema.cs
View File

@@ -71,6 +71,8 @@ public static $0 $2(JsonNode parsed)
.Replace("$2", callName) .Replace("$2", callName)
); );
var prefix = string.IsNullOrEmpty(ClassName) ? "Deserialize_" : $"{ClassName}_Deserialize_";
foreach (var kv in Properties) foreach (var kv in Properties)
{ {
writer.Write(@" writer.Write(@"
@@ -80,7 +82,7 @@ public static $0 $2(JsonNode parsed)
} }
" "
.Replace("$0", kv.Key) .Replace("$0", kv.Key)
.Replace("$1", kv.Value.GenerateDeserializerCall($"Deserialize_{kv.Key.ToUpperCamel()}", "kv.Value")) .Replace("$1", kv.Value.GenerateDeserializerCall($"{prefix}{kv.Key.ToUpperCamel()}", "kv.Value"))
.Replace("$2", kv.Key.ToUpperCamel()) .Replace("$2", kv.Key.ToUpperCamel())
); );
} }
@@ -95,7 +97,7 @@ public static $0 $2(JsonNode parsed)
{ {
if (!kv.Value.IsInline) if (!kv.Value.IsInline)
{ {
kv.Value.GenerateDeserializer(writer, $"Deserialize_{kv.Key.ToUpperCamel()}"); kv.Value.GenerateDeserializer(writer, $"{prefix}{kv.Key.ToUpperCamel()}");
} }
} }
} }
@@ -131,6 +133,9 @@ public static void {callName}(JsonFormatter f, {ValueType} value)
" "
); );
var prefix = string.IsNullOrEmpty(ClassName) ? "Serialize_" : $"{ClassName}_Serialize_";
foreach (var kv in Properties) foreach (var kv in Properties)
{ {
var valueName = $"value.{kv.Key.ToUpperCamel()}"; var valueName = $"value.{kv.Key.ToUpperCamel()}";
@@ -138,7 +143,7 @@ public static void {callName}(JsonFormatter f, {ValueType} value)
writer.Write($@" writer.Write($@"
if({kv.Value.CreateSerializationCondition(valueName)}{condition}){{ if({kv.Value.CreateSerializationCondition(valueName)}{condition}){{
f.Key(""{kv.Key}""); f.Key(""{kv.Key}"");
{kv.Value.GenerateSerializerCall($"Serialize_{kv.Key.ToUpperCamel()}", valueName)}; {kv.Value.GenerateSerializerCall($"{prefix}{kv.Key.ToUpperCamel()}", valueName)};
}} }}
"); ");
} }
@@ -152,7 +157,7 @@ public static void {callName}(JsonFormatter f, {ValueType} value)
{ {
if (!kv.Value.IsInline) if (!kv.Value.IsInline)
{ {
kv.Value.GenerateSerializer(writer, $"Serialize_{kv.Key.ToUpperCamel()}"); kv.Value.GenerateSerializer(writer, $"{prefix}{kv.Key.ToUpperCamel()}");
} }
} }
} }