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

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/Source/Editor/ActorJointBrowseEdit.cpp
-1
View File
@@ -52,7 +52,6 @@ namespace EMStudio
AZ_Warning("EMotionFX", false, "Cannot open joint selection window. Please select an actor instance first.");
return;
}
const EMotionFX::Actor* actor = actorInstance->GetActor();
CommandSystem::SelectionList selectionList;
for (const SelectionItem& selectedJoint : m_selectedJoints)
Gems/EMotionFX/Code/Source/Editor/Plugins/Ragdoll/RagdollNodeInspectorPlugin.cpp
-4
View File
@@ -103,9 +103,6 @@ namespace EMotionFX
return;
}
const Actor* actor = selectedRowIndices[0].data(SkeletonModel::ROLE_ACTOR_POINTER).value<Actor*>();
const AZStd::shared_ptr<PhysicsSetup>& physicsSetup = actor->GetPhysicsSetup();
const int numSelectedNodes = selectedRowIndices.count();
int ragdollNodeCount = 0;
for (const QModelIndex& modelIndex : selectedRowIndices)
@@ -465,7 +462,6 @@ namespace EMotionFX
const Physics::CharacterColliderConfiguration& colliderConfig = ragdollConfig.m_colliders;
const RagdollInstance* ragdollInstance = actorInstance->GetRagdollInstance();
MCommon::RenderUtil* renderUtil = renderInfo->mRenderUtil;
EMStudio::RenderOptions* renderOptions = renderPlugin->GetRenderOptions();
const MCore::RGBAColor defaultColor = renderOptions->GetRagdollColliderColor();
const MCore::RGBAColor selectedColor = renderOptions->GetSelectedRagdollColliderColor();
Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionContainerHandler.cpp
-3
View File
@@ -260,9 +260,6 @@ namespace EMotionFX
return;
}
// Get the anim graph instance in case only exactly one actor instance is selected.
EMotionFX::AnimGraphInstance* animGraphInstance = GetSingleSelectedAnimGraphInstance();
for (const AZStd::string& selectedMotionId : selectedMotionIds)
{
bool alreadyExists = false;
Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectColliderTagHandler.cpp
+1 -2
View File
@@ -142,8 +142,7 @@ namespace EMotionFX
return;
}
const SimulatedObjectSetup* simulatedObjectSetup = m_simulatedObject->GetSimulatedObjectSetup();
AZ_Assert(simulatedObjectSetup, "Simulated object does not belong to a valid simulated object setup.");
AZ_Assert(m_simulatedObject->GetSimulatedObjectSetup(), "Simulated object does not belong to a valid simulated object setup.");
const AZStd::vector<AZStd::string>& colliderTags = m_simulatedObject->GetColliderTags();
QString tag;
Gems/EMotionFX/Code/Source/Editor/SkeletonModel.cpp
-1
View File
@@ -633,7 +633,6 @@ namespace EMotionFX
for (AZ::u32 nodeIndex = 0; nodeIndex < numNodes; ++nodeIndex)
{
const Node* node = skeleton->GetNode(nodeIndex);
NodeInfo& nodeInfo = m_nodeInfos[nodeIndex];
// Is bone?
Gems/EMotionFX/Code/Source/Editor/SkeletonSortFilterProxyModel.cpp
-4
View File
@@ -143,10 +143,6 @@ namespace EMotionFX
bool shouldShow = false;
const Node* node = sourceIndex.data(SkeletonModel::ROLE_POINTER).value<Node*>();
const Actor* actor = sourceIndex.data(SkeletonModel::ROLE_ACTOR_POINTER).value<Actor*>();
const ActorInstance* actorInstance = sourceIndex.data(SkeletonModel::ROLE_ACTOR_INSTANCE_POINTER).value<ActorInstance*>();
if (AllFiltersDisabled())
{
shouldShow = true;
Gems/EMotionFX/Code/Source/Editor/TypeChoiceButton.cpp
-1
View File
@@ -39,7 +39,6 @@ namespace EMotionFX
for (const AZStd::pair<AZ::TypeId, AZStd::string>& typePair : m_types)
{
const AZ::TypeId& type = typePair.first;
const AZStd::string& typeString = typePair.second;
if (m_typePrefix.empty())
{
Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp
-1
View File
@@ -129,7 +129,6 @@ namespace EMotionFX
if (behaviorContext)
{
behaviorContext->EBus<ActorComponentRequestBus>("ActorComponentRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::Preview)
->Event("GetJointIndexByName", &ActorComponentRequestBus::Events::GetJointIndexByName)
->Event("GetJointTransform", &ActorComponentRequestBus::Events::GetJointTransform)
->Event("AttachToEntity", &ActorComponentRequestBus::Events::AttachToEntity)
Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.cpp
-1
View File
@@ -509,7 +509,6 @@ namespace EMotionFX
if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
{
behaviorContext->EBus<EMotionFX::Integration::AnimAudioComponentRequestBus>("AnimAudioComponentRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Attribute(AZ::Script::Attributes::Category, "Animation")
->Event("AddTriggerEvent", &AnimAudioComponentRequestBus::Events::AddTriggerEvent)
->Event("ClearTriggerEvents", &AnimAudioComponentRequestBus::Events::ClearTriggerEvents)
Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphComponent.cpp
-3
View File
@@ -144,7 +144,6 @@ namespace EMotionFX
behaviorContext->Constant("InvalidParameterIndex", BehaviorConstant(static_cast<AZ::u32>(MCORE_INVALIDINDEX32)));
behaviorContext->EBus<AnimGraphComponentRequestBus>("AnimGraphComponentRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::Preview)
// General API
->Event("FindParameterIndex", &AnimGraphComponentRequestBus::Events::FindParameterIndex)
->Event("FindParameterName", &AnimGraphComponentRequestBus::Events::FindParameterName)
@@ -192,7 +191,6 @@ namespace EMotionFX
;
behaviorContext->EBus<AnimGraphComponentNetworkRequestBus>("AnimGraphComponentNetworkRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Attribute(AZ::Script::Attributes::Category, "Animation")
->Event("IsAssetReady", &AnimGraphComponentNetworkRequestBus::Events::IsAssetReady)
->Event("HasSnapshot", &AnimGraphComponentNetworkRequestBus::Events::HasSnapshot)
@@ -451,7 +449,6 @@ namespace EMotionFX
AnimGraphInstancePostCreate();
// Apply parameter defaults.
EMotionFX::AnimGraph* animGraph = cfg.m_animGraphAsset.Get()->GetAnimGraph();
for (AZ::ScriptProperty* parameter : cfg.m_parameterDefaults.m_parameters)
{
const char* paramName = parameter->m_name.c_str();
Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.cpp
-1
View File
@@ -84,7 +84,6 @@ namespace EMotionFX
if (behaviorContext)
{
behaviorContext->EBus<SimpleMotionComponentRequestBus>("SimpleMotionComponentRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::Preview)
->Event("LoopMotion", &SimpleMotionComponentRequestBus::Events::LoopMotion)
->Event("GetLoopMotion", &SimpleMotionComponentRequestBus::Events::GetLoopMotion)
->Attribute("Hidden", AZ::Edit::Attributes::PropertyHidden)
Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.cpp
-2
View File
@@ -400,7 +400,6 @@ namespace EMotionFX
// In order for a property to be displayed in ScriptCanvas. Both a setter and a getter are necessary(both must be non-null).
// This is being worked on in dragon branch, once this is complete the dummy lambda functions can be removed.
behaviorContext->Class<MotionEvent>("MotionEvent")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::Preview)
->Property("entityId", BehaviorValueGetter(&MotionEvent::m_entityId), [](MotionEvent*, const AZ::EntityId&) {})
->Property("parameter", BehaviorValueGetter(&MotionEvent::m_parameter), [](MotionEvent*, const char*) {})
->Property("eventType", BehaviorValueGetter(&MotionEvent::m_eventType), [](MotionEvent*, const AZ::u32&) {})
@@ -412,7 +411,6 @@ namespace EMotionFX
;
behaviorContext->EBus<ActorNotificationBus>("ActorNotificationBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::Preview)
->Handler<ActorNotificationBusHandler>()
->Event("OnMotionEvent", &ActorNotificationBus::Events::OnMotionEvent)
->Event("OnMotionLoop", &ActorNotificationBus::Events::OnMotionLoop)