aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-10 01:09:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged in nimetu/ryzomcore (pull request #126)

Browse source 
add bold, italic, underline, strikethrough font styles
This commit is contained in:
Jan Boon 2015-04-01 06:20:41 +02:00
commit dd4c90785e
1 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
code/nel/tools/3d/tga_2_dds/tga2dds.cpp
View file

@ -359,6 +359,27 @@ void dividSize (CBitmap &bitmap)
} }
} }
const int bayerDiv8R[4][4] = {
7, 3, 6, 2,
1, 5, 0, 4,
6, 2, 7, 3,
0, 4, 1, 5,
};
const int bayerDiv8G[4][4] = {
0, 4, 1, 5,
6, 2, 7, 3,
1, 5, 0, 4,
7, 3, 6, 2,
};
const int bayerDiv8B[4][4] = {
5, 1, 4, 0,
3, 7, 2, 6,
4, 0, 5, 1,
2, 6, 3, 7,
};
// *************************************************************************** // ***************************************************************************
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
@ -601,6 +622,26 @@ int main(int argc, char **argv)
Reduce--; Reduce--;
} }
if (algo == TGA16)
{
// Apply bayer dither
CObjectVector<uint8> &rgba = picSrc.getPixels(0);
const uint32 w = picSrc.getWidth(0);
uint32 x = 0;
uint32 y = 0;
for (uint32 i = 0; i < rgba.size(); i += 4)
{
NLMISC::CRGBA &c = reinterpret_cast<NLMISC::CRGBA &>(rgba[i]);
c.R = (uint8)std::min(255, (int)c.R + bayerDiv8R[x % 4][y % 4]);
c.G = (uint8)std::min(255, (int)c.G + bayerDiv8G[x % 4][y % 4]);
c.B = (uint8)std::min(255, (int)c.B + bayerDiv8B[x % 4][y % 4]);
++x;
x %= w;
if (x == 0)
++y;
}
}
// 8 or 16 bits TGA or PNG ? // 8 or 16 bits TGA or PNG ?
if ((algo == TGA16) || (algo == TGA8) || (algo == PNG16) || (algo == PNG8)) if ((algo == TGA16) || (algo == TGA8) || (algo == PNG16) || (algo == PNG8))
{ {