games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

* [battles] displaying fighting creatures

Browse Source 
* faster blitting of animated unit
This commit is contained in:
mateuszb
2008-03-08 15:23:04 +00:00
parent 23a7b708d8
commit 0379fbfc1d
3 changed files with 169 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
CBattleInterface.cpp
View File

@@ -167,8 +167,106 @@ void CBattleInterface::show(SDL_Surface * to)
defendingHero->show(to); defendingHero->show(to);
//showing units //a lot of work... //showing units //a lot of work...
switch(creAnim1.size()) //for attacker
creAnim1[0]->nextFrame(to, -94, -139); {
case 0:
break;
case 1:
creAnim1[0]->nextFrame(to, -116, 71, true); //6
break;
case 2:
creAnim1[0]->nextFrame(to, -94, -55, true); //3
creAnim1[1]->nextFrame(to, -94, 197, true); //9
break;
case 3:
creAnim1[0]->nextFrame(to, -94, -55, true); //3
creAnim1[1]->nextFrame(to, -116, 71, true); //6
creAnim1[2]->nextFrame(to, -94, 197, true); //9
break;
case 4:
creAnim1[0]->nextFrame(to, -94, -139, true); //1
creAnim1[1]->nextFrame(to, -94, 29, true); //5
creAnim1[2]->nextFrame(to, -94, 113, true); //7
creAnim1[3]->nextFrame(to, -94, 281, true); //11
break;
case 5:
creAnim1[0]->nextFrame(to, -94, -139, true); //1
creAnim1[1]->nextFrame(to, -94, -55, true); //3
creAnim1[2]->nextFrame(to, -116, 71, true); //6
creAnim1[3]->nextFrame(to, -94, 197, true); //9
creAnim1[4]->nextFrame(to, -94, 281, true); //11
break;
case 6:
creAnim1[0]->nextFrame(to, -94, -139, true); //1
creAnim1[1]->nextFrame(to, -94, -55, true); //3
creAnim1[2]->nextFrame(to, -94, 29, true); //5
creAnim1[3]->nextFrame(to, -94, 113, true); //7
creAnim1[4]->nextFrame(to, -94, 197, true); //9
creAnim1[5]->nextFrame(to, -94, 281, true); //11
break;
case 7:
creAnim1[0]->nextFrame(to, -94, -139, true); //1
creAnim1[1]->nextFrame(to, -94, -55, true); //3
creAnim1[2]->nextFrame(to, -94, 29, true); //5
creAnim1[3]->nextFrame(to, -116, 71, true); //6
creAnim1[4]->nextFrame(to, -94, 113, true); //7
creAnim1[5]->nextFrame(to, -94, 197, true); //9
creAnim1[6]->nextFrame(to, -94, 281, true); //11
break;
default: //fault
break;
//creAnim1[0]->nextFrame(to, -94, -139);
}
switch(creAnim2.size()) //for defender
{
case 0:
break;
case 1:
creAnim2[0]->nextFrame(to, 441, 71, false); //6
break;
case 2:
creAnim2[0]->nextFrame(to, 463, -55, false); //3
creAnim2[1]->nextFrame(to, 463, 197, false); //9
break;
case 3:
creAnim2[0]->nextFrame(to, 463, -55, false); //3
creAnim2[1]->nextFrame(to, 441, 71, false); //6
creAnim2[2]->nextFrame(to, 463, 197, false); //9
break;
case 4:
creAnim2[0]->nextFrame(to, 463, -139, false); //1
creAnim2[1]->nextFrame(to, 463, 29, false); //5
creAnim2[2]->nextFrame(to, 463, 113, false); //7
creAnim2[3]->nextFrame(to, 463, 281, false); //11
break;
case 5:
creAnim2[0]->nextFrame(to, 463, -139, false); //1
creAnim2[1]->nextFrame(to, 463, -55, false); //3
creAnim2[2]->nextFrame(to, 441, 71, false); //6
creAnim2[3]->nextFrame(to, 463, 197, false); //9
creAnim2[4]->nextFrame(to, 463, 281, false); //11
break;
case 6:
creAnim2[0]->nextFrame(to, 463, -139, false); //1
creAnim2[1]->nextFrame(to, 463, -55, false); //3
creAnim2[2]->nextFrame(to, 463, 29, false); //5
creAnim2[3]->nextFrame(to, 463, 113, false); //7
creAnim2[4]->nextFrame(to, 463, 197, false); //9
creAnim2[5]->nextFrame(to, 463, 281, false); //11
break;
case 7:
creAnim2[0]->nextFrame(to, 463, -139, false); //1
creAnim2[1]->nextFrame(to, 463, -55, false); //3
creAnim2[2]->nextFrame(to, 463, 29, false); //5
creAnim2[3]->nextFrame(to, 441, 71, false); //6
creAnim2[4]->nextFrame(to, 463, 113, false); //7
creAnim2[5]->nextFrame(to, 463, 197, false); //9
creAnim2[6]->nextFrame(to, 463, 281, false); //11
break;
default: //fault
break;
//creAnim2[0]->nextFrame(to, 463, -139);
}
//units shown //units shown

