Skip to content

Commit 8726aee

Browse files
xezonxezon
committed
unify(heightmap): Move Height Map and Terrain related files to Core (#1991)
1 parent 9be7927 commit 8726aee

Some content is hidden

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

49 files changed

+85
-14763
lines changed

‎Core/GameEngine/CMakeLists.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ set(GAMEENGINE_SRC
6969
# Include/Common/List.h
7070
Include/Common/LocalFile.h
7171
Include/Common/LocalFileSystem.h
72-
# Include/Common/MapObject.h
72+
Include/Common/MapObject.h
7373
# Include/Common/MapReaderWriterInfo.h
7474
# Include/Common/MessageStream.h
7575
Include/Common/MiniDumper.h
@@ -204,7 +204,7 @@ set(GAMEENGINE_SRC
204204
# Include/GameClient/Line2D.h
205205
# Include/GameClient/LoadScreen.h
206206
# Include/GameClient/LookAtXlat.h
207-
# Include/GameClient/MapUtil.h
207+
Include/GameClient/MapUtil.h
208208
# Include/GameClient/MessageBox.h
209209
# Include/GameClient/MetaEvent.h
210210
# Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
@@ -226,8 +226,8 @@ set(GAMEENGINE_SRC
226226
Include/GameClient/Smudge.h
227227
Include/GameClient/Snow.h
228228
# Include/GameClient/Statistics.h
229-
# Include/GameClient/TerrainRoads.h
230-
# Include/GameClient/TerrainVisual.h
229+
Include/GameClient/TerrainRoads.h
230+
Include/GameClient/TerrainVisual.h
231231
Include/GameClient/VideoPlayer.h
232232
Include/GameClient/View.h
233233
Include/GameClient/Water.h
@@ -807,7 +807,7 @@ set(GAMEENGINE_SRC
807807
# Source/GameClient/Input/Mouse.cpp
808808
# Source/GameClient/LanguageFilter.cpp
809809
# Source/GameClient/Line2D.cpp
810-
# Source/GameClient/MapUtil.cpp
810+
Source/GameClient/MapUtil.cpp
811811
# Source/GameClient/MessageStream/CommandXlat.cpp
812812
# Source/GameClient/MessageStream/GUICommandTranslator.cpp
813813
# Source/GameClient/MessageStream/HintSpy.cpp
@@ -830,8 +830,8 @@ set(GAMEENGINE_SRC
830830
# Source/GameClient/System/ParticleSys.cpp
831831
# Source/GameClient/System/RayEffect.cpp
832832
Source/GameClient/System/Smudge.cpp
833-
# Source/GameClient/Terrain/TerrainRoads.cpp
834-
# Source/GameClient/Terrain/TerrainVisual.cpp
833+
Source/GameClient/Terrain/TerrainRoads.cpp
834+
Source/GameClient/Terrain/TerrainVisual.cpp
835835
Source/GameClient/VideoPlayer.cpp
836836
Source/GameClient/VideoStream.cpp
837837
Source/GameClient/View.cpp

GeneralsMD/Code/GameEngine/Include/Common/MapObject.h renamed to Core/GameEngine/Include/Common/MapObject.h

File renamed without changes.

GeneralsMD/Code/GameEngine/Include/GameClient/MapUtil.h renamed to Core/GameEngine/Include/GameClient/MapUtil.h

File renamed without changes.

GeneralsMD/Code/GameEngine/Include/GameClient/TerrainRoads.h renamed to Core/GameEngine/Include/GameClient/TerrainRoads.h

File renamed without changes.

GeneralsMD/Code/GameEngine/Include/GameClient/TerrainVisual.h renamed to Core/GameEngine/Include/GameClient/TerrainVisual.h

File renamed without changes.

GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp renamed to Core/GameEngine/Source/GameClient/MapUtil.cpp

File renamed without changes.

GeneralsMD/Code/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp renamed to Core/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp

File renamed without changes.

GeneralsMD/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp renamed to Core/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp

File renamed without changes.

‎Core/GameEngineDevice/CMakeLists.txt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set(GAMEENGINEDEVICE_SRC
99
Include/W3DDevice/GameClient/BaseHeightMap.h
1010
# Include/W3DDevice/GameClient/camerashakesystem.h
1111
Include/W3DDevice/GameClient/FlatHeightMap.h
12-
# Include/W3DDevice/GameClient/HeightMap.h
12+
Include/W3DDevice/GameClient/HeightMap.h
1313
# Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
1414
# Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h
1515
# Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h
@@ -29,8 +29,8 @@ set(GAMEENGINEDEVICE_SRC
2929
# Include/W3DDevice/GameClient/Module/W3DTracerDraw.h
3030
Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
3131
# Include/W3DDevice/GameClient/Module/W3DTruckDraw.h
32-
# Include/W3DDevice/GameClient/TerrainTex.h
33-
# Include/W3DDevice/GameClient/TileData.h
32+
Include/W3DDevice/GameClient/TerrainTex.h
33+
Include/W3DDevice/GameClient/TileData.h
3434
# Include/W3DDevice/GameClient/W3DAssetManager.h
3535
# Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
3636
# Include/W3DDevice/GameClient/W3DBibBuffer.h
@@ -67,17 +67,17 @@ set(GAMEENGINEDEVICE_SRC
6767
Include/W3DDevice/GameClient/W3DSnow.h
6868
# Include/W3DDevice/GameClient/W3DStatusCircle.h
6969
Include/W3DDevice/GameClient/W3DTerrainBackground.h
70-
# Include/W3DDevice/GameClient/W3DTerrainTracks.h
71-
# Include/W3DDevice/GameClient/W3DTerrainVisual.h
72-
# Include/W3DDevice/GameClient/W3DTreeBuffer.h
70+
Include/W3DDevice/GameClient/W3DTerrainTracks.h
71+
Include/W3DDevice/GameClient/W3DTerrainVisual.h
72+
Include/W3DDevice/GameClient/W3DTreeBuffer.h
7373
Include/W3DDevice/GameClient/W3DVideoBuffer.h
7474
Include/W3DDevice/GameClient/W3DView.h
7575
# Include/W3DDevice/GameClient/W3DVolumetricShadow.h
7676
Include/W3DDevice/GameClient/W3DWater.h
7777
Include/W3DDevice/GameClient/W3DWaterTracks.h
7878
# Include/W3DDevice/GameClient/W3DWaypointBuffer.h
7979
# Include/W3DDevice/GameClient/W3DWebBrowser.h
80-
# Include/W3DDevice/GameClient/WorldHeightMap.h
80+
Include/W3DDevice/GameClient/WorldHeightMap.h
8181
# Include/W3DDevice/GameLogic/W3DGameLogic.h
8282
# Include/W3DDevice/GameLogic/W3DGhostObject.h
8383
# Include/W3DDevice/GameLogic/W3DTerrainLogic.h
@@ -136,13 +136,13 @@ set(GAMEENGINEDEVICE_SRC
136136
# Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp
137137
# Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp
138138
# Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp
139-
# Source/W3DDevice/GameClient/HeightMap.cpp
139+
Source/W3DDevice/GameClient/HeightMap.cpp
140140
# Source/W3DDevice/GameClient/Shadow/W3DBufferManager.cpp
141141
# Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
142142
# Source/W3DDevice/GameClient/Shadow/W3DShadow.cpp
143143
# Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp
144-
# Source/W3DDevice/GameClient/TerrainTex.cpp
145-
# Source/W3DDevice/GameClient/TileData.cpp
144+
Source/W3DDevice/GameClient/TerrainTex.cpp
145+
Source/W3DDevice/GameClient/TileData.cpp
146146
# Source/W3DDevice/GameClient/W3DAssetManager.cpp
147147
# Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
148148
# Source/W3DDevice/GameClient/W3DBibBuffer.cpp
@@ -169,16 +169,16 @@ set(GAMEENGINEDEVICE_SRC
169169
Source/W3DDevice/GameClient/W3DSnow.cpp
170170
# Source/W3DDevice/GameClient/W3DStatusCircle.cpp
171171
Source/W3DDevice/GameClient/W3DTerrainBackground.cpp
172-
# Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
173-
# Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
174-
# Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
172+
Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
173+
Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
174+
Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
175175
Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
176176
Source/W3DDevice/GameClient/W3DView.cpp
177177
# Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
178178
# Source/W3DDevice/GameClient/W3DWebBrowser.cpp
179179
Source/W3DDevice/GameClient/Water/W3DWater.cpp
180180
Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
181-
# Source/W3DDevice/GameClient/WorldHeightMap.cpp
181+
Source/W3DDevice/GameClient/WorldHeightMap.cpp
182182
# Source/W3DDevice/GameLogic/W3DGameLogic.cpp
183183
# Source/W3DDevice/GameLogic/W3DGhostObject.cpp
184184
# Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp

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

File renamed without changes.

0 commit comments

Comments
 (0)