From 37ecb3a30b0a923865354491590ee87b0d907eec Mon Sep 17 00:00:00 2001
From: Josh Holtrop <josh.holtrop@gentex.com>
Date: Sun, 15 Dec 2013 18:35:34 -0500
Subject: [PATCH] store each logo scale with 1.0 as max

---
 src/modes/fading_logos.d | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/modes/fading_logos.d b/src/modes/fading_logos.d
index d6472b7..6cb5c43 100644
--- a/src/modes/fading_logos.d
+++ b/src/modes/fading_logos.d
@@ -49,7 +49,7 @@ class FadingLogos : Mode
         mat4 view_matrix;
         view_matrix.make_identity();
         view_matrix.scale(ss.get_height() / cast(float)ss.get_width(), 1.0, 1.0);
-        double scale = 0.35 * ss.get_width() * 1080.0 / (ss.get_height() * 1920.0);
+        const double scale = 0.35 * ss.get_aspect() * (1080.0 / 1920.0);
         view_matrix.scale(scale, scale, scale);
 
         glUniformMatrix4fv(m_shader.view_idx, 1, GL_TRUE, view_matrix.value_ptr);
@@ -81,7 +81,6 @@ class FadingLogos : Mode
 
     protected void update_logos(ScreenSaver ss, uint ms)
     {
-        const double max_scale = 0.35 * ss.get_aspect() * (1080.0 / 1920.0);
         if (m_last_create_time == 0 || (ms - m_last_create_time) >= CREATE_DELAY)
         {
             /* time to create a new logo */
@@ -90,7 +89,7 @@ class FadingLogos : Mode
             lp.c_x = uniform(-0.8 * ss.get_aspect(), 0.8 * ss.get_aspect());
             lp.c_y = uniform(-0.8, 0.8);
             lp.rotation = uniform(0.0, math.PI * 2.0);
-            lp.scale = uniform(0.2 * max_scale, max_scale);
+            lp.scale = uniform(0.2, 1.0);
             m_logos ~= lp;
         }