Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #767 from kevlahnota/master

Browse Source 
minor changes
This commit is contained in:
Anthony Calosa
2016-07-18 14:26:31 +08:00
committed by GitHub
parent fe4c102c7d bd36590084
commit 5b9f3c70dc
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/mtg/src/GameStateMenu.cpp
View File

@@ -153,7 +153,7 @@ void GameStateMenu::Start()
mBg = WResourceManager::Instance()->RetrieveQuad("menutitle.png", 0, 0, 0, 0); // Create background quad for rendering. mBg = WResourceManager::Instance()->RetrieveQuad("menutitle.png", 0, 0, 0, 0); // Create background quad for rendering.
if (mBg) if (mBg)
mBg->SetHotSpot(0, 0); mBg->SetHotSpot(mBg->mWidth/2, 0);
if (MENU_STATE_MAJOR_MAINMENU == currentState) if (MENU_STATE_MAJOR_MAINMENU == currentState)
currentState = currentState | MENU_STATE_MINOR_FADEIN; currentState = currentState | MENU_STATE_MINOR_FADEIN;
@@ -830,7 +830,7 @@ void GameStateMenu::Render()
scroller->Render(); scroller->Render();
if (mBg.get()) if (mBg.get())
renderer->RenderQuad(mBg.get(), (SCREEN_WIDTH/4)-6, 2, 0, 256 / mBg->mWidth, 166 / mBg->mHeight); renderer->RenderQuad(mBg.get(), SCREEN_WIDTH_F/2, 2, 0, 256 / mBg->mWidth, 166 / mBg->mHeight);
RenderTopMenu(); RenderTopMenu();

9
projects/mtg/src/MenuItem.cpp
View File

@@ -41,15 +41,16 @@ void MenuItem::Render()
if (mParticleSys) if (mParticleSys)
start = mParticleSys->info.colColorStart.GetHWColor(); start = mParticleSys->info.colColorStart.GetHWColor();
PIXEL_TYPE colors[] = { ARGB(0,0,0,0), start, ARGB(0,0,0,0), start, }; PIXEL_TYPE colors[] = { ARGB(0,0,0,0), start, ARGB(0,0,0,0), start, };
renderer->FillRect(255, 0, SCREEN_WIDTH - 155, SCREEN_HEIGHT, colors); renderer->FillRect(255, 0, SCREEN_WIDTH - 165, SCREEN_HEIGHT, colors);//color on main menu right side
// set additive blending // set additive blending
renderer->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE); renderer->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE);
mParticleSys->Render(); mParticleSys->Render();
// set normal blending // set normal blending
renderer->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA); renderer->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA);
mFont->SetColor(ARGB(255,255,255,255)); mFont->SetColor(ARGB(255,255,255,255));
onQuad->SetColor(ARGB(70,255,255,255)); offQuad->SetColor(ARGB(60,255,255,255));
renderer->RenderQuad(onQuad, SCREEN_WIDTH, SCREEN_HEIGHT / 2, 0, 8, 8); renderer->RenderQuad(offQuad, SCREEN_WIDTH, SCREEN_HEIGHT / 2, 0, 8, 8);//big icon main menu right side
offQuad->SetColor(ARGB(255,255,255,255));
onQuad->SetColor(ARGB(255,255,255,255)); onQuad->SetColor(ARGB(255,255,255,255));
mFont->DrawString(mText.c_str(), SCREEN_WIDTH / 2, 3 * SCREEN_HEIGHT / 4, JGETEXT_CENTER); mFont->DrawString(mText.c_str(), SCREEN_WIDTH / 2, 3 * SCREEN_HEIGHT / 4, JGETEXT_CENTER);
renderer->RenderQuad(onQuad, mX, mY, 0, mScale, mScale); renderer->RenderQuad(onQuad, mX, mY, 0, mScale, mScale);
@@ -88,7 +89,7 @@ void MenuItem::Entering()
if (mParticleSys) if (mParticleSys)
mParticleSys->Fire(); mParticleSys->Fire();
mHasFocus = true; mHasFocus = true;
mTargetScale = 1.3f; mTargetScale = 1.2f;
} }
bool MenuItem::Leaving(JButton) bool MenuItem::Leaving(JButton)