Revert "move around some files to keep the size of the next commit down"

This reverts commit 0951283b31.

ExternalLibs/GL/gles.h

@@ -1,14 +0,0 @@
-/* OpenGL ES-specific. --ryan. */
-/* I should probably put an official GLES header in here instead. Oh well. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void glOrthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-void glClearDepthf(GLclampf depth);
-
-#ifdef __cplusplus
-}
-#endif
-

ExternalLibs/glfont2/glfont2.cpp

@@ -0,0 +1,319 @@
+//*******************************************************************
+//glfont2.cpp -- glFont Version 2.0 implementation
+//Copyright (c) 1998-2002 Brad Fish
+//See glfont.html for terms of use
+//May 14, 2002
+//*******************************************************************
+
+//STL headers
+#include <string>
+#include <utility>
+#include <iostream>
+#include <fstream>
+using namespace std;
+
+//OpenGL headers
+/*
+#ifdef _WINDOWS
+#include <windows.h>
+#endif
+#include <OpenGL/gl.h>
+*/
+#include "Base.h"
+
+#include "SDL_endian.h"
+
+//glFont header
+#include "glfont2.h"
+using namespace glfont;
+
+static int read_int(ifstream &input)
+{
+	int buffer;
+	
+	input.read((char *)&buffer, 4);
+	return SDL_SwapLE32(buffer);
+}
+
+static float read_float(ifstream &input)
+{
+	union
+	{
+		int i;
+		float f; 
+	} buffer;
+	
+	input.read((char *)&buffer.i, 4);
+	buffer.i = SDL_SwapLE32(buffer.i);
+	return buffer.f;
+}
+
+//*******************************************************************
+//GLFont Class Implementation
+//*******************************************************************
+GLFont::GLFont ()
+{
+	//Initialize header to safe state
+	header.tex = -1;
+	header.tex_width = 0;
+	header.tex_height = 0;
+	header.start_char = 0;
+	header.end_char = 0;
+	header.chars = NULL;
+}
+//*******************************************************************
+GLFont::~GLFont ()
+{
+	//Destroy the font
+	Destroy();
+}
+//*******************************************************************
+bool GLFont::Create (const char *file_name, int tex, bool loadTexture)
+{
+	ifstream input;
+	int num_chars, num_tex_bytes;
+	char *tex_bytes;
+
+	//Destroy the old font if there was one, just to be safe
+	Destroy();
+
+	//Open input file
+	input.open(file_name, ios::in | ios::binary);
+	if (!input)
+		return false;
+
+	// Read the header from file
+	header.tex = tex;
+	input.seekg(4, ios::cur); // skip tex field
+	header.tex_width = read_int(input);
+	header.tex_height = read_int(input);
+	header.start_char = read_int(input);
+	header.end_char = read_int(input);
+	input.seekg(4, ios::cur); // skip chars field
+	
+	std::ostringstream os;
+	os << "tex_width: " << header.tex_width << " tex_height: " << header.tex_height;
+	debugLog(os.str());
+	
+	//Allocate space for character array
+	num_chars = header.end_char - header.start_char + 1;
+	if ((header.chars = new GLFontChar[num_chars]) == NULL)
+		return false;
+
+	//Read character array
+	for (int i = 0; i < num_chars; i++)
+	{
+		header.chars[i].dx = read_float(input);
+		header.chars[i].dy = read_float(input);
+		header.chars[i].tx1 = read_float(input);
+		header.chars[i].ty1 = read_float(input);
+		header.chars[i].tx2 = read_float(input);
+		header.chars[i].ty2 = read_float(input);
+	}
+
+	//Read texture pixel data
+	num_tex_bytes = header.tex_width * header.tex_height * 2;
+	tex_bytes = new char[num_tex_bytes];
+	input.read(tex_bytes, num_tex_bytes);
+
+
+	//Build2DMipmaps(3, header.tex_width, header.tex_height, GL_UNSIGNED_BYTE, tex_bytes, 1);
+
+	if (loadTexture)
+	{
+#ifdef BBGE_BUILD_OPENGL
+		glBindTexture(GL_TEXTURE_2D, tex);  
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+
+		//glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+		glTexImage2D(GL_TEXTURE_2D, 0, 2, header.tex_width,
+			header.tex_height, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE,
+			(void *)tex_bytes);
+		//gluBuild2DMipmaps(GL_TEXTURE_2D, 2, header.tex_width, header.tex_height, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, (void*)tex_bytes);
+		//Build2DMipmaps(3, header.tex_width, header.tex_height, GL_LUMINANCE_ALPHA, tex_bytes, 1);
+		//Create OpenGL texture
+		/*
+		glBindTexture(GL_TEXTURE_2D, tex);  
+		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		//glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+
+		*/
+#endif
+	}
+
+	//Free texture pixels memory
+	delete[] tex_bytes;
+
+	//Close input file
+	input.close();
+
+	//Return successfully
+	return true;
+}
+//*******************************************************************
+bool GLFont::Create (const std::string &file_name, int tex, bool loadTexture)
+{
+	return Create(file_name.c_str(), tex);
+}
+//*******************************************************************
+void GLFont::Destroy (void)
+{
+	//Delete the character array if necessary
+	if (header.chars)
+	{
+		delete[] header.chars;
+		header.chars = NULL;
+	}
+}
+//*******************************************************************
+void GLFont::GetTexSize (std::pair<int, int> *size)
+{
+	//Retrieve texture size
+	size->first = header.tex_width;
+	size->second = header.tex_height;
+}
+//*******************************************************************
+int GLFont::GetTexWidth (void)
+{
+	//Return texture width
+	return header.tex_width;
+}
+//*******************************************************************
+int GLFont::GetTexHeight (void)
+{
+	//Return texture height
+	return header.tex_height;
+}
+//*******************************************************************
+void GLFont::GetCharInterval (std::pair<int, int> *interval)
+{
+	//Retrieve character interval
+	interval->first = header.start_char;
+	interval->second = header.end_char;
+}
+//*******************************************************************
+int GLFont::GetStartChar (void)
+{
+	//Return start character
+	return header.start_char;
+}
+//*******************************************************************
+int GLFont::GetEndChar (void)
+{
+	//Return end character
+	return header.end_char;
+}
+//*******************************************************************
+void GLFont::GetCharSize (int c, std::pair<int, int> *size)
+{
+	//Make sure character is in range
+	if (c < header.start_char || c > header.end_char)
+	{
+		//Not a valid character, so it obviously has no size
+		size->first = 0;
+		size->second = 0;
+	}
+	else
+	{
+		GLFontChar *glfont_char;
+
+		//Retrieve character size
+		glfont_char = &header.chars[c - header.start_char];
+		size->first = (int)(glfont_char->dx * header.tex_width);
+		size->second = (int)(glfont_char->dy *
+			header.tex_height);
+	}
+}
+//*******************************************************************
+int GLFont::GetCharWidth (int c)
+{
+	//Make sure in range
+	if (c < header.start_char || c > header.end_char)
+		return 0;
+	else
+	{
+		GLFontChar *glfont_char;
+		
+		//Retrieve character width
+		glfont_char = &header.chars[c - header.start_char];
+
+		// hack to fix empty spaces
+		if (c == ' ' && glfont_char->dx <= 0)
+		{
+			GLFontChar *glfont_a = &header.chars['a' - header.start_char];
+			glfont_char->dx = glfont_a->dx*0.75;
+			glfont_char->dy = glfont_a->dy;
+		}
+
+		return (int)(glfont_char->dx * header.tex_width);
+	}
+}
+//*******************************************************************
+int GLFont::GetCharHeight (int c)
+{
+	//Make sure in range
+	if (c < header.start_char || c > header.end_char)
+		return 0;
+	else
+	{
+		GLFontChar *glfont_char;
+
+		//Retrieve character height
+		glfont_char = &header.chars[c - header.start_char];
+		return (int)(glfont_char->dy * header.tex_height);
+	}
+}
+//*******************************************************************
+void GLFont::Begin (void)
+{
+#ifdef BBGE_BUILD_OPENGL
+	//Bind to font texture
+	glBindTexture(GL_TEXTURE_2D, header.tex);
+#endif
+}
+//*******************************************************************
+void GLFont::GetStringSize (const std::string &text, std::pair<int, int> *size)
+{
+	unsigned int i;
+	char c;
+	GLFontChar *glfont_char;
+	float width;
+	
+	//debugLog("size->second");
+	//Height is the same for now...might change in future
+	size->second = (int)(header.chars[header.start_char].dy *
+		header.tex_height);
+
+	//Calculate width of string
+	width = 0.0F;
+	for (i = 0; i < text.size(); i++)
+	{
+		//Make sure character is in range
+		c = (char)text[i];
+		
+		if (c < header.start_char || c > header.end_char)
+			continue;
+
+		//Get pointer to glFont character
+		glfont_char = &header.chars[c - header.start_char];
+
+		//Get width and height
+		width += glfont_char->dx * header.tex_width;		
+	}
+
+	//Save width
+	//debugLog("size first");
+	size->first = (int)width;
+	
+	//debugLog("done");
+}
+
+//End of file
+
+

