-added display clearing before showing wait message

This commit is contained in:
fix94.1 2012-05-20 16:55:50 +00:00
parent 0c32d1b0c1
commit 4c4224c49d
2 changed files with 12 additions and 11 deletions

View File

@ -167,12 +167,7 @@ void CVideo::init(void)
GX_SetNumChans(0); GX_SetNumChans(0);
GX_SetZCompLoc(GX_ENABLE); GX_SetZCompLoc(GX_ENABLE);
setup2DProjection(); setup2DProjection();
_clearScreen();
VIDEO_ClearFrameBuffer(m_rmode, m_frameBuf[0], COLOR_BLACK);
VIDEO_ClearFrameBuffer(m_rmode, m_frameBuf[1], COLOR_BLACK);
render();
render();
VIDEO_SetBlack(FALSE); VIDEO_SetBlack(FALSE);
VIDEO_Flush(); VIDEO_Flush();
VIDEO_WaitVSync(); VIDEO_WaitVSync();
@ -183,6 +178,14 @@ void CVideo::init(void)
memset(m_stencil, 0, CVideo::_stencilWidth * CVideo::_stencilHeight); memset(m_stencil, 0, CVideo::_stencilWidth * CVideo::_stencilHeight);
} }
void CVideo::_clearScreen()
{
VIDEO_ClearFrameBuffer(m_rmode, m_frameBuf[0], COLOR_BLACK);
VIDEO_ClearFrameBuffer(m_rmode, m_frameBuf[1], COLOR_BLACK);
render();
render();
}
void CVideo::set2DViewport(u32 w, u32 h, int x, int y) void CVideo::set2DViewport(u32 w, u32 h, int x, int y)
{ {
m_width2D = std::min(std::max(512u, w), 800u); m_width2D = std::min(std::max(512u, w), 800u);
@ -233,11 +236,7 @@ void CVideo::cleanup(void)
{ {
gprintf("Cleaning up video...\n"); gprintf("Cleaning up video...\n");
VIDEO_ClearFrameBuffer(m_rmode, m_frameBuf[0], COLOR_BLACK); _clearScreen();
VIDEO_ClearFrameBuffer(m_rmode, m_frameBuf[1], COLOR_BLACK);
render();
render();
VIDEO_SetBlack(TRUE); VIDEO_SetBlack(TRUE);
VIDEO_Flush(); VIDEO_Flush();
@ -495,6 +494,7 @@ void CVideo::_showWaitMessages(CVideo *m)
vector<STexture>::iterator waitItr = m->m_waitMessages.begin(); vector<STexture>::iterator waitItr = m->m_waitMessages.begin();
gprintf("Going to show a wait message screen, delay: %d, # images: %d\n", waitFrames, m->m_waitMessages.size()); gprintf("Going to show a wait message screen, delay: %d, # images: %d\n", waitFrames, m->m_waitMessages.size());
m->_clearScreen();
m->waitMessage(*waitItr); m->waitMessage(*waitItr);
waitItr += PNGfadeDirection; waitItr += PNGfadeDirection;

View File

@ -114,6 +114,7 @@ private:
private: private:
void _drawAASceneWithAlpha(float w, float h); void _drawAASceneWithAlpha(float w, float h);
void _setViewPort(float x, float y, float w, float h); void _setViewPort(float x, float y, float w, float h);
void _clearScreen();
static void _showWaitMessages(CVideo *m); static void _showWaitMessages(CVideo *m);
private: private:
CVideo(const CVideo &); CVideo(const CVideo &);