Skip to content

Modify dxDraw(Material)Primitive to use same queue as other dxDraw functions #565

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 2 commits into from
Sep 27, 2018
Merged

Modify dxDraw(Material)Primitive to use same queue as other dxDraw functions #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15c5688
Modifiec dx drawing code to use same queue as other dx functions
Sep 22, 2018
2eeb229
Disable depth buffering for material primitives drawing
Sep 26, 2018
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
136 changes: 90 additions & 46 deletions Client/core/Graphics/CGraphics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,8 @@ CGraphics::CGraphics(CLocalGUI* pGUI)
m_pLine3DBatcherPostGUI = new CLine3DBatcher(false);
m_pMaterialLine3DBatcherPreGUI = new CMaterialLine3DBatcher(true);
m_pMaterialLine3DBatcherPostGUI = new CMaterialLine3DBatcher(false);
m_pPrimitiveBatcherPreGUI = new CPrimitiveBatcher(true);
m_pPrimitiveBatcherPostGUI = new CPrimitiveBatcher(false);
m_pPrimitiveMaterialBatcherPreGUI = new CPrimitiveMaterialBatcher(true, this);
m_pPrimitiveMaterialBatcherPostGUI = new CPrimitiveMaterialBatcher(false, this);
m_pPrimitiveBatcher = new CPrimitiveBatcher();
m_pPrimitiveMaterialBatcher = new CPrimitiveMaterialBatcher(this);

