Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24 from KursonSerg/master 

Replaced 'char *' with 'const char *' for consistency with C API
pull/27/head
Thomas Herzog 2017-07-27 13:04:07 +02:00 committed by GitHub
parent 57a5d0cf7e 3acd3f8991
commit e6064f7291
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/core/Godot.hpp
View File

@ -24,11 +24,11 @@ template<class T>
class GodotScript { class GodotScript {
public: public:
T *owner; T *owner;
// GodotScript() {} // GodotScript() {}
void _init() {} void _init() {}
static char *___get_base_type_name() static const char *___get_base_type_name()
{ {
return T::___get_class_name(); return T::___get_class_name();
} }
@ -46,13 +46,12 @@ public:
#define NATIVESCRIPT_INIT() void nativescript_init() #define NATIVESCRIPT_INIT() void nativescript_init()
#define GODOT_CLASS(Name) \ #define GODOT_CLASS(Name) \
public: inline static char *___get_type_name() { return (char *) #Name; } \ public: inline static const char *___get_type_name() { return static_cast<const char *>(#Name); } \
private: private:
#define GODOT_SUBCLASS(Name, Base) \ #define GODOT_SUBCLASS(Name, Base) \
public: inline static char *___get_type_name() { return (char *) #Name; } \ public: inline static const char *___get_type_name() { return static_cast<const char *>(#Name); } \
inline static char *___get_base_type_name() { return (char *) #Base; } \ inline static const char *___get_base_type_name() { return static_cast<const char *>(#Base); } \
//inline Name(godot_object *o) : Base(o) {} \
private: private:
@ -154,13 +153,13 @@ typedef godot_variant (*__godot_wrapper_method)(godot_object *, void *, void *,
template<class T, class R, class ...args> template<class T, class R, class ...args>
char *___get_method_class_name(R (T::*p)(args... a)) const char *___get_method_class_name(R (T::*p)(args... a))
{ {
return T::___get_type_name(); return T::___get_type_name();
} }
template<class T, class R, class ...args> template<class T, class R, class ...args>
char *___get_method_class_name(R (T::*p)(args... a) const) const char *___get_method_class_name(R (T::*p)(args... a) const)
{ {
return T::___get_type_name(); return T::___get_type_name();
} }
@ -275,7 +274,7 @@ __godot_wrapper_method ___get_wrapper_function(R (T::*f)(A...) const)
template<class M> template<class M>
void register_method(char *name, M method_ptr, godot_method_rpc_mode rpc_type = GODOT_METHOD_RPC_MODE_DISABLED) void register_method(const char *name, M method_ptr, godot_method_rpc_mode rpc_type = GODOT_METHOD_RPC_MODE_DISABLED)
{ {
godot_instance_method method = {}; godot_instance_method method = {};
method.method_data = ___make_wrapper_function(method_ptr); method.method_data = ___make_wrapper_function(method_ptr);
@ -364,7 +363,7 @@ struct _PropertyDefaultGetFunc {
template<class T, class P> template<class T, class P>
void register_property(char *name, P (T::*var), P default_value, godot_method_rpc_mode rpc_mode = GODOT_METHOD_RPC_MODE_DISABLED, godot_property_usage_flags usage = GODOT_PROPERTY_USAGE_DEFAULT, godot_property_hint hint = GODOT_PROPERTY_HINT_NONE, String hint_string = "") void register_property(const char *name, P (T::*var), P default_value, godot_method_rpc_mode rpc_mode = GODOT_METHOD_RPC_MODE_DISABLED, godot_property_usage_flags usage = GODOT_PROPERTY_USAGE_DEFAULT, godot_property_hint hint = GODOT_PROPERTY_HINT_NONE, String hint_string = "")
{ {
Variant def_val = default_value; Variant def_val = default_value;
@ -411,7 +410,7 @@ void register_property(char *name, P (T::*var), P default_value, godot_method_rp
template<class T, class P> template<class T, class P>
void register_property(char *name, void (T::*setter)(P), P (T::*getter)(), P default_value, godot_method_rpc_mode rpc_mode = GODOT_METHOD_RPC_MODE_DISABLED, godot_property_usage_flags usage = GODOT_PROPERTY_USAGE_DEFAULT, godot_property_hint hint = GODOT_PROPERTY_HINT_NONE, String hint_string = "") void register_property(const char *name, void (T::*setter)(P), P (T::*getter)(), P default_value, godot_method_rpc_mode rpc_mode = GODOT_METHOD_RPC_MODE_DISABLED, godot_property_usage_flags usage = GODOT_PROPERTY_USAGE_DEFAULT, godot_property_hint hint = GODOT_PROPERTY_HINT_NONE, String hint_string = "")
{ {
Variant def_val = default_value; Variant def_val = default_value;
@ -472,7 +471,7 @@ void register_signal(String name, Dictionary args = Dictionary())
for (int i = 0; i < signal.num_args; i++) { for (int i = 0; i < signal.num_args; i++) {
godot_string_destroy(&signal.args[i].name); godot_string_destroy(&signal.args[i].name);
} }
godot_free(signal.args); godot_free(signal.args);
} }