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

Removed outer border from rendered cards.

Browse Source
This commit is contained in:
valfieri
2019-10-24 17:53:43 +02:00
parent f44ad43413
commit ca7c8f5cf9
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/CardGui.h
+2 -2
View File
@@ -55,8 +55,8 @@ public:
virtual void Render(); virtual void Render();
virtual void Update(float dt); virtual void Update(float dt);
void DrawCard(const Pos& inPosition, int inMode = DrawMode::kNormal, bool thumb = false, bool noborder = false, bool gdv = false); void DrawCard(const Pos& inPosition, int inMode = DrawMode::kNormal, bool thumb = false, bool noborder = true, bool gdv = false);
static void DrawCard(MTGCard* inCard, const Pos& inPosition, int inMode = DrawMode::kNormal, bool thumb = false, bool noborder = false, bool gdv = false); static void DrawCard(MTGCard* inCard, const Pos& inPosition, int inMode = DrawMode::kNormal, bool thumb = false, bool noborder = true, bool gdv = false);
static JQuadPtr AlternateThumbQuad(MTGCard * card); static JQuadPtr AlternateThumbQuad(MTGCard * card);
virtual ostream& toString(ostream&) const; virtual ostream& toString(ostream&) const;
projects/mtg/src/CardGui.cpp
+3
View File
@@ -1293,6 +1293,8 @@ void CardGui::RenderBig(MTGCard* card, const Pos& pos, bool thumb, bool noborder
} }
}*///disabled this for universal border across game, deck editor, etc... }*///disabled this for universal border across game, deck editor, etc...
//universal border //universal border
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")
&& !options[Options::BLKBORDER].number) && !options[Options::BLKBORDER].number)
{//white border {//white border
@@ -1316,6 +1318,7 @@ void CardGui::RenderBig(MTGCard* card, const Pos& pos, bool thumb, bool noborder
renderer->RenderQuad(alphabeta.get(), x, pos.actY+0.2f, pos.actT, myscale, myscale); renderer->RenderQuad(alphabeta.get(), x, pos.actY+0.2f, pos.actT, myscale, myscale);
} }
} }
}
float modxscale = (cardsetname =="UNH")?0.015f:0.0f; float modxscale = (cardsetname =="UNH")?0.015f:0.0f;
float modyscale = (cardsetname =="UNH")?0.010f:0.0f; float modyscale = (cardsetname =="UNH")?0.010f:0.0f;
float gdvadd = gdv?0.008f:0.0f;//scale add grid deck view float gdvadd = gdv?0.008f:0.0f;//scale add grid deck view