Skip to content

Commit 4e45e90

Browse files
authored
[ZH] Remove the unused WWShade library (#596)
1 parent b71b3a9 commit 4e45e90

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+6
-13065
lines changed

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@
5858
#include "GameLogic/TerrainLogic.h"
5959
#include "WW3D2/dx8caps.h"
6060
#include "GameClient/Drawable.h"
61+
#ifdef USE_WWSHADE
6162
#include "wwshade/shdmesh.h"
6263
#include "wwshade/shdsubmesh.h"
64+
#endif
6365

6466
#ifdef _INTERNAL
6567
// for occasional debugging...
@@ -701,7 +703,7 @@ Int W3DShadowGeometry::initFromHLOD(RenderObjClass *robj)
701703
}
702704

703705

704-
#if (1) //(cnc3)(gth) Support for ShaderMeshes!
706+
#ifdef USE_WWSHADE //(cnc3)(gth) Support for ShaderMeshes!
705707
// I'm coding this as a completely independent block rather than re-factoring the code above
706708
// because it will probably save us pain in future merges.
707709
if (hlod->Peek_Lod_Model(top,i) && hlod->Peek_Lod_Model(top,i)->Class_ID() == RenderObjClass::CLASSID_SHDMESH)

GeneralsMD/Code/Libraries/Source/WWVegas/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ target_include_directories(z_wwcommon INTERFACE
2323
WWMath
2424
WWSaveLoad
2525
Wwutil
26-
wwshade
2726
)
2827

2928
add_subdirectory(WWAudio)
@@ -34,7 +33,6 @@ add_subdirectory(Wwutil)
3433
add_subdirectory(WWSaveLoad)
3534
add_subdirectory(WW3D2)
3635
add_subdirectory(WWDownload)
37-
add_subdirectory(wwshade)
3836

3937
# Helpful interface to bundle the ww modules together.
4038
add_library(z_wwvegas INTERFACE)
@@ -48,7 +46,6 @@ target_include_directories(z_wwvegas INTERFACE
4846
WWMath
4947
WWSaveLoad
5048
Wwutil
51-
wwshade
5249
)
5350

5451
target_link_libraries(z_wwvegas INTERFACE
@@ -58,6 +55,5 @@ target_link_libraries(z_wwvegas INTERFACE
5855
z_wwlib
5956
z_wwmath
6057
z_wwsaveload
61-
z_wwshade
6258
z_wwutil
6359
)

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939
#ifndef SHDLIB_H
4040
#define SHDLIB_H
4141

42+
// TheSuperHackers @compile Removes the unused WWShade code. (#596)
43+
// If there is a desire to revive this, then the WWShade library needs to be re-added.
44+
4245
#ifdef USE_WWSHADE
4346

4447
extern void SHD_Init();

GeneralsMD/Code/Libraries/Source/WWVegas/wwshade/CMakeLists.txt

Lines changed: 0 additions & 80 deletions
This file was deleted.

GeneralsMD/Code/Libraries/Source/WWVegas/wwshade/shd6bumpdiff.cpp

Lines changed: 0 additions & 238 deletions
This file was deleted.

0 commit comments

Comments
 (0)