Skip to content
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

loadWaterTextures: Fix loading high water diffuse textures #4093

Merged
merged 2 commits into from
Oct 15, 2024
Merged

loadWaterTextures: Fix loading high water diffuse textures #4093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e6fd93
loadWaterTextures: Fix loading high water diffuse textures
past-due Oct 14, 2024
55b0e13
Fix: Compress base water textures
past-due Oct 15, 2024
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
2 changes: 2 additions & 0 deletions data/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ if(WZ_ENABLE_BASIS_UNIVERSAL AND NOT WZ_CI_DISABLE_BASIS_COMPRESS_TEXTURES)

# Normal Terrain
file(GLOB TEXPAGES_TERRAIN
"${CMAKE_CURRENT_SOURCE_DIR}/base/texpages/page-80-water-1.png"
"${CMAKE_CURRENT_SOURCE_DIR}/base/texpages/page-81-water-2.png"
"${CMAKE_CURRENT_SOURCE_DIR}/base/texpages/page-82-yellow-sand-arizona.png"
"${CMAKE_CURRENT_SOURCE_DIR}/base/texpages/page-83-red-earth-arizona.png"
"${CMAKE_CURRENT_SOURCE_DIR}/base/texpages/page-84-tiles-arizona.png"
Expand Down
3 changes: 2 additions & 1 deletion src/terrain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,8 @@ void loadWaterTextures(int maxTerrainTextureSize, optional<int> maxTerrainAuxTex
return fullName;
};

// check water optional textures.push_back(optTexturenameToPath("page-80-water-1.png"));
// check water optional textures
waterTextureFilenames.push_back(optTexturenameToPath("page-80-water-1.png"));
waterTextureFilenames.push_back(optTexturenameToPath("page-81-water-2.png"));
waterTextureFilenames_nm.push_back(optTexturenameToPath("page-80-water-1_nm.png"));
waterTextureFilenames_nm.push_back(optTexturenameToPath("page-81-water-2_nm.png"));
Expand Down
Loading