Skip to content

Commit a398a3b

Browse files
committed
Fix animations
Not sure what I was thinking here, but I've simplified the logic and it works better now.
1 parent a57a0d7 commit a398a3b

File tree

1 file changed

+40
-69
lines changed

1 file changed

+40
-69
lines changed

Assets/HOTK/HOTK_Overlay.cs

Lines changed: 40 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -489,98 +489,69 @@ private void HandleAnimateOnGaze(bool hit, ref bool changed)
489489
{
490490
if (AnimateOnGaze == AnimationType.Alpha || AnimateOnGaze == AnimationType.AlphaAndScale)
491491
{
492-
if (Alpha <= Alpha2)
493-
{
494-
if (_alpha < Alpha2)
495-
{
496-
_alpha += AlphaSpeed;
497-
changed = true;
498-
if (_alpha > Alpha2)
499-
_alpha = Alpha2;
500-
}
501-
}
502-
else // Not sure why you'd want it to fade out on gaze, but just in case
492+
if (_alpha < Alpha2)
503493
{
494+
_alpha += AlphaSpeed;
495+
changed = true;
504496
if (_alpha > Alpha2)
505-
{
506-
_alpha -= AlphaSpeed;
507-
changed = true;
508-
if (_alpha < Alpha2)
509-
_alpha = Alpha2;
510-
}
497+
_alpha = Alpha2;
498+
}else if (_alpha > Alpha2)
499+
{
500+
_alpha -= AlphaSpeed;
501+
changed = true;
502+
if (_alpha < Alpha2)
503+
_alpha = Alpha2;
511504
}
512505
}
513506
if (AnimateOnGaze == AnimationType.Scale || AnimateOnGaze == AnimationType.AlphaAndScale)
514507
{
515-
if (Scale <= Scale2)
516-
{
517-
if (_scale < Scale2)
518-
{
519-
_scale += ScaleSpeed;
520-
changed = true;
521-
if (_scale > Scale2)
522-
_scale = Scale2;
523-
}
524-
}
525-
else // Not sure why you'd want it to scale down on gaze, but just in case
508+
if (_scale < Scale2)
526509
{
510+
_scale += ScaleSpeed;
511+
changed = true;
527512
if (_scale > Scale2)
528-
{
529-
_scale -= ScaleSpeed;
530-
changed = true;
531-
if (_scale < Scale2)
532-
_scale = Scale2;
533-
}
513+
_scale = Scale2;
514+
}else if (_scale > Scale2)
515+
{
516+
_scale -= ScaleSpeed;
517+
changed = true;
518+
if (_scale < Scale2)
519+
_scale = Scale2;
534520
}
535521
}
536522
}
537523
else
538524
{
539525
if (AnimateOnGaze == AnimationType.Alpha || AnimateOnGaze == AnimationType.AlphaAndScale)
540526
{
541-
if (Alpha < Alpha2)
542-
{
543-
if (_alpha > Alpha)
544-
{
545-
_alpha -= AlphaSpeed;
546-
changed = true;
547-
if (_alpha < Alpha)
548-
_alpha = Alpha;
549-
}
550-
}
551-
else // Not sure why you'd want it to fade in when you look away from it, but just in case
527+
if (_alpha > Alpha)
552528
{
529+
_alpha -= AlphaSpeed;
530+
changed = true;
553531
if (_alpha < Alpha)
554-
{
555-
_alpha += AlphaSpeed;
556-
changed = true;
557-
if (_alpha > Alpha)
558-
_alpha = Alpha;
559-
}
532+
_alpha = Alpha;
533+
}else if (_alpha < Alpha)
534+
{
535+
_alpha += AlphaSpeed;
536+
changed = true;
537+
if (_alpha > Alpha)
538+
_alpha = Alpha;
560539
}
561540
}
562-
563541
if (AnimateOnGaze == AnimationType.Scale || AnimateOnGaze == AnimationType.AlphaAndScale)
564542
{
565-
if (Scale < Scale2)
566-
{
567-
if (_scale > Scale)
568-
{
569-
_scale -= ScaleSpeed;
570-
changed = true;
571-
if (_scale < Scale)
572-
_scale = Scale;
573-
}
574-
}
575-
else // Not sure why you'd want it to scale up when you look away from it, but just in case
543+
if (_scale > Scale)
576544
{
545+
_scale -= ScaleSpeed;
546+
changed = true;
577547
if (_scale < Scale)
578-
{
579-
_scale += ScaleSpeed;
580-
changed = true;
581-
if (_scale > Scale)
582-
_scale = Scale;
583-
}
548+
_scale = Scale;
549+
}else if (_scale < Scale)
550+
{
551+
_scale += ScaleSpeed;
552+
changed = true;
553+
if (_scale > Scale)
554+
_scale = Scale;
584555
}
585556
}
586557
}

0 commit comments

Comments
 (0)