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

Minimal mod card scale

Browse Source 
it's a minimal graphics mod so it's easier to debug. It's a smaller card
scale of big render so we have more space to view in game.
This commit is contained in:
Anthony Calosa
2016-08-14 14:59:49 +08:00
parent b7307adc10
commit bccb740c45
4 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
projects/mtg/src/ActionStack.cpp
View File

@@ -130,7 +130,10 @@ void Interruptible::Render(MTGCardInstance * source, JQuad * targetQuad, string
if (bigQuad) if (bigQuad)
{ {
Pos pos = Pos(CardGui::BigWidth / 2, CardGui::BigHeight / 2 - 10, 1.0, 0.0, 220); /*Pos pos = Pos(CardGui::BigWidth / 2, CardGui::BigHeight / 2 - 10, 1.0, 0.0, 220);
CardGui::DrawCard(source, pos, observer->getCardSelector()->GetDrawMode());*/
Pos pos = Pos(CardGui::BigWidth / 2, CardGui::BigHeight / 2 - 10, 0.80f, 0.0, 220);
pos.actY = 142;//adjust y a little bit
CardGui::DrawCard(source, pos, observer->getCardSelector()->GetDrawMode()); CardGui::DrawCard(source, pos, observer->getCardSelector()->GetDrawMode());
} }

6
projects/mtg/src/CardDisplay.cpp
View File

@@ -263,11 +263,13 @@ void CardDisplay::Render()
{ {
mObjects[mCurr]->Render(); mObjects[mCurr]->Render();
CardGui * cardg = ((CardGui *) mObjects[mCurr]); CardGui * cardg = ((CardGui *) mObjects[mCurr]);
Pos pos = Pos(CardGui::BigWidth / 2, CardGui::BigHeight / 2 - 10, 1.0, 0.0, 220); //Pos pos = Pos(CardGui::BigWidth / 2, CardGui::BigHeight / 2 - 10, 1.0, 0.0, 220);
Pos pos = Pos((CardGui::BigWidth / 2), CardGui::BigHeight / 2 - 10, 0.80f, 0.0, 220);
int drawMode = DrawMode::kNormal; int drawMode = DrawMode::kNormal;
if (observer) if (observer)
{ {
pos.actY = 145; //pos.actY = 145;
pos.actY = 142;//reduce y a little
if (x < (CardGui::BigWidth / 2)) pos.actX = SCREEN_WIDTH - 10 - CardGui::BigWidth / 2; if (x < (CardGui::BigWidth / 2)) pos.actX = SCREEN_WIDTH - 10 - CardGui::BigWidth / 2;
drawMode = observer->getCardSelector()->GetDrawMode(); drawMode = observer->getCardSelector()->GetDrawMode();
} }

53
projects/mtg/src/CardGui.cpp
View File

@@ -153,7 +153,7 @@ void CardGui::Render()
else else
quad = AlternateThumbQuad(card); quad = AlternateThumbQuad(card);
float cardScale = quad ? 40 / quad->mHeight : 1; float cardScale = quad ? 38 / quad->mHeight : 1;
//I want the below for melded cards but I dont know how to adjust everything else //I want the below for melded cards but I dont know how to adjust everything else
//to look neat and clean. leaving this here incase someone else wants to pretty up the p/t box //to look neat and clean. leaving this here incase someone else wants to pretty up the p/t box
//and line up the position. //and line up the position.
@@ -385,9 +385,11 @@ void CardGui::Render()
mFont->SetScale(DEFAULT_MAIN_FONT_SCALE); mFont->SetScale(DEFAULT_MAIN_FONT_SCALE);
char buffer[200]; char buffer[200];
sprintf(buffer, "%i/%i", card->power, card->life); sprintf(buffer, "%i/%i", card->power, card->life);
renderer->FillRect(actX - (13 * actZ), actY + 4 * actZ, 25.5f * actZ, 14 * actZ, //move up the p/t box by increasing ymody
float ymody = (card->isAttacker()||card->isDefenser())?-6.0f:0.0f;
renderer->FillRect(actX - (13 * actZ), actY + ymody + 4 * actZ, 25.5f * actZ, 14 * actZ,
ARGB(((static_cast<unsigned char>(actA))/2),0,0,0)); ARGB(((static_cast<unsigned char>(actA))/2),0,0,0));
renderer->DrawRect(actX - (13 * actZ), actY + 4 * actZ, 25.5f * actZ, 14 * actZ, renderer->DrawRect(actX - (13 * actZ), actY + ymody + 4 * actZ, 25.5f * actZ, 14 * actZ,
ARGB(((static_cast<unsigned char>(actA))),20,20,20)); ARGB(((static_cast<unsigned char>(actA))),20,20,20));
//damaged or buffed or powered down //damaged or buffed or powered down
if(card->wasDealtDamage && card->life <= 2) if(card->wasDealtDamage && card->life <= 2)
@@ -403,7 +405,7 @@ void CardGui::Render()
mFont->SetScale(actZ); mFont->SetScale(actZ);
mFont->SetScale(actZ); mFont->SetScale(actZ);
float halfbufferW = (mFont->GetStringWidth(buffer))/2; float halfbufferW = (mFont->GetStringWidth(buffer))/2;
mFont->DrawString(buffer, actX - halfbufferW, actY + 7 * actZ); mFont->DrawString(buffer, actX - halfbufferW, actY + ymody + 7 * actZ);
mFont->SetScale(1); mFont->SetScale(1);
} }
@@ -1123,7 +1125,7 @@ void CardGui::RenderBig(MTGCard* card, const Pos& pos, bool thumb, bool noborder
// card = (MTGCard*)game->mLayers->actionLayer()->currentActionCard; // card = (MTGCard*)game->mLayers->actionLayer()->currentActionCard;
//i want this but ai targets cards so quickly that it can crash the game. //i want this but ai targets cards so quickly that it can crash the game.
float x = pos.actX; float x = pos.actX;
JQuadPtr alphabeta = WResourceManager::Instance()->RetrieveTempQuad("alphabeta.png");
JQuadPtr quad = thumb ? WResourceManager::Instance()->RetrieveCard(card, RETRIEVE_THUMB) JQuadPtr quad = thumb ? WResourceManager::Instance()->RetrieveCard(card, RETRIEVE_THUMB)
: WResourceManager::Instance()->RetrieveCard(card); : WResourceManager::Instance()->RetrieveCard(card);
MTGCardInstance * kcard = dynamic_cast<MTGCardInstance*>(card); MTGCardInstance * kcard = dynamic_cast<MTGCardInstance*>(card);
@@ -1145,24 +1147,39 @@ void CardGui::RenderBig(MTGCard* card, const Pos& pos, bool thumb, bool noborder
if(!noborder) if(!noborder)
{ {
if(cardsetname == "2ED"||cardsetname == "RV"||cardsetname == "4ED"||cardsetname == "5ED"||cardsetname == "6ED"||cardsetname == "7ED"||cardsetname == "8ED"||cardsetname == "9ED"||cardsetname == "CHR"||cardsetname == "DM") if(cardsetname == "2ED"||cardsetname == "RV"||cardsetname == "4ED"||cardsetname == "5ED"||cardsetname == "6ED"||cardsetname == "7ED"||cardsetname == "8ED"||cardsetname == "9ED"||cardsetname == "CHR"||cardsetname == "DM")
{ {//Draw white border
//like white border renderer->FillRoundRect((pos.actX - (pos.actZ * 84.f))-11.5f,(pos.actY - (pos.actZ * 119.7f))-14.f,pos.actZ * 168.f + 6.5f,pos.actZ * 239.4f + 12.f,8.f,ARGB(255,248,248,255));
renderer->FillRoundRect(x-92,pos.actY-130, (scale * quad->mWidth)-10, (scale * quad->mHeight)-11, 9.0f,ARGB(255,248,248,255)); renderer->DrawRoundRect((pos.actX - (pos.actZ * 84.f))-11.5f,(pos.actY - (pos.actZ * 119.7f))-14.f,pos.actZ * 168.f + 6.5f,pos.actZ * 239.4f + 12.f,8.f,ARGB(150,20,20,20));
//black thin line to simulate card edge
renderer->DrawRoundRect(x-92,pos.actY-130, (scale * quad->mWidth)-10, (scale * quad->mHeight)-11, 9.0f,ARGB(150,20,20,20));
} }
else else
{ {
//like black border if(cardsetname == "LEA")
renderer->FillRoundRect(x-92,pos.actY-130, (scale * quad->mWidth)-10, (scale * quad->mHeight)-11, 9.0f,ARGB(255,10,10,10)); {//BETA HAS REGULAR BORDER
//white thin line to simulate card edge //Draw more rounder black border
renderer->DrawRoundRect(x-92,pos.actY-130, (scale * quad->mWidth)-10, (scale * quad->mHeight)-11, 9.0f,ARGB(50,240,240,240)); renderer->FillRoundRect((pos.actX - (pos.actZ * 84.f))-10.f,(pos.actY - (pos.actZ * 119.7f))-14.f,pos.actZ * 168.f - 0.5f,pos.actZ * 239.4f + 8.f,10.f,ARGB(255,5,5,5));
renderer->DrawRoundRect((pos.actX - (pos.actZ * 84.f))-10.f,(pos.actY - (pos.actZ * 119.7f))-14.f,pos.actZ * 168.f - 0.5f,pos.actZ * 239.4f + 8.f,10.f,ARGB(50,240,240,240));
}
else
{//draw black border
renderer->FillRoundRect((pos.actX - (pos.actZ * 84.f))-11.5f,(pos.actY - (pos.actZ * 119.7f))-14.f,pos.actZ * 168.f + 6.5f,pos.actZ * 239.4f + 12.f,8.f,ARGB(255,5,5,5));
renderer->DrawRoundRect((pos.actX - (pos.actZ * 84.f))-11.5f,(pos.actY - (pos.actZ * 119.7f))-14.f,pos.actZ * 168.f + 6.5f,pos.actZ * 239.4f + 12.f,8.f,ARGB(50,240,240,240));
}
} }
//render card image
renderer->RenderQuad(quad.get(), x, pos.actY-2, pos.actT, scale-0.02f, scale-0.02f);
} }
else //draw inner border
renderer->RenderQuad(quad.get(), x, pos.actY, pos.actT, scale, scale); if(cardsetname == "LEA"||cardsetname == "LEB")
{
if(alphabeta.get())
{
alphabeta->SetHotSpot(static_cast<float> (alphabeta->mWidth / 2), static_cast<float> (alphabeta->mHeight / 2));
float myscale = pos.actZ * 254 / alphabeta->mHeight;
alphabeta->SetColor(ARGB((int)pos.actA,255,255,255));
renderer->RenderQuad(alphabeta.get(), x, pos.actY+0.2f, pos.actT, myscale, myscale);
}
}
float modxscale = (cardsetname =="UNH")?0.02f:0.0f;
float modyscale = (cardsetname =="UNH")?0.015f:0.0f;
renderer->RenderQuad(quad.get(), x, pos.actY, pos.actT, scale+modxscale, scale+modyscale);
RenderCountersBig(card, pos); RenderCountersBig(card, pos);
return; return;

8
projects/mtg/src/CardSelector.cpp
View File

@@ -339,8 +339,14 @@ void CardSelector::Render()
active->Render(); active->Render();
if (CardView* card = dynamic_cast<CardView*>(active) ) if (CardView* card = dynamic_cast<CardView*>(active) )
{ {
//if(timer > 0)
//card->DrawCard(bigpos, mDrawMode);
if(timer > 0) if(timer > 0)
card->DrawCard(bigpos, mDrawMode); {
float modx = 14.f;
Pos npos = Pos(bigpos.x+modx,bigpos.y-4.f,bigpos.zoom-(bigpos.zoom/5),bigpos.t,bigpos.alpha);
card->DrawCard(npos, mDrawMode);
}
} }
} }
} }