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

Ensure r_aabb is always used when creating surfaces through the RenderingServer

This commit is contained in:
clayjohn 2023-10-23 14:09:18 +02:00
parent c21c2706ad
commit 3c17f556ad
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
servers/rendering_server.cpp
View File

@ -441,16 +441,15 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
const Vector3 *src = array.ptr(); const Vector3 *src = array.ptr();
// Setting vertices means regenerating the AABB. r_aabb = AABB();
AABB aabb;
if (p_format & ARRAY_FLAG_COMPRESS_ATTRIBUTES) { if (p_format & ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
// First we need to generate the AABB for the entire surface. // First we need to generate the AABB for the entire surface.
for (int i = 0; i < p_vertex_array_len; i++) { for (int i = 0; i < p_vertex_array_len; i++) {
if (i == 0) { if (i == 0) {
aabb = AABB(src[i], SMALL_VEC3); r_aabb = AABB(src[i], SMALL_VEC3);
} else { } else {
aabb.expand_to(src[i]); r_aabb.expand_to(src[i]);
} }
} }
@ -459,7 +458,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
if (!using_normals_tangents) { if (!using_normals_tangents) {
// Early out if we are only setting vertex positions. // Early out if we are only setting vertex positions.
for (int i = 0; i < p_vertex_array_len; i++) { for (int i = 0; i < p_vertex_array_len; i++) {
Vector3 pos = (src[i] - aabb.position) / aabb.size; Vector3 pos = (src[i] - r_aabb.position) / r_aabb.size;
uint16_t vector[4] = { uint16_t vector[4] = {
(uint16_t)CLAMP(pos.x * 65535, 0, 65535), (uint16_t)CLAMP(pos.x * 65535, 0, 65535),
(uint16_t)CLAMP(pos.y * 65535, 0, 65535), (uint16_t)CLAMP(pos.y * 65535, 0, 65535),
@ -507,7 +506,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
// Store vertex position + angle. // Store vertex position + angle.
{ {
Vector3 pos = (src[i] - aabb.position) / aabb.size; Vector3 pos = (src[i] - r_aabb.position) / r_aabb.size;
uint16_t vector[4] = { uint16_t vector[4] = {
(uint16_t)CLAMP(pos.x * 65535, 0, 65535), (uint16_t)CLAMP(pos.x * 65535, 0, 65535),
(uint16_t)CLAMP(pos.y * 65535, 0, 65535), (uint16_t)CLAMP(pos.y * 65535, 0, 65535),
@ -543,7 +542,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
// Store vertex position + angle. // Store vertex position + angle.
{ {
Vector3 pos = (src[i] - aabb.position) / aabb.size; Vector3 pos = (src[i] - r_aabb.position) / r_aabb.size;
uint16_t vector[4] = { uint16_t vector[4] = {
(uint16_t)CLAMP(pos.x * 65535, 0, 65535), (uint16_t)CLAMP(pos.x * 65535, 0, 65535),
(uint16_t)CLAMP(pos.y * 65535, 0, 65535), (uint16_t)CLAMP(pos.y * 65535, 0, 65535),
@ -562,14 +561,12 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
memcpy(&vw[p_offsets[ai] + i * p_vertex_stride], vector, sizeof(float) * 3); memcpy(&vw[p_offsets[ai] + i * p_vertex_stride], vector, sizeof(float) * 3);
if (i == 0) { if (i == 0) {
aabb = AABB(src[i], SMALL_VEC3); r_aabb = AABB(src[i], SMALL_VEC3);
} else { } else {
aabb.expand_to(src[i]); r_aabb.expand_to(src[i]);
} }
} }
} }
r_aabb = aabb;
} }
} break; } break;