Skip to content

Commit 911ece7

Browse files
xezonxezon
committed
unify(view): Move View, W3DView to Core (#1904)
1 parent 0d0107d commit 911ece7

File tree

11 files changed

+15
-14
lines changed

11 files changed

+15
-14
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

‎GeneralsMD/Code/GameEngine/Include/GameClient/View.h‎ renamed to ‎Core/GameEngine/Include/GameClient/View.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp‎ renamed to ‎Core/GameEngine/Source/GameClient/View.cpp‎

File renamed without changes.

‎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

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

File renamed without changes.

‎GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp‎ renamed to ‎Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp‎

File renamed without changes.

‎Generals/Code/GameEngine/Include/GameClient/Display.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@
2929
#pragma once
3030

3131
#include "Common/SubsystemInterface.h"
32-
#include "View.h"
3332
#include "GameClient/Color.h"
3433
#include "GameClient/GameFont.h"
35-
36-
class View;
34+
#include "GameClient/View.h"
3735

3836
struct ShroudLevel
3937
{

‎GeneralsMD/Code/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/TerrainRoads.h
225225
Include/GameClient/TerrainVisual.h
226226
# Include/GameClient/VideoPlayer.h
227-
Include/GameClient/View.h
227+
# Include/GameClient/View.h
228228
Include/GameClient/Water.h
229229
Include/GameClient/WindowLayout.h
230230
# Include/GameClient/WindowVideoManager.h
@@ -824,7 +824,7 @@ set(GAMEENGINE_SRC
824824
Source/GameClient/Terrain/TerrainVisual.cpp
825825
# Source/GameClient/VideoPlayer.cpp
826826
# Source/GameClient/VideoStream.cpp
827-
Source/GameClient/View.cpp
827+
# Source/GameClient/View.cpp
828828
Source/GameClient/Water.cpp
829829
Source/GameLogic/AI/AI.cpp
830830
Source/GameLogic/AI/AIDock.cpp

‎GeneralsMD/Code/GameEngine/Include/GameClient/Display.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@
2929
#pragma once
3030

3131
#include "Common/SubsystemInterface.h"
32-
#include "View.h"
3332
#include "GameClient/Color.h"
3433
#include "GameClient/GameFont.h"
35-
36-
class View;
34+
#include "GameClient/View.h"
3735

3836
struct ShroudLevel
3937
{

‎GeneralsMD/Code/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

0 commit comments

Comments
 (0)