godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Add override keywords.

Browse Source
This commit is contained in:
Marcel Admiraal
2020-07-10 11:34:39 +01:00
parent ad9e5ae984
commit 26fcf2b04c
351 changed files with 4123 additions and 4146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
scene/animation/animation_blend_tree.h
View File

@@ -43,17 +43,17 @@ class AnimationNodeAnimation : public AnimationRootNode {
bool skip;
protected:
void _validate_property(PropertyInfo &property) const;
void _validate_property(PropertyInfo &property) const override;
static void _bind_methods();
public:
void get_parameter_list(List<PropertyInfo> *r_list) const;
void get_parameter_list(List<PropertyInfo> *r_list) const override;
static Vector<String> (*get_editable_animation_list)();
virtual String get_caption() const;
virtual float process(float p_time, bool p_seek);
virtual String get_caption() const override;
virtual float process(float p_time, bool p_seek) override;
void set_animation(const StringName &p_name);
StringName get_animation() const;
@@ -96,10 +96,10 @@ protected:
static void _bind_methods();
public:
virtual void get_parameter_list(List<PropertyInfo> *r_list) const;
virtual Variant get_parameter_default_value(const StringName &p_parameter) const;
virtual void get_parameter_list(List<PropertyInfo> *r_list) const override;
virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
virtual String get_caption() const;
virtual String get_caption() const override;
void set_fadein_time(float p_time);
void set_fadeout_time(float p_time);
@@ -121,8 +121,8 @@ public:
void set_use_sync(bool p_sync);
bool is_using_sync() const;
virtual bool has_filter() const;
virtual float process(float p_time, bool p_seek);
virtual bool has_filter() const override;
virtual float process(float p_time, bool p_seek) override;
AnimationNodeOneShot();
};
@@ -139,16 +139,16 @@ protected:
static void _bind_methods();
public:
void get_parameter_list(List<PropertyInfo> *r_list) const;
virtual Variant get_parameter_default_value(const StringName &p_parameter) const;
void get_parameter_list(List<PropertyInfo> *r_list) const override;
virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
virtual String get_caption() const;
virtual String get_caption() const override;
void set_use_sync(bool p_sync);
bool is_using_sync() const;
virtual bool has_filter() const;
virtual float process(float p_time, bool p_seek);
virtual bool has_filter() const override;
virtual float process(float p_time, bool p_seek) override;
AnimationNodeAdd2();
};
@@ -163,16 +163,16 @@ protected:
static void _bind_methods();
public:
void get_parameter_list(List<PropertyInfo> *r_list) const;
virtual Variant get_parameter_default_value(const StringName &p_parameter) const;
void get_parameter_list(List<PropertyInfo> *r_list) const override;
virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
virtual String get_caption() const;
virtual String get_caption() const override;
void set_use_sync(bool p_sync);
bool is_using_sync() const;
virtual bool has_filter() const;
virtual float process(float p_time, bool p_seek);
virtual bool has_filter() const override;
virtual float process(float p_time, bool p_seek) override;
AnimationNodeAdd3();
};
@@ -187,16 +187,16 @@ protected:
static void _bind_methods();
public:
virtual void get_parameter_list(List<PropertyInfo> *r_list) const;
virtual Variant get_parameter_default_value(const StringName &p_parameter) const;
virtual void get_parameter_list(List<PropertyInfo> *r_list) const override;
virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
virtual String get_caption() const;
virtual float process(float p_time, bool p_seek);
virtual String get_caption() const override;
virtual float process(float p_time, bool p_seek) override;
void set_use_sync(bool p_sync);
bool is_using_sync() const;
virtual bool has_filter() const;
virtual bool has_filter() const override;
AnimationNodeBlend2();
};
@@ -210,15 +210,15 @@ protected:
static void _bind_methods();
public:
virtual void get_parameter_list(List<PropertyInfo> *r_list) const;
virtual Variant get_parameter_default_value(const StringName &p_parameter) const;
virtual void get_parameter_list(List<PropertyInfo> *r_list) const override;
virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
virtual String get_caption() const;
virtual String get_caption() const override;
void set_use_sync(bool p_sync);
bool is_using_sync() const;
float process(float p_time, bool p_seek);
float process(float p_time, bool p_seek) override;
AnimationNodeBlend3();
};
@@ -231,12 +231,12 @@ protected:
static void _bind_methods();
public:
virtual void get_parameter_list(List<PropertyInfo> *r_list) const;
virtual Variant get_parameter_default_value(const StringName &p_parameter) const;
virtual void get_parameter_list(List<PropertyInfo> *r_list) const override;
virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
virtual String get_caption() const;
virtual String get_caption() const override;
float process(float p_time, bool p_seek);
float process(float p_time, bool p_seek) override;
AnimationNodeTimeScale();
};
@@ -250,12 +250,12 @@ protected:
static void _bind_methods();
public:
virtual void get_parameter_list(List<PropertyInfo> *r_list) const;
virtual Variant get_parameter_default_value(const StringName &p_parameter) const;
virtual void get_parameter_list(List<PropertyInfo> *r_list) const override;
virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
virtual String get_caption() const;
virtual String get_caption() const override;
float process(float p_time, bool p_seek);
float process(float p_time, bool p_seek) override;
AnimationNodeTimeSeek();
};
@@ -294,13 +294,13 @@ class AnimationNodeTransition : public AnimationNode {
protected:
static void _bind_methods();
void _validate_property(PropertyInfo &property) const;
void _validate_property(PropertyInfo &property) const override;
public:
virtual void get_parameter_list(List<PropertyInfo> *r_list) const;
virtual Variant get_parameter_default_value(const StringName &p_parameter) const;
virtual void get_parameter_list(List<PropertyInfo> *r_list) const override;
virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
virtual String get_caption() const;
virtual String get_caption() const override;
void set_enabled_inputs(int p_inputs);
int get_enabled_inputs();
@@ -314,7 +314,7 @@ public:
void set_cross_fade_time(float p_fade);
float get_cross_fade_time() const;
float process(float p_time, bool p_seek);
float process(float p_time, bool p_seek) override;
AnimationNodeTransition();
};
@@ -323,8 +323,8 @@ class AnimationNodeOutput : public AnimationNode {
GDCLASS(AnimationNodeOutput, AnimationNode);
public:
virtual String get_caption() const;
virtual float process(float p_time, bool p_seek);
virtual String get_caption() const override;
virtual float process(float p_time, bool p_seek) override;
AnimationNodeOutput();
};
@@ -374,7 +374,7 @@ public:
void set_node_position(const StringName &p_node, const Vector2 &p_position);
Vector2 get_node_position(const StringName &p_node) const;
virtual void get_child_nodes(List<ChildNode> *r_child_nodes);
virtual void get_child_nodes(List<ChildNode> *r_child_nodes) override;
void connect_node(const StringName &p_input_node, int p_input_index, const StringName &p_output_node);
void disconnect_node(const StringName &p_node, int p_input_index);
@@ -388,15 +388,15 @@ public:
ConnectionError can_connect_node(const StringName &p_input_node, int p_input_index, const StringName &p_output_node) const;
void get_node_connections(List<NodeConnection> *r_connections) const;
virtual String get_caption() const;
virtual float process(float p_time, bool p_seek);
virtual String get_caption() const override;
virtual float process(float p_time, bool p_seek) override;
void get_node_list(List<StringName> *r_list);
void set_graph_offset(const Vector2 &p_graph_offset);
Vector2 get_graph_offset() const;
virtual Ref<AnimationNode> get_child_by_name(const StringName &p_name);
virtual Ref<AnimationNode> get_child_by_name(const StringName &p_name) override;
AnimationNodeBlendTree();
~AnimationNodeBlendTree();