noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #84576 from clayjohn/mesh-tangents-always

Browse Source 
Create tangent array if mesh created without tangents
This commit is contained in:
Rémi Verschelde
2023-11-08 19:09:36 +01:00
parent 7efe2e3d82 031f221b9d
commit f0c52c0e35
2 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scene/resources/immediate_mesh.cpp
+10 -3
View File
@@ -166,7 +166,7 @@ void ImmediateMesh::surface_end() {
normal_tangent_stride += sizeof(uint32_t);
}
uint32_t tangent_offset = 0;
if (uses_tangents) {
if (uses_tangents || uses_normals) {
format |= ARRAY_FORMAT_TANGENT;
tangent_offset = vertex_stride * vertices.size() + normal_tangent_stride;
normal_tangent_stride += sizeof(uint32_t);
@@ -202,9 +202,16 @@ void ImmediateMesh::surface_end() {
*normal = value;
}
if (uses_tangents) {
if (uses_tangents || uses_normals) {
uint32_t *tangent = (uint32_t *)&surface_vertex_ptr[i * normal_tangent_stride + tangent_offset];
Vector2 t = tangents[i].normal.octahedron_tangent_encode(tangents[i].d);
Vector2 t;
if (uses_tangents) {
t = tangents[i].normal.octahedron_tangent_encode(tangents[i].d);
} else {
Vector3 tan = Vector3(0.0, 1.0, 0.0).cross(normals[i].normalized());
t = tan.octahedron_tangent_encode(1.0);
}
uint32_t value = 0;
value |= (uint16_t)CLAMP(t.x * 65535, 0, 65535);
value |= (uint16_t)CLAMP(t.y * 65535, 0, 65535) << 16;