mirror of https://github.com/AxioDL/metaforce.git
CFluidPlaneShader: Replace explicit operator bool calls with the analogous named function
Same behavior, more informative to the reader about what is being checked for.
This commit is contained in:
parent
942b972398
commit
4e718a805f
|
@ -204,10 +204,10 @@ CFluidPlaneShader::CFluidPlaneShader(EFluidType type, const TLockedToken<CTextur
|
||||||
, m_envBumpMap(envBumpMap)
|
, m_envBumpMap(envBumpMap)
|
||||||
, m_lightmap(lightmap)
|
, m_lightmap(lightmap)
|
||||||
, m_rippleMap(rippleMap) {
|
, m_rippleMap(rippleMap) {
|
||||||
SFluidPlaneShaderInfo shaderInfo(type, m_patternTex1.operator bool(), m_patternTex2.operator bool(),
|
SFluidPlaneShaderInfo shaderInfo(type, m_patternTex1.HasReference(), m_patternTex2.HasReference(),
|
||||||
m_colorTex.operator bool(), m_bumpMap.operator bool(), m_envMap.operator bool(),
|
m_colorTex.HasReference(), m_bumpMap.HasReference(), m_envMap.HasReference(),
|
||||||
m_envBumpMap.operator bool(), m_lightmap.operator bool(),
|
m_envBumpMap.HasReference(), m_lightmap.HasReference(), m_rippleMap.operator bool(),
|
||||||
m_rippleMap.operator bool(), doubleLightmapBlend, additive);
|
doubleLightmapBlend, additive);
|
||||||
m_pipelines = _cache.GetOrBuildShader(shaderInfo);
|
m_pipelines = _cache.GetOrBuildShader(shaderInfo);
|
||||||
PrepareBinding(maxVertCount);
|
PrepareBinding(maxVertCount);
|
||||||
}
|
}
|
||||||
|
@ -216,8 +216,8 @@ CFluidPlaneShader::CFluidPlaneShader(const TLockedToken<CTexture>& patternTex1,
|
||||||
const TLockedToken<CTexture>& patternTex2, const TLockedToken<CTexture>& colorTex,
|
const TLockedToken<CTexture>& patternTex2, const TLockedToken<CTexture>& colorTex,
|
||||||
u32 maxVertCount)
|
u32 maxVertCount)
|
||||||
: m_patternTex1(patternTex1), m_patternTex2(patternTex2), m_colorTex(colorTex) {
|
: m_patternTex1(patternTex1), m_patternTex2(patternTex2), m_colorTex(colorTex) {
|
||||||
SFluidPlaneDoorShaderInfo shaderInfo(m_patternTex1.operator bool(), m_patternTex2.operator bool(),
|
SFluidPlaneDoorShaderInfo shaderInfo(m_patternTex1.HasReference(), m_patternTex2.HasReference(),
|
||||||
m_colorTex.operator bool());
|
m_colorTex.HasReference());
|
||||||
m_pipelines = _cache.GetOrBuildShader(shaderInfo);
|
m_pipelines = _cache.GetOrBuildShader(shaderInfo);
|
||||||
PrepareBinding(maxVertCount);
|
PrepareBinding(maxVertCount);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue