Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #99893 from kiroxas/avoidUTF8ParsingWhenNotNecessary

Browse source 
Avoid duplicated `utf8()` calls
This commit is contained in:
Rémi Verschelde 2025-01-06 22:47:12 +01:00
commit e06cac212b
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/gltf/gltf_document.cpp
View file

@ -8256,11 +8256,10 @@ PackedByteArray GLTFDocument::_serialize_glb_buffer(Ref<GLTFState> p_state, Erro
const int32_t header_size = 12;
const int32_t chunk_header_size = 8;
int32_t padding = (chunk_header_size + json.utf8().length()) % 4;
json += String(" ").repeat(padding);
CharString cs = json.utf8();
const uint32_t text_chunk_length = cs.length();
int32_t padding = (chunk_header_size + cs.length()) % 4;
const uint32_t text_chunk_length = cs.length() + padding;
const uint32_t text_chunk_type = 0x4E4F534A; //JSON
int32_t binary_data_length = 0;
@ -8278,6 +8277,9 @@ PackedByteArray GLTFDocument::_serialize_glb_buffer(Ref<GLTFState> p_state, Erro
buffer->put_32(text_chunk_length);
buffer->put_32(text_chunk_type);
buffer->put_data((uint8_t *)&cs[0], cs.length());
for (int i = 0; i < padding; i++) {
buffer->put_8(' ');
}
if (binary_chunk_length) {
buffer->put_32(binary_chunk_length);
buffer->put_32(binary_chunk_type);