Skip to content

Consolidate textures #1234

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
MontyTRC89 merged 10 commits into from
Jul 2, 2026
Merged

Consolidate textures #1234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c5dcebe
WIP
Lwmte May 24, 2026
ce1b49e
Fixed dangling memory issues, added changelog
Lwmte May 29, 2026
8bc3c23
Update Wad2.cs
Lwmte May 29, 2026
91de2da
Address Copilot comments
Lwmte May 30, 2026
6ddeab6
Merge branch 'develop' into consolidate_textures
MontyTRC89 Jun 18, 2026
170e73d
Consolidate textures across all selected objects into shared pages
MontyTRC89 Jun 18, 2026
bc17a8d
WadTool: opt-in auto-consolidate textures when copying objects
MontyTRC89 Jun 19, 2026
3001ec9
TombEditor.Tests: fix FlybyFrameState.FromDegrees call with new DOF p…
MontyTRC89 Jun 19, 2026
baf6162
Adjust dialogue box
TrainWrack Jul 2, 2026
607c19e
Merge branch 'develop' into consolidate_textures
MontyTRC89 Jul 2, 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
1 change: 1 addition & 0 deletions Installer/Changes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Tomb Editor:
* Fixed exception while opening texture lists in Remap Texture dialog.

WadTool:
* Added an option to consolidate textures for an object into a single set of texture pages.
* Added mesh name display in the skeleton editor.
* Added missing TR2 henchman death sound (ID 838) and appropriate TR2 -> TEN conversion.
* Fixed exception when trying to open an object without meshes in the mesh editor.
Expand Down
191 changes: 136 additions & 55 deletions TombLib/TombLib/Wad/Wad2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,84 +267,165 @@ public void MergeSimilarTextures(WadMesh mesh)
new FileFormat("Tomb Raider Chronicles level", "trc")
};

public static List<WadTexture> PackTexturesForExport(Dictionary<Hash, WadTexture.AtlasReference> texturesToPack, int padding)
private class PackedTexturePlacement
{
public WadTexture.AtlasReference TextureReference { get; set; }
public VectorInt2 Position { get; set; }
public int PaddingX { get; set; }
public int PaddingY { get; set; }
}

private class PackedTexturePage
{
public int Scale { get; set; }
public List<PackedTexturePlacement> Placements { get; } = new List<PackedTexturePlacement>();
}

public static List<WadTexture> PackTexturesForExport(Dictionary<Hash, WadTexture.AtlasReference> texturesToPack, int padding, int texturePageSize)
{
var textures = new List<WadTexture>();
var scale = 256;
var scale = Math.Clamp(texturePageSize, 1, 2048);

var packer = new RectPackerTree(new TombLib.VectorInt2(scale, scale));
var atlas = new WadTexture(ImageC.CreateNew(scale, scale));
atlas.Image.Fill(new ColorC(0, 0, 0, 0));
textures.Add(atlas);
var remainingTextures = texturesToPack.Values.ToList();

for (int i = 0; i < texturesToPack.Count; i++)
while (remainingTextures.Count > 0)
{
var textureRef = texturesToPack.ElementAt(i).Value;
var page = PackTexturePage(remainingTextures, padding, scale);
if (page == null || page.Placements.Count == 0)
throw new InvalidOperationException("Unable to pack textures into the requested export page size.");

var atlasImage = ImageC.CreateNew(page.Scale, page.Scale);
atlasImage.Fill(new ColorC(0, 0, 0, 0));

foreach (var placement in page.Placements)
{
DrawTextureToAtlas(atlasImage, placement);
placement.TextureReference.Position = new VectorInt2(placement.Position.X + placement.PaddingX, placement.Position.Y + placement.PaddingY);
placement.TextureReference.Atlas = textures.Count;
}

int paddingX = padding;
if (textureRef.Texture.Image.Width + 2 * paddingX >= scale)
paddingX = (int)Math.Floor((float)(scale - textureRef.Texture.Image.Width) / 2);
int paddingY = padding;
if (textureRef.Texture.Image.Height + 2 * paddingY >= scale)
paddingY = (int)Math.Floor((float)(scale - textureRef.Texture.Image.Height) / 2);
var atlas = new WadTexture(atlasImage);
textures.Add(atlas);
remainingTextures.RemoveRange(0, page.Placements.Count);
}

VectorInt2 size = textureRef.Texture.Image.Size + new VectorInt2(paddingX * 2, paddingY * 2);
return textures;
}

