Skip to content

unify(texture): Merge W3DWater and WW3D2 texture code #1989

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
xezon merged 2 commits into from
Dec 15, 2025
Merged

unify(texture): Merge W3DWater and WW3D2 texture code #1989

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
dfb477c
unify(texture): Merge W3DWater and WW3D2 texture code (#1989)
xezon Dec 13, 2025
96d463e
unify(texture): Move W3DWater, W3DLaserDraw and WW3D2 texture related…
xezon Dec 14, 2025
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
4 changes: 2 additions & 2 deletions Core/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ set(GAMEENGINE_SRC
# Include/GameClient/TerrainVisual.h
Include/GameClient/VideoPlayer.h
Include/GameClient/View.h
# Include/GameClient/Water.h
Include/GameClient/Water.h
# Include/GameClient/WindowLayout.h
Include/GameClient/WindowVideoManager.h
# Include/GameClient/WindowXlat.h
Expand Down Expand Up @@ -835,7 +835,7 @@ set(GAMEENGINE_SRC
Source/GameClient/VideoPlayer.cpp
Source/GameClient/VideoStream.cpp
Source/GameClient/View.cpp
# Source/GameClient/Water.cpp
Source/GameClient/Water.cpp
# Source/GameLogic/AI/AI.cpp
# Source/GameLogic/AI/AIDock.cpp
# Source/GameLogic/AI/AIGroup.cpp
Expand Down
0 ...ode/GameEngine/Include/GameClient/Water.h → Core/GameEngine/Include/GameClient/Water.h
View file
Open in desktop
File renamed without changes.
0 ...de/GameEngine/Source/GameClient/Water.cpp → Core/GameEngine/Source/GameClient/Water.cpp
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions Core/GameEngineDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ set(GAMEENGINEDEVICE_SRC
# Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
# Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h
# Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h
# Include/W3DDevice/GameClient/Module/W3DLaserDraw.h
Include/W3DDevice/GameClient/Module/W3DLaserDraw.h
# Include/W3DDevice/GameClient/Module/W3DModelDraw.h
# Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h
# Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h
Expand Down Expand Up @@ -73,8 +73,8 @@ set(GAMEENGINEDEVICE_SRC
Include/W3DDevice/GameClient/W3DVideoBuffer.h
Include/W3DDevice/GameClient/W3DView.h
# Include/W3DDevice/GameClient/W3DVolumetricShadow.h
# Include/W3DDevice/GameClient/W3DWater.h
# Include/W3DDevice/GameClient/W3DWaterTracks.h
Include/W3DDevice/GameClient/W3DWater.h
Include/W3DDevice/GameClient/W3DWaterTracks.h
# Include/W3DDevice/GameClient/W3DWaypointBuffer.h
# Include/W3DDevice/GameClient/W3DWebBrowser.h
# Include/W3DDevice/GameClient/WorldHeightMap.h
Expand Down Expand Up @@ -102,7 +102,7 @@ set(GAMEENGINEDEVICE_SRC
# Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordAircraftDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTankDraw.cpp
Expand Down Expand Up @@ -176,8 +176,8 @@ set(GAMEENGINEDEVICE_SRC
Source/W3DDevice/GameClient/W3DView.cpp
# Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
# Source/W3DDevice/GameClient/W3DWebBrowser.cpp
# Source/W3DDevice/GameClient/Water/W3DWater.cpp
# Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
Source/W3DDevice/GameClient/Water/W3DWater.cpp
Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
# Source/W3DDevice/GameClient/WorldHeightMap.cpp
# Source/W3DDevice/GameLogic/W3DGameLogic.cpp
# Source/W3DDevice/GameLogic/W3DGhostObject.cpp
Expand Down
0 ...3DDevice/GameClient/Module/W3DLaserDraw.h → ...3DDevice/GameClient/Module/W3DLaserDraw.h
View file
Open in desktop
File renamed without changes.
0 ...e/Include/W3DDevice/GameClient/W3DWater.h → ...e/Include/W3DDevice/GameClient/W3DWater.h
View file
Open in desktop
File renamed without changes.
0 ...ude/W3DDevice/GameClient/W3DWaterTracks.h → ...ude/W3DDevice/GameClient/W3DWaterTracks.h
View file
Open in desktop
File renamed without changes.
0 ...GameClient/Drawable/Draw/W3DLaserDraw.cpp → ...GameClient/Drawable/Draw/W3DLaserDraw.cpp
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ...e/W3DDevice/GameClient/Water/W3DWater.cpp → ...e/W3DDevice/GameClient/Water/W3DWater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,8 +619,8 @@ HRESULT WaterRenderObjClass::generateVertexBuffer( Int sizeX, Int sizeY, Int ver
{
m_numVertices=sizeX*sizeY;
//Assuming dynamic vertex buffer, allocate maximum multiple of required size to allow rendering from
//different parts of the buffer. 5-15-03: Disabled this since we use DISCARD mode instead to avoid Nvidia Runtime bug. -MW
//m_numVertices=(65536 / (sizeX*sizeY))*sizeX*sizeY;
//different parts of the buffer. 5-15-03: Disabled this since we use DISCARD mode instead to avoid Nvidia Runtime bug. -MW
//m_numVertices=(65536 / (sizeX*sizeY))*sizeX*sizeY;

SEA_PATCH_VERTEX* pVertices;

Expand Down Expand Up @@ -2229,9 +2229,9 @@ void WaterRenderObjClass::renderWaterMesh(void)
if (!m_doWaterGrid)
return; //the water grid is disabled.

//According to Nvidia there's a D3D bug that happens if you don't start with a
//new dynamic VB each frame - so we force a DISCARD by overflowing the counter.
m_vertexBufferD3DOffset = 0xffff;
//According to Nvidia there's a D3D bug that happens if you don't start with a
//new dynamic VB each frame - so we force a DISCARD by overflowing the counter.
m_vertexBufferD3DOffset = 0xffff;

Setting *setting=&m_settings[m_tod];

Expand Down
6 changes: 3 additions & 3 deletions ...evice/GameClient/Water/W3DWaterTracks.cpp → ...evice/GameClient/Water/W3DWaterTracks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,9 +867,9 @@ Try improving the fit to vertical surfaces like cliffs.
if (!m_usedModules || ShaderClass::Is_Backface_Culling_Inverted())
return; //don't render track marks in reflections.

//According to Nvidia there's a D3D bug that happens if you don't start with a
//new dynamic VB each frame - so we force a DISCARD by overflowing the counter.
m_batchStart = 0xffff;
//According to Nvidia there's a D3D bug that happens if you don't start with a
//new dynamic VB each frame - so we force a DISCARD by overflowing the counter.
m_batchStart = 0xffff;

// adjust shading for time of day.
Real shadeR, shadeG, shadeB;
Expand Down
0 ...ource/W3DDevice/GameClient/Water/wave.nvp → ...ource/W3DDevice/GameClient/Water/wave.nvp
View file
Open in desktop
File renamed without changes.
0 ...ource/W3DDevice/GameClient/Water/wave.nvv → ...ource/W3DDevice/GameClient/Water/wave.nvv
View file
Open in desktop
File renamed without changes.
32 changes: 16 additions & 16 deletions Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ set(WW3D2_SRC
assetstatus.h
bitmaphandler.cpp
bitmaphandler.h
#bmp2d.cpp
#bmp2d.h
bmp2d.cpp
bmp2d.h
#boxrobj.cpp
#boxrobj.h
bwrender.cpp
Expand Down Expand Up @@ -56,8 +56,8 @@ set(WW3D2_SRC
#dx8renderer.h
#dx8rendererdebugger.cpp
#dx8rendererdebugger.h
#dx8texman.cpp
#dx8texman.h
dx8texman.cpp
dx8texman.h
#dx8vertexbuffer.cpp
#dx8vertexbuffer.h
dx8webbrowser.cpp
Expand Down Expand Up @@ -108,8 +108,8 @@ set(WW3D2_SRC
#mapper.h
matinfo.cpp
matinfo.h
#matpass.cpp
#matpass.h
matpass.cpp
matpass.h
#matrixmapper.cpp
#matrixmapper.h
#mesh.cpp
Expand Down Expand Up @@ -200,18 +200,18 @@ set(WW3D2_SRC
stripoptimizer.h
surfaceclass.cpp
surfaceclass.h
#texproject.cpp
#texproject.h
texproject.cpp
texproject.h
#textdraw.cpp # unused
textdraw.h
#texture.cpp
#texture.h
#texturefilter.cpp
#texturefilter.h
#textureloader.cpp
#textureloader.h
#texturethumbnail.cpp
#texturethumbnail.h
texture.cpp
texture.h
texturefilter.cpp
texturefilter.h
textureloader.cpp
textureloader.h
texturethumbnail.cpp
texturethumbnail.h
#vertmaterial.cpp
#vertmaterial.h
visrasterizer.cpp
Expand Down
0 .../Libraries/Source/WWVegas/WW3D2/bmp2d.cpp → .../Libraries/Source/WWVegas/WW3D2/bmp2d.cpp
View file
Open in desktop
File renamed without changes.
0 ...de/Libraries/Source/WWVegas/WW3D2/bmp2d.h → Core/Libraries/Source/WWVegas/WW3D2/bmp2d.h
View file
Open in desktop
File renamed without changes.
0 ...raries/Source/WWVegas/WW3D2/dx8texman.cpp → ...raries/Source/WWVegas/WW3D2/dx8texman.cpp
View file
Open in desktop
File renamed without changes.
0 ...ibraries/Source/WWVegas/WW3D2/dx8texman.h → ...ibraries/Source/WWVegas/WW3D2/dx8texman.h
View file
Open in desktop
File renamed without changes.
0 ...ibraries/Source/WWVegas/WW3D2/matpass.cpp → ...ibraries/Source/WWVegas/WW3D2/matpass.cpp
View file
Open in desktop
File renamed without changes.
0 .../Libraries/Source/WWVegas/WW3D2/matpass.h → .../Libraries/Source/WWVegas/WW3D2/matpass.h
View file
Open in desktop
File renamed without changes.
0 ...aries/Source/WWVegas/WW3D2/texproject.cpp → ...aries/Source/WWVegas/WW3D2/texproject.cpp
View file
Open in desktop
File renamed without changes.
0 ...braries/Source/WWVegas/WW3D2/texproject.h → ...braries/Source/WWVegas/WW3D2/texproject.h
View file
Open in desktop
File renamed without changes.
0 ...ibraries/Source/WWVegas/WW3D2/texture.cpp → ...ibraries/Source/WWVegas/WW3D2/texture.cpp
View file
Open in desktop
File renamed without changes.
0 .../Libraries/Source/WWVegas/WW3D2/texture.h → .../Libraries/Source/WWVegas/WW3D2/texture.h
View file
Open in desktop
File renamed without changes.
0 ...es/Source/WWVegas/WW3D2/texturefilter.cpp → ...es/Source/WWVegas/WW3D2/texturefilter.cpp
View file
Open in desktop
File renamed without changes.
0 ...ries/Source/WWVegas/WW3D2/texturefilter.h → ...ries/Source/WWVegas/WW3D2/texturefilter.h
View file
Open in desktop
File renamed without changes.
0 ...es/Source/WWVegas/WW3D2/textureloader.cpp → ...es/Source/WWVegas/WW3D2/textureloader.cpp
View file
Open in desktop
File renamed without changes.
0 ...ries/Source/WWVegas/WW3D2/textureloader.h → ...ries/Source/WWVegas/WW3D2/textureloader.h
View file
Open in desktop
File renamed without changes.
0 ...Source/WWVegas/WW3D2/texturethumbnail.cpp → ...Source/WWVegas/WW3D2/texturethumbnail.cpp
View file
Open in desktop
File renamed without changes.
0 ...s/Source/WWVegas/WW3D2/texturethumbnail.h → ...s/Source/WWVegas/WW3D2/texturethumbnail.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions Generals/Code/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ set(GAMEENGINE_SRC
Include/GameClient/TerrainVisual.h
# Include/GameClient/VideoPlayer.h
# Include/GameClient/View.h
Include/GameClient/Water.h
# Include/GameClient/Water.h
Include/GameClient/WindowLayout.h
# Include/GameClient/WindowVideoManager.h
Include/GameClient/WindowXlat.h
Expand Down Expand Up @@ -777,7 +777,7 @@ set(GAMEENGINE_SRC
Source/GameClient/Terrain/TerrainVisual.cpp
# Source/GameClient/VideoPlayer.cpp
# Source/GameClient/View.cpp
Source/GameClient/Water.cpp
# Source/GameClient/Water.cpp
Source/GameLogic/AI/AI.cpp
Source/GameLogic/AI/AIDock.cpp
Source/GameLogic/AI/AIGroup.cpp
Expand Down
124 changes: 0 additions & 124 deletions Generals/Code/GameEngine/Include/GameClient/Water.h
View file
Open in desktop

This file was deleted.

Loading
Loading