summaryrefslogtreecommitdiffstats
path: root/core/object.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-08-25 17:45:20 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-08-25 17:45:20 -0300
commit9c6175db11ff72603ae58789a462b33ec1e910f8 (patch)
treec7fbb26583b6c7f44b9f8091aa59497900527f08 /core/object.h
parent41a58f7935ecd0c91ae55a5e5b84425aadc51840 (diff)
downloadredot-engine-9c6175db11ff72603ae58789a462b33ec1e910f8.tar.gz
More visual script work
-Block switches to 2d/3d editor if editing visual script -Added cast node in flow control -Added ability to do RPC in visual script -Comment nodes -Fix bug with inverted cable in connecting backwards -Copy and paste nodes, including from different scripts
Diffstat (limited to 'core/object.h')
-rw-r--r--core/object.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/object.h b/core/object.h
index 6ea794ec71..ac3fc51b3e 100644
--- a/core/object.h
+++ b/core/object.h
@@ -126,6 +126,11 @@ struct PropertyInfo {
_FORCE_INLINE_ PropertyInfo added_usage(int p_fl) const { PropertyInfo pi=*this; pi.usage|=p_fl; return pi; }
+
+ operator Dictionary() const;
+
+ static PropertyInfo from_dict(const Dictionary& p_dict);
+
PropertyInfo() { type=Variant::NIL; hint=PROPERTY_HINT_NONE; usage = PROPERTY_USAGE_DEFAULT; }
PropertyInfo( Variant::Type p_type, const String p_name, PropertyHint p_hint=PROPERTY_HINT_NONE, const String& p_hint_string="",uint32_t p_usage=PROPERTY_USAGE_DEFAULT) {
type=p_type; name=p_name; hint=p_hint; hint_string=p_hint_string; usage=p_usage;
@@ -150,6 +155,9 @@ struct MethodInfo {
inline bool operator<(const MethodInfo& p_method) const { return id==p_method.id?(name < p_method.name):(id<p_method.id); }
+ operator Dictionary() const;
+
+ static MethodInfo from_dict(const Dictionary& p_dict);
MethodInfo();
MethodInfo(const String& p_name);
MethodInfo(const String& p_name, const PropertyInfo& p_param1);