Skip to content

Commit 330ad22

Browse files
committed
unify(heightmap): Merge Height Map related code and move Zero Hour's BaseHeightMap, FlatHeightMap, W3DPropDraw, W3DTreeDraw, W3DPropBuffer, W3DSnow, W3DTerrainBackground files to Core (#1991)
1 parent 334f56a commit 330ad22

File tree

62 files changed

+3652
-3294
lines changed

Some content is hidden

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

62 files changed

+3652
-3294
lines changed

Core/GameEngine/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ set(GAMEENGINE_SRC
224224
# Include/GameClient/ShellHooks.h
225225
# Include/GameClient/ShellMenuScheme.h
226226
Include/GameClient/Smudge.h
227-
# Include/GameClient/Snow.h
227+
Include/GameClient/Snow.h
228228
# Include/GameClient/Statistics.h
229229
# Include/GameClient/TerrainRoads.h
230230
# Include/GameClient/TerrainVisual.h
@@ -820,7 +820,7 @@ set(GAMEENGINE_SRC
820820
Source/GameClient/ParabolicEase.cpp
821821
# Source/GameClient/RadiusDecal.cpp
822822
# Source/GameClient/SelectionInfo.cpp
823-
# Source/GameClient/Snow.cpp
823+
Source/GameClient/Snow.cpp
824824
# Source/GameClient/Statistics.cpp
825825
# Source/GameClient/System/Anim2D.cpp
826826
# Source/GameClient/System/CampaignManager.cpp
File renamed without changes.
File renamed without changes.

Core/GameEngineDevice/CMakeLists.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ set(GAMEENGINEDEVICE_SRC
66
# Include/W3DDevice/Common/W3DModuleFactory.h
77
Include/W3DDevice/Common/W3DRadar.h
88
# Include/W3DDevice/Common/W3DThingFactory.h
9-
# Include/W3DDevice/GameClient/BaseHeightMap.h
9+
Include/W3DDevice/GameClient/BaseHeightMap.h
1010
# Include/W3DDevice/GameClient/camerashakesystem.h
11-
# Include/W3DDevice/GameClient/FlatHeightMap.h
11+
Include/W3DDevice/GameClient/FlatHeightMap.h
1212
# Include/W3DDevice/GameClient/HeightMap.h
1313
# Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
1414
# Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h
@@ -20,14 +20,14 @@ set(GAMEENGINEDEVICE_SRC
2020
# Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h
2121
# Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h
2222
# Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h
23-
# Include/W3DDevice/GameClient/Module/W3DPropDraw.h
23+
Include/W3DDevice/GameClient/Module/W3DPropDraw.h
2424
# Include/W3DDevice/GameClient/Module/W3DRopeDraw.h
2525
# Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
2626
# Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h
2727
# Include/W3DDevice/GameClient/Module/W3DTankDraw.h
2828
# Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h
2929
# Include/W3DDevice/GameClient/Module/W3DTracerDraw.h
30-
# Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
30+
Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
3131
# Include/W3DDevice/GameClient/Module/W3DTruckDraw.h
3232
# Include/W3DDevice/GameClient/TerrainTex.h
3333
# Include/W3DDevice/GameClient/TileData.h
@@ -57,16 +57,16 @@ set(GAMEENGINEDEVICE_SRC
5757
# Include/W3DDevice/GameClient/W3DParticleSys.h
5858
# Include/W3DDevice/GameClient/W3DPoly.h
5959
# Include/W3DDevice/GameClient/W3DProjectedShadow.h
60-
# Include/W3DDevice/GameClient/W3DPropBuffer.h
60+
Include/W3DDevice/GameClient/W3DPropBuffer.h
6161
# Include/W3DDevice/GameClient/W3DRoadBuffer.h
6262
# Include/W3DDevice/GameClient/W3DScene.h
6363
Include/W3DDevice/GameClient/W3DShaderManager.h
6464
# Include/W3DDevice/GameClient/W3DShadow.h
6565
# Include/W3DDevice/GameClient/W3DShroud.h
6666
Include/W3DDevice/GameClient/W3DSmudge.h
67-
# Include/W3DDevice/GameClient/W3DSnow.h
67+
Include/W3DDevice/GameClient/W3DSnow.h
6868
# Include/W3DDevice/GameClient/W3DStatusCircle.h
69-
# Include/W3DDevice/GameClient/W3DTerrainBackground.h
69+
Include/W3DDevice/GameClient/W3DTerrainBackground.h
7070
# Include/W3DDevice/GameClient/W3DTerrainTracks.h
7171
# Include/W3DDevice/GameClient/W3DTerrainVisual.h
7272
# Include/W3DDevice/GameClient/W3DTreeBuffer.h
@@ -97,7 +97,7 @@ set(GAMEENGINEDEVICE_SRC
9797
# Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
9898
# Source/W3DDevice/Common/Thing/W3DThingFactory.cpp
9999
# Source/W3DDevice/Common/W3DConvert.cpp
100-
# Source/W3DDevice/GameClient/BaseHeightMap.cpp
100+
Source/W3DDevice/GameClient/BaseHeightMap.cpp
101101
Source/W3DDevice/GameClient/CameraShakeSystem.cpp
102102
# Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
103103
# Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
@@ -109,16 +109,16 @@ set(GAMEENGINEDEVICE_SRC
109109
# Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTruckDraw.cpp
110110
# Source/W3DDevice/GameClient/Drawable/Draw/W3DPoliceCarDraw.cpp
111111
# Source/W3DDevice/GameClient/Drawable/Draw/W3DProjectileStreamDraw.cpp
112-
# Source/W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp
112+
Source/W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp
113113
# Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp
114114
# Source/W3DDevice/GameClient/Drawable/Draw/W3DScienceModelDraw.cpp
115115
# Source/W3DDevice/GameClient/Drawable/Draw/W3DSupplyDraw.cpp
116116
# Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp
117117
# Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp
118118
# Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp
119-
# Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp
119+
Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp
120120
# Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp
121-
# Source/W3DDevice/GameClient/FlatHeightMap.cpp
121+
Source/W3DDevice/GameClient/FlatHeightMap.cpp
122122
# Source/W3DDevice/GameClient/GUI/Gadget/W3DCheckBox.cpp
123123
# Source/W3DDevice/GameClient/GUI/Gadget/W3DComboBox.cpp
124124
# Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp
@@ -160,15 +160,15 @@ set(GAMEENGINEDEVICE_SRC
160160
# Source/W3DDevice/GameClient/W3DMouse.cpp
161161
# Source/W3DDevice/GameClient/W3DParticleSys.cpp
162162
# Source/W3DDevice/GameClient/W3DPoly.cpp
163-
# Source/W3DDevice/GameClient/W3DPropBuffer.cpp
163+
Source/W3DDevice/GameClient/W3DPropBuffer.cpp
164164
# Source/W3DDevice/GameClient/W3DRoadBuffer.cpp
165165
# Source/W3DDevice/GameClient/W3DScene.cpp
166166
Source/W3DDevice/GameClient/W3DShaderManager.cpp
167167
# Source/W3DDevice/GameClient/W3DShroud.cpp
168168
Source/W3DDevice/GameClient/W3DSmudge.cpp
169-
# Source/W3DDevice/GameClient/W3DSnow.cpp
169+
Source/W3DDevice/GameClient/W3DSnow.cpp
170170
# Source/W3DDevice/GameClient/W3DStatusCircle.cpp
171-
# Source/W3DDevice/GameClient/W3DTerrainBackground.cpp
171+
Source/W3DDevice/GameClient/W3DTerrainBackground.cpp
172172
# Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
173173
# Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
174174
# Source/W3DDevice/GameClient/W3DTreeBuffer.cpp

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h renamed to Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h

File renamed without changes.

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h renamed to Core/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h

File renamed without changes.

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h renamed to Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h

File renamed without changes.

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h renamed to Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h

File renamed without changes.

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPropBuffer.h renamed to Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DPropBuffer.h

File renamed without changes.

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h renamed to Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h

File renamed without changes.

0 commit comments

Comments
 (0)