merging latest development

Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-20 13:27:45 -07:00
parent 6e84495975 df9b0714a4
commit 8401ee409b
1363 changed files with 53344 additions and 47766 deletions
@@ -89,11 +89,23 @@ namespace Multiplayer
        //! @param deltaTime    amount of time to integrate the provided inputs over
        virtual void ProcessInput(NetworkInput& networkInput, float deltaTime) = 0;

+        //! Similar to ProcessInput, do not call directly.
+        //! This only needs to be overridden in components which allow NetworkInput to be processed by script.
+        //! @param networkInput input structure to process
+        //! @param deltaTime    amount of time to integrate the provided inputs over
+        virtual void ProcessInputFromScript([[maybe_unused]] NetworkInput& networkInput, [[maybe_unused]] float deltaTime){}
+
        //! Only valid on a client, should never be invoked on the server.
        //! @param networkInput input structure to process
        //! @param deltaTime    amount of time to integrate the provided inputs over
        virtual void CreateInput(NetworkInput& networkInput, float deltaTime) = 0;

+        //! Similar to CreateInput, should never be invoked on the server.
+        //! This only needs to be overridden in components which allow NetworkInput creation to be handled by scripts.
+        //! @param networkInput input structure to process
+        //! @param deltaTime    amount of time to integrate the provided inputs over
+        virtual void CreateInputFromScript([[maybe_unused]]NetworkInput& networkInput, [[maybe_unused]] float deltaTime) {}
+
        template <typename ComponentType>
        const ComponentType* FindComponent() const;