1 files changed, 233 insertions, 233 deletions

diff --git a/src/libjin/Graphics/Font/TextureFont.cpp b/src/libjin/Graphics/Font/TextureFont.cpp
index a1f2b27..8c9c4ac 100644
--- a/src/libjin/Graphics/Font/TextureFont.cpp
+++ b/src/libjin/Graphics/Font/TextureFont.cpp
@@ -6,295 +6,295 @@
 
 namespace jin
 {
-namespace graphics
-{
-
-	using namespace std;
-	using namespace math;
-
-	TextureFont * TextureFont::createTextureFont(const Bitmap* bitmap, const Content& codepoints, int cellw, int cellh)
-	{
-		TextureFont* tf = new TextureFont(bitmap, codepoints, cellw, cellh);
-		return tf;
-	}
-
-	TextureFont * TextureFont::createTextureFont(const Bitmap* bitmap, const Text& codepoints, int cellw, int cellh)
+	namespace graphics
 	{
-		TextureFont* tf = new TextureFont(bitmap, *codepoints, cellw, cellh);
-		return tf;
-	}
 
-	TextureFont* TextureFont::createTextureFont(const Bitmap* bitmap, const Content& codepoints, Color mask, int cellh)
-	{
-		TextureFont* tf = new TextureFont(bitmap, codepoints, mask, cellh);
-		return tf;
-	}
+		using namespace std;
+		using namespace math;
 
-	TextureFont* TextureFont::createTextureFont(const Bitmap* bitmap, const Text& codepoints, Color mask, int cellh)
-	{
-		TextureFont* tf = new TextureFont(bitmap, *codepoints, mask, cellh);
-		return tf;
-	}
+		TextureFont * TextureFont::createTextureFont(const Bitmap* bitmap, const Content& codepoints, int cellw, int cellh)
+		{
+			TextureFont* tf = new TextureFont(bitmap, codepoints, cellw, cellh);
+			return tf;
+		}
 
-    TextureFont::~TextureFont()
-    {
-    }
+		TextureFont * TextureFont::createTextureFont(const Bitmap* bitmap, const Text& codepoints, int cellw, int cellh)
+		{
+			TextureFont* tf = new TextureFont(bitmap, *codepoints, cellw, cellh);
+			return tf;
+		}
 
-	const TextureFont::TextureGlyph* TextureFont::findGlyph(Codepoint codepoint) const
-	{
-		auto it = glyphs.find(codepoint);
-		if (it != glyphs.end())
+		TextureFont* TextureFont::createTextureFont(const Bitmap* bitmap, const Content& codepoints, Color mask, int cellh)
 		{
-			return &it->second;
+			TextureFont* tf = new TextureFont(bitmap, codepoints, mask, cellh);
+			return tf;
 		}
-		else
-			return nullptr;
-	}
 
-	Page* TextureFont::typeset(const Content& text, int lineheight, int spacing)
-	{
-		Page* page = new Page();
-		page->font = this;
-		vector<GlyphArrayDrawInfo>& glyphinfolist = page->glyphinfolist;
-		vector<GlyphVertex>& glyphvertices = page->glyphvertices;
-		int texture = -1;
-		const TextureGlyph* glyph = nullptr;
-		GlyphVertex vertex;
-		Vector2<int> p(0, 0);
-		int i = 0;
+		TextureFont* TextureFont::createTextureFont(const Bitmap* bitmap, const Text& codepoints, Color mask, int cellh)
+		{
+			TextureFont* tf = new TextureFont(bitmap, *codepoints, mask, cellh);
+			return tf;
+		}
 
-#define glyphvertices_push(_x, _y, _u, _v) \
-		vertex.x = _x; vertex.y = _y;\
-		vertex.u = _u; vertex.v = _v;\
-		glyphvertices.push_back(vertex);\
+		TextureFont::~TextureFont()
+		{
+		}
 
-		for (Codepoint c : text)
+		const TextureFont::TextureGlyph* TextureFont::findGlyph(Codepoint codepoint) const
 		{
-			if (c == 0x0D) continue;
-			if (c == 0x0A)
+			auto it = glyphs.find(codepoint);
+			if (it != glyphs.end())
 			{
-				/* new line */
-				p.y += lineheight;
-				p.x = 0;
-				continue;
+				return &it->second;
 			}
-			glyph = findGlyph(c);																	
-			if (glyph == nullptr) continue;
-			if (texture != this->texture)														
-			{																
-				texture = this->texture;
-				GlyphArrayDrawInfo info;														
-				info.start = i;																	
-				info.count = 0;																	
-				info.texture = texture;													
-				glyphinfolist.push_back(info);													
-			}																					
-			glyphinfolist[glyphinfolist.size() - 1].count += 4;	
-			// normalized
-			float nx = glyph->x / (float)size.w, ny = glyph->y / (float)size.h;
-			float nw = glyph->w / (float)size.w, nh = glyph->h / (float)size.h;
-			glyphvertices_push(p.x,			   p.y,			   nx,      ny);												   
-			glyphvertices_push(p.x,			   p.y + glyph->h, nx,		ny + nh);						   
-			glyphvertices_push(p.x + glyph->w, p.y + glyph->h, nx + nw, ny + nh); 
-			glyphvertices_push(p.x + glyph->w, p.y,			   nx + nw, ny);						   
-			p.x += glyph->w + spacing;
-			i += 4;
+			else
+				return nullptr;
 		}
-		getTextBox(text, &page->size.w, &page->size.h, lineheight, spacing);
-		return page;
-	}
 
-	int TextureFont::getCharWidth(int c)
-	{
-		auto it = glyphs.find(c);
-		if (it != glyphs.end())
+		Page* TextureFont::typeset(const Content& text, int lineheight, int spacing)
 		{
-			return it->second.w;
+			Page* page = new Page();
+			page->font = this;
+			vector<GlyphArrayDrawInfo>& glyphinfolist = page->glyphinfolist;
+			vector<GlyphVertex>& glyphvertices = page->glyphvertices;
+			int texture = -1;
+			const TextureGlyph* glyph = nullptr;
+			GlyphVertex vertex;
+			Vector2<int> p(0, 0);
+			int i = 0;
+
+	#define glyphvertices_push(_x, _y, _u, _v) \
+			vertex.x = _x; vertex.y = _y;\
+			vertex.u = _u; vertex.v = _v;\
+			glyphvertices.push_back(vertex);\
+
+			for (Codepoint c : text)
+			{
+				if (c == 0x0D) continue;
+				if (c == 0x0A)
+				{
+					/* new line */
+					p.y += lineheight;
+					p.x = 0;
+					continue;
+				}
+				glyph = findGlyph(c);																	
+				if (glyph == nullptr) continue;
+				if (texture != this->texture)														
+				{																
+					texture = this->texture;
+					GlyphArrayDrawInfo info;														
+					info.start = i;																	
+					info.count = 0;																	
+					info.texture = texture;													
+					glyphinfolist.push_back(info);													
+				}																					
+				glyphinfolist[glyphinfolist.size() - 1].count += 4;	
+				// normalized
+				float nx = glyph->x / (float)size.w, ny = glyph->y / (float)size.h;
+				float nw = glyph->w / (float)size.w, nh = glyph->h / (float)size.h;
+				glyphvertices_push(p.x,			   p.y,			   nx,      ny);												   
+				glyphvertices_push(p.x,			   p.y + glyph->h, nx,		ny + nh);						   
+				glyphvertices_push(p.x + glyph->w, p.y + glyph->h, nx + nw, ny + nh); 
+				glyphvertices_push(p.x + glyph->w, p.y,			   nx + nw, ny);						   
+				p.x += glyph->w + spacing;
+				i += 4;
+			}
+			getTextBox(text, &page->size.w, &page->size.h, lineheight, spacing);
+			return page;
 		}
-		return 0;
-	}
 
-	int TextureFont::getCharHeight(int c)
-	{
-		auto it = glyphs.find(c);
-		if (it != glyphs.end())
+		int TextureFont::getCharWidth(int c)
 		{
-			return it->second.h;
+			auto it = glyphs.find(c);
+			if (it != glyphs.end())
+			{
+				return it->second.w;
+			}
+			return 0;
 		}
-		return 0;
-	}
 
-	int TextureFont::getTextWidth(const Content& t, int spacing)
-	{
-		int res = 0;
-		int tmp = 0;
-		for (Codepoint c : t)
+		int TextureFont::getCharHeight(int c)
 		{
-			if (c == 0x0D)
-				continue;
-			if (c == 0x0A)
+			auto it = glyphs.find(c);
+			if (it != glyphs.end())
 			{
-				tmp = 0;
-				continue;
+				return it->second.h;
 			}
-			tmp += getCharWidth(c) + spacing;
-			if (tmp > res)
-				res = tmp;
+			return 0;
 		}
-		return res;
-	}
 
-	int TextureFont::getTextHeight(const Content& t, int lineheight)
-	{
-		int res = 0;
-		bool newline = true;
-		for (Codepoint c : t)
+		int TextureFont::getTextWidth(const Content& t, int spacing)
 		{
-			if (c == 0x0A)
-				newline = true;
-			else if (c == 0x0D);
-			else if (newline)
+			int res = 0;
+			int tmp = 0;
+			for (Codepoint c : t)
 			{
-				newline = false;
-				res += lineheight;
+				if (c == 0x0D)
+					continue;
+				if (c == 0x0A)
+				{
+					tmp = 0;
+					continue;
+				}
+				tmp += getCharWidth(c) + spacing;
+				if (tmp > res)
+					res = tmp;
 			}
+			return res;
 		}
-		return res;
-	}
 
-	void TextureFont::getTextBox(const Content& text, int* w, int* h, int lineheight, int spacing)
-	{
-		*w = 0;
-		*h = 0;
-		int tmp = 0;
-		bool newline = true;
-		for (Codepoint c : text)
+		int TextureFont::getTextHeight(const Content& t, int lineheight)
 		{
-			if (c == 0x0D)
-				continue;
-			if (c == 0x0A)
+			int res = 0;
+			bool newline = true;
+			for (Codepoint c : t)
 			{
-				tmp = 0;
-				newline = true;
-				continue;
+				if (c == 0x0A)
+					newline = true;
+				else if (c == 0x0D);
+				else if (newline)
+				{
+					newline = false;
+					res += lineheight;
+				}
 			}
-			else if (newline)
+			return res;
+		}
+
+		void TextureFont::getTextBox(const Content& text, int* w, int* h, int lineheight, int spacing)
+		{
+			*w = 0;
+			*h = 0;
+			int tmp = 0;
+			bool newline = true;
+			for (Codepoint c : text)
 			{
-				newline = false;
-				*h += lineheight;
+				if (c == 0x0D)
+					continue;
+				if (c == 0x0A)
+				{
+					tmp = 0;
+					newline = true;
+					continue;
+				}
+				else if (newline)
+				{
+					newline = false;
+					*h += lineheight;
+				}
+				tmp += getCharWidth(c) + spacing;
+				if (tmp > *w)
+					*w = tmp;
 			}
-			tmp += getCharWidth(c) + spacing;
-			if (tmp > *w)
-				*w = tmp;
 		}
-	}
-
-	Page* TextureFont::typeset(const Text& text, int lineheight, int spacing)
-	{
-		return typeset(*text, lineheight, spacing);
-	}
 
-    void TextureFont::print(const Page* page, int x, int y)
-    {
-		Shader* shader = Shader::getCurrentShader();
-		const vector<GlyphArrayDrawInfo>& glyphinfolist = page->glyphinfolist;
-		const vector<GlyphVertex>& glyphvertices = page->glyphvertices;
-		gl.ModelMatrix.setTransformation(x, y, 0, 1, 1, 0, 0);
-		shader->sendMatrix4(SHADER_MODEL_MATRIX, &gl.ModelMatrix);
-		shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix);
-		for (int i = 0; i < glyphinfolist.size(); ++i)
+		Page* TextureFont::typeset(const Text& text, int lineheight, int spacing)
 		{
-			const GlyphArrayDrawInfo& info = glyphinfolist[i];
-			shader->bindVertexPointer(2, GL_INT, sizeof(GlyphVertex), &glyphvertices[info.start].x);
-			shader->bindUVPointer(2, GL_FLOAT, sizeof(GlyphVertex), &glyphvertices[info.start].u);
-			gl.bindTexture(info.texture);
-			gl.drawArrays(GL_QUADS, 0, info.count);
-			gl.bindTexture(0);
+			return typeset(*text, lineheight, spacing);
 		}
-    }
-
-    void TextureFont::print(const Content& text, int x, int y, int lineheight, int spacing)
-    {
-		Page* page = typeset(text, lineheight, spacing);
-		print(page, x, y);
-		delete page;
-    }
-
-	void TextureFont::print(const Text& text, int x, int y, int lineheight, int spacing)
-	{
-		Page* page = typeset(text, lineheight, spacing);
-		print(page, x, y);
-		delete page;
-	}
 
-    TextureFont::TextureFont(const Bitmap* bitmap, const Content& codepoints, int cellw, int cellh)
-        : Drawable(bitmap)
-        , Font(cellh)
-    {
-		TextureGlyph glyph; 
-		Vector2<int> count(bitmap->getWidth() / cellw, bitmap->getHeight() / cellh);
-		glyph.w = cellw; 
-		glyph.h = cellh;
-		for (int y = 0; y < count.row; ++y)
+		void TextureFont::print(const Page* page, int x, int y)
 		{
-			glyph.y = y * cellh;
-			for (int x = 0; x < count.colum; ++x)
+			Shader* shader = Shader::getCurrentShader();
+			const vector<GlyphArrayDrawInfo>& glyphinfolist = page->glyphinfolist;
+			const vector<GlyphVertex>& glyphvertices = page->glyphvertices;
+			gl.ModelMatrix.setTransformation(x, y, 0, 1, 1, 0, 0);
+			shader->sendMatrix4(SHADER_MODEL_MATRIX, &gl.ModelMatrix);
+			shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix);
+			for (int i = 0; i < glyphinfolist.size(); ++i)
 			{
-				glyph.x = x * cellw;
-				if (x + y * count.colum >= codepoints.size())
-					return;
-				glyphs.insert(std::pair<Codepoint, TextureGlyph>(codepoints[x + y * count.colum], glyph));
+				const GlyphArrayDrawInfo& info = glyphinfolist[i];
+				shader->bindVertexPointer(2, GL_INT, sizeof(GlyphVertex), &glyphvertices[info.start].x);
+				shader->bindUVPointer(2, GL_FLOAT, sizeof(GlyphVertex), &glyphvertices[info.start].u);
+				gl.bindTexture(info.texture);
+				gl.drawArrays(GL_QUADS, 0, info.count);
+				gl.bindTexture(0);
 			}
 		}
-    }
 
