Skip to content

Commit e06d5cd

Browse files
bruvzgbruvzg
committed
Add double precision build support.
1 parent f262ae9 commit e06d5cd

File tree

5 files changed

+49
-24
lines changed

5 files changed

+49
-24
lines changed

‎.github/workflows/ci.yml

+7
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ jobs:
1515
artifact-name: godot-cpp-linux-glibc2.27-x86_64-release
1616
artifact-path: bin/libgodot-cpp.linux.release.64.a
1717

18+
- name: 🐧 Linux (GCC, Double Precision)
19+
os: ubuntu-18.04
20+
platform: linux
21+
artifact-name: godot-cpp-linux-glibc2.27-x86_64-double-release
22+
artifact-path: bin/libgodot-cpp.linux.release.64.a
23+
flags: float=64
24+
1825
- name: 🏁 Windows (x86_64, MSVC)
1926
os: windows-2019
2027
platform: windows

‎CMakeLists.txt

+12-6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# godot-cpp cmake arguments
55
# GODOT_HEADERS_DIR: This is where the gdnative include folder is (godot_source/modules/gdnative/include)
66
# GODOT_CUSTOM_API_FILE: This is if you have another path for the godot_api.json
7+
# FLOAT_TYPE Floating-point precision (32, 64)
78
#
89
# Android cmake arguments
910
# CMAKE_TOOLCHAIN_FILE: The path to the android cmake toolchain ($ANDROID_NDK/build/cmake/android.toolchain.cmake)
@@ -60,6 +61,16 @@ set(CMAKE_CXX_STANDARD 17)
6061
set(CMAKE_CXX_STANDARD_REQUIRED ON)
6162
set(CMAKE_CXX_EXTENSIONS OFF)
6263

64+
set(FLOAT_TYPE_FLAG "float" CACHE STRING "")
65+
if(FLOAT_TYPE EQUAL 64)
66+
set(FLOAT_TYPE_FLAG "double" CACHE STRING "")
67+
endif(FLOAT_TYPE EQUAL 64)
68+
69+
set(BITS 32)
70+
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
71+
set(BITS 64)
72+
endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
73+
6374
# Input from user for godot headers and the api file
6475
set(GODOT_HEADERS_DIR "godot-headers" CACHE STRING "")
6576
set(GODOT_CUSTOM_API_FILE "godot-headers/extension_api.json" CACHE STRING "")
@@ -139,7 +150,7 @@ execute_process(COMMAND "${Python3_EXECUTABLE}" "-c" "import binding_generator;
139150
)
140151

