northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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

41
core/func_ref.cpp
View File

@ -28,55 +28,50 @@
/*************************************************************************/
#include "func_ref.h"
Variant FuncRef::call_func(const Variant** p_args, int p_argcount, Variant::CallError& r_error) {
Variant FuncRef::call_func(const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
if (id==0) {
r_error.error=Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;
if (id == 0) {
r_error.error = Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;
return Variant();
}
Object* obj = ObjectDB::get_instance(id);
Object *obj = ObjectDB::get_instance(id);
if (!obj) {
r_error.error=Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;
r_error.error = Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;
return Variant();
}
return obj->call(function,p_args,p_argcount,r_error);
return obj->call(function, p_args, p_argcount, r_error);
}
void FuncRef::set_instance(Object *p_obj){
void FuncRef::set_instance(Object *p_obj) {
ERR_FAIL_NULL(p_obj);
id=p_obj->get_instance_ID();
id = p_obj->get_instance_ID();
}
void FuncRef::set_function(const StringName& p_func){
void FuncRef::set_function(const StringName &p_func) {
function=p_func;
function = p_func;
}
void FuncRef::_bind_methods() {
{
MethodInfo mi;
mi.name="call_func";
mi.name = "call_func";
Vector<Variant> defargs;
for(int i=0;i<10;i++) {
mi.arguments.push_back( PropertyInfo( Variant::NIL, "arg"+itos(i)));
for (int i = 0; i < 10; i++) {
mi.arguments.push_back(PropertyInfo(Variant::NIL, "arg" + itos(i)));
defargs.push_back(Variant());
}
ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"call_func",&FuncRef::call_func,mi,defargs);
ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT, "call_func", &FuncRef::call_func, mi, defargs);
}
ObjectTypeDB::bind_method(_MD("set_instance","instance"),&FuncRef::set_instance);
ObjectTypeDB::bind_method(_MD("set_function","name"),&FuncRef::set_function);
ObjectTypeDB::bind_method(_MD("set_instance", "instance"), &FuncRef::set_instance);
ObjectTypeDB::bind_method(_MD("set_function", "name"), &FuncRef::set_function);
}
FuncRef::FuncRef() {
FuncRef::FuncRef(){
id=0;
id = 0;
}