Green-Sky/solDOOM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Green-Sky:fee884ff326eb8eff722d47e94921ae87ef083e9
Branches Tags
Green-Sky:master
...
compare: Green-Sky:master
Branches Tags
Green-Sky:master

5 Commits
fee884ff32 ... master

Author SHA1 Message Date
Green Sky
80f9a857d3 update imgui 2025-10-07 22:01:58 +02:00
Green Sky
0fc34b42d4 fix cd ubuntu naming 2025-07-15 12:52:44 +02:00
Green Sky
de6826f7d3 update cd config 2025-07-15 12:44:34 +02:00
Green Sky
ed7517080b update imgui 2025-07-15 12:20:53 +02:00
Green Sky
3320e6c1e3 update imgui to v1.91.7 2025-01-18 14:49:54 +01:00
3 changed files with 18 additions and 16 deletions
Expand all files Collapse all files

29
.github/workflows/cd.yml vendored
View File

@@ -7,14 +7,14 @@ on:
branches: [ master ] branches: [ master ]
env: env:
BUILD_TYPE: Release BUILD_TYPE: RelWidthDebInfo
BRANCH_NAME: ${{ github.head_ref || github.ref_name }} BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
jobs: jobs:
linux-ubuntu: linux-ubuntu:
timeout-minutes: 10 timeout-minutes: 10
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -25,6 +25,10 @@ jobs:
- name: Build - name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
- name: Test
working-directory: ${{github.workspace}}/build
run: ctest -C ${{env.BUILD_TYPE}}
- name: Determine tag name - name: Determine tag name
id: tag id: tag
shell: bash shell: bash
@@ -32,24 +36,24 @@ jobs:
run: | run: |
SHORT_HASH="$(git rev-parse --short=7 HEAD)" SHORT_HASH="$(git rev-parse --short=7 HEAD)"
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
echo "name=${SHORT_HASH}" >> $GITHUB_OUTPUT echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
else else
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-') SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
echo "name=${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
fi fi
- name: Compress artifacts - name: Compress artifacts
shell: bash shell: bash
run: | run: |
tar -czvf ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu20.04-x86_64.tar.gz -C ${{github.workspace}}/build/bin/ . tar -czvf ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu22.04-x86_64.tar.gz -C ${{github.workspace}}/build/bin/ .
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
with: with:
# TODO: simpler name? # TODO: simpler name?
name: ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu20.04-x86_64 name: ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu22.04-x86_64
# TODO: do propper packing # TODO: do propper packing
path: | path: |
${{github.workspace}}/${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu20.04-x86_64.tar.gz ${{github.workspace}}/${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu22.04-x86_64.tar.gz
windows: windows:
@@ -78,10 +82,10 @@ jobs:
run: | run: |
SHORT_HASH="$(git rev-parse --short=7 HEAD)" SHORT_HASH="$(git rev-parse --short=7 HEAD)"
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
echo "name=${SHORT_HASH}" >> $GITHUB_OUTPUT echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
else else
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-') SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
echo "name=${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
fi fi
- name: Compress artifacts - name: Compress artifacts
@@ -98,8 +102,7 @@ jobs:
${{github.workspace}}/${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-msvc-x86_64.zip ${{github.workspace}}/${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-msvc-x86_64.zip
release: release:
if: false if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) }}
#if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -120,10 +123,10 @@ jobs:
run: | run: |
SHORT_HASH="$(git rev-parse --short=7 HEAD)" SHORT_HASH="$(git rev-parse --short=7 HEAD)"
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
echo "name=${SHORT_HASH}" >> $GITHUB_OUTPUT echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
else else
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-') SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
echo "name=${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
fi fi
- name: Download artifacts - name: Download artifacts

3
external/CMakeLists.txt vendored
View File

@@ -18,9 +18,8 @@ endif()
if (NOT TARGET imgui) if (NOT TARGET imgui)
FetchContent_Declare(imgui FetchContent_Declare(imgui
GIT_REPOSITORY https://github.com/ocornut/imgui.git GIT_REPOSITORY https://github.com/ocornut/imgui.git
GIT_TAG cb16568 # v1.91.3 GIT_TAG bf75bfec48fc00f532af8926130b70c0e26eb099 # v1.92.3
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
CONFIGURE_COMMAND "" # remove?
) )
# imgui does not provide a cmake # imgui does not provide a cmake

2
src/solanaceae/doom_imgui.cpp
View File

@@ -104,7 +104,7 @@ float DoomIMGUI::render(float time_delta) {
} }
doom_interval = _doom.render(time_delta); doom_interval = _doom.render(time_delta);
ImGui::Image(reinterpret_cast<void*>(_doom.getTexID()), {_size_scaler * 320, _size_scaler * 200 * 1.2f}); ImGui::Image(_doom.getTexID(), {_size_scaler * 320, _size_scaler * 200 * 1.2f});
} }
ImGui::End(); ImGui::End();