Parcourir la source

Clang format applied

Signed-off-by: Michał Pełka <[email protected]>
Michał Pełka il y a 3 mois
Parent
commit
466fcca8a2

+ 1 - 1
Gems/SimulationInterfaces/Code/Source/Clients/ROS2SimulationInterfacesSystemComponent.h

@@ -19,8 +19,8 @@
 #include "Services/GetSimulationStateServiceHandler.h"
 #include "Services/GetSimulationStateServiceHandler.h"
 #include "Services/GetSpawnablesServiceHandler.h"
 #include "Services/GetSpawnablesServiceHandler.h"
 #include "Services/ROS2ServiceBase.h"
 #include "Services/ROS2ServiceBase.h"
-#include "Services/SetEntityStateServiceHandler.h"
 #include "Services/ResetSimulationServiceHandler.h"
 #include "Services/ResetSimulationServiceHandler.h"
+#include "Services/SetEntityStateServiceHandler.h"
 #include "Services/SetSimulationStateServiceHandler.h"
 #include "Services/SetSimulationStateServiceHandler.h"
 #include "Services/SpawnEntityServiceHandler.h"
 #include "Services/SpawnEntityServiceHandler.h"
 #include "Services/StepSimulationServiceHandler.h"
 #include "Services/StepSimulationServiceHandler.h"

+ 0 - 1
Gems/SimulationInterfaces/Code/Source/Clients/SimulationEntitiesManager.cpp

@@ -487,7 +487,6 @@ namespace SimulationInterfaces
             for (const auto& descendant : entityAndDescendants)
             for (const auto& descendant : entityAndDescendants)
             {
             {
                 AzPhysics::SimulatedBodyComponentRequestsBus::Event(descendant, &AzPhysics::SimulatedBodyComponentRequests::DisablePhysics);
                 AzPhysics::SimulatedBodyComponentRequestsBus::Event(descendant, &AzPhysics::SimulatedBodyComponentRequests::DisablePhysics);
-
             }
             }
             if (parentEntityId.IsValid())
             if (parentEntityId.IsValid())
             {
             {

+ 1 - 3
Gems/SimulationInterfaces/Code/Source/Services/SpawnEntityServiceHandler.h

@@ -9,9 +9,9 @@
 #pragma once
 #pragma once
 
 
 #include "ROS2ServiceBase.h"
 #include "ROS2ServiceBase.h"
+#include <AzCore/std/string/regex.h>
 #include <AzCore/std/string/string_view.h>
 #include <AzCore/std/string/string_view.h>
 #include <simulation_interfaces/srv/spawn_entity.hpp>
 #include <simulation_interfaces/srv/spawn_entity.hpp>
-#include <AzCore/std/string/regex.h>
 namespace ROS2SimulationInterfaces
 namespace ROS2SimulationInterfaces
 {
 {
     class SpawnEntityServiceHandler : public ROS2ServiceBase<simulation_interfaces::srv::SpawnEntity>
     class SpawnEntityServiceHandler : public ROS2ServiceBase<simulation_interfaces::srv::SpawnEntity>
@@ -33,8 +33,6 @@ namespace ROS2SimulationInterfaces
     private:
     private:
         bool ValidateEntityName(const AZStd::string& entityName);
         bool ValidateEntityName(const AZStd::string& entityName);
         bool ValidateFrameName(const AZStd::string& frameName);
         bool ValidateFrameName(const AZStd::string& frameName);
-
-
     };
     };
 
 
 } // namespace ROS2SimulationInterfaces
 } // namespace ROS2SimulationInterfaces

+ 1 - 2
Gems/SimulationInterfaces/Code/Source/Services/StepSimulationServiceHandler.cpp

@@ -16,8 +16,7 @@ namespace ROS2SimulationInterfaces
 
 
     AZStd::unordered_set<AZ::u8> StepSimulationServiceHandler::GetProvidedFeatures()
     AZStd::unordered_set<AZ::u8> StepSimulationServiceHandler::GetProvidedFeatures()
     {
     {
-        return AZStd::unordered_set<AZ::u8>{ SimulationFeatures::STEP_SIMULATION_SINGLE,
-                                             SimulationFeatures::STEP_SIMULATION_MULTIPLE };
+        return AZStd::unordered_set<AZ::u8>{ SimulationFeatures::STEP_SIMULATION_SINGLE, SimulationFeatures::STEP_SIMULATION_MULTIPLE };
     }
     }
 
 
     AZStd::optional<StepSimulationServiceHandler::Response> StepSimulationServiceHandler::HandleServiceRequest(
     AZStd::optional<StepSimulationServiceHandler::Response> StepSimulationServiceHandler::HandleServiceRequest(

+ 1 - 1
Gems/SimulationInterfaces/Code/Source/Services/StepSimulationServiceHandler.h

@@ -9,9 +9,9 @@
 #pragma once
 #pragma once
 
 
 #include "ROS2ServiceBase.h"
 #include "ROS2ServiceBase.h"
+#include <AzCore/Component/TickBus.h>
 #include <AzCore/std/string/string_view.h>
 #include <AzCore/std/string/string_view.h>
 #include <simulation_interfaces/srv/step_simulation.hpp>
 #include <simulation_interfaces/srv/step_simulation.hpp>
-#include <AzCore/Component/TickBus.h>
 namespace ROS2SimulationInterfaces
 namespace ROS2SimulationInterfaces
 {
 {
 
 

+ 1 - 1
Gems/SimulationInterfaces/Code/Source/SimulationInterfacesModuleInterface.cpp

@@ -13,8 +13,8 @@
 
 
 #include "Clients/SimulationFeaturesAggregator.h"
 #include "Clients/SimulationFeaturesAggregator.h"
 #include "Clients/SimulationManager.h"
 #include "Clients/SimulationManager.h"
-#include <Clients/SimulationEntitiesManager.h>
 #include <Clients/ROS2SimulationInterfacesSystemComponent.h>
 #include <Clients/ROS2SimulationInterfacesSystemComponent.h>
+#include <Clients/SimulationEntitiesManager.h>
 
 
 namespace SimulationInterfaces
 namespace SimulationInterfaces
 {
 {

+ 1 - 1
Gems/SimulationInterfaces/Code/Tests/Clients/ROS2SimulationInterfacesTest.cpp

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  *
  */
  */
- 
+
 #include <AzTest/AzTest.h>
 #include <AzTest/AzTest.h>
 
 
 AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV);
 AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV);

+ 8 - 3
Gems/SimulationInterfaces/Code/Tests/Tools/Mocks/SimulationEntityManagerMock.h

@@ -27,7 +27,12 @@ namespace UnitTest
         MOCK_METHOD0(ResetAllEntitiesToInitialState, void());
         MOCK_METHOD0(ResetAllEntitiesToInitialState, void());
         MOCK_METHOD6(
         MOCK_METHOD6(
             SpawnEntity,
             SpawnEntity,
-            void(const AZStd::string& name, const AZStd::string& uri, const AZStd::string& entityNamespace, const AZ::Transform& initialPose, const bool allowRename, SpawnCompletedCb completedCb));
-
+            void(
+                const AZStd::string& name,
+                const AZStd::string& uri,
+                const AZStd::string& entityNamespace,
+                const AZ::Transform& initialPose,
+                const bool allowRename,
+                SpawnCompletedCb completedCb));
     };
     };
-}
+} // namespace UnitTest