Skip to content

Preserve imported geometry normals when using Vertex Color lighting #1197

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

Open
Copilot wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Preserve imported geometry normals when using Vertex Color lighting #1197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7822245
Initial plan
Copilot Apr 19, 2026
9cfdaaa
fix: preserve imported geometry split normals during vertex merging
Copilot Apr 19, 2026
52adaeb
refine: make imported geometry vertex merge comparison explicit
Copilot Apr 19, 2026
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
10 changes: 8 additions & 2 deletions TombLib/TombLib/LevelData/Compilers/Rooms.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,8 @@ private tr_room BuildRoom(Room room)
},
Lighting1 = 0,
Lighting2 = 0,
Attributes = 0
Attributes = 0,
Normal = normal
};

// Pack the light according to chosen lighting model
Expand Down Expand Up @@ -709,7 +710,12 @@ private tr_room BuildRoom(Room room)
}
else
{
existingIndex = roomVertices.IndexOf(v => v.Position == trVertex.Position && v.Color == trVertex.Color);
existingIndex = roomVertices.IndexOf(v =>
v.Position == trVertex.Position &&
v.Lighting1 == trVertex.Lighting1 &&
v.Attributes == trVertex.Attributes &&
v.Lighting2 == trVertex.Lighting2 &&
v.Normal == trVertex.Normal);
if (existingIndex == -1)
{
existingIndex = roomVertices.Count;
Expand Down
1 change: 1 addition & 0 deletions TombLib/TombLib/LevelData/Compilers/TombEngine/Rooms.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,7 @@ private TombEngineRoom BuildRoom(Room room)
var span = CollectionsMarshal.AsSpan(roomVertices);
for (int i = 0; (uint)i < (uint)span.Length; i++)
if (span[i].Position == trVertex.Position &&
span[i].Normal == trVertex.Normal &&
span[i].Color == trVertex.Color &&
span[i].DoubleSided == trVertex.DoubleSided)
{
Expand Down
12 changes: 10 additions & 2 deletions TombLib/TombLib/LevelData/Room.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1870,6 +1870,8 @@ public void GetGeometryStatistics(out int vertices, out int faces)

// Apply the transform to the vertex
var position = MathC.HomogenousTransform(vertex.Position, worldTransform);
var normal = MathC.HomogenousTransform(vertex.Normal, normalTransform);
normal = Vector3.Normalize(normal);
var trVertex = new tr_room_vertex
{
Position = new tr_vertex
Expand All @@ -1880,7 +1882,8 @@ public void GetGeometryStatistics(out int vertices, out int faces)
},
Lighting1 = 0,
Lighting2 = 0,
Attributes = 0
Attributes = 0,
Normal = normal
};

// HACK: Find a vertex with same coordinates and merge with it.
Expand All @@ -1896,7 +1899,12 @@ public void GetGeometryStatistics(out int vertices, out int faces)
}
else
{
existingIndex = roomVertices.IndexOf(v => v.Position == trVertex.Position && v.Color == trVertex.Color);
existingIndex = roomVertices.IndexOf(v =>
v.Position == trVertex.Position &&
v.Lighting1 == trVertex.Lighting1 &&
v.Attributes == trVertex.Attributes &&
v.Lighting2 == trVertex.Lighting2 &&
v.Normal == trVertex.Normal);
if (existingIndex == -1)
{
existingIndex = roomVertices.Count;
Expand Down