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.

Sign up for GitHub

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

Jump to bottom

fix inspector rotation use XYZ rotate #482

Merged
merged 2 commits into from
Feb 29, 2024
Merged

fix inspector rotation use XYZ rotate #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2877a9a
fix inspector rotation use XYZ rotate
VTui22 Feb 28, 2024
572acfa
update
VTui22 Feb 29, 2024
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
2 changes: 1 addition & 1 deletion Engine/Source/Editor/UILayers/Inspector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ void UpdateComponentWidget<engine::TransformComponent>(engine::SceneWorld* pScen

if (isHeaderOpen)
{
if (ImGuiUtils::ImGuiTransformProperty("Transform", pTransformComponent->GetTransform()))
if (ImGuiUtils::ImGuiTransformProperty("Transform", pTransformComponent->GetTransform(), pTransformComponent->GetRotateEular()))
{
pTransformComponent->Dirty();
pTransformComponent->Build();
Expand Down
5 changes: 5 additions & 0 deletions Engine/Source/Runtime/ECWorld/TransformComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ class TransformComponent final
#ifdef EDITOR_MODE
static bool DoUseUniformScale() { return m_doUseUniformScale; }
static void SetUseUniformScale(bool use) { m_doUseUniformScale = use; }

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:
Expand All @@ -51,6 +55,7 @@ class TransformComponent final

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

Expand Down
52 changes: 45 additions & 7 deletions Engine/Source/Runtime/ImGui/ImGuiUtils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,47 @@
namespace ImGuiUtils
{

enum class AxisDirection
{
X,
Y,
Z
};

template<AxisDirection AD>
static cd::Matrix3x3 Rotate(float rad)
{
cd::Matrix3x3 matrixRot = cd::Matrix3x3::Identity();
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;
}

static bool ImGuiBoolProperty(const char* pName, bool& value)
{
return ImGui::Checkbox(pName, &value);
Expand Down Expand Up @@ -185,7 +226,7 @@ static bool ImGuiVectorProperty(const char* pName, T& value, cd::Unit unit = cd:
return dirty;
}

static bool ImGuiTransformProperty(const char* pName, cd::Transform& value)
static bool ImGuiTransformProperty(const char* pName, cd::Transform& value, cd::Vec3f& inspectorEular)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is just OK but doesn't look good in the call side. As a api user, it is strange to apply extra vec3f.

{
ImGui::PushID(pName);

Expand All @@ -195,13 +236,10 @@ static bool ImGuiTransformProperty(const char* pName, cd::Transform& value)
dirty = true;
}

cd::Vec3f eularAngles = value.GetRotation().ToEulerAngles();
if (ImGuiVectorProperty("Rotation", eularAngles, cd::Unit::Degree, cd::Vec3f::Zero(), cd::Vec3f(360.0f)))
if (ImGuiVectorProperty("Rotation", inspectorEular, cd::Unit::Degree, cd::Vec3f(-360.0f), cd::Vec3f(360.0f), false, 0.2f))
{
float pitch = std::min(eularAngles.x(), 89.9f);
pitch = std::max(pitch, -89.9f);

value.SetRotation(cd::Quaternion::FromPitchYawRoll(pitch, eularAngles.y(), eularAngles.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;
}
constexpr float labelIndetation = 10.0f;
Expand Down
Loading