Gems/EMotionFX

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-13 15:20:42 -07:00
parent 5eed3234ad
commit 316eb65c2c
22 changed files with 45 additions and 64 deletions
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-// Minimal integration system bits, such as allocator definition, smart pointers, etc.
-#include <platform.h> // Many CryCommon files require that this is included first.
-#include <Integration/System/SystemCommon.h>
-// When we go full-source for EMotion FX, we'll want to ensure we're no longer pulling it all in via PCH,
-// and instead apply our normal philosophy around minimal includes.
-// Though if EMotion FX has any internal defines that drive behavior, we'd still potentially want an include wrapper.
-#include <MCore/Source/AzCoreConversions.h>
-#include <EMotionFX/Source/EMotionFX.h>
@@ -5,11 +5,13 @@
 *
 */

-#include "EMotionFX_precompiled.h"
 #include <Integration/Assets/AnimGraphAsset.h>
 #include <EMotionFX/Source/Allocators.h>
 #include <EMotionFX/Source/AnimGraphManager.h>
-
+#include <EMotionFX/Source/AnimGraphInstance.h>
+#include <EMotionFX/Source/EMotionFXManager.h>
+#include <EMotionFX/Source/Importer/Importer.h>
+#include <EMotionFX/Source/AnimGraph.h>

 namespace EMotionFX
 {
@@ -5,10 +5,10 @@
 *
 */

-
-#include "EMotionFX_precompiled.h"
-
 #include <Integration/Assets/MotionAsset.h>
+#include <EMotionFX/Source/EMotionFXManager.h>
+#include <EMotionFX/Source/Importer/Importer.h>
+#include <EMotionFX/Source/Motion.h>

 namespace EMotionFX
 {
@@ -5,13 +5,14 @@
 *
 */

-
-#include "EMotionFX_precompiled.h"
-
 #include <AzCore/Asset/AssetManager.h>
 #include <AzCore/Component/TickBus.h>
+#include <AzCore/StringFunc/StringFunc.h>

 #include <Integration/Assets/MotionSetAsset.h>
+#include <EMotionFX/Source/MotionSet.h>
+#include <EMotionFX/Source/EMotionFXManager.h>
+#include <EMotionFX/Source/Importer/Importer.h>

 namespace EMotionFX
 {
@@ -152,9 +153,9 @@ namespace EMotionFX
            {
                AZStd::string assetSourcePath = devAssetsPath;

-                AzFramework::StringFunc::AssetDatabasePath::Normalize(assetSourcePath);
+                AZ::StringFunc::AssetDatabasePath::Normalize(assetSourcePath);
                AZStd::string filename;
-                AzFramework::StringFunc::AssetDatabasePath::Join(assetSourcePath.c_str(), assetFilename.c_str(), filename);
+                AZ::StringFunc::AssetDatabasePath::Join(assetSourcePath.c_str(), assetFilename.c_str(), filename);

                assetData->m_emfxMotionSet->SetFilename(filename.c_str());
            }
@@ -5,8 +5,6 @@
 *
 */

-#include "EMotionFX_precompiled.h"
-
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
@@ -26,6 +24,12 @@
 #include <EMotionFX/Source/Transform.h>
 #include <EMotionFX/Source/RagdollInstance.h>
 #include <EMotionFX/Source/DebugDraw.h>
+#include <EMotionFX/Source/AttachmentSkin.h>
+#include <EMotionFX/Source/Node.h>
+#include <EMotionFX/Source/TransformData.h>
+#include <EMotionFX/Source/AttachmentNode.h>
+
+#include <MCore/Source/AzCoreConversions.h>

 #include <Atom/RPI.Reflect/Model/ModelAsset.h>

@@ -7,8 +7,6 @@

 #include <AzCore/PlatformDef.h>

-#include "EMotionFX_precompiled.h"
-
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
@@ -13,6 +13,7 @@
 #include <Integration/AnimationBus.h>
 #include <Integration/AnimAudioComponentBus.h>
 #include <IAudioSystem.h>
+#include <Integration/System/SystemCommon.h>

 namespace EMotionFX
 {
@@ -5,16 +5,17 @@
 *
 */

-
-#include "EMotionFX_precompiled.h"
-
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/RTTI/BehaviorContext.h>

 #include <MCore/Source/AttributeString.h>
+#include <MCore/Source/AzCoreConversions.h>
 #include <EMotionFX/Source/AnimGraph.h>
+#include <EMotionFX/Source/AnimGraphInstance.h>
+#include <EMotionFX/Source/ActorInstance.h>
+#include <EMotionFX/Source/MotionSet.h>

 #include <Integration/Components/AnimGraphComponent.h>

@@ -8,8 +8,6 @@

 #include <AzCore/PlatformDef.h>

-#include "EMotionFX_precompiled.h"
-
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
@@ -17,6 +15,7 @@

 #include <Integration/Components/SimpleLODComponent.h>
 #include <MCore/Source/AttributeString.h>
+#include <EMotionFX/Source/ActorInstance.h>

 #include <MathConversion.h>
 #include <IRenderAuxGeom.h>
@@ -5,9 +5,6 @@
 *
 */

-
-#include "EMotionFX_precompiled.h"
-
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
@@ -16,6 +13,9 @@

 #include <Integration/Components/SimpleMotionComponent.h>
 #include <MCore/Source/AttributeString.h>
+#include <EMotionFX/Source/ActorInstance.h>
+#include <EMotionFX/Source/MotionSystem.h>
+#include <EMotionFX/Source/MotionInstance.h>

 namespace EMotionFX
 {
@@ -5,8 +5,6 @@
 *
 */

-#include "EMotionFX_precompiled.h"
-
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
@@ -29,6 +27,8 @@
 #include <EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.h>
 #include <EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeSelectionWindow.h>
 #include <EMotionFX/CommandSystem/Source/SelectionList.h>
+#include <EMotionFX/Source/TransformData.h>
+#include <EMotionFX/Source/AttachmentNode.h>
 #include <MCore/Source/AzCoreConversions.h>

 namespace EMotionFX
@@ -5,8 +5,6 @@
 *
 */

-#include "EMotionFX_precompiled.h"
-
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>

@@ -5,9 +5,6 @@
 *
 */

-
-#include "EMotionFX_precompiled.h"
-
 #include <AzCore/Asset/AssetManager.h>
 #include <AzCore/Script/ScriptProperty.h>
 #include <AzCore/Serialization/EditContext.h>
@@ -21,6 +18,7 @@
 #include <EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.h>
 #include <Integration/ActorComponentBus.h>
 #include <Integration/Editor/Components/EditorAnimGraphComponent.h>
+#include <EMotionFX/Source/MotionSet.h>

 #include <QApplication>

@@ -7,7 +7,6 @@

 #include <AzCore/PlatformDef.h>

-#include "EMotionFX_precompiled.h"
 #include <MathConversion.h>

 #include <AzCore/Component/Entity.h>
@@ -5,9 +5,6 @@
 *
 */

-
-#include "EMotionFX_precompiled.h"
-
 #include <AzCore/Component/Entity.h>
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
@@ -19,6 +16,8 @@
 #include <Integration/Assets/ActorAsset.h>
 #include <Integration/Editor/Components/EditorSimpleMotionComponent.h>
 #include <Integration/SimpleMotionComponentBus.h>
+#include <EMotionFX/Source/MotionSystem.h>
+#include <EMotionFX/Source/MotionInstance.h>

 namespace EMotionFX
 {
@@ -5,9 +5,6 @@
 *
 */

-
-#include "EMotionFX_precompiled.h"
-
 #include <Integration/System/SystemComponent.h>
 #include <Integration/Components/ActorComponent.h>
 #include <Integration/Components/AnimAudioComponent.h>
@@ -5,9 +5,6 @@
 *
 */

-
-#include "EMotionFX_precompiled.h"
-
 #include <AzCore/Component/ComponentApplication.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Serialization/SerializeContext.h>
@@ -29,6 +26,13 @@
 #include <EMotionFX/Source/Parameter/ParameterFactory.h>
 #include <EMotionFX/Source/TwoStringEventData.h>
 #include <EMotionFX/Source/EventDataFootIK.h>
+#include <EMotionFX/Source/MotionEvent.h>
+#include <EMotionFX/Source/AnimGraphNodeGroup.h>
+#include <EMotionFX/Source/AnimGraphGameControllerSettings.h>
+#include <EMotionFX/Source/MotionEventTable.h>
+#include <EMotionFX/Source/MotionEventTrack.h>
+#include <EMotionFX/Source/AnimGraphSyncTrack.h>
+#include <EMotionFX/Source/AnimGraph.h>

 #include <EMotionFX/Source/PhysicsSetup.h>
 #include <EMotionFX/Source/SimulatedObjectSetup.h>
@@ -5,13 +5,17 @@
 *
 */

-#include "EMotionFX_precompiled.h"
 #include "EMotionFXBuilderFixture.h"

 #include <EMotionFX/Source/EMotionFXManager.h>
 #include <EMotionFX/Source/Allocators.h>
 #include <EMotionFX/Source/AnimGraphObjectFactory.h>
 #include <EMotionFX/Source/Parameter/ParameterFactory.h>
+#include <EMotionFX/Source/MotionSet.h>
+#include <EMotionFX/Source/AnimGraphObject.h>
+#include <EMotionFX/Source/AnimGraph.h>
+#include <EMotionFX/Source/AnimGraphNodeGroup.h>
+#include <EMotionFX/Source/AnimGraphGameControllerSettings.h>
 #include <Integration/Assets/MotionSetAsset.h>
 #include <Integration/Assets/AnimGraphAsset.h>

@@ -5,8 +5,6 @@
 *
 */

-#include "EMotionFX_precompiled.h"
-
 #include <AzTest/AzTest.h>
 #include <AzCore/Math/Quaternion.h>
 #include <AzCore/Math/Vector3.h>
@@ -5,8 +5,6 @@
 *
 */

-
-#include "EMotionFX_precompiled.h"
 #include "SystemComponentFixture.h"

 #include <AzTest/AzTest.h>
@@ -6,7 +6,6 @@
 #

 set(FILES
-    Source/EMotionFX_precompiled.h
    ../Assets/Editor/Layouts/Layouts.qrc
    ../Assets/Editor/Images/Icons/Resources.qrc
    ../Assets/Editor/Images/Icons/ActorComponent.svg
@@ -6,7 +6,6 @@
 #

 set(FILES
-    Source/EMotionFX_precompiled.h
    Include/Integration/AnimationBus.h
    Include/Integration/MotionExtractionBus.h
    Source/Integration/System/SystemComponent.cpp