Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GDNative: Expose String::num_uint64, and use bool in capitalized versions #63136

Merged
merged 1 commit into from
Jul 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion modules/gdnative/gdnative/string.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,21 @@ godot_string GDAPI godot_string_num_int64(int64_t p_num, godot_int p_base) {

godot_string GDAPI godot_string_num_int64_capitalized(int64_t p_num, godot_int p_base, godot_bool p_capitalize_hex) {
godot_string result;
memnew_placement(&result, String(String::num_int64(p_num, p_base, true)));
memnew_placement(&result, String(String::num_int64(p_num, p_base, p_capitalize_hex)));
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It made no sense to have a p_capitalize_hex argument but always use true.
This could have been fixed by simply removing the bool, but that would break the API so instead I used it.


return result;
}

godot_string GDAPI godot_string_num_uint64(uint64_t p_num, godot_int p_base) {
godot_string result;
memnew_placement(&result, String(String::num_uint64(p_num, p_base)));

return result;
}

godot_string GDAPI godot_string_num_uint64_capitalized(uint64_t p_num, godot_int p_base, godot_bool p_capitalize_hex) {
godot_string result;
memnew_placement(&result, String(String::num_uint64(p_num, p_base, p_capitalize_hex)));

return result;
}
Expand Down
17 changes: 17 additions & 0 deletions modules/gdnative/gdnative_api.json
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,23 @@
["const godot_string *", "p_self"],
["const godot_array *", "p_parts"]
]
},
{
"name": "godot_string_num_uint64",
"return_type": "godot_string",
"arguments": [
["uint64_t", "p_num"],
["godot_int", "p_base"]
]
},
{
"name": "godot_string_num_uint64_capitalized",
"return_type": "godot_string",
"arguments": [
["uint64_t", "p_num"],
["godot_int", "p_base"],
["godot_bool", "p_capitalize_hex"]
]
}
]
},
Expand Down
2 changes: 2 additions & 0 deletions modules/gdnative/include/gdnative/string.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ godot_string GDAPI godot_string_md5(const uint8_t *p_md5);
godot_string GDAPI godot_string_num(double p_num);
godot_string GDAPI godot_string_num_int64(int64_t p_num, godot_int p_base);
godot_string GDAPI godot_string_num_int64_capitalized(int64_t p_num, godot_int p_base, godot_bool p_capitalize_hex);
godot_string GDAPI godot_string_num_uint64(uint64_t p_num, godot_int p_base);
godot_string GDAPI godot_string_num_uint64_capitalized(uint64_t p_num, godot_int p_base, godot_bool p_capitalize_hex);
godot_string GDAPI godot_string_num_real(double p_num);
godot_string GDAPI godot_string_num_scientific(double p_num);
godot_string GDAPI godot_string_num_with_decimals(double p_num, godot_int p_decimals);
Expand Down