AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-09 13:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Editor/CWorldEditor: Eliminate redundant copies

Browse Source
This commit is contained in:
Lioncache
2025-12-07 02:13:02 -05:00
parent 051d0ec50b
commit 5ff96c750b
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Editor/WorldEditor/CWorldEditor.cpp
View File

@@ -440,17 +440,16 @@ void CWorldEditor::OpenProject()
void CWorldEditor::OpenRecentProject() void CWorldEditor::OpenRecentProject()
{ {
QAction *pSender = qobject_cast<QAction*>(sender()); const auto* pSender = qobject_cast<QAction*>(sender());
if (!pSender)
return;
if (pSender) QSettings Settings;
{ const QStringList RecentProjectsList = Settings.value(QStringLiteral("WorldEditor/RecentProjectsList")).toStringList();
QSettings Settings;
QStringList RecentProjectsList = Settings.value(QStringLiteral("WorldEditor/RecentProjectsList")).toStringList();
int ProjIndex = pSender->data().toInt(); const int ProjIndex = pSender->data().toInt();
QString ProjPath = RecentProjectsList[ProjIndex]; const QString& ProjPath = RecentProjectsList[ProjIndex];
gpEdApp->OpenProject(ProjPath); gpEdApp->OpenProject(ProjPath);
}
} }
void CWorldEditor::ExportGame() void CWorldEditor::ExportGame()
@@ -464,7 +463,8 @@ void CWorldEditor::ExportGame()
return; return;
CExportGameDialog ExportDialog(IsoPath, ExportDir, this); CExportGameDialog ExportDialog(IsoPath, ExportDir, this);
if (ExportDialog.HasValidDisc()) ExportDialog.exec(); if (ExportDialog.HasValidDisc())
ExportDialog.exec();
if (ExportDialog.ExportSucceeded()) if (ExportDialog.ExportSucceeded())
{ {
@@ -965,11 +965,11 @@ void CWorldEditor::LaunchQuickplay()
LaunchQuickplayFromLocation(CameraPosition, false); LaunchQuickplayFromLocation(CameraPosition, false);
} }
void CWorldEditor::LaunchQuickplayFromLocation(CVector3f Location, bool ForceAsSpawnPosition) void CWorldEditor::LaunchQuickplayFromLocation(const CVector3f& Location, bool ForceAsSpawnPosition)
{ {
// This function should not be called if a level is not open in a project. // This function should not be called if a level is not open in a project.
ASSERT( gpEdApp->ActiveProject() != nullptr ); ASSERT(gpEdApp->ActiveProject() != nullptr);
ASSERT( mpWorld && mpArea ); ASSERT(mpWorld && mpArea);
// Fill in parameters and start running // Fill in parameters and start running
SQuickplayParameters Parameters = mQuickplayParms; SQuickplayParameters Parameters = mQuickplayParms;
@@ -988,7 +988,7 @@ void CWorldEditor::LaunchQuickplayFromLocation(CVector3f Location, bool ForceAsS
} }
// ************ PROTECTED ************ // ************ PROTECTED ************
QAction* CWorldEditor::AddEditModeButton(QIcon Icon, QString ToolTip, EWorldEditorMode Mode) QAction* CWorldEditor::AddEditModeButton(const QIcon& Icon, const QString& ToolTip, EWorldEditorMode Mode)
{ {
ASSERT(mpEditModeButtonGroup->button(Mode) == nullptr); ASSERT(mpEditModeButtonGroup->button(Mode) == nullptr);
@@ -1147,7 +1147,7 @@ void CWorldEditor::OnUnlinkClicked()
} }
} }
void CWorldEditor::OnPickModeEnter(QCursor Cursor) void CWorldEditor::OnPickModeEnter(const QCursor& Cursor)
{ {
ui->MainViewport->SetCursorState(Cursor); ui->MainViewport->SetCursorState(Cursor);
} }
@@ -1179,9 +1179,10 @@ void CWorldEditor::OnCameraSpeedChange(double Speed)
ui->CamSpeedSpinBox->blockSignals(false); ui->CamSpeedSpinBox->blockSignals(false);
} }
void CWorldEditor::OnTransformSpinBoxModified(CVector3f Value) void CWorldEditor::OnTransformSpinBoxModified(const CVector3f& Value)
{ {
if (mpSelection->IsEmpty()) return; if (mpSelection->IsEmpty())
return;
switch (mGizmo.Mode()) switch (mGizmo.Mode())
{ {
@@ -1212,9 +1213,10 @@ void CWorldEditor::OnTransformSpinBoxModified(CVector3f Value)
UpdateGizmoUI(); UpdateGizmoUI();
} }
void CWorldEditor::OnTransformSpinBoxEdited(CVector3f) void CWorldEditor::OnTransformSpinBoxEdited(const CVector3f&)
{ {
if (mpSelection->IsEmpty()) return; if (mpSelection->IsEmpty())
return;
if (mGizmo.Mode() == CGizmo::EGizmoMode::Translate) UndoStack().push(CTranslateNodeCommand::End()); if (mGizmo.Mode() == CGizmo::EGizmoMode::Translate) UndoStack().push(CTranslateNodeCommand::End());
else if (mGizmo.Mode() == CGizmo::EGizmoMode::Rotate) UndoStack().push(CRotateNodeCommand::End()); else if (mGizmo.Mode() == CGizmo::EGizmoMode::Rotate) UndoStack().push(CRotateNodeCommand::End());

10
src/Editor/WorldEditor/CWorldEditor.h
View File

@@ -140,10 +140,10 @@ public slots:
void UpdateNewLinkLine(); void UpdateNewLinkLine();
void LaunchQuickplay(); void LaunchQuickplay();
void LaunchQuickplayFromLocation(CVector3f Location, bool ForceAsSpawnPosition); void LaunchQuickplayFromLocation(const CVector3f& Location, bool ForceAsSpawnPosition);
protected: protected:
QAction* AddEditModeButton(QIcon Icon, QString ToolTip, EWorldEditorMode Mode); QAction* AddEditModeButton(const QIcon& Icon, const QString& ToolTip, EWorldEditorMode Mode);
void SetSidebar(CWorldEditorSidebar *pSidebar); void SetSidebar(CWorldEditorSidebar *pSidebar);
void GizmoModeChanged(CGizmo::EGizmoMode Mode) override; void GizmoModeChanged(CGizmo::EGizmoMode Mode) override;
@@ -156,12 +156,12 @@ private slots:
void OnLinkEnd(); void OnLinkEnd();
void OnUnlinkClicked(); void OnUnlinkClicked();
void OnPickModeEnter(QCursor Cursor); void OnPickModeEnter(const QCursor& Cursor);
void OnPickModeExit(); void OnPickModeExit();
void UpdateCameraOrbit(); void UpdateCameraOrbit();
void OnCameraSpeedChange(double Speed); void OnCameraSpeedChange(double Speed);
void OnTransformSpinBoxModified(CVector3f Value); void OnTransformSpinBoxModified(const CVector3f& Value);
void OnTransformSpinBoxEdited(CVector3f Value); void OnTransformSpinBoxEdited(const CVector3f& Value);
void SelectAllTriggered(); void SelectAllTriggered();
void InvertSelectionTriggered(); void InvertSelectionTriggered();