Skip to content

Align USD texture offset on even rows with s25client #48

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

Draft
morganchristiansson wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Align USD texture offset on even rows with s25client #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
822db7d
Align USD texture offset on even rows with s25client
morganchristiansson Jun 19, 2026
c0484c4
Update
Jun 29, 2026
492d3eb
Fix terrain triangles
Jun 29, 2026
b047f40
Align USD texture and border reads with s25client I/O shift
Jun 29, 2026
30021b8
Fix resources & tools
Jun 29, 2026
7320c45
Fix vertical wrap triangle
Jun 29, 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
17 changes: 15 additions & 2 deletions CIO/CFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,10 +570,19 @@ bobMAP* CFile::read_wld(FILE* fp)
// go to texture information for UpSideDown-Triangles
fseek(fp, 16, SEEK_CUR);

// Read usdTexture: file → memory (align with s25client coordinate system).
// s25client MapLoader::InitNodes:
// unsigned char t2 = map.getMapDataAt(MapLayer::Terrain2, pt.x, pt.y);
// node.t2 = getTerrainFromS2(t2 & 0x3F); // stored at same visual (pt.x, pt.y) as t1
// s25edit WLD file stores USD offsets that need shifting to match client:
// even rows: memory(i, j) = file(i-1, j)
for(int j = 0; j < myMap->height; j++)
{
for(int i = 0; i < myMap->width; i++)
CHECK_READ(libendian::read(&myMap->getVertex(i, j).usdTexture, 1, fp));
{
const int dest_i = (i + !(j & 1)) % myMap->width;
CHECK_READ(libendian::read(&myMap->getVertex(dest_i, j).usdTexture, 1, fp));
}
}

// go to road data
Expand Down Expand Up @@ -833,10 +842,14 @@ bool CFile::save_wld(FILE* fp, void* data)
// go to texture information for UpSideDown-Triangles
libendian::write(map_data_header, fp);

// Write usdTexture: inverse of read shift.
for(int j = 0; j < myMap->height; j++)
{
for(int i = 0; i < myMap->width; i++)
libendian::write(&myMap->getVertex(i, j).usdTexture, 1, fp);
{
const int src_i = (i + !(j & 1)) % myMap->width;
libendian::write(&myMap->getVertex(src_i, j).usdTexture, 1, fp);
}
}

// go to road data
Expand Down
Loading