isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-20 14:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'isledecomp:master' into psp

Browse Source
This commit is contained in:
VoxelTek 2025-07-20 14:56:21 +10:00 committed by GitHub
commit ffa346d9d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View File

@ -35,8 +35,10 @@ jobs:
matrix: matrix:
include: include:
- { name: 'Linux', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: true, linux: true, werror: true, clang-tidy: true } - { name: 'Linux', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: true, linux: true, werror: true, clang-tidy: true }
- { name: 'Linux (Debug)', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: true, linux: true, werror: true, clang-tidy: true, debug: true }
- { name: 'MSVC (x86)', os: 'windows-latest', generator: 'Ninja', dx5: true, config: false, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64_x86' } - { name: 'MSVC (x86)', os: 'windows-latest', generator: 'Ninja', dx5: true, config: false, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64_x86' }
- { name: 'MSVC (x64)', os: 'windows-latest', generator: 'Ninja', dx5: false, config: true, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64' } - { name: 'MSVC (x64)', os: 'windows-latest', generator: 'Ninja', dx5: false, config: true, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64' }
- { name: 'MSVC (x64 Debug)', os: 'windows-latest', generator: 'Ninja', dx5: false, config: true, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64', debug: true }
- { name: 'MSVC (arm64)', os: 'windows-latest', generator: 'Ninja', dx5: false, config: false, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64_arm64' } - { name: 'MSVC (arm64)', os: 'windows-latest', generator: 'Ninja', dx5: false, config: false, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64_arm64' }
- { name: 'msys2 mingw32', os: 'windows-latest', generator: 'Ninja', dx5: false, config: false, mingw: true, werror: true, clang-tidy: true, msystem: 'mingw32', msys-env: 'mingw-w64-i686', shell: 'msys2 {0}' } - { name: 'msys2 mingw32', os: 'windows-latest', generator: 'Ninja', dx5: false, config: false, mingw: true, werror: true, clang-tidy: true, msystem: 'mingw32', msys-env: 'mingw-w64-i686', shell: 'msys2 {0}' }
- { name: 'msys2 mingw64', os: 'windows-latest', generator: 'Ninja', dx5: false, config: true, mingw: true, werror: true, clang-tidy: true, msystem: 'mingw64', msys-env: 'mingw-w64-x86_64', shell: 'msys2 {0}' } - { name: 'msys2 mingw64', os: 'windows-latest', generator: 'Ninja', dx5: false, config: true, mingw: true, werror: true, clang-tidy: true, msystem: 'mingw64', msys-env: 'mingw-w64-x86_64', shell: 'msys2 {0}' }
@ -113,7 +115,7 @@ jobs:
-DISLE_BUILD_CONFIG=${{ !!matrix.config }} \ -DISLE_BUILD_CONFIG=${{ !!matrix.config }} \
-DENABLE_CLANG_TIDY=${{ !!matrix.clang-tidy }} \ -DENABLE_CLANG_TIDY=${{ !!matrix.clang-tidy }} \
-DISLE_WERROR=${{ !!matrix.werror }} \ -DISLE_WERROR=${{ !!matrix.werror }} \
-DISLE_DEBUG=OFF \ -DISLE_DEBUG=${{ matrix.debug || 'OFF' }} \
-Werror=dev -Werror=dev
- name: Build (CMake) - name: Build (CMake)

12
ISLE/isledebug.cpp
View File

@ -46,7 +46,7 @@ class DebugViewer {
if (plantManager->m_numEntries) { if (plantManager->m_numEntries) {
if (ImGui::BeginTable("Animated Entries", 4, ImGuiTableFlags_Borders)) { if (ImGui::BeginTable("Animated Entries", 4, ImGuiTableFlags_Borders)) {
ImGui::TableSetupColumn("ROI Name"); ImGui::TableSetupColumn("ROI Name");
ImGui::TableSetupColumn("ROI m_unk0x100"); ImGui::TableSetupColumn("ROI m_sharedLodList");
ImGui::TableSetupColumn("Entity Name"); ImGui::TableSetupColumn("Entity Name");
ImGui::TableSetupColumn("Time"); ImGui::TableSetupColumn("Time");
ImGui::TableHeadersRow(); ImGui::TableHeadersRow();
@ -55,7 +55,7 @@ class DebugViewer {
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::Text("%s", entry->m_roi->m_name); ImGui::Text("%s", entry->m_roi->m_name);
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("%d", entry->m_roi->m_unk0x100); ImGui::Text("%d", entry->m_roi->m_sharedLodList);
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("%s", entry->m_roi->m_entity->ClassName()); ImGui::Text("%s", entry->m_roi->m_entity->ClassName());
ImGui::TableNextColumn(); ImGui::TableNextColumn();
@ -75,7 +75,7 @@ class DebugViewer {
if (buildingManager->m_numEntries) { if (buildingManager->m_numEntries) {
if (ImGui::BeginTable("Animated Entries", 6, ImGuiTableFlags_Borders)) { if (ImGui::BeginTable("Animated Entries", 6, ImGuiTableFlags_Borders)) {
ImGui::TableSetupColumn("ROI Name"); ImGui::TableSetupColumn("ROI Name");
ImGui::TableSetupColumn("ROI m_unk0x100"); ImGui::TableSetupColumn("ROI m_sharedLodList");
ImGui::TableSetupColumn("Entity Name"); ImGui::TableSetupColumn("Entity Name");
ImGui::TableSetupColumn("Time"); ImGui::TableSetupColumn("Time");
ImGui::TableSetupColumn("Y"); ImGui::TableSetupColumn("Y");
@ -86,13 +86,13 @@ class DebugViewer {
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::Text("%s", entry->m_roi->m_name); ImGui::Text("%s", entry->m_roi->m_name);
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("%d", entry->m_roi->m_unk0x100); ImGui::Text("%d", entry->m_roi->m_sharedLodList);
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("%s", entry->m_roi->m_entity->ClassName()); ImGui::Text("%s", entry->m_roi->m_entity->ClassName());
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("%d", entry->m_time); ImGui::Text("%d", entry->m_time);
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("%d", entry->m_y); ImGui::Text("%f", entry->m_y);
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("%d", entry->m_muted); ImGui::Text("%d", entry->m_muted);
} }
@ -135,7 +135,7 @@ class DebugViewer {
ImGui::Text("unk0x70: %u", videoManager->m_unk0x70); ImGui::Text("unk0x70: %u", videoManager->m_unk0x70);
ImGui::Text("Dither: %d", videoManager->m_dither); ImGui::Text("Dither: %d", videoManager->m_dither);
ImGui::Text("BufferCount: %u", videoManager->m_bufferCount); ImGui::Text("BufferCount: %u", videoManager->m_bufferCount);
ImGui::Text("Paused: %f", videoManager->m_paused); ImGui::Text("Paused: %d", videoManager->m_paused);
ImGui::Text("back: %g", videoManager->m_back); ImGui::Text("back: %g", videoManager->m_back);
ImGui::Text("front: %g", videoManager->m_front); ImGui::Text("front: %g", videoManager->m_front);
ImGui::Text("cameraWidth: %g", videoManager->m_cameraWidth); ImGui::Text("cameraWidth: %g", videoManager->m_cameraWidth);