From 1d7f83bcf66060adb17a5edc4c906f5a488a205c Mon Sep 17 00:00:00 2001
From: Josh Holtrop <josh.holtrop@gentex.com>
Date: Sat, 7 Dec 2013 23:16:13 -0500
Subject: [PATCH] move N_GENTEX and N_CORPORATION constants to logo module

---
 src/fading_logos_mode.d | 4 ++--
 src/logo.d              | 3 +++
 src/screensaver.d       | 3 ---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/fading_logos_mode.d b/src/fading_logos_mode.d
index 1b04373..b0bcc2c 100644
--- a/src/fading_logos_mode.d
+++ b/src/fading_logos_mode.d
@@ -30,12 +30,12 @@ class FadingLogosMode : Mode
 
         glUniformMatrix4fv(m_shader.view_idx, 1, GL_TRUE, view_matrix.value_ptr);
 
-        for (int i = 0; i < N_GENTEX; i++)
+        for (int i = 0; i < logo.N_GENTEX; i++)
         {
             draw_letter(logo.GENTEX, i);
         }
 
-        for (int i = 0; i < N_CORPORATION; i++)
+        for (int i = 0; i < logo.N_CORPORATION; i++)
         {
             draw_letter(logo.CORPORATION, i);
         }
diff --git a/src/logo.d b/src/logo.d
index c20772e..aa9bd20 100644
--- a/src/logo.d
+++ b/src/logo.d
@@ -3,6 +3,9 @@ import glamour.vao;
 import glamour.vbo;
 static import logoobj;
 
+immutable int N_GENTEX = 6;
+immutable int N_CORPORATION = 11;
+
 immutable enum int FACE = 0;
 immutable enum int WIRE = 1;
 
diff --git a/src/screensaver.d b/src/screensaver.d
index 34d8052..37387b6 100644
--- a/src/screensaver.d
+++ b/src/screensaver.d
@@ -5,9 +5,6 @@ import derelict.opengl3.gl3;
 static import logo;
 import mode;
 
-immutable int N_GENTEX = 6;
-immutable int N_CORPORATION = 11;
-
 class ScreenSaver
 {
     protected int m_width;