Skip to content

Commit a02c4b3

Browse files
patrikjuvonenpatrikjuvonen
committed
Revert "Revert "Revert "Add SVG support (lunasvg) (#2026)"""
This reverts commit 7d055fb.
1 parent 7d055fb commit a02c4b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+69
-18204
lines changed

‎Client/core/Graphics/CRenderItem.VectorGraphic.cpp

Lines changed: 0 additions & 142 deletions
This file was deleted.

‎Client/core/Graphics/CRenderItemManager.cpp

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -135,40 +135,14 @@ CTextureItem* CRenderItemManager::CreateTexture(const SString& strFullFilePath,
135135
if (!pTextureItem->IsValid())
136136
{
137137
SAFE_RELEASE(pTextureItem);
138-
return nullptr;
138+
return NULL;
139139
}
140140

141141
UpdateMemoryUsage();
142142

143143
return pTextureItem;
144144
}
145145

146-
////////////////////////////////////////////////////////////////
147-
//
148-
// CRenderItemManager::CreateVectorGraphic
149-
//
150-
//
151-
//
152-
////////////////////////////////////////////////////////////////
153-
CVectorGraphicItem* CRenderItemManager::CreateVectorGraphic(uint width, uint height)
154-
{
155-
if (!CanCreateRenderItem(CVectorGraphicItem::GetClassId()))
156-
return nullptr;
157-
158-
CVectorGraphicItem* pVectorItem = new CVectorGraphicItem;
159-
pVectorItem->PostConstruct(this, width, height);
160-
161-
if (!pVectorItem->IsValid())
162-
{
163-
SAFE_RELEASE(pVectorItem);
164-
return nullptr;
165-
}
166-
167-
UpdateMemoryUsage();
168-
169-
return pVectorItem;
170-
}
171-
172146
////////////////////////////////////////////////////////////////
173147
//
174148
// CRenderItemManager::CreateRenderTarget

‎Client/core/Graphics/CRenderItemManager.h

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -22,41 +22,40 @@ class CRenderItemManager : public CRenderItemManagerInterface
2222
~CRenderItemManager();
2323

