Skip to content

Commit 957f86c

Browse files
committed
Add Array:make macro
1 parent b1dbaad commit 957f86c

File tree

2 files changed

+59
-0
lines changed

2 files changed

+59
-0
lines changed

binding_generator.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,9 @@ def generate_builtin_class_header(builtin_api, size, used_classes, fully_used_cl
222222
if class_name == "String":
223223
result.append("#include <godot_cpp/variant/char_string.hpp>")
224224

225+
if class_name == "Array":
226+
result.append("#include <godot_cpp/variant/array_helpers.hpp>")
227+
225228
for include in fully_used_classes:
226229
result.append(f"#include <godot_cpp/{get_include_path(include)}>")
227230

@@ -424,6 +427,12 @@ def generate_builtin_class_header(builtin_api, size, used_classes, fully_used_cl
424427
result.append(f"\tconst char32_t &operator[](int p_index) const;")
425428
result.append(f"\tchar32_t &operator[](int p_index);")
426429

430+
if class_name == "Array":
431+
result.append("\ttemplate <class... Args>")
432+
result.append("\tstatic Array make(Args... args) {")
433+
result.append("\t\treturn helpers::append_all(Array(), args...);")
434+
result.append("\t}")
435+
427436
if is_packed_array(class_name):
428437
return_type = correct_type(builtin_api["indexing_return_type"])
429438
if class_name == "PackedByteArray":
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*************************************************************************/
2+
/* array_helpers.hpp */
3+
/*************************************************************************/
4+
/* This file is part of: */
5+
/* GODOT ENGINE */
6+
/* https://godotengine.org */
7+
/*************************************************************************/
8+
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */
9+
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */
10+
/* */
11+
/* Permission is hereby granted, free of charge, to any person obtaining */
12+
/* a copy of this software and associated documentation files (the */
13+
/* "Software"), to deal in the Software without restriction, including */
14+
/* without limitation the rights to use, copy, modify, merge, publish, */
15+
/* distribute, sublicense, and/or sell copies of the Software, and to */
16+
/* permit persons to whom the Software is furnished to do so, subject to */
17+
/* the following conditions: */
18+
/* */
19+
/* The above copyright notice and this permission notice shall be */
20+
/* included in all copies or substantial portions of the Software. */
21+
/* */
22+
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
23+
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
24+
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
25+
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
26+
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
27+
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
28+
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
29+
/*************************************************************************/
30+
31+
namespace godot {
32+
namespace helpers {
33+
template <typename T, typename ValueT>
34+
T append_all(T appendable, ValueT value) {
35+
appendable.append(value);
36+
return appendable;
37+
}
38+
39+
template <typename T, typename ValueT, typename... Args>
40+
T append_all(T appendable, ValueT value, Args... args) {
41+
appendable.append(value);
42+
return append_all(appendable, args...);
43+
}
44+
45+
template <typename T>
46+
T append_all(T appendable) {
47+
return appendable;
48+
}
49+
} // namespace helpers
50+
} // namespace godot

0 commit comments

Comments
 (0)