finalize 3.1.7

hbc/meta.xml

@@ -2,8 +2,8 @@
 <app version="1">
   <name>FCE Ultra GX</name>
   <coder>Tantric</coder>
-  <version>3.1.6</version>
-  <release_date>20100409</release_date>
+  <version>3.1.7</version>
+  <release_date>20100519</release_date>
   <short_description>Nintendo Emulator</short_description>
   <long_description>A port of FCE Ultra to the Wii.</long_description>
 </app>

readme.txt

@@ -1,7 +1,7 @@
 ¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤
  
                                  - FCE Ultra GX -
-                                  Version 3.1.6
+                                  Version 3.1.7
                          http://code.google.com/p/fceugc   
                                (Under GPL License)
  
@@ -33,6 +33,15 @@ Wii/GameCube.
 |0O×øo·                         UPDATE HISTORY                        ·oø×O0|
 `¨•¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨'
 
+[3.1.7 - May 19, 2010]
+
+* DVD support fixed
+* PAL/NTSC timing corrections
+* Fixed some potential hangs when returning to menu
+* Video/audio code changes
+* Fixed scrolling text bug
+* Other minor changes
+
 [3.1.6 - April 9, 2010]
 
 * Fix auto-save bug

source/fceugx.h

@@ -17,7 +17,7 @@
 #include "fceultra/driver.h"
 
 #define APPNAME			"FCE Ultra GX"
-#define APPVERSION		"3.1.6"
+#define APPVERSION		"3.1.7"
 #define APPFOLDER 		"fceugx"
 #define PREF_FILE_NAME	"settings.xml"
 

source/gcvideo.cpp

@@ -121,7 +121,7 @@ static camera cam = { {0.0F, 0.0F, 0.0F},
 static GXRModeObj PAL_240p =
 {
 	VI_TVMODE_PAL_DS,       // viDisplayMode
-	640,             // fbWidth
+	512,             // fbWidth
 	240,             // efbHeight
 	240,             // xfbHeight
 	(VI_MAX_WIDTH_PAL - 640)/2,         // viXOrigin
@@ -158,7 +158,7 @@ static GXRModeObj PAL_240p =
 static GXRModeObj NTSC_240p =
 {
 	VI_TVMODE_EURGB60_DS,      // viDisplayMode
-	640,             // fbWidth
+	512,             // fbWidth
 	240,             // efbHeight
 	240,             // xfbHeight
 	(VI_MAX_WIDTH_NTSC - 640)/2,	// viXOrigin
@@ -407,7 +407,7 @@ UpdateScaling()
 		else // no filtering
 		{
 			fscale = 1;
-			xscale = 640 / 2; // use GX scaler instead VI
+			xscale = 512 / 2; // use GX scaler instead VI
 			yscale = TEX_HEIGHT / 2;
 		}
 	}
@@ -417,10 +417,9 @@ UpdateScaling()
 		yscale = vmode->efbHeight / 2;
 	}
 
-	// aspect ratio scaling (change width scale)
-	// yes its pretty cheap and ugly, but its easy!
+	// match the original console's width for "widescreen" to prevent flickering
 	if (GCSettings.widescreen)
-		xscale = (3*xscale)/4;
+		xscale = 256;
 
 	xscale *= GCSettings.zoomHor;
 	yscale *= GCSettings.zoomVert;

source/gui/gui.h

@@ -641,6 +641,11 @@ class GuiText : public GuiElement
 		//!Sets the text of the GuiText element
 		//!\param t Text
 		void SetText(const char * t);
+		//!Sets the text of the GuiText element
+		//!\param t UTF-8 Text
+		void SetWText(wchar_t * t);
+		//!Gets the translated text length of the GuiText element
+		int GetLength();
 		//!Sets up preset values to be used by GuiText(t)
 		//!Useful when printing multiple text elements, all with the same attributes set
 		//!\param sz Font size
@@ -656,6 +661,8 @@ class GuiText : public GuiElement
 		//!Sets the maximum width of the drawn texture image
 		//!\param w Maximum width
 		void SetMaxWidth(int w);
+		//!Gets the width of the text when rendered
+		int GetTextWidth();
 		//!Enables/disables text scrolling
 		//!\param s Scrolling on/off
 		void SetScroll(int s);

source/gui/gui_text.cpp

@@ -49,6 +49,9 @@ GuiText::GuiText(const char * t, int s, GXColor c)
 		origText = strdup(t);
 		text = charToWideChar(gettext(t));
 	}
+
+	for(int i=0; i < 20; i++)
+		textDyn[i] = NULL;
 }
 
 /**
@@ -78,6 +81,9 @@ GuiText::GuiText(const char * t)
 		origText = strdup(t);
 		text = charToWideChar(gettext(t));
 	}
+
+	for(int i=0; i < 20; i++)
+		textDyn[i] = NULL;
 }
 
 /**
@@ -93,7 +99,8 @@ GuiText::~GuiText()
 	if(textDynNum > 0)
 	{
 		for(int i=0; i < textDynNum; i++)
-			delete[] textDyn[i];
+			if(textDyn[i])
+				delete[] textDyn[i];
 	}
 }
 
@@ -107,7 +114,8 @@ void GuiText::SetText(const char * t)
 	if(textDynNum > 0)
 	{
 		for(int i=0; i < textDynNum; i++)
-			delete[] textDyn[i];
+			if(textDyn[i])
+				delete[] textDyn[i];
 	}
 
 	origText = NULL;
@@ -123,6 +131,38 @@ void GuiText::SetText(const char * t)
 	}
 }
 
+void GuiText::SetWText(wchar_t * t)
+{
+	if(origText)
+		free(origText);
+	if(text)
+		delete[] text;
+
+	if(textDynNum > 0)
+	{
+		for(int i=0; i < textDynNum; i++)
+			if(textDyn[i])
+				delete[] textDyn[i];
+	}
+
+	origText = NULL;
+	text = NULL;
+	textDynNum = 0;
+	textScrollPos = 0;
+	textScrollInitialDelay = TEXT_SCROLL_INITIAL_DELAY;
+
+	if(t)
+		text = wcsdup(t);
+}
+
+int GuiText::GetLength()
+{
+	if(!text)
+		return 0;
+
+	return wcslen(text);
+}
+
 void GuiText::SetPresets(int sz, GXColor c, int w, u16 s, int h, int v)
 {
 	presetSize = sz;
@@ -142,24 +182,49 @@ void GuiText::SetMaxWidth(int width)
 {
 	maxWidth = width;
 
-	if(textDynNum > 0)
+	for(int i=0; i < textDynNum; i++)
 	{
-		for(int i=0; i < textDynNum; i++)
+		if(textDyn[i])
+		{
 			delete[] textDyn[i];
+			textDyn[i] = NULL;
+		}
 	}
+
 	textDynNum = 0;
 }
 
+int GuiText::GetTextWidth()
+{
+	if(!text)
+		return 0;
+
+	if(currentSize != size)
+	{
+		ChangeFontSize(size);
+
+		if(!fontSystem[size])
+			fontSystem[size] = new FreeTypeGX(size);
+
+		currentSize = size;
+	}
+	return fontSystem[size]->getWidth(text);
+}
+
 void GuiText::SetWrap(bool w, int width)
 {
 	wrap = w;
 	maxWidth = width;
 
-	if(textDynNum > 0)
+	for(int i=0; i < textDynNum; i++)
 	{
-		for(int i=0; i < textDynNum; i++)
+		if(textDyn[i])
+		{
 			delete[] textDyn[i];
+			textDyn[i] = NULL;
+		}
 	}
+
 	textDynNum = 0;
 }
 
@@ -168,11 +233,15 @@ void GuiText::SetScroll(int s)
 	if(textScroll == s)
 		return;
 
-	if(textDynNum > 0)
+	for(int i=0; i < textDynNum; i++)
 	{
-		for(int i=0; i < textDynNum; i++)
+		if(textDyn[i])
+		{
 			delete[] textDyn[i];
+			textDyn[i] = NULL;
+		}
 	}
+
 	textDynNum = 0;
 
 	textScroll = s;
@@ -234,12 +303,17 @@ void GuiText::ResetText()
 
 	text = charToWideChar(gettext(origText));
 
-	if(textDynNum > 0)
+	for(int i=0; i < textDynNum; i++)
 	{
-		for(int i=0; i < textDynNum; i++)
+		if(textDyn[i])
+		{
 			delete[] textDyn[i];
+			textDyn[i] = NULL;
+		}
 	}
+
 	textDynNum = 0;
+	currentSize = 0;
 }
 
 /**
@@ -276,7 +350,6 @@ void GuiText::Draw()
 		return;
 	}
 
-	u32 maxChar = maxWidth*2.5 / (float)newSize; // approximate
 	u32 textlen = wcslen(text);
 
 	if(wrap)
@@ -298,7 +371,7 @@ void GuiText::Draw()
 
 				if(text[ch] == ' ' || ch == textlen-1)
 				{
-					if(wcslen(textDyn[linenum]) >= maxChar)
+					if(fontSystem[currentSize]->getWidth(textDyn[linenum]) > maxWidth)
 					{
 						if(lastSpace >= 0)
 						{
@@ -344,14 +417,15 @@ void GuiText::Draw()
 		{
 			textDynNum = 1;
 			textDyn[0] = wcsdup(text);
+			int len = wcslen(textDyn[0]);
 
-			if(textlen > maxChar)
-				textDyn[0][maxChar] = 0;
+			while(fontSystem[currentSize]->getWidth(textDyn[0]) > maxWidth)
+				textDyn[0][--len] = 0;
 		}
 
 		if(textScroll == SCROLL_HORIZONTAL)
 		{
-			if(textlen > maxChar && (FrameTimer % textScrollDelay == 0))
+			if(fontSystem[currentSize]->getWidth(text) > maxWidth && (FrameTimer % textScrollDelay == 0))
 			{
 				if(textScrollInitialDelay)
 				{
@@ -366,15 +440,36 @@ void GuiText::Draw()
 						textScrollInitialDelay = TEXT_SCROLL_INITIAL_DELAY;
 					}
 
-					wcsncpy(textDyn[0], &text[textScrollPos], maxChar-1);
-
+					wcscpy(textDyn[0], &text[textScrollPos]);
 					u32 dynlen = wcslen(textDyn[0]);
 
-					if(dynlen+2 < maxChar)
+					if(dynlen+2 < textlen)
 					{
 						textDyn[0][dynlen] = ' ';
 						textDyn[0][dynlen+1] = ' ';
-						wcsncat(&textDyn[0][dynlen+2], text, maxChar - dynlen - 2);
+						textDyn[0][dynlen+2] = 0;
+						dynlen += 2;
+					}
+
+					if(fontSystem[currentSize]->getWidth(textDyn[0]) > maxWidth)
+					{
+						while(fontSystem[currentSize]->getWidth(textDyn[0]) > maxWidth)
+							textDyn[0][--dynlen] = 0;
+					}
+					else
+					{
+						int i = 0;
+
+						while(fontSystem[currentSize]->getWidth(textDyn[0]) < maxWidth && dynlen+1 < textlen)
+						{
+							textDyn[0][dynlen] = text[i++];
+							textDyn[0][++dynlen] = 0;
+						}
+
+						if(fontSystem[currentSize]->getWidth(textDyn[0]) > maxWidth)
+							textDyn[0][dynlen-2] = 0;
+						else
+							textDyn[0][dynlen-1] = 0;
 					}
 				}
 			}

source/utils/FreeTypeGX.cpp

@@ -38,6 +38,13 @@ void InitFreeType(uint8_t* fontBuffer, FT_Long bufferSize)
 		fontSystem[i] = NULL;
 }
 
+void DeinitFreeType()
+{
+	ClearFontData();
+	FT_Done_FreeType(ftLibrary);
+	ftLibrary = NULL;
+}
+
 void ChangeFontSize(FT_UInt pixelSize)
 {
 	FT_Set_Pixel_Sizes(ftFace, 0, pixelSize);
@@ -544,10 +551,10 @@ uint16_t FreeTypeGX::getWidth(wchar_t *text)
 
 	std::map<wchar_t, ftgxCharData>::iterator thisEnd =this->fontData.end();
 
-	for (uint32_t i = 0; i < strLength; ++i){
-	
+	for (uint32_t i = 0; i < strLength; ++i)
+	{
 		ftgxCharData* glyphData = NULL;
-		if( this->fontData.find(text[i]) !=  thisEnd)
+		if(this->fontData.find(text[i]) != thisEnd)
 		{
 			glyphData = &this->fontData[text[i]];
 		}
@@ -560,7 +567,7 @@ uint16_t FreeTypeGX::getWidth(wchar_t *text)
 		{
 			if(this->ftKerningEnabled && (i > 0))
 			{
-				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 += glyphData->glyphAdvanceX;

source/utils/FreeTypeGX.h

@@ -1,298 +1,300 @@
-/*
- * 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 <wchar.h>
-#include <map>
-
-#define MAX_FONT_SIZE 100
-
-/*! \struct ftgxCharData_
- *
- * Font face character glyph relevant data structure.
- */
-typedef struct ftgxCharData_ {
-	int16_t renderOffsetX;		/**< Texture X axis bearing offset. */
-	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. */
-
-	int16_t renderOffsetY;		/**< Texture Y axis bearing offset. */
-	int16_t renderOffsetMax;	/**< Texture Y axis bearing maximum value. */
-	int16_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 ascender;	/**< Maximum data offset. */
-	int16_t descender;	/**< Minimum data offset. */
-	int16_t max;		/**< Maximum data offset. */
-	int16_t min;		/**< Minimum data offset. */
-} ftgxDataOffset;
-
-typedef struct ftgxCharData_ ftgxCharData;
-typedef struct ftgxDataOffset_ 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_JUSTIFY_MASK		0x000f
-
-#define FTGX_ALIGN_TOP			0x0010
-#define FTGX_ALIGN_MIDDLE		0x0020
-#define FTGX_ALIGN_BOTTOM		0x0040
-#define FTGX_ALIGN_BASELINE		0x0080
-#define FTGX_ALIGN_GLYPH_TOP	0x0100
-#define FTGX_ALIGN_GLYPH_MIDDLE	0x0200
-#define FTGX_ALIGN_GLYPH_BOTTOM	0x0400
-#define FTGX_ALIGN_MASK			0x0ff0
-
-#define FTGX_STYLE_UNDERLINE	0x1000
-#define FTGX_STYLE_STRIKE		0x2000
-#define FTGX_STYLE_MASK			0xf000
-
-#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. */
-
-void InitFreeType(uint8_t* fontBuffer, FT_Long bufferSize);
-void ChangeFontSize(FT_UInt pixelSize);
-wchar_t* charToWideChar(const char* p);
-void ClearFontData();
-
-/*! \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_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 int16_t getStyleOffsetWidth(uint16_t width, uint16_t format);
-		static int16_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(FT_UInt pixelSize, uint8_t textureFormat = GX_TF_RGBA8, uint8_t vertexIndex = GX_VTXFMT1);
-		~FreeTypeGX();
-
-		void setVertexFormat(uint8_t vertexIndex);
-		void setCompatibilityMode(uint32_t compatibilityMode);
-
-		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);
-		void getOffset(wchar_t *text, ftgxDataOffset* offset);
-		void getOffset(wchar_t const *text, ftgxDataOffset* offset);
-};
-
-#endif /* FREETYPEGX_H_ */
+/*
+ * 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 <malloc.h>
+#include <string.h>
+#include <wchar.h>
+#include <map>
+
+#include "Metaphrasis.h"
+
+#define MAX_FONT_SIZE 100
+
+/*! \struct ftgxCharData_
+ *
+ * Font face character glyph relevant data structure.
+ */
+typedef struct ftgxCharData_ {
+	int16_t renderOffsetX;		/**< Texture X axis bearing offset. */
+	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. */
+
+	int16_t renderOffsetY;		/**< Texture Y axis bearing offset. */
+	int16_t renderOffsetMax;	/**< Texture Y axis bearing maximum value. */
+	int16_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 ascender;	/**< Maximum data offset. */
+	int16_t descender;	/**< Minimum data offset. */
+	int16_t max;		/**< Maximum data offset. */
+	int16_t min;		/**< Minimum data offset. */
+} ftgxDataOffset;
+
+typedef struct ftgxCharData_ ftgxCharData;
+typedef struct ftgxDataOffset_ 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_JUSTIFY_MASK		0x000f
+
+#define FTGX_ALIGN_TOP			0x0010
+#define FTGX_ALIGN_MIDDLE		0x0020
+#define FTGX_ALIGN_BOTTOM		0x0040
+#define FTGX_ALIGN_BASELINE		0x0080
+#define FTGX_ALIGN_GLYPH_TOP	0x0100
+#define FTGX_ALIGN_GLYPH_MIDDLE	0x0200
+#define FTGX_ALIGN_GLYPH_BOTTOM	0x0400
+#define FTGX_ALIGN_MASK			0x0ff0
+
+#define FTGX_STYLE_UNDERLINE	0x1000
+#define FTGX_STYLE_STRIKE		0x2000
+#define FTGX_STYLE_MASK			0xf000
+
+#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. */
+
+void InitFreeType(uint8_t* fontBuffer, FT_Long bufferSize);
+void DeinitFreeType();
+void ChangeFontSize(FT_UInt pixelSize);
+wchar_t* charToWideChar(const char* p);
+void ClearFontData();
+
+/*! \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_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 int16_t getStyleOffsetWidth(uint16_t width, uint16_t format);
+		static int16_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(FT_UInt pixelSize, uint8_t textureFormat = GX_TF_RGBA8, uint8_t vertexIndex = GX_VTXFMT1);
+		~FreeTypeGX();
+
+		void setVertexFormat(uint8_t vertexIndex);
+		void setCompatibilityMode(uint32_t compatibilityMode);
+
+		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);
+		void getOffset(wchar_t *text, ftgxDataOffset* offset);
+		void getOffset(wchar_t const *text, ftgxDataOffset* offset);
+};
+
+#endif /* FREETYPEGX_H_ */

update.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<app version="3.1.6">
-<file url="http://fceugc.googlecode.com/files/FCE%20Ultra%20GX%203.1.6.zip"></file>
+<app version="3.1.7">
+<file url="http://fceugc.googlecode.com/files/FCE%20Ultra%20GX%203.1.7.zip"></file>
 </app>