The-Homebrew-Cloud/dosbox-wii
2
0
Fork 0
mirror of https://github.com/retro100/dosbox-wii.git synced 2024-11-16 15:19:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
dborth 2010-07-07 07:05:10 +00:00
parent 9063cfecf2
commit 5c16da723c
1 changed files with 48 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/platform/wii/FreeTypeGX.cpp
View File

@ -72,7 +72,7 @@ void ClearFontData()
wchar_t* charToWideChar(const char* strChar) wchar_t* charToWideChar(const char* strChar)
{ {
wchar_t *strWChar = new(std::nothrow) wchar_t[strlen(strChar) + 1]; wchar_t *strWChar = new wchar_t[strlen(strChar) + 1];
if(!strWChar) if(!strWChar)
return NULL; return NULL;
@ -82,53 +82,13 @@ wchar_t* charToWideChar(const char* strChar)
strWChar[bt] = (wchar_t)'\0'; strWChar[bt] = (wchar_t)'\0';
return strWChar; return strWChar;
} }
wchar_t *tempDest = strWChar; wchar_t *tempDest = strWChar;
while((*tempDest++ = *strChar++)); while((*tempDest++ = *strChar++));
return strWChar; return strWChar;
} }
static uint32_t* convertBufferToRGBA8(uint32_t* rgbaBuffer, uint16_t bufferWidth, uint16_t bufferHeight) {
uint32_t bufferSize = (bufferWidth * bufferHeight) << 2;
uint32_t* dataBufferRGBA8 = (uint32_t *)memalign(32, bufferSize);
memset(dataBufferRGBA8, 0x00, bufferSize);
uint8_t *src = (uint8_t *)rgbaBuffer;
uint8_t *dst = (uint8_t *)dataBufferRGBA8;
for(uint32_t block = 0; block < bufferHeight; block += 4) {
for(uint32_t i = 0; i < bufferWidth; i += 4) {
for (uint32_t c = 0; c < 4; c++) {
uint32_t blockWid = (((block + c) * bufferWidth)+i)<<2 ;
*dst++ = src[blockWid+ 3]; // ar = 0
*dst++ = src[blockWid+ 0];
*dst++ = src[blockWid+ 7]; // ar = 1
*dst++ = src[blockWid+ 4];
*dst++ = src[blockWid+ 11]; // ar = 2
*dst++ = src[blockWid+ 8];
*dst++ = src[blockWid+ 15]; // ar = 3
*dst++ = src[blockWid+ 12];
}
for (uint32_t c = 0; c < 4; c++) {
uint32_t blockWid = (((block + c) * bufferWidth)+i)<<2 ;
*dst++ = src[blockWid+ 1]; // gb = 0
*dst++ = src[blockWid+ 2];
*dst++ = src[blockWid+ 5]; // gb = 1
*dst++ = src[blockWid+ 6];
*dst++ = src[blockWid+ 9]; // gb = 2
*dst++ = src[blockWid+ 10];
*dst++ = src[blockWid+ 13]; // gb = 3
*dst++ = src[blockWid+ 14];
}
}
}
DCFlushRange(dataBufferRGBA8, bufferSize);
return dataBufferRGBA8;
}
/** /**
* Default constructor for the FreeTypeGX class. * Default constructor for the FreeTypeGX class.
* *
@ -274,10 +234,10 @@ ftgxCharData *FreeTypeGX::cacheGlyphData(wchar_t charCode)
uint16_t textureWidth = 0, textureHeight = 0; uint16_t textureWidth = 0, textureHeight = 0;
gIndex = FT_Get_Char_Index( ftFace, charCode ); gIndex = FT_Get_Char_Index( ftFace, charCode );
if (!FT_Load_Glyph(ftFace, gIndex, FT_LOAD_DEFAULT )) { if (!FT_Load_Glyph(ftFace, gIndex, FT_LOAD_DEFAULT | FT_LOAD_RENDER ))
FT_Render_Glyph( ftSlot, FT_RENDER_MODE_NORMAL ); {
if(ftSlot->format == FT_GLYPH_FORMAT_BITMAP)
if(ftSlot->format == FT_GLYPH_FORMAT_BITMAP) { {
FT_Bitmap *glyphBitmap = &ftSlot->bitmap; FT_Bitmap *glyphBitmap = &ftSlot->bitmap;
textureWidth = adjustTextureWidth(glyphBitmap->width); textureWidth = adjustTextureWidth(glyphBitmap->width);
@ -330,24 +290,36 @@ uint16_t FreeTypeGX::cacheGlyphDataComplete()
* *
* @param bmp A pointer to the most recently rendered glyph's bitmap. * @param bmp A pointer to the most recently rendered glyph's bitmap.
* @param charData A pointer to an allocated ftgxCharData structure whose data represent that of the last rendered glyph. * @param charData A pointer to an allocated ftgxCharData structure whose data represent that of the last rendered glyph.
*
* Optimized for RGBA8 use by Dimok.
*/ */
void FreeTypeGX::loadGlyphData(FT_Bitmap *bmp, ftgxCharData *charData) void FreeTypeGX::loadGlyphData(FT_Bitmap *bmp, ftgxCharData *charData)
{ {
uint32_t *glyphData = (uint32_t *)memalign(32, charData->textureWidth * charData->textureHeight * 4); int length = charData->textureWidth * charData->textureHeight * 4;
memset(glyphData, 0x00, charData->textureWidth * charData->textureHeight * 4);
uint32_t bmprows = bmp->rows; uint8_t * glyphData = (uint8_t *) memalign(32, length);
uint32_t bmpwid = bmp->width; if(!glyphData)
for (uint32_t imagePosY = 0; imagePosY < bmprows; imagePosY++) return;
memset(glyphData, 0x00, length);
uint8_t *src = (uint8_t *)bmp->buffer;
uint32_t offset;
for (int imagePosY = 0; imagePosY < bmp->rows; ++imagePosY)
{ {
for (uint32_t imagePosX = 0; imagePosX < bmpwid; imagePosX++) for (int imagePosX = 0; imagePosX < bmp->width; ++imagePosX)
{ {
uint32_t pixel = (uint32_t) bmp->buffer[imagePosY * bmpwid + imagePosX]; offset = ((((imagePosY >> 2) * (charData->textureWidth >> 2) + (imagePosX >> 2)) << 5) + ((imagePosY & 3) << 2) + (imagePosX & 3)) << 1;
glyphData[imagePosY * charData->textureWidth + imagePosX] = 0x00000000 | (pixel << 24) | (pixel << 16) | (pixel << 8) | pixel; glyphData[offset] = *src;
glyphData[offset+1] = *src;
glyphData[offset+32] = *src;
glyphData[offset+33] = *src;
++src;
} }
} }
charData->glyphDataTexture = convertBufferToRGBA8(glyphData, charData->textureWidth, charData->textureHeight); DCFlushRange(glyphData, length);
free(glyphData); charData->glyphDataTexture = (uint32_t *) glyphData;
} }
/** /**
@ -421,7 +393,6 @@ int16_t FreeTypeGX::getStyleOffsetHeight(ftgxDataOffset *offset, uint16_t format
*/ */
uint16_t FreeTypeGX::drawText(int16_t x, int16_t y, wchar_t *text, GXColor color, uint16_t textStyle) uint16_t FreeTypeGX::drawText(int16_t x, int16_t y, wchar_t *text, GXColor color, uint16_t textStyle)
{ {
uint32_t strLength = wcslen(text);
uint16_t x_pos = x, printed = 0; uint16_t x_pos = x, printed = 0;
uint16_t x_offset = 0, y_offset = 0; uint16_t x_offset = 0, y_offset = 0;
GXTexObj glyphTexture; GXTexObj glyphTexture;
@ -438,12 +409,11 @@ uint16_t FreeTypeGX::drawText(int16_t x, int16_t y, wchar_t *text, GXColor color
y_offset = this->getStyleOffsetHeight(&offset, textStyle); y_offset = this->getStyleOffsetHeight(&offset, textStyle);
} }
std::map<wchar_t, ftgxCharData>::iterator thisEnd =this->fontData.end(); int i = 0;
while (text[i])
for (uint32_t i = 0; i < strLength; ++i)
{ {
ftgxCharData* glyphData = NULL; ftgxCharData* glyphData = NULL;
if( this->fontData.find(text[i]) != thisEnd) if (this->fontData.find(text[i]) != this->fontData.end())
{ {
glyphData = &this->fontData[text[i]]; glyphData = &this->fontData[text[i]];
} }
@ -466,6 +436,7 @@ uint16_t FreeTypeGX::drawText(int16_t x, int16_t y, wchar_t *text, GXColor color
x_pos += glyphData->glyphAdvanceX; x_pos += glyphData->glyphAdvanceX;
++printed; ++printed;
} }
++i;
} }
if(textStyle & FTGX_STYLE_MASK) if(textStyle & FTGX_STYLE_MASK)
@ -507,16 +478,14 @@ void FreeTypeGX::drawTextFeature(int16_t x, int16_t y, uint16_t width, ftgxDataO
*/ */
uint16_t FreeTypeGX::getWidth(wchar_t *text) uint16_t FreeTypeGX::getWidth(wchar_t *text)
{ {
FT_Vector pairDelta;
uint32_t strLength = wcslen(text);
uint16_t strWidth = 0; uint16_t strWidth = 0;
FT_Vector pairDelta;
std::map<wchar_t, ftgxCharData>::iterator thisEnd =this->fontData.end(); int i = 0;
while (text[i])
for (uint32_t i = 0; i < strLength; ++i)
{ {
ftgxCharData* glyphData = NULL; ftgxCharData* glyphData = NULL;
if(this->fontData.find(text[i]) != thisEnd) if (this->fontData.find(text[i]) != this->fontData.end())
{ {
glyphData = &this->fontData[text[i]]; glyphData = &this->fontData[text[i]];
} }
@ -532,8 +501,10 @@ uint16_t FreeTypeGX::getWidth(wchar_t *text)
FT_Get_Kerning(ftFace, this->fontData[text[i - 1]].glyphIndex, glyphData->glyphIndex, FT_KERNING_DEFAULT, &pairDelta); FT_Get_Kerning(ftFace, this->fontData[text[i - 1]].glyphIndex, glyphData->glyphIndex, FT_KERNING_DEFAULT, &pairDelta);
strWidth += pairDelta.x >> 6; strWidth += pairDelta.x >> 6;
} }
strWidth += glyphData->glyphAdvanceX; strWidth += glyphData->glyphAdvanceX;
} }
++i;
} }
return strWidth; return strWidth;
} }
@ -584,15 +555,13 @@ uint16_t FreeTypeGX::getHeight(wchar_t const *text)
*/ */
void FreeTypeGX::getOffset(wchar_t *text, ftgxDataOffset* offset) void FreeTypeGX::getOffset(wchar_t *text, ftgxDataOffset* offset)
{ {
uint32_t strLength = wcslen(text);
int16_t strMax = 0, strMin = 9999; int16_t strMax = 0, strMin = 9999;
std::map<wchar_t, ftgxCharData>::iterator thisEnd =this->fontData.end(); int i = 0;
while (text[i])
for (uint32_t i = 0; i < strLength; ++i)
{ {
ftgxCharData* glyphData = NULL; ftgxCharData* glyphData = NULL;
if( this->fontData.find(text[i]) != thisEnd) if (this->fontData.find(text[i]) != this->fontData.end())
{ {
glyphData = &this->fontData[text[i]]; glyphData = &this->fontData[text[i]];
} }
@ -606,6 +575,7 @@ void FreeTypeGX::getOffset(wchar_t *text, ftgxDataOffset* offset)
strMax = glyphData->renderOffsetMax > strMax ? glyphData->renderOffsetMax : strMax; strMax = glyphData->renderOffsetMax > strMax ? glyphData->renderOffsetMax : strMax;
strMin = glyphData->renderOffsetMin < strMin ? glyphData->renderOffsetMin : strMin; strMin = glyphData->renderOffsetMin < strMin ? glyphData->renderOffsetMin : strMin;
} }
++i;
} }
offset->ascender = ftFace->size->metrics.ascender>>6; offset->ascender = ftFace->size->metrics.ascender>>6;
offset->descender = ftFace->size->metrics.descender>>6; offset->descender = ftFace->size->metrics.descender>>6;