TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-22 11:31:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Big performance boost (#242)

Browse Source
This commit is contained in:
Anders Jenbo 2025-06-06 03:08:38 +02:00 committed by GitHub
parent 9a1cf812dd
commit 06fb577d7f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
miniwin/src/d3drm/d3drmmesh.cpp
View File

@ -64,8 +64,6 @@ HRESULT Direct3DRMMeshImpl::AddGroup(
m_groups.push_back(std::move(group)); m_groups.push_back(std::move(group));
UpdateBox(newIndex);
return DD_OK; return DD_OK;
} }
@ -281,19 +279,14 @@ void Direct3DRMMeshImpl::UpdateBox()
m_box.max = {-INF, -INF, -INF}; m_box.max = {-INF, -INF, -INF};
for (size_t i = 0; i < m_groups.size(); ++i) { for (size_t i = 0; i < m_groups.size(); ++i) {
UpdateBox(i); for (const D3DRMVERTEX& v : m_groups[i].vertices) {
} m_box.min.x = std::min(m_box.min.x, v.position.x);
} m_box.min.y = std::min(m_box.min.y, v.position.y);
m_box.min.z = std::min(m_box.min.z, v.position.z);
void Direct3DRMMeshImpl::UpdateBox(DWORD groupIndex) m_box.max.x = std::max(m_box.max.x, v.position.x);
{ m_box.max.y = std::max(m_box.max.y, v.position.y);
for (const D3DRMVERTEX& v : m_groups[groupIndex].vertices) { m_box.max.z = std::max(m_box.max.z, v.position.z);
m_box.min.x = std::min(m_box.min.x, v.position.x); }
m_box.min.y = std::min(m_box.min.y, v.position.y);
m_box.min.z = std::min(m_box.min.z, v.position.z);
m_box.max.x = std::max(m_box.max.x, v.position.x);
m_box.max.y = std::max(m_box.max.y, v.position.y);
m_box.max.z = std::max(m_box.max.z, v.position.z);
} }
} }

24
miniwin/src/d3drm/d3drmviewport.cpp
View File

@ -212,7 +212,13 @@ bool IsBoxInFrustum(const D3DVECTOR corners[8], const Plane planes[6])
return true; return true;
} }
void Direct3DRMViewportImpl::CollectMeshesFromFrame(IDirect3DRMFrame* frame, D3DRMMATRIX4D parentMatrix) void Direct3DRMViewportImpl::CollectMeshesFromFrame(
IDirect3DRMFrame* frame,
D3DRMMATRIX4D parentMatrix,
std::vector<GeometryVertex>& verts,
std::vector<D3DRMVERTEX>& d3dVerts,
std::vector<DWORD>& faces
)
{ {
Direct3DRMFrameImpl* frameImpl = static_cast<Direct3DRMFrameImpl*>(frame); Direct3DRMFrameImpl* frameImpl = static_cast<Direct3DRMFrameImpl*>(frame);
D3DRMMATRIX4D localMatrix; D3DRMMATRIX4D localMatrix;
@ -234,7 +240,7 @@ void Direct3DRMViewportImpl::CollectMeshesFromFrame(IDirect3DRMFrame* frame, D3D
IDirect3DRMFrame* childFrame = nullptr; IDirect3DRMFrame* childFrame = nullptr;
visual->QueryInterface(IID_IDirect3DRMFrame, (void**) &childFrame); visual->QueryInterface(IID_IDirect3DRMFrame, (void**) &childFrame);
if (childFrame) { if (childFrame) {
CollectMeshesFromFrame(childFrame, worldMatrix); CollectMeshesFromFrame(childFrame, worldMatrix, verts, d3dVerts, faces);
childFrame->Release(); childFrame->Release();
visual->Release(); visual->Release();
continue; continue;
@ -273,9 +279,12 @@ void Direct3DRMViewportImpl::CollectMeshesFromFrame(IDirect3DRMFrame* frame, D3D
DWORD vtxCount, faceCount, vpf, dataSize; DWORD vtxCount, faceCount, vpf, dataSize;
mesh->GetGroup(gi, &vtxCount, &faceCount, &vpf, &dataSize, nullptr); mesh->GetGroup(gi, &vtxCount, &faceCount, &vpf, &dataSize, nullptr);
std::vector<GeometryVertex> verts(dataSize * vpf); verts.reserve(dataSize);
std::vector<D3DRMVERTEX> d3dVerts(vtxCount); verts.clear();
std::vector<DWORD> faces(dataSize); d3dVerts.resize(vtxCount);
d3dVerts.clear();
faces.resize(dataSize);
faces.clear();
mesh->GetVertices(gi, 0, vtxCount, d3dVerts.data()); mesh->GetVertices(gi, 0, vtxCount, d3dVerts.data());
mesh->GetGroup(gi, nullptr, nullptr, nullptr, nullptr, faces.data()); mesh->GetGroup(gi, nullptr, nullptr, nullptr, nullptr, faces.data());
@ -356,8 +365,11 @@ HRESULT Direct3DRMViewportImpl::RenderScene()
return status; return status;
} }
std::vector<GeometryVertex> verts;
std::vector<D3DRMVERTEX> d3dVerts;
std::vector<DWORD> faces;
ExtractFrustumPlanes(viewProj); ExtractFrustumPlanes(viewProj);
CollectMeshesFromFrame(m_rootFrame, identity); CollectMeshesFromFrame(m_rootFrame, identity, verts, d3dVerts, faces);
return m_renderer->FinalizeFrame(); return m_renderer->FinalizeFrame();
} }

1
miniwin/src/internal/d3drmmesh_impl.h
View File

@ -94,7 +94,6 @@ struct Direct3DRMMeshImpl : public Direct3DRMObjectBaseImpl<IDirect3DRMMesh> {
private: private:
void UpdateBox(); void UpdateBox();
void UpdateBox(DWORD groupIndex);
std::vector<MeshGroup> m_groups; std::vector<MeshGroup> m_groups;
D3DRMBOX m_box; D3DRMBOX m_box;

8
miniwin/src/internal/d3drmviewport_impl.h
View File

@ -37,7 +37,13 @@ struct Direct3DRMViewportImpl : public Direct3DRMObjectBaseImpl<IDirect3DRMViewp
private: private:
HRESULT RenderScene(); HRESULT RenderScene();
void CollectLightsFromFrame(IDirect3DRMFrame* frame, D3DRMMATRIX4D parentMatrix, std::vector<SceneLight>& lights); void CollectLightsFromFrame(IDirect3DRMFrame* frame, D3DRMMATRIX4D parentMatrix, std::vector<SceneLight>& lights);
void CollectMeshesFromFrame(IDirect3DRMFrame* frame, D3DRMMATRIX4D parentMatrix); void CollectMeshesFromFrame(
IDirect3DRMFrame* frame,
D3DRMMATRIX4D parentMatrix,
std::vector<GeometryVertex>& verts,
std::vector<D3DRMVERTEX>& d3dVerts,
std::vector<DWORD>& faces
);
void UpdateProjectionMatrix(); void UpdateProjectionMatrix();
Direct3DRMRenderer* m_renderer; Direct3DRMRenderer* m_renderer;
D3DCOLOR m_backgroundColor = 0xFF000000; D3DCOLOR m_backgroundColor = 0xFF000000;