diff --git a/include/godot_cpp/core/method_ptrarg.hpp b/include/godot_cpp/core/method_ptrarg.hpp new file mode 100644 index 000000000..2c7ee4278 --- /dev/null +++ b/include/godot_cpp/core/method_ptrarg.hpp @@ -0,0 +1,51 @@ +/**************************************************************************/ +/* method_ptrarg.hpp */ +/**************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/**************************************************************************/ +/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ +/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/**************************************************************************/ + +#pragma once + +#include + +#include +#include + +#include + +namespace godot { + +template +struct PtrToArg; + +template > +struct ConvertiblePtrToArg : std::false_type {}; + +template +struct ConvertiblePtrToArg::encode_arg(std::declval()))>> : std::true_type {}; + +} diff --git a/include/godot_cpp/core/method_ptrcall.hpp b/include/godot_cpp/core/method_ptrcall.hpp index 92aa497fb..250d083ef 100644 --- a/include/godot_cpp/core/method_ptrcall.hpp +++ b/include/godot_cpp/core/method_ptrcall.hpp @@ -31,6 +31,7 @@ #pragma once #include +#include #include #include @@ -38,9 +39,6 @@ namespace godot { -template -struct PtrToArg {}; - #define MAKE_PTRARG(m_type) \ template <> \ struct PtrToArg { \ diff --git a/include/godot_cpp/variant/variant.hpp b/include/godot_cpp/variant/variant.hpp index bfabea2f6..ce1ad00f0 100644 --- a/include/godot_cpp/variant/variant.hpp +++ b/include/godot_cpp/variant/variant.hpp @@ -31,6 +31,7 @@ #pragma once #include +#include #include #include @@ -39,6 +40,7 @@ #include #include +#include namespace godot { @@ -215,6 +217,9 @@ class Variant { Variant(const PackedVector3Array &v); Variant(const PackedColorArray &v); Variant(const PackedVector4Array &v); + template ::value>> + explicit Variant(T v) : + Variant(PtrToArg::encode_arg(v)) {} ~Variant(); operator bool() const;