chizui/YarikStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17 from undefined9071/dev

Browse Source 
fix blendshape export issue
This commit is contained in:
Razmoth
2023-09-17 15:02:01 +04:00
committed by GitHub
parent 96079d4906 886dfa9084
commit d790c9695b
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
AssetStudio/IImported.cs
View File

@@ -231,9 +231,16 @@ namespace AssetStudio
public float SampleRate { get; set; } public float SampleRate { get; set; }
public List<ImportedAnimationKeyframedTrack> TrackList { get; set; } public List<ImportedAnimationKeyframedTrack> TrackList { get; set; }
public ImportedAnimationKeyframedTrack FindTrack(string path) public ImportedAnimationKeyframedTrack FindTrack(string path, string attribute = null)
{ {
var track = TrackList.Find(x => x.Path == path); var track = TrackList.Find(t => {
if (attribute == null)
{
return t.Path == path;
} else {
return t.Path == path && t.BlendShape?.ChannelName == attribute;
}
});
if (track == null) if (track == null)
{ {
track = new ImportedAnimationKeyframedTrack { Path = path }; track = new ImportedAnimationKeyframedTrack { Path = path };

32
AssetStudioUtility/ModelConverter.cs
View File

@@ -519,6 +519,8 @@ namespace AssetStudio
crc.Update(bytes, 0, (uint)bytes.Length); crc.Update(bytes, 0, (uint)bytes.Length);
morphChannelNames[crc.GetDigest()] = blendShapeName; morphChannelNames[crc.GetDigest()] = blendShapeName;
morphChannelNames[shapeChannel.nameHash] = shapeChannel.name;
channel.Name = shapeChannel.name.Split('.').Last(); channel.Name = shapeChannel.name.Split('.').Last();
channel.KeyframeList = new List<ImportedMorphKeyframe>(shapeChannel.frameCount); channel.KeyframeList = new List<ImportedMorphKeyframe>(shapeChannel.frameCount);
var frameEnd = shapeChannel.frameIndex + shapeChannel.frameCount; var frameEnd = shapeChannel.frameIndex + shapeChannel.frameCount;
@@ -870,14 +872,17 @@ namespace AssetStudio
channelName = channelName.Substring(dotPos + 1); channelName = channelName.Substring(dotPos + 1);
} }
var path = FixBonePath(animationClip, m_FloatCurve.path); var path = GetPathByChannelName(channelName);
if (string.IsNullOrEmpty(path)) if (string.IsNullOrEmpty(path))
{ {
path = GetPathByChannelName(channelName); path = FixBonePath(animationClip, m_FloatCurve.path);
}
var track = iAnim.FindTrack(path, channelName);
if (track.BlendShape == null)
{
track.BlendShape = new ImportedBlendShape();
track.BlendShape.ChannelName = channelName;
} }
var track = iAnim.FindTrack(path);
track.BlendShape = new ImportedBlendShape();
track.BlendShape.ChannelName = channelName;
foreach (var m_Curve in m_FloatCurve.curve.m_Curve) foreach (var m_Curve in m_FloatCurve.curve.m_Curve)
{ {
track.BlendShape.Keyframes.Add(new ImportedKeyframe<float>(m_Curve.time, m_Curve.value)); track.BlendShape.Keyframes.Add(new ImportedKeyframe<float>(m_Curve.time, m_Curve.value));
@@ -984,15 +989,18 @@ namespace AssetStudio
channelName = channelName.Substring(dotPos + 1); channelName = channelName.Substring(dotPos + 1);
} }
var bPath = FixBonePath(GetPathFromHash(binding.path)); var path = GetPathByChannelName(channelName);
if (string.IsNullOrEmpty(bPath)) if (string.IsNullOrEmpty(path))
{ {
bPath = GetPathByChannelName(channelName); path = FixBonePath(GetPathFromHash(binding.path));
} }
var bTrack = iAnim.FindTrack(bPath); var track = iAnim.FindTrack(path, channelName);
bTrack.BlendShape = new ImportedBlendShape(); if (track.BlendShape == null)
bTrack.BlendShape.ChannelName = channelName; {
bTrack.BlendShape.Keyframes.Add(new ImportedKeyframe<float>(time, data[curveIndex++ + offset])); track.BlendShape = new ImportedBlendShape();
track.BlendShape.ChannelName = channelName;
}
track.BlendShape.Keyframes.Add(new ImportedKeyframe<float>(time, data[curveIndex++ + offset]));
} }
else if (binding.typeID == ClassIDType.Transform) else if (binding.typeID == ClassIDType.Transform)
{ {