Solved Alpha blend bug with UIElements

LastCoffeeStudio · Mar 14, 2018 · 5eecc1b · 5eecc1b
1 parent c1cc04c
commit 5eecc1b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 32 deletions.
diff --git a/LCSEngine/Application.cpp b/LCSEngine/Application.cpp
@@ -24,13 +24,13 @@ Application::Application()
 	modules.push_back(json = new ModuleJson());
 	modules.push_back(camera = new ModuleCamera());
 	modules.push_back(renderer = new ModuleRender());
+	modules.push_back(gameUI = new ModuleGameUI());
 	modules.push_back(gui = new ModuleGUI());
 	modules.push_back(textures = new ModuleTextures());
 	modules.push_back(audio = new ModuleAudio());
 	modules.push_back(fade = new ModuleFadeToBlack());
 	modules.push_back(animations = new ModuleAnimation());
 	modules.push_back(sceneMain = new ModuleSceneMain(false));
-	modules.push_back(gameUI = new ModuleGameUI());
 	modules.push_back(type = new ModuleType());
 
 	timer = 0;

diff --git a/LCSEngine/ModuleGameUI.cpp b/LCSEngine/ModuleGameUI.cpp
@@ -19,12 +19,6 @@ ModuleGameUI::ModuleGameUI() {}
 
 ModuleGameUI::~ModuleGameUI() {}
 
-update_status ModuleGameUI::update(float deltaTime)
-{
-	printGameUI();
-	return UPDATE_CONTINUE;
-}
-
 void ModuleGameUI::printGameUI()
 {
 	GLuint program = App->sceneMain->shader->programs[App->sceneMain->shader->defaultShaders[DEFAULTSHADER]];

diff --git a/LCSEngine/ModuleGameUI.h b/LCSEngine/ModuleGameUI.h
@@ -13,16 +13,11 @@ class ModuleGameUI : public Module
 public:
 	ModuleGameUI();
 	~ModuleGameUI();
-	update_status update(float deltaTime) override;
-
+	void printGameUI();
 
 public:
 	vector<ElementGameUI*> elements;
 
-private:
-	void printGameUI();
-
-
 };
 
 #endif // __MODULEGAMEUI_H__
diff --git a/LCSEngine/ModuleRender.cpp b/LCSEngine/ModuleRender.cpp
@@ -5,6 +5,7 @@
 #include "ModuleGUI.h"
 #include "ModuleSceneMain.h"
 #include "ModuleCamera.h"
+#include "ModuleGameUI.h"
 #include "Shader.h"
 #include "SDL/include/SDL.h"
 #include "Glew/include/glew.h"
@@ -56,12 +57,12 @@ bool ModuleRender::init()
 	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 	glClearDepth(1.0f);
 	glClearColor(0.f, 0.f, 0.f, 1.f);
+	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glEnable(GL_DEPTH_TEST);
 	glEnable(GL_CULL_FACE);
 	//glEnable(GL_LIGHTING);
 	//glEnable(GL_LIGHT0);
-	glEnable(GL_COLOR_MATERIAL);
 	glEnable(GL_TEXTURE_2D);
 	glFrontFace(GL_CCW);
 	glCullFace(GL_BACK);
@@ -95,9 +96,8 @@ update_status ModuleRender::postUpdate(float deltaTime)
 	renderObjects();
 	glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 	App->gui->draw();
+	App->gameUI->printGameUI();
 	//SDL_GL_SwapWindow(App->window->window);
-
-
 	swap();
 	return UPDATE_CONTINUE;
 }

diff --git a/LCSEngine/ProjectDir/Assets/Shaders/fragshader.txt b/LCSEngine/ProjectDir/Assets/Shaders/fragshader.txt
@@ -10,10 +10,9 @@ uniform bool useText;
 
 void main()
 {
-	float myColor = 1.f;
 	if (useText)
 	{
-		color = vec4(texture(text, UV).rgb * col, 1.0f);
+		color = vec4(texture(text,UV).rgb * col, texture(text,UV).a);
 	}
 	else
 	{

diff --git a/LCSEngine/UIImage.cpp b/LCSEngine/UIImage.cpp
@@ -77,7 +77,6 @@ void UIImage::init()
 	float x1 = (float)((rect.x / screenWidth) * 2) - 1;
 	float x2 = (float)(x1 + (rect.w / screenWidth) * 2);
 	float y1 = (float)(2 - ((rect.y / screenHeight) * 2) - 1);
-	//float y2 = (float)(2 - (y1 + ((*it)->rect.h) / (screenHeight / 2)));
 	float y2 = (float)(y1 - (rect.h / screenHeight) * 2);
 
 	verticesVBO.push_back(float3(x1, y1, 0.f));
@@ -94,18 +93,6 @@ void UIImage::init()
 	texCoordsVBO.push_back(float2(0.f, 0.f));
 	texCoordsVBO.push_back(float2(1.f, 0.f));
 	texCoordsVBO.push_back(float2(1.f, 1.f));
-
-	/*verticesVBO = { float3(-1 / 2.f, 1 / 2.f, 1 / 2.f), float3(1 / 2.f, 1 / 2.f, 1 / 2.f),
-		float3(1 / 2.f, -1 / 2.f, 1 / 2.f), float3(-1 / 2.f, -1 / 2.f, 1 / 2.f),
-		float3(-1 / 2.f, 1 / 2.f, -1 / 2.f), float3(1 / 2.f, 1 / 2.f, -1 / 2.f),
-		float3(1 / 2.f, -1 / 2.f, -1 / 2.f), float3(-1 / 2.f, -1 / 2.f, -1 / 2.f) };
-
-	indicesVAO = { 1, 3, 2, 1, 0, 3,
-		0, 7, 3, 0, 4, 7,
-		5, 2, 6, 5, 1, 2,
-		5, 0, 1, 5, 4, 0,
-		2, 7, 6, 2, 3, 7,
-		4, 6, 7, 4, 5, 6 };*/
 }
 
 void UIImage::generateIDs()
@@ -142,7 +129,6 @@ void UIImage::updateCoords()
 	float x1 = (float)((rect.x / screenWidth) * 2) - 1;
 	float x2 = (float)(x1 + (rect.w / screenWidth) * 2);
 	float y1 = (float)(2 - ((rect.y / screenHeight) * 2) - 1);
-	//float y2 = (float)(2 - (y1 + ((*it)->rect.h) / (screenHeight / 2)));
 	float y2 = (float)(y1 - (rect.h / screenHeight) * 2);
 
 	verticesVBO.clear();