Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-04-25 07:28:51 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove Obsolete method

Browse Source
This commit is contained in:
Masataka SUMI 2022-11-03 17:33:16 +09:00
parent efe2503cdb
commit 7a0745b5cd
6 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/UniGLTF/Runtime/Utils/CachedEnum/CachedEnum.cs
View File

@ -33,16 +33,6 @@ namespace UniGLTF.Utils
}
}
/// <summary>
/// bool を返して out 変数に結果を返すのが TryXXX なので、Try ではない。
/// </summary>
[Obsolete("use ParseOrDefault")]
public static T TryParseOrDefault<T>(string name, bool ignoreCase = false, T defaultValue = default)
where T : struct, Enum
{
return ParseOrDefault<T>(name, ignoreCase: ignoreCase);
}
public static T[] GetValues<T>() where T : struct, Enum
{
return CachedEnumType<T>.Values;

4
Assets/UniGLTF/Tests/UniGLTF/CacheEnumTest.cs
View File

@ -11,8 +11,8 @@ namespace UniGLTF
[Test]
public void CacheEnumTestSimplePasses()
{
Assert.AreEqual(default(HumanBodyBones), CachedEnum.TryParseOrDefault<HumanBodyBones>("xxx"));
Assert.AreEqual(HumanBodyBones.UpperChest, CachedEnum.TryParseOrDefault<HumanBodyBones>("upperchest", true));
Assert.AreEqual(default(HumanBodyBones), CachedEnum.ParseOrDefault<HumanBodyBones>("xxx"));
Assert.AreEqual(HumanBodyBones.UpperChest, CachedEnum.ParseOrDefault<HumanBodyBones>("upperchest", true));
Assert.AreEqual(CachedEnum.GetValues<HumanBodyBones>().First(x => x == HumanBodyBones.Hips), HumanBodyBones.Hips);
}
}

2
Assets/VRM/Runtime/FirstPerson/VRMFirstPerson.cs
View File

@ -127,7 +127,7 @@ namespace VRM
{
if (x.mesh == index)
{
return CachedEnum.TryParseOrDefault<FirstPersonFlag>(x.firstPersonFlag, true);
return CachedEnum.ParseOrDefault<FirstPersonFlag>(x.firstPersonFlag, true);
}
}

2
Assets/VRM/Runtime/Format/glTF_VRM_FirstPerson.cs
View File

@ -72,7 +72,7 @@ namespace VRM
{
get
{
return CachedEnum.TryParseOrDefault<LookAtType>(lookAtTypeName, true);
return CachedEnum.ParseOrDefault<LookAtType>(lookAtTypeName, true);
}
set { lookAtTypeName = value.ToString(); }
}

6
Assets/VRM/Runtime/Format/glTF_VRM_Meta.cs
View File

@ -36,7 +36,7 @@ namespace VRM
{
static UssageLicense FromString(string src)
{
return CachedEnum.TryParseOrDefault<UssageLicense>(src, true);
return CachedEnum.ParseOrDefault<UssageLicense>(src, true);
}
[JsonSchema(Description = "Title of VRM model")]
@ -69,7 +69,7 @@ namespace VRM
{
get
{
return CachedEnum.TryParseOrDefault<AllowedUser>(allowedUserName, true);
return CachedEnum.ParseOrDefault<AllowedUser>(allowedUserName, true);
}
set
{
@ -135,7 +135,7 @@ namespace VRM
{
get
{
return CachedEnum.TryParseOrDefault<LicenseType>(licenseName, true);
return CachedEnum.ParseOrDefault<LicenseType>(licenseName, true);
}
set
{

4
Assets/VRM/Runtime/IO/VRMImporterContext.cs
View File

@ -153,12 +153,12 @@ namespace VRM
if (group != null)
{
asset.BlendShapeName = groupName;
asset.Preset = CachedEnum.TryParseOrDefault<BlendShapePreset>(group.presetName, true);
asset.Preset = CachedEnum.ParseOrDefault<BlendShapePreset>(group.presetName, true);
asset.IsBinary = group.isBinary;
if (asset.Preset == BlendShapePreset.Unknown)
{
// fallback
asset.Preset = CachedEnum.TryParseOrDefault<BlendShapePreset>(group.name, true);
asset.Preset = CachedEnum.ParseOrDefault<BlendShapePreset>(group.name, true);
}
asset.Values = group.binds.Select(x =>
{