141152
add_custom_command(OUTPUT ${GENERATED_FILES_LIST}
142-
COMMAND "${Python3_EXECUTABLE}" "-c" "import binding_generator; binding_generator.generate_bindings(\"${GODOT_CUSTOM_API_FILE}\", \"${GENERATE_BINDING_PARAMETERS}\", \"${CMAKE_CURRENT_BINARY_DIR}\")"
153+
COMMAND "${Python3_EXECUTABLE}" "-c" "import binding_generator; binding_generator.generate_bindings(\"${GODOT_CUSTOM_API_FILE}\", \"${GENERATE_BINDING_PARAMETERS}\", \"${BITS}\", \"${FLOAT_TYPE_FLAG}\", \"${CMAKE_CURRENT_BINARY_DIR}\")"
143154
VERBATIM
144155
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
145156
MAIN_DEPENDENCY ${GODOT_CUSTOM_API_FILE}
@@ -185,11 +196,6 @@ set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS ${GODOT_LI
185196

186197
# Create the correct name (godot.os.build_type.system_bits)
187198

188-
set(BITS 32)
189-
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
190-
set(BITS 64)
191-
endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
192-
193199
string(TOLOWER "${CMAKE_SYSTEM_NAME}" SYSTEM_NAME)
194200
string(TOLOWER "${CMAKE_BUILD_TYPE}" BUILD_TYPE)
195201

‎SConstruct

+4
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ opts.Add(
139139
opts.Add(BoolVariable("generate_template_get_node", "Generate a template version of the Node class's get_node.", True))
140140

141141
opts.Add(BoolVariable("build_library", "Build the godot-cpp library.", True))
142+
opts.Add(EnumVariable("float", "Floating-point precision", "32", ("32", "64")))
142143

143144
opts.Update(env)
144145
Help(opts.GenerateHelpText(env))
@@ -171,6 +172,9 @@ else:
171172
if env["target"] == "debug":
172173
env.Append(CPPDEFINES=["DEBUG_ENABLED", "DEBUG_METHODS_ENABLED"])
173174

175+
if env["float"] == "64":
176+
env.Append(CPPDEFINES=["REAL_T_IS_DOUBLE"])
177+
174178
if env["platform"] == "linux" or env["platform"] == "freebsd":
175179
if env["use_llvm"]:
176180
env["CXX"] = "clang++"

‎binding_generator.py

+11-3
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,17 @@ def scons_emit_files(target, source, env):
6464

6565

6666
def scons_generate_bindings(target, source, env):
67-
generate_bindings(str(source[0]), env["generate_template_get_node"], target[0].abspath)
67+
generate_bindings(
68+
str(source[0]),
69+
env["generate_template_get_node"],
70+
env["bits"],
71+
"double" if (env["float"] == "64") else "float",
72+
target[0].abspath,
73+
)
6874
return None
6975

7076

71-
def generate_bindings(api_filepath, use_template_get_node, output_dir="."):
77+
def generate_bindings(api_filepath, use_template_get_node, bits="64", double="float", output_dir="."):
7278
api = None
7379

7480
target_dir = Path(output_dir) / "gen"
@@ -79,9 +85,11 @@ def generate_bindings(api_filepath, use_template_get_node, output_dir="."):
7985
shutil.rmtree(target_dir, ignore_errors=True)
8086
target_dir.mkdir(parents=True)
8187

88+
print("Built-in type config: " + double + "_" + bits)
89+
8290
generate_global_constants(api, target_dir)
8391
generate_global_constant_binds(api, target_dir)
84-
generate_builtin_bindings(api, target_dir, "float_64")
92+
generate_builtin_bindings(api, target_dir, double + "_" + bits)
8593
generate_engine_classes_bindings(api, target_dir, use_template_get_node)
8694
generate_utility_functions(api, target_dir)
8795

‎include/godot_cpp/variant/color.hpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ class Color {
159159

160160
inline Color blend(const Color &p_over) const {
161161
Color res;
162-
float sa = (real_t)1.0 - p_over.a;
162+
float sa = 1.0 - p_over.a;
163163
res.a = a * sa + p_over.a;
164164
if (res.a == 0) {
165165
return Color(0, 0, 0, 0);
@@ -173,16 +173,16 @@ class Color {
173173

174174
inline Color srgb_to_linear() const {
175175
return Color(
176-
r < (real_t)0.04045 ? r * (real_t)(1.0 / 12.92) : Math::pow((r + (real_t)0.055) * (real_t)(1.0 / (1.0 + 0.055)), (real_t)2.4),
177-
g < (real_t)0.04045 ? g * (real_t)(1.0 / 12.92) : Math::pow((g + (real_t)0.055) * (real_t)(1.0 / (1.0 + 0.055)), (real_t)2.4),
178-
b < (real_t)0.04045 ? b * (real_t)(1.0 / 12.92) : Math::pow((b + (real_t)0.055) * (real_t)(1.0 / (1.0 + 0.055)), (real_t)2.4),
176+
r < 0.04045 ? r * (1.0 / 12.92) : Math::pow((r + 0.055f) * (1.0 / (1.0 + 0.055)), 2.4),
177+
g < 0.04045 ? g * (1.0 / 12.92) : Math::pow((g + 0.055f) * (1.0 / (1.0 + 0.055)), 2.4),
178+
b < 0.04045 ? b * (1.0 / 12.92) : Math::pow((b + 0.055f) * (1.0 / (1.0 + 0.055)), 2.4),
179179
a);
180180
}
181181
inline Color linear_to_srgb() const {
182182
return Color(
183-
r < (real_t)0.0031308 ? (real_t)12.92 * r : (real_t)(1.0 + 0.055) * Math::pow(r, (real_t)(1.0 / 2.4)) - (real_t)0.055,
184-
g < (real_t)0.0031308 ? (real_t)12.92 * g : (real_t)(1.0 + 0.055) * Math::pow(g, (real_t)(1.0 / 2.4)) - (real_t)0.055,
185-
b < (real_t)0.0031308 ? (real_t)12.92 * b : (real_t)(1.0 + 0.055) * Math::pow(b, (real_t)(1.0 / 2.4)) - (real_t)0.055, a);
183+
r < 0.0031308f ? 12.92f * r : (1.0f + 0.055f) * Math::pow(r, 1.0f / 2.4f) - 0.055f,
184+
g < 0.0031308f ? 12.92f * g : (1.0f + 0.055f) * Math::pow(g, 1.0f / 2.4f) - 0.055f,
185+
b < 0.0031308f ? 12.92f * b : (1.0f + 0.055f) * Math::pow(b, 1.0f / 2.4f) - 0.055f, a);
186186
}
187187

188188
static Color hex(uint32_t p_hex);
@@ -204,14 +204,14 @@ class Color {
204204
operator String() const;
205205

206206
// For the binder.
207-
inline void set_r8(int32_t r8) { r = (Math::clamp(r8, 0, 255) / (real_t)255.0); }
208-
inline int32_t get_r8() const { return int32_t(Math::clamp(r * (real_t)255.0, (real_t)0.0, (real_t)255.0)); }
209-
inline void set_g8(int32_t g8) { g = (Math::clamp(g8, 0, 255) / (real_t)255.0); }
210-
inline int32_t get_g8() const { return int32_t(Math::clamp(g * (real_t)255.0, (real_t)0.0, (real_t)255.0)); }
211-
inline void set_b8(int32_t b8) { b = (Math::clamp(b8, 0, 255) / (real_t)255.0); }
212-
inline int32_t get_b8() const { return int32_t(Math::clamp(b * (real_t)255.0, (real_t)0.0, (real_t)255.0)); }
213-
inline void set_a8(int32_t a8) { a = (Math::clamp(a8, 0, 255) / (real_t)255.0); }
214-
inline int32_t get_a8() const { return int32_t(Math::clamp(a * (real_t)255.0, (real_t)0.0, (real_t)255.0)); }
207+
inline void set_r8(int32_t r8) { r = (Math::clamp(r8, 0, 255) / 255.0); }
208+
inline int32_t get_r8() const { return int32_t(Math::clamp(r * 255.0, 0.0, 255.0)); }
209+
inline void set_g8(int32_t g8) { g = (Math::clamp(g8, 0, 255) / 255.0); }
210+
inline int32_t get_g8() const { return int32_t(Math::clamp(g * 255.0, 0.0, 255.0)); }
211+
inline void set_b8(int32_t b8) { b = (Math::clamp(b8, 0, 255) / 255.0); }
212+
inline int32_t get_b8() const { return int32_t(Math::clamp(b * 255.0, 0.0, 255.0)); }
213+
inline void set_a8(int32_t a8) { a = (Math::clamp(a8, 0, 255) / 255.0); }
214+
inline int32_t get_a8() const { return int32_t(Math::clamp(a * 255.0, 0.0, 255.0)); }
215215

216216
inline void set_h(float p_h) { set_hsv(p_h, get_s(), get_v()); }
217217
inline void set_s(float p_s) { set_hsv(get_h(), p_s, get_v()); }

0 commit comments

Comments
 (0)