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

[LYN-3419] Removed remaining references to checking if the new viewport interaction model is enabled.

Browse Source
This commit is contained in:
Chris Galvan
2021-04-29 16:45:39 -05:00
parent 54e06b0f63
commit 217ba1e816
18 changed files with 142 additions and 965 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/CryEdit.cpp
-195
View File
@@ -381,12 +381,8 @@ void CCryEditApp::RegisterActionHandlers()
ON_COMMAND(ID_FILE_EXPORT_SELECTEDOBJECTS, OnExportSelectedObjects)
ON_COMMAND(ID_EDIT_HOLD, OnEditHold)
ON_COMMAND(ID_EDIT_FETCH, OnEditFetch)
ON_COMMAND(ID_GENERATORS_STATICOBJECTS, OnGeneratorsStaticobjects)
ON_COMMAND(ID_FILE_EXPORTTOGAMENOSURFACETEXTURE, OnFileExportToGameNoSurfaceTexture)
ON_COMMAND(ID_VIEW_SWITCHTOGAME, OnViewSwitchToGame)
ON_COMMAND(ID_EDIT_SELECTALL, OnEditSelectAll)
ON_COMMAND(ID_EDIT_SELECTNONE, OnEditSelectNone)
ON_COMMAND(ID_EDIT_DELETE, OnEditDelete)
ON_COMMAND(ID_MOVE_OBJECT, OnMoveObject)
ON_COMMAND(ID_RENAME_OBJ, OnRenameObj)
ON_COMMAND(ID_EDITMODE_MOVE, OnEditmodeMove)
@@ -395,7 +391,6 @@ void CCryEditApp::RegisterActionHandlers()
ON_COMMAND(ID_UNDO, OnUndo)
ON_COMMAND(ID_TOOLBAR_WIDGET_REDO, OnUndo) // Can't use the same ID, because for the menu we can't have a QWidgetAction, while for the toolbar we want one
ON_COMMAND(ID_IMPORT_ASSET, OnOpenAssetImporter)
ON_COMMAND(ID_LOCK_SELECTION, OnLockSelection)
ON_COMMAND(ID_EDIT_LEVELDATA, OnEditLevelData)
ON_COMMAND(ID_FILE_EDITLOGFILE, OnFileEditLogFile)
ON_COMMAND(ID_FILE_RESAVESLICES, OnFileResaveSlices)
@@ -415,11 +410,6 @@ void CCryEditApp::RegisterActionHandlers()
ON_COMMAND(ID_GAME_SYNCPLAYER, OnSyncPlayer)
ON_COMMAND(ID_RESOURCES_REDUCEWORKINGSET, OnResourcesReduceworkingset)
// Standard file based document commands
ON_COMMAND(ID_EDIT_HIDE, OnEditHide)
ON_COMMAND(ID_EDIT_SHOW_LAST_HIDDEN, OnEditShowLastHidden)
ON_COMMAND(ID_EDIT_UNHIDEALL, OnEditUnhideall)
ON_COMMAND(ID_SNAP_TO_GRID, OnSnap)
ON_COMMAND(ID_WIREFRAME, OnWireframe)
@@ -465,11 +455,6 @@ void CCryEditApp::RegisterActionHandlers()
#endif
ON_COMMAND(ID_DISPLAY_GOTOPOSITION, OnDisplayGotoPosition)
ON_COMMAND(ID_SNAPANGLE, OnSnapangle)
ON_COMMAND(ID_RULER, OnRuler)
ON_COMMAND(ID_ROTATESELECTION_XAXIS, OnRotateselectionXaxis)
ON_COMMAND(ID_ROTATESELECTION_YAXIS, OnRotateselectionYaxis)
ON_COMMAND(ID_ROTATESELECTION_ZAXIS, OnRotateselectionZaxis)
ON_COMMAND(ID_ROTATESELECTION_ROTATEANGLE, OnRotateselectionRotateangle)
ON_COMMAND(ID_EDIT_RENAMEOBJECT, OnEditRenameobject)
ON_COMMAND(ID_CHANGEMOVESPEED_INCREASE, OnChangemovespeedIncrease)
ON_COMMAND(ID_CHANGEMOVESPEED_DECREASE, OnChangemovespeedDecrease)
@@ -483,7 +468,6 @@ void CCryEditApp::RegisterActionHandlers()
ON_COMMAND(ID_TOOLS_VALIDATEOBJECTPOSITIONS, OnValidateObjectPositions)
ON_COMMAND(ID_TOOLS_PREFERENCES, OnToolsPreferences)
ON_COMMAND(ID_GRAPHICS_SETTINGS, OnGraphicsSettings)
ON_COMMAND(ID_EDIT_INVERTSELECTION, OnEditInvertselection)
ON_COMMAND(ID_SWITCHCAMERA_DEFAULTCAMERA, OnSwitchToDefaultCamera)
ON_COMMAND(ID_SWITCHCAMERA_SEQUENCECAMERA, OnSwitchToSequenceCamera)
ON_COMMAND(ID_SWITCHCAMERA_SELECTEDCAMERA, OnSwitchToSelectedcamera)
@@ -2645,64 +2629,6 @@ void CCryEditApp::OnFileExportToGameNoSurfaceTexture()
UserExportToGame(false);
}
void CCryEditApp::OnGeneratorsStaticobjects()
{
////////////////////////////////////////////////////////////////////////
// Show the static objects dialog
////////////////////////////////////////////////////////////////////////
/*
CStaticObjects cDialog;
cDialog.DoModal();
BeginWaitCursor();
GetIEditor()->UpdateViews( eUpdateStatObj );
GetIEditor()->GetDocument()->GetStatObjMap()->PlaceObjectsOnTerrain();
EndWaitCursor();
*/
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnEditSelectAll()
{
if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
{
////////////////////////////////////////////////////////////////////////
// Select all map objects
////////////////////////////////////////////////////////////////////////
AABB box(Vec3(-FLT_MAX, -FLT_MAX, -FLT_MAX), Vec3(FLT_MAX, FLT_MAX, FLT_MAX));
GetIEditor()->GetObjectManager()->SelectObjects(box);
}
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnEditSelectNone()
{
CUndo undo("Unselect All");
////////////////////////////////////////////////////////////////////////
// Remove the selection from all map objects
////////////////////////////////////////////////////////////////////////
GetIEditor()->ClearSelection();
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnEditInvertselection()
{
if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
{
GetIEditor()->GetObjectManager()->InvertSelection();
}
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnEditDelete()
{
if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
{
DeleteSelectedEntities(true);
}
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::DeleteSelectedEntities([[maybe_unused]] bool includeDescendants)
{
@@ -2860,13 +2786,6 @@ void CCryEditApp::OnShowHelpers()
GetIEditor()->Notify(eNotify_OnDisplayRenderUpdate);
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnLockSelection()
{
// Invert selection lock.
GetIEditor()->LockSelection(!GetIEditor()->IsSelectionLocked());
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnEditLevelData()
{
@@ -3628,7 +3547,6 @@ CCryEditDoc* CCryEditApp::OpenDocumentFile(LPCTSTR lpszFileName)
GetIEditor()->GetUndoManager()->Suspend();
actionManager->GetAction(ID_EDIT_SELECTALL)->trigger();
actionManager->GetAction(ID_GOTO_SELECTED)->trigger();
actionManager->GetAction(ID_EDIT_SELECTNONE)->trigger();
GetIEditor()->GetUndoManager()->Resume();
}
}
@@ -3646,69 +3564,6 @@ void CCryEditApp::OnResourcesReduceworkingset()
#endif
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnToggleSelection(bool hide)
{
CSelectionGroup* sel = GetIEditor()->GetSelection();
if (!sel->IsEmpty())
{
AzToolsFramework::ScopedUndoBatch undo(hide ? "Hide Entity" : "Show Entity");
for (int i = 0; i < sel->GetCount(); i++)
{
// Duplicated object names can exist in the case of prefab objects so passing a name as a script parameter and processing it couldn't be exact.
GetIEditor()->GetObjectManager()->HideObject(sel->GetObject(i), hide);
}
}
}
void CCryEditApp::OnEditHide()
{
if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
{
OnToggleSelection(true);
}
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnUpdateEditHide(QAction* action)
{
CSelectionGroup* sel = GetIEditor()->GetSelection();
if (!sel->IsEmpty())
{
action->setEnabled(true);
}
else
{
action->setEnabled(false);
}
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnEditShowLastHidden()
{
AzToolsFramework::ScopedUndoBatch undo("Show Last Hidden Entity");
GetIEditor()->GetObjectManager()->ShowLastHiddenObject();
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnEditUnhideall()
{
if (!GetIEditor()->IsNewViewportInteractionModelEnabled())
{
if (QMessageBox::question(
AzToolsFramework::GetActiveWindow(), QObject::tr("Unhide All"),
QObject::tr("Are you sure you want to unhide all the objects?"),
QMessageBox::Yes | QMessageBox::Cancel) == QMessageBox::Yes)
{
// Unhide all.
AzToolsFramework::ScopedUndoBatch undo("Unhide all Entities");
GetIEditor()->GetObjectManager()->UnhideAll();
}
}
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnSnap()
{
@@ -3978,56 +3833,6 @@ void CCryEditApp::OnUpdateSnapangle(QAction* action)
action->setChecked(gSettings.pGrid->IsAngleSnapEnabled());
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnRuler()
{
CRuler* pRuler = GetIEditor()->GetRuler();
pRuler->SetActive(!pRuler->IsActive());
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnUpdateRuler(QAction* action)
{
Q_ASSERT(action->isCheckable());
action->setChecked(GetIEditor()->GetRuler()->IsActive());
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnRotateselectionXaxis()
{
CUndo undo("Rotate X");
CSelectionGroup* pSelection = GetIEditor()->GetSelection();
pSelection->Rotate(Ang3(m_fastRotateAngle, 0, 0), GetIEditor()->GetReferenceCoordSys());
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnRotateselectionYaxis()
{
CUndo undo("Rotate Y");
CSelectionGroup* pSelection = GetIEditor()->GetSelection();
pSelection->Rotate(Ang3(0, m_fastRotateAngle, 0), GetIEditor()->GetReferenceCoordSys());
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnRotateselectionZaxis()
{
CUndo undo("Rotate Z");
CSelectionGroup* pSelection = GetIEditor()->GetSelection();
pSelection->Rotate(Ang3(0, 0, m_fastRotateAngle), GetIEditor()->GetReferenceCoordSys());
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnRotateselectionRotateangle()
{
bool ok = false;
int fractionalDigitCount = 5;
float angle = aznumeric_caster(QInputDialog::getDouble(AzToolsFramework::GetActiveWindow(), QObject::tr("Rotate Angle"), QStringLiteral(""), m_fastRotateAngle, std::numeric_limits<float>::lowest(), std::numeric_limits<float>::max(), fractionalDigitCount, &ok));
if (ok)
{
m_fastRotateAngle = angle;
}
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnEditRenameobject()
{