2424
// CRenderItemManagerInterface
25-
virtual void DoPulse();
26-
virtual CDxFontItem* CreateDxFont(const SString& strFullFilePath, uint uiSize, bool bBold, DWORD ulQuality = DEFAULT_QUALITY);
27-
virtual CGuiFontItem* CreateGuiFont(const SString& strFullFilePath, const SString& strFontName, uint uiSize);
28-
virtual CTextureItem* CreateTexture(const SString& strFullFilePath, const CPixels* pPixels, bool bMipMaps = true, uint uiSizeX = RDEFAULT,
29-
uint uiSizeY = RDEFAULT, ERenderFormat format = RFORMAT_UNKNOWN, ETextureAddress textureAddress = TADDRESS_WRAP,
30-
ETextureType textureType = TTYPE_TEXTURE, uint uiVolumeDepth = 1);
31-
virtual CShaderItem* CreateShader(const SString& strFile, const SString& strRootPath, bool bIsRawData, SString& strOutStatus, float fPriority,
32-
float fMaxDistance, bool bLayered, bool bDebug, int iTypeMask, const EffectMacroList& macros);
33-
virtual CRenderTargetItem* CreateRenderTarget(uint uiSizeX, uint uiSizeY, bool bWithAlphaChannel, bool bForce = false);
34-
virtual CScreenSourceItem* CreateScreenSource(uint uiSizeX, uint uiSizeY);
35-
virtual CVectorGraphicItem* CreateVectorGraphic(uint width, uint height);
36-
virtual CWebBrowserItem* CreateWebBrowser(uint uiSizeX, uint uiSizeY);
37-
virtual bool SetRenderTarget(CRenderTargetItem* pItem, bool bClear);
38-
virtual void EnableSetRenderTargetOldVer(bool bEnable);
39-
virtual bool IsSetRenderTargetEnabledOldVer();
40-
virtual bool RestoreDefaultRenderTarget();
41-
virtual void UpdateBackBufferCopy();
42-
virtual void UpdateScreenSource(CScreenSourceItem* pScreenSourceItem, bool bResampleNow);
43-
virtual SShaderItemLayers* GetAppliedShaderForD3DData(CD3DDUMMY* pD3DData);
44-
virtual bool ApplyShaderItemToWorldTexture(CShaderItem* pShaderItem, const SString& strTextureNameMatch, CClientEntityBase* pClientEntity,
45-
bool bAppendLayers);
46-
virtual bool RemoveShaderItemFromWorldTexture(CShaderItem* pShaderItem, const SString& strTextureNameMatch, CClientEntityBase* pClientEntity);
47-
virtual void RemoveClientEntityRefs(CClientEntityBase* pClientEntity);
48-
virtual void GetVisibleTextureNames(std::vector<SString>& outNameList, const SString& strTextureNameMatch, ushort usModelID);
49-
virtual eDxTestMode GetTestMode() { return m_TestMode; }
50-
virtual void SetTestMode(eDxTestMode testMode);
51-
virtual void GetDxStatus(SDxStatus& outStatus);
52-
virtual CEffectCloner* GetEffectCloner() { return m_pEffectCloner; }
53-
virtual void PreDrawWorld();
54-
virtual void SetDepthBufferFormat(ERenderFormat depthBufferFormat) { m_depthBufferFormat = depthBufferFormat; }
55-
virtual ERenderFormat GetDepthBufferFormat() { return m_depthBufferFormat; }
56-
virtual void SaveReadableDepthBuffer();
57-
virtual void FlushNonAARenderTarget();
58-
virtual void HandleStretchRect(IDirect3DSurface9* pSourceSurface, CONST RECT* pSourceRect, IDirect3DSurface9* pDestSurface, CONST RECT* pDestRect,
59-
int Filter);
25+
virtual void DoPulse();
26+
virtual CDxFontItem* CreateDxFont(const SString& strFullFilePath, uint uiSize, bool bBold, DWORD ulQuality = DEFAULT_QUALITY);
27+
virtual CGuiFontItem* CreateGuiFont(const SString& strFullFilePath, const SString& strFontName, uint uiSize);
28+
virtual CTextureItem* CreateTexture(const SString& strFullFilePath, const CPixels* pPixels, bool bMipMaps = true, uint uiSizeX = RDEFAULT,
29+
uint uiSizeY = RDEFAULT, ERenderFormat format = RFORMAT_UNKNOWN, ETextureAddress textureAddress = TADDRESS_WRAP,
30+
ETextureType textureType = TTYPE_TEXTURE, uint uiVolumeDepth = 1);
31+
virtual CShaderItem* CreateShader(const SString& strFile, const SString& strRootPath, bool bIsRawData, SString& strOutStatus, float fPriority, float fMaxDistance,
32+
bool bLayered, bool bDebug, int iTypeMask, const EffectMacroList& macros);
33+
virtual CRenderTargetItem* CreateRenderTarget(uint uiSizeX, uint uiSizeY, bool bWithAlphaChannel, bool bForce = false);
34+
virtual CScreenSourceItem* CreateScreenSource(uint uiSizeX, uint uiSizeY);
35+
virtual CWebBrowserItem* CreateWebBrowser(uint uiSizeX, uint uiSizeY);
36+
virtual bool SetRenderTarget(CRenderTargetItem* pItem, bool bClear);
37+
virtual void EnableSetRenderTargetOldVer(bool bEnable);
38+
virtual bool IsSetRenderTargetEnabledOldVer();
39+
virtual bool RestoreDefaultRenderTarget();
40+
virtual void UpdateBackBufferCopy();
41+
virtual void UpdateScreenSource(CScreenSourceItem* pScreenSourceItem, bool bResampleNow);
42+
virtual SShaderItemLayers* GetAppliedShaderForD3DData(CD3DDUMMY* pD3DData);
43+
virtual bool ApplyShaderItemToWorldTexture(CShaderItem* pShaderItem, const SString& strTextureNameMatch, CClientEntityBase* pClientEntity,
44+
bool bAppendLayers);
45+
virtual bool RemoveShaderItemFromWorldTexture(CShaderItem* pShaderItem, const SString& strTextureNameMatch, CClientEntityBase* pClientEntity);
46+
virtual void RemoveClientEntityRefs(CClientEntityBase* pClientEntity);
47+
virtual void GetVisibleTextureNames(std::vector<SString>& outNameList, const SString& strTextureNameMatch, ushort usModelID);
48+
virtual eDxTestMode GetTestMode() { return m_TestMode; }
49+
virtual void SetTestMode(eDxTestMode testMode);
50+
virtual void GetDxStatus(SDxStatus& outStatus);
51+
virtual CEffectCloner* GetEffectCloner() { return m_pEffectCloner; }
52+
virtual void PreDrawWorld();
53+
virtual void SetDepthBufferFormat(ERenderFormat depthBufferFormat) { m_depthBufferFormat = depthBufferFormat; }
54+
virtual ERenderFormat GetDepthBufferFormat() { return m_depthBufferFormat; }
55+
virtual void SaveReadableDepthBuffer();
56+
virtual void FlushNonAARenderTarget();
57+
virtual void HandleStretchRect(IDirect3DSurface9* pSourceSurface, CONST RECT* pSourceRect, IDirect3DSurface9* pDestSurface, CONST RECT* pDestRect,
58+
int Filter);
6059

