gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-10-04 16:54:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix GCC 12 -Werror=type-limits in animation compression code

Browse source 
Fixup to #54050, CI's GCC builds didn't catch it.
This commit is contained in:
Rémi Verschelde 2021-10-25 17:57:04 +02:00
parent 3409d16227
commit 5ff0624a07
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/resources/animation.cpp
View file

@ -4688,7 +4688,7 @@ bool Animation::_blend_shape_interpolate_compressed(uint32_t p_compressed_track,
template <uint32_t COMPONENTS>
bool Animation::_fetch_compressed(uint32_t p_compressed_track, double p_time, Vector3i &r_current_value, double &r_current_time, Vector3i &r_next_value, double &r_next_time, uint32_t *key_index) const {
ERR_FAIL_COND_V(!compression.enabled, false);
ERR_FAIL_INDEX_V(p_compressed_track, compression.bounds.size(), false);
ERR_FAIL_UNSIGNED_INDEX_V(p_compressed_track, compression.bounds.size(), false);
p_time = CLAMP(p_time, 0, length);
if (key_index) {
*key_index = 0;
@ -4836,7 +4836,7 @@ bool Animation::_fetch_compressed(uint32_t p_compressed_track, double p_time, Ve
template <uint32_t COMPONENTS>
void Animation::_get_compressed_key_indices_in_range(uint32_t p_compressed_track, double p_time, double p_delta, List<int> *r_indices) const {
ERR_FAIL_COND(!compression.enabled);
ERR_FAIL_INDEX(p_compressed_track, compression.bounds.size());
ERR_FAIL_UNSIGNED_INDEX(p_compressed_track, compression.bounds.size());
double frame_to_sec = 1.0 / double(compression.fps);
uint32_t key_index = 0;
@ -4957,7 +4957,7 @@ float Animation::_uncompress_blend_shape(const Vector3i &p_value) const {
template <uint32_t COMPONENTS>
bool Animation::_fetch_compressed_by_index(uint32_t p_compressed_track, int p_index, Vector3i &r_value, double &r_time) const {
ERR_FAIL_COND_V(!compression.enabled, false);
ERR_FAIL_INDEX_V(p_compressed_track, compression.bounds.size(), false);
ERR_FAIL_UNSIGNED_INDEX_V(p_compressed_track, compression.bounds.size(), false);
for (uint32_t i = 0; i < compression.pages.size(); i++) {
const uint8_t *page_data = compression.pages[i].data.ptr();