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

[TextServer] Remove excessive Dictionary checks.

Browse source
This commit is contained in:
bruvzg 2023-07-07 20:14:28 +03:00
parent fa3428ff25
commit 31a8a9b2e1
No known key found for this signature in database
GPG key ID: 7960FCF39844EC38
3 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/text_server_adv/text_server_adv.cpp
View file

@ -2383,10 +2383,8 @@ void TextServerAdvanced::_font_set_variation_coordinates(const RID &p_font_rid,
ERR_FAIL_COND(!fd); ERR_FAIL_COND(!fd);
MutexLock lock(fd->mutex); MutexLock lock(fd->mutex);
if (fd->variation_coordinates != p_variation_coordinates) { _font_clear_cache(fd);
_font_clear_cache(fd); fd->variation_coordinates = p_variation_coordinates;
fd->variation_coordinates = p_variation_coordinates;
}
} }
Dictionary TextServerAdvanced::_font_get_variation_coordinates(const RID &p_font_rid) const { Dictionary TextServerAdvanced::_font_get_variation_coordinates(const RID &p_font_rid) const {

6
modules/text_server_fb/text_server_fb.cpp
View file

@ -1376,10 +1376,8 @@ void TextServerFallback::_font_set_variation_coordinates(const RID &p_font_rid,
ERR_FAIL_COND(!fd); ERR_FAIL_COND(!fd);
MutexLock lock(fd->mutex); MutexLock lock(fd->mutex);
if (fd->variation_coordinates != p_variation_coordinates) { _font_clear_cache(fd);
_font_clear_cache(fd); fd->variation_coordinates = p_variation_coordinates;
fd->variation_coordinates = p_variation_coordinates;
}
} }
Dictionary TextServerFallback::_font_get_variation_coordinates(const RID &p_font_rid) const { Dictionary TextServerFallback::_font_get_variation_coordinates(const RID &p_font_rid) const {

12
scene/resources/font.cpp
View file

@ -2833,10 +2833,8 @@ Ref<Font> FontVariation::_get_base_font_or_default() const {
} }
void FontVariation::set_variation_opentype(const Dictionary &p_coords) { void FontVariation::set_variation_opentype(const Dictionary &p_coords) {
if (variation.opentype != p_coords) { variation.opentype = p_coords;
variation.opentype = p_coords; _invalidate_rids();
_invalidate_rids();
}
} }
Dictionary FontVariation::get_variation_opentype() const { Dictionary FontVariation::get_variation_opentype() const {
@ -2877,10 +2875,8 @@ int FontVariation::get_variation_face_index() const {
} }
void FontVariation::set_opentype_features(const Dictionary &p_features) { void FontVariation::set_opentype_features(const Dictionary &p_features) {
if (opentype_features != p_features) { opentype_features = p_features;
opentype_features = p_features; _invalidate_rids();
_invalidate_rids();
}
} }
Dictionary FontVariation::get_opentype_features() const { Dictionary FontVariation::get_opentype_features() const {