Skip to content

unify(shader): Merge and move W3DShaderManager, Smudge, W3DSmudge to Core #1920

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
merged 2 commits into from
Nov 29, 2025
Merged

unify(shader): Merge and move W3DShaderManager, Smudge, W3DSmudge to Core #1920

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
76e0b1a
unify(shader): Merge W3DShaderManager code, move Smudge, W3DSmudge to…
xezon Nov 28, 2025
6080343
unify(shader): Move W3DShaderManager to Core (#1920)
xezon Nov 28, 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 @@ -222,7 +222,7 @@ set(GAMEENGINE_SRC
# Include/GameClient/Shell.h
# Include/GameClient/ShellHooks.h
# Include/GameClient/ShellMenuScheme.h
# Include/GameClient/Smudge.h
Include/GameClient/Smudge.h
# Include/GameClient/Snow.h
# Include/GameClient/Statistics.h
# Include/GameClient/TerrainRoads.h
Expand Down Expand Up @@ -827,7 +827,7 @@ set(GAMEENGINE_SRC
# Source/GameClient/System/Image.cpp
# Source/GameClient/System/ParticleSys.cpp
# Source/GameClient/System/RayEffect.cpp
# Source/GameClient/System/Smudge.cpp
Source/GameClient/System/Smudge.cpp
# Source/GameClient/Terrain/TerrainRoads.cpp
# Source/GameClient/Terrain/TerrainVisual.cpp
Source/GameClient/VideoPlayer.cpp
Expand Down
0 ...de/GameEngine/Include/GameClient/Smudge.h → Core/GameEngine/Include/GameClient/Smudge.h
View file
Open in desktop
File renamed without changes.
0 ...ngine/Source/GameClient/System/Smudge.cpp → ...ngine/Source/GameClient/System/Smudge.cpp
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions Core/GameEngineDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ set(GAMEENGINEDEVICE_SRC
# Include/W3DDevice/GameClient/W3DPropBuffer.h
# Include/W3DDevice/GameClient/W3DRoadBuffer.h
# Include/W3DDevice/GameClient/W3DScene.h
# Include/W3DDevice/GameClient/W3DShaderManager.h
Include/W3DDevice/GameClient/W3DShaderManager.h
# Include/W3DDevice/GameClient/W3DShadow.h
# Include/W3DDevice/GameClient/W3DShroud.h
# Include/W3DDevice/GameClient/W3DSmudge.h
Include/W3DDevice/GameClient/W3DSmudge.h
# Include/W3DDevice/GameClient/W3DSnow.h
# Include/W3DDevice/GameClient/W3DStatusCircle.h
# Include/W3DDevice/GameClient/W3DTerrainBackground.h
Expand Down Expand Up @@ -163,9 +163,9 @@ set(GAMEENGINEDEVICE_SRC
# Source/W3DDevice/GameClient/W3DPropBuffer.cpp
# Source/W3DDevice/GameClient/W3DRoadBuffer.cpp
# Source/W3DDevice/GameClient/W3DScene.cpp
# Source/W3DDevice/GameClient/W3DShaderManager.cpp
Source/W3DDevice/GameClient/W3DShaderManager.cpp
# Source/W3DDevice/GameClient/W3DShroud.cpp
# Source/W3DDevice/GameClient/W3DSmudge.cpp
Source/W3DDevice/GameClient/W3DSmudge.cpp
# Source/W3DDevice/GameClient/W3DSnow.cpp
# Source/W3DDevice/GameClient/W3DStatusCircle.cpp
# Source/W3DDevice/GameClient/W3DTerrainBackground.cpp
Expand Down
0 ...e/W3DDevice/GameClient/W3DShaderManager.h → ...e/W3DDevice/GameClient/W3DShaderManager.h
View file
Open in desktop
File renamed without changes.
0 .../Include/W3DDevice/GameClient/W3DSmudge.h → .../Include/W3DDevice/GameClient/W3DSmudge.h
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions ...W3DDevice/GameClient/W3DShaderManager.cpp → ...W3DDevice/GameClient/W3DShaderManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2526,7 +2526,6 @@ void RoadShader2Stage::reset(void)
{
ShaderClass::Invalidate();

//Free references to textures
DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);

Expand Down Expand Up @@ -2692,7 +2691,6 @@ void W3DShaderManager::shutdown(void)
W3DFilters[i]->shutdown();
}
}

}

//=============================================================================
Expand Down
0 ...Source/W3DDevice/GameClient/W3DSmudge.cpp → ...Source/W3DDevice/GameClient/W3DSmudge.cpp
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion Generals/Code/GameEngine/Include/GameClient/CommandXlat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ enum FilterTypes CPP_11(: Int)
FT_VIEW_BW_FILTER, //filter to apply a black & white filter to the screen.
FT_VIEW_MOTION_BLUR_FILTER, //filter to apply motion blur filter to screen.
FT_VIEW_CROSSFADE, ///<filter to apply a cross blend between previous/current views.
FT_VIEW_DEFAULT, ///<default filter mode for default filter.
FT_MAX
};

Expand All @@ -101,7 +102,7 @@ enum FilterModes CPP_11(: Int)
FM_VIEW_MB_OUT_SATURATE, // Motion blur filter out saturated blur
FM_VIEW_MB_END_PAN_ALPHA, // Moton blur on screen pan (for camera tracks object mode)


FM_VIEW_DEFAULT, //Default filter that's enabled when all others are off.

// NOTE: This has to be the last entry in this enum.
// Add new entries before this one. jba.
Expand Down
4 changes: 2 additions & 2 deletions Generals/Code/GameEngineDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ set(GAMEENGINEDEVICE_SRC
Include/W3DDevice/GameClient/W3DProjectedShadow.h
Include/W3DDevice/GameClient/W3DRoadBuffer.h
Include/W3DDevice/GameClient/W3DScene.h
Include/W3DDevice/GameClient/W3DShaderManager.h
# Include/W3DDevice/GameClient/W3DShaderManager.h
Include/W3DDevice/GameClient/W3DShadow.h
Include/W3DDevice/GameClient/W3DShroud.h
Include/W3DDevice/GameClient/W3DStatusCircle.h
Expand Down Expand Up @@ -151,7 +151,7 @@ set(GAMEENGINEDEVICE_SRC
Source/W3DDevice/GameClient/W3DPoly.cpp
Source/W3DDevice/GameClient/W3DRoadBuffer.cpp
Source/W3DDevice/GameClient/W3DScene.cpp
Source/W3DDevice/GameClient/W3DShaderManager.cpp
# Source/W3DDevice/GameClient/W3DShaderManager.cpp
Source/W3DDevice/GameClient/W3DShroud.cpp
Source/W3DDevice/GameClient/W3DStatusCircle.cpp
Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
Expand Down
241 changes: 0 additions & 241 deletions Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h
View file
Open in desktop

This file was deleted.

Loading
Loading