m_pScreenGrabber = NewScreenGrabber();
m_pPixelsManager = NewPixelsManager();
Expand All @@ -84,10 +82,8 @@ CGraphics::~CGraphics(void)
SAFE_DELETE(m_pLine3DBatcherPostGUI);
SAFE_DELETE(m_pMaterialLine3DBatcherPreGUI);
SAFE_DELETE(m_pMaterialLine3DBatcherPostGUI);
SAFE_DELETE(m_pPrimitiveBatcherPreGUI);
SAFE_DELETE(m_pPrimitiveBatcherPostGUI);
SAFE_DELETE(m_pPrimitiveMaterialBatcherPreGUI);
SAFE_DELETE(m_pPrimitiveMaterialBatcherPostGUI);
SAFE_DELETE(m_pPrimitiveBatcher);
SAFE_DELETE(m_pPrimitiveMaterialBatcher);
SAFE_DELETE(m_pScreenGrabber);
SAFE_DELETE(m_pPixelsManager);
SAFE_DELETE(m_pAspectRatioConverter);
Expand Down Expand Up @@ -508,6 +504,14 @@ void CGraphics::CheckModes(EDrawModeType newDrawMode, EBlendModeType newBlendMod
{
m_pTileBatcher->Flush();
}
else if (m_CurDrawMode == EDrawMode::PRIMITIVE)
{
m_pPrimitiveBatcher->Flush();
}
else if (m_CurDrawMode == EDrawMode::PRIMITIVE_MATERIAL)
{
m_pPrimitiveMaterialBatcher->Flush();
}

// Start new
if (newDrawMode == EDrawMode::DX_SPRITE)
Expand Down Expand Up @@ -841,58 +845,92 @@ void CGraphics::DrawCircleQueued(float fX, float fY, float fRadius, float fStart
AddQueueItem(Item, bPostGUI);
}

void CGraphics::DrawPrimitiveQueued(const std::vector<PrimitiveVertice>& vecVertices, D3DPRIMITIVETYPE eType, bool bPostGUI)
void CGraphics::DrawPrimitiveQueued(std::vector<PrimitiveVertice>* pVecVertices, D3DPRIMITIVETYPE eType, bool bPostGUI)
{
// Prevent queuing when minimized
if (g_pCore->IsWindowMinimized())
{
m_pPrimitiveBatcherPreGUI->ClearQueue();
m_pPrimitiveBatcherPostGUI->ClearQueue();
delete pVecVertices;
m_pPrimitiveBatcher->ClearQueue();
return;
}

for (PrimitiveVertice vert : vecVertices)
for (auto& vert : *pVecVertices)
{
vert.fY = m_pAspectRatioConverter->ConvertPositionForAspectRatio(vert.fY);
}

sDrawQueuePrimitive primitive;
primitive.vertices = vecVertices;
primitive.type = eType;
// Add it to the queue
if (bPostGUI && !CCore::GetSingleton().IsMenuVisible())
m_pPrimitiveBatcherPostGUI->AddPrimitive(primitive);
else
m_pPrimitiveBatcherPreGUI->AddPrimitive(primitive);
// Set up a queue item
sDrawQueueItem Item;
Item.eType = QUEUE_PRIMITIVE;
Item.Primitive.eType = eType;
Item.Primitive.pVecVertices = pVecVertices;
AddQueueItem (Item, bPostGUI);
}

void CGraphics::DrawMaterialPrimitiveQueued(const std::vector<PrimitiveMaterialVertice>& vecVertices, D3DPRIMITIVETYPE eType, CMaterialItem* pMaterial,
void CGraphics::DrawMaterialPrimitiveQueued(std::vector<PrimitiveMaterialVertice>* pVecVertices, D3DPRIMITIVETYPE eType, CMaterialItem* pMaterial,
bool bPostGUI)
{
// Prevent queuing when minimized
if (g_pCore->IsWindowMinimized())
{
m_pPrimitiveBatcherPreGUI->ClearQueue();
m_pPrimitiveBatcherPostGUI->ClearQueue();
delete pVecVertices;
m_pPrimitiveMaterialBatcher->ClearQueue();
return;
}

for (PrimitiveMaterialVertice vert : vecVertices)
for (auto& vert : *pVecVertices)
{
vert.fY = m_pAspectRatioConverter->ConvertPositionForAspectRatio(vert.fY);
}

sDrawQueuePrimitiveMaterial primitive;
primitive.vertices = vecVertices;
primitive.material = pMaterial;
primitive.type = eType;
// Set up a queue item
sDrawQueueItem Item;
Item.eType = QUEUE_PRIMITIVEMATERIAL;
Item.PrimitiveMaterial.eType = eType;
Item.PrimitiveMaterial.pMaterial = pMaterial;
Item.PrimitiveMaterial.pVecVertices = pVecVertices;
AddQueueItem(Item, bPostGUI);

AddQueueRef(primitive.material);
// Add it to the queue
if (bPostGUI && !CCore::GetSingleton().IsMenuVisible())
m_pPrimitiveMaterialBatcherPostGUI->AddPrimitive(primitive);
else
m_pPrimitiveMaterialBatcherPreGUI->AddPrimitive(primitive);
AddQueueRef(pMaterial);
}

bool CGraphics::IsValidPrimitiveSize (int iNumVertives, D3DPRIMITIVETYPE eType)
{
if (iNumVertives < 1)
{
return false;
}

switch (eType)
{
case D3DPT_LINESTRIP:
if (iNumVertives < 2)
{
return false;
}
break;
case D3DPT_LINELIST:
if (iNumVertives % 2 != 0)
{
return false;
}
break;
case D3DPT_TRIANGLELIST:
if (iNumVertives % 3 != 0)
{
return false;
}
case D3DPT_TRIANGLEFAN:
case D3DPT_TRIANGLESTRIP:
if (iNumVertives < 3)
{
return false;
}
break;
}

return true;
}

struct stVertex
Expand Down Expand Up @@ -1424,10 +1462,8 @@ void CGraphics::OnDeviceCreate(IDirect3DDevice9* pDevice)
m_pLine3DBatcherPostGUI->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
m_pMaterialLine3DBatcherPreGUI->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
m_pMaterialLine3DBatcherPostGUI->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
m_pPrimitiveBatcherPreGUI->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
m_pPrimitiveBatcherPostGUI->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
m_pPrimitiveMaterialBatcherPreGUI->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
m_pPrimitiveMaterialBatcherPostGUI->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
m_pPrimitiveBatcher->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
m_pPrimitiveMaterialBatcher->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
m_pRenderItemManager->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
m_pScreenGrabber->OnDeviceCreate(pDevice);
m_pPixelsManager->OnDeviceCreate(pDevice);
Expand Down Expand Up @@ -1496,15 +1532,11 @@ void CGraphics::OnZBufferModified(void)
void CGraphics::DrawPreGUIQueue(void)
{
DrawQueue(m_PreGUIQueue);
m_pPrimitiveBatcherPreGUI->Flush();
m_pPrimitiveMaterialBatcherPreGUI->Flush();
}

void CGraphics::DrawPostGUIQueue(void)
{
DrawQueue(m_PostGUIQueue);
m_pPrimitiveBatcherPostGUI->Flush();
m_pPrimitiveMaterialBatcherPostGUI->Flush();
m_pLine3DBatcherPostGUI->Flush();
m_pMaterialLine3DBatcherPostGUI->Flush();

Expand Down Expand Up @@ -1683,6 +1715,20 @@ void CGraphics::DrawQueueItem(const sDrawQueueItem& Item)
RemoveQueueRef(Item.Texture.pMaterial);
break;
}
case QUEUE_PRIMITIVE:
{
const sDrawQueuePrimitive primitive = Item.Primitive;
CheckModes (EDrawMode::PRIMITIVE);
m_pPrimitiveBatcher->AddPrimitive (primitive.eType, primitive.pVecVertices);
break;
}
case QUEUE_PRIMITIVEMATERIAL:
{
const sDrawQueuePrimitiveMaterial primitive = Item.PrimitiveMaterial;
CheckModes(EDrawMode::PRIMITIVE_MATERIAL);
m_pPrimitiveMaterialBatcher->AddPrimitive(primitive.eType, primitive.pMaterial, primitive.pVecVertices);
break;
}
}
}

