Erwan
- Added extra rendering for "text" mode
This commit is contained in:
@@ -54,7 +54,7 @@ void StackAbility::Render(){
|
||||
float scale = 30 / quad->mHeight;
|
||||
renderer->RenderQuad(quad, x , y , 0,scale,scale);
|
||||
}else{
|
||||
//TODO
|
||||
mFont->DrawString(ability->source->getName(),x,y-15);
|
||||
}
|
||||
}
|
||||
StackAbility::StackAbility(int id,MTGAbility * _ability): Interruptible(id),ability(_ability){
|
||||
@@ -105,9 +105,7 @@ void Spell::Render(){
|
||||
JLBFont * mFont = GameApp::CommonRes->GetJLBFont(Constants::MAIN_FONT);
|
||||
mFont->SetBase(0);
|
||||
mFont->SetScale(DEFAULT_MAIN_FONT_SCALE);
|
||||
char buffer[200];
|
||||
sprintf(buffer, "%s", source->getName());
|
||||
mFont->DrawString(buffer, x + 20 , y, JGETEXT_LEFT);
|
||||
mFont->DrawString(source->getName(), x + 25 , y, JGETEXT_LEFT);
|
||||
JRenderer * renderer = JRenderer::GetInstance();
|
||||
JQuad * quad = source->getThumb();
|
||||
if (quad){
|
||||
@@ -115,7 +113,7 @@ void Spell::Render(){
|
||||
float scale = mHeight / quad->mHeight;
|
||||
renderer->RenderQuad(quad, x , y , 0,scale,scale);
|
||||
}else{
|
||||
//TODO
|
||||
//
|
||||
}
|
||||
Damageable * target = getNextDamageableTarget();
|
||||
if (target){
|
||||
@@ -124,6 +122,9 @@ void Spell::Render(){
|
||||
quad->SetColor(ARGB(255,255,255,255));
|
||||
float scale = 30 / quad->mHeight;
|
||||
renderer->RenderQuad(quad, x + 150 , y , 0,scale,scale);
|
||||
}else{
|
||||
if (target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
|
||||
mFont->DrawString(((MTGCardInstance *)target)->getName(),x+120,y);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -163,7 +164,7 @@ void PutInGraveyard::Render(){
|
||||
float scale = 30 / quad->mHeight;
|
||||
renderer->RenderQuad(quad, x , y , 0,scale,scale);
|
||||
}else{
|
||||
//TODO
|
||||
mFont->DrawString(card->getName(),x,y-15);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -294,14 +294,17 @@ void CardGui::Render(){
|
||||
myW = quad->mWidth * mScale;
|
||||
myX = x + (quad->mHeight/2 * tap * mScale);
|
||||
myY = y+(quad->mWidth/2 * tap * mScale);
|
||||
if (mHeight-defaultHeight){
|
||||
if (card->isTapped()){
|
||||
renderer->FillRect(myX + 1*(mHeight-defaultHeight) - quad->mHeight * mScale , myY + 1*(mHeight-defaultHeight) , quad->mHeight * mScale, quad->mWidth * mScale, ARGB(128,0,0,0));
|
||||
}else{
|
||||
renderer->FillRect(myX + 1*(mHeight-defaultHeight) , myY + 1*(mHeight-defaultHeight) , quad->mWidth * mScale, quad->mHeight * mScale, ARGB(128,0,0,0));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (mHeight-defaultHeight){
|
||||
if (card->isTapped()){
|
||||
renderer->FillRect(myX + 1*(mHeight-defaultHeight) - myH , myY + 1*(mHeight-defaultHeight) , myH, myW, ARGB(128,0,0,0));
|
||||
}else{
|
||||
renderer->FillRect(myX + 1*(mHeight-defaultHeight) , myY + 1*(mHeight-defaultHeight) , myW, myH, ARGB(128,0,0,0));
|
||||
}
|
||||
}
|
||||
|
||||
if(quad){
|
||||
quad->SetColor(ARGB( alpha,255,255,255));
|
||||
|
||||
if (tc){
|
||||
@@ -342,7 +345,7 @@ void CardGui::Render(){
|
||||
if (mIcon) renderer->RenderQuad(mIcon,myX - myH/2, myY + myW/2,M_PI_2,mScale,mScale);
|
||||
if (tc){
|
||||
if (!tc->canTarget(card)){
|
||||
renderer->DrawRect(myX - myH , myY , myH, myW, ARGB(128,0,0,0));
|
||||
renderer->FillRect(myX - myH , myY , myH, myW, ARGB(200,0,0,0));
|
||||
}
|
||||
}
|
||||
}else{
|
||||
@@ -353,7 +356,7 @@ void CardGui::Render(){
|
||||
if (mIcon) renderer->RenderQuad(mIcon,myX + myW/2, myY + myH/2,0,mScale, mScale);
|
||||
if (tc){
|
||||
if (!tc->canTarget(card)){
|
||||
renderer->DrawRect(myX , myY , myW, myH, ARGB(128,0,0,0));
|
||||
renderer->FillRect(myX , myY , myW, myH, ARGB(200,0,0,0));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,14 +60,15 @@ void Damage::Render(){
|
||||
float scale = 30 / quad->mHeight;
|
||||
renderer->RenderQuad(quad, x , y , 0,scale,scale);
|
||||
}else{
|
||||
//TODO
|
||||
mFont->DrawString(source->getName(),x,y-15);
|
||||
}
|
||||
quad = target->getIcon();
|
||||
if (quad){
|
||||
float scale = 30 / quad->mHeight;
|
||||
renderer->RenderQuad(quad, x + 150 , y , 0,scale,scale);
|
||||
}else{
|
||||
//TODO
|
||||
if (target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
|
||||
mFont->DrawString(((MTGCardInstance *)target)->getName(),x+120,y);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user