Skip to content

Commit c110a0e

Browse files
xezonxezon
committed
unify(texture): Move W3DWater, W3DLaserDraw and WW3D2 texture related files to Core (#1989)
1 parent fa9cb0c commit c110a0e

File tree

62 files changed

+102
-15391
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

+102
-15391
lines changed

‎Core/GameEngine/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ set(GAMEENGINE_SRC
230230
# Include/GameClient/TerrainVisual.h
231231
Include/GameClient/VideoPlayer.h
232232
Include/GameClient/View.h
233-
# Include/GameClient/Water.h
233+
Include/GameClient/Water.h
234234
# Include/GameClient/WindowLayout.h
235235
Include/GameClient/WindowVideoManager.h
236236
# Include/GameClient/WindowXlat.h
@@ -835,7 +835,7 @@ set(GAMEENGINE_SRC
835835
Source/GameClient/VideoPlayer.cpp
836836
Source/GameClient/VideoStream.cpp
837837
Source/GameClient/View.cpp
838-
# Source/GameClient/Water.cpp
838+
Source/GameClient/Water.cpp
839839
# Source/GameLogic/AI/AI.cpp
840840
# Source/GameLogic/AI/AIDock.cpp
841841
# Source/GameLogic/AI/AIGroup.cpp

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

File renamed without changes.

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

File renamed without changes.

‎Core/GameEngineDevice/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set(GAMEENGINEDEVICE_SRC
1313
# Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
1414
# Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h
1515
# Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h
16-
# Include/W3DDevice/GameClient/Module/W3DLaserDraw.h
16+
Include/W3DDevice/GameClient/Module/W3DLaserDraw.h
1717
# Include/W3DDevice/GameClient/Module/W3DModelDraw.h
1818
# Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h
1919
# Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h
@@ -73,8 +73,8 @@ set(GAMEENGINEDEVICE_SRC
7373
Include/W3DDevice/GameClient/W3DVideoBuffer.h
7474
Include/W3DDevice/GameClient/W3DView.h
7575
# Include/W3DDevice/GameClient/W3DVolumetricShadow.h
76-
# Include/W3DDevice/GameClient/W3DWater.h
77-
# Include/W3DDevice/GameClient/W3DWaterTracks.h
76+
Include/W3DDevice/GameClient/W3DWater.h
77+
Include/W3DDevice/GameClient/W3DWaterTracks.h
7878
# Include/W3DDevice/GameClient/W3DWaypointBuffer.h
7979
# Include/W3DDevice/GameClient/W3DWebBrowser.h
8080
# Include/W3DDevice/GameClient/WorldHeightMap.h
@@ -102,7 +102,7 @@ set(GAMEENGINEDEVICE_SRC
102102
# Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
103103
# Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
104104
# Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp
105-
# Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
105+
Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
106106
# Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
107107
# Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordAircraftDraw.cpp
108108
# Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTankDraw.cpp
@@ -176,8 +176,8 @@ set(GAMEENGINEDEVICE_SRC
176176
Source/W3DDevice/GameClient/W3DView.cpp
177177
# Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
178178
# Source/W3DDevice/GameClient/W3DWebBrowser.cpp
179-
# Source/W3DDevice/GameClient/Water/W3DWater.cpp
180-
# Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
179+
Source/W3DDevice/GameClient/Water/W3DWater.cpp
180+
Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
181181
# Source/W3DDevice/GameClient/WorldHeightMap.cpp
182182
# Source/W3DDevice/GameLogic/W3DGameLogic.cpp
183183
# Source/W3DDevice/GameLogic/W3DGhostObject.cpp

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp renamed to Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp

File renamed without changes.

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp renamed to Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp

File renamed without changes.

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp renamed to Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp

File renamed without changes.

0 commit comments

Comments
 (0)