Add colorization support for gles2 driver

This commit is contained in:
Benau 2022-09-15 08:30:24 +08:00
parent 9947c87fe1
commit 16173207ee
5 changed files with 81 additions and 6 deletions

View File

@ -13,11 +13,14 @@ precision mediump float;
#define TransparentVertexAlpha 8 #define TransparentVertexAlpha 8
#define TransparentReflection2Layer 9 #define TransparentReflection2Layer 9
#define StkGrass 10 #define StkGrass 10
#define StkBlend 11
/* Uniforms */ /* Uniforms */
uniform int uMaterialType; uniform int uMaterialType;
uniform float uHueChange;
uniform bool uTextureUsage0; uniform bool uTextureUsage0;
//uniform bool uTextureUsage1; //uniform bool uTextureUsage1;
@ -31,14 +34,48 @@ varying vec2 varTexCoord0;
varying vec4 varVertexColor; varying vec4 varVertexColor;
varying float varEyeDist; varying float varEyeDist;
vec3 rgbToHsv(vec3 c)
{
vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
vec4 p = mix(vec4(c.bg, K.wz), vec4(c.gb, K.xy), step(c.b, c.g));
vec4 q = mix(vec4(p.xyw, c.r), vec4(c.r, p.yzx), step(p.x, c.r));
float d = q.x - min(q.w, q.y);
float e = 1.0e-10;
return vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);
}
vec3 hsvToRgb(vec3 c)
{
vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
}
vec4 renderSolid() vec4 renderSolid()
{ {
vec4 Color = varVertexColor; vec4 Color = vec4(1.0, 1.0, 1.0, 1.0);
if(uTextureUsage0) if(uTextureUsage0)
{
Color *= texture2D(uTextureUnit0, varTexCoord0); Color *= texture2D(uTextureUnit0, varTexCoord0);
if (uHueChange > 0.0)
//Color.a = 1.0; {
float f_hue_change = 0.66;
float mask = Color.a;
vec3 old_hsv = rgbToHsv(Color.rgb);
float mask_step = step(mask, 0.5);
float saturation = mask * 1.825;
vec2 new_xy = mix(vec2(old_hsv.x, old_hsv.y), vec2(uHueChange,
max(old_hsv.y, saturation)), vec2(mask_step, mask_step));
Color.rgb = hsvToRgb(vec3(new_xy.x, new_xy.y, old_hsv.z));
}
Color.a = 1.0;
}
else
{
Color = varVertexColor;
Color.a = 1.0;
}
return Color; return Color;
} }
@ -97,7 +134,16 @@ vec4 renderTransparent()
vec4 Color = vec4(1.0, 1.0, 1.0, 1.0); vec4 Color = vec4(1.0, 1.0, 1.0, 1.0);
if(uTextureUsage0) if(uTextureUsage0)
{
Color *= texture2D(uTextureUnit0, varTexCoord0); Color *= texture2D(uTextureUnit0, varTexCoord0);
if (uHueChange > 0.0)
{
vec3 old_hsv = rgbToHsv(Color.rgb);
vec2 new_xy = vec2(uHueChange, old_hsv.y);
vec3 new_color = hsvToRgb(vec3(new_xy.x, new_xy.y, old_hsv.z));
Color.rgb = vec3(new_color.r, new_color.g, new_color.b);
}
}
return Color; return Color;
} }
@ -107,7 +153,16 @@ vec4 renderTransparentVertexColor()
vec4 Color = varVertexColor; vec4 Color = varVertexColor;
if(uTextureUsage0) if(uTextureUsage0)
{
Color *= texture2D(uTextureUnit0, varTexCoord0); Color *= texture2D(uTextureUnit0, varTexCoord0);
if (uHueChange > 0.0)
{
vec3 old_hsv = rgbToHsv(Color.rgb);
vec2 new_xy = vec2(uHueChange, old_hsv.y);
vec3 new_color = hsvToRgb(vec3(new_xy.x, new_xy.y, old_hsv.z));
Color.rgb = vec3(new_color.r, new_color.g, new_color.b);
}
}
return Color; return Color;
} }
@ -142,6 +197,10 @@ void main ()
discard; discard;
gl_FragColor = Color; gl_FragColor = Color;
} }
else if(uMaterialType == StkBlend)
{
gl_FragColor = renderTransparentVertexColor();
}
else if(uMaterialType == TransparentVertexAlpha) else if(uMaterialType == TransparentVertexAlpha)
{ {
vec4 Color = renderTransparent(); vec4 Color = renderTransparent();

View File

@ -465,6 +465,11 @@ namespace video
return m_render_info; return m_render_info;
} }
const std::shared_ptr<GE::GERenderInfo>& getRenderInfo() const
{
return m_render_info;
}
void setRenderInfo(std::shared_ptr<GE::GERenderInfo> ri) void setRenderInfo(std::shared_ptr<GE::GERenderInfo> ri)
{ {
m_render_info = ri; m_render_info = ri;

View File

@ -14,6 +14,8 @@
#include "os.h" #include "os.h"
#include "COGLES2Driver.h" #include "COGLES2Driver.h"
#include "ge_render_info.hpp"
namespace irr namespace irr
{ {
namespace video namespace video
@ -132,10 +134,18 @@ bool COGLES2FixedPipelineRenderer::OnRender(IMaterialRendererServices* service,
case EMT_STK_GRASS: case EMT_STK_GRASS:
materialType = 10; materialType = 10;
break; break;
case EMT_ONETEXTURE_BLEND:
materialType = 11;
break;
default: default:
break; break;
} }
float hue_change = 0.0f;
if (Driver->getCurrentMaterial().getRenderInfo())
hue_change = Driver->getCurrentMaterial().getRenderInfo()->getHue();
IMaterialRendererServices::setPixelShaderConstant("uHueChange", &hue_change, 1);
IMaterialRendererServices::setPixelShaderConstant("uMaterialType", &materialType, 1); IMaterialRendererServices::setPixelShaderConstant("uMaterialType", &materialType, 1);
/* Transform Matrices Upload */ /* Transform Matrices Upload */

View File

@ -502,7 +502,8 @@ bool CentralVideoSettings::isARBTextureBufferObjectUsable() const
bool CentralVideoSettings::supportsColorization() const bool CentralVideoSettings::supportsColorization() const
{ {
return isGLSL() || GE::getDriver()->getDriverType() == video::EDT_VULKAN; return isGLSL() || GE::getDriver()->getDriverType() == video::EDT_VULKAN ||
GE::getDriver()->getDriverType() == video::EDT_OGLES2;
} }
#endif // !SERVER_ONLY #endif // !SERVER_ONLY

View File

@ -970,7 +970,7 @@ std::function<void(irr::video::IImage*)> Material::getMaskImageMani() const
->getDriverAttributes().getAttributeAsDimension2d("MAX_TEXTURE_SIZE"); ->getDriverAttributes().getAttributeAsDimension2d("MAX_TEXTURE_SIZE");
// Material using alpha channel will be colorized as a whole // Material using alpha channel will be colorized as a whole
if (irr_driver->getVideoDriver()->getDriverType() == EDT_VULKAN && if (CVS->supportsColorization() &&
!useAlphaChannel() && (!m_colorization_mask.empty() || !useAlphaChannel() && (!m_colorization_mask.empty() ||
m_colorization_factor > 0.0f || m_colorizable)) m_colorization_factor > 0.0f || m_colorizable))
{ {