sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

animation: console scrolls in from top of screen

Browse Source 
This was SVN commit r374.
This commit is contained in:
janwas 2004-06-03 00:19:22 +00:00
parent 2d51e32878
commit af05b758c6
3 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/main.cpp
View File

@ -543,7 +543,7 @@ int main(int argc, char* argv[])
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
new CRenderer;
@ -649,9 +649,11 @@ g_Console->RegisterFunc(Testing, "Testing");
mouseButtons[SDL_BUTTON_WHEELUP] = false;
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();

76
source/ps/CConsole.cpp
View File

@ -1,14 +1,16 @@
#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);
FlushBuffer();
@ -106,24 +108,28 @@ void CConsole::RegisterFunc(fptr F, const char* szName)
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;
}
}
}
}
@ -132,7 +138,11 @@ void CConsole::Render()
{
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();
DrawHistory();
@ -246,9 +256,10 @@ void CConsole::InsertChar(const int szChar)
{
static int iHistoryPos = -1;
if (szChar == '`')
if (szChar == SDLK_F1)
{
m_bToggle = !m_bToggle;
m_bToggle = true;
m_bVisible = !m_bVisible;
return;
}
@ -417,25 +428,12 @@ void CConsole::ProcessBuffer(const char* szLine){
#include "sdl.h"
extern CConsole* g_Console;
static bool console_active = false;
bool conInputHandler(const SDL_Event& ev)
{
if(ev.type != SDL_KEYDOWN)
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();
}

8
source/ps/CConsole.h
View File

@ -23,12 +23,12 @@ private:
float m_fX;
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;
std::deque<std::string> m_deqMsgHistory;
@ -75,6 +75,8 @@ public:
void FlushBuffer();
void RegisterFunc(fptr F, const char* szName);
bool IsActive() { return m_bVisible; }
};
#endif