asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

-Added method flags to global constants for script

Browse source 
-Added a new flag METHOD_FLAG_FROM_SCRIPT to get_method_list() flag property. Closes #3489
This commit is contained in:
Juan Linietsky 2016-01-31 15:40:51 -03:00
parent 53e237dfe4
commit 817fd1ab71
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/global_constants.cpp
View file

@ -476,6 +476,16 @@ static _GlobalConstant _global_constants[]={
BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_EDITOR ), BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_EDITOR ),
BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_NETWORK ), BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_NETWORK ),
BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_DEFAULT ), BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_DEFAULT ),
BIND_GLOBAL_CONSTANT( METHOD_FLAG_NORMAL ),
BIND_GLOBAL_CONSTANT( METHOD_FLAG_EDITOR ),
BIND_GLOBAL_CONSTANT( METHOD_FLAG_NOSCRIPT ),
BIND_GLOBAL_CONSTANT( METHOD_FLAG_CONST ),
BIND_GLOBAL_CONSTANT( METHOD_FLAG_REVERSE ),
BIND_GLOBAL_CONSTANT( METHOD_FLAG_VIRTUAL ),
BIND_GLOBAL_CONSTANT( METHOD_FLAG_FROM_SCRIPT ),
BIND_GLOBAL_CONSTANT( METHOD_FLAGS_DEFAULT ),
{"TYPE_NIL",Variant::NIL}, {"TYPE_NIL",Variant::NIL},
{"TYPE_BOOL",Variant::BOOL}, {"TYPE_BOOL",Variant::BOOL},
{"TYPE_INT",Variant::INT}, {"TYPE_INT",Variant::INT},

1
core/method_bind.h
View file

@ -50,6 +50,7 @@ enum MethodFlags {
METHOD_FLAG_CONST=8, METHOD_FLAG_CONST=8,
METHOD_FLAG_REVERSE=16, // used for events METHOD_FLAG_REVERSE=16, // used for events
METHOD_FLAG_VIRTUAL=32, METHOD_FLAG_VIRTUAL=32,
METHOD_FLAG_FROM_SCRIPT=64,
METHOD_FLAGS_DEFAULT=METHOD_FLAG_NORMAL, METHOD_FLAGS_DEFAULT=METHOD_FLAG_NORMAL,
}; };

1
modules/gdscript/gd_script.cpp
View file

@ -2456,6 +2456,7 @@ void GDInstance::get_method_list(List<MethodInfo> *p_list) const {
MethodInfo mi; MethodInfo mi;
mi.name=E->key(); mi.name=E->key();
mi.flags|=METHOD_FLAG_FROM_SCRIPT;
for(int i=0;i<E->get().get_argument_count();i++) for(int i=0;i<E->get().get_argument_count();i++)
mi.arguments.push_back(PropertyInfo(Variant::NIL,"arg"+itos(i))); mi.arguments.push_back(PropertyInfo(Variant::NIL,"arg"+itos(i)));
p_list->push_back(mi); p_list->push_back(mi);