godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
core/method_bind.cpp
View File

@@ -35,49 +35,46 @@
#ifdef DEBUG_METHODS_ENABLED
PropertyInfo MethodBind::get_argument_info(int p_argument) const {
if (p_argument >= 0) {
if (p_argument>=0) {
String name = (p_argument<arg_names.size())?String(arg_names[p_argument]):String("arg"+itos(p_argument));
PropertyInfo pi( get_argument_type(p_argument), name );
if ((pi.type==Variant::OBJECT) && name.find(":")!=-1) {
pi.hint=PROPERTY_HINT_RESOURCE_TYPE;
pi.hint_string=name.get_slicec(':',1);
pi.name=name.get_slicec(':',0);
String name = (p_argument < arg_names.size()) ? String(arg_names[p_argument]) : String("arg" + itos(p_argument));
PropertyInfo pi(get_argument_type(p_argument), name);
if ((pi.type == Variant::OBJECT) && name.find(":") != -1) {
pi.hint = PROPERTY_HINT_RESOURCE_TYPE;
pi.hint_string = name.get_slicec(':', 1);
pi.name = name.get_slicec(':', 0);
}
return pi;
} else {
Variant::Type at = get_argument_type(-1);
if (at==Variant::OBJECT && ret_type)
return PropertyInfo( at, "ret", PROPERTY_HINT_RESOURCE_TYPE, ret_type );
if (at == Variant::OBJECT && ret_type)
return PropertyInfo(at, "ret", PROPERTY_HINT_RESOURCE_TYPE, ret_type);
else
return PropertyInfo( at, "ret" );
return PropertyInfo(at, "ret");
}
return PropertyInfo();
}
#endif
void MethodBind::_set_const(bool p_const) {
_const=p_const;
_const = p_const;
}
StringName MethodBind::get_name() const {
return name;
}
void MethodBind::set_name(const StringName& p_name) {
name=p_name;
void MethodBind::set_name(const StringName &p_name) {
name = p_name;
}
#ifdef DEBUG_METHODS_ENABLED
void MethodBind::set_argument_names(const Vector<StringName>& p_names) {
arg_names=p_names;
void MethodBind::set_argument_names(const Vector<StringName> &p_names) {
arg_names = p_names;
}
Vector<StringName> MethodBind::get_argument_names() const {
@@ -86,40 +83,35 @@ Vector<StringName> MethodBind::get_argument_names() const {
#endif
void MethodBind::set_default_arguments(const Vector<Variant>& p_defargs) {
default_arguments=p_defargs;
default_argument_count=default_arguments.size();
void MethodBind::set_default_arguments(const Vector<Variant> &p_defargs) {
default_arguments = p_defargs;
default_argument_count = default_arguments.size();
}
#ifdef DEBUG_METHODS_ENABLED
void MethodBind::_generate_argument_types(int p_count) {
set_argument_count(p_count);
Variant::Type *argt = memnew_arr(Variant::Type,p_count+1);
argt[0]=_gen_argument_type(-1);
for(int i=0;i<p_count;i++) {
argt[i+1]=_gen_argument_type(i);
Variant::Type *argt = memnew_arr(Variant::Type, p_count + 1);
argt[0] = _gen_argument_type(-1);
for (int i = 0; i < p_count; i++) {
argt[i + 1] = _gen_argument_type(i);
}
set_argument_types(argt);
}
#endif
MethodBind::MethodBind() {
static int last_id=0;
method_id=last_id++;
hint_flags=METHOD_FLAGS_DEFAULT;
argument_count=0;
default_argument_count=0;
static int last_id = 0;
method_id = last_id++;
hint_flags = METHOD_FLAGS_DEFAULT;
argument_count = 0;
default_argument_count = 0;
#ifdef DEBUG_METHODS_ENABLED
argument_types=NULL;
argument_types = NULL;
#endif
_const=false;
_const = false;
}
MethodBind::~MethodBind() {
@@ -128,4 +120,3 @@ MethodBind::~MethodBind() {
memdelete_arr(argument_types);
#endif
}