mewin/godot-cpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added Variant constructor for Object types

Browse Source
This commit is contained in:
Karroffel
2017-04-04 02:28:05 +02:00
parent fe4f8b9581
commit c40a9dce51
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/godot_cpp/Godot.hpp
View File

@@ -13,9 +13,10 @@ namespace godot {
#define GODOT_CLASS(Name, Base) \
public: static char *___get_type_name() { return (char *) #Name; } \
static char *___get_base_type_name() { return (char *) #Base; } \
Name(godot_object *o) { __core_object = o; } \
public: inline static char *___get_type_name() { return (char *) #Name; } \
inline static char *___get_base_type_name() { return (char *) #Base; } \
inline Name(godot_object *o) { __core_object = o; } \
inline Name(const Variant& obj) { __core_object = ((Object) obj).__core_object; } \
private:
@@ -539,7 +540,6 @@ void register_property(char *name, void (T::*setter)(P), P (T::*getter)(), P def
attr.type = def_val.get_type();
attr.default_value = *(godot_variant *) &def_val;
attr.hint = hint;
attr.listed = true;
attr.rset_type = rpc_mode;
attr.usage = usage;