Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

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

16
scene/resources/font.h
View file

@ -160,13 +160,13 @@ public:
Error create_from_fnt(const String &p_file);
void set_height(float p_height);
float get_height() const;
float get_height() const override;
void set_ascent(float p_ascent);
float get_ascent() const;
float get_descent() const;
float get_underline_position() const;
float get_underline_thickness() const;
float get_ascent() const override;
float get_descent() const override;
float get_underline_position() const override;
float get_underline_thickness() const override;
void add_texture(const Ref<Texture2D> &p_texture);
void add_char(CharType p_char, int p_texture_idx, const Rect2 &p_rect, const Size2 &p_align, float p_advance = -1);
@ -182,7 +182,7 @@ public:
int get_kerning_pair(CharType p_A, CharType p_B) const;
Vector<KerningPairKey> get_kerning_pair_keys() const;
Size2 get_char_size(CharType p_char, CharType p_next = 0) const;
Size2 get_char_size(CharType p_char, CharType p_next = 0) const override;
void set_fallback(const Ref<BitmapFont> &p_fallback);
Ref<BitmapFont> get_fallback() const;
@ -190,9 +190,9 @@ public:
void clear();
void set_distance_field_hint(bool p_distance_field);
bool is_distance_field_hint() const;
bool is_distance_field_hint() const override;
float draw_char(RID p_canvas_item, const Point2 &p_pos, CharType p_char, CharType p_next = 0, const Color &p_modulate = Color(1, 1, 1), bool p_outline = false) const;
float draw_char(RID p_canvas_item, const Point2 &p_pos, CharType p_char, CharType p_next = 0, const Color &p_modulate = Color(1, 1, 1), bool p_outline = false) const override;
BitmapFont();
~BitmapFont();