Skip to content

SVG related fixes #2832

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

Merged
merged 4 commits into from
Dec 23, 2022
Merged

SVG related fixes #2832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70ac380
SVG texture lock checks
tederis Dec 16, 2022
b71b583
Lock rect with D3DLOCK_DISCARD
tederis Dec 16, 2022
c0b0bf1
Fix return type inconsistency
tederis Dec 16, 2022
f0d468b
Merge branch 'master' into pr/2832
Lpsd Dec 23, 2022
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
57 changes: 24 additions & 33 deletions Client/mods/deathmatch/logic/CClientVectorGraphicDisplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ void CClientVectorGraphicDisplay::Render()
if (HasUpdated())
{
m_pVectorGraphic->OnUpdate();
}

}
}

void CClientVectorGraphicDisplay::UpdateTexture()
Expand All @@ -52,46 +51,41 @@ void CClientVectorGraphicDisplay::UpdateTexture()
return;

Document* svgDocument = m_pVectorGraphic->GetSVGDocument();

if (svgDocument == nullptr)
if (!svgDocument)
return;

CVectorGraphicItem* pVectorGraphicItem = m_pVectorGraphic->GetRenderItem();

if (!pVectorGraphicItem)
return;

IDirect3DSurface9* surface = m_pVectorGraphic->GetRenderItem()->m_pD3DRenderTargetSurface;

if (!surface)
return;

IDirect3DDevice9* device = pVectorGraphicItem->m_pDevice;

uint width = pVectorGraphicItem->m_uiSizeX;
uint height = pVectorGraphicItem->m_uiSizeY;

Bitmap bitmap = svgDocument->renderToBitmap(width, height);
Bitmap bitmap = svgDocument->renderToBitmap(pVectorGraphicItem->m_uiSizeX, pVectorGraphicItem->m_uiSizeY);
if (!bitmap.valid())
return;

// Lock surface
D3DLOCKED_RECT LockedRect;
surface->LockRect(&LockedRect, nullptr, 0);
if (SUCCEEDED(surface->LockRect(&LockedRect, nullptr, D3DLOCK_DISCARD)))
{
auto surfaceData = static_cast<byte*>(LockedRect.pBits);
auto sourceData = static_cast<const byte*>(bitmap.data());

auto surfaceData = static_cast<byte*>(LockedRect.pBits);
auto sourceData = static_cast<const byte*>(bitmap.data());
for (uint32_t y = 0; y < bitmap.height(); ++y)
{
memcpy(surfaceData, sourceData, bitmap.width() * 4); // 4 bytes per pixel

for (uint32_t y = 0; y < bitmap.height(); ++y)
{
memcpy(surfaceData, sourceData, bitmap.width() * 4); // 4 bytes per pixel
// advance row pointers
sourceData += bitmap.stride();
surfaceData += LockedRect.Pitch;
}

// advance row pointers
sourceData += bitmap.stride();
surfaceData += LockedRect.Pitch;
// Unlock surface
surface->UnlockRect();
}

// Unlock surface
surface->UnlockRect();

m_bHasUpdated = false;
}

Expand All @@ -101,25 +95,22 @@ void CClientVectorGraphicDisplay::ClearTexture()
return;

CVectorGraphicItem* pVectorGraphicItem = m_pVectorGraphic->GetRenderItem();

if (!pVectorGraphicItem)
return;

IDirect3DSurface9* surface = pVectorGraphicItem->m_pD3DRenderTargetSurface;

if (!surface)
return;

IDirect3DDevice9* device = pVectorGraphicItem->m_pDevice;

// Lock surface
D3DLOCKED_RECT LockedRect;
surface->LockRect(&LockedRect, nullptr, 0);

device->ColorFill(surface, nullptr, D3DCOLOR_ARGB(0, 0, 0, 0));
if (SUCCEEDED(surface->LockRect(&LockedRect, nullptr, D3DLOCK_DISCARD)))
{
std::memset(LockedRect.pBits, 0x0, LockedRect.Pitch * pVectorGraphicItem->m_uiSurfaceSizeY);

// Unlock surface
surface->UnlockRect();
// Unlock surface
surface->UnlockRect();
}

m_bIsCleared = true;
}
Expand Down
8 changes: 4 additions & 4 deletions Client/mods/deathmatch/logic/luadefs/CLuaVectorGraphicDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ CClientVectorGraphic* CLuaVectorGraphicDefs::SVGCreate(lua_State* luaVM, CVector
g_pClientGame->GetManager()->GetRenderElementManager()->CreateVectorGraphic(static_cast<int>(size.fX), static_cast<int>(size.fY));

if (!vectorGraphic)
return false;
return nullptr;

if (pathOrRawData.has_value())
{
Expand All @@ -151,7 +151,7 @@ CClientVectorGraphic* CLuaVectorGraphicDefs::SVGCreate(lua_State* luaVM, CVector
if (!didLoad)
{
delete vectorGraphic;
return false;
return nullptr;
}
}
else
Expand All @@ -177,15 +177,15 @@ CClientVectorGraphic* CLuaVectorGraphicDefs::SVGCreate(lua_State* luaVM, CVector
if (!didLoad)
{
delete vectorGraphic;
return false;
return nullptr;
}
}
else
{
delete vectorGraphic;

m_pScriptDebugging->LogCustom(luaVM, SString("Unable to load SVG (invalid file path) [%s]", pathOrRawData.value().c_str()));
return false;
return nullptr;
}
}
}
Expand Down