Expand Down Expand Up @@ -1758,10 +1804,8 @@ void CGraphics::OnChangingRenderTarget(uint uiNewViewportSizeX, uint uiNewViewpo
DrawPreGUIQueue();
// Inform batchers
m_pTileBatcher->OnChangingRenderTarget(uiNewViewportSizeX, uiNewViewportSizeY);
m_pPrimitiveBatcherPreGUI->OnChangingRenderTarget(uiNewViewportSizeX, uiNewViewportSizeY);
m_pPrimitiveBatcherPostGUI->OnChangingRenderTarget(uiNewViewportSizeX, uiNewViewportSizeY);
m_pPrimitiveMaterialBatcherPreGUI->OnChangingRenderTarget(uiNewViewportSizeX, uiNewViewportSizeY);
m_pPrimitiveMaterialBatcherPostGUI->OnChangingRenderTarget(uiNewViewportSizeX, uiNewViewportSizeY);
m_pPrimitiveBatcher->OnChangingRenderTarget(uiNewViewportSizeX, uiNewViewportSizeY);
m_pPrimitiveMaterialBatcher->OnChangingRenderTarget(uiNewViewportSizeX, uiNewViewportSizeY);
}

////////////////////////////////////////////////////////////////
Expand Down
41 changes: 30 additions & 11 deletions Client/core/Graphics/CGraphics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ namespace EDrawMode
DX_LINE,
DX_SPRITE,
TILE_BATCHER,
PRIMITIVE,
PRIMITIVE_MATERIAL
};
}
using EDrawMode::EDrawModeType;
Expand Down Expand Up @@ -145,11 +147,13 @@ class CGraphics : public CGraphicsInterface, public CSingleton<CGraphics>
unsigned long ulFormat, ID3DXFont* pDXFont = NULL, bool bPostGUI = false, bool bColorCoded = false, bool bSubPixelPositioning = false,
float fRotation = 0, float fRotationCenterX = 0, float fRotationCenterY = 0);

