TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-22 12:55:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Corrects OpenGL projection matrix

Browse source 
Corrects OpenGL glPolygonOffset values
Corrects Direct3D11 DepthBias values
This commit is contained in:
rextimmy 2017-08-25 13:13:47 +10:00
parent ad612e218b
commit 54970b0ad6
3 changed files with 43 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gfx/D3D11/gfxD3D11StateBlock.cpp
View file

@ -110,7 +110,9 @@ GFXD3D11StateBlock::GFXD3D11StateBlock(const GFXStateBlockDesc& desc)
ZeroMemory(&mRasterizerDesc, sizeof(D3D11_RASTERIZER_DESC));
mRasterizerDesc.CullMode = GFXD3D11CullMode[mDesc.cullMode];
mRasterizerDesc.FillMode = GFXD3D11FillMode[mDesc.fillMode];
mRasterizerDesc.DepthBias = mDesc.zBias;
//this assumes 24bit depth
const INT depthMul = INT((1 << 24) - 1);
mRasterizerDesc.DepthBias = mDesc.zBias * depthMul;
mRasterizerDesc.SlopeScaledDepthBias = mDesc.zSlopeBias;
mRasterizerDesc.AntialiasedLineEnable = FALSE;
mRasterizerDesc.MultisampleEnable = FALSE;

13
Engine/source/gfx/gl/gfxGLStateBlock.cpp
View file

@ -139,16 +139,19 @@ void GFXGLStateBlock::activate(const GFXGLStateBlock* oldState)
if(STATE_CHANGE(zFunc))
glDepthFunc(GFXGLCmpFunc[mDesc.zFunc]);
if(STATE_CHANGE(zBias))
if (STATE_CHANGE(zBias))
{
if (mDesc.zBias == 0)
{
glDisable(GL_POLYGON_OFFSET_FILL);
} else {
F32 bias = mDesc.zBias * 10000.0f;
}
else
{
//this assumes 24bit depth
const F32 depthMul = F32((1 << 24) - 1);
glEnable(GL_POLYGON_OFFSET_FILL);
glPolygonOffset(bias, bias);
}
glPolygonOffset(mDesc.zSlopeBias, mDesc.zBias * depthMul);
}
}
if(STATE_CHANGE(zWriteEnable))