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

Gems/EMotionFX

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 17:58:50 -07:00
parent 62439e03fb
commit 794d656c66
25 changed files with 4 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/EMotionFX/Pipeline/RCExt/Actor/ActorGroupExporter.cpp
-1
View File
@@ -163,7 +163,6 @@ namespace EMotionFX
}
// Default to the first mesh group until we get a way to choose it via the scene settings (ATOM-13590).
AZStd::optional<AZ::Data::AssetId> meshAssetId = AZStd::nullopt;
AZ_Error("EMotionFX", atomModelAssets.size() <= 1, "Ambigious mesh for actor asset. More than one mesh group found. Defaulting to the first one.");
if (!atomModelAssets.empty())
{
Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.cpp
-2
View File
@@ -519,7 +519,6 @@ namespace MCommon
EMotionFX::SubMesh* subMesh = mesh->GetSubMesh(subMeshIndex);
const uint32 numVertices = subMesh->GetNumVertices();
const uint32 startVertex = subMesh->GetStartVertex();
const uint32 startIndex = subMesh->GetStartIndex();
for (uint32 j = 0; j < numVertices; ++j)
{
@@ -1332,7 +1331,6 @@ namespace MCommon
// render mesh based axis
void RenderUtil::RenderAxis(float size, const AZ::Vector3& position, const AZ::Vector3& right, const AZ::Vector3& up, const AZ::Vector3& forward)
{
const float zeroSphereRadius = size * 0.075f;
static const MCore::RGBAColor xAxisColor(1.0f, 0.0f, 0.0f);
static const MCore::RGBAColor yAxisColor(0.0f, 1.0f, 0.0f);
static const MCore::RGBAColor zAxisColor(0.0f, 0.0f, 1.0f);
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/FileManager.h
-2
View File
@@ -112,8 +112,6 @@ namespace EMStudio
QString m_lastWorkspaceFolder;
QString m_lastNodeMapFolder;
bool m_skipFileChangedCheck;
void UpdateLastUsedFolder(const char* filename, QString& outLastFolder) const;
QString GetLastUsedFolder(const QString& lastUsedFolder) const;
};
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.h
-3
View File
@@ -203,9 +203,6 @@ namespace EMStudio
QAction* m_saveAllAction;
QAction* m_mergeActorAction;
QAction* m_saveSelectedActorsAction;
#ifdef EMFX_DEVELOPMENT_BUILD
QAction* m_saveSelectedActorAsAttachmentsAction;
#endif
// application mode
QComboBox* m_applicationMode;
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindowEventFilter.h
+1 -1
View File
@@ -27,6 +27,6 @@ namespace EMStudio
virtual bool nativeEventFilter(const QByteArray& /*eventType*/, void* message, long* /*result*/) Q_DECL_OVERRIDE;
private:
MainWindow* m_mainWindow;
[[maybe_unused]] MainWindow* m_mainWindow;
};
}
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModel.h
+1 -1
View File
@@ -313,7 +313,7 @@ namespace EMStudio
bool Execute(MCore::Command * command, const MCore::CommandLine& commandLine) override; \
bool Undo(MCore::Command* command, const MCore::CommandLine& commandLine) override; \
private: \
AnimGraphModel& m_animGraphModel; \
[[maybe_unused]] AnimGraphModel& m_animGraphModel; \
}; \
friend class CLASSNAME;
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendSpace1DNodeWidget.cpp
-2
View File
@@ -364,8 +364,6 @@ namespace EMStudio
const int rectLeft = m_drawRect.left();
const int rectRight = m_drawRect.right();
const int rectBottom = m_drawRect.bottom();
const int xValueTop = rectBottom + 4;
const int xAxisLabelTop = m_drawCenterY + 15;
const char numFormat = 'g';
const int numPrecision = 4;
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWindow.cpp
-1
View File
@@ -651,7 +651,6 @@ namespace EMStudio
// enable/disable recording/playback mode
void ParameterWindow::OnRecorderStateChanged()
{
const bool readOnly = (EMotionFX::GetRecorder().GetIsInPlayMode()); // disable when in playback mode, enable otherwise
if (m_animGraph)
{
// update parameter values
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterWindow.h
-1
View File
@@ -205,7 +205,6 @@ namespace EMStudio
ParameterWindowTreeWidget* m_treeWidget;
AzQtComponents::FilteredSearchWidget* m_searchWidget;
QVBoxLayout* m_verticalLayout;
QScrollArea* m_scrollArea;
AZStd::string m_nameString;
struct ParameterWidget
{
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.h
-1
View File
@@ -85,7 +85,6 @@ namespace EMStudio
CommandAdjustActorCallback* m_adjustActorCallback;
CommandRemoveActorInstanceCallback* m_removeActorInstanceCallback;
QWidget* m_noSelectionWidget;
MysticQt::DialogStack* m_dialogStack;
AttachmentsWindow* m_attachmentsWindow;
AttachmentsHierarchyWindow* m_attachmentsHierarchyWindow;
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetsWindowPlugin.h
-1
View File
@@ -91,6 +91,5 @@ namespace EMStudio
QVBoxLayout* m_staticTextLayout;
QWidget* m_staticTextWidget;
MysticQt::DialogStack* m_dialogStack;
QLabel* m_infoText;
};
} // namespace EMStudio
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventsPlugin.cpp
-1
View File
@@ -32,7 +32,6 @@ namespace EMStudio
, m_dialogStack(nullptr)
, m_motionEventPresetsWidget(nullptr)
, m_motionEventWidget(nullptr)
, m_motionTable(nullptr)
, m_timeViewPlugin(nullptr)
, m_trackHeaderWidget(nullptr)
, m_trackDataWidget(nullptr)
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventsPlugin.h
-1
View File
@@ -87,7 +87,6 @@ namespace EMStudio
MotionEventPresetsWidget* m_motionEventPresetsWidget;
MotionEventWidget* m_motionEventWidget;
QTableWidget* m_motionTable;
TimeViewPlugin* m_timeViewPlugin;
TrackHeaderWidget* m_trackHeaderWidget;
TrackDataWidget* m_trackDataWidget;
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetWindow.cpp
-2
View File
@@ -819,7 +819,6 @@ namespace EMStudio
}
const QList<QTableWidgetItem*> selectedItems = m_tableWidget->selectedItems();
const size_t numSelectedItems = selectedItems.count();
// Get the row indices from the selected items.
AZStd::vector<int> rowIndices;
@@ -1079,7 +1078,6 @@ namespace EMStudio
// Get the row indices from the selected items.
AZStd::vector<int> rowIndices;
GetRowIndices(selectedItems, rowIndices);
const size_t numRowIndices = rowIndices.size();
// remove motion from motion window, too?
bool removeMotion = false;
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetWindow.h
-1
View File
@@ -187,7 +187,6 @@ namespace EMStudio
size_t CalcNumMotionEntriesUsingMotionExcluding(const AZStd::string& motionFilename, EMotionFX::MotionSet* excludedMotionSet);
private:
QVBoxLayout* m_vLayout = nullptr;
MotionSetTableWidget* m_tableWidget = nullptr;
QAction* m_addAction = nullptr;
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionExtractionWindow.h
-1
View File
@@ -68,7 +68,6 @@ namespace EMStudio
// general
MotionWindowPlugin* m_motionWindowPlugin;
QCheckBox* m_autoMode;
// flags widget
QWidget* m_flagsWidget;
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionRetargetingWindow.h
-2
View File
@@ -49,8 +49,6 @@ namespace EMStudio
private:
MotionWindowPlugin* m_motionWindowPlugin;
QCheckBox* m_motionRetargetingButton;
EMotionFX::ActorInstance* m_selectedActorInstance;
EMotionFX::Actor* m_actor;
CommandSystem::SelectionList m_selectionList;
};
} // namespace EMStudio
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupWidget.h
-1
View File
@@ -58,7 +58,6 @@ namespace EMStudio
NodeSelectionWindow* m_nodeSelectionWindow;
CommandSystem::SelectionList m_nodeSelectionList;
EMotionFX::NodeGroup* m_nodeGroup;
uint16 m_nodeGroupIndex;
CommandSystem::CommandAdjustNodeGroup::NodeAction m_nodeAction;
// widgets
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewToolBar.cpp
+1 -1
View File
@@ -441,7 +441,7 @@ namespace EMStudio
const bool playbackOptionsVisible = m_playbackOptions->UpdateInterface(mode, /*showRightSeparator=*/false);
const bool playbackControlsVisible = m_playbackControls->UpdateInterface(mode, /*showRightSeparator=*/playbackOptionsVisible);
const bool recorderGroupVisible = m_recorderGroup->UpdateInterface(mode, /*showRightSeparator=*/playbackControlsVisible);
m_recorderGroup->UpdateInterface(mode, /*showRightSeparator=*/playbackControlsVisible);
}
void TimeViewToolBar::OnDetailedNodes()
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataHeaderWidget.cpp
-4
View File
@@ -284,8 +284,6 @@ namespace EMStudio
{
m_plugin->SetRedrawFlag();
const bool ctrlPressed = event->modifiers() & Qt::ControlModifier;
const bool shiftPressed = event->modifiers() & Qt::ShiftModifier;
const bool altPressed = event->modifiers() & Qt::AltModifier;
// store the last clicked position
@@ -370,8 +368,6 @@ namespace EMStudio
m_plugin->GetTimeInfoWidget()->SetIsOverwriteMode(false);
}
const bool ctrlPressed = event->modifiers() & Qt::ControlModifier;
if (event->button() == Qt::RightButton)
{
m_mouseRightClicked = false;
Gems/EMotionFX/Code/Source/Editor/Plugins/SimulatedObject/SimulatedObjectWidget.cpp
-1
View File
@@ -495,7 +495,6 @@ namespace EMotionFX
if (renderSimulatedJoints && !selectedJointIndices.empty())
{
// Render the joint radius.
const MCore::RGBAColor defaultColor = renderPlugin->GetRenderOptions()->GetSelectedSimulatedObjectColliderColor();
const size_t actorInstanceCount = GetActorManager().GetNumActorInstances();
for (size_t actorInstanceIndex = 0; actorInstanceIndex < actorInstanceCount; ++actorInstanceIndex)
{
Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTransitionHandler.cpp
+1 -1
View File
@@ -206,7 +206,7 @@ namespace EMotionFX
QPushButton* removeTransitionButton = new QPushButton();
EMStudio::EMStudioManager::MakeTransparentButton(removeTransitionButton, "Images/Icons/Trash.svg", "Remove transition from list");
connect(removeTransitionButton, &QPushButton::clicked, this, [this, removeTransitionButton, id]()
connect(removeTransitionButton, &QPushButton::clicked, this, [this, id]()
{
m_transitionIds.erase(AZStd::remove(m_transitionIds.begin(), m_transitionIds.end(), id), m_transitionIds.end());
Reinit();
Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp
-1
View File
@@ -683,7 +683,6 @@ namespace EMotionFX
const size_t lodLevel = m_actorInstance->GetLODLevel();
Actor* actor = m_actorAsset.Get()->GetActor();
const size_t numNodes = actor->GetNumNodes();
const size_t numLods = actor->GetNumLODLevels();
for (size_t nodeIndex = 0; nodeIndex < numNodes; ++nodeIndex)
{
Mesh* mesh = actor->GetMesh(lodLevel, nodeIndex);
Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/RemoveTransition.cpp
-1
View File
@@ -73,7 +73,6 @@ namespace EMotionFX
// Select the transition in the anim graph model.
const QModelIndex& modelIndex = animGraphModel.FindFirstModelIndex(transition);
const EMStudio::AnimGraphModel::ModelItemType itemType = modelIndex.data(EMStudio::AnimGraphModel::ROLE_MODEL_ITEM_TYPE).value<EMStudio::AnimGraphModel::ModelItemType>();
ASSERT_TRUE(modelIndex.isValid()) << "Anim graph transition has an invalid model index.";
animGraphModel.GetSelectionModel().select(QItemSelection(modelIndex, modelIndex), QItemSelectionModel::Current | QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
Gems/EMotionFX/Code/Tests/ProvidesUI/AnimGraph/Transitions/RemoveTransitionCondition.cpp
-1
View File
@@ -76,7 +76,6 @@ namespace EMotionFX
// Select the transition in the anim graph model.
const QModelIndex& modelIndex = animGraphModel.FindFirstModelIndex(transition);
const EMStudio::AnimGraphModel::ModelItemType itemType = modelIndex.data(EMStudio::AnimGraphModel::ROLE_MODEL_ITEM_TYPE).value<EMStudio::AnimGraphModel::ModelItemType>();
ASSERT_TRUE(modelIndex.isValid()) << "Anim graph transition has an invalid model index.";
animGraphModel.GetSelectionModel().select(QItemSelection(modelIndex, modelIndex), QItemSelectionModel::Current | QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);