Skip to content

unify(heightmap): Merge Height Map related code and move Height Map and Terrain related files to Core #1991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 3 commits into from
Dec 15, 2025
Merged

unify(heightmap): Merge Height Map related code and move Height Map and Terrain related files to Core #1991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd11c9f
build(heightmap): Fix include paths in Zero Hour Height Map files (#1…
xezon Dec 13, 2025
9be7927
unify(heightmap): Merge Height Map related code and move Zero Hour's …
xezon Dec 14, 2025
8726aee
unify(heightmap): Move Height Map and Terrain related files to Core (…
xezon Dec 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Core/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ set(GAMEENGINE_SRC
# Include/Common/List.h
Include/Common/LocalFile.h
Include/Common/LocalFileSystem.h
# Include/Common/MapObject.h
Include/Common/MapObject.h
# Include/Common/MapReaderWriterInfo.h
# Include/Common/MessageStream.h
Include/Common/MiniDumper.h
Expand Down Expand Up @@ -204,7 +204,7 @@ set(GAMEENGINE_SRC
# Include/GameClient/Line2D.h
# Include/GameClient/LoadScreen.h
# Include/GameClient/LookAtXlat.h
# Include/GameClient/MapUtil.h
Include/GameClient/MapUtil.h
# Include/GameClient/MessageBox.h
# Include/GameClient/MetaEvent.h
# Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
Expand All @@ -224,10 +224,10 @@ set(GAMEENGINE_SRC
# Include/GameClient/ShellHooks.h
# Include/GameClient/ShellMenuScheme.h
Include/GameClient/Smudge.h
# Include/GameClient/Snow.h
Include/GameClient/Snow.h
# Include/GameClient/Statistics.h
# Include/GameClient/TerrainRoads.h
# Include/GameClient/TerrainVisual.h
Include/GameClient/TerrainRoads.h
Include/GameClient/TerrainVisual.h
Include/GameClient/VideoPlayer.h
Include/GameClient/View.h
Include/GameClient/Water.h
Expand Down Expand Up @@ -807,7 +807,7 @@ set(GAMEENGINE_SRC
# Source/GameClient/Input/Mouse.cpp
# Source/GameClient/LanguageFilter.cpp
# Source/GameClient/Line2D.cpp
# Source/GameClient/MapUtil.cpp
Source/GameClient/MapUtil.cpp
# Source/GameClient/MessageStream/CommandXlat.cpp
# Source/GameClient/MessageStream/GUICommandTranslator.cpp
# Source/GameClient/MessageStream/HintSpy.cpp
Expand All @@ -820,7 +820,7 @@ set(GAMEENGINE_SRC
Source/GameClient/ParabolicEase.cpp
# Source/GameClient/RadiusDecal.cpp
# Source/GameClient/SelectionInfo.cpp
# Source/GameClient/Snow.cpp
Source/GameClient/Snow.cpp
# Source/GameClient/Statistics.cpp
# Source/GameClient/System/Anim2D.cpp
# Source/GameClient/System/CampaignManager.cpp
Expand All @@ -830,8 +830,8 @@ set(GAMEENGINE_SRC
# Source/GameClient/System/ParticleSys.cpp
# Source/GameClient/System/RayEffect.cpp
Source/GameClient/System/Smudge.cpp
# Source/GameClient/Terrain/TerrainRoads.cpp
# Source/GameClient/Terrain/TerrainVisual.cpp
Source/GameClient/Terrain/TerrainRoads.cpp
Source/GameClient/Terrain/TerrainVisual.cpp
Source/GameClient/VideoPlayer.cpp
Source/GameClient/VideoStream.cpp
Source/GameClient/View.cpp
Expand Down
0 ...ode/GameEngine/Include/Common/MapObject.h → Core/GameEngine/Include/Common/MapObject.h
View file
Open in desktop
File renamed without changes.
0 ...e/GameEngine/Include/GameClient/MapUtil.h → Core/GameEngine/Include/GameClient/MapUtil.h
View file
Open in desktop
File renamed without changes.
0 ...Code/GameEngine/Include/GameClient/Snow.h → Core/GameEngine/Include/GameClient/Snow.h
View file
Open in desktop
File renamed without changes.
0 ...eEngine/Include/GameClient/TerrainRoads.h → ...eEngine/Include/GameClient/TerrainRoads.h
View file
Open in desktop
File renamed without changes.
12 changes: 0 additions & 12 deletions ...Engine/Include/GameClient/TerrainVisual.h → ...Engine/Include/GameClient/TerrainVisual.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ struct SeismicSimulationNode;
class SeismicSimulationFilterBase;




#define DEFAULT_SEISMIC_SIMULATION_MAGNITUDE (20.0f)
struct SeismicSimulationNode; // just a forward declaration folks, no cause for alarm
class SeismicSimulationFilterBase
Expand All @@ -65,10 +63,6 @@ class SeismicSimulationFilterBase
virtual Real applyGravityCallback( Real velocityIn ) = 0;
};





struct SeismicSimulationNode
{
SeismicSimulationNode()
Expand Down Expand Up @@ -159,11 +153,6 @@ class DomeStyleSeismicFilter : public SeismicSimulationFilterBase
};







//-------------------------------------------------------------------------------------------------
/** LOD values for terrain, keep this in sync with TerrainLODNames[] */
//-------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -303,7 +292,6 @@ class TerrainVisual : public Snapshot,
////////////////////////////////////////////////////



/// Replace the skybox texture
virtual void replaceSkyboxTextures(const AsciiString *oldTexName[NumSkyboxTextures], const AsciiString *newTexName[NumSkyboxTextures])=0;

Expand Down
0 .../GameEngine/Source/GameClient/MapUtil.cpp → .../GameEngine/Source/GameClient/MapUtil.cpp
View file
Open in desktop
File renamed without changes.
0 ...ode/GameEngine/Source/GameClient/Snow.cpp → Core/GameEngine/Source/GameClient/Snow.cpp
View file
Open in desktop
File renamed without changes.
0 ...ource/GameClient/Terrain/TerrainRoads.cpp → ...ource/GameClient/Terrain/TerrainRoads.cpp
View file
Open in desktop
File renamed without changes.
5 changes: 0 additions & 5 deletions ...urce/GameClient/Terrain/TerrainVisual.cpp → ...urce/GameClient/Terrain/TerrainVisual.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,6 @@ void TerrainVisual::loadPostProcess( void )
}







SeismicSimulationFilterBase::SeismicSimStatusCode DomeStyleSeismicFilter::filterCallback( WorldHeightMapInterfaceClass *heightMap, const SeismicSimulationNode *node )
{

Expand Down
56 changes: 28 additions & 28 deletions Core/GameEngineDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ set(GAMEENGINEDEVICE_SRC
# Include/W3DDevice/Common/W3DModuleFactory.h
Include/W3DDevice/Common/W3DRadar.h
# Include/W3DDevice/Common/W3DThingFactory.h
# Include/W3DDevice/GameClient/BaseHeightMap.h
Include/W3DDevice/GameClient/BaseHeightMap.h
# Include/W3DDevice/GameClient/camerashakesystem.h
# Include/W3DDevice/GameClient/FlatHeightMap.h
# Include/W3DDevice/GameClient/HeightMap.h
Include/W3DDevice/GameClient/FlatHeightMap.h
Include/W3DDevice/GameClient/HeightMap.h
# Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
# Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h
# Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h
Expand All @@ -20,17 +20,17 @@ set(GAMEENGINEDEVICE_SRC
# Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h
# Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h
# Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h
# Include/W3DDevice/GameClient/Module/W3DPropDraw.h
Include/W3DDevice/GameClient/Module/W3DPropDraw.h
# Include/W3DDevice/GameClient/Module/W3DRopeDraw.h
# Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
# Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h
# Include/W3DDevice/GameClient/Module/W3DTankDraw.h
# Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h
# Include/W3DDevice/GameClient/Module/W3DTracerDraw.h
# Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
# Include/W3DDevice/GameClient/Module/W3DTruckDraw.h
# Include/W3DDevice/GameClient/TerrainTex.h
# Include/W3DDevice/GameClient/TileData.h
Include/W3DDevice/GameClient/TerrainTex.h
Include/W3DDevice/GameClient/TileData.h
# Include/W3DDevice/GameClient/W3DAssetManager.h
# Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
# Include/W3DDevice/GameClient/W3DBibBuffer.h
Expand All @@ -57,27 +57,27 @@ set(GAMEENGINEDEVICE_SRC
# Include/W3DDevice/GameClient/W3DParticleSys.h
# Include/W3DDevice/GameClient/W3DPoly.h
# Include/W3DDevice/GameClient/W3DProjectedShadow.h
# Include/W3DDevice/GameClient/W3DPropBuffer.h
Include/W3DDevice/GameClient/W3DPropBuffer.h
# Include/W3DDevice/GameClient/W3DRoadBuffer.h
# Include/W3DDevice/GameClient/W3DScene.h
Include/W3DDevice/GameClient/W3DShaderManager.h
# Include/W3DDevice/GameClient/W3DShadow.h
# Include/W3DDevice/GameClient/W3DShroud.h
Include/W3DDevice/GameClient/W3DSmudge.h
# Include/W3DDevice/GameClient/W3DSnow.h
Include/W3DDevice/GameClient/W3DSnow.h
# Include/W3DDevice/GameClient/W3DStatusCircle.h
# Include/W3DDevice/GameClient/W3DTerrainBackground.h
# Include/W3DDevice/GameClient/W3DTerrainTracks.h
# Include/W3DDevice/GameClient/W3DTerrainVisual.h
# Include/W3DDevice/GameClient/W3DTreeBuffer.h
Include/W3DDevice/GameClient/W3DTerrainBackground.h
Include/W3DDevice/GameClient/W3DTerrainTracks.h
Include/W3DDevice/GameClient/W3DTerrainVisual.h
Include/W3DDevice/GameClient/W3DTreeBuffer.h
Include/W3DDevice/GameClient/W3DVideoBuffer.h
Include/W3DDevice/GameClient/W3DView.h
# Include/W3DDevice/GameClient/W3DVolumetricShadow.h
Include/W3DDevice/GameClient/W3DWater.h
Include/W3DDevice/GameClient/W3DWaterTracks.h
# Include/W3DDevice/GameClient/W3DWaypointBuffer.h
# Include/W3DDevice/GameClient/W3DWebBrowser.h
# Include/W3DDevice/GameClient/WorldHeightMap.h
Include/W3DDevice/GameClient/WorldHeightMap.h
# Include/W3DDevice/GameLogic/W3DGameLogic.h
# Include/W3DDevice/GameLogic/W3DGhostObject.h
# Include/W3DDevice/GameLogic/W3DTerrainLogic.h
Expand All @@ -97,7 +97,7 @@ set(GAMEENGINEDEVICE_SRC
# Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
# Source/W3DDevice/Common/Thing/W3DThingFactory.cpp
# Source/W3DDevice/Common/W3DConvert.cpp
# Source/W3DDevice/GameClient/BaseHeightMap.cpp
Source/W3DDevice/GameClient/BaseHeightMap.cpp
Source/W3DDevice/GameClient/CameraShakeSystem.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
Expand All @@ -109,16 +109,16 @@ set(GAMEENGINEDEVICE_SRC
# Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTruckDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DPoliceCarDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DProjectileStreamDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp
Source/W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DScienceModelDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DSupplyDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp
Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp
# Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp
# Source/W3DDevice/GameClient/FlatHeightMap.cpp
Source/W3DDevice/GameClient/FlatHeightMap.cpp
# Source/W3DDevice/GameClient/GUI/Gadget/W3DCheckBox.cpp
# Source/W3DDevice/GameClient/GUI/Gadget/W3DComboBox.cpp
# Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp
Expand All @@ -136,13 +136,13 @@ set(GAMEENGINEDEVICE_SRC
# Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp
# Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp
# Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp
# Source/W3DDevice/GameClient/HeightMap.cpp
Source/W3DDevice/GameClient/HeightMap.cpp
# Source/W3DDevice/GameClient/Shadow/W3DBufferManager.cpp
# Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
# Source/W3DDevice/GameClient/Shadow/W3DShadow.cpp
# Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp
# Source/W3DDevice/GameClient/TerrainTex.cpp
# Source/W3DDevice/GameClient/TileData.cpp
Source/W3DDevice/GameClient/TerrainTex.cpp
Source/W3DDevice/GameClient/TileData.cpp
# Source/W3DDevice/GameClient/W3DAssetManager.cpp
# Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
# Source/W3DDevice/GameClient/W3DBibBuffer.cpp
Expand All @@ -160,25 +160,25 @@ set(GAMEENGINEDEVICE_SRC
# Source/W3DDevice/GameClient/W3DMouse.cpp
# Source/W3DDevice/GameClient/W3DParticleSys.cpp
# Source/W3DDevice/GameClient/W3DPoly.cpp
# Source/W3DDevice/GameClient/W3DPropBuffer.cpp
Source/W3DDevice/GameClient/W3DPropBuffer.cpp
# Source/W3DDevice/GameClient/W3DRoadBuffer.cpp
# Source/W3DDevice/GameClient/W3DScene.cpp
Source/W3DDevice/GameClient/W3DShaderManager.cpp
# Source/W3DDevice/GameClient/W3DShroud.cpp
Source/W3DDevice/GameClient/W3DSmudge.cpp
# Source/W3DDevice/GameClient/W3DSnow.cpp
Source/W3DDevice/GameClient/W3DSnow.cpp
# Source/W3DDevice/GameClient/W3DStatusCircle.cpp
# Source/W3DDevice/GameClient/W3DTerrainBackground.cpp
# Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
# Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
# Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
Source/W3DDevice/GameClient/W3DTerrainBackground.cpp
Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
Source/W3DDevice/GameClient/W3DView.cpp
# Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
# Source/W3DDevice/GameClient/W3DWebBrowser.cpp
Source/W3DDevice/GameClient/Water/W3DWater.cpp
Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
# Source/W3DDevice/GameClient/WorldHeightMap.cpp
Source/W3DDevice/GameClient/WorldHeightMap.cpp
# Source/W3DDevice/GameLogic/W3DGameLogic.cpp
# Source/W3DDevice/GameLogic/W3DGhostObject.cpp
# Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
Expand Down
2 changes: 1 addition & 1 deletion ...lude/W3DDevice/GameClient/BaseHeightMap.h → ...lude/W3DDevice/GameClient/BaseHeightMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "vertmaterial.h"
#include "Lib/BaseType.h"
#include "Common/GameType.h"
#include "WorldHeightMap.h"
#include "W3DDevice/GameClient/WorldHeightMap.h"

#define MAX_ENABLED_DYNAMIC_LIGHTS 20
typedef UnsignedByte HeightSampleType; //type of data to store in heightmap
Expand Down
4 changes: 2 additions & 2 deletions ...lude/W3DDevice/GameClient/FlatHeightMap.h → ...lude/W3DDevice/GameClient/FlatHeightMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
#include "vertmaterial.h"
#include "Lib/BaseType.h"
#include "Common/GameType.h"
#include "WorldHeightMap.h"
#include "BaseHeightMap.h"
#include "W3DDevice/GameClient/WorldHeightMap.h"
#include "W3DDevice/GameClient/BaseHeightMap.h"

class W3DTerrainBackground;
/// Custom render object that draws the heightmap and handles intersection tests.
Expand Down
4 changes: 2 additions & 2 deletions .../Include/W3DDevice/GameClient/HeightMap.h → .../Include/W3DDevice/GameClient/HeightMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
#include "vertmaterial.h"
#include "Lib/BaseType.h"
#include "Common/GameType.h"
#include "WorldHeightMap.h"
#include "BaseHeightMap.h"
#include "W3DDevice/GameClient/WorldHeightMap.h"
#include "W3DDevice/GameClient/BaseHeightMap.h"

#define VERTEX_BUFFER_TILE_LENGTH 32 //tiles of side length 32 (grid of 33x33 vertices).

Expand Down
0 ...W3DDevice/GameClient/Module/W3DPropDraw.h → ...W3DDevice/GameClient/Module/W3DPropDraw.h
View file
Open in desktop
File renamed without changes.
0 ...W3DDevice/GameClient/Module/W3DTreeDraw.h → ...W3DDevice/GameClient/Module/W3DTreeDraw.h
View file
Open in desktop
File renamed without changes.
0 ...Include/W3DDevice/GameClient/TerrainTex.h → ...Include/W3DDevice/GameClient/TerrainTex.h
View file
Open in desktop
File renamed without changes.
0 ...e/Include/W3DDevice/GameClient/TileData.h → ...e/Include/W3DDevice/GameClient/TileData.h
View file
Open in desktop
File renamed without changes.
0 ...lude/W3DDevice/GameClient/W3DPropBuffer.h → ...lude/W3DDevice/GameClient/W3DPropBuffer.h
View file
Open in desktop
File renamed without changes.
0 ...ce/Include/W3DDevice/GameClient/W3DSnow.h → ...ce/Include/W3DDevice/GameClient/W3DSnow.h
View file
Open in desktop
File renamed without changes.
0 ...DDevice/GameClient/W3DTerrainBackground.h → ...DDevice/GameClient/W3DTerrainBackground.h
View file
Open in desktop
File renamed without changes.
0 ...e/W3DDevice/GameClient/W3DTerrainTracks.h → ...e/W3DDevice/GameClient/W3DTerrainTracks.h
View file
Open in desktop
File renamed without changes.
16 changes: 0 additions & 16 deletions ...e/W3DDevice/GameClient/W3DTerrainVisual.h → ...e/W3DDevice/GameClient/W3DTerrainVisual.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ class WaterHandle;
class BaseHeightMapRenderObjClass;
class WorldHeightMap;







//-------------------------------------------------------------------------------------------------
/** W3D impelmentation of visual terrain details singleton */
//-------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -150,18 +144,13 @@ class W3DTerrainVisual : public TerrainVisual
////////////////////////////////////////////////////
////////////////////////////////////////////////////




protected:

// snapshot methods
virtual void crc( Xfer *xfer );
virtual void xfer( Xfer *xfer );
virtual void loadPostProcess( void );



#ifdef DO_SEISMIC_SIMULATIONS
////////////////////////////////////////////////////
////////////////////////////////////////////////////
Expand All @@ -175,8 +164,6 @@ class W3DTerrainVisual : public TerrainVisual
////////////////////////////////////////////////////
#endif



BaseHeightMapRenderObjClass *m_terrainRenderObject; ///< W3D render object for terrain
WaterRenderObjClass *m_waterRenderObject; ///< W3D render object for water plane

Expand All @@ -191,7 +178,4 @@ class W3DTerrainVisual : public TerrainVisual
AsciiString m_currentSkyboxTexNames[NumSkyboxTextures]; ///<store current texture names applied to skybox.
AsciiString m_initialSkyboxTexNames[NumSkyboxTextures]; ///<store starting texture/default skybox textures.




};
0 ...lude/W3DDevice/GameClient/W3DTreeBuffer.h → ...lude/W3DDevice/GameClient/W3DTreeBuffer.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ude/W3DDevice/GameClient/WorldHeightMap.h → ...ude/W3DDevice/GameClient/WorldHeightMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "WWLib/refcount.h"
#include "WWMath/vector3.h"
#include "W3DDevice/GameClient/TileData.h"
#include "../../GameEngine/Include/Common/MapObject.h"
#include "Common/MapObject.h"

#include "Common/STLTypedefs.h"
typedef std::vector<ICoord2D> VecICoord2D;
Expand Down
1 change: 1 addition & 0 deletions ...ce/W3DDevice/GameClient/BaseHeightMap.cpp → ...ce/W3DDevice/GameClient/BaseHeightMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
#include <d3dx8core.h>
#include "Common/GlobalData.h"
#include "Common/PerfTimer.h"
#include "Common/Xfer.h"

#include "GameClient/TerrainVisual.h"
#include "GameClient/View.h"
Expand Down
0 .../GameClient/Drawable/Draw/W3DPropDraw.cpp → .../GameClient/Drawable/Draw/W3DPropDraw.cpp
View file
Open in desktop
File renamed without changes.
0 .../GameClient/Drawable/Draw/W3DTreeDraw.cpp → .../GameClient/Drawable/Draw/W3DTreeDraw.cpp
View file
Open in desktop
File renamed without changes.
0 ...ce/W3DDevice/GameClient/FlatHeightMap.cpp → ...ce/W3DDevice/GameClient/FlatHeightMap.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions ...Source/W3DDevice/GameClient/HeightMap.cpp → ...Source/W3DDevice/GameClient/HeightMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@
//-----------------------------------------------------------------------------
// Includes
//-----------------------------------------------------------------------------


#include "W3DDevice/GameClient/HeightMap.h"

#ifndef USE_FLAT_HEIGHT_MAP // Flat height map uses flattened textures. jba. [3/20/2003]
Expand Down
2 changes: 1 addition & 1 deletion ...ource/W3DDevice/GameClient/TerrainTex.cpp → ...ource/W3DDevice/GameClient/TerrainTex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ int TerrainTextureClass::update(WorldHeightMap *htMap)
DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0, &surface_level));
DX8_ErrorCode(surface_level->GetDesc(&surface_desc));
if (surface_desc.Width < TEXTURE_WIDTH) {
surface_level->Release();
return 0;
}

Expand Down Expand Up @@ -944,7 +945,6 @@ void CloudMapTerrainTextureClass::Apply(unsigned int stage)

// Do the base apply.
TextureClass::Apply(stage);
return;
#if 0 // obsolete
/* previous setup */
if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
Expand Down
0 .../Source/W3DDevice/GameClient/TileData.cpp → .../Source/W3DDevice/GameClient/TileData.cpp
View file
Open in desktop
File renamed without changes.
0 ...ce/W3DDevice/GameClient/W3DPropBuffer.cpp → ...ce/W3DDevice/GameClient/W3DPropBuffer.cpp
View file
Open in desktop
File renamed without changes.
0 ...e/Source/W3DDevice/GameClient/W3DSnow.cpp → ...e/Source/W3DDevice/GameClient/W3DSnow.cpp
View file
Open in desktop
File renamed without changes.
0 ...evice/GameClient/W3DTerrainBackground.cpp → ...evice/GameClient/W3DTerrainBackground.cpp
View file
Open in desktop
File renamed without changes.
0 ...W3DDevice/GameClient/W3DTerrainTracks.cpp → ...W3DDevice/GameClient/W3DTerrainTracks.cpp
View file
Open in desktop
File renamed without changes.
Loading
Loading