mirror of
https://github.com/godotengine/godot-visual-script.git
synced 2025-12-31 21:48:42 +03:00
Rename instance()->instantiate() when it's a verb
This commit is contained in:
@@ -725,7 +725,7 @@ int VisualScript::get_available_id() const {
|
||||
|
||||
/////////////////////////////////
|
||||
|
||||
bool VisualScript::can_instance() const {
|
||||
bool VisualScript::can_instantiate() const {
|
||||
return true; // ScriptServer::is_scripting_enabled();
|
||||
}
|
||||
|
||||
@@ -1958,7 +1958,7 @@ void VisualScriptInstance::create(const Ref<VisualScript> &p_script, Object *p_o
|
||||
for (const Set<int>::Element *F = node_ids.front(); F; F = F->next()) {
|
||||
Ref<VisualScriptNode> node = script->nodes[F->get()].node;
|
||||
|
||||
VisualScriptNodeInstance *instance = node->instance(this); // Create instance.
|
||||
VisualScriptNodeInstance *instance = node->instantiate(this); // Create instance.
|
||||
ERR_FAIL_COND(!instance);
|
||||
|
||||
instance->base = node.ptr();
|
||||
@@ -2262,7 +2262,7 @@ void VisualScriptLanguage::get_string_delimiters(List<String> *p_delimiters) con
|
||||
|
||||
Ref<Script> VisualScriptLanguage::get_template(const String &p_class_name, const String &p_base_class_name) const {
|
||||
Ref<VisualScript> script;
|
||||
script.instance();
|
||||
script.instantiate();
|
||||
script->set_instance_base_type(p_base_class_name);
|
||||
return script;
|
||||
}
|
||||
|
||||
@@ -87,7 +87,7 @@ public:
|
||||
void set_breakpoint(bool p_breakpoint);
|
||||
bool is_breakpoint() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) = 0;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) = 0;
|
||||
|
||||
struct TypeGuess {
|
||||
Variant::Type type = Variant::NIL;
|
||||
@@ -325,7 +325,7 @@ public:
|
||||
|
||||
void set_instance_base_type(const StringName &p_type);
|
||||
|
||||
virtual bool can_instance() const override;
|
||||
virtual bool can_instantiate() const override;
|
||||
|
||||
virtual Ref<Script> get_base_script() const override;
|
||||
virtual StringName get_instance_base_type() const override;
|
||||
@@ -619,7 +619,7 @@ public:
|
||||
template <class T>
|
||||
static Ref<VisualScriptNode> create_node_generic(const String &p_name) {
|
||||
Ref<T> node;
|
||||
node.instance();
|
||||
node.instantiate();
|
||||
return node;
|
||||
}
|
||||
|
||||
|
||||
@@ -1187,7 +1187,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptBuiltinFunc::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptBuiltinFunc::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceBuiltinFunc *instance = memnew(VisualScriptNodeInstanceBuiltinFunc);
|
||||
instance->node = this;
|
||||
instance->instance = p_instance;
|
||||
|
||||
@@ -139,7 +139,7 @@ public:
|
||||
void set_func(BuiltinFunc p_which);
|
||||
BuiltinFunc get_func();
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptBuiltinFunc(VisualScriptBuiltinFunc::BuiltinFunc func);
|
||||
VisualScriptBuiltinFunc();
|
||||
|
||||
@@ -1303,7 +1303,7 @@ void VisualScriptEditor::_create_function() {
|
||||
Vector2 ofs = _get_available_pos();
|
||||
|
||||
Ref<VisualScriptFunction> func_node;
|
||||
func_node.instance();
|
||||
func_node.instantiate();
|
||||
func_node->set_name(name);
|
||||
|
||||
for (int i = 0; i < func_input_vbox->get_child_count(); i++) {
|
||||
@@ -1420,7 +1420,7 @@ void VisualScriptEditor::_member_button(Object *p_item, int p_column, int p_butt
|
||||
Vector2 ofs = _get_available_pos();
|
||||
|
||||
Ref<VisualScriptFunction> func_node;
|
||||
func_node.instance();
|
||||
func_node.instantiate();
|
||||
func_node->set_name(name);
|
||||
int fn_id = script->get_available_id();
|
||||
|
||||
@@ -2084,12 +2084,12 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
|
||||
Ref<VisualScriptNode> vnode;
|
||||
if (use_set) {
|
||||
Ref<VisualScriptVariableSet> vnodes;
|
||||
vnodes.instance();
|
||||
vnodes.instantiate();
|
||||
vnodes->set_variable(d["variable"]);
|
||||
vnode = vnodes;
|
||||
} else {
|
||||
Ref<VisualScriptVariableGet> vnodeg;
|
||||
vnodeg.instance();
|
||||
vnodeg.instantiate();
|
||||
vnodeg->set_variable(d["variable"]);
|
||||
vnode = vnodeg;
|
||||
}
|
||||
@@ -2120,7 +2120,7 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
|
||||
ofs /= EDSCALE;
|
||||
|
||||
Ref<VisualScriptFunctionCall> vnode;
|
||||
vnode.instance();
|
||||
vnode.instantiate();
|
||||
vnode->set_call_mode(VisualScriptFunctionCall::CALL_MODE_SELF);
|
||||
|
||||
int new_id = script->get_available_id();
|
||||
@@ -2152,7 +2152,7 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
|
||||
ofs /= EDSCALE;
|
||||
|
||||
Ref<VisualScriptEmitSignal> vnode;
|
||||
vnode.instance();
|
||||
vnode.instantiate();
|
||||
vnode->set_signal(d["signal"]);
|
||||
|
||||
int new_id = script->get_available_id();
|
||||
@@ -2181,7 +2181,7 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
|
||||
ofs /= EDSCALE;
|
||||
|
||||
Ref<VisualScriptPreload> prnode;
|
||||
prnode.instance();
|
||||
prnode.instantiate();
|
||||
prnode->set_preload(d["resource"]);
|
||||
|
||||
int new_id = script->get_available_id();
|
||||
@@ -2224,7 +2224,7 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
|
||||
}
|
||||
|
||||
Ref<VisualScriptPreload> prnode;
|
||||
prnode.instance();
|
||||
prnode.instantiate();
|
||||
prnode->set_preload(res);
|
||||
|
||||
undo_redo->add_do_method(script.ptr(), "add_node", new_id, prnode, ofs);
|
||||
@@ -2290,13 +2290,13 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
|
||||
|
||||
if (use_node) {
|
||||
Ref<VisualScriptSceneNode> scene_node;
|
||||
scene_node.instance();
|
||||
scene_node.instantiate();
|
||||
scene_node->set_node_path(sn->get_path_to(node));
|
||||
n = scene_node;
|
||||
} else {
|
||||
// ! Doesn't work properly.
|
||||
Ref<VisualScriptFunctionCall> call;
|
||||
call.instance();
|
||||
call.instantiate();
|
||||
call->set_call_mode(VisualScriptFunctionCall::CALL_MODE_NODE_PATH);
|
||||
call->set_base_path(sn->get_path_to(node));
|
||||
call->set_base_type(node->get_class());
|
||||
@@ -2358,7 +2358,7 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
|
||||
|
||||
if (!use_get) {
|
||||
Ref<VisualScriptPropertySet> pset;
|
||||
pset.instance();
|
||||
pset.instantiate();
|
||||
pset->set_call_mode(VisualScriptPropertySet::CALL_MODE_INSTANCE);
|
||||
pset->set_base_type(obj->get_class());
|
||||
/*if (use_value) {
|
||||
@@ -2368,7 +2368,7 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
|
||||
vnode = pset;
|
||||
} else {
|
||||
Ref<VisualScriptPropertyGet> pget;
|
||||
pget.instance();
|
||||
pget.instantiate();
|
||||
pget->set_call_mode(VisualScriptPropertyGet::CALL_MODE_INSTANCE);
|
||||
pget->set_base_type(obj->get_class());
|
||||
|
||||
@@ -2400,7 +2400,7 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
|
||||
|
||||
if (!use_get) {
|
||||
Ref<VisualScriptPropertySet> pset;
|
||||
pset.instance();
|
||||
pset.instantiate();
|
||||
if (sn == node) {
|
||||
pset->set_call_mode(VisualScriptPropertySet::CALL_MODE_SELF);
|
||||
} else {
|
||||
@@ -2411,7 +2411,7 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
|
||||
vnode = pset;
|
||||
} else {
|
||||
Ref<VisualScriptPropertyGet> pget;
|
||||
pget.instance();
|
||||
pget.instantiate();
|
||||
if (sn == node) {
|
||||
pget->set_call_mode(VisualScriptPropertyGet::CALL_MODE_SELF);
|
||||
} else {
|
||||
@@ -2666,7 +2666,7 @@ void VisualScriptEditor::add_callback(const String &p_function, PackedStringArra
|
||||
}
|
||||
|
||||
Ref<VisualScriptFunction> func;
|
||||
func.instance();
|
||||
func.instantiate();
|
||||
for (int i = 0; i < p_args.size(); i++) {
|
||||
String name = p_args[i];
|
||||
Variant::Type type = Variant::NIL;
|
||||
@@ -3087,7 +3087,7 @@ void VisualScriptEditor::_port_action_menu(int p_option) {
|
||||
switch (p_option) {
|
||||
case CREATE_CALL_SET_GET: {
|
||||
Ref<VisualScriptFunctionCall> n;
|
||||
n.instance();
|
||||
n.instantiate();
|
||||
|
||||
VisualScriptNode::TypeGuess tg = _guess_output_type(port_action_node, port_action_output, vn);
|
||||
|
||||
@@ -3234,16 +3234,16 @@ void VisualScriptEditor::_selected_connect_node(const String &p_text, const Stri
|
||||
|
||||
if (p_category == String("method")) {
|
||||
Ref<VisualScriptFunctionCall> n;
|
||||
n.instance();
|
||||
n.instantiate();
|
||||
vnode = n;
|
||||
} else if (p_category == String("set")) {
|
||||
Ref<VisualScriptPropertySet> n;
|
||||
n.instance();
|
||||
n.instantiate();
|
||||
vnode = n;
|
||||
script_prop_set = n;
|
||||
} else if (p_category == String("get")) {
|
||||
Ref<VisualScriptPropertyGet> n;
|
||||
n.instance();
|
||||
n.instantiate();
|
||||
n->set_property(p_text);
|
||||
vnode = n;
|
||||
}
|
||||
@@ -3251,28 +3251,28 @@ void VisualScriptEditor::_selected_connect_node(const String &p_text, const Stri
|
||||
if (p_category == String("action")) {
|
||||
if (p_text == "VisualScriptCondition") {
|
||||
Ref<VisualScriptCondition> n;
|
||||
n.instance();
|
||||
n.instantiate();
|
||||
vnode = n;
|
||||
}
|
||||
if (p_text == "VisualScriptSwitch") {
|
||||
Ref<VisualScriptSwitch> n;
|
||||
n.instance();
|
||||
n.instantiate();
|
||||
vnode = n;
|
||||
} else if (p_text == "VisualScriptSequence") {
|
||||
Ref<VisualScriptSequence> n;
|
||||
n.instance();
|
||||
n.instantiate();
|
||||
vnode = n;
|
||||
} else if (p_text == "VisualScriptIterator") {
|
||||
Ref<VisualScriptIterator> n;
|
||||
n.instance();
|
||||
n.instantiate();
|
||||
vnode = n;
|
||||
} else if (p_text == "VisualScriptWhile") {
|
||||
Ref<VisualScriptWhile> n;
|
||||
n.instance();
|
||||
n.instantiate();
|
||||
vnode = n;
|
||||
} else if (p_text == "VisualScriptReturn") {
|
||||
Ref<VisualScriptReturn> n;
|
||||
n.instance();
|
||||
n.instantiate();
|
||||
vnode = n;
|
||||
}
|
||||
}
|
||||
@@ -3468,7 +3468,7 @@ void VisualScriptEditor::_selected_new_virtual_method(const String &p_text, cons
|
||||
|
||||
selected = name;
|
||||
Ref<VisualScriptFunction> func_node;
|
||||
func_node.instance();
|
||||
func_node.instantiate();
|
||||
func_node->set_name(name);
|
||||
int fn_id = script->get_available_id();
|
||||
undo_redo->create_action(TTR("Add Function"));
|
||||
@@ -3484,7 +3484,7 @@ void VisualScriptEditor::_selected_new_virtual_method(const String &p_text, cons
|
||||
undo_redo->add_undo_method(script.ptr(), "remove_node", fn_id);
|
||||
if (minfo.return_val.type != Variant::NIL || minfo.return_val.usage & PROPERTY_USAGE_NIL_IS_VARIANT) {
|
||||
Ref<VisualScriptReturn> ret_node;
|
||||
ret_node.instance();
|
||||
ret_node.instantiate();
|
||||
ret_node->set_return_type(minfo.return_val.type);
|
||||
ret_node->set_enable_return_value(true);
|
||||
ret_node->set_name(name);
|
||||
@@ -3996,7 +3996,7 @@ void VisualScriptEditor::_menu_option(int p_what) {
|
||||
Vector2 ofs = _get_available_pos(false, script->get_node_position(start_node) - Vector2(80, 150));
|
||||
|
||||
Ref<VisualScriptFunction> func_node;
|
||||
func_node.instance();
|
||||
func_node.instantiate();
|
||||
func_node->set_name(new_fn);
|
||||
|
||||
undo_redo->create_action(TTR("Create Function"));
|
||||
@@ -4041,7 +4041,7 @@ void VisualScriptEditor::_menu_option(int p_what) {
|
||||
int m = 1;
|
||||
for (Set<int>::Element *G = end_nodes.front(); G; G = G->next()) {
|
||||
Ref<VisualScriptReturn> ret_node;
|
||||
ret_node.instance();
|
||||
ret_node.instantiate();
|
||||
|
||||
int ret_id = fn_id + (m++);
|
||||
selections.insert(ret_id);
|
||||
@@ -4529,7 +4529,7 @@ void VisualScriptEditor::register_editor() {
|
||||
|
||||
Ref<VisualScriptNode> _VisualScriptEditor::create_node_custom(const String &p_name) {
|
||||
Ref<VisualScriptCustomNode> node;
|
||||
node.instance();
|
||||
node.instantiate();
|
||||
node->set_script(singleton->custom_nodes[p_name]);
|
||||
return node;
|
||||
}
|
||||
|
||||
@@ -1498,7 +1498,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptExpression::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptExpression::instantiate(VisualScriptInstance *p_instance) {
|
||||
_compile_expression();
|
||||
VisualScriptNodeInstanceExpression *instance = memnew(VisualScriptNodeInstanceExpression);
|
||||
instance->instance = p_instance;
|
||||
|
||||
@@ -273,7 +273,7 @@ public:
|
||||
virtual String get_text() const override;
|
||||
virtual String get_category() const override { return "operators"; }
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptExpression();
|
||||
~VisualScriptExpression();
|
||||
|
||||
@@ -138,7 +138,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptReturn::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptReturn::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceReturn *instance = memnew(VisualScriptNodeInstanceReturn);
|
||||
instance->node = this;
|
||||
instance->instance = p_instance;
|
||||
@@ -154,7 +154,7 @@ VisualScriptReturn::VisualScriptReturn() {
|
||||
template <bool with_value>
|
||||
static Ref<VisualScriptNode> create_return_node(const String &p_name) {
|
||||
Ref<VisualScriptReturn> node;
|
||||
node.instance();
|
||||
node.instantiate();
|
||||
node->set_enable_return_value(with_value);
|
||||
return node;
|
||||
}
|
||||
@@ -231,7 +231,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptCondition::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptCondition::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceCondition *instance = memnew(VisualScriptNodeInstanceCondition);
|
||||
instance->node = this;
|
||||
instance->instance = p_instance;
|
||||
@@ -311,7 +311,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptWhile::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptWhile::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceWhile *instance = memnew(VisualScriptNodeInstanceWhile);
|
||||
instance->node = this;
|
||||
instance->instance = p_instance;
|
||||
@@ -435,7 +435,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptIterator::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptIterator::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceIterator *instance = memnew(VisualScriptNodeInstanceIterator);
|
||||
instance->node = this;
|
||||
instance->instance = p_instance;
|
||||
@@ -534,7 +534,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptSequence::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptSequence::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceSequence *instance = memnew(VisualScriptNodeInstanceSequence);
|
||||
instance->node = this;
|
||||
instance->instance = p_instance;
|
||||
@@ -618,7 +618,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptSwitch::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptSwitch::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceSwitch *instance = memnew(VisualScriptNodeInstanceSwitch);
|
||||
instance->instance = p_instance;
|
||||
instance->case_count = case_values.size();
|
||||
@@ -831,7 +831,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptTypeCast::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptTypeCast::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceTypeCast *instance = memnew(VisualScriptNodeInstanceTypeCast);
|
||||
instance->instance = p_instance;
|
||||
instance->base_type = base_type;
|
||||
|
||||
@@ -64,7 +64,7 @@ public:
|
||||
void set_enable_return_value(bool p_enable);
|
||||
bool is_return_value_enabled() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptReturn();
|
||||
};
|
||||
@@ -91,7 +91,7 @@ public:
|
||||
virtual String get_text() const override;
|
||||
virtual String get_category() const override { return "flow_control"; }
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptCondition();
|
||||
};
|
||||
@@ -118,7 +118,7 @@ public:
|
||||
virtual String get_text() const override;
|
||||
virtual String get_category() const override { return "flow_control"; }
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptWhile();
|
||||
};
|
||||
@@ -145,7 +145,7 @@ public:
|
||||
virtual String get_text() const override;
|
||||
virtual String get_category() const override { return "flow_control"; }
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptIterator();
|
||||
};
|
||||
@@ -177,7 +177,7 @@ public:
|
||||
void set_steps(int p_steps);
|
||||
int get_steps() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptSequence();
|
||||
};
|
||||
@@ -220,7 +220,7 @@ public:
|
||||
virtual String get_text() const override;
|
||||
virtual String get_category() const override { return "flow_control"; }
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptSwitch();
|
||||
};
|
||||
@@ -258,7 +258,7 @@ public:
|
||||
|
||||
virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptTypeCast();
|
||||
};
|
||||
|
||||
@@ -856,7 +856,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptFunctionCall::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptFunctionCall::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceFunctionCall *instance = memnew(VisualScriptNodeInstanceFunctionCall);
|
||||
instance->node = this;
|
||||
instance->instance = p_instance;
|
||||
@@ -891,7 +891,7 @@ VisualScriptFunctionCall::VisualScriptFunctionCall() {
|
||||
template <VisualScriptFunctionCall::CallMode cmode>
|
||||
static Ref<VisualScriptNode> create_function_call_node(const String &p_name) {
|
||||
Ref<VisualScriptFunctionCall> node;
|
||||
node.instance();
|
||||
node.instantiate();
|
||||
node->set_call_mode(cmode);
|
||||
return node;
|
||||
}
|
||||
@@ -1587,7 +1587,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptPropertySet::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptPropertySet::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstancePropertySet *instance = memnew(VisualScriptNodeInstancePropertySet);
|
||||
instance->node = this;
|
||||
instance->instance = p_instance;
|
||||
@@ -1618,7 +1618,7 @@ VisualScriptPropertySet::VisualScriptPropertySet() {
|
||||
template <VisualScriptPropertySet::CallMode cmode>
|
||||
static Ref<VisualScriptNode> create_property_set_node(const String &p_name) {
|
||||
Ref<VisualScriptPropertySet> node;
|
||||
node.instance();
|
||||
node.instantiate();
|
||||
node->set_call_mode(cmode);
|
||||
return node;
|
||||
}
|
||||
@@ -2175,7 +2175,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptPropertyGet::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptPropertyGet::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstancePropertyGet *instance = memnew(VisualScriptNodeInstancePropertyGet);
|
||||
instance->node = this;
|
||||
instance->instance = p_instance;
|
||||
@@ -2197,7 +2197,7 @@ VisualScriptPropertyGet::VisualScriptPropertyGet() {
|
||||
template <VisualScriptPropertyGet::CallMode cmode>
|
||||
static Ref<VisualScriptNode> create_property_get_node(const String &p_name) {
|
||||
Ref<VisualScriptPropertyGet> node;
|
||||
node.instance();
|
||||
node.instantiate();
|
||||
node->set_call_mode(cmode);
|
||||
return node;
|
||||
}
|
||||
@@ -2321,7 +2321,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptEmitSignal::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptEmitSignal::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceEmitSignal *instance = memnew(VisualScriptNodeInstanceEmitSignal);
|
||||
instance->node = this;
|
||||
instance->instance = p_instance;
|
||||
@@ -2340,7 +2340,7 @@ static Ref<VisualScriptNode> create_basic_type_call_node(const String &p_name) {
|
||||
String method = path[3];
|
||||
|
||||
Ref<VisualScriptFunctionCall> node;
|
||||
node.instance();
|
||||
node.instantiate();
|
||||
|
||||
Variant::Type type = Variant::VARIANT_MAX;
|
||||
|
||||
|
||||
@@ -125,7 +125,7 @@ public:
|
||||
void set_rpc_call_mode(RPCCallMode p_mode);
|
||||
RPCCallMode get_rpc_call_mode() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
|
||||
|
||||
@@ -231,7 +231,7 @@ public:
|
||||
void set_assign_op(AssignOp p_op);
|
||||
AssignOp get_assign_op() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
|
||||
|
||||
VisualScriptPropertySet();
|
||||
@@ -314,7 +314,7 @@ public:
|
||||
void set_index(const StringName &p_type);
|
||||
StringName get_index() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptPropertyGet();
|
||||
};
|
||||
@@ -351,7 +351,7 @@ public:
|
||||
void set_signal(const StringName &p_type);
|
||||
StringName get_signal() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptEmitSignal();
|
||||
};
|
||||
|
||||
@@ -296,7 +296,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptFunction::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptFunction::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceFunction *instance = memnew(VisualScriptNodeInstanceFunction);
|
||||
instance->node = this;
|
||||
instance->instance = p_instance;
|
||||
@@ -791,7 +791,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptComposeArray::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptComposeArray::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptComposeArrayNode *instance = memnew(VisualScriptComposeArrayNode);
|
||||
instance->input_count = inputports.size();
|
||||
return instance;
|
||||
@@ -1062,7 +1062,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptOperator::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptOperator::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceOperator *instance = memnew(VisualScriptNodeInstanceOperator);
|
||||
instance->unary = get_input_value_port_count() == 1;
|
||||
instance->op = op;
|
||||
@@ -1077,7 +1077,7 @@ VisualScriptOperator::VisualScriptOperator() {
|
||||
template <Variant::Operator OP>
|
||||
static Ref<VisualScriptNode> create_op_node(const String &p_name) {
|
||||
Ref<VisualScriptOperator> node;
|
||||
node.instance();
|
||||
node.instantiate();
|
||||
node->set_operator(OP);
|
||||
return node;
|
||||
}
|
||||
@@ -1169,7 +1169,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptSelect::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptSelect::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceSelect *instance = memnew(VisualScriptNodeInstanceSelect);
|
||||
return instance;
|
||||
}
|
||||
@@ -1277,7 +1277,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptVariableGet::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptVariableGet::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceVariableGet *instance = memnew(VisualScriptNodeInstanceVariableGet);
|
||||
instance->node = this;
|
||||
instance->instance = p_instance;
|
||||
@@ -1389,7 +1389,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptVariableSet::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptVariableSet::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceVariableSet *instance = memnew(VisualScriptNodeInstanceVariableSet);
|
||||
instance->node = this;
|
||||
instance->instance = p_instance;
|
||||
@@ -1504,7 +1504,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptConstant::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptConstant::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceConstant *instance = memnew(VisualScriptNodeInstanceConstant);
|
||||
instance->constant = value;
|
||||
return instance;
|
||||
@@ -1597,7 +1597,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptPreload::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptPreload::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstancePreload *instance = memnew(VisualScriptNodeInstancePreload);
|
||||
instance->preload = preload;
|
||||
return instance;
|
||||
@@ -1662,7 +1662,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptIndexGet::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptIndexGet::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceIndexGet *instance = memnew(VisualScriptNodeInstanceIndexGet);
|
||||
return instance;
|
||||
}
|
||||
@@ -1732,7 +1732,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptIndexSet::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptIndexSet::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceIndexSet *instance = memnew(VisualScriptNodeInstanceIndexSet);
|
||||
return instance;
|
||||
}
|
||||
@@ -1798,7 +1798,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptGlobalConstant::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptGlobalConstant::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceGlobalConstant *instance = memnew(VisualScriptNodeInstanceGlobalConstant);
|
||||
instance->index = index;
|
||||
return instance;
|
||||
@@ -1916,7 +1916,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptClassConstant::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptClassConstant::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceClassConstant *instance = memnew(VisualScriptNodeInstanceClassConstant);
|
||||
instance->value = ClassDB::get_integer_constant(base_type, name, &instance->valid);
|
||||
return instance;
|
||||
@@ -2050,7 +2050,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptBasicTypeConstant::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptBasicTypeConstant::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceBasicTypeConstant *instance = memnew(VisualScriptNodeInstanceBasicTypeConstant);
|
||||
instance->value = Variant::get_constant_value(type, name, &instance->valid);
|
||||
return instance;
|
||||
@@ -2174,7 +2174,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptMathConstant::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptMathConstant::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceMathConstant *instance = memnew(VisualScriptNodeInstanceMathConstant);
|
||||
instance->value = const_value[constant];
|
||||
return instance;
|
||||
@@ -2268,7 +2268,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptEngineSingleton::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptEngineSingleton::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceEngineSingleton *instance = memnew(VisualScriptNodeInstanceEngineSingleton);
|
||||
instance->singleton = Engine::get_singleton()->get_singleton_object(singleton);
|
||||
return instance;
|
||||
@@ -2394,7 +2394,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptSceneNode::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptSceneNode::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceSceneNode *instance = memnew(VisualScriptNodeInstanceSceneNode);
|
||||
instance->node = this;
|
||||
instance->instance = p_instance;
|
||||
@@ -2574,7 +2574,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptSceneTree::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptSceneTree::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceSceneTree *instance = memnew(VisualScriptNodeInstanceSceneTree);
|
||||
instance->node = this;
|
||||
instance->instance = p_instance;
|
||||
@@ -2655,7 +2655,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptResourcePath::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptResourcePath::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceResourcePath *instance = memnew(VisualScriptNodeInstanceResourcePath);
|
||||
instance->path = path;
|
||||
return instance;
|
||||
@@ -2727,7 +2727,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptSelf::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptSelf::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceSelf *instance = memnew(VisualScriptNodeInstanceSelf);
|
||||
instance->instance = p_instance;
|
||||
return instance;
|
||||
@@ -2908,7 +2908,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptCustomNode::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptCustomNode::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceCustomNode *instance = memnew(VisualScriptNodeInstanceCustomNode);
|
||||
instance->instance = p_instance;
|
||||
instance->node = this;
|
||||
@@ -3059,7 +3059,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptSubCall::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptSubCall::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceSubCall *instance = memnew(VisualScriptNodeInstanceSubCall);
|
||||
instance->instance = p_instance;
|
||||
Ref<Script> script = get_script();
|
||||
@@ -3172,7 +3172,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptComment::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptComment::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceComment *instance = memnew(VisualScriptNodeInstanceComment);
|
||||
instance->instance = p_instance;
|
||||
return instance;
|
||||
@@ -3279,7 +3279,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptConstructor::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptConstructor::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceConstructor *instance = memnew(VisualScriptNodeInstanceConstructor);
|
||||
instance->instance = p_instance;
|
||||
instance->type = type;
|
||||
@@ -3308,7 +3308,7 @@ static Ref<VisualScriptNode> create_constructor_node(const String &p_name) {
|
||||
ERR_FAIL_COND_V(!constructor_map.has(p_name), Ref<VisualScriptNode>());
|
||||
|
||||
Ref<VisualScriptConstructor> vsc;
|
||||
vsc.instance();
|
||||
vsc.instantiate();
|
||||
vsc->set_constructor_type(constructor_map[p_name].first);
|
||||
vsc->set_constructor(constructor_map[p_name].second);
|
||||
|
||||
@@ -3389,7 +3389,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptLocalVar::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptLocalVar::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceLocalVar *instance = memnew(VisualScriptNodeInstanceLocalVar);
|
||||
instance->instance = p_instance;
|
||||
instance->name = name;
|
||||
@@ -3497,7 +3497,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptLocalVarSet::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptLocalVarSet::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceLocalVarSet *instance = memnew(VisualScriptNodeInstanceLocalVarSet);
|
||||
instance->instance = p_instance;
|
||||
instance->name = name;
|
||||
@@ -3634,7 +3634,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptInputAction::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptInputAction::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceInputAction *instance = memnew(VisualScriptNodeInstanceInputAction);
|
||||
instance->instance = p_instance;
|
||||
instance->action = name;
|
||||
@@ -3812,7 +3812,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptDeconstruct::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptDeconstruct::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceDeconstruct *instance = memnew(VisualScriptNodeInstanceDeconstruct);
|
||||
instance->instance = p_instance;
|
||||
instance->outputs.resize(elements.size());
|
||||
@@ -3849,7 +3849,7 @@ VisualScriptDeconstruct::VisualScriptDeconstruct() {
|
||||
template <Variant::Type T>
|
||||
static Ref<VisualScriptNode> create_node_deconst_typed(const String &p_name) {
|
||||
Ref<VisualScriptDeconstruct> node;
|
||||
node.instance();
|
||||
node.instantiate();
|
||||
node->set_deconstruct_type(T);
|
||||
return node;
|
||||
}
|
||||
|
||||
@@ -97,7 +97,7 @@ public:
|
||||
void set_rpc_mode(MultiplayerAPI::RPCMode p_mode);
|
||||
MultiplayerAPI::RPCMode get_rpc_mode() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
virtual void reset_state() override;
|
||||
|
||||
@@ -192,7 +192,7 @@ public:
|
||||
virtual String get_text() const override;
|
||||
virtual String get_category() const override { return "functions"; }
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptComposeArray();
|
||||
};
|
||||
@@ -227,7 +227,7 @@ public:
|
||||
void set_typed(Variant::Type p_op);
|
||||
Variant::Type get_typed() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptOperator();
|
||||
};
|
||||
@@ -259,7 +259,7 @@ public:
|
||||
void set_typed(Variant::Type p_op);
|
||||
Variant::Type get_typed() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptSelect();
|
||||
};
|
||||
@@ -291,7 +291,7 @@ public:
|
||||
void set_variable(StringName p_variable);
|
||||
StringName get_variable() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptVariableGet();
|
||||
};
|
||||
@@ -323,7 +323,7 @@ public:
|
||||
void set_variable(StringName p_variable);
|
||||
StringName get_variable() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptVariableSet();
|
||||
};
|
||||
@@ -359,7 +359,7 @@ public:
|
||||
void set_constant_value(Variant p_value);
|
||||
Variant get_constant_value() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptConstant();
|
||||
};
|
||||
@@ -390,7 +390,7 @@ public:
|
||||
void set_preload(const Ref<Resource> &p_preload);
|
||||
Ref<Resource> get_preload() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptPreload();
|
||||
};
|
||||
@@ -413,7 +413,7 @@ public:
|
||||
virtual String get_caption() const override;
|
||||
virtual String get_category() const override { return "operators"; }
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptIndexGet();
|
||||
};
|
||||
@@ -436,7 +436,7 @@ public:
|
||||
virtual String get_caption() const override;
|
||||
virtual String get_category() const override { return "operators"; }
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptIndexSet();
|
||||
};
|
||||
@@ -466,7 +466,7 @@ public:
|
||||
void set_global_constant(int p_which);
|
||||
int get_global_constant();
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptGlobalConstant();
|
||||
};
|
||||
@@ -502,7 +502,7 @@ public:
|
||||
void set_base_type(const StringName &p_which);
|
||||
StringName get_base_type();
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptClassConstant();
|
||||
};
|
||||
@@ -539,7 +539,7 @@ public:
|
||||
void set_basic_type(Variant::Type p_which);
|
||||
Variant::Type get_basic_type() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptBasicTypeConstant();
|
||||
};
|
||||
@@ -586,7 +586,7 @@ public:
|
||||
void set_math_constant(MathConstant p_which);
|
||||
MathConstant get_math_constant();
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptMathConstant();
|
||||
};
|
||||
@@ -621,7 +621,7 @@ public:
|
||||
void set_singleton(const String &p_string);
|
||||
String get_singleton();
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
|
||||
|
||||
@@ -655,7 +655,7 @@ public:
|
||||
void set_node_path(const NodePath &p_path);
|
||||
NodePath get_node_path();
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
|
||||
|
||||
@@ -684,7 +684,7 @@ public:
|
||||
virtual String get_caption() const override;
|
||||
virtual String get_category() const override { return "data"; }
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
|
||||
|
||||
@@ -717,7 +717,7 @@ public:
|
||||
void set_resource_path(const String &p_path);
|
||||
String get_resource_path();
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptResourcePath();
|
||||
};
|
||||
@@ -743,7 +743,7 @@ public:
|
||||
virtual String get_caption() const override;
|
||||
virtual String get_category() const override { return "data"; }
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
|
||||
|
||||
@@ -788,7 +788,7 @@ public:
|
||||
virtual String get_text() const override;
|
||||
virtual String get_category() const override;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
void _script_changed();
|
||||
|
||||
@@ -819,7 +819,7 @@ public:
|
||||
virtual String get_text() const override;
|
||||
virtual String get_category() const override;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptSubCall();
|
||||
};
|
||||
@@ -859,7 +859,7 @@ public:
|
||||
void set_size(const Size2 &p_size);
|
||||
Size2 get_size() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptComment();
|
||||
};
|
||||
@@ -894,7 +894,7 @@ public:
|
||||
void set_constructor(const Dictionary &p_info);
|
||||
Dictionary get_constructor() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptConstructor();
|
||||
};
|
||||
@@ -929,7 +929,7 @@ public:
|
||||
void set_var_type(Variant::Type p_type);
|
||||
Variant::Type get_var_type() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptLocalVar();
|
||||
};
|
||||
@@ -965,7 +965,7 @@ public:
|
||||
void set_var_type(Variant::Type p_type);
|
||||
Variant::Type get_var_type() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptLocalVarSet();
|
||||
};
|
||||
@@ -1010,7 +1010,7 @@ public:
|
||||
void set_action_mode(Mode p_mode);
|
||||
Mode get_action_mode() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptInputAction();
|
||||
};
|
||||
@@ -1056,7 +1056,7 @@ public:
|
||||
void set_deconstruct_type(Variant::Type p_type);
|
||||
Variant::Type get_deconstruct_type() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptDeconstruct();
|
||||
};
|
||||
|
||||
@@ -113,7 +113,7 @@ public:
|
||||
}
|
||||
|
||||
Ref<VisualScriptFunctionState> state;
|
||||
state.instance();
|
||||
state.instantiate();
|
||||
|
||||
int ret = STEP_YIELD_BIT;
|
||||
switch (mode) {
|
||||
@@ -138,7 +138,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptYield::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptYield::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceYield *instance = memnew(VisualScriptNodeInstanceYield);
|
||||
//instance->instance=p_instance;
|
||||
instance->mode = yield_mode;
|
||||
@@ -202,7 +202,7 @@ VisualScriptYield::VisualScriptYield() {
|
||||
template <VisualScriptYield::YieldMode MODE>
|
||||
static Ref<VisualScriptNode> create_yield_node(const String &p_name) {
|
||||
Ref<VisualScriptYield> node;
|
||||
node.instance();
|
||||
node.instantiate();
|
||||
node->set_yield_mode(MODE);
|
||||
return node;
|
||||
}
|
||||
@@ -548,7 +548,7 @@ public:
|
||||
}
|
||||
|
||||
Ref<VisualScriptFunctionState> state;
|
||||
state.instance();
|
||||
state.instantiate();
|
||||
|
||||
state->connect_to_signal(object, signal, Array());
|
||||
|
||||
@@ -559,7 +559,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
VisualScriptNodeInstance *VisualScriptYieldSignal::instance(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstance *VisualScriptYieldSignal::instantiate(VisualScriptInstance *p_instance) {
|
||||
VisualScriptNodeInstanceYieldSignal *instance = memnew(VisualScriptNodeInstanceYieldSignal);
|
||||
instance->node = this;
|
||||
instance->instance = p_instance;
|
||||
@@ -578,7 +578,7 @@ VisualScriptYieldSignal::VisualScriptYieldSignal() {
|
||||
template <VisualScriptYieldSignal::CallMode cmode>
|
||||
static Ref<VisualScriptNode> create_yield_signal_node(const String &p_name) {
|
||||
Ref<VisualScriptYieldSignal> node;
|
||||
node.instance();
|
||||
node.instantiate();
|
||||
node->set_call_mode(cmode);
|
||||
return node;
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ public:
|
||||
void set_wait_time(float p_time);
|
||||
float get_wait_time();
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptYield();
|
||||
};
|
||||
@@ -135,7 +135,7 @@ public:
|
||||
void set_call_mode(CallMode p_mode);
|
||||
CallMode get_call_mode() const;
|
||||
|
||||
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
|
||||
virtual VisualScriptNodeInstance *instantiate(VisualScriptInstance *p_instance) override;
|
||||
|
||||
VisualScriptYieldSignal();
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user