2
0
Эх сурвалжийг харах

Reset manipulator target position when it fails picking an apple

Signed-off-by: Paweł Budziszewski <[email protected]>
Signed-off-by: Michał Pełka <[email protected]>
Paweł Budziszewski 2 жил өмнө
parent
commit
a8184b6a27

+ 1 - 0
Project/Gem/Source/ApplePicker/KrakenEffectorComponent.cpp

@@ -487,6 +487,7 @@ namespace AppleKraken
                 [this]()
                 {
                     ManipulatorRequestBus::Event(m_manipulatorEntity, &ManipulatorRequest::RetrieveNose);
+                    ManipulatorRequestBus::Event(m_manipulatorEntity, &ManipulatorRequest::ResetApple);
                 },
             },
         };

+ 4 - 0
Project/Gem/Source/Manipulator/KrakenManipulatorController.cpp

@@ -200,6 +200,10 @@ namespace AppleKraken
         AZ_Printf("ManipulatorController", "Retrieve\n");
         m_time_XZ_ok = std::numeric_limits<float>::lowest();
         m_noseRetrieveRequest = true;
+        ResetApple();
+    };
+    void ManipulatorController::ResetApple()
+    {
         m_desiredApple.reset();
     };
     void ManipulatorController::RetrieveNose()

+ 1 - 0
Project/Gem/Source/Manipulator/KrakenManipulatorController.h

@@ -43,6 +43,7 @@ namespace AppleKraken
         void PickApple(const AZ::Vector3 position) override;
         AZ::Vector3 GetPosition() override;
         void Retrieve() override;
+        void ResetApple() override;
         void RetrieveNose() override;
         int GetStatus() override;
         bool IsNoseRetreived() override;

+ 1 - 0
Project/Gem/Source/Manipulator/ManipulatorRequestBus.h

@@ -23,6 +23,7 @@ namespace AppleKraken
         virtual void PickApple(const AZ::Vector3 position) = 0;
         virtual AZ::Vector3 GetPosition() = 0;
         virtual void Retrieve() = 0;
+        virtual void ResetApple() = 0;
         virtual void RetrieveNose() = 0;
         virtual int GetStatus() = 0;
         virtual bool IsNoseRetreived() = 0;