birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixes for terrain surface data. (#4508)

Browse Source 
* Bugfixes for terrain surface data.
1. Changed the TerrainSurfaceDataSystem component to query for all the surface types, now that we have them.
2. Added dependency tracking to the TerrainSurfaceGradientList component so that it will refresh terrain data when any of its data changes.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Addressed PR feedback

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
This commit is contained in:
Mike Balfour
2021-10-06 10:48:01 -05:00
committed by GitHub
parent 032939d395
commit 4b6c93f289
3 changed files with 58 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Terrain/Code/Source/Components/TerrainSurfaceDataSystemComponent.cpp
+10
View File
@@ -156,9 +156,19 @@ namespace Terrain
point.m_entityId = GetEntityId();
point.m_position = AZ::Vector3(inPosition.GetX(), inPosition.GetY(), terrainHeight);
point.m_normal = terrain->GetNormal(inPosition);
// Always add a "terrain" or "terrainHole" tag.
const AZ::Crc32 terrainTag =
isHole ? SurfaceData::Constants::s_terrainHoleTagCrc : SurfaceData::Constants::s_terrainTagCrc;
SurfaceData::AddMaxValueForMasks(point.m_masks, terrainTag, 1.0f);
// Add all of the surface tags that the terrain has at this point.
AzFramework::SurfaceData::OrderedSurfaceTagWeightSet surfaceWeights;
terrain->GetSurfaceWeights(point.m_position, surfaceWeights);
for (auto& tag : surfaceWeights)
{
SurfaceData::AddMaxValueForMasks(point.m_masks, tag.m_surfaceType, tag.m_weight);
}
surfacePointList.push_back(point);
}
// Only one handler should exist.