mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-05-25 05:40:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix calculations in Live2D motions

Browse Source 
- Fixed calculation of totalPointCount and totalSegmentCount in Live2D motions.
https://github.com/Live2D/CubismNativeFramework/pull/57
This commit is contained in:
VaDiM 2024-10-30 01:26:37 +03:00
parent 8ccdd0fd4e
commit f253c868d4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
AssetStudioUtility/CubismLive2DExtractor/CubismMotion3Json.cs
View File

@ -122,8 +122,8 @@ namespace CubismLive2DExtractor
// Motion curves. // Motion curves.
Curves = new SerializableCurve[Meta.CurveCount]; Curves = new SerializableCurve[Meta.CurveCount];
var totalSegmentCount = 1; var totalSegmentCount = 0;
var totalPointCount = 1; var totalPointCount = 0;
var actualCurveCount = 0; var actualCurveCount = 0;
for (var i = 0; i < fadeMotion.ParameterCurves.Length; i++) for (var i = 0; i < fadeMotion.ParameterCurves.Length; i++)
{ {
@ -182,6 +182,7 @@ namespace CubismLive2DExtractor
AddSegments(curve, preCurve, nextCurve, Curves[actualCurveCount], forceBezier, ref totalPointCount, ref totalSegmentCount, ref j); AddSegments(curve, preCurve, nextCurve, Curves[actualCurveCount], forceBezier, ref totalPointCount, ref totalSegmentCount, ref j);
} }
actualCurveCount++; actualCurveCount++;
totalPointCount++;
} }
// The total number of segments (from all curves). // The total number of segments (from all curves).
@ -210,8 +211,8 @@ namespace CubismLive2DExtractor
}; };
Curves = new SerializableCurve[Meta.CurveCount]; Curves = new SerializableCurve[Meta.CurveCount];
var totalSegmentCount = 1; var totalSegmentCount = 0;
var totalPointCount = 1; var totalPointCount = 0;
for (var i = 0; i < Meta.CurveCount; i++) for (var i = 0; i < Meta.CurveCount; i++)
{ {
var track = animation.TrackList[i]; var track = animation.TrackList[i];
@ -235,6 +236,7 @@ namespace CubismLive2DExtractor
var nextCurve = next != null ? new CubismKeyframeData(next) : new CubismKeyframeData(); var nextCurve = next != null ? new CubismKeyframeData(next) : new CubismKeyframeData();
AddSegments(curve, preCurve, nextCurve, Curves[i], forceBezier, ref totalPointCount, ref totalSegmentCount, ref j); AddSegments(curve, preCurve, nextCurve, Curves[i], forceBezier, ref totalPointCount, ref totalSegmentCount, ref j);
} }
totalPointCount++;
} }
Meta.TotalSegmentCount = totalSegmentCount; Meta.TotalSegmentCount = totalSegmentCount;
Meta.TotalPointCount = totalPointCount; Meta.TotalPointCount = totalPointCount;