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

Removed obsolete code

Browse Source
This commit is contained in:
ousttrue 2018-08-09 14:33:09 +09:00
parent d75ae1f872
commit cb8bd45cd8
1 changed files with 1 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
Scripts/Format/VRMImporter.cs
View File

@ -56,15 +56,7 @@ namespace VRM
using (context.MeasureTime("VRM LoadHumanoid"))
{
try
{
LoadHumanoidObsolete(context);
Debug.LogWarning("LoadHumanoidObsolete");
}
catch (Exception)
{
LoadHumanoid(context);
}
LoadHumanoid(context);
}
using (context.MeasureTime("VRM LoadBlendShapeMaster"))
@ -228,56 +220,6 @@ namespace VRM
return sb;
}
[Obsolete]
private static void LoadHumanoidObsolete(VRMImporterContext context)
{
var parsed = UniJSON.JsonParser.Parse(context.Json)["extensions"]["VRM"];
var skeleton = context.Root.transform.Traverse().Select(x => ToSkeletonBone(x)).ToArray();
var description = new HumanDescription
{
human = parsed[HUMANOID_KEY]["bones"]
.ObjectItems
.Select(x => new { x.Key, Index = x.Value.Value.GetInt32() })
.Where(x => x.Index != -1)
.Select(x =>
{
var humanBone = EnumUtil.TryParseOrDefault<HumanBodyBones>(x.Key);
var hb = new HumanBone
{
boneName = context.Nodes[x.Index].name,
humanName = ToHumanBoneName(humanBone)
};
hb.limit.useDefaultValues = true;
return hb;
}).ToArray(),
skeleton = skeleton,
lowerArmTwist = 0.5f,
upperArmTwist = 0.5f,
upperLegTwist = 0.5f,
lowerLegTwist = 0.5f,
armStretch = 0.05f,
legStretch = 0.05f,
feetSpacing = 0.0f,
};
context.HumanoidAvatar = AvatarBuilder.BuildHumanAvatar(context.Root, description);
context.HumanoidAvatar.name = "VrmAvatar";
context.AvatarDescription = UniHumanoid.AvatarDescription.CreateFrom(description);
context.AvatarDescription.name = "AvatarDescription";
var humanoid = context.Root.AddComponent<VRMHumanoidDescription>();
humanoid.Avatar = context.HumanoidAvatar;
humanoid.Description = context.AvatarDescription;
var animator = context.Root.GetComponent<Animator>();
if (animator == null)
{
animator = context.Root.AddComponent<Animator>();
}
animator.avatar = context.HumanoidAvatar;
}
private static void LoadHumanoid(VRMImporterContext context)
{
context.AvatarDescription = context.GLTF.extensions.VRM.humanoid.ToDescription(context.Nodes);