void DrawPrimitiveQueued(const std::vector<PrimitiveVertice>& vecVertices, D3DPRIMITIVETYPE type, bool bPostGUI = false);
void DrawMaterialPrimitiveQueued(const std::vector<PrimitiveMaterialVertice>& vertices, D3DPRIMITIVETYPE type, CMaterialItem* pMaterial, bool bPostGUI);
void DrawPrimitiveQueued(std::vector<PrimitiveVertice>* pVecVertices, D3DPRIMITIVETYPE eType, bool bPostGUI = false);
void DrawMaterialPrimitiveQueued(std::vector<PrimitiveMaterialVertice>* vertices, D3DPRIMITIVETYPE type, CMaterialItem* pMaterial, bool bPostGUI);
void DrawCircleQueued(float fX, float fY, float fRadius, float fStartAngle, float fStopAngle, unsigned long ulColor, unsigned long ulColorCenter,
short siSegments, float fRatio, bool bPostGUI);

bool IsValidPrimitiveSize (int iNumVertives, D3DPRIMITIVETYPE eType);

void OnChangingRenderTarget(uint uiNewViewportSizeX, uint uiNewViewportSizeY);

// Subsystems
Expand Down Expand Up @@ -213,10 +217,8 @@ class CGraphics : public CGraphicsInterface, public CSingleton<CGraphics>
CLine3DBatcher* m_pLine3DBatcherPostGUI;
CMaterialLine3DBatcher* m_pMaterialLine3DBatcherPreGUI;
CMaterialLine3DBatcher* m_pMaterialLine3DBatcherPostGUI;
CPrimitiveBatcher* m_pPrimitiveBatcherPreGUI;
CPrimitiveBatcher* m_pPrimitiveBatcherPostGUI;
CPrimitiveMaterialBatcher* m_pPrimitiveMaterialBatcherPreGUI;
CPrimitiveMaterialBatcher* m_pPrimitiveMaterialBatcherPostGUI;
CPrimitiveBatcher* m_pPrimitiveBatcher;
CPrimitiveMaterialBatcher* m_pPrimitiveMaterialBatcher;
CAspectRatioConverter* m_pAspectRatioConverter;

// Fonts
Expand All @@ -237,6 +239,8 @@ class CGraphics : public CGraphicsInterface, public CSingleton<CGraphics>
QUEUE_TEXTURE,
QUEUE_SHADER,
QUEUE_CIRCLE,
QUEUE_PRIMITIVE,
QUEUE_PRIMITIVEMATERIAL,
};

struct sDrawQueueLine
Expand Down Expand Up @@ -307,6 +311,19 @@ class CGraphics : public CGraphicsInterface, public CSingleton<CGraphics>
bool bRelativeUV;
};

struct sDrawQueuePrimitive
{
D3DPRIMITIVETYPE eType;
std::vector<PrimitiveVertice>* pVecVertices;
};

struct sDrawQueuePrimitiveMaterial
{
D3DPRIMITIVETYPE eType;
CMaterialItem* pMaterial;
std::vector<PrimitiveMaterialVertice>* pVecVertices;
};

struct sDrawQueueItem
{
eDrawQueueType eType;
Expand All @@ -315,11 +332,13 @@ class CGraphics : public CGraphicsInterface, public CSingleton<CGraphics>

// Queue item data based on the eType.
union {
sDrawQueueLine Line;
sDrawQueueText Text;
sDrawQueueRect Rect;
sDrawQueueTexture Texture;
sDrawQueueCircle Circle;
sDrawQueueLine Line;
sDrawQueueText Text;
sDrawQueueRect Rect;
sDrawQueueTexture Texture;
sDrawQueueCircle Circle;
sDrawQueuePrimitive Primitive;
sDrawQueuePrimitiveMaterial PrimitiveMaterial;
};
};

Expand Down
Loading