Flipped UI, minor changes

Flipped UI, removed extra Batch2D, added comments and minor changes

src/graphics/Batch2D.cpp

@@ -74,13 +74,13 @@ void Batch2D::rect(float x, float y, float w, float h){
 void Batch2D::rect(float x, float y, float w, float h,
 					float u, float v, float tx, float ty,
 					float r, float g, float b, float a){
-	vertex(x, y, u, v, r,g,b,a);
-	vertex(x+w, y+h, u+tx, v+ty, r,g,b,a);
-	vertex(x, y+h, u, v+ty, r,g,b,a);
+	vertex(x, y, u, v+ty, r,g,b,a);
+	vertex(x+w, y+h, u+tx, v, r,g,b,a);
+	vertex(x, y+h, u, v, r,g,b,a);
 
-	vertex(x, y, u, v, r,g,b,a);
-	vertex(x+w, y, u+tx, v, r,g,b,a);
-	vertex(x+w, y+h, u+tx, v+ty, r,g,b,a);
+	vertex(x, y, u, v+ty, r,g,b,a);
+	vertex(x+w, y, u+tx, v+ty, r,g,b,a);
+	vertex(x+w, y+h, u+tx, v, r,g,b,a);
 }
 
 void Batch2D::render() {

src/graphics/Font.cpp

@@ -9,15 +9,8 @@ Font::~Font(){
 	delete texture;
 }
 
-
-void Font::draw(Batch2D* batch, std::string text, int x, int y) {
-	for (char c : text){
-		float u = (c % 16) / 16.0f;
-		float v = 1.0f - ((c / 16) / 16.0f) - 1.0f/16.0f;
-		batch->rect(x, y, 8, 8, u, v, 1.0f/16.0f, 1.0f/16.0f, 1,1,1,1);
-
-		int gw = 7;
-		switch (c){
+int Font::getGlyphWidth(char c) {
+	switch (c){
 		case 'l':
 		case 'i':
 		case 'j':
@@ -25,16 +18,19 @@ void Font::draw(Batch2D* batch, std::string text, int x, int y) {
 		case '.':
 		case ',':
 		case ':':
-		case ';':
-			gw = 3;
-			break;
-		case 't':
-			gw = 5;
-			break;
-		case ' ':
-			gw = 3;
-			break;
-		}
-		x += gw;
+		case ';': return 3;
+		case 't': return 5;
+		case ' ': return 3;
+	}
+	return 7;
+}
+
+
+void Font::draw(Batch2D* batch, std::string text, int x, int y) {
+	for (char c : text){
+		float u = (c % 16) / 16.0f;
+		float v = 1.0f - ((c / 16) / 16.0f) - 1.0f/16.0f;
+		batch->rect(x, y, 8, 8, u, v, 1.0f/16.0f, 1.0f/16.0f, 1,1,1,1);
+		x += getGlyphWidth(c);
 	}
 }

src/graphics/Font.h

@@ -12,6 +12,7 @@ public:
 	Font(Texture* texture);
 	~Font();
 
+	int getGlyphWidth(char c);
 	void draw(Batch2D* batch, std::string text, int x, int y);
 };