ExternalLibs/glfont2/glfont2.h

@@ -0,0 +1,146 @@
+//*******************************************************************
+//glfont2.h -- Header for glfont2.cpp
+//Copyright (c) 1998-2002 Brad Fish
+//See glfont.html for terms of use
+//May 14, 2002
+//*******************************************************************
+
+#ifndef GLFONT2_H
+#define GLFONT2_H
+
+#include <assert.h>
+
+//*******************************************************************
+//GLFont Interface
+//*******************************************************************
+
+//glFont namespace
+namespace glfont
+{
+	class GLFont;	
+}
+
+//glFont class
+class glfont::GLFont
+{
+private:
+
+	//glFont character structure
+	typedef struct
+	{
+		float dx, dy;
+		float tx1, ty1;
+		float tx2, ty2;
+	} GLFontChar;
+
+	//glFont header structure
+	struct
+	{
+		int tex;
+		int tex_width, tex_height;
+		int start_char, end_char;
+		GLFontChar *chars;
+	} header;
+
+public:
+
+	//Constructor
+	GLFont ();
+
+	//Destructor
+	~GLFont ();
+
+public:
+
+	//Creates the glFont
+	bool Create (const char *file_name, int tex, bool loadTexture=true);
+	bool Create (const std::string &file_name, int tex, bool loadTexture=true);
+
+	//Destroys the glFont
+	void Destroy (void);
+
+	//Texture size retrieval methods
+	void GetTexSize (std::pair<int, int> *size);
+	int GetTexWidth (void);
+	int GetTexHeight (void);
+
+	//Character interval retrieval methods
+	void GetCharInterval (std::pair<int, int> *interval);
+	int GetStartChar (void);
+	int GetEndChar (void);
+
+	//Character size retrieval methods
+	void GetCharSize (int c, std::pair<int, int> *size);
+	int GetCharWidth (int c);
+	int GetCharHeight (int c);
+	
+	void GetStringSize (const std::string &text, std::pair<int, int> *size);
+
+
+	//Begins text output with this font
+	void Begin (void);	
+	
+	//Template function to output a scaled, colored std::basic_string
+	template<class T> void DrawString (
+		const std::basic_string<T> &text, float scalar, float x,
+		float y, const float *top_color, const float *bottom_color, float alpha, float lastAlpha)
+	{
+		unsigned int i;
+		T c;
+		GLFontChar *glfont_char;
+		float width, height;
+		
+		//Begin rendering quads
+		glBegin(GL_QUADS);
+		
+		int sz = text.size();
+
+		float a = 0;
+		//Loop through characters
+		for (i = 0; i < sz; i++)
+		{
+			//Make sure character is in range
+			c = text[i];
+			if (c < header.start_char || c > header.end_char)
+				continue;
+
+			//Get pointer to glFont character
+			glfont_char = &header.chars[c - header.start_char];
+
+			//Get width and height
+			width = (glfont_char->dx * header.tex_width) * scalar;
+			height = (glfont_char->dy * header.tex_height) * scalar;
+			
+			if (i == (sz-1))
+				a = alpha*lastAlpha;
+			else
+				a = alpha;
+
+			//Specify colors, vertices, and texture coordinates
+			glColor4f(top_color[0], top_color[1], top_color[2], a);
+			glTexCoord2f(glfont_char->tx1, glfont_char->ty1);
+			glVertex3f(x, y, 0.0F);
+			glTexCoord2f(glfont_char->tx2, glfont_char->ty1);
+			glVertex3f(x + width, y, 0.0F);
+			glColor4f(bottom_color[0], bottom_color[1], bottom_color[2], a);
+			glTexCoord2f(glfont_char->tx2, glfont_char->ty2);
+			glVertex3f(x + width, y + height, 0.0F);
+			glTexCoord2f(glfont_char->tx1, glfont_char->ty2);
+			glVertex3f(x, y + height, 0.0F);
+		
+			//Move to next character
+			x += width;
+		}
+
+		//Stop rendering quads
+		glEnd();
+	}
+};
+
+//*******************************************************************
+
+#endif
+
+//End of file
+
+

