From c56df48d7526972b1b25f76bdbc2aae180006f6f Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Tue, 28 Apr 2020 21:49:15 -0700
Subject: [PATCH] Interpolate text box alpha

This makes text boxes fade in and out pretty smoothly.

This requires that the textboxclass::setcol() be in Graphics::drawgui(),
so now it's moved there.

Text box fading is only really noticeable if you're playing in slowmode.
---
 desktop_version/src/Graphics.cpp | 4 ++++
 desktop_version/src/Textbox.cpp  | 4 ++--
 desktop_version/src/Textbox.h    | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp
index 32f3d7de..e56a1329 100644
--- a/desktop_version/src/Graphics.cpp
+++ b/desktop_version/src/Graphics.cpp
@@ -609,6 +609,10 @@ void Graphics::drawgui()
     //Draw all the textboxes to the screen
     for (size_t i = 0; i<textbox.size(); i++)
     {
+        //This routine also updates textbox colors
+        float tl_lerp = lerp(textbox[i].prev_tl, textbox[i].tl);
+        textbox[i].setcol(textbox[i].tr * tl_lerp, textbox[i].tg * tl_lerp, textbox[i].tb * tl_lerp);
+
         if (textbox[i].r == 0 && textbox[i].g == 0 && textbox[i].b == 0)
         {
             if(flipmode)
diff --git a/desktop_version/src/Textbox.cpp b/desktop_version/src/Textbox.cpp
index 90a8eb55..692185c3 100644
--- a/desktop_version/src/Textbox.cpp
+++ b/desktop_version/src/Textbox.cpp
@@ -9,6 +9,7 @@ textboxclass::textboxclass()
     h = 0;
     lw = 0;
     tl = 0;
+    prev_tl = 0;
     tm = 0;
     timer = 0;
 }
@@ -56,6 +57,7 @@ void textboxclass::setcol(int rr, int gg, int bb)
 
 void textboxclass::update()
 {
+    prev_tl = tl;
     if (tm == 0)
     {
         tl += .1f;
@@ -64,7 +66,6 @@ void textboxclass::update()
             tl = 1;
             tm = 1;
         }
-        setcol(int(tr * tl), int(tg * tl), int(tb * tl));
     }
     else if (tm == 2)
     {
@@ -74,7 +75,6 @@ void textboxclass::update()
             tl = 0.5;
             //this textbox will be removed by updatetextboxes() later
         }
-        setcol(int(tr * tl), int(tg * tl), int(tb * tl));
     }
     if (timer > 0)
     {
diff --git a/desktop_version/src/Textbox.h b/desktop_version/src/Textbox.h
index d30cdd5e..4b084c73 100644
--- a/desktop_version/src/Textbox.h
+++ b/desktop_version/src/Textbox.h
@@ -40,6 +40,7 @@ public:
     int timer;
 
     float tl;
+    float prev_tl;
     int tm;
 
     int max;