the revival, entityx

1 files changed, 47 insertions, 51 deletions

diff --git a/src/ui_menu.cpp b/src/ui_menu.cpp
index ca830d8..f0299c6 100644
--- a/src/ui_menu.cpp
+++ b/src/ui_menu.cpp
@@ -1,5 +1,7 @@
 #include <ui_menu.hpp>
 
+#include <render.hpp>
+
 #include <fstream>
 
 extern bool gameRunning;
@@ -196,10 +198,7 @@ namespace ui {
 
             SDL_Event e;
 
-			useShader(&textShader,
-					  &textShader_uniform_texture,
-					  &textShader_attribute_coord,
-					  &textShader_attribute_tex);
+			Render::useShader(&Render::textShader);
 
             setFontSize(24);
             game::config::update();
@@ -231,7 +230,7 @@ namespace ui {
 
 			static GLuint backTex = Texture::genColor(Color(0, 0, 0, 204));
 			//static GLuint bsTex =	Texture::genColor(Color(30, 30, 30));
-			static GLuint border =	Texture::genColor(Color(245, 245, 245));            
+			static GLuint border =	Texture::genColor(Color(245, 245, 245));
 
 			GLfloat line_tex[] = {0.0, 0.0,
 								  1.0, 0.0,
@@ -241,13 +240,13 @@ namespace ui {
 
 			//draw the dark transparent background
             glColor4f(0.0f, 0.0f, 0.0f, .8f);
-			glUseProgram(textShader);
-			
+			Render::textShader.use();
+
 			glBindTexture(GL_TEXTURE_2D, backTex);
-			drawRect(vec2(offset.x - SCREEN_WIDTH / 2 - 1, offset.y - (SCREEN_HEIGHT / 2)),
-			         vec2(offset.x + SCREEN_WIDTH / 2, offset.y + (SCREEN_HEIGHT / 2)), -8.5);
+			Render::drawRect(vec2(offset.x - SCREEN_WIDTH / 2 - 1, offset.y - (SCREEN_HEIGHT / 2)),
+			                 vec2(offset.x + SCREEN_WIDTH / 2, offset.y + (SCREEN_HEIGHT / 2)), -8.5);
 
-			glUseProgram(0);
+			Render::textShader.unuse();
 
             //loop through all elements of the menu
             for (auto &m : currentMenu->items) {
@@ -256,12 +255,12 @@ namespace ui {
 
                     //draw the button background
                     GLuint bsTex = Texture::genColor(Color(m.button.color.red,m.button.color.green,m.button.color.blue));
-					
-					glUseProgram(textShader);
+
+					Render::textShader.use();
 					glBindTexture(GL_TEXTURE_2D, bsTex);
 
-					drawRect(vec2(offset.x + m.button.loc.x, offset.y + m.button.loc.y),
-							 vec2(offset.x + m.button.loc.x + m.button.dim.x, offset.y + m.button.loc.y + m.button.dim.y), -8.6);
+					Render::drawRect(vec2(offset.x + m.button.loc.x, offset.y + m.button.loc.y),
+							         vec2(offset.x + m.button.loc.x + m.button.dim.x, offset.y + m.button.loc.y + m.button.dim.y), -8.6);
                     //draw the button text
                     putStringCentered(offset.x + m.button.loc.x + (m.button.dim.x/2),
                                       (offset.y + m.button.loc.y + (m.button.dim.y/2)) - ui::fontSize/2,
@@ -273,24 +272,23 @@ namespace ui {
 
                             //if the mouse if over the button, it draws this white outline
 							glBindTexture(GL_TEXTURE_2D, border);
-						
+
 							GLfloat verts[] = {offset.x+m.button.loc.x, 					offset.y+m.button.loc.y,				-8.7,
                                 			   offset.x+m.button.loc.x+m.button.dim.x, 		offset.y+m.button.loc.y,				-8.7,
                                 			   offset.x+m.button.loc.x+m.button.dim.x, 		offset.y+m.button.loc.y+m.button.dim.y, -8.7,
                                 			   offset.x+m.button.loc.x, 					offset.y+m.button.loc.y+m.button.dim.y, -8.7,
                                 			   offset.x+m.button.loc.x, 					offset.y+m.button.loc.y, 				-8.7};
 
-							glUseProgram(textShader);
-							glEnableVertexAttribArray(textShader_attribute_coord);
-							glEnableVertexAttribArray(textShader_attribute_tex);
+							Render::textShader.use();
+							Render::textShader.enable();
 
-							glVertexAttribPointer(textShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, verts);
-							glVertexAttribPointer(textShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 0, line_tex);
+							glVertexAttribPointer(Render::textShader.coord, 3, GL_FLOAT, GL_FALSE, 0, verts);
+							glVertexAttribPointer(Render::textShader.tex, 2, GL_FLOAT, GL_FALSE, 0, line_tex);
 							glDrawArrays(GL_LINE_STRIP, 0, 5);
 
-							glDisableVertexAttribArray(textShader_attribute_coord);
-							glDisableVertexAttribArray(textShader_attribute_tex);
-							
+							Render::textShader.disable();
+							Render::textShader.unuse();
+
                             //if the mouse is over the button and clicks
                             if (SDL_GetMouseState(NULL, NULL) & SDL_BUTTON(SDL_BUTTON_LEFT)) {
                                 switch(m.member) {
@@ -330,25 +328,25 @@ namespace ui {
                         m.slider.sliderLoc = m.slider.minValue + (*m.slider.var/m.slider.maxValue)*(m.slider.dim.x-sliderW);
                     }
                     //draw the background of the slider
-					glUseProgram(textShader);
+					Render::textShader.use();
                     GLuint bsTex = Texture::genColor(Color(m.slider.color.red, m.slider.color.green, m.slider.color.blue, 175));
-					GLuint hTex =  Texture::genColor(Color(m.slider.color.red, m.slider.color.green, m.slider.color.blue, 255));					
+					GLuint hTex =  Texture::genColor(Color(m.slider.color.red, m.slider.color.green, m.slider.color.blue, 255));
 
 					glBindTexture(GL_TEXTURE_2D, bsTex);
-					drawRect(vec2(offset.x + m.slider.loc.x, offset.y + m.slider.loc.y),
-							 vec2(offset.x + m.slider.loc.x + m.slider.dim.x, offset.y + m.slider.loc.y + m.slider.dim.y), -8.6);
-	                    
+					Render::drawRect(vec2(offset.x + m.slider.loc.x, offset.y + m.slider.loc.y),
+							         vec2(offset.x + m.slider.loc.x + m.slider.dim.x, offset.y + m.slider.loc.y + m.slider.dim.y), -8.6);
+
 					//draw the slider handle
                     glBindTexture(GL_TEXTURE_2D, hTex);
 					if (m.slider.dim.y > m.slider.dim.x) {
-                        drawRect(vec2(offset.x+m.slider.loc.x, offset.y+m.slider.loc.y + (m.slider.sliderLoc * 1.05)),
-                            	 vec2(offset.x+m.slider.loc.x + sliderW, offset.y+m.slider.loc.y + (m.slider.sliderLoc * 1.05) + sliderH), -8.7);
+                        Render::drawRect(vec2(offset.x+m.slider.loc.x, offset.y+m.slider.loc.y + (m.slider.sliderLoc * 1.05)),
+                            	         vec2(offset.x+m.slider.loc.x + sliderW, offset.y+m.slider.loc.y + (m.slider.sliderLoc * 1.05) + sliderH), -8.7);
 
                         //draw the now combined slider text
                         putStringCentered(offset.x + m.slider.loc.x + (m.slider.dim.x/2), (offset.y + m.slider.loc.y + (m.slider.dim.y*1.05)) - ui::fontSize/2, outSV);
                     }else{
-                        drawRect(vec2(offset.x+m.slider.loc.x+m.slider.sliderLoc, offset.y+m.slider.loc.y),
-                                 vec2(offset.x+m.slider.loc.x + m.slider.sliderLoc + sliderW, offset.y+m.slider.loc.y + sliderH), -8.7);
+                        Render::drawRect(vec2(offset.x+m.slider.loc.x+m.slider.sliderLoc, offset.y+m.slider.loc.y),
+                                         vec2(offset.x+m.slider.loc.x + m.slider.sliderLoc + sliderW, offset.y+m.slider.loc.y + sliderH), -8.7);
 
                         //draw the now combined slider text
                         putStringCentered(offset.x + m.slider.loc.x + (m.slider.dim.x/2), (offset.y + m.slider.loc.y + (m.slider.dim.y/2)) - ui::fontSize/2, outSV);
@@ -359,20 +357,19 @@ namespace ui {
 
                             //if it is we draw a white border around it
                             glBindTexture(GL_TEXTURE_2D, border);
-							glUseProgram(textShader);
 
-							glEnableVertexAttribArray(textShader_attribute_coord);
-							glEnableVertexAttribArray(textShader_attribute_tex);
-                            
+							Render::textShader.use();
+							Render::textShader.enable();
+
 							GLfloat box_border[] = {offset.x+m.slider.loc.x, 					offset.y+m.slider.loc.y, 				-8.8,
                                 					offset.x+m.slider.loc.x+m.slider.dim.x, 	offset.y+m.slider.loc.y,				-8.8,
                                 					offset.x+m.slider.loc.x+m.slider.dim.x, 	offset.y+m.slider.loc.y+m.slider.dim.y,	-8.8,
                                 					offset.x+m.slider.loc.x, 					offset.y+m.slider.loc.y+m.slider.dim.y,	-8.8,
                                 					offset.x+m.slider.loc.x, 					offset.y+m.slider.loc.y,				-8.8};
 
-							glVertexAttribPointer(textShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, box_border);
-							glVertexAttribPointer(textShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 0, line_tex);
-							glDrawArrays(GL_LINE_STRIP, 0, 5);	
+							glVertexAttribPointer(Render::textShader.coord, 3, GL_FLOAT, GL_FALSE, 0, box_border);
+							glVertexAttribPointer(Render::textShader.tex, 2, GL_FLOAT, GL_FALSE, 0, line_tex);
+							glDrawArrays(GL_LINE_STRIP, 0, 5);
                             if (m.slider.dim.y > m.slider.dim.x) {
                                 //and a border around the slider handle
                                 GLfloat handle_border[] = {offset.x+m.slider.loc.x, 		  static_cast<GLfloat>(offset.y+m.slider.loc.y + (m.slider.sliderLoc * 1.05)),				-8.8,
@@ -380,9 +377,9 @@ namespace ui {
                                 						   offset.x+m.slider.loc.x + sliderW, static_cast<GLfloat>(offset.y+m.slider.loc.y + (m.slider.sliderLoc * 1.05) + sliderH),	-8.8,
                                 						   offset.x+m.slider.loc.x,           static_cast<GLfloat>(offset.y+m.slider.loc.y + (m.slider.sliderLoc * 1.05) + sliderH),	-8.8,
                                 						   offset.x+m.slider.loc.x,           static_cast<GLfloat>(offset.y+m.slider.loc.y + (m.slider.sliderLoc * 1.05)),				-8.8};
-								glVertexAttribPointer(textShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, handle_border);
-								glVertexAttribPointer(textShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 0, line_tex);
-								glDrawArrays(GL_LINE_STRIP, 0, 5);	
+								glVertexAttribPointer(Render::textShader.coord, 3, GL_FLOAT, GL_FALSE, 0, handle_border);
+								glVertexAttribPointer(Render::textShader.tex, 2, GL_FLOAT, GL_FALSE, 0, line_tex);
+								glDrawArrays(GL_LINE_STRIP, 0, 5);
                             }else{
                                 //and a border around the slider handle
                                 GLfloat handle_border[] = {offset.x+m.slider.loc.x + m.slider.sliderLoc, offset.y+m.slider.loc.y,							-8.8,
@@ -390,14 +387,13 @@ namespace ui {
                                 						   offset.x+m.slider.loc.x + (m.slider.sliderLoc + sliderW), offset.y+m.slider.loc.y+m.slider.dim.y,-8.8,
                                 						   offset.x+m.slider.loc.x + m.slider.sliderLoc, offset.y+m.slider.loc.y+m.slider.dim.y,			-8.8,
                                 						   offset.x+m.slider.loc.x + m.slider.sliderLoc, offset.y+m.slider.loc.y,							-8.8};
-								glVertexAttribPointer(textShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, handle_border);
-								glVertexAttribPointer(textShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 0, line_tex);
-								glDrawArrays(GL_LINE_STRIP, 0, 5);	
+								glVertexAttribPointer(Render::textShader.coord, 3, GL_FLOAT, GL_FALSE, 0, handle_border);
+								glVertexAttribPointer(Render::textShader.tex, 2, GL_FLOAT, GL_FALSE, 0, line_tex);
+								glDrawArrays(GL_LINE_STRIP, 0, 5);
                             }
 
 
-							glDisableVertexAttribArray(textShader_attribute_coord);
-							glDisableVertexAttribArray(textShader_attribute_tex);
+							Render::textShader.disable();
 
                             //if we are inside the slider and click it will set the slider to that point
                             if (SDL_GetMouseState(NULL, NULL) & SDL_BUTTON(SDL_BUTTON_LEFT)) {
@@ -406,15 +402,15 @@ namespace ui {
                                     *m.slider.var = (((mouse.y-offset.y) - m.slider.loc.y)/m.slider.dim.y)*100;
                                     //draw a white box over the handle
                                     glBindTexture(GL_TEXTURE_2D, border);
-									drawRect(vec2(offset.x+m.slider.loc.x, offset.y+m.slider.loc.y + (m.slider.sliderLoc * 1.05)),
-                                             vec2(offset.x+m.slider.loc.x + sliderW, offset.y+m.slider.loc.y + (m.slider.sliderLoc * 1.05) + sliderH), -8.9);
+									Render::drawRect(vec2(offset.x+m.slider.loc.x, offset.y+m.slider.loc.y + (m.slider.sliderLoc * 1.05)),
+                                                     vec2(offset.x+m.slider.loc.x + sliderW, offset.y+m.slider.loc.y + (m.slider.sliderLoc * 1.05) + sliderH), -8.9);
 
                                 }else{
                                     *m.slider.var = (((mouse.x-offset.x) - m.slider.loc.x)/m.slider.dim.x)*100;
                                     //draw a white box over the handle
                                     glBindTexture(GL_TEXTURE_2D, border);
-									drawRect(vec2(offset.x+m.slider.loc.x + m.slider.sliderLoc, offset.y+m.slider.loc.y),
-                                             vec2(offset.x+m.slider.loc.x + (m.slider.sliderLoc + sliderW), offset.y+m.slider.loc.y + m.slider.dim.y), -8.9);
+									Render::drawRect(vec2(offset.x+m.slider.loc.x + m.slider.sliderLoc, offset.y+m.slider.loc.y),
+                                                     vec2(offset.x+m.slider.loc.x + (m.slider.sliderLoc + sliderW), offset.y+m.slider.loc.y + m.slider.dim.y), -8.9);
                                 }
                             }