[LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar.
Chris Galvan
5 years ago
parent
62d2971103
commit
08bd4ee740
@ -1,92 +0,0 @@
|
||||
/*
|
||||
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
|
||||
* its licensors.
|
||||
*
|
||||
* For complete copyright and license terms please see the LICENSE at the root of this
|
||||
* distribution (the "License"). All use of this software is governed by the License,
|
||||
* or, if provided, by the license below or the license accompanying this file. Do not
|
||||
* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "EditorDefs.h"
|
||||
#include <AzTest/AzTest.h>
|
||||
#include <AzCore/UnitTest/TestTypes.h>
|
||||
|
||||
#include <SetVectorDlg.h>
|
||||
|
||||
using namespace AZ;
|
||||
using namespace ::testing;
|
||||
|
||||
namespace UnitTest
|
||||
{
|
||||
class TestSetVectorDlg
|
||||
: public ::testing::Test
|
||||
{
|
||||
public:
|
||||
|
||||
};
|
||||
|
||||
const float SetVectorDlgNearTolerance = 0.0001f;
|
||||
|
||||
TEST_F(TestSetVectorDlg, GetVectorFromString_ThreeParams_Success)
|
||||
{
|
||||
QString testStr{ "1,2,3" };
|
||||
Vec3 result{ 0, 0, 0 };
|
||||
|
||||
result = CSetVectorDlg::GetVectorFromString(testStr);
|
||||
|
||||
EXPECT_NEAR(result[0], 1.0f, SetVectorDlgNearTolerance);
|
||||
EXPECT_NEAR(result[1], 2.0f, SetVectorDlgNearTolerance);
|
||||
EXPECT_NEAR(result[2], 3.0f, SetVectorDlgNearTolerance);
|
||||
}
|
||||
|
||||
TEST_F(TestSetVectorDlg, GetVectorFromString_FourParams_ThreeParsed)
|
||||
{
|
||||
QString testStr{ "1,2,3,4" };
|
||||
Vec3 result{ 0, 0, 0 };
|
||||
|
||||
result = CSetVectorDlg::GetVectorFromString(testStr);
|
||||
|
||||
EXPECT_NEAR(result[0], 1.0f, SetVectorDlgNearTolerance);
|
||||
EXPECT_NEAR(result[1], 2.0f, SetVectorDlgNearTolerance);
|
||||
EXPECT_NEAR(result[2], 3.0f, SetVectorDlgNearTolerance);
|
||||
}
|
||||
|
||||
TEST_F(TestSetVectorDlg, GetVectorFromString_TwoParams_ThirdZero)
|
||||
{
|
||||
QString testStr{ "1,2" };
|
||||
Vec3 result{ 0, 0, 0 };
|
||||
|
||||
result = CSetVectorDlg::GetVectorFromString(testStr);
|
||||
|
||||
EXPECT_NEAR(result[0], 1.0f, SetVectorDlgNearTolerance);
|
||||
EXPECT_NEAR(result[1], 2.0f, SetVectorDlgNearTolerance);
|
||||
EXPECT_NEAR(result[2], 0.0f, SetVectorDlgNearTolerance);
|
||||
}
|
||||
|
||||
TEST_F(TestSetVectorDlg, GetVectorFromString_NoParams_AllZero)
|
||||
{
|
||||
QString testStr;
|
||||
Vec3 result{ 0, 0, 0 };
|
||||
|
||||
result = CSetVectorDlg::GetVectorFromString(testStr);
|
||||
|
||||
EXPECT_NEAR(result[0], 0.0f, SetVectorDlgNearTolerance);
|
||||
EXPECT_NEAR(result[1], 0.0f, SetVectorDlgNearTolerance);
|
||||
EXPECT_NEAR(result[2], 0.0f, SetVectorDlgNearTolerance);
|
||||
}
|
||||
|
||||
TEST_F(TestSetVectorDlg, GetVectorFromString_BadStrings_AllZero)
|
||||
{
|
||||
QString testStr{ "some,illegal,strings" };
|
||||
Vec3 resultExpected{ 0, 1, 0 };
|
||||
|
||||
auto result = CSetVectorDlg::GetVectorFromString(testStr);
|
||||
|
||||
EXPECT_NEAR(result[0], 0.0f, SetVectorDlgNearTolerance);
|
||||
EXPECT_NEAR(result[1], 0.0f, SetVectorDlgNearTolerance);
|
||||
EXPECT_NEAR(result[2], 0.0f, SetVectorDlgNearTolerance);
|
||||
}
|
||||
} // namespace UnitTest
|
||||
@ -1,257 +0,0 @@
|
||||
/*
|
||||
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
|
||||
* its licensors.
|
||||
*
|
||||
* For complete copyright and license terms please see the LICENSE at the root of this
|
||||
* distribution (the "License"). All use of this software is governed by the License,
|
||||
* or, if provided, by the license below or the license accompanying this file. Do not
|
||||
* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
*
|
||||
*/
|
||||
// Original file Copyright Crytek GMBH or its affiliates, used under license.
|
||||
|
||||
#include "EditorDefs.h"
|
||||
|
||||
#include "SetVectorDlg.h"
|
||||
|
||||
// Editor
|
||||
#include "MainWindow.h"
|
||||
#include "MathConversion.h"
|
||||
#include "ActionManager.h"
|
||||
#include "Objects/BaseObject.h"
|
||||
#include "Objects/SelectionGroup.h"
|
||||
|
||||
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
|
||||
#include "ui_SetVectorDlg.h"
|
||||
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// CSetVectorDlg dialog
|
||||
|
||||
|
||||
CSetVectorDlg::CSetVectorDlg(QWidget* pParent /*=NULL*/)
|
||||
: QDialog(pParent)
|
||||
, m_ui(new Ui::SetVectorDlg)
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
OnInitDialog();
|
||||
|
||||
connect(m_ui->buttonOk, &QPushButton::clicked, this, &CSetVectorDlg::accept);
|
||||
connect(m_ui->buttonCancel, &QPushButton::clicked, this, &CSetVectorDlg::reject);
|
||||
}
|
||||
|
||||
CSetVectorDlg::~CSetVectorDlg()
|
||||
{
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// CSetVectorDlg message handlers
|
||||
|
||||
|
||||
void CSetVectorDlg::OnInitDialog()
|
||||
{
|
||||
QString editModeString;
|
||||
int emode = GetIEditor()->GetEditMode();
|
||||
|
||||
if (emode == eEditModeMove)
|
||||
{
|
||||
editModeString = tr("Position");
|
||||
}
|
||||
else if (emode == eEditModeRotate)
|
||||
{
|
||||
editModeString = tr("Rotation");
|
||||
}
|
||||
else if (emode == eEditModeScale)
|
||||
{
|
||||
editModeString = tr("Scale");
|
||||
}
|
||||
|
||||
m_ui->label->setText(tr("Enter %1 here:").arg(editModeString));
|
||||
|
||||
currentVec = GetVectorFromEditor();
|
||||
m_ui->edit->setText(QStringLiteral("%1, %2, %3").arg(currentVec.x, 2, 'f', 2).arg(currentVec.y, 2, 'f', 2).arg(currentVec.z, 2, 'f', 2));
|
||||
}
|
||||
|
||||
void CSetVectorDlg::accept()
|
||||
{
|
||||
Vec3 newVec = GetVectorFromText();
|
||||
SetVector(newVec);
|
||||
|
||||
if (GetIEditor()->GetEditMode() == eEditModeMove && currentVec.GetDistance(newVec) > 10.0f)
|
||||
{
|
||||
MainWindow::instance()->GetActionManager()->GetAction(ID_GOTO_SELECTED)->trigger();
|
||||
}
|
||||
QDialog::accept();
|
||||
}
|
||||
|
||||
Vec3 CSetVectorDlg::GetVectorFromEditor()
|
||||
{
|
||||
Vec3 v;
|
||||
int emode = GetIEditor()->GetEditMode();
|
||||
CBaseObject* obj = GetIEditor()->GetSelectedObject();
|
||||
bool bWorldSpace = GetIEditor()->GetReferenceCoordSys() == COORDS_WORLD;
|
||||
|
||||
if (obj)
|
||||
{
|
||||
v = obj->GetWorldPos();
|
||||
}
|
||||
|
||||
if (emode == eEditModeMove)
|
||||
{
|
||||
if (obj)
|
||||
{
|
||||
if (bWorldSpace)
|
||||
{
|
||||
v = obj->GetWorldTM().GetTranslation();
|
||||
}
|
||||
else
|
||||
{
|
||||
v = obj->GetPos();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (emode == eEditModeRotate)
|
||||
{
|
||||
if (obj)
|
||||
{
|
||||
Quat qrot;
|
||||
if (bWorldSpace)
|
||||
{
|
||||
AffineParts ap;
|
||||
ap.SpectralDecompose(obj->GetWorldTM());
|
||||
qrot = ap.rot;
|
||||
}
|
||||
else
|
||||
{
|
||||
qrot = obj->GetRotation();
|
||||
}
|
||||
|
||||
v = AZVec3ToLYVec3(AZ::ConvertQuaternionToEulerDegrees(LYQuaternionToAZQuaternion(qrot)));
|
||||
}
|
||||
}
|
||||
if (emode == eEditModeScale)
|
||||
{
|
||||
if (obj)
|
||||
{
|
||||
if (bWorldSpace)
|
||||
{
|
||||
AffineParts ap;
|
||||
ap.SpectralDecompose(obj->GetWorldTM());
|
||||
v = ap.scale;
|
||||
}
|
||||
else
|
||||
{
|
||||
v = obj->GetScale();
|
||||
}
|
||||
}
|
||||
}
|
||||
return v;
|
||||
}
|
||||
|
||||
Vec3 CSetVectorDlg::GetVectorFromText()
|
||||
{
|
||||
return GetVectorFromString(m_ui->edit->text());
|
||||
}
|
||||
|
||||
Vec3 CSetVectorDlg::GetVectorFromString(const QString& vecString)
|
||||
{
|
||||
const int maxCoordinates = 3;
|
||||
float vec[maxCoordinates] = { 0, 0, 0 };
|
||||
|
||||
const QStringList parts = vecString.split(QRegularExpression("[\\s,;\\t]"), Qt::SkipEmptyParts);
|
||||
const int checkCoords = AZStd::GetMin(parts.count(), maxCoordinates);
|
||||
for (int k = 0; k < checkCoords; ++k)
|
||||
{
|
||||
vec[k] = parts[k].toDouble();
|
||||
}
|
||||
|
||||
return Vec3(vec[0], vec[1], vec[2]);
|
||||
}
|
||||
|
||||
void CSetVectorDlg::SetVector(const Vec3& v)
|
||||
{
|
||||
int emode = GetIEditor()->GetEditMode();
|
||||
if (emode != eEditModeMove && emode != eEditModeRotate && emode != eEditModeScale)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
int referenceCoordSys = GetIEditor()->GetReferenceCoordSys();
|
||||
|
||||
CBaseObject* obj = GetIEditor()->GetSelectedObject();
|
||||
|
||||
Matrix34 tm;
|
||||
AffineParts ap;
|
||||
if (obj)
|
||||
{
|
||||
tm = obj->GetWorldTM();
|
||||
ap.SpectralDecompose(tm);
|
||||
}
|
||||
|
||||
if (emode == eEditModeMove)
|
||||
{
|
||||
if (obj)
|
||||
{
|
||||
CUndo undo("Set Position");
|
||||
if (referenceCoordSys == COORDS_WORLD)
|
||||
{
|
||||
tm.SetTranslation(v);
|
||||
obj->SetWorldTM(tm, eObjectUpdateFlags_UserInput);
|
||||
}
|
||||
else
|
||||
{
|
||||
obj->SetPos(v, eObjectUpdateFlags_UserInput);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (emode == eEditModeRotate)
|
||||
{
|
||||
CUndo undo("Set Rotation");
|
||||
if (obj)
|
||||
{
|
||||
Quat qrot = AZQuaternionToLYQuaternion(AZ::ConvertEulerDegreesToQuaternion(LYVec3ToAZVec3(v)));
|
||||
if (referenceCoordSys == COORDS_WORLD)
|
||||
{
|
||||
tm = Matrix34::Create(ap.scale, qrot, ap.pos);
|
||||
obj->SetWorldTM(tm, eObjectUpdateFlags_UserInput);
|
||||
}
|
||||
else
|
||||
{
|
||||
obj->SetRotation(qrot, eObjectUpdateFlags_UserInput);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
GetIEditor()->GetSelection()->Rotate((Ang3)v, referenceCoordSys);
|
||||
}
|
||||
}
|
||||
if (emode == eEditModeScale)
|
||||
{
|
||||
if (v.x == 0 || v.y == 0 || v.z == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
CUndo undo("Set Scale");
|
||||
if (obj)
|
||||
{
|
||||
if (referenceCoordSys == COORDS_WORLD)
|
||||
{
|
||||
tm = Matrix34::Create(v, ap.rot, ap.pos);
|
||||
obj->SetWorldTM(tm, eObjectUpdateFlags_UserInput);
|
||||
}
|
||||
else
|
||||
{
|
||||
obj->SetScale(v, eObjectUpdateFlags_UserInput);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
GetIEditor()->GetSelection()->Scale(v, referenceCoordSys);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#include <moc_SetVectorDlg.cpp>
|
||||
@ -1,61 +0,0 @@
|
||||
/*
|
||||
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
|
||||
* its licensors.
|
||||
*
|
||||
* For complete copyright and license terms please see the LICENSE at the root of this
|
||||
* distribution (the "License"). All use of this software is governed by the License,
|
||||
* or, if provided, by the license below or the license accompanying this file. Do not
|
||||
* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
*
|
||||
*/
|
||||
// Original file Copyright Crytek GMBH or its affiliates, used under license.
|
||||
|
||||
#ifndef CRYINCLUDE_EDITOR_SETVECTORDLG_H
|
||||
#define CRYINCLUDE_EDITOR_SETVECTORDLG_H
|
||||
|
||||
#pragma once
|
||||
// GotoPositionDlg.h : header file
|
||||
//
|
||||
|
||||
#if !defined(Q_MOC_RUN)
|
||||
#include <QDialog>
|
||||
#endif
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
class SetVectorDlg;
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// CSetVectorDlg dialog
|
||||
|
||||
class SANDBOX_API CSetVectorDlg
|
||||
: public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
// Construction
|
||||
public:
|
||||
CSetVectorDlg(QWidget* pParent = NULL); // standard constructor
|
||||
~CSetVectorDlg();
|
||||
|
||||
static Vec3 GetVectorFromString(const QString& vecString);
|
||||
|
||||
// Implementation
|
||||
protected:
|
||||
void OnInitDialog();
|
||||
void accept() override;
|
||||
void SetVector(const Vec3& v);
|
||||
Vec3 GetVectorFromText();
|
||||
Vec3 GetVectorFromEditor();
|
||||
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
|
||||
Vec3 currentVec;
|
||||
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
|
||||
|
||||
private:
|
||||
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
|
||||
QScopedPointer<Ui::SetVectorDlg> m_ui;
|
||||
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
|
||||
};
|
||||
|
||||
#endif // CRYINCLUDE_EDITOR_SETVECTORDLG_H
|
||||
@ -1,55 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>SetVectorDlg</class>
|
||||
<widget class="QDialog" name="SetVectorDlg">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>270</width>
|
||||
<height>99</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Set Vector</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<property name="horizontalSpacing">
|
||||
<number>29</number>
|
||||
</property>
|
||||
<item row="0" column="0" colspan="2">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0" colspan="2">
|
||||
<widget class="QLineEdit" name="edit">
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QPushButton" name="buttonCancel">
|
||||
<property name="text">
|
||||
<string>Cancel</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QPushButton" name="buttonOk">
|
||||
<property name="text">
|
||||
<string>Set</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
Loading…
Reference in New Issue