birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Registering an empty atom render plugin in the emfxatom gem.

Browse Source 
Signed-off-by: rhhong <rhhong@amazon.com>
This commit is contained in:
rhhong
2021-08-30 17:57:45 -07:00
parent a96b091d3f
commit f2b449c4b9
16 changed files with 173 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.cpp
+5 -5
View File
@@ -46,6 +46,7 @@
#include <EMotionFX/Source/PoseData.h>
#include <EMotionFX/Source/PoseDataRagdoll.h>
#include <Integration/AnimationBus.h>
#include <Integration/EMotionFXBus.h>
#include <Integration/Assets/ActorAsset.h>
#include <Integration/Assets/MotionAsset.h>
@@ -70,7 +71,6 @@
# include <AzToolsFramework/API/ViewPaneOptions.h>
# include <AzCore/std/string/wildcard.h>
# include <QApplication>
# include <EMotionStudio/EMStudioSDK/Source/EMStudioManager.h>
# include <EMotionStudio/EMStudioSDK/Source/MainWindow.h>
# include <EMotionStudio/EMStudioSDK/Source/PluginManager.h>
// EMStudio plugins
@@ -88,7 +88,6 @@
# include <EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupsPlugin.h>
# include <EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.h>
# include <EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/OpenGLRenderPlugin.h>
# include <EMotionStudio/Plugins/RenderPlugins/Source/AtomRender/AtomRenderPlugin.h>
# include <Editor/Plugins/HitDetection/HitDetectionJointInspectorPlugin.h>
# include <Editor/Plugins/SkeletonOutliner/SkeletonOutlinerPlugin.h>
# include <Editor/Plugins/Ragdoll/RagdollNodeInspectorPlugin.h>
@@ -530,7 +529,7 @@ namespace EMotionFX
if (EMStudio::GetManager())
{
EMStudio::Initializer::Shutdown();
m_emstudioManager.reset();
MysticQt::Initializer::Shutdown();
}
@@ -795,12 +794,13 @@ namespace EMotionFX
pluginManager->RegisterPlugin(new EMStudio::NodeGroupsPlugin());
pluginManager->RegisterPlugin(new EMStudio::AnimGraphPlugin());
pluginManager->RegisterPlugin(new EMStudio::OpenGLRenderPlugin());
pluginManager->RegisterPlugin(new EMStudio::AtomRenderPlugin());
pluginManager->RegisterPlugin(new EMotionFX::HitDetectionJointInspectorPlugin());
pluginManager->RegisterPlugin(new EMotionFX::SkeletonOutlinerPlugin());
pluginManager->RegisterPlugin(new EMotionFX::RagdollNodeInspectorPlugin());
pluginManager->RegisterPlugin(new EMotionFX::ClothJointInspectorPlugin());
pluginManager->RegisterPlugin(new EMotionFX::SimulatedObjectWidget());
SystemNotificationBus::Broadcast(&SystemNotificationBus::Events::OnRegisterPlugin);
}
//////////////////////////////////////////////////////////////////////////
@@ -816,7 +816,7 @@ namespace EMotionFX
char** argv = nullptr;
MysticQt::Initializer::Init("", editorAssetsPath.c_str());
EMStudio::Initializer::Init(qApp, argc, argv);
m_emstudioManager = AZStd::make_unique<EMStudio::EMStudioManager>(qApp, argc, argv);
InitializeEMStudioPlugins();