File tree Expand file tree Collapse file tree 1 file changed +40
-69
lines changed Expand file tree Collapse file tree 1 file changed +40
-69
lines changed Original file line number Diff line number Diff line change @@ -489,98 +489,69 @@ private void HandleAnimateOnGaze(bool hit, ref bool changed)
489
489
{
490
490
if ( AnimateOnGaze == AnimationType . Alpha || AnimateOnGaze == AnimationType . AlphaAndScale )
491
491
{
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 )
503
493
{
494
+ _alpha += AlphaSpeed ;
495
+ changed = true ;
504
496
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 ;
511
504
}
512
505
}
513
506
if ( AnimateOnGaze == AnimationType . Scale || AnimateOnGaze == AnimationType . AlphaAndScale )
514
507
{
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 )
526
509
{
510
+ _scale += ScaleSpeed ;
511
+ changed = true ;
527
512
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 ;
534
520
}
535
521
}
536
522
}
537
523
else
538
524
{
539
525
if ( AnimateOnGaze == AnimationType . Alpha || AnimateOnGaze == AnimationType . AlphaAndScale )
540
526
{
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 )
552
528
{
529
+ _alpha -= AlphaSpeed ;
530
+ changed = true ;
553
531
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 ;
560
539
}
561
540
}
562
-
563
541
if ( AnimateOnGaze == AnimationType . Scale || AnimateOnGaze == AnimationType . AlphaAndScale )
564
542
{
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 )
576
544
{
545
+ _scale -= ScaleSpeed ;
546
+ changed = true ;
577
547
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 ;
584
555
}
585
556
}
586
557
}
You can’t perform that action at this time.
0 commit comments