implementa transparencia em textura

Author: RodrigoPAml

docs/api.md

@@ -744,7 +744,8 @@ The argument table format
     texture_id = number, the texture id
     rotation = number, -- rotation in degrees, optional
     color = {x = number, y = number, z = number }, -- color, vec3 format, optional
-    color_weight = number, -- color weight in relation to texture, should vary between 0.0 and 1.0
+    color_weight = number, -- color weight in relation to texture, should vary between 0.0 and 1.0, optional
+    transparency = number, -- transparency multiplier, should vary between 0.0 and 1.0, optional
 }
 ```
 

release1.0.1/BoxEngine.exe

@@ -744,7 +744,8 @@ The argument table format
     texture_id = number, the texture id
     rotation = number, -- rotation in degrees, optional
     color = {x = number, y = number, z = number }, -- color, vec3 format, optional
-    color_weight = number, -- color weight in relation to texture, should vary between 0.0 and 1.0
+    color_weight = number, -- color weight in relation to texture, should vary between 0.0 and 1.0, optional
+    transparency = number, -- transparency multiplier, should vary between 0.0 and 1.0, optional
 }
 ```
 

release1.0.1/docs/api.md

@@ -453,7 +453,7 @@ namespace Connection {
 		{
 			glm::vec2 position, size;
 			glm::vec3 color = { 0, 0, 0 };
-			float rotation = 0, colorWeight = 0;
+			float rotation = 0, colorWeight = 0, transparency = 1;
 			unsigned int textureId;
 
 			if (!LuaUtils::GetTable(L, 1, "position", position))
@@ -468,11 +468,12 @@ namespace Connection {
 			LuaUtils::GetTable(L, 1, "rotation", rotation);
 			LuaUtils::GetTable(L, 1, "color", color);
 			LuaUtils::GetTable(L, 1, "color_weight", colorWeight);
+			LuaUtils::GetTable(L, 1, "transparency", transparency);
 
 			auto texture = TextureConnection::Get()->Get(textureId);
 
 			if(texture != nullptr)
-				Drawing::TextureRenderer::Draw(texture, position, size, color, rotation, colorWeight);
+				Drawing::TextureRenderer::Draw(texture, position, size, color, rotation, colorWeight, transparency);
 		}
 		else return luaL_error(L, "expecting argument 1 to be a table");
 

src/Engine/Project/Connections/Drawing/DrawingConnection.cpp

@@ -5,7 +5,15 @@ namespace BoxEngine {
 namespace Modules {
 namespace Drawing {
 
-	void TextureRenderer::Draw(const GPU::TexturePtr texture, const glm::vec2& position, const glm::vec2& size, const glm::vec3& color, const float rotation, const float colorWeight)
+	void TextureRenderer::Draw(
+		const GPU::TexturePtr texture, 
+		const glm::vec2& position, 
+		const glm::vec2& size, 
+		const glm::vec3& color, 
+		const float rotation, 
+		const float colorWeight,
+		const float transparency
+	)
 	{
 		const Camera::Camera2DPtr cam = Camera::Camera2D::GetCurrentCamera();
 
@@ -53,6 +61,7 @@ namespace Drawing {
 			instance.shaderMultisampled->SetInt("image", 0);
 			instance.shaderMultisampled->SetVec3("texColor", color);
 			instance.shaderMultisampled->SetFloat("colorWeight", colorWeight);
+			instance.shaderMultisampled->SetFloat("transparency", transparency);
 			instance.shaderMultisampled->SetXY("texSize", texture->GetSize().x, texture->GetSize().y);
 			instance.shaderMultisampled->SetInt("samples", texture->GetNumberOfSamples());
 		}
@@ -63,6 +72,7 @@ namespace Drawing {
 			instance.shader->SetMat4("model", model);
 			instance.shader->SetVec3("color", color);
 			instance.shader->SetFloat("colorWeight", colorWeight);
+			instance.shader->SetFloat("transparency", transparency);
 			instance.shader->SetMat4("projection", cam->GetOrthoMatrix());
 			instance.shader->SetInt("image", 0);
 		}
@@ -100,10 +110,11 @@ namespace Drawing {
 			"uniform vec3 color;\n"
 			"uniform sampler2D image;\n"
 			"uniform float colorWeight;\n"
+			"uniform float transparency;\n"
 			"void main()\n"
 			"{\n"
 			"  vec4 texFrag = texture(image, uv);\n"
-			"  outColor =  vec4((texFrag.xyz * (1 - colorWeight)) + (color*colorWeight), texFrag.w);\n"
+			"  outColor =  vec4((texFrag.xyz * (1 - colorWeight)) + (color*colorWeight), texFrag.w * transparency);\n"
 			"}"
 		};
 
@@ -115,6 +126,7 @@ namespace Drawing {
 			"uniform vec3 texColor;\n"
 			"uniform sampler2DMS image;\n"
 			"uniform float colorWeight;\n"
+			"uniform float transparency;\n"
 			"uniform vec2 texSize;\n"
 			"uniform int samples;\n"
 
@@ -126,7 +138,7 @@ namespace Drawing {
 			"    color += texelFetch(image, ivec2(uv.x*texSize.x, uv.y*texSize.y), i);\n"
 			"  }\n"
 			"  color = (color/samples);\n"
-			"  outColor =  vec4((color.xyz * (1 - colorWeight)) + (texColor*colorWeight), color.w);\n"
+			"  outColor =  vec4((color.xyz * (1 - colorWeight)) + (texColor*colorWeight), color.w * transparency);\n"
 			"}"
 		};
 

src/Modules/Drawing/TextureRenderer.cpp

@@ -17,7 +17,16 @@ namespace Drawing {
 
 		GPU::VertexPtr mesh;
 	public:
-		static void Draw(const GPU::TexturePtr texture, const glm::vec2& position, const glm::vec2& size, const glm::vec3& color, const float rotation, const float colorWeight = 0);
+		static void Draw(
+			const GPU::TexturePtr texture, 
+			const glm::vec2& position, 
+			const glm::vec2& size, 
+			const glm::vec3& color, 
+			const float rotation,
+			const float colorWeight = 0,
+			const float transparency = 1
+		);
+
 	private:
 		TextureRenderer() {};