metin-server/m2dev-client-src
3
0
Fork 1
Code Issues 1 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

batched text rendering

Browse Source
This commit is contained in:
d1str4ught
2025-08-23 00:16:24 +02:00
parent f5eb9e391b
commit a2c3890527
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/EterLib/GrpTextInstance.cpp
View File

@@ -3,9 +3,11 @@
#include "StateManager.h" #include "StateManager.h"
#include "IME.h" #include "IME.h"
#include "TextTag.h" #include "TextTag.h"
#include "../EterLocale/StringCodec.h" #include "EterLocale/StringCodec.h"
#include "../EterBase/Utils.h" #include "EterBase/Utils.h"
#include "../EterLocale/Arabic.h" #include "EterLocale/Arabic.h"
#include <unordered_map>
extern DWORD GetDefaultCodePage(); extern DWORD GetDefaultCodePage();
@@ -530,7 +532,10 @@ void CGraphicTextInstance::Render(RECT * pClipRect)
break; break;
} }
//WORD FillRectIndices[6] = { 0, 2, 1, 2, 3, 1 }; static std::unordered_map<LPDIRECT3DTEXTURE9, std::vector<SVertex>> s_vtxBatches;
for (auto& [pTexture, vtxBatch] : s_vtxBatches) {
vtxBatch.clear();
}
STATEMANAGER.SaveRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA); STATEMANAGER.SaveRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
STATEMANAGER.SaveRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA); STATEMANAGER.SaveRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
@@ -615,7 +620,7 @@ void CGraphicTextInstance::Render(RECT * pClipRect)
fFontEy = fFontSy + fFontHeight; fFontEy = fFontSy + fFontHeight;
pFontTexture->SelectTexture(pCurCharInfo->index); pFontTexture->SelectTexture(pCurCharInfo->index);
STATEMANAGER.SetTexture(0, pFontTexture->GetD3DTexture()); std::vector<SVertex>& vtxBatch = s_vtxBatches[pFontTexture->GetD3DTexture()];
akVertex[0].u=pCurCharInfo->left; akVertex[0].u=pCurCharInfo->left;
akVertex[0].v=pCurCharInfo->top; akVertex[0].v=pCurCharInfo->top;
@@ -641,9 +646,8 @@ void CGraphicTextInstance::Render(RECT * pClipRect)
akVertex[1].x=fFontSx-fFontHalfWeight-feather; akVertex[1].x=fFontSx-fFontHalfWeight-feather;
akVertex[2].x=fFontEx-fFontHalfWeight+feather; akVertex[2].x=fFontEx-fFontHalfWeight+feather;
akVertex[3].x=fFontEx-fFontHalfWeight+feather; akVertex[3].x=fFontEx-fFontHalfWeight+feather;
if (CGraphicBase::SetPDTStream((SPDTVertex*)akVertex, 4)) vtxBatch.insert(vtxBatch.end(), std::begin(akVertex), std::end(akVertex));
STATEMANAGER.DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
// 오른 // 오른
@@ -652,8 +656,7 @@ void CGraphicTextInstance::Render(RECT * pClipRect)
akVertex[2].x=fFontEx+fFontHalfWeight+feather; akVertex[2].x=fFontEx+fFontHalfWeight+feather;
akVertex[3].x=fFontEx+fFontHalfWeight+feather; akVertex[3].x=fFontEx+fFontHalfWeight+feather;
if (CGraphicBase::SetPDTStream((SPDTVertex*)akVertex, 4)) vtxBatch.insert(vtxBatch.end(), std::begin(akVertex), std::end(akVertex));
STATEMANAGER.DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
akVertex[0].x=fFontSx-feather; akVertex[0].x=fFontSx-feather;
akVertex[1].x=fFontSx-feather; akVertex[1].x=fFontSx-feather;
@@ -666,9 +669,7 @@ void CGraphicTextInstance::Render(RECT * pClipRect)
akVertex[2].y=fFontSy-fFontHalfWeight-feather; akVertex[2].y=fFontSy-fFontHalfWeight-feather;
akVertex[3].y=fFontEy-fFontHalfWeight+feather; akVertex[3].y=fFontEy-fFontHalfWeight+feather;
// 20041216.myevan.DrawPrimitiveUP vtxBatch.insert(vtxBatch.end(), std::begin(akVertex), std::end(akVertex));
if (CGraphicBase::SetPDTStream((SPDTVertex*)akVertex, 4))
STATEMANAGER.DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
// 아래 // 아래
akVertex[0].y=fFontSy+fFontHalfWeight-feather; akVertex[0].y=fFontSy+fFontHalfWeight-feather;
@@ -676,9 +677,7 @@ void CGraphicTextInstance::Render(RECT * pClipRect)
akVertex[2].y=fFontSy+fFontHalfWeight-feather; akVertex[2].y=fFontSy+fFontHalfWeight-feather;
akVertex[3].y=fFontEy+fFontHalfWeight+feather; akVertex[3].y=fFontEy+fFontHalfWeight+feather;
// 20041216.myevan.DrawPrimitiveUP vtxBatch.insert(vtxBatch.end(), std::begin(akVertex), std::end(akVertex));
if (CGraphicBase::SetPDTStream((SPDTVertex*)akVertex, 4))
STATEMANAGER.DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
fCurX += fFontAdvance; fCurX += fFontAdvance;
} }
@@ -727,7 +726,7 @@ void CGraphicTextInstance::Render(RECT * pClipRect)
fFontEy = fFontSy + fFontHeight; fFontEy = fFontSy + fFontHeight;
pFontTexture->SelectTexture(pCurCharInfo->index); pFontTexture->SelectTexture(pCurCharInfo->index);
STATEMANAGER.SetTexture(0, pFontTexture->GetD3DTexture()); std::vector<SVertex>& vtxBatch = s_vtxBatches[pFontTexture->GetD3DTexture()];
akVertex[0].x=fFontSx; akVertex[0].x=fFontSx;
akVertex[0].y=fFontSy; akVertex[0].y=fFontSy;
@@ -749,19 +748,22 @@ void CGraphicTextInstance::Render(RECT * pClipRect)
akVertex[3].u=pCurCharInfo->right; akVertex[3].u=pCurCharInfo->right;
akVertex[3].v=pCurCharInfo->bottom; akVertex[3].v=pCurCharInfo->bottom;
//m_dwColorInfoVector[i];
//m_dwTextColor;
akVertex[0].color = akVertex[1].color = akVertex[2].color = akVertex[3].color = m_dwColorInfoVector[i]; akVertex[0].color = akVertex[1].color = akVertex[2].color = akVertex[3].color = m_dwColorInfoVector[i];
// 20041216.myevan.DrawPrimitiveUP vtxBatch.insert(vtxBatch.end(), std::begin(akVertex), std::end(akVertex));
if (CGraphicBase::SetPDTStream((SPDTVertex*)akVertex, 4))
STATEMANAGER.DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
//STATEMANAGER.DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, akVertex, sizeof(SVertex));
fCurX += fFontAdvance; fCurX += fFontAdvance;
} }
} }
for (const auto& [pTexture, vtxBatch] : s_vtxBatches) {
if (vtxBatch.empty())
continue;
STATEMANAGER.SetTexture(0, pTexture);
STATEMANAGER.DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, vtxBatch.size() - 2, vtxBatch.data(), sizeof(SVertex));
}
if (m_isCursor) if (m_isCursor)
{ {
// Draw Cursor // Draw Cursor