private static PackedTexturePage PackTexturePage(IReadOnlyList<WadTexture.AtlasReference> texturesToPack, int padding, int maxScale)
{
PackedTexturePage bestPage = null;

foreach (var candidateScale in GetCandidateScales(maxScale))
{
var candidatePage = TryPackTexturePage(texturesToPack, padding, candidateScale);
if (candidatePage.Placements.Count == 0)
continue;

if (bestPage == null ||
candidatePage.Placements.Count > bestPage.Placements.Count ||
(candidatePage.Placements.Count == bestPage.Placements.Count && candidatePage.Scale < bestPage.Scale))
bestPage = candidatePage;
}

return bestPage;
}

private static PackedTexturePage TryPackTexturePage(IReadOnlyList<WadTexture.AtlasReference> texturesToPack, int padding, int scale)
{
var page = new PackedTexturePage { Scale = scale };
var packer = new RectPackerTree(new VectorInt2(scale, scale));

for (int i = 0; i < texturesToPack.Count; i++)
{
var textureRef = texturesToPack[i];
var size = GetPaddedTextureSize(textureRef.Texture, padding, scale, out int paddingX, out int paddingY);
var result = packer.TryAdd(size);

if (!result.HasValue)
break;

page.Placements.Add(new PackedTexturePlacement
{
atlas = new WadTexture(ImageC.CreateNew(scale, scale));
atlas.Image.Fill(new ColorC(0, 0, 0, 0));
textures.Add(atlas);
packer = new RectPackerTree(new TombLib.VectorInt2(scale, scale));
result = packer.TryAdd(size);
}
TextureReference = textureRef,
Position = result.Value,
PaddingX = paddingX,
PaddingY = paddingY
});
}

// West
for (int p = 0; p < paddingX; p++)
atlas.Image.CopyFrom(result.Value.X + p, result.Value.Y + paddingY, textureRef.Texture.Image, 0, 0, 1, textureRef.Texture.Image.Height);
return page;
}

// East
for (int p = 0; p < paddingX; p++)
atlas.Image.CopyFrom(result.Value.X + paddingX + textureRef.Texture.Image.Width + p, result.Value.Y + paddingY, textureRef.Texture.Image, textureRef.Texture.Image.Width - 1, 0, 1, textureRef.Texture.Image.Height);
private static VectorInt2 GetPaddedTextureSize(WadTexture texture, int padding, int scale, out int paddingX, out int paddingY)
{
paddingX = padding;
if (texture.Image.Width + 2 * paddingX >= scale)
paddingX = Math.Max(0, (int)Math.Floor((float)(scale - texture.Image.Width) / 2));

// North
for (int p = 0; p < paddingY; p++)
atlas.Image.CopyFrom(result.Value.X + paddingX, result.Value.Y + p, textureRef.Texture.Image, 0, 0, textureRef.Texture.Image.Width, 1);
paddingY = padding;
if (texture.Image.Height + 2 * paddingY >= scale)
paddingY = Math.Max(0, (int)Math.Floor((float)(scale - texture.Image.Height) / 2));

// South
for (int p = 0; p < paddingY; p++)
atlas.Image.CopyFrom(result.Value.X + paddingX, result.Value.Y + paddingY + textureRef.Texture.Image.Height + p, textureRef.Texture.Image, 0, textureRef.Texture.Image.Height - 1, textureRef.Texture.Image.Width, 1);
return texture.Image.Size + new VectorInt2(paddingX * 2, paddingY * 2);
}

// Corners
var color = textureRef.Texture.Image.GetPixel(0, 0);
for (int px = 0; px < paddingX; px++)
for (int py = 0; py < paddingY; py++)
atlas.Image.SetPixel(result.Value.X + px, result.Value.Y + py, color);
private static IEnumerable<int> GetCandidateScales(int maxScale)
{
yield return maxScale;

color = textureRef.Texture.Image.GetPixel(textureRef.Texture.Image.Width - 1, 0);
for (int px = 0; px < paddingX; px++)
for (int py = 0; py < paddingY; py++)
atlas.Image.SetPixel(result.Value.X + textureRef.Texture.Image.Width + paddingX + px, result.Value.Y + py, color);
for (int candidateScale = GetPreviousPowerOfTwo(maxScale); candidateScale > 0; candidateScale /= 2)
if (candidateScale != maxScale)
yield return candidateScale;
}

