Added comma, period as navigation keys. Added other input keys.

include/overkill/Input.hpp

@@ -18,7 +18,7 @@ namespace overkill
 
 enum NavigationKey
 {
-    I, J, K, L, Y, H, W, A, S, D, N, M
+    I, J, K, L, Y, H, W, A, S, D, N, M, comma, period
 };
 
 class Input
@@ -36,7 +36,7 @@ public:
     static float m_camRotY;
     static float m_camPanX;        // Factor camera uses for its position/orientation.
     static float m_camPanY;
-    static bool m_navKeyPressed[12];// Which navigation keys are pressed. WASD-QE keys.
+    static bool m_navKeyPressed[14];// Which navigation keys are pressed. WASD-QE keys.
 
     static void OnInputKeyPress(GLFWwindow* window, int keyCode, int scanCode, int mods);
     static void OnInputKeyHold(GLFWwindow* window, int keyCode, int scanCode, int mods);

src/Input.cpp

@@ -15,7 +15,7 @@ namespace overkill
     float Input::m_camPanY = 0;
     bool Input::m_navKeyPressed[] = {false, false, false, false, false, false, false, false, false, false, false, false}; // Which navigation keys are pressed. WASD-QE keys.
 
-    void Input::OnInputKeyPress(GLFWwindow* window, int keyCode, int /*scanCode*/, int /*mods*/)
+    void Input::OnInputKeyPress(GLFWwindow* window, int keyCode, int /*scanCode*/, int mods)
     {
         // LOG_DEBUG("Pressing %i, as char: %c\n", keyCode, char(keyCode));
         if (keyCode == GLFW_KEY_ESCAPE)
@@ -26,6 +26,45 @@ namespace overkill
         else if(keyCode == GLFW_KEY_O) {
             // Terrain lines.
         }
+                // PRESS SPACE to toggle camera mode
+        else if(keyCode == GLFW_KEY_SPACE) {
+            EntityCamera* cam = (EntityCamera*) Scene::getActiveCamera();
+            if (cam != nullptr)
+            {
+                cam-> cycleMode();
+                LOG_INFO("Cycled camera mode.");
+            }
+            else 
+            {
+                LOG_WARN("Main camera not set. The scene most likely loaded incorrectly.")
+            }
+
+        }
+        // PRESS TAB to cycle through camera
+        else if(keyCode == GLFW_KEY_TAB) {
+            Scene::cycleCameras();
+            LOG_INFO("Cycled cameras.");
+        }
+
+
+        // PRESS SHIFT + 1 TO RELOAD ShaderSystem
+        else if(keyCode == GLFW_KEY_1 && mods == GLFW_MOD_SHIFT) {
+            ShaderSystem::reload();
+        }
+        // PRESS SHIFT + 2 TO RELOAD MaterialSystem
+        else if(keyCode == GLFW_KEY_2 && mods == GLFW_MOD_SHIFT) {
+            MaterialSystem::reload();
+            Init::loadOBJFiles(false, true, false);
+        }
+        // PRESS SHIFT + 3 TO RELOAD ModelSystem
+        else if(keyCode == GLFW_KEY_3 && mods == GLFW_MOD_SHIFT) {
+            ModelSystem::reload();
+            Init::loadOBJFiles(false, false, true);
+        }
+        // PRESS SHIFT + 4 TO RELOAD Scene
+        else if(keyCode == GLFW_KEY_4 && mods == GLFW_MOD_SHIFT) {
+            Scene::reload();
+        }
 
 
         // PRESS 1 TO Set season to spring.
@@ -44,45 +83,33 @@ namespace overkill
         else if(keyCode == GLFW_KEY_4) {
             // Winter.
         }
+        // PRESS 5 TO Set toggle season changing.
+        else if(keyCode == GLFW_KEY_5) {
+            // toggle season change
+        }
+
+        // PRESS 6 TO change daytime to morning.
+        else if(keyCode == GLFW_KEY_6) {
             
-        // PRESS 0 TO RELOAD Scene
-        else if(keyCode == GLFW_KEY_0) {
-            Scene::reload();
         }
-        // PRESS 7 TO RELOAD ShaderSystem
+        // PRESS 7 TO change daytime to noon
         else if(keyCode == GLFW_KEY_7) {
-            ShaderSystem::reload();
+            
         }
-        // PRESS 8 TO RELOAD MaterialSystem
+        // PRESS 8 TO change daytime to afternoon
         else if(keyCode == GLFW_KEY_8) {
-            MaterialSystem::reload();
-            Init::loadOBJFiles(false, true, false);
+            
         }
-        // PRESS 9 TO RELOAD ModelSystem
+        // PRESS 9 TO change daytime to night
         else if(keyCode == GLFW_KEY_9) {
-            ModelSystem::reload();
-            Init::loadOBJFiles(false, false, true);
-        }
             
-        // PRESS SPACE to toggle camera mode
-        else if(keyCode == GLFW_KEY_SPACE) {
-            EntityCamera* cam = (EntityCamera*) Scene::getActiveCamera();
-            if (cam != nullptr)
-            {
-                cam-> cycleMode();
-                LOG_INFO("Cycled camera mode.");
-            }
-            else 
-            {
-                LOG_WARN("Main camera not set. The scene most likely loaded incorrectly.")
         }
+        // PRESS 0 TO toggle daytime changing.
+        else if(keyCode == GLFW_KEY_0) {
            
         }
-        // PRESS TAB to cycle through camera
-        else if(keyCode == GLFW_KEY_TAB) {
-            Scene::cycleCameras();
-            LOG_INFO("Cycled cameras.");
-        }
+
+
 
         // Navigation keys input:
         switch (keyCode)
@@ -99,6 +126,12 @@ namespace overkill
             case GLFW_KEY_D:
                 m_navKeyPressed[D] = true;
             break;
+            case GLFW_KEY_COMMA:
+                m_navKeyPressed[comma] = true;
+            break;
+            case GLFW_KEY_PERIOD:
+                m_navKeyPressed[period] = true;
+            break;
             case GLFW_KEY_I:
                 m_navKeyPressed[I] = true;
                 break;
@@ -136,7 +169,9 @@ namespace overkill
         // LOG_DEBUG("Unpressed %i, as char: %c\n", keyCode, char(keyCode));
 
         switch (keyCode)
+
         {
+
             case GLFW_KEY_W:
                 m_navKeyPressed[W] = false;
             break;
@@ -149,6 +184,12 @@ namespace overkill
             case GLFW_KEY_D:
                 m_navKeyPressed[D] = false;
             break;
+            case GLFW_KEY_COMMA:
+                m_navKeyPressed[comma] = false;
+            break;
+            case GLFW_KEY_PERIOD:
+                m_navKeyPressed[period] = false;
+            break;
             case GLFW_KEY_I:
                 m_navKeyPressed[I] = false;
                 break;