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

- [Core] Added new entry

Browse Source
This commit is contained in:
Razmoth
2023-11-11 19:21:46 +04:00
parent e863310354
commit 740b8725b2
12 changed files with 524 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
AssetStudio.Utility/YAML/AnimationClipConverter.cs
View File

@@ -57,7 +57,7 @@ namespace AssetStudio
var lastSampleFrame = streamedFrames.Count > 1 ? streamedFrames[streamedFrames.Count - 2].time : 0.0f;
var lastFrame = Math.Max(lastDenseFrame, lastSampleFrame);
if (!m_Clip.m_ACLClip.m_ClipData.IsNullOrEmpty() && !game.Type.IsSRGroup())
if (m_Clip.m_ACLClip.IsSet && !game.Type.IsSRGroup())
{
var lastACLFrame = ProcessACLClip(m_Clip, bindings, tos);
lastFrame = Math.Max(lastFrame, lastACLFrame);
@@ -65,7 +65,7 @@ namespace AssetStudio
}
ProcessStreams(streamedFrames, bindings, tos, m_Clip.m_DenseClip.m_SampleRate);
ProcessDenses(m_Clip, bindings, tos);
if (!m_Clip.m_ACLClip.m_ClipData.IsNullOrEmpty() && game.Type.IsSRGroup())
if (m_Clip.m_ACLClip.IsSet && game.Type.IsSRGroup())
{
var lastACLFrame = ProcessACLClip(m_Clip, bindings, tos);
lastFrame = Math.Max(lastFrame, lastACLFrame);
@@ -112,7 +112,7 @@ namespace AssetStudio
var curve = frame.keyList[curveIndex];
var index = curve.index;
if (!game.Type.IsSRGroup())
index += (int)animationClip.m_MuscleClip.m_Clip.m_ACLClip.m_CurveCount;
index += (int)animationClip.m_MuscleClip.m_Clip.m_ACLClip.CurveCount;
var binding = bindings.FindBinding(index);
var path = GetCurvePath(tos, binding.path);
@@ -161,7 +161,7 @@ namespace AssetStudio
{
var index = (int)streamCount + curveIndex;
if (!game.Type.IsSRGroup())
index += (int)clip.m_ACLClip.m_CurveCount;
index += (int)clip.m_ACLClip.CurveCount;
var binding = bindings.FindBinding(index);
var path = GetCurvePath(tos, binding.path);
var framePosition = frameOffset + curveIndex;
@@ -193,8 +193,8 @@ namespace AssetStudio
for (int frameIndex = 0; frameIndex < frameCount; frameIndex++)
{
float time = times[frameIndex];
int frameOffset = frameIndex * (int)acl.m_CurveCount;
for (int curveIndex = 0; curveIndex < acl.m_CurveCount;)
int frameOffset = frameIndex * (int)acl.CurveCount;
for (int curveIndex = 0; curveIndex < acl.CurveCount;)
{
var index = curveIndex;
if (game.Type.IsSRGroup())
@@ -236,8 +236,8 @@ namespace AssetStudio
for (var curveIndex = 0; curveIndex < constant.data.Length;)
{
var index = (int)(streamCount + denseCount + curveIndex);
if (!clip.m_ACLClip.m_ClipData.IsNullOrEmpty())
index += (int)clip.m_ACLClip.m_CurveCount;
if (clip.m_ACLClip.IsSet)
index += (int)clip.m_ACLClip.CurveCount;
GenericBinding binding = bindings.FindBinding(index);
string path = GetCurvePath(tos, binding.path);
if (binding.typeID == ClassIDType.Transform)

20
AssetStudio.Utility/YAML/CustomCurveResolver.cs
View File

@@ -634,36 +634,36 @@ namespace AssetStudio
public static string FindPropertyNameByCRC28(this Material material, uint crc)
{
foreach (var property in material.m_SavedProperties.m_TexEnvs.Keys)
foreach (var property in material.m_SavedProperties.m_TexEnvs)
{
string hdrName = $"{property}_HDR";
string hdrName = $"{property.Key}_HDR";
if (CRC.Verify28DigestUTF8(hdrName, crc))
{
return hdrName;
}
string stName = $"{property}_ST";
string stName = $"{property.Key}_ST";
if (CRC.Verify28DigestUTF8(stName, crc))
{
return stName;
}
string texelName = $"{property}_TexelSize";
string texelName = $"{property.Key}_TexelSize";
if (CRC.Verify28DigestUTF8(texelName, crc))
{
return texelName;
}
}
foreach (var property in material.m_SavedProperties.m_Floats.Keys)
foreach (var property in material.m_SavedProperties.m_Floats)
{
if (CRC.Verify28DigestUTF8(property, crc))
if (CRC.Verify28DigestUTF8(property.Key, crc))
{
return property;
return property.Key;
}
}
foreach (var property in material.m_SavedProperties.m_Colors.Keys)
foreach (var property in material.m_SavedProperties.m_Colors)
{
if (CRC.Verify28DigestUTF8(property, crc))
if (CRC.Verify28DigestUTF8(property.Key, crc))
{
return property;
return property.Key;
}
}
return null;