Allow compiling orchestrator as doubles.

CraterCrash · Jun 30, 2024 · 45a65a0 · 45a65a0
1 parent cc8e799
commit 45a65a0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,6 +29,7 @@ jobs:
             target: template_release
             platform: linux
             arch: x86_64
+            precision: double
 #          - identifier: windows-debug
 #            name: 🪟 Windows (Debug)
 #            build_type: Debug
@@ -43,6 +44,7 @@ jobs:
             target: template_release
             platform: windows
             arch: x86_64
+            precision: double
 #          - identifier: macos-debug
 #            name: 🍎 MacOS (Debug)
 #            build_type: Debug
@@ -55,18 +57,21 @@ jobs:
             runner: macos-latest
             target: template_release
             platform: macos
+            precision: double
           - identifier: android-arm64
             name: 🤖 Android Arm64
             build_type: Release
             runner: ubuntu-20.04
             platform: android
             arch: arm64-v8a
+            precision: double
           - identifier: android-arm32
             name: 🤖 Android Arm32
             build_type: Release
             runner: ubuntu-20.04
             platform: android
             arch: armeabi-v7a
+            precision: double
 
     runs-on: ${{ matrix.runner }}
     name: ${{ matrix.name }}
@@ -106,21 +111,21 @@ jobs:
         if: startsWith(matrix.identifier, 'linux-') || startsWith(matrix.identifier, 'macos-')
         shell: sh
         run: |
-          cmake -B ${{ github.workspace }}/.out-${{ matrix.identifier }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -S ${{ github.workspace }} -G Ninja          
+          cmake -B ${{ github.workspace }}/.out-${{ matrix.identifier }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -S ${{ github.workspace }} -G Ninja -DGODOT_FLOAT_PRECISION=${{ matrix.precision }}
           cmake --build ${{ github.workspace }}/.out-${{ matrix.identifier }} --target orchestrator -j 18
 
       - name: Build Orchestrator (Windows)
         if: startsWith(matrix.identifier, 'windows-')
         shell: bash
         run: |
-          cmake -B '${{ github.workspace }}/.out-${{ matrix.identifier }}' -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl -S '${{ github.workspace }}' -G Ninja
+          cmake -B '${{ github.workspace }}/.out-${{ matrix.identifier }}' -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl -S '${{ github.workspace }}' -G Ninja -DGODOT_FLOAT_PRECISION=${{ matrix.precision }}
           cmake --build '${{ github.workspace }}/.out-${{ matrix.identifier }}' --target orchestrator -j 18        
 
       - name: Build Orchestrator (Android)
         if: startsWith(matrix.identifier, 'android-')
         shell: sh
         run: |
-          cmake -B ${{ github.workspace }}/.out-${{ matrix.identifier }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_ANDROID_ARCH_ABI=${{ matrix.arch }} -DANDROID_ABI=${{ matrix.arch }} -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 -DANDROID_PLATFORM=android-23 -DANDROID_TOOLCHAIN=clang -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -S ${{ github.workspace }}
+          cmake -B ${{ github.workspace }}/.out-${{ matrix.identifier }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_ANDROID_ARCH_ABI=${{ matrix.arch }} -DANDROID_ABI=${{ matrix.arch }} -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 -DANDROID_PLATFORM=android-23 -DANDROID_TOOLCHAIN=clang -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -S ${{ github.workspace }}  -DGODOT_FLOAT_PRECISION=${{ matrix.precision }}
           cmake --build ${{ github.workspace }}/.out-${{ matrix.identifier }} --target orchestrator -j 18
 
       - name: Prepare addon files

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,6 +23,8 @@ SET(GDEXTENSION_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/project/addons/orchestrato
 # ADD_COMPILE_DEFINITIONS(HOT_RELOAD_ENABLED)
 add_compile_definitions(TOOLS_ENABLED)
 
+set(GODOT_FLOAT_PRECISION "single" CACHE STRING "")
+
 OPTION(
         AUTOFORMAT_SRC_ON_CONFIGURE
         "If enabled, clang-format will be used to format all sources in src/ during configuration"
@@ -89,6 +91,10 @@ FILE(GLOB_RECURSE gdext_sources
         "${CMAKE_CURRENT_SOURCE_DIR}/src/*.[hc]pp"
 )
 
+if ("${GODOT_FLOAT_PRECISION}" STREQUAL "double")
+	add_compile_definitions(REAL_T_IS_DOUBLE)
+endif()
+
 # GDExtension library
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${gdext_sources})
 
@@ -100,6 +106,7 @@ TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PUBLIC
         $<${compiler_is_msvc}:
         /EHsc
         /utf-8
+		$<$<STREQUAL:${GODOT_FLOAT_PRECISION},double>:/DREAL_T_IS_DOUBLE>
         /Zc:preprocessor
         /wd5054 # operator '|' deprecated between enumerations of different types
         $<$<CONFIG:Debug>:

diff --git a/extern/godot-engine b/extern/godot-engine
+2 −2		core/object/worker_thread_pool.cpp
+1 −0		doc/classes/GraphEdit.xml
+2 −3		doc/classes/ProjectSettings.xml
+3 −0		editor/editor_quick_open.cpp
+1 −1		editor/plugins/abstract_polygon_2d_editor.cpp
+5 −0		editor/plugins/canvas_item_editor_plugin.cpp
+1 −1		editor/plugins/gradient_texture_2d_editor_plugin.cpp
+16 −11		editor/plugins/node_3d_editor_plugin.cpp
+1 −0		editor/plugins/node_3d_editor_plugin.h
+55 −34		editor/plugins/tiles/tile_data_editors.cpp
+4 −8		editor/plugins/tiles/tile_data_editors.h
+6 −2		editor/plugins/tiles/tile_map_layer_editor.cpp
+5 −3		editor/plugins/tiles/tile_set_atlas_source_editor.cpp
+14 −11		modules/gltf/gltf_document.cpp
+20 −0		modules/navigation/nav_map.cpp
+9 −1		platform/android/display_server_android.cpp
+8 −1		platform/ios/display_server_ios.mm
+8 −1		platform/linuxbsd/wayland/display_server_wayland.cpp
+8 −1		platform/linuxbsd/x11/display_server_x11.cpp
+8 −1		platform/windows/display_server_windows.cpp
+1 −1		scene/2d/animated_sprite_2d.cpp
+2 −2		scene/2d/sprite_2d.cpp
+1 −1		scene/2d/tile_map_layer.cpp
+1 −1		scene/gui/rich_text_label.cpp
+2 −2		servers/rendering/renderer_canvas_cull.cpp
+1 −1		servers/rendering/rendering_device.cpp
+3 −1		tests/core/math/test_vector2.h
+3 −1		tests/core/math/test_vector3.h
+2 −0		tests/core/object/test_class_db.h
+2 −0		tests/core/os/test_os.h
+2 −0		tests/scene/test_instance_placeholder.h
+2 −0		tests/scene/test_node.h