Overhauled ImageRasterizer, fixed a bunch of other crap, getting ready to poke around in love.graphics

src/modules/graphics/opengl/Font.h

@@ -1,30 +1,32 @@
-/**
-* Copyright (c) 2006-2010 LOVE Development Team
-* 
-* 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.
+/**
+* Copyright (c) 2006-2010 LOVE Development Team
+* 
+* 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.
 **/
 
 #ifndef LOVE_GRAPHICS_OPENGL_FONT_H
 #define LOVE_GRAPHICS_OPENGL_FONT_H
 
+// STD
+#include <string>
+
 // LOVE
 #include <common/Object.h>
 #include <graphics/Volatile.h>
-#include <filesystem/File.h>
 
 namespace love
 {
@@ -36,8 +38,6 @@ namespace opengl
 	{
 	protected:
 
-		love::filesystem::File * file;
-
 		int size;
 		float lineHeight;
 		float mSpacing; // modifies the spacing by multiplying it with this value

src/modules/graphics/opengl/Glyph.cpp

@@ -108,7 +108,7 @@ namespace opengl
 			(GLsizei)width, 
 			(GLsizei)height, 
 			0, 
-			GL_LUMINANCE_ALPHA, 
+			GL_RGBA, 
 			GL_UNSIGNED_BYTE, 
 			data->getData());
 

src/modules/graphics/opengl/TrueTypeFont.h

@@ -24,6 +24,10 @@
 // Module
 #include "Font.h"
 
+// LOVE
+#include <common/config.h>
+#include <common/Data.h>
+
 // FreeType2
 #ifdef LOVE_MACOSX
 #include <freetype/ft2build.h>