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
Code/Sandbox/Editor/TrackView/SelectKeyUIControls.cpp
-3
View File
@@ -102,8 +102,6 @@ bool CSelectKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKey
ResetCameraEntries();
// Get All cameras.
CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
mv_camera.SetEnumList(NULL);
mv_camera->AddEnumItem(QObject::tr("<None>"), QString::number(static_cast<AZ::u64>(AZ::EntityId::InvalidEntityId)));
@@ -223,7 +221,6 @@ void CSelectKeyUIControls::OnCameraRemoved(const AZ::EntityId & cameraId)
// We can't iterate or remove an item from the enum list, and Camera::CameraRequests::GetCameras
// still includes the deleted camera at this point. Reset the list anyway and filter out the
// deleted camera.
IVarEnumList* oldList = mv_camera->GetEnumList();
mv_camera->SetEnumList(NULL);
mv_camera->AddEnumItem(QObject::tr("<None>"), QString::number(static_cast<AZ::u64>(AZ::EntityId::InvalidEntityId)));
Code/Sandbox/Editor/TrackView/TVEventsDialog.cpp
+1 -6
View File
@@ -239,8 +239,6 @@ CTVEventsDialog::~CTVEventsDialog()
void CTVEventsDialog::OnBnClickedButtonAddEvent()
{
CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
const QString add = QInputDialog::getText(this, tr("Track Event Name"), QString());
if (!add.isEmpty() && static_cast<TVEventsModel*>(m_ui->m_List->model())->addRow(add))
{
@@ -252,8 +250,6 @@ void CTVEventsDialog::OnBnClickedButtonAddEvent()
void CTVEventsDialog::OnBnClickedButtonRemoveEvent()
{
CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
QList<QPersistentModelIndex> indexes;
for (auto index : m_ui->m_List->selectionModel()->selectedRows())
{
@@ -304,8 +300,7 @@ void CTVEventsDialog::OnInitDialog()
m_ui->m_List->setModel(new TVEventsModel(this));
m_ui->m_List->header()->resizeSections(QHeaderView::ResizeToContents);
CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
assert(sequence);
assert(GetIEditor()->GetAnimation()->GetSequence());
UpdateButtons();
}
Code/Sandbox/Editor/TrackView/TrackViewDopeSheetBase.cpp
-10
View File
@@ -1405,7 +1405,6 @@ void CTrackViewDopeSheetBase::ShowKeyTooltip(CTrackViewKeyHandle& keyHandle, con
const float time = keyHandle.GetTime();
const char* desc = keyHandle.GetDescription();
float duration = keyHandle.GetDuration();
QString tipText;
if (GetTickDisplayMode() == eTVTickMode_InSeconds)
@@ -1848,8 +1847,6 @@ void CTrackViewDopeSheetBase::SetScrollOffset(int hpos)
//////////////////////////////////////////////////////////////////////////
void CTrackViewDopeSheetBase::LButtonDownOnTimeAdjustBar([[maybe_unused]] const QPoint& point, CTrackViewKeyHandle& keyHandle, bool bStart)
{
CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
m_keyTimeOffset = 0;
m_keyForTimeAdjust = keyHandle;
@@ -2568,9 +2565,6 @@ void CTrackViewDopeSheetBase::DrawTrack(CTrackViewTrack* pTrack, QPainter* paint
//////////////////////////////////////////////////////////////////////////
void CTrackViewDopeSheetBase::DrawSelectTrack(const Range& timeRange, QPainter* painter, CTrackViewTrack* pTrack, const QRect& rc)
{
int x0 = TimeToClient(timeRange.start);
float t0 = timeRange.start;
const QBrush prevBrush = painter->brush();
painter->setBrush(m_selectTrackBrush);
@@ -2682,9 +2676,6 @@ void CTrackViewDopeSheetBase::DrawBoolTrack(const Range& timeRange, QPainter* pa
//////////////////////////////////////////////////////////////////////////
void CTrackViewDopeSheetBase::DrawSequenceTrack(const Range& timeRange, QPainter* painter, CTrackViewTrack* pTrack, const QRect& rc)
{
int x0 = TimeToClient(timeRange.start);
float t0 = timeRange.start;
const QBrush prevBrush = painter->brush();
painter->setBrush(m_selectTrackBrush);
@@ -3386,7 +3377,6 @@ void CTrackViewDopeSheetBase::DrawTimeline(QPainter* painter, const QRect& rcUpd
const QPen black(textCol);
const QPen redpen(lineCol);
// Draw time ticks every tick step seconds.
const Range& timeRange = m_timeRange;
painter->setPen(dkgray);
Code/Sandbox/Editor/TrackView/TrackViewNodes.cpp
+4 -9
View File
@@ -631,8 +631,6 @@ CTrackViewNodesCtrl::CRecord* CTrackViewNodesCtrl::AddAnimNodeRecord(CRecord* pP
//////////////////////////////////////////////////////////////////////////
CTrackViewNodesCtrl::CRecord* CTrackViewNodesCtrl::AddTrackRecord(CRecord* pParentRecord, CTrackViewTrack* pTrack)
{
const CTrackViewAnimNode* animNode = pTrack->GetAnimNode();
CRecord* pNewTrackRecord = new CRecord(pTrack);
pNewTrackRecord->setSizeHint(0, QSize(30, 18));
pNewTrackRecord->setText(0, pTrack->GetName());
@@ -785,7 +783,6 @@ void CTrackViewNodesCtrl::UpdateAnimNodeRecord(CRecord* record, CTrackViewAnimNo
if (nodeType == AnimNodeType::Component)
{
// get the component icon from cached component icons
bool searchCompleted = false;
AZ::Entity* azEntity = nullptr;
AZ::ComponentApplicationBus::BroadcastResult(azEntity, &AZ::ComponentApplicationBus::Events::FindEntity,
@@ -1526,7 +1523,7 @@ void CTrackViewNodesCtrl::OnNMRclick(QPoint point)
if (animNode)
{
QString matName;
int subMtlIndex = GetMatNameAndSubMtlIndexFromName(matName, animNode->GetName());
GetMatNameAndSubMtlIndexFromName(matName, animNode->GetName());
QString newMatName;
newMatName = tr("%1.[%2]").arg(matName).arg(cmd - eMI_SelectSubmaterialBase + 1);
CUndo undo("Rename TrackView node");
@@ -1671,7 +1668,6 @@ void CTrackViewNodesCtrl::ImportFromFBX()
for (unsigned int trackID = 0; trackID < numTracks; ++trackID)
{
CTrackViewTrack* pTrack = tracks.GetTrack(trackID);
undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
}
@@ -2275,7 +2271,6 @@ int CTrackViewNodesCtrl::ShowPopupMenuMultiSelection(SContextMenu& contextMenu)
for (int currentNode = 0; currentNode < records.size(); ++currentNode)
{
CRecord* pItemInfo = (CRecord*)records[currentNode];
ETrackViewNodeType type = pItemInfo->GetNode()->GetNodeType();
if (pItemInfo->GetNode()->GetNodeType() == eTVNT_AnimNode)
{
@@ -2622,7 +2617,8 @@ void CTrackViewNodesCtrl::ShowNextResult()
if (!items.empty())
{
m_currentMatchIndex = ++m_currentMatchIndex % m_matchCount;
++m_currentMatchIndex;
m_currentMatchIndex = m_currentMatchIndex % m_matchCount;
ui->treeWidget->selectionModel()->clear();
items[m_currentMatchIndex]->setSelected(true);
}
@@ -2812,8 +2808,7 @@ CTrackViewNodesCtrl::CRecord* CTrackViewNodesCtrl::GetNodeRecord(const CTrackVie
return nullptr;
}
CRecord* record = findIter->second;
assert (record->GetNode() == pNode);
assert (findIter->second->GetNode() == pNode);
return findIter->second;
}
Code/Sandbox/Editor/TrackView/TrackViewSequence.cpp
-1
View File
@@ -1273,7 +1273,6 @@ void CTrackViewSequence::OffsetSelectedKeys(const float timeOffset)
// may become invalid after sorted with a new time.
bool notifyListeners = false;
const CTrackViewTrack* pTrack = nullptr;
for (int k = 0; k < (int)selectedKeys.GetKeyCount(); ++k)
{
CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
Code/Sandbox/Editor/TrackView/TrackViewSplineCtrl.cpp
-1
View File
@@ -210,7 +210,6 @@ private:
return;
}
CTrackViewSplineCtrl* pCtrl = FindControl(m_pCtrl);
for (auto it = m_splineEntries.begin(); it != m_splineEntries.end(); ++it)
{
CSplineEntry& entry = *it;
Code/Sandbox/Editor/TrackView/TrackViewTrack.cpp
+1 -2
View File
@@ -186,7 +186,6 @@ CTrackViewKeyHandle CTrackViewTrack::GetNextKey(const float time)
const float startTime = time;
float closestTime = std::numeric_limits<float>::max();
bool bFoundKey = false;
const int numKeys = m_pAnimTrack->GetNumKeys();
for (int i = 0; i < numKeys; ++i)
@@ -619,7 +618,7 @@ void CTrackViewTrack::SelectKeys(const bool bSelected)
{
// Affect sub tracks
unsigned int childCount = GetChildCount();
for (unsigned int childIndex = 0; childIndex < childCount; ++childCount)
for (unsigned int childIndex = 0; childIndex < childCount; ++childIndex)
{
CTrackViewTrack* pChildTrack = static_cast<CTrackViewTrack*>(GetChild(childIndex));
pChildTrack->SelectKeys(bSelected);