Various refactoring

pkdawson · Aug 9, 2024 · 2248b21 · 2248b21
1 parent 1fd003e
commit 2248b21
Show file tree

Hide file tree

Showing 9 changed files with 153 additions and 245 deletions.
diff --git a/.github/workflows/gdext.yml b/.github/workflows/gdext.yml
@@ -10,10 +10,21 @@ env:
   vcpkg_tag: 1de2026f28ead93ff1773e6e680387643e914ea1 # 2024.07.12
 
 jobs:
-  # TODO: refactor to matrix
-  windows:
-    name: 🪟Windows
-    runs-on: windows-latest
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-14, windows-latest]
+        include:
+          - os: ubuntu-latest
+            name: 🐧Linux
+          - os: macos-14
+            name: 🍎macOS
+          - os: windows-latest
+            name: 🪟Windows
+
+    name: ${{ matrix.name }} Build
+    runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v4
@@ -26,17 +37,31 @@ jobs:
           python-version: 3.12
 
       - name: Install tools
+        shell: bash
         run: |
           python -m pip install "scons<4.8"
           scons --version
           pip install ply
 
+      - name: Linux tools
+        if: runner.os == 'Linux'
+        shell: bash
+        run: |
+          sudo apt install clang-format
+
+      - name: macOS tools
+        if: runner.os == 'macOS'
+        shell: bash
+        run: |
+          brew install clang-format ninja
+
       - name: Setup vcpkg
         uses: lukka/run-vcpkg@v11
         with:
           vcpkgGitCommitId: ${{ env.vcpkg_tag }}
 
-      - shell: bash
+      - name: Make cache key
+        shell: bash
         run: |
           echo "cache_key=godot-cpp-$(git -C gdext/godot-cpp rev-parse --short HEAD)-${{ runner.os }}-$ImageVersion" >> $GITHUB_ENV
 
@@ -49,7 +74,7 @@ jobs:
           key: ${{ env.cache_key }}
 
       - name: Build
-        if: github.ref_type != 'tag'
+        if: github.ref_type != 'tag' || runner.os != 'Windows'
         run: |
           cd gdext
           scons godot-cpp
@@ -58,7 +83,7 @@ jobs:
           scons target=template_release
 
       - name: Build (with debug symbols)
-        if: github.ref_type == 'tag'
+        if: github.ref_type == 'tag' && runner.os == 'Windows'
         run: |
           cd gdext
           scons debug_symbols=yes godot-cpp
@@ -69,125 +94,13 @@ jobs:
       - name: Upload binaries
         uses: actions/upload-artifact@v4
         with:
-          name: gdext-windows
-          path: addons/imgui-godot/bin
-
-  linux:
-    name: 🐧Linux
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Setup Python 3.x
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.12
-
-      - name: Install tools
-        run: |
-          python -m pip install "scons<4.8"
-          scons --version
-          pip install ply
-          sudo apt install clang-format
-
-      - name: Setup vcpkg
-        uses: lukka/run-vcpkg@v11
-        with:
-          vcpkgGitCommitId: ${{ env.vcpkg_tag }}
-
-      - shell: bash
-        run: |
-          echo "cache_key=godot-cpp-$(git -C gdext/godot-cpp rev-parse --short HEAD)-${{ runner.os }}-$ImageVersion" >> $GITHUB_ENV
-
-      - uses: actions/cache@v4
-        id: cache-godot-cpp
-        with:
-          path: |
-            gdext/scons_cache
-          key: ${{ env.cache_key }}
-
-      - name: Build debug
-        run: |
-          cd gdext
-          scons godot-cpp
-          scons
-
-      - name: Build release
-        run: |
-          cd gdext
-          scons target=template_release godot-cpp
-          scons target=template_release
-
-      - name: Upload binaries
-        uses: actions/upload-artifact@v4
-        with:
-          name: gdext-linux
-          path: addons/imgui-godot/bin
-
-  macos:
-    name: 🍎macOS
-    runs-on: macos-14
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Setup Python 3.x
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.12
-
-      - name: Install tools
-        run: |
-          python -m pip install "scons<4.8"
-          scons --version
-          pip install ply
-          brew install clang-format ninja
-
-      - name: Setup vcpkg
-        uses: lukka/run-vcpkg@v11
-        with:
-          vcpkgGitCommitId: ${{ env.vcpkg_tag }}
-
-      - shell: bash
-        run: |
-          echo "cache_key=godot-cpp-$(git -C gdext/godot-cpp rev-parse --short HEAD)-${{ runner.os }}-$ImageVersion" >> $GITHUB_ENV
-
-      - uses: actions/cache@v4
-        id: cache-godot-cpp
-        with:
-          path: |
-            gdext/scons_cache
-          key: ${{ env.cache_key }}
-
-      - name: Build debug
-        run: |
-          export PATH="$(brew --prefix llvm@15)/bin:$PATH"
-          cd gdext
-          scons godot-cpp
-          scons
-
-      - name: Build release
-        run: |
-          export PATH="$(brew --prefix llvm@15)/bin:$PATH"
-          cd gdext
-          scons target=template_release godot-cpp
-          scons target=template_release
-
-      - name: Upload binaries
-        uses: actions/upload-artifact@v4
-        with:
-          name: gdext-macos
+          name: gdext-${{ runner.os }}
           path: addons/imgui-godot/bin
 
   package:
     name: 📦Package
     runs-on: ubuntu-latest
-    needs: [windows, linux, macos]
+    needs: [build]
 
     steps:
       - uses: actions/checkout@v4
@@ -267,7 +180,7 @@ jobs:
   package_cs:
     name: 📦Package (C# only)
     runs-on: ubuntu-latest
-    needs: [windows, linux, macos]
+    needs: [build]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/doc/test/gdscript/main.gd b/doc/test/gdscript/main.gd
@@ -11,6 +11,9 @@ func _ready() -> void:
     assert_equal(ImGuiGD.Scale, 2)
     assert_equal(ImGui.GetFontSize(), 26)
 
+    # StringName conversion
+    assert_equal(ImGui.GetID("test_id"), 2044763162)
+
     # rescale
     call_deferred("change_scale")
 

diff --git a/gdext/CMakeLists.txt b/gdext/CMakeLists.txt
@@ -31,8 +31,13 @@ target_compile_definitions(imgui-godot-native PUBLIC
     IMGUI_ENABLE_FREETYPE
 #    IMGUI_ENABLE_FREETYPE_LUNASVG
     IGN_EXPORT
+    # REAL_T_IS_DOUBLE
     )
 
+# target_compile_definitions(godot-cpp PUBLIC
+#     REAL_T_IS_DOUBLE
+# )
+
 if (MSVC)
     target_compile_options(godot-cpp PRIVATE "/MP")
     target_compile_options(imgui-godot-native PRIVATE "/MP")

diff --git a/gdext/include/imgui-godot.h b/gdext/include/imgui-godot.h
@@ -120,7 +120,7 @@ inline void ResetFonts()
     detail::ImGuiGD->call(sn);
 }
 
-inline void SetJoyAxisDeadZone(float deadZone)
+inline void SetJoyAxisDeadZone(real_t deadZone)
 {
     ERR_FAIL_COND(!detail::GET_IMGUIGD());
     static const StringName sn("JoyAxisDeadZone");