From a7ffe4990b184900d76ad1531e1c1228324c6504 Mon Sep 17 00:00:00 2001 From: "wrenczes@gmail.com" Date: Sun, 17 Oct 2010 00:20:25 +0000 Subject: [PATCH] Cleaned up the SimpleMenu drawing routines. I was seeing intermittently weird edge lines on the spades of the menu system, as well as gaps. The code was doing a lot of hacky +/- of arbitrary pixel values for the positioning, so I fixed it up to do everything relative to the widths of the pole & the actual spade graphic's size. Also cleaned up the pngs themselves, as they had no need for a transparent pixel rim. Also moved some static value definitions used in the drawing code from the class header to a private namespace in the cpp file, as they don't need to be seen by any clients of the class. --- projects/mtg/bin/Res/graphics/spade_ul.png | Bin 354 -> 2931 bytes projects/mtg/bin/Res/graphics/spade_ur.png | Bin 354 -> 2931 bytes projects/mtg/include/SimpleMenu.h | 7 --- projects/mtg/src/SimpleMenu.cpp | 58 ++++++++++++--------- 4 files changed, 33 insertions(+), 32 deletions(-) diff --git a/projects/mtg/bin/Res/graphics/spade_ul.png b/projects/mtg/bin/Res/graphics/spade_ul.png index 7448a81dd098c35d4c7ce92920972e3d93ccb50f..6ee7be94471cfbd653a483ff07b944f83fd81298 100644 GIT binary patch literal 2931 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 diff --git a/projects/mtg/bin/Res/graphics/spade_ur.png b/projects/mtg/bin/Res/graphics/spade_ur.png index 7448a81dd098c35d4c7ce92920972e3d93ccb50f..6ee7be94471cfbd653a483ff07b944f83fd81298 100644 GIT binary patch literal 2931 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 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;