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

Fix/improve property evaluator

Browse source 
Evolution of #10366 based on what has been discussed there.

Now you can refer to the relevant object either by `self` or `s`.
No conflicts with a potential `tool` script attached to the object.
Proper cleanup since a dummy object is used to have an instance and the temporary script dies with it.
This commit is contained in:
Pedro J. Estébanez 2017-08-17 02:17:18 +02:00
parent 19aff15a1a
commit fcf52303c5
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
editor/property_editor.cpp
View file

@ -4774,19 +4774,20 @@ double PropertyValueEvaluator::eval(const String &p_text) {
return _default_eval(p_text); return _default_eval(p_text);
} }
ScriptInstance *script_instance = script->instance_create(obj); Object dummy;
ScriptInstance *script_instance = script->instance_create(&dummy);
if (!script_instance) if (!script_instance)
return _default_eval(p_text); return _default_eval(p_text);
Variant::CallError call_err; Variant::CallError call_err;
double result = script_instance->call("e", NULL, 0, call_err); Variant arg = obj;
const Variant *args[] = { &arg };
double result = script_instance->call("eval", args, 1, call_err);
if (call_err.error == Variant::CallError::CALL_OK) { if (call_err.error == Variant::CallError::CALL_OK) {
return result; return result;
} }
print_line("[PropertyValueEvaluator]: Error eval! Error code: " + itos(call_err.error)); print_line("[PropertyValueEvaluator]: Error eval! Error code: " + itos(call_err.error));
memdelete(script_instance);
return _default_eval(p_text); return _default_eval(p_text);
} }
@ -4795,9 +4796,8 @@ void PropertyValueEvaluator::edit(Object *p_obj) {
} }
String PropertyValueEvaluator::_build_script(const String &p_text) { String PropertyValueEvaluator::_build_script(const String &p_text) {
String script_text = "tool\nextends Object\nfunc e():\n\treturn "; String script_text =
script_text += p_text.strip_edges(); "tool\nextends Object\nfunc eval(s):\n\tself = s\n\treturn " + p_text.strip_edges() + "\n";
script_text += "\n";
return script_text; return script_text;
} }