LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-12 08:30:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add love.graphics.setStencilMode. Remove old stencil API.

Browse Source 
- Add setStencilMode(drawaction, comparemode, value = 0, readmask = 0xFF, writemask = 0xFF).
- Add getStencilMode.
- Remove love.graphics.stencil.
- Remove love.graphics.set/getStencilTest.

Note that the new setStencilMode API does not clear the stencil buffer, and does not turn off color writes (it can still be done manually), unlike love.graphics.stencil.

Fixes #1161.
Fixes #1251.
This commit is contained in:
Alex Szpakowski
2022-01-22 23:36:07 -04:00
parent 173fe3dab5
commit 6dbb7fa5de
10 changed files with 148 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Graphics.cpp
+15 -26
View File
@@ -515,7 +515,6 @@ bool Graphics::isActive() const
void Graphics::reset()
{
DisplayState s;
stopDrawToStencilBuffer();
restoreState(s);
origin();
}
@@ -542,14 +541,6 @@ void Graphics::restoreState(const DisplayState &s)
else
setScissor();
if (s.stencil.action != STENCIL_KEEP)
drawToStencilBuffer(s.stencil.action, s.stencil.value);
else
stopDrawToStencilBuffer();
setStencilTest(s.stencil.compare, s.stencil.value);
setDepthMode(s.depthTest, s.depthWrite);
setMeshCullMode(s.meshCullMode);
setFrontFaceWinding(s.winding);
@@ -557,6 +548,9 @@ void Graphics::restoreState(const DisplayState &s)
setShader(s.shader.get());
setRenderTargets(s.renderTargets);
setStencilMode(s.stencil.action, s.stencil.compare, s.stencil.value, s.stencil.readMask, s.stencil.writeMask);
setDepthMode(s.depthTest, s.depthWrite);
setColorMask(s.colorMask);
setWireframe(s.wireframe);
@@ -596,20 +590,6 @@ void Graphics::restoreStateChecked(const DisplayState &s)
setScissor();
}
if (s.stencil.action != cur.stencil.action)
{
if (s.stencil.action != STENCIL_KEEP)
drawToStencilBuffer(s.stencil.action, s.stencil.value);
else
stopDrawToStencilBuffer();
}
if (s.stencil.compare != cur.stencil.compare || s.stencil.value != cur.stencil.value)
setStencilTest(s.stencil.compare, s.stencil.value);
if (s.depthTest != cur.depthTest || s.depthWrite != cur.depthWrite)
setDepthMode(s.depthTest, s.depthWrite);
setMeshCullMode(s.meshCullMode);
if (s.winding != cur.winding)
@@ -643,6 +623,12 @@ void Graphics::restoreStateChecked(const DisplayState &s)
if (rtschanged)
setRenderTargets(s.renderTargets);
if (!(s.stencil == cur.stencil))
setStencilMode(s.stencil.action, s.stencil.compare, s.stencil.value, s.stencil.readMask, s.stencil.writeMask);
if (s.depthTest != cur.depthTest || s.depthWrite != cur.depthWrite)
setDepthMode(s.depthTest, s.depthWrite);
if (s.colorMask != cur.colorMask)
setColorMask(s.colorMask);
@@ -1046,16 +1032,19 @@ bool Graphics::getScissor(Rect &rect) const
return state.scissor;
}
void Graphics::setStencilTest()
void Graphics::setStencilMode()
{
setStencilTest(COMPARE_ALWAYS, 0);
setStencilMode(STENCIL_KEEP, COMPARE_ALWAYS, 0, LOVE_UINT32_MAX, LOVE_UINT32_MAX);
}
void Graphics::getStencilTest(CompareMode &compare, int &value) const
void Graphics::getStencilMode(StencilAction &action, CompareMode &compare, int &value, uint32 &readmask, uint32 &writemask) const
{
const DisplayState &state = states.back();
action = state.stencil.action;
compare = state.stencil.compare;
value = state.stencil.value;
readmask = state.stencil.readMask;
writemask = state.stencil.writeMask;
}
void Graphics::setDepthMode()