113
hch/CCreatureHandler.cpp
View File

@@ -7,6 +7,7 @@
#include <boost/assign/std/vector.hpp> #include <boost/assign/std/vector.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/replace.hpp> #include <boost/algorithm/string/replace.hpp>
#include "SDL_Extensions.h"
int CCreature::getQuantityID(int quantity) int CCreature::getQuantityID(int quantity)
{ {
@@ -742,12 +743,13 @@ int CCreatureAnimation::readNormalNr (int pos, int bytCon, unsigned char * str,
return ret; return ret;
} }
int CCreatureAnimation::nextFrame(SDL_Surface *dest, int x, int y) int CCreatureAnimation::nextFrame(SDL_Surface *dest, int x, int y, bool attacker)
{ {
if(dest->format->BytesPerPixel<3) if(dest->format->BytesPerPixel<3)
return -1; //not enough depth return -1; //not enough depth
int SIndex = curFrame++; //TODO: finish //increasing frame numer
int SIndex = curFrame++;
if(type!=-1) if(type!=-1)
{ {
if(SEntries[curFrame].group!=type) //rewind if(SEntries[curFrame].group!=type) //rewind
@@ -770,6 +772,7 @@ int CCreatureAnimation::nextFrame(SDL_Surface *dest, int x, int y)
if(curFrame>=frames) if(curFrame>=frames)
curFrame = 0; curFrame = 0;
} }
//frame number increased
long BaseOffset, long BaseOffset,
SpriteWidth, SpriteHeight, //format sprite'a SpriteWidth, SpriteHeight, //format sprite'a
@@ -777,7 +780,7 @@ int CCreatureAnimation::nextFrame(SDL_Surface *dest, int x, int y)
i, add, FullHeight,FullWidth, i, add, FullHeight,FullWidth,
TotalRowLength, // dlugosc przeczytanego segmentu TotalRowLength, // dlugosc przeczytanego segmentu
NextSpriteOffset, RowAdd; NextSpriteOffset, RowAdd;
unsigned char SegmentType, SegmentLength, BL, BR; unsigned char SegmentType, SegmentLength;
std::string FTemp; std::string FTemp;
@@ -797,16 +800,27 @@ int CCreatureAnimation::nextFrame(SDL_Surface *dest, int x, int y)
int BaseOffsetor = BaseOffset = i; int BaseOffsetor = BaseOffset = i;
int ftcp = 0;
SDL_Surface * hlps = SDL_CreateRGBSurface(dest->flags, FullWidth+add, FullHeight, 8, 0, 0, 0, 0);
for(int b=0; b<256; ++b)
{
hlps->format->palette->ncolors = 256;
hlps->format->palette->colors[b].r = palette[b].R;
hlps->format->palette->colors[b].g = palette[b].G;
hlps->format->palette->colors[b].b = palette[b].B;
hlps->format->palette->colors[b].unused = palette[b].F;
}
if (defType2==1) //as it should be allways in creature animations if (defType2==1) //as it should be allways in creature animations
{ {
if (add==4)
add=0; ////////was 3
if (TopMargin>0) if (TopMargin>0)
{ {
for (int i=0;i<TopMargin;i++) for (int i=0;i<TopMargin;i++)
{ {
for (int j=0;j<FullWidth+add;j++) for (int j=0;j<FullWidth+add;j++)
FTemp+='\0'; ftcp++;
} }
} }
RLEntries = new int[SpriteHeight]; RLEntries = new int[SpriteHeight];
@@ -820,7 +834,7 @@ int CCreatureAnimation::nextFrame(SDL_Surface *dest, int x, int y)
if (LeftMargin>0) if (LeftMargin>0)
{ {
for (int j=0;j<LeftMargin;j++) for (int j=0;j<LeftMargin;j++)
FTemp+='\0'; ftcp++;
} }
TotalRowLength=0; TotalRowLength=0;
do do
@@ -831,7 +845,7 @@ int CCreatureAnimation::nextFrame(SDL_Surface *dest, int x, int y)
{ {
for (int k=0;k<=SegmentLength;k++) for (int k=0;k<=SegmentLength;k++)
{ {
FTemp+=FDef[BaseOffset+k]; ((char*)(hlps->pixels))[ftcp++]=FDef[BaseOffset+k];
if ((TotalRowLength+k+1)>=SpriteWidth) if ((TotalRowLength+k+1)>=SpriteWidth)
break; break;
} }
@@ -842,8 +856,7 @@ int CCreatureAnimation::nextFrame(SDL_Surface *dest, int x, int y)
{ {
for (int k=0;k<SegmentLength+1;k++) for (int k=0;k<SegmentLength+1;k++)
{ {
FTemp+=SegmentType;// ((char*)(hlps->pixels))[ftcp++]=SegmentType;
//FTemp+='\0';
} }
TotalRowLength+=SegmentLength+1; TotalRowLength+=SegmentLength+1;
} }
@@ -852,12 +865,12 @@ int CCreatureAnimation::nextFrame(SDL_Surface *dest, int x, int y)
if (RightMargin>0) if (RightMargin>0)
{ {
for (int j=0;j<RightMargin;j++) for (int j=0;j<RightMargin;j++)
FTemp+='\0'; ftcp++;
} }
if (add>0) if (add>0)
{ {
for (int j=0;j<add+RowAdd;j++) for (int j=0;j<add+RowAdd;j++)
FTemp+='\0'; ftcp++;
} }
} }
delete [] RLEntries; delete [] RLEntries;
@@ -867,45 +880,55 @@ int CCreatureAnimation::nextFrame(SDL_Surface *dest, int x, int y)
for (int i=0;i<BottomMargin;i++) for (int i=0;i<BottomMargin;i++)
{ {
for (int j=0;j<FullWidth+add;j++) for (int j=0;j<FullWidth+add;j++)
FTemp+='\0'; ftcp++;
} }
} }
} }
if(!attacker)
for (int i=0; i<FullHeight; ++i)
{ {
for (int j=0;j<FullWidth+add;j++) SDL_Surface * h2 = CSDL_Ext::rotate01(hlps);
{ SDL_FreeSurface(hlps);
if( i+y<dest->h && j+x<dest->w && i+y>=0 && j+x>=0) hlps = h2;
{
unsigned char coln = FTemp[i*(FullWidth+add)+j]; //number of color from palette
if(coln==0)
continue;
unsigned char* ptr = ((unsigned char*)dest->pixels + dest->format->BytesPerPixel * ((i + y)*dest->w + j + x));
if(coln>7 || coln == 5) //normal or yellow border
{
*ptr = palette[coln].B;
*(ptr+1) = palette[coln].G;
*(ptr+2) = palette[coln].R;
}
else if(coln<5) //shadow
{
*ptr = ((*ptr) * (palette[coln].G + 50)) /200;
*(ptr+1) = ((*(ptr+1)) * (palette[coln].G + 50)) /200 ;
*(ptr+2) = ((*(ptr+2)) * (palette[coln].G + 50)) /200 ;
}
else if(coln == 6) //yellow border shadowed
{
*ptr = ((*ptr) + palette[coln-1].B) / 2;
*(ptr+1) = ((*(ptr+1)) + palette[coln-1].G) / 2;
*(ptr+2) = ((*(ptr+2)) + palette[coln-1].R) / 2;
}
}
}
} }
CSDL_Ext::alphaTransform(hlps);
SDL_UpdateRect(dest, x, y, FullWidth+add, FullHeight); CSDL_Ext::blit8bppAlphaTo24bpp(hlps, NULL, dest, &genRect(hlps->h, hlps->w, x, y));
SDL_FreeSurface(hlps);
//for (int i=0; i<FullHeight; ++i)
//{
// for (int j=0;j<FullWidth+add;j++)
// {
// if( i+y<dest->h && j+x<dest->w && i+y>=0 && j+x>=0)
// {
// unsigned char coln = FTemp[i*(FullWidth+add)+j]; //number of color from palette
// if(coln==0)
// continue;
// unsigned char* ptr = ((unsigned char*)dest->pixels + dest->format->BytesPerPixel * ((i + y)*dest->w + j + x));
// if(coln>7 || coln == 5) //normal or yellow border
// {
// *ptr = palette[coln].B;
// *(ptr+1) = palette[coln].G;
// *(ptr+2) = palette[coln].R;
// }
// else if(coln<5) //shadow
// {
// *ptr = ((*ptr) * (palette[coln].G + 50)) /200;
// *(ptr+1) = ((*(ptr+1)) * (palette[coln].G + 50)) /200 ;
// *(ptr+2) = ((*(ptr+2)) * (palette[coln].G + 50)) /200 ;
// }
// else if(coln == 6) //yellow border shadowed
// {
// *ptr = ((*ptr) + palette[coln-1].B) / 2;
// *(ptr+1) = ((*(ptr+1)) + palette[coln-1].G) / 2;
// *(ptr+2) = ((*(ptr+2)) + palette[coln-1].R) / 2;
// }
// }
// }
//}
//SDL_UpdateRect(dest, x, y, FullWidth+add, FullHeight);
return 0; return 0;
} }

2
hch/CCreatureHandler.h
View File

@@ -96,7 +96,7 @@ public:
void setType(int type); //sets type of animation and cleares framecount void setType(int type); //sets type of animation and cleares framecount
int getType() const; //returns type of animation int getType() const; //returns type of animation
int nextFrame(SDL_Surface * dest, int x, int y); //0 - success, any other - error //print next int nextFrame(SDL_Surface * dest, int x, int y, bool attacker); //0 - success, any other - error //print next
}; };
#endif //CCREATUREHANDLER_H #endif //CCREATUREHANDLER_H