Making terrain query resolution a single float instead of a Vector2 (#7186)

* Making terrain query resolution a single float instead of a Vector2

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Keeping the concept of different x/y step sizes in region queries since that may be useful and is separate from query resolution. Also keeping the concept of different x/y step sizes in physics since that's independent of the terrain gem.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Formatting cleanups

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* A few more minor cleanups

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Added support to convert serialized Vector2 query resolution to a single float.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Switch ray intersection check back to using separate values for x and y resolution

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Fixing new unit tests added to use float query resolution.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Updating automated test

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

Code/Editor/GameExporter.cpp

@@ -317,8 +317,8 @@ void CGameExporter::ExportLevelInfo(const QString& path)
     root->setAttr("Name", levelName.toUtf8().data());
     auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
     const AZ::Aabb terrainAabb = terrain ? terrain->GetTerrainAabb() : AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
-    const AZ::Vector2 terrainGridResolution = terrain ? terrain->GetTerrainHeightQueryResolution() : AZ::Vector2::CreateOne();
-    const int compiledHeightmapSize = static_cast<int>(terrainAabb.GetXExtent() / terrainGridResolution.GetX());
+    const float terrainGridResolution = terrain ? terrain->GetTerrainHeightQueryResolution() : 1.0f;
+    const int compiledHeightmapSize = static_cast<int>(terrainAabb.GetXExtent() / terrainGridResolution);
     root->setAttr("HeightmapSize", compiledHeightmapSize);
 
     //////////////////////////////////////////////////////////////////////////

Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.cpp

@@ -378,7 +378,7 @@ namespace Physics
         m_cachedNativeHeightfield = cachedNativeHeightfield;
     }
 
-    AZ::Vector2 HeightfieldShapeConfiguration::GetGridResolution() const
+    const AZ::Vector2& HeightfieldShapeConfiguration::GetGridResolution() const
     {
         return m_gridResolution;
     }

Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.h

@@ -221,7 +221,7 @@ namespace Physics
         const void* GetCachedNativeHeightfield() const;
         void* GetCachedNativeHeightfield();
         void SetCachedNativeHeightfield(void* cachedNativeHeightfield);
-        AZ::Vector2 GetGridResolution() const;
+        const AZ::Vector2& GetGridResolution() const;
         void SetGridResolution(const AZ::Vector2& gridSpacing);
         int32_t GetNumColumns() const;
         void SetNumColumns(int32_t numColumns);
@@ -235,7 +235,7 @@ namespace Physics
         void SetMaxHeightBounds(float maxBounds);
 
     private:
-        //! The number of meters between each heightfield sample.
+        //! The number of meters between each heightfield sample in x and y.
         AZ::Vector2 m_gridResolution{ 1.0f };
         //! The number of columns in the heightfield sample grid.
         int32_t m_numColumns{ 0 };

Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h

@@ -50,8 +50,8 @@ namespace AzFramework
             static AZ::Vector3 GetDefaultTerrainNormal() { return AZ::Vector3::CreateAxisZ(); }
 
             // System-level queries to understand world size and resolution
-            virtual AZ::Vector2 GetTerrainHeightQueryResolution() const = 0;
-            virtual void SetTerrainHeightQueryResolution(AZ::Vector2 queryResolution) = 0;
+            virtual float GetTerrainHeightQueryResolution() const = 0;
+            virtual void SetTerrainHeightQueryResolution(float queryResolution) = 0;
 
             virtual AZ::Aabb GetTerrainAabb() const = 0;
             virtual void SetTerrainAabb(const AZ::Aabb& worldBounds) = 0;

Code/Framework/AzFramework/Tests/Mocks/Terrain/MockTerrainDataRequestBus.h

@@ -49,8 +49,8 @@ namespace UnitTest
             AzFramework::Terrain::TerrainDataRequestBus::Handler::BusDisconnect();
         }
 
-        MOCK_CONST_METHOD0(GetTerrainHeightQueryResolution, AZ::Vector2());
-        MOCK_METHOD1(SetTerrainHeightQueryResolution, void(AZ::Vector2));
+        MOCK_CONST_METHOD0(GetTerrainHeightQueryResolution, float());
+        MOCK_METHOD1(SetTerrainHeightQueryResolution, void(float));
         MOCK_CONST_METHOD0(GetTerrainAabb, AZ::Aabb());
         MOCK_METHOD1(SetTerrainAabb, void(const AZ::Aabb&));
         MOCK_CONST_METHOD3(GetHeight, float(const AZ::Vector3&, Sampler, bool*));