Makefile.gc

@@ -43,7 +43,7 @@ LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map -Wl,--cref
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project
 #---------------------------------------------------------------------------------
-LIBS	:=	-lpngu -lpng -lmxml -lfreetypegx -lmetaphrasis -lfat -lz -logc -lfreetype
+LIBS	:=	-lpngu -lpng -lmxml -lmetaphrasis -lfat -lz -logc -lfreetype
 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing

Makefile.wii

@@ -43,7 +43,7 @@ LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project
 #---------------------------------------------------------------------------------
-LIBS	:=	-ldb -ldi -lpngu -lpng -lmxml -lfreetypegx -lmetaphrasis \
+LIBS	:=	-ldb -ldi -lpngu -lpng -lmxml -lmetaphrasis \
 			-lfat -lwiiuse -lz -lbte -logc -lasnd -ltremor -lfreetype -ltinysmb
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing

source/ngc/FreeTypeGX.cpp

@@ -0,0 +1,717 @@
+/*
+ * FreeTypeGX is a wrapper class for libFreeType which renders a compiled
+ * FreeType parsable font into a GX texture for Wii homebrew development.
+ * Copyright (C) 2008 Armin Tamzarian
+ * Modified by Tantric, 2009
+ *
+ * This file is part of FreeTypeGX.
+ *
+ * FreeTypeGX is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FreeTypeGX is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with FreeTypeGX.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "FreeTypeGX.h"
+
+/**
+ * Default constructor for the FreeTypeGX class.
+ *
+ * @param textureFormat	Optional format (GX_TF_*) of the texture as defined by the libogc gx.h header file. If not specified default value is GX_TF_RGBA8.
+ * @param vertexIndex	Optional vertex format index (GX_VTXFMT*) of the glyph textures as defined by the libogc gx.h header file. If not specified default value is GX_VTXFMT1.
+ */
+FreeTypeGX::FreeTypeGX(uint8_t textureFormat, uint8_t vertexIndex) {
+	FT_Init_FreeType(&this->ftLibrary);
+
+	this->textureFormat = textureFormat;
+	this->setVertexFormat(vertexIndex);
+	this->setCompatibilityMode(FTGX_COMPATIBILITY_NONE);
+}
+
+/**
+ * Default destructor for the FreeTypeGX class.
+ */
+FreeTypeGX::~FreeTypeGX() {
+	this->unloadFont();
+}
+
+/**
+ * Convert a short char sctring to a wide char string.
+ *
+ * This routine converts a supplied shot character string into a wide character string.
+ * Note that it is the user's responsibility to clear the returned buffer once it is no longer needed.
+ *
+ * @param strChar	Character string to be converted.
+ * @return Wide character representation of supplied character string.
+ */
+wchar_t* FreeTypeGX::charToWideChar(char* strChar) {
+      wchar_t *strWChar;
+      strWChar = new wchar_t[strlen(strChar) + 1];
+
+      char *tempSrc = strChar;
+      wchar_t *tempDest = strWChar;
+      while((*tempDest++ = *tempSrc++));
+
+      return strWChar;
+}
+
+/**
+ *
+ * \overload
+ */
+wchar_t* FreeTypeGX::charToWideChar(const char* strChar) {
+      return FreeTypeGX::charToWideChar((char*) strChar);
+}
+
+/**
+ * Setup the vertex attribute formats for the glyph textures.
+ *
+ * This function sets up the vertex format for the glyph texture on the specified vertex format index.
+ * Note that this function should not need to be called except if the vertex formats are cleared or the specified
+ * vertex format index is modified.
+ *
+ * @param vertexIndex	Vertex format index (GX_VTXFMT*) of the glyph textures as defined by the libogc gx.h header file.
+*/
+void FreeTypeGX::setVertexFormat(uint8_t vertexIndex) {
+	this->vertexIndex = vertexIndex;
+
+	GX_SetVtxAttrFmt(this->vertexIndex, GX_VA_POS, GX_POS_XY, GX_S16, 0);
+	GX_SetVtxAttrFmt(this->vertexIndex, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
+	GX_SetVtxAttrFmt(this->vertexIndex, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
+}
+
+/**
+ * Sets the TEV and VTX rendering compatibility requirements for the class.
+ *
+ * This sets up the default TEV opertion and VTX descriptions rendering values for the class. This ensures that FreeTypeGX
+ * can remain compatible with external liraries or project code. Certain external libraries or code by design or lack of
+ * foresight assume that the TEV opertion and VTX descriptions values will remain constant or are always returned to a
+ * certain value. This will enable compatibility with those libraries and any other code which cannot or will not be changed.
+ *
+ * @param compatibilityMode	Compatibility descritor (FTGX_COMPATIBILITY_*) as defined in FreeTypeGX.h
+*/
+void FreeTypeGX::setCompatibilityMode(uint32_t compatibilityMode) {
+	this->compatibilityMode = compatibilityMode;
+}
+
+/**
+ * Sets the TEV operation and VTX descriptor values after texture rendering it complete.
+ *
+ * This function calls the GX_SetTevOp and GX_SetVtxDesc functions with the compatibility parameters specified
+ * in setCompatibilityMode.
+ */
+void FreeTypeGX::setDefaultMode() {
+	if(this->compatibilityMode) {
+		switch(this->compatibilityMode & 0x00FF) {
+			case FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_MODULATE:
+				GX_SetTevOp(GX_TEVSTAGE0, GX_MODULATE);
+				break;
+			case FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_DECAL:
+				GX_SetTevOp(GX_TEVSTAGE0, GX_DECAL);
+				break;
+			case FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_BLEND:
+				GX_SetTevOp(GX_TEVSTAGE0, GX_BLEND);
+				break;
+			case FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_REPLACE:
+				GX_SetTevOp(GX_TEVSTAGE0, GX_REPLACE);
+				break;
+			case FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_PASSCLR:
+				GX_SetTevOp(GX_TEVSTAGE0, GX_PASSCLR);
+				break;
+			default:
+				break;
+		}
+
+		switch(this->compatibilityMode & 0xFF00) {
+			case FTGX_COMPATIBILITY_DEFAULT_VTXDESC_GX_NONE:
+				GX_SetVtxDesc(GX_VA_TEX0, GX_NONE);
+				break;
+			case FTGX_COMPATIBILITY_DEFAULT_VTXDESC_GX_DIRECT:
+				GX_SetVtxDesc(GX_VA_TEX0, GX_DIRECT);
+				break;
+			case FTGX_COMPATIBILITY_DEFAULT_VTXDESC_GX_INDEX8:
+				GX_SetVtxDesc(GX_VA_TEX0, GX_INDEX8);
+				break;
+			case FTGX_COMPATIBILITY_DEFAULT_VTXDESC_GX_INDEX16:
+				GX_SetVtxDesc(GX_VA_TEX0, GX_INDEX16);
+				break;
+			default:
+				break;
+		}
+	}
+}
+
+/**
+ * Loads and processes a specified true type font buffer to a specific point size.
+ *
+ * This routine takes a precompiled true type font buffer and loads the necessary processed data into memory. This routine should be called before drawText will succeed.
+ *
+ * @param fontBuffer	A pointer in memory to a precompiled true type font buffer.
+ * @param bufferSize	Size of the true type font buffer in bytes.
+ * @param pointSize	The desired point size this wrapper's configured font face.
+ * @param cacheAll	Optional flag to specify if all font characters should be cached when the class object is created. If specified as false the characters only become cached the first time they are used. If not specified default value is false.
+ */
+uint16_t FreeTypeGX::loadFont(uint8_t* fontBuffer, FT_Long bufferSize, FT_UInt pointSize, bool cacheAll) {
+	this->unloadFont();
+	this->ftPointSize = pointSize;
+
+	FT_New_Memory_Face(this->ftLibrary, (FT_Byte *)fontBuffer, bufferSize, 0, &this->ftFace);
+
+	if(this->ftPointSize > 0)
+		FT_Set_Pixel_Sizes(this->ftFace, 0, this->ftPointSize);
+
+	this->ftSlot = this->ftFace->glyph;
+	this->ftKerningEnabled = FT_HAS_KERNING(this->ftFace);
+
+	if (cacheAll) {
+		return this->cacheGlyphDataComplete();
+	}
+
+	return 0;
+}
+
+/**
+ *
+ * \overload
+ */
+uint16_t FreeTypeGX::loadFont(const uint8_t* fontBuffer, FT_Long bufferSize, FT_UInt pointSize, bool cacheAll) {
+	return this->loadFont((uint8_t *)fontBuffer, bufferSize, pointSize, cacheAll);
+}
+
+/**
+ * Clears all loaded font glyph data.
+ *
+ * This routine clears all members of the font map structure and frees all allocated memory back to the system.
+ */
+void FreeTypeGX::unloadFont() {
+	if(this->fontData.size() == 0)
+		return;
+
+	GX_DrawDone();
+	GX_Flush();
+
+	for( std::map<wchar_t, ftgxCharData>::iterator i = this->fontData.begin(); i != this->fontData.end(); i++) {
+		free(i->second.glyphDataTexture);
+	}
+
+	this->fontData.clear();
+}
+
+void FreeTypeGX::changeSize(FT_UInt pointSize) {
+	this->unloadFont();
+	this->ftPointSize = pointSize;
+	FT_Set_Pixel_Sizes(this->ftFace, 0, this->ftPointSize);
+}
+
+/**
+ * Adjusts the texture data buffer to necessary width for a given texture format.
+ *
+ * This routine determines adjusts the given texture width into the required width to hold the necessary texture data for proper alignment.
+ *
+ * @param textureWidth	The initial guess for the texture width.
+ * @param textureFormat	The texture format to which the data is to be converted.
+ * @return The correctly adjusted texture width.
+ */
+uint16_t FreeTypeGX::adjustTextureWidth(uint16_t textureWidth, uint8_t textureFormat) {
+	uint16_t alignment;
+
+	switch(textureFormat) {
+		case GX_TF_I4:		/* 8x8 Tiles - 4-bit Intensity */
+		case GX_TF_I8:		/* 8x4 Tiles - 8-bit Intensity */
+		case GX_TF_IA4:		/* 8x4 Tiles - 4-bit Intensity, , 4-bit Alpha */
+			alignment = 8;
+			break;
+
+		case GX_TF_IA8:		/* 4x4 Tiles - 8-bit Intensity, 8-bit Alpha */
+		case GX_TF_RGB565:	/* 4x4 Tiles - RGB565 Format */
+		case GX_TF_RGB5A3:	/* 4x4 Tiles - RGB5A3 Format */
+		case GX_TF_RGBA8:	/* 4x4 Tiles - RGBA8 Dual Cache Line Format */
+		default:
+			alignment = 4;
+			break;
+	}
+	return textureWidth % alignment == 0 ? textureWidth : alignment + textureWidth - (textureWidth % alignment);
+
+}
+
+/**
+ * Adjusts the texture data buffer to necessary height for a given texture format.
+ *
+ * This routine determines adjusts the given texture height into the required height to hold the necessary texture data for proper alignment.
+ *
+ * @param textureHeight	The initial guess for the texture height.
+ * @param textureFormat	The texture format to which the data is to be converted.
+ * @return The correctly adjusted texture height.
+ */
+uint16_t FreeTypeGX::adjustTextureHeight(uint16_t textureHeight, uint8_t textureFormat) {
+	uint16_t alignment;
+
+	switch(textureFormat) {
+		case GX_TF_I4:		/* 8x8 Tiles - 4-bit Intensity */
+			alignment = 8;
+			break;
+
+		case GX_TF_I8:		/* 8x4 Tiles - 8-bit Intensity */
+		case GX_TF_IA4:		/* 8x4 Tiles - 4-bit Intensity, , 4-bit Alpha */
+		case GX_TF_IA8:		/* 4x4 Tiles - 8-bit Intensity, 8-bit Alpha */
+		case GX_TF_RGB565:	/* 4x4 Tiles - RGB565 Format */
+		case GX_TF_RGB5A3:	/* 4x4 Tiles - RGB5A3 Format */
+		case GX_TF_RGBA8:	/* 4x4 Tiles - RGBA8 Dual Cache Line Format */
+		default:
+			alignment = 4;
+			break;
+	}
+	return textureHeight % alignment == 0 ? textureHeight : alignment + textureHeight - (textureHeight % alignment);
+
+}
+
+/**
+ * Caches the given font glyph in the instance font texture buffer.
+ *
+ * This routine renders and stores the requested glyph's bitmap and relevant information into its own quickly addressible
+ * structure within an instance-specific map.
+ *
+ * @param charCode	The requested glyph's character code.
+ * @return A pointer to the allocated font structure.
+ */
+ftgxCharData *FreeTypeGX::cacheGlyphData(wchar_t charCode) {
+	FT_UInt gIndex;
+	uint16_t textureWidth = 0, textureHeight = 0;
+
+	gIndex = FT_Get_Char_Index( this->ftFace, charCode );
+	if (!FT_Load_Glyph(this->ftFace, gIndex, FT_LOAD_DEFAULT )) {
+		FT_Render_Glyph( this->ftSlot, FT_RENDER_MODE_NORMAL );
+
+		if(this->ftSlot->format == FT_GLYPH_FORMAT_BITMAP) {
+			FT_Bitmap *glyphBitmap = &this->ftSlot->bitmap;
+
+			textureWidth = adjustTextureWidth(glyphBitmap->width, this->textureFormat);
+			textureHeight = adjustTextureHeight(glyphBitmap->rows, this->textureFormat);
+
+			this->fontData[charCode] = (ftgxCharData){
+				this->ftSlot->advance.x >> 6,
+				gIndex,
+				textureWidth,
+				textureHeight,
+				this->ftSlot->bitmap_top,
+				this->ftSlot->bitmap_top,
+				textureHeight - this->ftSlot->bitmap_top,
+				NULL
+			};
+			this->loadGlyphData(glyphBitmap, &this->fontData[charCode]);
+
+			return &this->fontData[charCode];
+		}
+	}
+
+	return NULL;
+}
+
+/**
+ * Locates each character in this wrapper's configured font face and proccess them.
+ *
+ * This routine locates each character in the configured font face and renders the glyph's bitmap.
+ * Each bitmap and relevant information is loaded into its own quickly addressible structure within an instance-specific map.
+ */
+uint16_t FreeTypeGX::cacheGlyphDataComplete() {
+	uint16_t i = 0;
+	FT_UInt gIndex;
+	FT_ULong charCode = FT_Get_First_Char( this->ftFace, &gIndex );
+	while ( gIndex != 0 ) {
+
+		if(this->cacheGlyphData(charCode) != NULL) {
+			i++;
+		}
+
+		charCode = FT_Get_Next_Char( this->ftFace, charCode, &gIndex );
+	}
+
+	return i;
+}
+
+/**
+ * Loads the rendered bitmap into the relevant structure's data buffer.
+ *
+ * This routine does a simple byte-wise copy of the glyph's rendered 8-bit grayscale bitmap into the structure's buffer.
+ * Each byte is converted from the bitmap's intensity value into the a uint32_t RGBA value.
+ *
+ * @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.
+ */
+void FreeTypeGX::loadGlyphData(FT_Bitmap *bmp, ftgxCharData *charData) {
+
+	uint32_t *glyphData = (uint32_t *)memalign(32, charData->textureWidth * charData->textureHeight * 4);
+	memset(glyphData, 0x00, charData->textureWidth * charData->textureHeight * 4);
+
+	for (uint16_t imagePosY = 0; imagePosY < bmp->rows; imagePosY++) {
+		for (uint16_t imagePosX = 0; imagePosX < bmp->width; imagePosX++) {
+			uint32_t pixel = (uint32_t) bmp->buffer[imagePosY * bmp->width + imagePosX];
+			glyphData[imagePosY * charData->textureWidth + imagePosX] = 0x00000000 | (pixel << 24) | (pixel << 16) | (pixel << 8) | pixel;
+		}
+	}
+
+	switch(this->textureFormat) {
+		case GX_TF_I4:
+			charData->glyphDataTexture = Metaphrasis::convertBufferToI4(glyphData, charData->textureWidth, charData->textureHeight);
+			break;
+		case GX_TF_I8:
+			charData->glyphDataTexture = Metaphrasis::convertBufferToI8(glyphData, charData->textureWidth, charData->textureHeight);
+			break;
+		case GX_TF_IA4:
+			charData->glyphDataTexture = Metaphrasis::convertBufferToIA4(glyphData, charData->textureWidth, charData->textureHeight);
+			break;
+		case GX_TF_IA8:
+			charData->glyphDataTexture = Metaphrasis::convertBufferToIA8(glyphData, charData->textureWidth, charData->textureHeight);
+			break;
+		case GX_TF_RGB565:
+			charData->glyphDataTexture = Metaphrasis::convertBufferToRGB565(glyphData, charData->textureWidth, charData->textureHeight);
+			break;
+		case GX_TF_RGB5A3:
+			charData->glyphDataTexture = Metaphrasis::convertBufferToRGB5A3(glyphData, charData->textureWidth, charData->textureHeight);
+			break;
+		case GX_TF_RGBA8:
+		default:
+			charData->glyphDataTexture = Metaphrasis::convertBufferToRGBA8(glyphData, charData->textureWidth, charData->textureHeight);
+			break;
+	}
+
+	free(glyphData);
+}
+
+/**
+ * Determines the x offset of the rendered string.
+ *
+ * This routine calculates the x offset of the rendered string based off of a supplied positional format parameter.
+ *
+ * @param width	Current pixel width of the string.
+ * @param format	Positional format of the string.
+ */
+uint16_t FreeTypeGX::getStyleOffsetWidth(uint16_t width, uint16_t format) {
+
+	if (format & FTGX_JUSTIFY_LEFT ) {
+		return 0;
+	}
+	else if (format & FTGX_JUSTIFY_CENTER ) {
+		return width >> 1;
+	}
+	else if (format & FTGX_JUSTIFY_RIGHT ) {
+		return width;
+	}
+
+	return 0;
+}
+
+/**
+ * Determines the y offset of the rendered string.
+ *
+ * This routine calculates the y offset of the rendered string based off of a supplied positional format parameter.
+ *
+ * @param offset	Current pixel offset data of the string.
+ * @param format	Positional format of the string.
+ */
+uint16_t FreeTypeGX::getStyleOffsetHeight(ftgxDataOffset offset, uint16_t format) {
+	if (format & FTGX_ALIGN_TOP ) {
+		return -offset.max;
+	}
+	else if (format & FTGX_ALIGN_MIDDLE ) {
+		return -offset.max;
+	}
+	else if (format & FTGX_ALIGN_BOTTOM ) {
+		return offset.min;
+	}
+
+	return 0;
+}
+
+/**
+ * Processes the supplied text string and prints the results at the specified coordinates.
+ *
+ * This routine processes each character of the supplied text string, loads the relevant preprocessed bitmap buffer,
+ * a texture from said buffer, and loads the resultant texture into the EFB.
+ *
+ * @param x	Screen X coordinate at which to output the text.
+ * @param y Screen Y coordinate at which to output the text. Note that this value corresponds to the text string origin and not the top or bottom of the glyphs.
+ * @param text	NULL terminated string to output.
+ * @param color	Optional color to apply to the text characters. If not specified default value is ftgxWhite: (GXColor){0xff, 0xff, 0xff, 0xff}
+ * @param textStyle	Flags which specify any styling which should be applied to the rendered string.
+ * @return The number of characters printed.
+ */
+uint16_t FreeTypeGX::drawText(int16_t x, int16_t y, wchar_t *text, GXColor color, uint16_t textStyle) {
+	uint16_t strLength = wcslen(text);
+	uint16_t x_pos = x, printed = 0;
+	uint16_t x_offset = 0, y_offset = 0;
+	GXTexObj glyphTexture;
+	FT_Vector pairDelta;
+
+	if(textStyle & 0x000F) {
+		x_offset = this->getStyleOffsetWidth(this->getWidth(text), textStyle);
+	}
+	if(textStyle & 0x00F0) {
+		y_offset = this->getStyleOffsetHeight(this->getOffset(text), textStyle);
+	}
+
+	for (uint16_t i = 0; i < strLength; i++) {
+
+		ftgxCharData* glyphData = NULL;
+		if( this->fontData.find(text[i]) != this->fontData.end() ) {
+			glyphData = &this->fontData[text[i]];
+		}
+		else {
+			glyphData = this->cacheGlyphData(text[i]);
+		}
+
+		if(glyphData != NULL) {
+
+			if(this->ftKerningEnabled && i) {
+				FT_Get_Kerning( this->ftFace, this->fontData[text[i - 1]].glyphIndex, glyphData->glyphIndex, FT_KERNING_DEFAULT, &pairDelta );
+				x_pos += pairDelta.x >> 6;
+			}
+
+			GX_InitTexObj(&glyphTexture, glyphData->glyphDataTexture, glyphData->textureWidth, glyphData->textureHeight, this->textureFormat, GX_CLAMP, GX_CLAMP, GX_FALSE);
+			this->copyTextureToFramebuffer(&glyphTexture, glyphData->textureWidth, glyphData->textureHeight, x_pos - x_offset, y - glyphData->renderOffsetY - y_offset, color);
+
+			x_pos += glyphData->glyphAdvanceX;
+			printed++;
+		}
+	}
+
+	if(textStyle & 0x0F00) {
+		this->drawTextFeature(x - x_offset, y, this->getWidth(text), this->getOffset(text), textStyle, color);
+	}
+
+	return printed;
+}
+
+/**
+ * \overload
+ */
+uint16_t FreeTypeGX::drawText(int16_t x, int16_t y, wchar_t const *text, GXColor color, uint16_t textStyle) {
+	return this->drawText(x, y, (wchar_t *)text, color, textStyle);
+}
+
+void FreeTypeGX::drawTextFeature(int16_t x, int16_t y, uint16_t width, ftgxDataOffset offsetData, uint16_t format, GXColor color) {
+	uint16_t featureHeight = this->ftPointSize >> 4 > 0 ? this->ftPointSize >> 4 : 1;
+
+	if (format & FTGX_STYLE_UNDERLINE ) {
+		switch(format & 0x00F0) {
+			case FTGX_ALIGN_TOP:
+				this->copyFeatureToFramebuffer(width, featureHeight, x, y + offsetData.max + 1, color);
+				break;
+			case FTGX_ALIGN_MIDDLE:
+				this->copyFeatureToFramebuffer(width, featureHeight, x, y + ((offsetData.max - offsetData.min) >> 1) + 1, color);
+				break;
+			case FTGX_ALIGN_BOTTOM:
+				this->copyFeatureToFramebuffer(width, featureHeight, x, y - offsetData.min, color);
+				break;
+			default:
+				this->copyFeatureToFramebuffer(width, featureHeight, x, y + 1, color);
+				break;
+		}
+	}
+
+	if (format & FTGX_STYLE_STRIKE ) {
+		switch(format & 0x00F0) {
+			case FTGX_ALIGN_TOP:
+				this->copyFeatureToFramebuffer(width, featureHeight, x, y + ((offsetData.max + offsetData.min) >> 1), color);
+				break;
+			case FTGX_ALIGN_MIDDLE:
+				this->copyFeatureToFramebuffer(width, featureHeight, x, y, color);
+				break;
+			case FTGX_ALIGN_BOTTOM:
+				this->copyFeatureToFramebuffer(width, featureHeight, x, y - ((offsetData.max + offsetData.min) >> 1), color);
+				break;
+			default:
+				this->copyFeatureToFramebuffer(width, featureHeight, x, y - ((offsetData.max - offsetData.min) >> 1), color);
+				break;
+		}
+	}
+}
+
+/**
+ * Processes the supplied string and return the width of the string in pixels.
+ *
+ * This routine processes each character of the supplied text string and calculates the width of the entire string.
+ * Note that if precaching of the entire font set is not enabled any uncached glyph will be cached after the call to this function.
+ *
+ * @param text	NULL terminated string to calculate.
+ * @return The width of the text string in pixels.
+ */
+uint16_t FreeTypeGX::getWidth(wchar_t *text) {
+	uint16_t strLength = wcslen(text);
+	uint16_t strWidth = 0;
+	FT_Vector pairDelta;
+
+	for (uint16_t i = 0; i < strLength; i++) {
+
+		ftgxCharData* glyphData = NULL;
+		if( this->fontData.find(text[i]) != this->fontData.end() ) {
+			glyphData = &this->fontData[text[i]];
+		}
+		else {
+			glyphData = this->cacheGlyphData(text[i]);
+		}
+
+		if(glyphData != NULL) {
+			if(this->ftKerningEnabled && (i > 0)) {
+				FT_Get_Kerning( this->ftFace, this->fontData[text[i - 1]].glyphIndex, glyphData->glyphIndex, FT_KERNING_DEFAULT, &pairDelta );
+				strWidth += pairDelta.x >> 6;
+			}
+
+			strWidth += glyphData->glyphAdvanceX;
+		}
+	}
+
+	return strWidth;
+}
+
+/**
+ *
+ * \overload
+ */
+uint16_t FreeTypeGX::getWidth(wchar_t const *text) {
+	return this->getWidth((wchar_t *)text);
+}
+
+/**
+ * Processes the supplied string and return the height of the string in pixels.
+ *
+ * This routine processes each character of the supplied text string and calculates the height of the entire string.
+ * Note that if precaching of the entire font set is not enabled any uncached glyph will be cached after the call to this function.
+ *
+ * @param text	NULL terminated string to calculate.
+ * @return The height of the text string in pixels.
+ */
+uint16_t FreeTypeGX::getHeight(wchar_t *text) {
+	ftgxDataOffset offset = this->getOffset(text);
+
+	return offset.max + offset.min;
+}
+
+/**
+ *
+ * \overload
+ */
+uint16_t FreeTypeGX::getHeight(wchar_t const *text) {
+	return this->getHeight((wchar_t *)text);
+}
+
+/**
+ * Get the maximum offset above and minimum offset below the font origin line.
+ *
+ * This function calculates the maximum pixel height above the font origin line and the minimum
+ * pixel height below the font origin line and returns the values in an addressible structure.
+ *
+ * @param text	NULL terminated string to calculate.
+ * @return The max and min values above and below the font origin line.
+ */
+ftgxDataOffset FreeTypeGX::getOffset(wchar_t *text) {
+	uint16_t strLength = wcslen(text);
+	uint16_t strMax = 0, strMin = 0;
+
+	for (uint16_t i = 0; i < strLength; i++) {
+
+		ftgxCharData* glyphData = NULL;
+		if( this->fontData.find(text[i]) != this->fontData.end() ) {
+			glyphData = &this->fontData[text[i]];
+		}
+		else {
+			glyphData = this->cacheGlyphData(text[i]);
+		}
+
+		if(glyphData != NULL) {
+			strMax = glyphData->renderOffsetMax > strMax ? glyphData->renderOffsetMax : strMax;
+			strMin = glyphData->renderOffsetMin > strMin ? glyphData->renderOffsetMin : strMin;
+		}
+	}
+
+	return (ftgxDataOffset){strMax, strMin};
+}
+
+/**
+ *
+ * \overload
+ */
+ftgxDataOffset FreeTypeGX::getOffset(wchar_t const *text) {
+	return this->getOffset(text);
+}
+
+/**
+ * Copies the supplied texture quad to the EFB.
+ *
+ * This routine uses the in-built GX quad builder functions to define the texture bounds and location on the EFB target.
+ *
+ * @param texObj	A pointer to the glyph's initialized texture object.
+ * @param texWidth	The pixel width of the texture object.
+ * @param texHeight	The pixel height of the texture object.
+ * @param screenX	The screen X coordinate at which to output the rendered texture.
+ * @param screenY	The screen Y coordinate at which to output the rendered texture.
+ * @param color	Color to apply to the texture.
+ */
+void FreeTypeGX::copyTextureToFramebuffer(GXTexObj *texObj, f32 texWidth, f32 texHeight, int16_t screenX, int16_t screenY, GXColor color) {
+
+	GX_LoadTexObj(texObj, GX_TEXMAP0);
+
+	GX_SetTevOp (GX_TEVSTAGE0, GX_MODULATE);
+	GX_SetVtxDesc (GX_VA_TEX0, GX_DIRECT);
+
+	GX_Begin(GX_QUADS, this->vertexIndex, 4);
+		GX_Position2s16(screenX, screenY);
+		GX_Color4u8(color.r, color.g, color.b, color.a);
+		GX_TexCoord2f32(0.0f, 0.0f);
+
+		GX_Position2s16(texWidth + screenX, screenY);
+		GX_Color4u8(color.r, color.g, color.b, color.a);
+		GX_TexCoord2f32(1.0f, 0.0f);
+
+		GX_Position2s16(texWidth + screenX, texHeight + screenY);
+		GX_Color4u8(color.r, color.g, color.b, color.a);
+		GX_TexCoord2f32(1.0f, 1.0f);
+
+		GX_Position2s16(screenX, texHeight + screenY);
+		GX_Color4u8(color.r, color.g, color.b, color.a);
+		GX_TexCoord2f32(0.0f, 1.0f);
+	GX_End();
+
+	this->setDefaultMode();
+}
+
+/**
+ * Creates a feature quad to the EFB.
+ *
+ * This function creates a simple quad for displaying underline or strikeout text styling.
+ *
+ * @param featureWidth	The pixel width of the quad.
+ * @param featureHeight	The pixel height of the quad.
+ * @param screenX	The screen X coordinate at which to output the quad.
+ * @param screenY	The screen Y coordinate at which to output the quad.
+ * @param color	Color to apply to the texture.
+ */
+void FreeTypeGX::copyFeatureToFramebuffer(f32 featureWidth, f32 featureHeight, int16_t screenX, int16_t screenY, GXColor color) {
+
+	GX_SetTevOp (GX_TEVSTAGE0, GX_PASSCLR);
+	GX_SetVtxDesc (GX_VA_TEX0, GX_NONE);
+
+	GX_Begin(GX_QUADS, this->vertexIndex, 4);
+		GX_Position2s16(screenX, screenY);
+		GX_Color4u8(color.r, color.g, color.b, color.a);
+
+ 		GX_Position2s16(featureWidth + screenX, screenY);
+		GX_Color4u8(color.r, color.g, color.b, color.a);
+
+		GX_Position2s16(featureWidth + screenX, featureHeight + screenY);
+		GX_Color4u8(color.r, color.g, color.b, color.a);
+
+		GX_Position2s16(screenX, featureHeight + screenY);
+		GX_Color4u8(color.r, color.g, color.b, color.a);
+	GX_End();
+
+	this->setDefaultMode();
+}

source/ngc/FreeTypeGX.h

@@ -0,0 +1,286 @@
+/*
+ * FreeTypeGX is a wrapper class for libFreeType which renders a compiled
+ * FreeType parsable font into a GX texture for Wii homebrew development.
+ * Copyright (C) 2008 Armin Tamzarian
+ * Modified by Tantric, 2009
+ *
+ * This file is part of FreeTypeGX.
+ *
+ * FreeTypeGX is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FreeTypeGX is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with FreeTypeGX.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** \mainpage FreeTypeGX
+ *
+ * \section sec_intro Introduction
+ *
+ * FreeTypeGX is a wrapper class for libFreeType which renders a compiled FreeType parsable font into a GX texture for Wii homebrew development.
+ * <br>
+ * FreeTypeGX is written in C++ and makes use of a selectable pre-buffered or buffer-on-demand methodology to allow fast and efficient printing of text to the EFB.
+ * <p>
+ * This library was developed in-full by Armin Tamzarian with the support of developers in \#wiibrew on EFnet.
+ *
+ * \section sec_installation_source Installation (Source Code)
+ *
+ * -# Ensure that you have the <a href = "http://www.tehskeen.com/forums/showthread.php?t=9404">libFreeType</a> Wii library installed in your development environment with the library added to your Makefile where appropriate.
+ * -# Ensure that you have the <a href = "http://code.google.com/p/metaphrasis">Metaphrasis</a> library installed in your development environment with the library added to your Makefile where appropriate.
+ * -# Extract the FreeTypeGX archive.
+ * -# Copy the contents of the <i>src</i> directory into your project's development path.
+ * -# Include the FreeTypeGX header file in your code using syntax such as the following:
+ * \code
+ * #include "FreeTypeGX.h"
+ * \endcode
+ *
+ * \section sec_installation_library Installation (Library)
+ *
+ * -# Ensure that you have the <a href = "http://www.tehskeen.com/forums/showthread.php?t=9404">libFreeType</a> Wii library installed in your development environment with the library added to your Makefile where appropriate.
+ * -# Ensure that you have the <a href = "http://code.google.com/p/metaphrasis">Metaphrasis</a> library installed in your development environment with the library added to your Makefile where appropriate.
+ * -# Extract the FreeTypeGX archive.
+ * -# Copy the contents of the <i>lib</i> directory into your <i>devKitPro/libogc</i> directory.
+ * -# Include the FreeTypeGX header file in your code using syntax such as the following:
+ * \code
+ * #include "FreeTypeGX.h"
+ * \endcode
+ *
+ * \section sec_freetypegx_prerequisites FreeTypeGX Prerequisites
+ *
+ * Before you begin using FreeTypeGX in your project you must ensure that the desired font in compiled into your project. For this example I will assume you are building your project with a Makefile using devKitPro evironment and are attempting to include a font whose filename is rursus_compact_mono.ttf.
+ *
+ * -# Copy the font into a directory which will be processed by the project's Makefile. If you are unsure about where you should place your font just copy the it into your project's source directory.
+ * \n\n
+ * -# Modify the Makefile to convert the font into an object file:
+ * \code
+ * %.ttf.o : %.ttf
+ * 	@echo $(notdir $<)
+ * 	$(bin2o)
+ * \endcode
+ * \n
+ * -# Include the font object's generated header file in your source code:
+ * \code
+ * #include "rursus_compact_mono_ttf.h"
+ * \endcode
+ * This header file defines the two variables that you will need for use within your project:
+ * \code
+ * extern const u8 rursus_compact_mono_ttf[];	A pointer to the font buffer within the compiled project.
+ * extern const u32 rursus_compact_mono_ttf_size;	The size of the font's buffer in bytes.
+ * \endcode
+ *
+ * \section sec_freetypegx_usage FreeTypeGX Usage
+ *
+ * -# Within the file you included the FreeTypeGX.h header create an instance object of the FreeTypeGX class:
+ * \code
+ * FreeTypeGX *freeTypeGX = new FreeTypeGX();
+ * \endcode
+ * Alternately you can specify a texture format to which you would like to render the font characters. Note that the default value for this parameter is GX_TF_RGBA8.
+ * \code
+ * FreeTypeGX *freeTypeGX = new FreeTypeGX(GX_TF_RGB565);
+ * \endcode
+ * Furthermore, you can also specify a vertex format index to avoid conflicts with concurrent libraries or other systems. Note that the default value for this parameter is GX_VTXFMT1.
+ * \code
+ * FreeTypeGX *freeTypeGX = new FreeTypeGX(GX_TF_RGB565, GX_VTXFMT1);
+ * \endcode
+ * \n
+ * Currently supported textures are:
+ * \li <i>GX_TF_I4</i>
+ * \li <i>GX_TF_I8</i>
+ * \li <i>GX_TF_IA4</i>
+ * \li <i>GX_TF_IA8</i>
+ * \li <i>GX_TF_RGB565</i>
+ * \li <i>GX_TF_RGB5A3</i>
+ * \li <i>GX_TF_RGBA8</i>
+ *
+ * \n
+ * -# Using the allocated FreeTypeGX instance object call the loadFont function to load the font from the compiled buffer and specify the desired point size. Note that this function can be called multiple times to load a new:
+ * \code
+ * freeTypeGX->loadFont(rursus_compact_mono_ttf, rursus_compact_mono_ttf_size, 64);
+ * \endcode
+ * Alternately you can specify a flag which will load and cache all available font glyphs immidiately. Note that on large font sets enabling this feature could take a significant amount of time.
+ * \code
+ * freeTypeGX->loadFont(rursus_compact_mono_ttf, rursus_compact_mono_ttf_size, 64, true);
+ * \endcode
+ * \n
+ * -# If necessary you can enable compatibility modes with concurrent libraries or systems. For more information on this feature see the documentation for setCompatibilityMode:
+ * \code
+ * freeTypeGX->setCompatibilityMode(FTGX_COMPATIBILITY_GRRLIB);
+ * \endcode
+ * -# Using the allocated FreeTypeGX instance object call the drawText function to print a string at the specified screen X and Y coordinates to the current EFB:
+ * \code
+ * freeTypeGX->drawText(10, 25, _TEXT("FreeTypeGX Rocks!"));
+ * \endcode
+ * Alternately you can specify a <i>GXColor</i> object you would like to apply to the printed characters:
+ * \code
+ * freeTypeGX->drawText(10, 25, _TEXT("FreeTypeGX Rocks!"),
+ *                      (GXColor){0xff, 0xee, 0xaa, 0xff});
+ * \endcode
+ * Furthermore you can also specify a group of styling parameters which will modify the positioning or style of the text:
+ * \code
+ * freeTypeGX->drawText(10, 25, _TEXT("FreeTypeGX Rocks!"),
+ *                      (GXColor){0xff, 0xee, 0xaa, 0xff},
+ *                      FTGX_JUSTIFY_CENTER | FTGX_ALIGN_BOTTOM | FTGX_STYLE_UNDERLINE);
+ * \endcode
+ * \n
+ * Currently style parameters are:
+ * \li <i>FTGX_JUSTIFY_LEFT</i>
+ * \li <i>FTGX_JUSTIFY_CENTER</i>
+ * \li <i>FTGX_JUSTIFY_RIGHT</i>
+ * \li <i>FTGX_ALIGN_TOP</i>
+ * \li <i>FTGX_ALIGN_MIDDLE</i>
+ * \li <i>FTGX_ALIGN_BOTTOM</i>
+ * \li <i>FTGX_STYLE_UNDERLINE</i>
+ * \li <i>FTGX_STYLE_STRIKE</i>
+ *
+ * \section sec_license License
+ *
+ * FreeTypeGX is distributed under the GNU Lesser General Public License.
+ *
+ * \section sec_contact Contact
+ *
+ * If you have any suggestions, questions, or comments regarding this library feel free to e-mail me at tamzarian1989 [at] gmail [dawt] com.
+ */
+
+#ifndef FREETYPEGX_H_
+#define FREETYPEGX_H_
+
+#include <gccore.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_BITMAP_H
+#include <Metaphrasis.h>
+
+#include <malloc.h>
+#include <string.h>
+#include <map>
+
+/*! \struct ftgxCharData_
+ *
+ * Font face character glyph relevant data structure.
+ */
+typedef struct ftgxCharData_ {
+	uint16_t glyphAdvanceX;	/**< Character glyph X coordinate advance in pixels. */
+	uint16_t glyphIndex;	/**< Charachter glyph index in the font face. */
+
+	uint16_t textureWidth;	/**< Texture width in pixels/bytes. */
+	uint16_t textureHeight;	/**< Texture glyph height in pixels/bytes. */
+
+	uint16_t renderOffsetY;	/**< Texture Y axis bearing offset. */
+	uint16_t renderOffsetMax;	/**< Texture Y axis bearing maximum value. */
+	uint16_t renderOffsetMin;	/**< Texture Y axis bearing minimum value. */
+
+	uint32_t* glyphDataTexture;	/**< Glyph texture bitmap data buffer. */
+} ftgxCharData;
+
+/*! \struct ftgxDataOffset_
+ *
+ * Offset structure which hold both a maximum and minimum value.
+ */
+typedef struct ftgxDataOffset_ {
+	int16_t max;	/**< Maximum data offset. */
+	int16_t min;	/**< Minimum data offset. */
+} ftgxDataOffset;
+
+#define _TEXT(t) L ## t /**< Unicode helper macro. */
+
+#define FTGX_NULL				0x0000
+#define FTGX_JUSTIFY_LEFT		0x0001
+#define FTGX_JUSTIFY_CENTER		0x0002
+#define FTGX_JUSTIFY_RIGHT		0x0004
+
+#define FTGX_ALIGN_TOP			0x0010
+#define FTGX_ALIGN_MIDDLE		0x0020
+#define FTGX_ALIGN_BOTTOM		0x0040
+
+#define FTGX_STYLE_UNDERLINE	0x0100
+#define FTGX_STYLE_STRIKE		0x0200
+
+#define FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_MODULATE	0X0001
+#define FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_DECAL		0X0002
+#define FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_BLEND		0X0004
+#define FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_REPLACE		0X0008
+#define FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_PASSCLR		0X0010
+
+#define FTGX_COMPATIBILITY_DEFAULT_VTXDESC_GX_NONE		0X0100
+#define FTGX_COMPATIBILITY_DEFAULT_VTXDESC_GX_DIRECT	0X0200
+#define FTGX_COMPATIBILITY_DEFAULT_VTXDESC_GX_INDEX8	0X0400
+#define FTGX_COMPATIBILITY_DEFAULT_VTXDESC_GX_INDEX16	0X0800
+
+#define FTGX_COMPATIBILITY_NONE							0x0000
+#define FTGX_COMPATIBILITY_GRRLIB						FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_PASSCLR | FTGX_COMPATIBILITY_DEFAULT_VTXDESC_GX_NONE
+#define FTGX_COMPATIBILITY_LIBWIISPRITE					FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_MODULATE | FTGX_COMPATIBILITY_DEFAULT_VTXDESC_GX_DIRECT
+
+const GXColor ftgxWhite = (GXColor){0xff, 0xff, 0xff, 0xff}; /**< Constant color value used only to sanitize Doxygen documentation. */
+
+/*! \class FreeTypeGX
+ * \brief Wrapper class for the libFreeType library with GX rendering.
+ * \author Armin Tamzarian
+ * \version 0.2.4
+ *
+ * FreeTypeGX acts as a wrapper class for the libFreeType library. It supports precaching of transformed glyph data into
+ * a specified texture format. Rendering of the data to the EFB is accomplished through the application of high performance
+ * GX texture functions resulting in high throughput of string rendering.
+ */
+class FreeTypeGX {
+
+	private:
+		FT_Library ftLibrary;	/**< FreeType FT_Library instance. */
+		FT_Face ftFace;			/**< FreeType reusable FT_Face typographic object. */
+		FT_GlyphSlot ftSlot;	/**< FreeType reusable FT_GlyphSlot glyph container object. */
+		FT_UInt ftPointSize;	/**< Requested size of the rendered font. */
+		bool ftKerningEnabled;	/**< Flag indicating the availability of font kerning data. */
+
+		uint8_t textureFormat;	/**< Defined texture format of the target EFB. */
+		uint8_t vertexIndex;	/**< Vertex format descriptor index. */
+		uint32_t compatibilityMode;	/**< Compatibility mode for default tev operations and vertex descriptors. */
+		std::map<wchar_t, ftgxCharData> fontData; /**< Map which holds the glyph data structures for the corresponding characters. */
+
+		static uint16_t adjustTextureWidth(uint16_t textureWidth, uint8_t textureFormat);
+		static uint16_t adjustTextureHeight(uint16_t textureHeight, uint8_t textureFormat);
+
+		static uint16_t getStyleOffsetWidth(uint16_t width, uint16_t format);
+		static uint16_t getStyleOffsetHeight(ftgxDataOffset offset, uint16_t format);
+
+		void unloadFont();
+		ftgxCharData *cacheGlyphData(wchar_t charCode);
+		uint16_t cacheGlyphDataComplete();
+		void loadGlyphData(FT_Bitmap *bmp, ftgxCharData *charData);
+
+		void setDefaultMode();
+
+		void drawTextFeature(int16_t x, int16_t y, uint16_t width, ftgxDataOffset offsetData, uint16_t format, GXColor color);
+		void copyTextureToFramebuffer(GXTexObj *texObj, f32 texWidth, f32 texHeight, int16_t screenX, int16_t screenY, GXColor color);
+		void copyFeatureToFramebuffer(f32 featureWidth, f32 featureHeight, int16_t screenX, int16_t screenY,  GXColor color);
+
+	public:
+		FreeTypeGX(uint8_t textureFormat = GX_TF_RGBA8, uint8_t vertexIndex = GX_VTXFMT1);
+		~FreeTypeGX();
+
+		static wchar_t* charToWideChar(char* p);
+		static wchar_t* charToWideChar(const char* p);
+		void setVertexFormat(uint8_t vertexIndex);
+		void setCompatibilityMode(uint32_t compatibilityMode);
+
+		uint16_t loadFont(uint8_t* fontBuffer, FT_Long bufferSize, FT_UInt pointSize, bool cacheAll = false);
+		uint16_t loadFont(const uint8_t* fontBuffer, FT_Long bufferSize, FT_UInt pointSize, bool cacheAll = false);
+		void changeSize(FT_UInt pointSize);
+
+		uint16_t drawText(int16_t x, int16_t y, wchar_t *text, GXColor color = ftgxWhite, uint16_t textStyling = FTGX_NULL);
+		uint16_t drawText(int16_t x, int16_t y, wchar_t const *text, GXColor color = ftgxWhite, uint16_t textStyling = FTGX_NULL);
+
+		uint16_t getWidth(wchar_t *text);
+		uint16_t getWidth(wchar_t const *text);
+		uint16_t getHeight(wchar_t *text);
+		uint16_t getHeight(wchar_t const *text);
+		ftgxDataOffset getOffset(wchar_t *text);
+		ftgxDataOffset getOffset(wchar_t const *text);
+};
+
+#endif /* FREETYPEGX_H_ */

source/ngc/filelist.h

@@ -22,6 +22,12 @@ extern const u32	bg_music_ogg_size;
 extern const u8		button_over_pcm[];
 extern const u32	button_over_pcm_size;
 
+extern const u8		logo_png[];
+extern const u32	logo_png_size;
+
+extern const u8		logo_over_png[];
+extern const u32	logo_over_png_size;
+
 extern const u8		bg_top_png[];
 extern const u32	bg_top_png_size;
 
@@ -91,6 +97,9 @@ extern const u32	screen_position_png_size;
 extern const u8		dialogue_box_png[];
 extern const u32	dialogue_box_png_size;
 
+extern const u8		credits_box_png[];
+extern const u32	credits_box_png_size;
+
 extern const u8		progressbar_png[];
 extern const u32	progressbar_png_size;
 
@@ -109,6 +118,9 @@ extern const u32	folder_png_size;
 extern const u8		battery_png[];
 extern const u32	battery_png_size;
 
+extern const u8		battery_red_png[];
+extern const u32	battery_red_png_size;
+
 extern const u8		battery_bar_png[];
 extern const u32	battery_bar_png_size;
 

source/ngc/fileop.cpp

@@ -331,8 +331,17 @@ ParseDirectory()
 			memset(&(browserList[entryNum]), 0, sizeof(BROWSERENTRY)); // clear the new entry
 
 			strncpy(browserList[entryNum].filename, filename, MAXJOLIET);
+
+			if(strcmp(filename,"..") == 0)
+			{
+				sprintf(browserList[entryNum].displayname, "Up One Level");
+			}
+			else
+			{
 				StripExt(tmpname, filename); // hide file extension
 				strncpy(browserList[entryNum].displayname, tmpname, MAXDISPLAY);	// crop name for display
+			}
+
 			browserList[entryNum].length = filestat.st_size;
 			timeinfo = localtime (&filestat.st_mtime);
 			memcpy(&browserList[entryNum].mtime, timeinfo, sizeof(tm));

source/ngc/gui/gui.h

@@ -17,7 +17,6 @@
 #include <string.h>
 #include <vector>
 #include <math.h>
-#include <wiiuse/wpad.h>
 #include <asndlib.h>
 #include "pngu/pngu.h"
 #include "FreeTypeGX.h"
@@ -29,8 +28,6 @@
 #include "menu.h"
 #include "oggplayer.h"
 
-#define PI 3.14159265f
-#define PADCAL 50
 #define SCROLL_INITIAL_DELAY 20
 #define SCROLL_LOOP_DELAY 3
 #define PAGESIZE 8
@@ -38,18 +35,6 @@
 
 typedef void (*UpdateCallback)(void * e);
 
-typedef struct _paddata {
-	u16 btns_d;
-	u16 btns_u;
-	u16 btns_h;
-	s8 stickX;
-	s8 stickY;
-	s8 substickX;
-	s8 substickY;
-	u8 triggerL;
-	u8 triggerR;
-} PADData;
-
 enum
 {
 	ALIGN_LEFT,
@@ -68,13 +53,6 @@ enum
 	STATE_DISABLED
 };
 
-enum
-{
-	TRIGGER_SIMPLE,
-	TRIGGER_BUTTON_ONLY,
-	TRIGGER_BUTTON_ONLY_IN_FOCUS
-};
-
 enum
 {
 	SOUND_PCM,
@@ -116,26 +94,6 @@ class GuiSound
 		s32 volume;
 };
 
-class GuiTrigger
-{
-	public:
-		GuiTrigger();
-		~GuiTrigger();
-		void SetSimpleTrigger(s32 ch, u32 wiibtns, u16 gcbtns);
-		void SetButtonOnlyTrigger(s32 ch, u32 wiibtns, u16 gcbtns);
-		void SetButtonOnlyInFocusTrigger(s32 ch, u32 wiibtns, u16 gcbtns);
-		s8 WPAD_Stick(u8 right, int axis);
-		bool Left();
-		bool Right();
-		bool Up();
-		bool Down();
-
-		u8 type;
-		s32 chan;
-		WPADData wpad;
-		PADData pad;
-};
-
 class GuiElement
 {
 	public:
@@ -153,13 +111,14 @@ class GuiElement
 		void SetSelectable(bool s);
 		void SetClickable(bool c);
 		int GetState();
-		void SetVisible(bool v);
 		void SetAlpha(int a);
 		int GetAlpha();
 		void SetScale(float s);
 		float GetScale();
 		void SetTrigger(GuiTrigger * t);
 		void SetTrigger(u8 i, GuiTrigger * t);
+		bool Rumble();
+		void SetRumble(bool r);
 		void SetEffect(int e, int a, int t=0);
 		void SetEffectOnOver(int e, int a, int t=0);
 		void SetEffectGrow();
@@ -169,6 +128,7 @@ class GuiElement
 		void UpdateEffects();
 		void SetUpdateCallback(UpdateCallback u);
 		int IsFocused();
+		virtual void SetVisible(bool v);
 		virtual void SetFocus(int f);
 		virtual void SetState(int s);
 		virtual void ResetState();
@@ -189,6 +149,7 @@ class GuiElement
 		f32 scale;
 		int alphaDyn;
 		f32 scaleDyn;
+		bool rumble;
 		int effects;
 		int effectAmount;
 		int effectTarget;
@@ -235,6 +196,7 @@ class GuiWindow : public GuiElement
 		//!Returns the size of the list of elements.
 		//!\return The size of the current elementlist.
 		u32 GetSize();
+		void SetVisible(bool v);
 		void ResetState();
 		void SetState(int s);
 		int GetSelected();
@@ -295,9 +257,12 @@ class GuiText : public GuiElement
 {
 	public:
 		GuiText(const char * t, int s, GXColor c);
+		GuiText(const char * t);
 		~GuiText();
 		void SetText(const char * t);
-		void SetSize(int s);
+		void SetPresets(int sz, GXColor c, int w, u16 s, int h, int v);
+		void SetFontSize(int s);
+		void SetMaxWidth(int w);
 		void SetColor(GXColor c);
 		void SetStyle(u16 s);
 		void SetAlignment(int hor, int vert);
@@ -305,6 +270,7 @@ class GuiText : public GuiElement
 	protected:
 		wchar_t* text;
 		int size;
+		int maxWidth;
 		u16 style;
 		GXColor color;
 };

source/ngc/gui/gui_button.cpp

@@ -145,13 +145,15 @@ void GuiButton::Update(GuiTrigger * t)
 
 	#ifdef HW_RVL
 	// cursor
-	if(t->wpad.ir.valid && this->IsSelectable())
+	if(t->wpad.ir.valid)
 	{
 		if(this->IsInside(t->wpad.ir.x, t->wpad.ir.y))
 		{
 			if(state == STATE_DEFAULT) // we weren't on the button before!
 			{
 				state = STATE_SELECTED;
+
+				if(this->Rumble())
 					rumbleRequest[t->chan] = 1;
 
 				if(soundOver)

source/ngc/gui/gui_element.cpp

@@ -25,6 +25,7 @@ GuiElement::GuiElement()
 	trigger[0] = NULL;
 	trigger[1] = NULL;
 	parentElement = NULL;
+	rumble = true;
 	selectable = false;
 	clickable = false;
 	visible = true;
@@ -283,6 +284,16 @@ void GuiElement::SetTrigger(u8 i, GuiTrigger * t)
 	trigger[i] = t;
 }
 
+bool GuiElement::Rumble()
+{
+	return rumble;
+}
+
+void GuiElement::SetRumble(bool r)
+{
+	rumble = r;
+}
+
 int GuiElement::GetEffect()
 {
 	return effects;

source/ngc/gui/gui_filebrowser.cpp

@@ -182,6 +182,8 @@ void GuiFileBrowser::Draw()
 	arrowUpBtn->Draw();
 	arrowDownBtn->Draw();
 	scrollbarBoxBtn->Draw();
+
+	this->UpdateEffects();
 }
 
 void GuiFileBrowser::Update(GuiTrigger * t)

source/ngc/gui/gui_image.cpp

@@ -19,7 +19,7 @@ GuiImage::GuiImage(GuiImageData * img)
 	width = img->GetWidth();
 	height = img->GetHeight();
 	imageangle = 0;
-	tile = 0;
+	tile = -1;
 	stripe = 0;
 	imgType = IMAGE_DATA;
 }
@@ -30,7 +30,7 @@ GuiImage::GuiImage(u8 * img, int w, int h)
 	width = w;
 	height = h;
 	imageangle = 0;
-	tile = 0;
+	tile = -1;
 	stripe = 0;
 	imgType = IMAGE_TEXTURE;
 }
@@ -41,7 +41,7 @@ GuiImage::GuiImage(int w, int h, GXColor c)
 	width = w;
 	height = h;
 	imageangle = 0;
-	tile = 0;
+	tile = -1;
 	stripe = 0;
 	imgType = IMAGE_COLOR;
 
@@ -191,7 +191,7 @@ void GuiImage::ColorStripe(int shift)
  */
 void GuiImage::Draw()
 {
-	if(!image || !this->IsVisible())
+	if(!image || !this->IsVisible() || tile == 0)
 		return;
 
 	float currScale = this->GetScale();

source/ngc/gui/gui_keyboard.cpp

@@ -163,6 +163,8 @@ GuiKeyboard::GuiKeyboard(char * t)
 			keyImg[i][j] = new GuiImage(key);
 			keyImgOver[i][j] = new GuiImage(keyOver);
 			keyTxt[i][j] = new GuiText(NULL, 22, (GXColor){0, 0, 0, 0xff});
+			keyTxt[i][j]->SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM);
+			keyTxt[i][j]->SetPosition(0, -10);
 			keyBtn[i][j] = new GuiButton(key->GetWidth(), key->GetHeight());
 			keyBtn[i][j]->SetImage(keyImg[i][j]);
 			keyBtn[i][j]->SetImageOver(keyImgOver[i][j]);

source/ngc/gui/gui_optionbrowser.cpp

@@ -91,7 +91,7 @@ GuiOptionBrowser::GuiOptionBrowser(int w, int h, OptionList * l)
 
 		optionBg[i] = new GuiImage(bgOptionsEntry);
 
-		optionBtn[i] = new GuiButton(552,30);
+		optionBtn[i] = new GuiButton(512,30);
 		optionBtn[i]->SetParent(this);
 		optionBtn[i]->SetLabel(optionTxt[i], 0);
 		optionBtn[i]->SetLabel(optionVal[i], 1);
@@ -229,6 +229,8 @@ void GuiOptionBrowser::Draw()
 	arrowUpBtn->Draw();
 	arrowDownBtn->Draw();
 	scrollbarBoxBtn->Draw();
+
+	this->UpdateEffects();
 }
 
 void GuiOptionBrowser::Update(GuiTrigger * t)

source/ngc/gui/gui_savebrowser.cpp

@@ -212,6 +212,8 @@ void GuiSaveBrowser::Draw()
 	arrowUpBtn->Draw();
 	arrowDownBtn->Draw();
 	scrollbarBoxBtn->Draw();
+
+	this->UpdateEffects();
 }
 
 void GuiSaveBrowser::Update(GuiTrigger * t)

source/ngc/gui/gui_text.cpp

@@ -13,6 +13,12 @@
 #include "filelist.h"
 
 static int currentSize = 0;
+static int presetSize = 0;
+static int presetMaxWidth = 0;
+static int presetAlignmentHor = 0;
+static int presetAlignmentVert = 0;
+static u16 presetStyle = 0;
+static GXColor presetColor = (GXColor){255, 255, 255, 255};
 
 /**
  * Constructor for the GuiText class.
@@ -24,23 +30,32 @@ GuiText::GuiText(const char * t, int s, GXColor c)
 	color = c;
 	alpha = c.a;
 	style = FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE;
+	maxWidth = 0;
 
 	alignmentHor = ALIGN_CENTRE;
 	alignmentVert = ALIGN_MIDDLE;
 
 	if(t)
-	{
-		// this is temporary: removes - and '
-		// because FreeType GX won't show them
-		char newt[200];
-		int i = -1;
-		strcpy(newt, t);
-		while(newt[++i] != 0)
-			if(newt[i] == '-' || newt[i] == '\'')
-				newt[i] = ' ';
+		text = fontSystem->charToWideChar((char *)t);
+}
 
-		text = fontSystem->charToWideChar((char *)newt);
-	}
+/**
+ * Constructor for the GuiText class, uses presets
+ */
+GuiText::GuiText(const char * t)
+{
+	text = NULL;
+	size = presetSize;
+	color = presetColor;
+	alpha = presetColor.a;
+	style = presetStyle;
+	maxWidth = presetMaxWidth;
+
+	alignmentHor = presetAlignmentHor;
+	alignmentVert = presetAlignmentVert;
+
+	if(t)
+		text = fontSystem->charToWideChar((char *)t);
 }
 
 /**
@@ -63,28 +78,35 @@ void GuiText::SetText(const char * t)
 	text = NULL;
 
 	if(t)
-	{
-		// this is temporary: removes - and '
-		// because FreeType GX won't show them
-		char newt[200];
-		int i = -1;
-		strcpy(newt, t);
-		while(newt[++i] != 0)
-			if(newt[i] == '-' || newt[i] == '\'')
-				newt[i] = ' ';
-
-		text = fontSystem->charToWideChar((char *)newt);
-	}
+		text = fontSystem->charToWideChar((char *)t);
 }
-void GuiText::SetSize(int s)
+
+void GuiText::SetPresets(int sz, GXColor c, int w, u16 s, int h, int v)
+{
+	presetSize = sz;
+	presetColor = c;
+	presetStyle = s;
+	presetMaxWidth = w;
+	presetAlignmentHor = h;
+	presetAlignmentVert = v;
+}
+
+void GuiText::SetFontSize(int s)
 {
 	size = s;
 }
+
+void GuiText::SetMaxWidth(int w)
+{
+	maxWidth = w;
+}
+
 void GuiText::SetColor(GXColor c)
 {
 	color = c;
 	alpha = c.a;
 }
+
 void GuiText::SetStyle(u16 s)
 {
 	style = s;
@@ -137,12 +159,78 @@ void GuiText::Draw()
 	GXColor c = color;
 	c.a = this->GetAlpha();
 
-	if(size != currentSize)
-	{
-		fontSystem->loadFont(font_ttf, font_ttf_size, size);
-		currentSize = size;
-	}
-	fontSystem->drawText((u16)this->GetLeft(), (u16)this->GetTop(), text, c, style);
+	int newSize = size*this->GetScale();
 
+	if(newSize != currentSize)
+	{
+		fontSystem->changeSize(newSize);
+		currentSize = newSize;
+	}
+
+	int voffset = 0;
+
+	if(alignmentVert == ALIGN_MIDDLE)
+		voffset = -newSize/2 + 2;
+
+	if(maxWidth > 0) // text wrapping
+	{
+		int lineheight = newSize + 6;
+		int strlen = wcslen(text);
+		int i = 0;
+		int ch = 0;
+		int linenum = 0;
+		int lastSpace = -1;
+		int lastSpaceIndex = -1;
+		wchar_t * tmptext[20];
+
+		while(ch < strlen)
+		{
+			if(i == 0)
+				tmptext[linenum] = new wchar_t[strlen + 1];
+
+			tmptext[linenum][i] = text[ch];
+			tmptext[linenum][i+1] = 0;
+
+			if(text[ch] == ' ' || ch == strlen-1)
+			{
+				if(fontSystem->getWidth(tmptext[linenum]) >= maxWidth)
+				{
+					if(lastSpace >= 0)
+					{
+						tmptext[linenum][lastSpaceIndex] = 0; // discard space, and everything after
+						ch = lastSpace; // go backwards to the last space
+						lastSpace = -1; // we have used this space
+						lastSpaceIndex = -1;
+					}
+					linenum++;
+					i = -1;
+				}
+				else if(ch == strlen-1)
+				{
+					linenum++;
+				}
+			}
+			if(text[ch] == ' ' && i >= 0)
+			{
+				lastSpace = ch;
+				lastSpaceIndex = i;
+			}
+			ch++;
+			i++;
+		}
+
+		if(alignmentVert == ALIGN_MIDDLE)
+			voffset = voffset - (lineheight*linenum)/2 + lineheight/2;
+
+		for(i=0; i < linenum; i++)
+		{
+			fontSystem->drawText(this->GetLeft(), this->GetTop()+voffset+i*lineheight, tmptext[i], c, style);
+			delete tmptext[i];
+		}
+	}
+	else
+	{
+		fontSystem->drawText(this->GetLeft(), this->GetTop()+voffset, text, c, style);
+	}
 	this->UpdateEffects();
 }

source/ngc/gui/gui_window.cpp

@@ -120,6 +120,17 @@ void GuiWindow::SetState(int s)
 	}
 }
 
+void GuiWindow::SetVisible(bool v)
+{
+	visible = v;
+
+	for (u8 i = 0; i < _elements.size(); i++)
+	{
+		try { _elements.at(i)->SetVisible(v); }
+		catch (exception& e) { }
+	}
+}
+
 void GuiWindow::SetFocus(int f)
 {
 	focus = f;

source/ngc/input.cpp

@@ -4,7 +4,7 @@
  * softdev July 2006
  * crunchy2 May-June 2007
  * Michniewski 2008
- * Tantric September 2008
+ * Tantric 2008-2009
  *
  * input.cpp
  *
@@ -31,8 +31,10 @@
 #include "menu.h"
 #include "video.h"
 #include "input.h"
+#include "gui/gui.h"
 
 int rumbleRequest[4] = {0,0,0,0};
+GuiTrigger userInput[4];
 
 #ifdef HW_RVL
 static int rumbleCount[4] = {0,0,0,0};

source/ngc/input.h

@@ -4,7 +4,7 @@
  * softdev July 2006
  * crunchy2 May-June 2007
  * Michniewski 2008
- * Tantric September 2008
+ * Tantric 2008-2009
  *
  * input.h
  *
@@ -15,11 +15,52 @@
 #define _INPUT_H_
 
 #include <gccore.h>
+#include <wiiuse/wpad.h>
 
 #define PI 				3.14159265f
 #define PADCAL			50
 #define MAXJP 			12 // # of mappable controller buttons
 
+enum
+{
+	TRIGGER_SIMPLE,
+	TRIGGER_BUTTON_ONLY,
+	TRIGGER_BUTTON_ONLY_IN_FOCUS
+};
+
+typedef struct _paddata {
+	u16 btns_d;
+	u16 btns_u;
+	u16 btns_h;
+	s8 stickX;
+	s8 stickY;
+	s8 substickX;
+	s8 substickY;
+	u8 triggerL;
+	u8 triggerR;
+} PADData;
+
+class GuiTrigger
+{
+	public:
+		GuiTrigger();
+		~GuiTrigger();
+		void SetSimpleTrigger(s32 ch, u32 wiibtns, u16 gcbtns);
+		void SetButtonOnlyTrigger(s32 ch, u32 wiibtns, u16 gcbtns);
+		void SetButtonOnlyInFocusTrigger(s32 ch, u32 wiibtns, u16 gcbtns);
+		s8 WPAD_Stick(u8 right, int axis);
+		bool Left();
+		bool Right();
+		bool Up();
+		bool Down();
+
+		u8 type;
+		s32 chan;
+		WPADData wpad;
+		PADData pad;
+};
+
+extern GuiTrigger userInput[4];
 extern int rumbleRequest[4];
 extern u32 btnmap[4][4][12];
 

source/ngc/menu.h

@@ -1,10 +1,7 @@
 /****************************************************************************
  * Snes9x 1.51 Nintendo Wii/Gamecube Port
  *
- * softdev July 2006
- * crunchy2 May-June 2007
- * Michniewski 2008
- * Tantric August 2008
+ * Tantric 2009
  *
  * menu.h
  *

source/ngc/snes9xGX.cpp

@@ -432,6 +432,7 @@ main(int argc, char *argv[])
 
 	// Initialize font system
 	fontSystem = new FreeTypeGX();
+	fontSystem->loadFont(font_ttf, font_ttf_size, 0);
 	fontSystem->setCompatibilityMode(FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_PASSCLR | FTGX_COMPATIBILITY_DEFAULT_VTXDESC_GX_NONE);
 
 	InitGUIThreads();

source/ngc/snes9xGX.h

@@ -17,6 +17,7 @@
 #include "FreeTypeGX.h"
 #include "snes9x.h"
 #include "filter.h"
+#include "filelist.h"
 
 #define APPNAME 		"Snes9x GX"
 #define APPVERSION 		"009"

source/ngc/video.cpp

@@ -31,6 +31,7 @@
 #include "filter.h"
 #include "filelist.h"
 #include "audio.h"
+#include "input.h"
 
 /*** Snes9x GFX Buffer ***/
 #define SNES9XGFX_SIZE 		EXT_PITCH*EXT_HEIGHT
@@ -425,10 +426,28 @@ void StopGX()
 static void
 UpdatePadsCB ()
 {
-#ifdef HW_RVL
+	#ifdef HW_RVL
 	WPAD_ScanPads();
-#endif
+	#endif
 	PAD_ScanPads();
+
+	for(int i=3; i >= 0; i--)
+	{
+		#ifdef HW_RVL
+		memcpy(&userInput[i].wpad, WPAD_Data(i), sizeof(WPADData));
+		#endif
+
+		userInput[i].chan = i;
+		userInput[i].pad.btns_d = PAD_ButtonsDown(i);
+		userInput[i].pad.btns_u = PAD_ButtonsUp(i);
+		userInput[i].pad.btns_h = PAD_ButtonsHeld(i);
+		userInput[i].pad.stickX = PAD_StickX(i);
+		userInput[i].pad.stickY = PAD_StickY(i);
+		userInput[i].pad.substickX = PAD_SubStickX(i);
+		userInput[i].pad.substickY = PAD_SubStickY(i);
+		userInput[i].pad.triggerL = PAD_TriggerL(i);
+		userInput[i].pad.triggerR = PAD_TriggerR(i);
+	}
 }
 
 /****************************************************************************