Skip to content

Commit c22ef8c

Browse files
committed
BugFix(NoiseAlpha Lerp)
1 parent 408a448 commit c22ef8c

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Scripts/Runtime/TextMeshProGeometryAnimator.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -433,14 +433,6 @@ private void UpdateAnimation()
433433
color1 = color2 = color3 = color0;
434434
}
435435

436-
if (animationData.alpha.use)
437-
{
438-
float ratio = animationData.alpha.curve.Evaluate(CalcAnimationTime(time, i, animationData.alpha));
439-
float alpha = Mathf.Lerp(animationData.alpha.from, animationData.alpha.to, ratio);
440-
color0.a = (byte)(color0.a * Mathf.Clamp01(alpha));
441-
color1 = color2 = color3 = color0;
442-
}
443-
444436
if (animationData.colorNoise.use)
445437
{
446438
var tex = animationData.colorNoise.noiseTexture;
@@ -453,6 +445,14 @@ private void UpdateAnimation()
453445
color1 = color2 = color3 = color0;
454446
}
455447

448+
if (animationData.alpha.use)
449+
{
450+
float ratio = animationData.alpha.curve.Evaluate(CalcAnimationTime(time, i, animationData.alpha));
451+
float alpha = Mathf.Lerp(animationData.alpha.from, animationData.alpha.to, ratio);
452+
color0.a = (byte)(color0.a * Mathf.Clamp01(alpha));
453+
color1.a = color2.a = color3.a = color0.a;
454+
}
455+
456456
if (animationData.alphaNoise.use)
457457
{
458458
var tex = animationData.alphaNoise.noiseTexture;
@@ -461,8 +461,8 @@ private void UpdateAnimation()
461461
var noise = tex.GetPixel(Mathf.FloorToInt(uv.x % 1.0f * tex.width), Mathf.FloorToInt(uv.y % 1.0f * tex.height));
462462

463463
float ratio = animationData.alphaNoise.curve.Evaluate(CalcAnimationTime(time, i, animationData.alphaNoise));
464-
color0.a = (byte)(color0.a + (color0.a * noise.r * ratio));
465-
color1 = color2 = color3 = color0;
464+
color0.a = (byte)(color0.a - byte.MaxValue * noise.r * ratio);
465+
color1.a = color2.a = color3.a = color0.a;
466466
}
467467

468468
Color32[] animatedColors = this.animatedColors[materialIndex];

0 commit comments

Comments
 (0)