Skip to content

Commit f33c8ab

Browse files
committed
unify(view): Move View, W3DView to Core (#1904)
1 parent 1a37cb1 commit f33c8ab

File tree

15 files changed

+17
-4323
lines changed

15 files changed

+17
-4323
lines changed

Core/GameEngine/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ set(GAMEENGINE_SRC
228228
# Include/GameClient/TerrainRoads.h
229229
# Include/GameClient/TerrainVisual.h
230230
Include/GameClient/VideoPlayer.h
231-
# Include/GameClient/View.h
231+
Include/GameClient/View.h
232232
# Include/GameClient/Water.h
233233
# Include/GameClient/WindowLayout.h
234234
Include/GameClient/WindowVideoManager.h
@@ -832,7 +832,7 @@ set(GAMEENGINE_SRC
832832
# Source/GameClient/Terrain/TerrainVisual.cpp
833833
Source/GameClient/VideoPlayer.cpp
834834
Source/GameClient/VideoStream.cpp
835-
# Source/GameClient/View.cpp
835+
Source/GameClient/View.cpp
836836
# Source/GameClient/Water.cpp
837837
# Source/GameLogic/AI/AI.cpp
838838
# Source/GameLogic/AI/AIDock.cpp

Core/GameEngineDevice/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ set(GAMEENGINEDEVICE_SRC
7171
# Include/W3DDevice/GameClient/W3DTerrainVisual.h
7272
# Include/W3DDevice/GameClient/W3DTreeBuffer.h
7373
Include/W3DDevice/GameClient/W3DVideoBuffer.h
74-
# Include/W3DDevice/GameClient/W3DView.h
74+
Include/W3DDevice/GameClient/W3DView.h
7575
# Include/W3DDevice/GameClient/W3DVolumetricShadow.h
7676
# Include/W3DDevice/GameClient/W3DWater.h
7777
# Include/W3DDevice/GameClient/W3DWaterTracks.h
@@ -173,7 +173,7 @@ set(GAMEENGINEDEVICE_SRC
173173
# Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
174174
# Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
175175
Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
176-
# Source/W3DDevice/GameClient/W3DView.cpp
176+
Source/W3DDevice/GameClient/W3DView.cpp
177177
# Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
178178
# Source/W3DDevice/GameClient/W3DWebBrowser.cpp
179179
# Source/W3DDevice/GameClient/Water/W3DWater.cpp

Generals/Code/GameEngine/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ set(GAMEENGINE_SRC
214214
Include/GameClient/TerrainRoads.h
215215
Include/GameClient/TerrainVisual.h
216216
# Include/GameClient/VideoPlayer.h
217-
Include/GameClient/View.h
217+
# Include/GameClient/View.h
218218
Include/GameClient/Water.h
219219
Include/GameClient/WindowLayout.h
220220
# Include/GameClient/WindowVideoManager.h
@@ -776,7 +776,7 @@ set(GAMEENGINE_SRC
776776
Source/GameClient/Terrain/TerrainRoads.cpp
777777
Source/GameClient/Terrain/TerrainVisual.cpp
778778
# Source/GameClient/VideoPlayer.cpp
779-
Source/GameClient/View.cpp
779+
# Source/GameClient/View.cpp
780780
Source/GameClient/Water.cpp
781781
Source/GameLogic/AI/AI.cpp
782782
Source/GameLogic/AI/AIDock.cpp

Generals/Code/GameEngine/Include/GameClient/View.h

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

Generals/Code/GameEngine/Source/GameClient/View.cpp

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

Generals/Code/GameEngineDevice/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ set(GAMEENGINEDEVICE_SRC
6060
Include/W3DDevice/GameClient/W3DTerrainVisual.h
6161
Include/W3DDevice/GameClient/W3DTreeBuffer.h
6262
# Include/W3DDevice/GameClient/W3DVideoBuffer.h
63-
Include/W3DDevice/GameClient/W3DView.h
63+
# Include/W3DDevice/GameClient/W3DView.h
6464
Include/W3DDevice/GameClient/W3DVolumetricShadow.h
6565
Include/W3DDevice/GameClient/W3DWater.h
6666
Include/W3DDevice/GameClient/W3DWaterTracks.h
@@ -158,7 +158,7 @@ set(GAMEENGINEDEVICE_SRC
158158
Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
159159
Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
160160
# Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
161-
Source/W3DDevice/GameClient/W3DView.cpp
161+
# Source/W3DDevice/GameClient/W3DView.cpp
162162
Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
163163
Source/W3DDevice/GameClient/W3DWebBrowser.cpp
164164
Source/W3DDevice/GameClient/Water/W3DWater.cpp

0 commit comments

Comments
 (0)