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

Avoid division by zero in the fix surface compatibility routine

This commit is contained in:
Yuri Sizov 2023-11-20 16:22:58 +01:00
parent 80de898d72
commit 98011e032d
1 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
servers/rendering_server.cpp
View File

@ -2148,45 +2148,47 @@ void RenderingServer::fix_surface_compatibility(SurfaceData &p_surface, const St
// The only difference for now is that Version 1 uses interleaved vertex positions while version 2 does not. // The only difference for now is that Version 1 uses interleaved vertex positions while version 2 does not.
// I.e. PNTPNTPNT -> PPPNTNTNT. // I.e. PNTPNTPNT -> PPPNTNTNT.
int vertex_size = 0; if (p_surface.vertex_data.size() > 0 && p_surface.vertex_count > 0) {
int normal_size = 0; int vertex_size = 0;
int tangent_size = 0; int normal_size = 0;
if (p_surface.format & ARRAY_FORMAT_VERTEX) { int tangent_size = 0;
if (p_surface.format & ARRAY_FLAG_USE_2D_VERTICES) { if (p_surface.format & ARRAY_FORMAT_VERTEX) {
vertex_size = sizeof(float) * 2; if (p_surface.format & ARRAY_FLAG_USE_2D_VERTICES) {
} else { vertex_size = sizeof(float) * 2;
vertex_size = sizeof(float) * 3; } else {
vertex_size = sizeof(float) * 3;
}
} }
} if (p_surface.format & ARRAY_FORMAT_NORMAL) {
if (p_surface.format & ARRAY_FORMAT_NORMAL) { normal_size += sizeof(uint16_t) * 2;
normal_size += sizeof(uint16_t) * 2;
}
if (p_surface.format & ARRAY_FORMAT_TANGENT) {
tangent_size = sizeof(uint16_t) * 2;
}
int stride = p_surface.vertex_data.size() / p_surface.vertex_count;
int position_stride = vertex_size;
int normal_tangent_stride = normal_size + tangent_size;
p_surface.vertex_data = _convert_surface_version_1_to_surface_version_2(p_surface.format, p_surface.vertex_data, p_surface.vertex_count, stride, vertex_size, normal_size, position_stride, normal_tangent_stride);
if (p_surface.blend_shape_data.size() > 0) {
// The size of one blend shape.
int divisor = (vertex_size + normal_size + tangent_size) * p_surface.vertex_count;
ERR_FAIL_COND((p_surface.blend_shape_data.size() % divisor) != 0);
uint32_t blend_shape_count = p_surface.blend_shape_data.size() / divisor;
Vector<uint8_t> new_blend_shape_data;
for (uint32_t i = 0; i < blend_shape_count; i++) {
Vector<uint8_t> bs_data = p_surface.blend_shape_data.slice(i * divisor, (i + 1) * divisor);
Vector<uint8_t> blend_shape = _convert_surface_version_1_to_surface_version_2(p_surface.format, bs_data, p_surface.vertex_count, stride, vertex_size, normal_size, position_stride, normal_tangent_stride);
new_blend_shape_data.append_array(blend_shape);
} }
if (p_surface.format & ARRAY_FORMAT_TANGENT) {
tangent_size = sizeof(uint16_t) * 2;
}
int stride = p_surface.vertex_data.size() / p_surface.vertex_count;
int position_stride = vertex_size;
int normal_tangent_stride = normal_size + tangent_size;
ERR_FAIL_COND(p_surface.blend_shape_data.size() != new_blend_shape_data.size()); p_surface.vertex_data = _convert_surface_version_1_to_surface_version_2(p_surface.format, p_surface.vertex_data, p_surface.vertex_count, stride, vertex_size, normal_size, position_stride, normal_tangent_stride);
p_surface.blend_shape_data = new_blend_shape_data; if (p_surface.blend_shape_data.size() > 0) {
// The size of one blend shape.
int divisor = (vertex_size + normal_size + tangent_size) * p_surface.vertex_count;
ERR_FAIL_COND((p_surface.blend_shape_data.size() % divisor) != 0);
uint32_t blend_shape_count = p_surface.blend_shape_data.size() / divisor;
Vector<uint8_t> new_blend_shape_data;
for (uint32_t i = 0; i < blend_shape_count; i++) {
Vector<uint8_t> bs_data = p_surface.blend_shape_data.slice(i * divisor, (i + 1) * divisor);
Vector<uint8_t> blend_shape = _convert_surface_version_1_to_surface_version_2(p_surface.format, bs_data, p_surface.vertex_count, stride, vertex_size, normal_size, position_stride, normal_tangent_stride);
new_blend_shape_data.append_array(blend_shape);
}
ERR_FAIL_COND(p_surface.blend_shape_data.size() != new_blend_shape_data.size());
p_surface.blend_shape_data = new_blend_shape_data;
}
} }
} }
p_surface.format &= ~(ARRAY_FLAG_FORMAT_VERSION_MASK << ARRAY_FLAG_FORMAT_VERSION_SHIFT); p_surface.format &= ~(ARRAY_FLAG_FORMAT_VERSION_MASK << ARRAY_FLAG_FORMAT_VERSION_SHIFT);