Skip to content

fix(smudge): Fix minor errors in W3DSmudge #2483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xezon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(smudge): Fix minor errors in W3DSmudge #2483

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DSmudge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,12 @@ void W3DSmudgeManager::ReleaseResources()
REF_PTR_RELEASE(m_indexBuffer);
}

//Make sure (SMUDGE_DRAW_SIZE * 12) < 65535 because that's the max index buffer size.

#define SMUDGE_DRAW_SIZE 500 //draw at most 50 smudges per call. Tweak value to improve CPU/GPU parallelism.

static_assert(SMUDGE_DRAW_SIZE * 5 < 0x10000, "Vertex index exceeds 16-bit limit");


void W3DSmudgeManager::ReAcquireResources()
{
ReleaseResources();
Expand Down Expand Up @@ -237,16 +240,20 @@ Bool W3DSmudgeManager::testHardwareSupport()

//bottom right
v[0].p = Vector4( BLOCK_SIZE-0.5f, BLOCK_SIZE-0.5f, 0.0f, 1.0f );
v[0].u = BLOCK_SIZE/(Real)TheDisplay->getWidth(); v[0].v = BLOCK_SIZE/(Real)TheDisplay->getHeight();
v[0].u = BLOCK_SIZE/(Real)TheDisplay->getWidth();
v[0].v = BLOCK_SIZE/(Real)TheDisplay->getHeight();
//top right
v[1].p = Vector4( BLOCK_SIZE-0.5f, 0-0.5f, 0.0f, 1.0f );
v[1].u = BLOCK_SIZE/(Real)TheDisplay->getWidth(); v[1].v = 0;
v[1].u = BLOCK_SIZE/(Real)TheDisplay->getWidth();
v[1].v = 0;
//bottom left
v[2].p = Vector4( 0-0.5f, BLOCK_SIZE-0.5f, 0.0f, 1.0f );
v[2].u = 0; v[2].v = BLOCK_SIZE/(Real)TheDisplay->getHeight();
v[2].u = 0;
v[2].v = BLOCK_SIZE/(Real)TheDisplay->getHeight();
//top left
v[3].p = Vector4( 0-0.5f, 0-0.5f, 0.0f, 1.0f );
v[3].u = 0; v[3].v = 0;
v[3].u = 0;
v[3].v = 0;

v[0].color = UNIQUE_COLOR;
v[1].color = UNIQUE_COLOR;
Expand Down Expand Up @@ -390,27 +397,20 @@ void W3DSmudgeManager::render(RenderInfoClass &rinfo)

Vector2 &thisUV=verts[i].uv;

//Clamp coordinates so we're not referencing texels outside the view.
if (thisUV.X > texClampX)
smudge->m_offset.X = 0;
else
if (thisUV.X < 0)
// Zero coordinates that fall outside valid texel bounds
if (thisUV.X < 0 || thisUV.X > texClampX)
smudge->m_offset.X = 0;

if (thisUV.Y > texClampY)
smudge->m_offset.Y = 0;
else
if (thisUV.Y < 0)
if (thisUV.Y < 0 || thisUV.Y > texClampY)
smudge->m_offset.Y = 0;

}

//Finish center vertex
//Ge uv coordinates by interpolating corner uv coordinates and applying desired offset.
uvSpanX=verts[3].uv.X - verts[0].uv.X;
uvSpanY=verts[1].uv.Y - verts[0].uv.Y;
verts[4].uv.X=verts[0].uv.X+uvSpanX*(0.5f+smudge->m_offset.X);
verts[4].uv.Y=verts[0].uv.Y+uvSpanY*(0.5f+smudge->m_offset.X);
verts[4].uv.Y=verts[0].uv.Y+uvSpanY*(0.5f+smudge->m_offset.Y);

count++; //increment visible smudge count.
smudge=smudge->Succ();
Expand Down Expand Up @@ -487,7 +487,8 @@ void W3DSmudgeManager::render(RenderInfoClass &rinfo)

//Check if we exceeded maximum number of smudges allowed per draw call.
if (smudgesInRenderBatch >= count)
{ remainingSmudgeStart = smudge;
{
remainingSmudgeStart = smudge;
goto flushSmudges;
}

Expand Down Expand Up @@ -520,11 +521,12 @@ void W3DSmudgeManager::render(RenderInfoClass &rinfo)
if (set) //start next batch at beginning of set.
remainingSmudgeStart = set->getUsedSmudgeList().Head();
}
flushSmudges:
DX8Wrapper::Set_Vertex_Buffer(vb_access);
}

DX8Wrapper::Draw_Triangles( 0,smudgesInRenderBatch*4, 0, smudgesInRenderBatch*5);
flushSmudges:
DX8Wrapper::Set_Vertex_Buffer(vb_access);

DX8Wrapper::Draw_Triangles(0,smudgesInRenderBatch*4, 0, smudgesInRenderBatch*5);

//Debug Code which draws outline around smudge
/* DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_FILLMODE,D3DFILL_WIREFRAME);
Expand Down
Loading