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

Merge pull request #23760 from BastiaanOlij/fix_tangent_direction

Browse Source 
Fixing tangent and binormal logic
This commit is contained in:
Rémi Verschelde
2018-11-20 14:13:36 +01:00
committed by GitHub
parent a2a5793e13 bcef4b8dc6
commit 477e89a8a2
6 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/csg/csg_shape.cpp
View File

@@ -201,10 +201,9 @@ void CSGShape::mikktSetTSpaceBasic(const SMikkTSpaceContext *pContext, const flo
int i = (iFace * 3 + iVert) * 4;
// Godot seems to want the tangent flipped because our handedness is reversed..
surface.tansw[i++] = -fvTangent[0];
surface.tansw[i++] = -fvTangent[1];
surface.tansw[i++] = -fvTangent[2];
surface.tansw[i++] = fvTangent[0];
surface.tansw[i++] = fvTangent[1];
surface.tansw[i++] = fvTangent[2];
surface.tansw[i++] = fSign;
}
@@ -219,11 +218,10 @@ void CSGShape::mikktSetTSpaceDefault(const SMikkTSpaceContext *pContext, const f
Vector3 bitangent = Vector3(fvBiTangent[0], fvBiTangent[1], fvBiTangent[2]);
float d = bitangent.dot(normal.cross(tangent));
// Godot seems to want the tangent flipped because our handedness is reversed..
i *= 4;
surface.tansw[i++] = -tangent.x;
surface.tansw[i++] = -tangent.y;
surface.tansw[i++] = -tangent.z;
surface.tansw[i++] = tangent.x;
surface.tansw[i++] = tangent.y;
surface.tansw[i++] = tangent.z;
surface.tansw[i++] = d < 0 ? -1 : 1;
}