Review changes

Signed-off-by: Aleksander Kamiński <[email protected]>
o3de · Aug 26, 2024 · 4911c8a · 4911c8a
1 parent 929629f
commit 4911c8a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/Gems/ROS2/Code/Include/ROS2/Lidar/RaycastResults.h b/Gems/ROS2/Code/Include/ROS2/Lidar/RaycastResults.h
@@ -63,9 +63,6 @@ namespace ROS2
         RaycastResults(RaycastResults&& other);
 
         [[nodiscard]] bool IsEmpty() const;
-        template<RaycastResultFlags F>
-        [[nodiscard]] bool IsFlagSatisfied(RaycastResultFlags requestedFlags) const;
-        [[nodiscard]] bool SatisfiesResultFlags(RaycastResultFlags flags) const;
 
         template<RaycastResultFlags F>
         [[nodiscard]] bool IsFieldPresent() const;
@@ -109,12 +106,6 @@ namespace ROS2
         FieldInternal<RaycastResultFlags::Intensity> m_intensities;
     };
 
-    template<RaycastResultFlags F>
-    bool RaycastResults::IsFlagSatisfied(RaycastResultFlags requestedFlags) const
-    {
-        return !IsFlagEnabled(F, requestedFlags) || IsFieldPresent<F>();
-    }
-
     template<RaycastResultFlags F>
     bool RaycastResults::IsFieldPresent() const
     {

diff --git a/Gems/ROS2/Code/Source/Lidar/LidarCore.cpp b/Gems/ROS2/Code/Source/Lidar/LidarCore.cpp
@@ -183,7 +183,7 @@ namespace ROS2
         AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationRequests::FindEntity, m_entityId);
         const auto entityTransform = entity->FindComponent<AzFramework::TransformComponent>();
 
-        AZ::Outcome<RaycastResults, const char*> results = AZ::Failure("EBus failure occured.");
+        AZ::Outcome<RaycastResults, const char*> results = AZ::Failure("EBus failure occurred.");
         LidarRaycasterRequestBus::EventResult(
             results, m_lidarRaycasterId, &LidarRaycasterRequestBus::Events::PerformRaycast, entityTransform->GetWorldTM());
         if (!results.IsSuccess())

diff --git a/Gems/ROS2/Code/Source/Lidar/RaycastResults.cpp b/Gems/ROS2/Code/Source/Lidar/RaycastResults.cpp
@@ -18,8 +18,12 @@ namespace ROS2
     }
 
     RaycastResults::RaycastResults(RaycastResults&& other)
+        : m_count{ other.m_count }
+        , m_points{ AZStd::move(other.m_points) }
+        , m_ranges{ AZStd::move(other.m_ranges) }
+        , m_intensities{ AZStd::move(other.m_intensities) }
     {
-        *this = other;
+        other.m_count = 0U;
     }
 
     void RaycastResults::Clear()
@@ -60,12 +64,6 @@ namespace ROS2
         return GetCount() == 0U;
     }
 
-    bool RaycastResults::SatisfiesResultFlags(RaycastResultFlags flags) const
-    {
-        return IsFlagSatisfied<RaycastResultFlags::Point>(flags) && IsFlagSatisfied<RaycastResultFlags::Range>(flags) &&
-            IsFlagSatisfied<RaycastResultFlags::Intensity>(flags);
-    }
-
     size_t RaycastResults::GetCount() const
     {
         return m_count;