Changeset 374 for ps

Timestamp:

06/03/04 02:19:22 (21 years ago)

Author:

janwas

Message:

animation: console scrolls in from top of screen

Location:

ps/trunk/source

Files:

• main.cpp (modified) (2 diffs)
• ps/CConsole.cpp (modified) (6 diffs)
• ps/CConsole.h (modified) (2 diffs)

ps/trunk/source/main.cpp

@@ -544 +544 @@
     font = font_load("fonts/verdana.fnt");
 
-    g_Console = new CConsole;
+    g_Console = new CConsole(0, g_yres-600.f, 800.f, 600.f);
 
     // create renderer
@@ -650 +650 @@
         mouseButtons[SDL_BUTTON_WHEELDOWN] = false;
 
+        float TimeSinceLastFrame = (float)(time1-time0);
         in_get_events();
-        UpdateWorld(float(time1-time0));
-        terr_update(float(time1-time0));
+        UpdateWorld(TimeSinceLastFrame);
+        terr_update(TimeSinceLastFrame);
+        g_Console->Update(TimeSinceLastFrame);
         Render();
         SDL_GL_SwapBuffers();

ps/trunk/source/ps/CConsole.cpp

@@ -1 +1 @@
 #include "CConsole.h"
 
-CConsole::CConsole(float X, float Y, float W, float H):
-                    m_fX(X), m_fY(Y), m_fMaxWidth(W), m_fMaxHeight(H)
-{
-    m_fHeight = m_fMaxHeight;
-    m_fWidth = m_fMaxWidth;
-
+#include "prometheus.h"
+#include "sysdep/sysdep.h"
+
+CConsole::CConsole(float X, float Y, float W, float H)
+    : m_fX(X), m_fY(Y), m_fWidth(W), m_fHeight(H)
+{
     m_bToggle = false;
     m_bVisible = false;
+
+    m_VisibleFrac = 0.0f;
 
     m_szBuffer = (char*)malloc(sizeof(char) * BUFFER_SIZE);
@@ -107 +109 @@
 void CConsole::Update(const float DeltaTime)
 {
-    const float MoveSpeed = 10.0f;
-
-    if (m_bToggle)
+    if(m_bToggle)
     {
-        if (m_fHeight > m_fY)
-            m_fHeight -= MoveSpeed * DeltaTime;
+        const float AnimateTime = .30f;
+        const float Delta = DeltaTime / AnimateTime;
+        if(m_bVisible)
+        {
+            m_VisibleFrac += Delta;
+            if(m_VisibleFrac > 1.0f)
+            {
+                m_VisibleFrac = 1.0f;
+                m_bToggle = false;
+            }
+        }
         else
-            if (m_bVisible) m_bVisible = false;
-    }
-    else
-    {
-        if (!m_bVisible) m_bVisible = true;
-
-        if (m_fHeight < m_fMaxHeight)
-            m_fHeight += MoveSpeed * DeltaTime;
-        else
-            if (m_fHeight != m_fMaxHeight)
-                m_fHeight = m_fMaxHeight;
+        {
+            m_VisibleFrac -= Delta;
+            if(m_VisibleFrac < 0.0f)
+            {
+                m_VisibleFrac = 0.0f;
+                m_bToggle = false;
+            }
+        }
     }
 }
@@ -133 +139 @@
     if (!m_bVisible) return;
 
-    glTranslatef(m_fX, m_fY, 0.0f); //Move to window position
+    // animation: slide in from top of screen
+    const float MaxY = m_fHeight;
+    const float DeltaY = (1.0f - m_VisibleFrac) * MaxY;
+
+    glTranslatef(m_fX, m_fY + DeltaY, 0.0f); //Move to window position
 
     DrawWindow();
@@ -247 +257 @@
     static int iHistoryPos = -1;
 
-    if (szChar == '`')
+    if (szChar == SDLK_F1)
     {
-        m_bToggle = !m_bToggle;
+        m_bToggle = true;
+        m_bVisible = !m_bVisible;
         return;
     }
@@ -418 +429 @@
 
 extern CConsole* g_Console;
-static bool console_active = false;
 
 bool conInputHandler(const SDL_Event& ev)
@@ -425 +435 @@
         return false;
 
-    const int c = ev.key.keysym.sym;
-    if(c == SDLK_F1)
-    {
-        console_active = !console_active;
-//      g_Console->Toggle();
-    }
-
-    if(console_active)
-    {
-        g_Console->InsertChar(c);
-        return true;
-    }
-    else
-        return false;
-}
+    g_Console->InsertChar(ev.key.keysym.sym);
+    return g_Console->IsActive();
+}

ps/trunk/source/ps/CConsole.h

@@ -24 +24 @@
     float m_fY;
 
-    float m_fMaxHeight;
-    float m_fMaxWidth;
-
     float m_fHeight;
     float m_fWidth;
+
+    // show / hide animation
+    float m_VisibleFrac;
 
     std::map<std::string, fptr> m_mapFuncList;
@@ -76 +76 @@
 
     void RegisterFunc(fptr F, const char* szName);
+
+    bool IsActive() { return m_bVisible; }
 };