fixed gizmo step - fixes #749
This commit is contained in:
parent
8ca3599c32
commit
c201efe02e
5 changed files with 3 additions and 9 deletions
|
@ -751,6 +751,7 @@ struct GizmoImpl : public Gizmo
|
||||||
|
|
||||||
|
|
||||||
int getStep() const override { return m_steps[(int)m_mode]; }
|
int getStep() const override { return m_steps[(int)m_mode]; }
|
||||||
|
void enableStep(bool enable) override { m_is_step = enable; }
|
||||||
void setStep(int step) override { m_steps[(int)m_mode] = step; }
|
void setStep(int step) override { m_steps[(int)m_mode] = step; }
|
||||||
bool isAutosnapDown() const override { return m_is_autosnap_down; }
|
bool isAutosnapDown() const override { return m_is_autosnap_down; }
|
||||||
void setAutosnapDown(bool snap) override { m_is_autosnap_down = snap; }
|
void setAutosnapDown(bool snap) override { m_is_autosnap_down = snap; }
|
||||||
|
|
|
@ -27,6 +27,7 @@ class LUMIX_EDITOR_API Gizmo
|
||||||
virtual void toggleCoordSystem() = 0;
|
virtual void toggleCoordSystem() = 0;
|
||||||
virtual int getStep() const = 0;
|
virtual int getStep() const = 0;
|
||||||
virtual void setStep(int step) = 0;
|
virtual void setStep(int step) = 0;
|
||||||
|
virtual void enableStep(bool enable) = 0;
|
||||||
virtual bool isAutosnapDown() const = 0;
|
virtual bool isAutosnapDown() const = 0;
|
||||||
virtual void setAutosnapDown(bool snap) = 0;
|
virtual void setAutosnapDown(bool snap) = 0;
|
||||||
virtual bool isTranslateMode() const = 0;
|
virtual bool isTranslateMode() const = 0;
|
||||||
|
|
|
@ -1717,13 +1717,6 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void setGizmoUseStep(bool use) override
|
|
||||||
{
|
|
||||||
m_gizmo_use_step = use;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void onMouseUp(int x, int y, MouseButton::Value button) override
|
void onMouseUp(int x, int y, MouseButton::Value button) override
|
||||||
{
|
{
|
||||||
m_is_mouse_down[button] = false;
|
m_is_mouse_down[button] = false;
|
||||||
|
|
|
@ -84,7 +84,6 @@ public:
|
||||||
virtual void renderIcons() = 0;
|
virtual void renderIcons() = 0;
|
||||||
virtual ComponentUID getEditCamera() = 0;
|
virtual ComponentUID getEditCamera() = 0;
|
||||||
virtual class Gizmo& getGizmo() = 0;
|
virtual class Gizmo& getGizmo() = 0;
|
||||||
virtual void setGizmoUseStep(bool use) = 0;
|
|
||||||
virtual bool canUndo() const = 0;
|
virtual bool canUndo() const = 0;
|
||||||
virtual bool canRedo() const = 0;
|
virtual bool canRedo() const = 0;
|
||||||
virtual void undo() = 0;
|
virtual void undo() = 0;
|
||||||
|
|
|
@ -192,7 +192,7 @@ void SceneView::onGUI()
|
||||||
view_pos = content_min;
|
view_pos = content_min;
|
||||||
if (ImGui::IsItemHovered())
|
if (ImGui::IsItemHovered())
|
||||||
{
|
{
|
||||||
m_editor->setGizmoUseStep(m_toggle_gizmo_step_action->isActive());
|
m_editor->getGizmo().enableStep(m_toggle_gizmo_step_action->isActive());
|
||||||
auto rel_mp = ImGui::GetMousePos();
|
auto rel_mp = ImGui::GetMousePos();
|
||||||
rel_mp.x -= m_screen_x;
|
rel_mp.x -= m_screen_x;
|
||||||
rel_mp.y -= m_screen_y;
|
rel_mp.y -= m_screen_y;
|
||||||
|
|
Loading…
Reference in a new issue