Skip to content

Commit a03ed31

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

Some content is hidden

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

55 files changed

+94
-15127
lines changed

‎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.

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvp renamed to Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvp

File renamed without changes.

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvv renamed to Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvv

File renamed without changes.

‎Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ set(WW3D2_SRC
1515
assetstatus.h
1616
bitmaphandler.cpp
1717
bitmaphandler.h
18-
#bmp2d.cpp
19-
#bmp2d.h
18+
bmp2d.cpp
19+
bmp2d.h
2020
#boxrobj.cpp
2121
#boxrobj.h
2222
bwrender.cpp
@@ -56,8 +56,8 @@ set(WW3D2_SRC
5656
#dx8renderer.h
5757
#dx8rendererdebugger.cpp
5858
#dx8rendererdebugger.h
59-
#dx8texman.cpp
60-
#dx8texman.h
59+
dx8texman.cpp
60+
dx8texman.h
6161
#dx8vertexbuffer.cpp
6262
#dx8vertexbuffer.h
6363
dx8webbrowser.cpp
@@ -108,8 +108,8 @@ set(WW3D2_SRC
108108
#mapper.h
109109
matinfo.cpp
110110
matinfo.h
111-
#matpass.cpp
112-
#matpass.h
111+
matpass.cpp
112+
matpass.h
113113
#matrixmapper.cpp
114114
#matrixmapper.h
115115
#mesh.cpp
@@ -200,18 +200,18 @@ set(WW3D2_SRC
200200
stripoptimizer.h
201201
surfaceclass.cpp
202202
surfaceclass.h
203-
#texproject.cpp
204-
#texproject.h
203+
texproject.cpp
204+
texproject.h
205205
#textdraw.cpp # unused
206206
textdraw.h
207-
#texture.cpp
208-
#texture.h
209-
#texturefilter.cpp
210-
#texturefilter.h
211-
#textureloader.cpp
212-
#textureloader.h
213-
#texturethumbnail.cpp
214-
#texturethumbnail.h
207+
texture.cpp
208+
texture.h
209+
texturefilter.cpp
210+
texturefilter.h
211+
textureloader.cpp
212+
textureloader.h
213+
texturethumbnail.cpp
214+
texturethumbnail.h
215215
#vertmaterial.cpp
216216
#vertmaterial.h
217217
visrasterizer.cpp

0 commit comments

Comments
 (0)