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

Fix wrong type casting for octahedral tangents

This commit is contained in:
nklbdev 2023-06-30 17:17:37 +05:00
parent 46424488ed
commit c022f52f11
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
servers/rendering_server.cpp
View File

@ -402,9 +402,9 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint
const Vector3 *src = array.ptr(); const Vector3 *src = array.ptr();
for (int i = 0; i < p_vertex_array_len; i++) { for (int i = 0; i < p_vertex_array_len; i++) {
Vector2 res = src[i].octahedron_encode(); Vector2 res = src[i].octahedron_encode();
int16_t vector[2] = { uint16_t vector[2] = {
(int16_t)CLAMP(res.x * 65535, 0, 65535), (uint16_t)CLAMP(res.x * 65535, 0, 65535),
(int16_t)CLAMP(res.y * 65535, 0, 65535), (uint16_t)CLAMP(res.y * 65535, 0, 65535),
}; };
memcpy(&vw[p_offsets[ai] + i * p_vertex_stride], vector, 4); memcpy(&vw[p_offsets[ai] + i * p_vertex_stride], vector, 4);
@ -422,9 +422,9 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint
for (int i = 0; i < p_vertex_array_len; i++) { for (int i = 0; i < p_vertex_array_len; i++) {
const Vector3 src(src_ptr[i * 4 + 0], src_ptr[i * 4 + 1], src_ptr[i * 4 + 2]); const Vector3 src(src_ptr[i * 4 + 0], src_ptr[i * 4 + 1], src_ptr[i * 4 + 2]);
Vector2 res = src.octahedron_tangent_encode(src_ptr[i * 4 + 3]); Vector2 res = src.octahedron_tangent_encode(src_ptr[i * 4 + 3]);
int16_t vector[2] = { uint16_t vector[2] = {
(int16_t)CLAMP(res.x * 65535, 0, 65535), (uint16_t)CLAMP(res.x * 65535, 0, 65535),
(int16_t)CLAMP(res.y * 65535, 0, 65535), (uint16_t)CLAMP(res.y * 65535, 0, 65535),
}; };
memcpy(&vw[p_offsets[ai] + i * p_vertex_stride], vector, 4); memcpy(&vw[p_offsets[ai] + i * p_vertex_stride], vector, 4);
@ -437,9 +437,9 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint
for (int i = 0; i < p_vertex_array_len; i++) { for (int i = 0; i < p_vertex_array_len; i++) {
const Vector3 src(src_ptr[i * 4 + 0], src_ptr[i * 4 + 1], src_ptr[i * 4 + 2]); const Vector3 src(src_ptr[i * 4 + 0], src_ptr[i * 4 + 1], src_ptr[i * 4 + 2]);
Vector2 res = src.octahedron_tangent_encode(src_ptr[i * 4 + 3]); Vector2 res = src.octahedron_tangent_encode(src_ptr[i * 4 + 3]);
int16_t vector[2] = { uint16_t vector[2] = {
(int16_t)CLAMP(res.x * 65535, 0, 65535), (uint16_t)CLAMP(res.x * 65535, 0, 65535),
(int16_t)CLAMP(res.y * 65535, 0, 65535), (uint16_t)CLAMP(res.y * 65535, 0, 65535),
}; };
memcpy(&vw[p_offsets[ai] + i * p_vertex_stride], vector, 4); memcpy(&vw[p_offsets[ai] + i * p_vertex_stride], vector, 4);