Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent division by 0 when creating vertices of a PrismMesh #86931

Merged
merged 1 commit into from
Jan 11, 2024
Merged

Prevent division by 0 when creating vertices of a PrismMesh #86931

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions scene/resources/primitive_meshes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1478,15 +1478,15 @@ void PrismMesh::_create_mesh_array(Array &p_arr) const {
thisrow = point;
prevrow = 0;
for (j = 0; j <= (subdivide_h + 1); j++) {
float scale = (y - start_pos.y) / size.y;
float scale = j / (subdivide_h + 1.0);
float scaled_size_x = size.x * scale;
float start_x = start_pos.x + (1.0 - scale) * size.x * left_to_right;
float offset_front = (1.0 - scale) * onethird * left_to_right;
float offset_back = (1.0 - scale) * onethird * (1.0 - left_to_right);

float v = j;
float v2 = j / (subdivide_h + 1.0);
v /= (2.0 * (subdivide_h + 1.0));
float v2 = scale;
v /= 2.0 * (subdivide_h + 1.0);

x = 0.0;
for (i = 0; i <= (subdivide_w + 1); i++) {
Expand Down Expand Up @@ -1568,16 +1568,16 @@ void PrismMesh::_create_mesh_array(Array &p_arr) const {
thisrow = point;
prevrow = 0;
for (j = 0; j <= (subdivide_h + 1); j++) {
float v = j;
float v2 = j / (subdivide_h + 1.0);
v /= (2.0 * (subdivide_h + 1.0));

float left, right;
float scale = (y - start_pos.y) / size.y;
float scale = j / (subdivide_h + 1.0);

left = start_pos.x + (size.x * (1.0 - scale) * left_to_right);
right = left + (size.x * scale);

float v = j;
float v2 = scale;
v /= 2.0 * (subdivide_h + 1.0);

z = start_pos.z;
for (i = 0; i <= (subdivide_d + 1); i++) {
float u = i;
Expand Down
Loading