diff --git a/projects/mtg/bin/Res/graphics/spade_ul.png b/projects/mtg/bin/Res/graphics/spade_ul.png index 7448a81dd..6ee7be944 100644 Binary files a/projects/mtg/bin/Res/graphics/spade_ul.png and b/projects/mtg/bin/Res/graphics/spade_ul.png differ diff --git a/projects/mtg/bin/Res/graphics/spade_ur.png b/projects/mtg/bin/Res/graphics/spade_ur.png index 7448a81dd..6ee7be944 100644 Binary files a/projects/mtg/bin/Res/graphics/spade_ur.png and b/projects/mtg/bin/Res/graphics/spade_ur.png differ diff --git a/projects/mtg/include/SimpleMenu.h b/projects/mtg/include/SimpleMenu.h index 708fb57bd..4ef41238e 100644 --- a/projects/mtg/include/SimpleMenu.h +++ b/projects/mtg/include/SimpleMenu.h @@ -10,13 +10,6 @@ #include "hge/hgeparticle.h" class SimpleMenu:public JGuiController{ - private: - // See SimpleMenu.cpp for values - static const unsigned SIDE_SIZE; - static const unsigned VMARGIN; - static const unsigned HMARGIN; - static const signed LINE_HEIGHT; - private: int mHeight, mWidth, mX, mY; int fontId; diff --git a/projects/mtg/src/SimpleMenu.cpp b/projects/mtg/src/SimpleMenu.cpp index c80c8b0a4..0e335b8df 100644 --- a/projects/mtg/src/SimpleMenu.cpp +++ b/projects/mtg/src/SimpleMenu.cpp @@ -5,10 +5,13 @@ #include "../include/GameApp.h" #include "../include/Translate.h" -const unsigned SimpleMenu::SIDE_SIZE = 7; -const unsigned SimpleMenu::VMARGIN = 16; -const unsigned SimpleMenu::HMARGIN = 30; -const signed SimpleMenu::LINE_HEIGHT = 20; +namespace +{ + const unsigned int kPoleWidth = 7; + const unsigned int kVerticalMargin = 16; + const unsigned int kHorizontalMargin = 30; + const signed int kLineHeight = 20; +} JQuad* SimpleMenu::spadeR = NULL; JQuad* SimpleMenu::spadeL = NULL; @@ -29,7 +32,7 @@ PIXEL_TYPE SimpleMenu::jewelGraphics[9] = {0x3FFFFFFF,0x63645AEA,0x610D0D98, SimpleMenu::SimpleMenu(int id, JGuiListener* listener, int fontId, int x, int y, const char * _title, int _maxItems): JGuiController(id, listener), fontId(fontId){ autoTranslate = true; - mHeight = 2 * VMARGIN; + mHeight = 2 * kVerticalMargin; mWidth = 0; mX = x; mY = y; @@ -40,7 +43,7 @@ SimpleMenu::SimpleMenu(int id, JGuiListener* listener, int fontId, int x, int y, timeOpen = 0; closed = false; ++refCount; - selectionTargetY = selectionY = y + VMARGIN; + selectionTargetY = selectionY = y + kVerticalMargin; JRenderer* renderer = JRenderer::GetInstance(); @@ -48,8 +51,8 @@ SimpleMenu::SimpleMenu(int id, JGuiListener* listener, int fontId, int x, int y, if (!spadeRTex) spadeRTex = resources.RetrieveTexture("spade_ur.png", RETRIEVE_MANAGE); if (!jewelTex) jewelTex= renderer->CreateTexture(5, 5, TEX_TYPE_USE_VRAM); if (!sideTex) sideTex = resources.RetrieveTexture("menuside.png", RETRIEVE_MANAGE); - if (NULL == spadeL) spadeL = resources.RetrieveQuad("spade_ul.png", 2, 1, 16, 13, "spade_ul", RETRIEVE_MANAGE); - if (NULL == spadeR) spadeR = resources.RetrieveQuad("spade_ur.png", 2, 1, 16, 13, "spade_ur", RETRIEVE_MANAGE); + if (NULL == spadeL) spadeL = resources.RetrieveQuad("spade_ul.png", 0, 0, 11, 11, "spade_ul", RETRIEVE_MANAGE); + if (NULL == spadeR) spadeR = resources.RetrieveQuad("spade_ur.png", 0, 0, 11, 11, "spade_ur", RETRIEVE_MANAGE); if (NULL == jewel) jewel = NEW JQuad(jewelTex, 1, 1, 3, 3); if (NULL == side) side = resources.RetrieveQuad("menuside.png", 1, 1, 1, 7,"menuside", RETRIEVE_MANAGE); @@ -59,27 +62,31 @@ SimpleMenu::SimpleMenu(int id, JGuiListener* listener, int fontId, int x, int y, stars->FireAt(mX, mY); } -void SimpleMenu::drawHorzPole(int x, int y, int width) { +void SimpleMenu::drawHorzPole(int x, int y, int width) +{ JRenderer* renderer = JRenderer::GetInstance(); - renderer->RenderQuad(side, x + 5 , y - SIDE_SIZE / 2, 0, width - 10); + static int offset = (spadeR->mWidth - kPoleWidth) / 2; + renderer->RenderQuad(side, x, y, 0, width); spadeR->SetHFlip(true); spadeL->SetHFlip(false); - renderer->RenderQuad(spadeR, x - 9, y - 6); - renderer->RenderQuad(spadeL, x + width - 5, y - 6); + renderer->RenderQuad(spadeR, x - offset, y - offset); + renderer->RenderQuad(spadeL, x - offset + width, y - offset); renderer->RenderQuad(jewel, x, y - 1); renderer->RenderQuad(jewel, x + width - 1, y - 1); } -void SimpleMenu::drawVertPole(int x, int y, int height) { +void SimpleMenu::drawVertPole(int x, int y, int height) +{ JRenderer* renderer = JRenderer::GetInstance(); - renderer->RenderQuad(side, x - SIDE_SIZE / 2, y + height - 5, -M_PI/2, height - 10); + static int offset = (spadeR->mHeight - kPoleWidth) / 2; + renderer->RenderQuad(side, x + kPoleWidth, y, M_PI/2, height); spadeR->SetHFlip(false); spadeL->SetHFlip(true); - renderer->RenderQuad(spadeR, x - 6, y + 7, -M_PI/2); - renderer->RenderQuad(spadeL, x - 6, y + height + 11, -M_PI/2); + renderer->RenderQuad(spadeR, x + kPoleWidth + offset, y - offset, M_PI/2); + renderer->RenderQuad(spadeL, x + kPoleWidth + offset, y - offset + height, M_PI/2); renderer->RenderQuad(jewel, x - 1, y - 1); renderer->RenderQuad(jewel, x - 1, y + height - 1); @@ -89,15 +96,15 @@ void SimpleMenu::Render() { WFont * titleFont = resources.GetWFont("smallface"); WFont * mFont = resources.GetWFont(fontId); if (0 == mWidth) { - float sY = mY + VMARGIN; + float sY = mY + kVerticalMargin; for (int i = startId; i < startId + mCount; ++i) { int width = (static_cast(mObjects[i]))->GetWidth(); if (mWidth < width) mWidth = width; } if ((!title.empty()) && (mWidth < titleFont->GetStringWidth(title.c_str()))) mWidth = titleFont->GetStringWidth(title.c_str()); - mWidth += 2*HMARGIN; + mWidth += 2*kHorizontalMargin; for (int i = startId; i < startId + mCount; ++i) { - float y = mY + VMARGIN + i * LINE_HEIGHT; + float y = mY + kVerticalMargin + i * kLineHeight; SimpleMenuItem * smi = static_cast(mObjects[i]); smi->Relocate(mX + mWidth / 2, y); if (smi->hasFocus()) sY = y; @@ -114,9 +121,11 @@ void SimpleMenu::Render() { renderer->FillRect(mX, mY, mWidth, height, ARGB(180,0,0,0)); + renderer->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA); drawVertPole(mX, mY - 16, height + 32); drawVertPole(mX + mWidth, mY - 16, height + 32); drawHorzPole(mX - 16, mY, mWidth + 32); + drawHorzPole(mX - 25, mY + height, mWidth + 50); renderer->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE); stars->Render(); @@ -127,16 +136,15 @@ void SimpleMenu::Render() { titleFont->DrawString(title.c_str(), mX+mWidth/2, mY - 3, JGETEXT_CENTER); for (int i = startId; i < startId + maxItems ; i++){ if (i > mCount-1) break; - if ((static_cast(mObjects[i]))->mY - LINE_HEIGHT * startId < mY + height - LINE_HEIGHT + 7) { + if ((static_cast(mObjects[i]))->mY - kLineHeight * startId < mY + height - kLineHeight + 7) { if (static_cast(mObjects[i])->hasFocus()){ resources.GetWFont(Constants::MAIN_FONT)->DrawString(static_cast(mObjects[i])->desc.c_str(),mX+mWidth+10,mY+15); mFont->SetColor(ARGB(255,255,255,0)); } else mFont->SetColor(ARGB(150,255,255,255)); - (static_cast(mObjects[i]))->RenderWithOffset(-LINE_HEIGHT*startId); + (static_cast(mObjects[i]))->RenderWithOffset(-kLineHeight*startId); } } - drawHorzPole(mX - 25, mY + height, mWidth + 50); } void SimpleMenu::Update(float dt){ @@ -148,7 +156,7 @@ void SimpleMenu::Update(float dt){ stars->Update(dt); selectionT += 3*dt; selectionY += (selectionTargetY - selectionY) * 8 * dt; - stars->MoveTo(mX + HMARGIN + ((mWidth-2*HMARGIN)*(1+cos(selectionT))/2), selectionY + 5 * cos(selectionT*2.35) + LINE_HEIGHT / 2 - LINE_HEIGHT * startId); + stars->MoveTo(mX + kHorizontalMargin + ((mWidth-2*kHorizontalMargin)*(1+cos(selectionT))/2), selectionY + 5 * cos(selectionT*2.35) + kLineHeight / 2 - kLineHeight * startId); if (timeOpen < 0) { timeOpen += dt * 10; if (timeOpen >= 0) { timeOpen = 0; closed = true; stars->FireAt(mX, mY); } @@ -159,10 +167,10 @@ void SimpleMenu::Update(float dt){ } void SimpleMenu::Add(int id, const char * text,string desc, bool forceFocus){ - SimpleMenuItem * smi = NEW SimpleMenuItem(this, id, fontId, text, 0, mY + VMARGIN + mCount*LINE_HEIGHT, (mCount == 0), autoTranslate); + SimpleMenuItem * smi = NEW SimpleMenuItem(this, id, fontId, text, 0, mY + kVerticalMargin + mCount*kLineHeight, (mCount == 0), autoTranslate); smi->desc = desc; JGuiController::Add(smi); - if (mCount <= maxItems) mHeight += LINE_HEIGHT; + if (mCount <= maxItems) mHeight += kLineHeight; if (forceFocus){ mObjects[mCurr]->Leaving(JGE_BTN_DOWN); mCurr = mCount-1;