MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

Vec4: Rename 'xyzHasEffect()' to something that makes sense

Browse source
This commit is contained in:
Jonas Kulla 2015-07-07 15:59:10 +02:00
parent 6e176a454c
commit 9acdd206f6
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/etc-internal.h
View file

@ -61,7 +61,7 @@ struct Vec4
return (x == other.x && y == other.y && z == other.z && w == other.w); return (x == other.x && y == other.y && z == other.z && w == other.w);
} }
bool xyzHasEffect() const bool xyzNotNull() const
{ {
return (x != 0.0 || y != 0.0 || z != 0.0); return (x != 0.0 || y != 0.0 || z != 0.0);
} }

6
src/graphics.cpp
View file

@ -174,7 +174,7 @@ public:
const IntRect &viewpRect = glState.scissorBox.get(); const IntRect &viewpRect = glState.scissorBox.get();
const IntRect &screenRect = geometry.rect; const IntRect &screenRect = geometry.rect;
const bool toneRGBEffect = t.xyzHasEffect(); const bool toneRGBEffect = t.xyzNotNull();
const bool toneGrayEffect = t.w != 0; const bool toneGrayEffect = t.w != 0;
const bool colorEffect = c.w > 0; const bool colorEffect = c.w > 0;
const bool flashEffect = f.w > 0; const bool flashEffect = f.w > 0;
@ -240,7 +240,7 @@ public:
/* Then apply them using hardware blending */ /* Then apply them using hardware blending */
gl.BlendFuncSeparate(GL_ONE, GL_ONE, GL_ZERO, GL_ONE); gl.BlendFuncSeparate(GL_ONE, GL_ONE, GL_ZERO, GL_ONE);
if (add.xyzHasEffect()) if (add.xyzNotNull())
{ {
gl.BlendEquation(GL_FUNC_ADD); gl.BlendEquation(GL_FUNC_ADD);
shader.setColor(add); shader.setColor(add);
@ -248,7 +248,7 @@ public:
screenQuad.draw(); screenQuad.draw();
} }
if (sub.xyzHasEffect()) if (sub.xyzNotNull())
{ {
gl.BlendEquation(GL_FUNC_REVERSE_SUBTRACT); gl.BlendEquation(GL_FUNC_REVERSE_SUBTRACT);
shader.setColor(sub); shader.setColor(sub);