Skip to content

Use Vector4 storage for tangents in SurfaceTool for consistency #119145

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

Merged
Repiteo merged 1 commit into from
Jun 19, 2026
Merged

Use Vector4 storage for tangents in SurfaceTool for consistency #119145

Show file tree
Hide file tree
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
5 changes: 1 addition & 4 deletions scene/resources/3d/importer_mesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1482,10 +1482,7 @@ Error ImporterMesh::lightmap_unwrap_cached(const Transform3D &p_base_transform,
surfaces_tools[surface]->set_normal(v.normal);
}
if (lightmap_surfaces[surface].format & Mesh::ARRAY_FORMAT_TANGENT) {
Plane t;
t.normal = v.tangent;
t.d = v.binormal.dot(v.normal.cross(v.tangent)) < 0 ? -1 : 1;
surfaces_tools[surface]->set_tangent(t);
surfaces_tools[surface]->set_tangent(Plane(v.tangent.x, v.tangent.y, v.tangent.z, v.tangent.w));
}
if (lightmap_surfaces[surface].format & Mesh::ARRAY_FORMAT_BONES) {
surfaces_tools[surface]->set_bones(v.bones);
Expand Down
5 changes: 1 addition & 4 deletions scene/resources/mesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2235,10 +2235,7 @@ Error ArrayMesh::lightmap_unwrap_cached(const Transform3D &p_base_transform, flo
surfaces_tools[surface]->set_normal(v.normal);
}
if (lightmap_surfaces[surface].format & ARRAY_FORMAT_TANGENT) {
Plane t;
t.normal = v.tangent;
t.d = v.binormal.dot(v.normal.cross(v.tangent)) < 0 ? -1 : 1;
surfaces_tools[surface]->set_tangent(t);
surfaces_tools[surface]->set_tangent(Plane(v.tangent.x, v.tangent.y, v.tangent.z, v.tangent.w));
}
if (lightmap_surfaces[surface].format & ARRAY_FORMAT_BONES) {
surfaces_tools[surface]->set_bones(v.bones);
Expand Down
29 changes: 9 additions & 20 deletions scene/resources/surface_tool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,6 @@ bool SurfaceTool::Vertex::operator==(const Vertex &p_vertex) const {
return false;
}

if (binormal != p_vertex.binormal) {
return false;
}

if (tangent != p_vertex.tangent) {
return false;
}
Expand Down Expand Up @@ -235,8 +231,7 @@ void SurfaceTool::add_vertex(const Vector3 &p_vertex) {
vtx.uv2 = last_uv2;
vtx.weights = last_weights;
vtx.bones = last_bones;
vtx.tangent = last_tangent.normal;
vtx.binormal = last_normal.cross(last_tangent.normal).normalized() * last_tangent.d;
vtx.tangent = last_tangent;
vtx.smooth_group = last_smooth_group;

for (int i = 0; i < RSE::ARRAY_CUSTOM_COUNT; i++) {
Expand Down Expand Up @@ -317,7 +312,7 @@ void SurfaceTool::set_tangent(const Plane &p_tangent) {
ERR_FAIL_COND(!first && !(format & Mesh::ARRAY_FORMAT_TANGENT));

format |= Mesh::ARRAY_FORMAT_TANGENT;
last_tangent = p_tangent;
last_tangent = Vector4(p_tangent.normal.x, p_tangent.normal.y, p_tangent.normal.z, p_tangent.d);
}

void SurfaceTool::set_uv(const Vector2 &p_uv) {
Expand Down Expand Up @@ -483,10 +478,7 @@ Array SurfaceTool::commit_to_arrays() {
w[idx * 4 + 0] = v.tangent.x;
w[idx * 4 + 1] = v.tangent.y;
w[idx * 4 + 2] = v.tangent.z;

//float d = v.tangent.dot(v.binormal,v.normal);
float d = v.binormal.dot(v.normal.cross(v.tangent));
w[idx * 4 + 3] = d < 0 ? -1 : 1;
w[idx * 4 + 3] = v.tangent.w;
}

a[i] = array;
Expand Down Expand Up @@ -882,9 +874,7 @@ void SurfaceTool::create_vertex_array_from_arrays(const Array &p_arrays, LocalVe
v.normal = narr[i];
}
if (lformat & RSE::ARRAY_FORMAT_TANGENT) {
v.tangent = Vector3(tarr[i * 4 + 0], tarr[i * 4 + 1], tarr[i * 4 + 2]);
float d = tarr[i * 4 + 3];
v.binormal = v.normal.cross(v.tangent).normalized() * d;
v.tangent = Vector4(tarr[i * 4 + 0], tarr[i * 4 + 1], tarr[i * 4 + 2], tarr[i * 4 + 3]);
}
if (lformat & RSE::ARRAY_FORMAT_COLOR) {
v.color = carr[i];
Expand Down Expand Up @@ -1039,15 +1029,16 @@ void SurfaceTool::append_from(const Ref<Mesh> &p_existing, int p_surface, const
}
}
int vfrom = vertex_array.size();
float flip = p_xform.basis.determinant() < 0 ? -1.0f : 1.0f;

for (Vertex &v : nvertices) {
v.vertex = p_xform.xform(v.vertex);
if (nformat & RSE::ARRAY_FORMAT_NORMAL) {
v.normal = p_xform.basis.xform(v.normal);
}
if (nformat & RSE::ARRAY_FORMAT_TANGENT) {
v.tangent = p_xform.basis.xform(v.tangent);
v.binormal = p_xform.basis.xform(v.binormal);
Vector3 tangent = p_xform.basis.xform(Vector3(v.tangent.x, v.tangent.y, v.tangent.z));
v.tangent = Vector4(tangent.x, tangent.y, tangent.z, v.tangent.w * flip);
}

vertex_array.push_back(v);
Expand Down Expand Up @@ -1148,8 +1139,7 @@ void SurfaceTool::mikktSetTSpaceDefault(const SMikkTSpaceContext *pContext, cons
}

if (vtx != nullptr) {
vtx->tangent = Vector3(fvTangent[0], fvTangent[1], fvTangent[2]);
vtx->binormal = Vector3(-fvBiTangent[0], -fvBiTangent[1], -fvBiTangent[2]); // for some reason these are reversed, something with the coordinate system in Godot
vtx->tangent = Vector4(fvTangent[0], fvTangent[1], fvTangent[2], bIsOrientationPreserving ? 1.0f : -1.0f);
}
}

Expand All @@ -1172,8 +1162,7 @@ void SurfaceTool::generate_tangents() {
TangentGenerationContextUserData triangle_data;
triangle_data.vertices = &vertex_array;
for (Vertex &vertex : vertex_array) {
vertex.binormal = Vector3();
vertex.tangent = Vector3();
vertex.tangent = Vector4();
}
triangle_data.indices = &index_array;
msc.m_pUserData = &triangle_data;
Expand Down
8 changes: 4 additions & 4 deletions scene/resources/surface_tool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

#pragma once

#include "core/math/vector4.h"
#include "core/templates/local_vector.h"
#include "scene/resources/mesh.h"
#include "servers/rendering/rendering_server_enums.h"
Expand All @@ -49,9 +50,8 @@ class SurfaceTool : public RefCounted {
uint32_t smooth_group = 0; // Must be first.

Color color;
Vector3 normal; // normal, binormal, tangent.
Vector3 binormal;
Vector3 tangent;
Vector3 normal;
Vector4 tangent; // xyz tangent, w orientation.
Vector2 uv;
Vector2 uv2;
Color custom[RSE::ARRAY_CUSTOM_COUNT];
Expand Down Expand Up @@ -164,7 +164,7 @@ class SurfaceTool : public RefCounted {
Vector2 last_uv2;
Vector<int> last_bones;
Vector<float> last_weights;
Plane last_tangent;
Vector4 last_tangent;
uint32_t last_smooth_group = 0;

SkinWeightCount skin_weights = SKIN_4_WEIGHTS;
Expand Down
Loading