6160
// CRenderItemManager
6261
void NotifyContructRenderItem(CRenderItem* pItem);

‎Client/mods/deathmatch/logic/CClientDisplay.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class CClientDisplay;
1717
enum eDisplayType
1818
{
1919
DISPLAY_TEXT,
20-
DISPLAY_VECTORGRAPHIC,
2120
};
2221

2322
class CClientDisplay

‎Client/mods/deathmatch/logic/CClientEntity.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,8 +1213,6 @@ unsigned int CClientEntity::GetTypeID(const char* szTypeName)
12131213
return CCLIENTSOUND;
12141214
else if (strcmp(szTypeName, "light") == 0)
12151215
return CCLIENTPOINTLIGHTS;
1216-
else if (strcmp(szTypeName, "svg") == 0)
1217-
return CCLIENTVECTORGRAPHIC;
12181216
else
12191217
return CCLIENTUNKNOWN;
12201218
}

‎Client/mods/deathmatch/logic/CClientEntity.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ enum eClientEntityType
7777
CCLIENTBROWSER,
7878
CCLIENTSEARCHLIGHT,
7979
CCLIENTIFP,
80-
CCLIENTVECTORGRAPHIC,
8180
CCLIENTUNKNOWN,
8281
};
8382

@@ -139,7 +138,6 @@ enum eCClientEntityClassTypes
139138
CLASS_CClientRenderTarget,
140139
CLASS_CClientScreenSource,
141140
CLASS_CClientWebBrowser,
142-
CLASS_CClientVectorGraphic,
143141
CLASS_CClientWeapon,
144142
CLASS_CClientEffect,
145143
CLASS_CClientPointLights,