-    TextureFont::TextureFont(const Bitmap* bitmap, const Content& codepoints, Color mask, int cellh)
-        : Drawable(bitmap)
-        , Font(cellh)
-    {
-		TextureGlyph glyph;
-		glyph.h = cellh;
-		int w = bitmap->getWidth();
-		int h = bitmap->getHeight();
-		int i = 0;
-		for (int y = 0; y < h; y += cellh)
+		void TextureFont::print(const Content& text, int x, int y, int lineheight, int spacing)
 		{
-			glyph.y = y;
-			bool newc = false;
-			for (int x = 0; x <= w; ++x)
+			Page* page = typeset(text, lineheight, spacing);
+			print(page, x, y);
+			delete page;
+		}
+
+		void TextureFont::print(const Text& text, int x, int y, int lineheight, int spacing)
+		{
+			Page* page = typeset(text, lineheight, spacing);
+			print(page, x, y);
+			delete page;
+		}
+
+		TextureFont::TextureFont(const Bitmap* bitmap, const Content& codepoints, int cellw, int cellh)
+			: Drawable(bitmap)
+			, Font(cellh)
+		{
+			TextureGlyph glyph; 
+			Vector2<int> count(bitmap->getWidth() / cellw, bitmap->getHeight() / cellh);
+			glyph.w = cellw; 
+			glyph.h = cellh;
+			for (int y = 0; y < count.row; ++y)
 			{
-				if (x == w && newc)
+				glyph.y = y * cellh;
+				for (int x = 0; x < count.colum; ++x)
 				{
-					glyph.w = x - glyph.x;
-					if (i >= codepoints.size())
+					glyph.x = x * cellw;
+					if (x + y * count.colum >= codepoints.size())
 						return;
-					glyphs.insert(std::pair<Codepoint, TextureGlyph>(codepoints[i], glyph));
-					++i;
-					newc = false;
-					break;
-				}
-				Color c = bitmap->getPixels()[x + y * w];
-				if (!newc && c != mask)
-				{
-					glyph.x = x;
-					newc = true;
+					glyphs.insert(std::pair<Codepoint, TextureGlyph>(codepoints[x + y * count.colum], glyph));
 				}
-				else if (newc && c == mask)
+			}
+		}
+
+		TextureFont::TextureFont(const Bitmap* bitmap, const Content& codepoints, Color mask, int cellh)
+			: Drawable(bitmap)
+			, Font(cellh)
+		{
+			TextureGlyph glyph;
+			glyph.h = cellh;
+			int w = bitmap->getWidth();
+			int h = bitmap->getHeight();
+			int i = 0;
+			for (int y = 0; y < h; y += cellh)
+			{
+				glyph.y = y;
+				bool newc = false;
+				for (int x = 0; x <= w; ++x)
 				{
-					glyph.w = x - glyph.x;
-					if (i >= codepoints.size())
-						return;
-					glyphs.insert(std::pair<Codepoint, TextureGlyph>(codepoints[i], glyph));
-					if (codepoints[i] == 't')
+					if (x == w && newc)
 					{
-						int a = 10;
+						glyph.w = x - glyph.x;
+						if (i >= codepoints.size())
+							return;
+						glyphs.insert(std::pair<Codepoint, TextureGlyph>(codepoints[i], glyph));
+						++i;
+						newc = false;
+						break;
+					}
+					Color c = bitmap->getPixels()[x + y * w];
+					if (!newc && c != mask)
+					{
+						glyph.x = x;
+						newc = true;
+					}
+					else if (newc && c == mask)
+					{
+						glyph.w = x - glyph.x;
+						if (i >= codepoints.size())
+							return;
+						glyphs.insert(std::pair<Codepoint, TextureGlyph>(codepoints[i], glyph));
+						if (codepoints[i] == 't')
+						{
+							int a = 10;
+						}
+						++i;
+						newc = false;
 					}
-					++i;
-					newc = false;
 				}
 			}
 		}
-    }
 
-}
+	}
 }
\ No newline at end of file