From 1e988ef6bb4fcb982cac9c5eb1ec4bdfe308739c Mon Sep 17 00:00:00 2001 From: "techdragon.nguyen@gmail.com" Date: Mon, 8 Nov 2010 13:41:32 +0000 Subject: [PATCH] make rendering of retrieval and rendering of background more tightly bounded. --- projects/mtg/include/DeckMenu.h | 2 +- projects/mtg/src/DeckMenu.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/projects/mtg/include/DeckMenu.h b/projects/mtg/include/DeckMenu.h index 07d1c9ff2..320358768 100644 --- a/projects/mtg/include/DeckMenu.h +++ b/projects/mtg/include/DeckMenu.h @@ -51,7 +51,7 @@ class DeckMenu:public JGuiController{ void Add(int id, const char * Text, string desc = "", bool forceFocus = false, DeckMetaData *deckMetaData = NULL); void Close(); void updateScroller(); - JQuad * getBackground(); + void RenderBackground(); float selectionTargetY; bool closed; diff --git a/projects/mtg/src/DeckMenu.cpp b/projects/mtg/src/DeckMenu.cpp index 91a82e994..fd0dc9720 100644 --- a/projects/mtg/src/DeckMenu.cpp +++ b/projects/mtg/src/DeckMenu.cpp @@ -96,12 +96,14 @@ fontId(fontId) { } -JQuad* DeckMenu::getBackground() +void DeckMenu::RenderBackground() { ostringstream bgFilename; bgFilename << backgroundName << ".png"; JQuad *background = resources.RetrieveTempQuad(bgFilename.str(), TEXTURE_SUB_5551); - return background; + if ( background ) + JRenderer::GetInstance()->RenderQuad( background, 0, 0 ); + } void DeckMenu::initMenuItems() @@ -171,8 +173,7 @@ void DeckMenu::Render() currentMenuItem->RenderWithOffset(-kLineHeight*startId); } - JQuad * background = getBackground(); - renderer->RenderQuad( background, 0, 0 ); + RenderBackground(); if (!title.empty()) {