‎Client/mods/deathmatch/logic/CClientPerfStat.LuaMemory.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ void CClientPerfStatLuaMemoryImpl::GetLuaMemoryStats(CClientPerfStatResult* pRes
294294
int RenderTargetCount = g_pClientGame->GetManager()->GetRenderElementManager()->GetRenderTargetCount();
295295
int ScreenSourceCount = g_pClientGame->GetManager()->GetRenderElementManager()->GetScreenSourceCount();
296296
int WebBrowserCount = g_pClientGame->GetManager()->GetRenderElementManager()->GetWebBrowserCount();
297-
int VectorGraphicCount = g_pClientGame->GetManager()->GetRenderElementManager()->GetVectorGraphicCount();
298297
TextItemCount = std::max(TextItemCount - 4, 0); // Remove count for radar items
299298
row[c++] = !TextItemCount ? "-" : SString("%d", TextItemCount);
300299
row[c++] = !DxFontCount ? "-" : SString("%d", DxFontCount);
@@ -304,7 +303,6 @@ void CClientPerfStatLuaMemoryImpl::GetLuaMemoryStats(CClientPerfStatResult* pRes
304303
row[c++] = !RenderTargetCount ? "-" : SString("%d", RenderTargetCount);
305304
row[c++] = !ScreenSourceCount ? "-" : SString("%d", ScreenSourceCount);
306305
row[c++] = !WebBrowserCount ? "-" : SString("%d", WebBrowserCount);
307-
row[c++] = !VectorGraphicCount ? "-" : SString("%d", VectorGraphicCount);
308306
}
309307

310308
// For each VM

‎Client/mods/deathmatch/logic/CClientRenderElementManager.cpp

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
*****************************************************************************/
1010

1111
#include "StdInc.h"
12-
#include "CClientVectorGraphic.h"
1312

1413
////////////////////////////////////////////////////////////////
1514
//
@@ -28,7 +27,6 @@ CClientRenderElementManager::CClientRenderElementManager(CClientManager* pClient
2827
m_uiStatsRenderTargetCount = 0;
2928
m_uiStatsScreenSourceCount = 0;
3029
m_uiStatsWebBrowserCount = 0;
31-
m_uiStatsVectorGraphicCount = 0;
3230
}
3331

3432
////////////////////////////////////////////////////////////////
@@ -244,33 +242,6 @@ CClientWebBrowser* CClientRenderElementManager::CreateWebBrowser(uint uiSizeX, u
244242
return pWebBrowserElement;
245243
}
246244

247-
////////////////////////////////////////////////////////////////
248-
//
249-
// CClientRenderElementManager::CreateVectorGraphic
250-
//
251-
//
252-
//
253-
////////////////////////////////////////////////////////////////
254-
CClientVectorGraphic* CClientRenderElementManager::CreateVectorGraphic(uint width, uint height)
255-
{
256-
// Create the item
257-
CVectorGraphicItem* pVectorGraphicItem = m_pRenderItemManager->CreateVectorGraphic(width, height);
258-
259-
// Check create worked
260-
if (!pVectorGraphicItem)
261-
return nullptr;
262-
263-
// Create the element
264-
CClientVectorGraphic* pVectorGraphicElement = new CClientVectorGraphic(m_pClientManager, INVALID_ELEMENT_ID, pVectorGraphicItem);
265-
266-
// Add to this manager's list
267-
MapSet(m_ItemElementMap, pVectorGraphicElement->GetRenderItem(), pVectorGraphicElement);
268-
269-
m_uiStatsVectorGraphicCount++;
270-
271-
return pVectorGraphicElement;
272-
}
273-
274245
////////////////////////////////////////////////////////////////
275246
//
276247
// CClientRenderElementManager::FindAutoTexture
@@ -339,8 +310,6 @@ void CClientRenderElementManager::Remove(CClientRenderElement* pElement)
339310
m_uiStatsScreenSourceCount--;
340311
else if (pElement->IsA(CClientWebBrowser::GetClassId()))
341312
m_uiStatsWebBrowserCount--;
342-
else if (pElement->IsA(CClientVectorGraphic::GetClassId()))
343-
m_uiStatsVectorGraphicCount--;
344313
else if (pElement->IsA(CClientTexture::GetClassId()))
345314
m_uiStatsTextureCount--;
346315

0 commit comments

Comments
 (0)