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

1st step in refactoring some of the card rendering logic - currently, each 'client' has duplicated code having to deal with how to render the full card graphic vs text mode vs using a 'back' image if a card isn't found. This is a first pass at consolidating some of that logic to one location - the ultimate goal being, eventually, the resource cache will actually own the notion of whether it's handing out a real card image or a default filler if the card isn't available, and the client code rendering the card should be oblivious.

Browse Source 
In this change, I made the CardGui's RenderBig() and AlternateRender() functions protected; anyone wanting to render a card simply calls RenderCard(), and the card drawing mode is passed along as a param.
This commit is contained in:
wrenczes@gmail.com
2010-11-14 08:15:26 +00:00
parent e758c7eea1
commit 27fd107208
9 changed files with 125 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
projects/mtg/src/GameStateDeckViewer.cpp
View File

@@ -1301,10 +1301,12 @@ void GameStateDeckViewer::renderCard(int id, float rotation){
int cacheError = CACHE_ERROR_NONE;
if(!options[Options::DISABLECARDS].number){
if(!options[Options::DISABLECARDS].number)
{
quad = resources.RetrieveCard(card,RETRIEVE_EXISTING);
cacheError = resources.RetrieveError();
if (!quad && cacheError != CACHE_ERROR_404){
if (!quad && cacheError != CACHE_ERROR_404)
{
if(last_user_activity > (abs(2-id) + 1)* NO_USER_ACTIVITY_SHOWCARD_DELAY)
quad = resources.RetrieveCard(card);
else{
@@ -1315,31 +1317,40 @@ void GameStateDeckViewer::renderCard(int id, float rotation){
int quadAlpha = alpha;
if ( !displayed_deck->count(card)) quadAlpha /=2;
if (quad){
if (quad == backQuad) {
if (quad)
{
if (quad == backQuad)
{
quad->SetColor(ARGB(255,255,255,255));
float _scale = scale *(285 / quad->mHeight);
JRenderer::GetInstance()->RenderQuad(quad, x , y , 0.0f,_scale,_scale);
} else {
Pos pos = Pos(x, y, scale* 285/250, 0.0, 255);
CardGui::RenderBig(card, pos);
JRenderer::GetInstance()->RenderQuad(quad, x, y, 0.0f, _scale, _scale);
}
}else{
else
{
Pos pos = Pos(x, y, scale* 285/250, 0.0, 255);
CardGui::DrawCard(card, pos);
}
}
else
{
Pos pos = Pos(x, y, scale* 285/250, 0.0, 255);
CardGui::alternateRender(card, pos);
CardGui::DrawCard(card, pos, DrawMode::kText);
if(!options[Options::DISABLECARDS].number)
quad = resources.RetrieveCard(card,CACHE_THUMB);
if (quad){
if (quad)
{
float _scale = 285 * scale / quad->mHeight;
quad->SetColor(ARGB(40,255,255,255));
JRenderer::GetInstance()->RenderQuad(quad,x,y,0,_scale,_scale);
JRenderer::GetInstance()->RenderQuad(quad, x, y, 0, _scale, _scale);
}
}
quadAlpha = 255 - quadAlpha;
if (quadAlpha > 0){
if (quadAlpha > 0)
{
JRenderer::GetInstance()->FillRect(x - scale * 100.0f ,y - scale * 142.5f , scale * 200.0f, scale * 285.0f, ARGB(quadAlpha,0,0,0));
}
if (last_user_activity < 3){
if (last_user_activity < 3)
{
int fontAlpha = alpha;
float qtY = y -135*scale;
float qtX = x + 40*scale;