hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed script_variables/ prefix to VS properties, made them easier to access from GD and Expression nodes

Browse source
This commit is contained in:
Juan Linietsky 2016-09-04 10:38:41 -03:00
parent 9167cd45bb
commit 24bd472a4a
2 changed files with 12 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

38
modules/visual_script/visual_script.cpp
View file

@ -3,7 +3,7 @@
#include "scene/main/node.h" #include "scene/main/node.h"
#include "os/os.h" #include "os/os.h"
#include "globals.h" #include "globals.h"
#define SCRIPT_VARIABLES_PREFIX "script_variables/"
//used by editor, this is not really saved //used by editor, this is not really saved
@ -615,8 +615,6 @@ void VisualScript::add_variable(const StringName& p_name,const Variant& p_defaul
v._export=p_export; v._export=p_export;
variables[p_name]=v; variables[p_name]=v;
script_variable_remap[SCRIPT_VARIABLES_PREFIX+String(p_name)]=p_name;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
_update_placeholders(); _update_placeholders();
@ -633,7 +631,6 @@ void VisualScript::remove_variable(const StringName& p_name) {
ERR_FAIL_COND(!variables.has(p_name)); ERR_FAIL_COND(!variables.has(p_name));
variables.erase(p_name); variables.erase(p_name);
script_variable_remap.erase(SCRIPT_VARIABLES_PREFIX+String(p_name));
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
_update_placeholders(); _update_placeholders();
@ -928,7 +925,7 @@ void VisualScript::_update_placeholders() {
continue; continue;
PropertyInfo p = E->get().info; PropertyInfo p = E->get().info;
p.name=SCRIPT_VARIABLES_PREFIX+String(E->key()); p.name=String(E->key());
pinfo.push_back(p); pinfo.push_back(p);
values[p.name]=E->get().default_value; values[p.name]=E->get().default_value;
} }
@ -964,7 +961,7 @@ ScriptInstance* VisualScript::instance_create(Object *p_this) {
continue; continue;
PropertyInfo p = E->get().info; PropertyInfo p = E->get().info;
p.name=SCRIPT_VARIABLES_PREFIX+String(E->key()); p.name=String(E->key());
pinfo.push_back(p); pinfo.push_back(p);
values[p.name]=E->get().default_value; values[p.name]=E->get().default_value;
} }
@ -1062,10 +1059,10 @@ void VisualScript::get_script_signal_list(List<MethodInfo> *r_signals) const {
bool VisualScript::get_property_default_value(const StringName& p_property,Variant& r_value) const { bool VisualScript::get_property_default_value(const StringName& p_property,Variant& r_value) const {
if (!script_variable_remap.has(p_property)) if (!variables.has(p_property))
return false; return false;
r_value=variables[ script_variable_remap[p_property] ].default_value; r_value=variables[ p_property ].default_value;
return true; return true;
} }
void VisualScript::get_script_method_list(List<MethodInfo> *p_list) const { void VisualScript::get_script_method_list(List<MethodInfo> *p_list) const {
@ -1402,12 +1399,10 @@ VisualScript::~VisualScript() {
bool VisualScriptInstance::set(const StringName& p_name, const Variant& p_value) { bool VisualScriptInstance::set(const StringName& p_name, const Variant& p_value) {
const Map<StringName,StringName>::Element *remap = script->script_variable_remap.find(p_name);
if (!remap)
return false;
Map<StringName,Variant>::Element *E=variables.find(remap->get()); Map<StringName,Variant>::Element *E=variables.find(p_name);
ERR_FAIL_COND_V(!E,false); if (!E)
return false;
E->get()=p_value; E->get()=p_value;
@ -1417,13 +1412,10 @@ bool VisualScriptInstance::set(const StringName& p_name, const Variant& p_value)
bool VisualScriptInstance::get(const StringName& p_name, Variant &r_ret) const { bool VisualScriptInstance::get(const StringName& p_name, Variant &r_ret) const {
const Map<StringName,StringName>::Element *remap = script->script_variable_remap.find(p_name); const Map<StringName,Variant>::Element *E=variables.find(p_name);
if (!remap) if (!E)
return false; return false;
const Map<StringName,Variant>::Element *E=variables.find(remap->get());
ERR_FAIL_COND_V(!E,false);
return E->get(); return E->get();
} }
void VisualScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const{ void VisualScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const{
@ -1433,21 +1425,15 @@ void VisualScriptInstance::get_property_list(List<PropertyInfo> *p_properties) c
if (!E->get()._export) if (!E->get()._export)
continue; continue;
PropertyInfo p = E->get().info; PropertyInfo p = E->get().info;
p.name=SCRIPT_VARIABLES_PREFIX+String(E->key()); p.name=String(E->key());
p_properties->push_back(p); p_properties->push_back(p);
} }
} }
Variant::Type VisualScriptInstance::get_property_type(const StringName& p_name,bool *r_is_valid) const{ Variant::Type VisualScriptInstance::get_property_type(const StringName& p_name,bool *r_is_valid) const{
const Map<StringName,StringName>::Element *remap = script->script_variable_remap.find(p_name);
if (!remap) {
if (r_is_valid)
*r_is_valid=false;
return Variant::NIL;
}
const Map<StringName,VisualScript::Variable>::Element *E=script->variables.find(remap->get()); const Map<StringName,VisualScript::Variable>::Element *E=script->variables.find(p_name);
if (!E) { if (!E) {
if (r_is_valid) if (r_is_valid)
*r_is_valid=false; *r_is_valid=false;

1
modules/visual_script/visual_script.h
View file

@ -227,7 +227,6 @@ friend class VisualScriptInstance;
Map<StringName,Function> functions; Map<StringName,Function> functions;
Map<StringName,Variable> variables; Map<StringName,Variable> variables;
Map<StringName,StringName> script_variable_remap;
Map<StringName,Vector<Argument> > custom_signals; Map<StringName,Vector<Argument> > custom_signals;
Map<Object*,VisualScriptInstance*> instances; Map<Object*,VisualScriptInstance*> instances;