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

fix avatar scaling on guicombat, border on combat

Browse Source
This commit is contained in:
Anthony Calosa
2015-10-11 23:04:28 +08:00
parent 4c86cae7fe
commit c7b9e6f9b8
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/ActionStack.cpp
+2 -2
View File
@@ -1222,9 +1222,9 @@ void ActionStack::Render()
//stack shadow //stack shadow
//renderer->FillRoundRect(x0 - 7, y0+2, width + 17, height + 2, 9.0f, ARGB(128,0,0,0)); //renderer->FillRoundRect(x0 - 7, y0+2, width + 17, height + 2, 9.0f, ARGB(128,0,0,0));
//stack fill //stack fill
renderer->FillRect(x0 - 7, y0+2, width + 17, height + 2, ARGB(245,10,10,10)); renderer->FillRect(x0 - 7, y0+2, width + 17, height + 14, ARGB(215,10,10,10));
//stack border //stack border
renderer->DrawRect(x0 - 7, y0+2, width + 17, height + 2, ARGB(160,240,240,240)); renderer->DrawRect(x0 - 7, y0+2, width + 17, height + 14, ARGB(180,240,240,240));
std::ostringstream stream; std::ostringstream stream;
// WALDORF - changed "interrupt ?" to "Interrupt?". Don't display count down // WALDORF - changed "interrupt ?" to "Interrupt?". Don't display count down
projects/mtg/src/CardGui.cpp
+5 -5
View File
@@ -1076,19 +1076,19 @@ void CardGui::RenderBig(MTGCard* card, const Pos& pos, bool thumb, bool noborder
if(cardsetname == "2ED"||cardsetname == "RV"||cardsetname == "4ED"||cardsetname == "5ED"||cardsetname == "6ED"||cardsetname == "7ED"||cardsetname == "8ED"||cardsetname == "9ED"||cardsetname == "CHR") if(cardsetname == "2ED"||cardsetname == "RV"||cardsetname == "4ED"||cardsetname == "5ED"||cardsetname == "6ED"||cardsetname == "7ED"||cardsetname == "8ED"||cardsetname == "9ED"||cardsetname == "CHR")
{ {
//like white border //like white border
renderer->FillRoundRect(x-92,pos.actY-128, (scale * quad->mWidth)-10, (scale * quad->mHeight)-11, 9.0f,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));
//black thin line to simulate card edge //black thin line to simulate card edge
renderer->DrawRoundRect(x-92,pos.actY-128, (scale * quad->mWidth)-10, (scale * quad->mHeight)-11, 9.0f,ARGB(150,20,20,20)); 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 //like black border
renderer->FillRoundRect(x-92,pos.actY-128, (scale * quad->mWidth)-10, (scale * quad->mHeight)-11, 9.0f,ARGB(255,10,10,10)); renderer->FillRoundRect(x-92,pos.actY-130, (scale * quad->mWidth)-10, (scale * quad->mHeight)-11, 9.0f,ARGB(255,10,10,10));
//white thin line to simulate card edge //white thin line to simulate card edge
renderer->DrawRoundRect(x-92,pos.actY-128, (scale * quad->mWidth)-10, (scale * quad->mHeight)-11, 9.0f,ARGB(50,240,240,240)); renderer->DrawRoundRect(x-92,pos.actY-130, (scale * quad->mWidth)-10, (scale * quad->mHeight)-11, 9.0f,ARGB(50,240,240,240));
} }
//render card image //render card image
renderer->RenderQuad(quad.get(), x, pos.actY, pos.actT, scale-0.02f, scale-0.02f); renderer->RenderQuad(quad.get(), x, pos.actY-2, pos.actT, scale-0.02f, scale-0.02f);
} }
else else
renderer->RenderQuad(quad.get(), x, pos.actY, pos.actT, scale, scale); renderer->RenderQuad(quad.get(), x, pos.actY, pos.actT, scale, scale);
projects/mtg/src/GuiCombat.cpp
+2
View File
@@ -483,6 +483,8 @@ void GuiCombat::Render()
} }
else else
{ {
observer->opponent()->getIcon()->mHeight = 50.f;
observer->opponent()->getIcon()->mWidth = 35.f;
observer->opponent()->getIcon()->SetHotSpot(18, 25); observer->opponent()->getIcon()->SetHotSpot(18, 25);
enemy_avatar.Render(observer->opponent()->getIcon().get()); enemy_avatar.Render(observer->opponent()->getIcon().get());
} }
projects/mtg/src/GuiPhaseBar.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
}; };
*/ */
const float GuiPhaseBar::zoom_big = (float)(1.5 * 1.2); const float GuiPhaseBar::zoom_big = (float)(1.5 * 1.25);
const float GuiPhaseBar::zoom_small = 1.5; const float GuiPhaseBar::zoom_small = 1.5;
const float GuiPhaseBar::step = M_PI/6.0f; const float GuiPhaseBar::step = M_PI/6.0f;
projects/mtg/src/GuiPlay.cpp
+2 -1
View File
@@ -162,7 +162,8 @@ void GuiPlay::BattleField::Render()
if (height > 3) if (height > 3)
{ {
JRenderer::GetInstance()->FillRect(0, SCREEN_HEIGHT / 2 + 8.5f - height / 2, 480, height, ARGB(127, red, 0, 0)); JRenderer::GetInstance()->FillRect(0, SCREEN_HEIGHT / 2 + 8.5f - height / 2, 480, height, ARGB(127, red, 0, 0));
JRenderer::GetInstance()->DrawRect(0, SCREEN_HEIGHT / 2 + 8.5f - height / 2, 480, height, ARGB(255, 255, 165, 0)); if(red > 1)
JRenderer::GetInstance()->DrawRect(-2, SCREEN_HEIGHT / 2 + 8.5f - height / 2, 484, height, ARGB(255, 255, 165, 0));
} }
} }