ExternalLibs/tinyxmlerror.cpp

@@ -0,0 +1,52 @@
+/*
+www.sourceforge.net/projects/tinyxml
+Original code (2.0 and earlier )copyright (c) 2000-2006 Lee Thomason (www.grinninglizard.com)
+
+This software is provided 'as-is', without any express or implied 
+warranty. In no event will the authors be held liable for any 
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any 
+purpose, including commercial applications, and to alter it and 
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+*/
+
+#include "tinyxml.h"
+
+// The goal of the seperate error file is to make the first
+// step towards localization. tinyxml (currently) only supports
+// english error messages, but the could now be translated.
+//
+// It also cleans up the code a bit.
+//
+
+const char* TiXmlBase::errorString[ TIXML_ERROR_STRING_COUNT ] =
+{
+	"No error",
+	"Error",
+	"Failed to open file",
+	"Error parsing Element.",
+	"Failed to read Element name",
+	"Error reading Element value.",
+	"Error reading Attributes.",
+	"Error: empty tag.",
+	"Error reading end tag.",
+	"Error parsing Unknown.",
+	"Error parsing Comment.",
+	"Error parsing Declaration.",
+	"Error document empty.",
+	"Error null (0) or unexpected EOF found in input stream.",
+	"Error parsing CDATA.",
+	"Error when TiXmlDocument added to document, because TiXmlDocument can only be at the root.",
+};