Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix inspector rotation use XYZ rotate #482

Merged
merged 2 commits into from
Feb 29, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
update
VTui22 committed Feb 29, 2024
commit 572acfa733f89a3aef0181581192e25dcc4305db
2 changes: 1 addition & 1 deletion Engine/Source/Editor/UILayers/Inspector.cpp
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ void UpdateComponentWidget<engine::TransformComponent>(engine::SceneWorld* pScen

if (isHeaderOpen)
{
if (ImGuiUtils::ImGuiTransformProperty("Transform", pTransformComponent->GetTransform(), pTransformComponent->GetInspectorEular()))
if (ImGuiUtils::ImGuiTransformProperty("Transform", pTransformComponent->GetTransform(), pTransformComponent->GetRotateEular()))
{
pTransformComponent->Dirty();
pTransformComponent->Build();
8 changes: 5 additions & 3 deletions Engine/Source/Runtime/ECWorld/TransformComponent.h
Original file line number Diff line number Diff line change
@@ -37,8 +37,10 @@ class TransformComponent final
#ifdef EDITOR_MODE
static bool DoUseUniformScale() { return m_doUseUniformScale; }
static void SetUseUniformScale(bool use) { m_doUseUniformScale = use; }
cd::Vec3f& GetInspectorEular() { return m_inspectorEular; }
void SetInspectorRotation(const cd::Vec3f& eular) { m_inspectorEular = eular; }

cd::Vec3f& GetRotateEular() { return m_rotateEular; }
const cd::Vec3f& GetRotateEular() const { return m_rotateEular; }
void SetRotateEular(cd::Vec3f eular) { m_rotateEular = cd::MoveTemp(eular); }
#endif

private:
@@ -53,7 +55,7 @@ class TransformComponent final

#ifdef EDITOR_MODE
static bool m_doUseUniformScale;
cd::Vec3f m_inspectorEular = cd::Vec3f::Zero();
cd::Vec3f m_rotateEular = cd::Vec3f::Zero();
#endif
};

60 changes: 35 additions & 25 deletions Engine/Source/Runtime/ImGui/ImGuiUtils.hpp
Original file line number Diff line number Diff line change
@@ -11,33 +11,44 @@
namespace ImGuiUtils
{

static cd::Matrix3x3 RotateX(float rad)
enum class AxisDirection
{
cd::Matrix3x3 matrixRot = cd::Matrix3x3::Identity();
matrixRot.Data(4) = std::cos(rad);
matrixRot.Data(5) = -std::sin(rad);
matrixRot.Data(7) = std::sin(rad);
matrixRot.Data(8) = std::cos(rad);
return matrixRot;
}
X,
Y,
Z
};

static cd::Matrix3x3 RotateY(float rad)
template<AxisDirection AD>
static cd::Matrix3x3 Rotate(float rad)
{
cd::Matrix3x3 matrixRot = cd::Matrix3x3::Identity();
matrixRot.Data(0) = std::cos(rad);
matrixRot.Data(2) = std::sin(rad);
matrixRot.Data(6) = -std::sin(rad);
matrixRot.Data(8) = std::cos(rad);
return matrixRot;
}

static cd::Matrix3x3 RotateZ(float rad)
{
cd::Matrix3x3 matrixRot = cd::Matrix3x3::Identity();
matrixRot.Data(0) = std::cos(rad);
matrixRot.Data(1) = -std::sin(rad);
matrixRot.Data(3) = std::sin(rad);
matrixRot.Data(4) = std::cos(rad);
float cosRad = std::cos(rad);
float sinRad = std::sin(rad);
if constexpr (AD == AxisDirection::X)
{
matrixRot.Data(4) = cosRad;
matrixRot.Data(5) = -sinRad;
matrixRot.Data(7) = sinRad;
matrixRot.Data(8) = cosRad;
}
else if constexpr (AD == AxisDirection::Y)
{
matrixRot.Data(0) = cosRad;
matrixRot.Data(2) = sinRad;
matrixRot.Data(6) = -sinRad;
matrixRot.Data(8) = cosRad;
}
else if constexpr (AD == AxisDirection::Z)
{
matrixRot.Data(0) = cosRad;
matrixRot.Data(1) = -sinRad;
matrixRot.Data(3) = sinRad;
matrixRot.Data(4) = cosRad;
}
else
{
static_assert("Unsupported axis direction.");
}
return matrixRot;
}

@@ -227,8 +238,7 @@ static bool ImGuiTransformProperty(const char* pName, cd::Transform& value, cd::

if (ImGuiVectorProperty("Rotation", inspectorEular, cd::Unit::Degree, cd::Vec3f(-360.0f), cd::Vec3f(360.0f), false, 0.2f))
{
// XYZ Rotate
cd::Matrix3x3 matrix = RotateX(cd::Math::DegreeToRadian(inspectorEular.x())) * RotateY(cd::Math::DegreeToRadian(inspectorEular.y())) * RotateZ(cd::Math::DegreeToRadian(inspectorEular.z()));
cd::Matrix3x3 matrix = Rotate<AxisDirection::X>(cd::Math::DegreeToRadian(inspectorEular.x())) * Rotate<AxisDirection::Y>(cd::Math::DegreeToRadian(inspectorEular.y())) * Rotate<AxisDirection::Z>(cd::Math::DegreeToRadian(inspectorEular.z()));
value.SetRotation(cd::Quaternion::FromMatrix(matrix));
dirty = true;
}