godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #52928 from bruvzg/var_coord_prefill

This commit is contained in:
Rémi Verschelde 2021-09-22 11:31:35 +02:00 committed by GitHub
parent c63d1c3e4a 9a36d8f26f
commit 211cb401db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scene/resources/font.cpp
View File

@ -1214,6 +1214,14 @@ void Font::add_data(const Ref<FontData> &p_data) {
if (data[data.size() - 1].is_valid()) { if (data[data.size() - 1].is_valid()) {
data.write[data.size() - 1]->connect(SNAME("changed"), callable_mp(this, &Font::_data_changed), varray(), CONNECT_REFERENCE_COUNTED); data.write[data.size() - 1]->connect(SNAME("changed"), callable_mp(this, &Font::_data_changed), varray(), CONNECT_REFERENCE_COUNTED);
Dictionary data_var_list = p_data->get_supported_variation_list();
for (int j = 0; j < data_var_list.size(); j++) {
int32_t tag = data_var_list.get_key_at_index(j);
Vector3i value = data_var_list.get_value_at_index(j);
if (!variation_coordinates.has(tag) && !variation_coordinates.has(TS->tag_to_name(tag))) {
variation_coordinates[TS->tag_to_name(tag)] = value.z;
}
}
} }
cache.clear(); cache.clear();
@ -1233,6 +1241,14 @@ void Font::set_data(int p_idx, const Ref<FontData> &p_data) {
data.write[p_idx] = p_data; data.write[p_idx] = p_data;
rids.write[p_idx] = RID(); rids.write[p_idx] = RID();
Dictionary data_var_list = p_data->get_supported_variation_list();
for (int j = 0; j < data_var_list.size(); j++) {
int32_t tag = data_var_list.get_key_at_index(j);
Vector3i value = data_var_list.get_value_at_index(j);
if (!variation_coordinates.has(tag) && !variation_coordinates.has(TS->tag_to_name(tag))) {
variation_coordinates[TS->tag_to_name(tag)] = value.z;
}
}
if (data[p_idx].is_valid()) { if (data[p_idx].is_valid()) {
data.write[p_idx]->connect(SNAME("changed"), callable_mp(this, &Font::_data_changed), varray(), CONNECT_REFERENCE_COUNTED); data.write[p_idx]->connect(SNAME("changed"), callable_mp(this, &Font::_data_changed), varray(), CONNECT_REFERENCE_COUNTED);