color = textureRef.Texture.Image.GetPixel(textureRef.Texture.Image.Width - 1, textureRef.Texture.Image.Height - 1);
for (int px = 0; px < paddingX; px++)
for (int py = 0; py < paddingY; py++)
atlas.Image.SetPixel(result.Value.X + textureRef.Texture.Image.Width + paddingX + px, result.Value.Y + textureRef.Texture.Image.Height + paddingY + py, color);
private static int GetPreviousPowerOfTwo(int value)
{
int result = 1;

color = textureRef.Texture.Image.GetPixel(0, textureRef.Texture.Image.Height - 1);
for (int px = 0; px < paddingX; px++)
for (int py = 0; py < paddingY; py++)
atlas.Image.SetPixel(result.Value.X + px, result.Value.Y + textureRef.Texture.Image.Height + paddingY + py, color);
while (result <= value / 2)
result *= 2;

atlas.Image.CopyFrom(result.Value.X + paddingX, result.Value.Y + paddingY, textureRef.Texture.Image);
return result;
}

textureRef.Position = new TombLib.VectorInt2(result.Value.X + paddingX, result.Value.Y + paddingY);
textureRef.Atlas = textures.Count - 1;
}
private static void DrawTextureToAtlas(ImageC atlasImage, PackedTexturePlacement placement)
{
var texture = placement.TextureReference.Texture;

return textures;
for (int p = 0; p < placement.PaddingX; p++)
atlasImage.CopyFrom(placement.Position.X + p, placement.Position.Y + placement.PaddingY, texture.Image, 0, 0, 1, texture.Image.Height);

for (int p = 0; p < placement.PaddingX; p++)
atlasImage.CopyFrom(placement.Position.X + placement.PaddingX + texture.Image.Width + p, placement.Position.Y + placement.PaddingY, texture.Image, texture.Image.Width - 1, 0, 1, texture.Image.Height);

for (int p = 0; p < placement.PaddingY; p++)
atlasImage.CopyFrom(placement.Position.X + placement.PaddingX, placement.Position.Y + p, texture.Image, 0, 0, texture.Image.Width, 1);

for (int p = 0; p < placement.PaddingY; p++)
atlasImage.CopyFrom(placement.Position.X + placement.PaddingX, placement.Position.Y + placement.PaddingY + texture.Image.Height + p, texture.Image, 0, texture.Image.Height - 1, texture.Image.Width, 1);

var color = texture.Image.GetPixel(0, 0);
for (int px = 0; px < placement.PaddingX; px++)
for (int py = 0; py < placement.PaddingY; py++)
atlasImage.SetPixel(placement.Position.X + px, placement.Position.Y + py, color);

color = texture.Image.GetPixel(texture.Image.Width - 1, 0);
for (int px = 0; px < placement.PaddingX; px++)
for (int py = 0; py < placement.PaddingY; py++)
atlasImage.SetPixel(placement.Position.X + texture.Image.Width + placement.PaddingX + px, placement.Position.Y + py, color);

color = texture.Image.GetPixel(texture.Image.Width - 1, texture.Image.Height - 1);
for (int px = 0; px < placement.PaddingX; px++)
for (int py = 0; py < placement.PaddingY; py++)
atlasImage.SetPixel(placement.Position.X + texture.Image.Width + placement.PaddingX + px, placement.Position.Y + texture.Image.Height + placement.PaddingY + py, color);

color = texture.Image.GetPixel(0, texture.Image.Height - 1);
for (int px = 0; px < placement.PaddingX; px++)
for (int py = 0; py < placement.PaddingY; py++)
atlasImage.SetPixel(placement.Position.X + px, placement.Position.Y + texture.Image.Height + placement.PaddingY + py, color);

atlasImage.CopyFrom(placement.Position.X + placement.PaddingX, placement.Position.Y + placement.PaddingY, texture.Image);
}
}
}
Loading