isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-02-03 12:31:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into emscripten

Browse Source
This commit is contained in:
Christian Semmler 2025-06-06 11:50:57 -07:00
commit 69c44b71e5
No known key found for this signature in database
GPG Key ID: 086DAA1360BEEE5C
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
miniwin/CMakeLists.txt
View File

@ -30,8 +30,7 @@ if(OpenGL_FOUND AND GLEW_FOUND)
# Find and link OpenGL (1.5) # Find and link OpenGL (1.5)
target_link_libraries(miniwin PRIVATE OpenGL::GL) target_link_libraries(miniwin PRIVATE OpenGL::GL)
# Glew is used for getting a FBO for off screen rendering # Glew is used for getting a FBO for off screen rendering
target_include_directories(miniwin PRIVATE ${GLEW_INCLUDE_DIRS}) target_link_libraries(miniwin PRIVATE GLEW::GLEW)
target_link_libraries(miniwin PRIVATE ${GLEW_LIBRARIES})
endif() endif()
# Force reported render mods from MiniWin # Force reported render mods from MiniWin

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

@ -282,9 +282,7 @@ void Direct3DRMViewportImpl::CollectMeshesFromFrame(
verts.reserve(dataSize); verts.reserve(dataSize);
verts.clear(); verts.clear();
d3dVerts.resize(vtxCount); d3dVerts.resize(vtxCount);
d3dVerts.clear();
faces.resize(dataSize); 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());