unify(heightmap): Merge Height Map related code and move Height Map and Terrain related files to Core #1991
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change contains commits of #1989
This change has 3 commits:
The first commit fixes include paths in Height Map related files, which is required when moving files to Core. The second commit merges all the various Height Map code and moves several Zero Hour specific source files to Core. The third commit moves all Height Map and Terrain related files to Core.
Zero Hour fixes
One minor Zero Hour specific mistake was identified in
TerrainTextureClass::update, where aIDirect3DSurface8was not released on a fail path.Generals changes
Generals get's a lot of changes. Most notably a huge refactor in
HeightMapandWorldHeightMap, which was split into more files and classes:BaseHeightMapandFlatHeightMap.It also gets most of the code for
DO_SEISMIC_SIMULATIONS, except inBunkerBusterBehavior. It is compiled out and therefore does nothing. In Zero Hour code I dialed back a bit of the excessive empty whitespace that it had added.It also gets all the changes for
W3DPropBufferandW3DTreeBuffer, which are owned byBaseHeightMap. They are practically unused because nothing gets added to them yet.W3DRoadBufferwas not fully merged yet, just partially merged to make it compile.WW3D2's shader and dx8caps, among many other files, only got the changes necessary to make it compile and run.