3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed 2D gizmos

Browse Source
This commit is contained in:
Enrico Turri 2018-08-28 12:50:26 +02:00
parent 4e37f9d232
commit 255e837d33
3 changed files with 3 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xs/src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -1134,11 +1134,7 @@ GLCanvas3D::Gizmos::~Gizmos()
bool GLCanvas3D::Gizmos::init(GLCanvas3D& parent) bool GLCanvas3D::Gizmos::init(GLCanvas3D& parent)
{ {
#if ENABLE_GIZMOS_3D
GLGizmoBase* gizmo = new GLGizmoScale3D(parent); GLGizmoBase* gizmo = new GLGizmoScale3D(parent);
#else
GLGizmoBase* gizmo = new GLGizmoScale(parent);
#endif // ENABLE_GIZMOS_3D
if (gizmo == nullptr) if (gizmo == nullptr)
return false; return false;
@ -1147,11 +1143,7 @@ bool GLCanvas3D::Gizmos::init(GLCanvas3D& parent)
m_gizmos.insert(GizmosMap::value_type(Scale, gizmo)); m_gizmos.insert(GizmosMap::value_type(Scale, gizmo));
#if ENABLE_GIZMOS_3D
gizmo = new GLGizmoRotate3D(parent); gizmo = new GLGizmoRotate3D(parent);
#else
gizmo = new GLGizmoRotate(parent, GLGizmoRotate::Z);
#endif // ENABLE_GIZMOS_3D
if (gizmo == nullptr) if (gizmo == nullptr)
{ {
_reset(); _reset();
@ -1379,11 +1371,7 @@ float GLCanvas3D::Gizmos::get_scale() const
return 1.0f; return 1.0f;
GizmosMap::const_iterator it = m_gizmos.find(Scale); GizmosMap::const_iterator it = m_gizmos.find(Scale);
#if ENABLE_GIZMOS_3D
return (it != m_gizmos.end()) ? reinterpret_cast<GLGizmoScale3D*>(it->second)->get_scale_x() : 1.0f; return (it != m_gizmos.end()) ? reinterpret_cast<GLGizmoScale3D*>(it->second)->get_scale_x() : 1.0f;
#else
return (it != m_gizmos.end()) ? reinterpret_cast<GLGizmoScale*>(it->second)->get_scale() : 1.0f;
#endif // ENABLE_GIZMOS_3D
} }
void GLCanvas3D::Gizmos::set_scale(float scale) void GLCanvas3D::Gizmos::set_scale(float scale)
@ -1393,11 +1381,7 @@ void GLCanvas3D::Gizmos::set_scale(float scale)
GizmosMap::const_iterator it = m_gizmos.find(Scale); GizmosMap::const_iterator it = m_gizmos.find(Scale);
if (it != m_gizmos.end()) if (it != m_gizmos.end())
#if ENABLE_GIZMOS_3D
reinterpret_cast<GLGizmoScale3D*>(it->second)->set_scale(scale); reinterpret_cast<GLGizmoScale3D*>(it->second)->set_scale(scale);
#else
reinterpret_cast<GLGizmoScale*>(it->second)->set_scale(scale);
#endif // ENABLE_GIZMOS_3D
} }
float GLCanvas3D::Gizmos::get_angle_z() const float GLCanvas3D::Gizmos::get_angle_z() const
@ -1406,11 +1390,7 @@ float GLCanvas3D::Gizmos::get_angle_z() const
return 0.0f; return 0.0f;
GizmosMap::const_iterator it = m_gizmos.find(Rotate); GizmosMap::const_iterator it = m_gizmos.find(Rotate);
#if ENABLE_GIZMOS_3D
return (it != m_gizmos.end()) ? reinterpret_cast<GLGizmoRotate3D*>(it->second)->get_angle_z() : 0.0f; return (it != m_gizmos.end()) ? reinterpret_cast<GLGizmoRotate3D*>(it->second)->get_angle_z() : 0.0f;
#else
return (it != m_gizmos.end()) ? reinterpret_cast<GLGizmoRotate*>(it->second)->get_angle() : 0.0f;
#endif // ENABLE_GIZMOS_3D
} }
void GLCanvas3D::Gizmos::set_angle_z(float angle_z) void GLCanvas3D::Gizmos::set_angle_z(float angle_z)
@ -1420,11 +1400,7 @@ void GLCanvas3D::Gizmos::set_angle_z(float angle_z)
GizmosMap::const_iterator it = m_gizmos.find(Rotate); GizmosMap::const_iterator it = m_gizmos.find(Rotate);
if (it != m_gizmos.end()) if (it != m_gizmos.end())
#if ENABLE_GIZMOS_3D reinterpret_cast<GLGizmoRotate3D*>(it->second)->set_angle_z(angle_z);
reinterpret_cast<GLGizmoRotate3D*>(it->second)->set_angle_z(angle_z);
#else
reinterpret_cast<GLGizmoRotate*>(it->second)->set_angle(angle_z);
#endif // ENABLE_GIZMOS_3D
} }
Vec3d GLCanvas3D::Gizmos::get_flattening_normal() const Vec3d GLCanvas3D::Gizmos::get_flattening_normal() const

179
xs/src/slic3r/GUI/GLGizmo.cpp
View File

@ -49,29 +49,14 @@ void GLGizmoBase::Grabber::render(bool hover) const
else else
::memcpy((void*)render_color, (const void*)color, 3 * sizeof(float)); ::memcpy((void*)render_color, (const void*)color, 3 * sizeof(float));
#if ENABLE_GIZMOS_3D
render(render_color, true); render(render_color, true);
#else
render(render_color);
#endif // ENABLE_GIZMOS_3D
} }
#if ENABLE_GIZMOS_3D
void GLGizmoBase::Grabber::render(const float* render_color, bool use_lighting) const void GLGizmoBase::Grabber::render(const float* render_color, bool use_lighting) const
#else
void GLGizmoBase::Grabber::render(const float* render_color) const
#endif // ENABLE_GIZMOS_3D
{ {
float half_size = dragging ? HalfSize * DraggingScaleFactor : HalfSize; float half_size = dragging ? HalfSize * DraggingScaleFactor : HalfSize;
#if ENABLE_GIZMOS_3D
if (use_lighting) if (use_lighting)
::glEnable(GL_LIGHTING); ::glEnable(GL_LIGHTING);
#else
float min_x = -half_size;
float max_x = +half_size;
float min_y = -half_size;
float max_y = +half_size;
#endif // !ENABLE_GIZMOS_3D
::glColor3f((GLfloat)render_color[0], (GLfloat)render_color[1], (GLfloat)render_color[2]); ::glColor3f((GLfloat)render_color[0], (GLfloat)render_color[1], (GLfloat)render_color[2]);
@ -83,7 +68,6 @@ void GLGizmoBase::Grabber::render(const float* render_color) const
::glRotatef((GLfloat)angle_y * rad_to_deg, 0.0f, 1.0f, 0.0f); ::glRotatef((GLfloat)angle_y * rad_to_deg, 0.0f, 1.0f, 0.0f);
::glRotatef((GLfloat)angle_z * rad_to_deg, 0.0f, 0.0f, 1.0f); ::glRotatef((GLfloat)angle_z * rad_to_deg, 0.0f, 0.0f, 1.0f);
#if ENABLE_GIZMOS_3D
// face min x // face min x
::glPushMatrix(); ::glPushMatrix();
::glTranslatef(-(GLfloat)half_size, 0.0f, 0.0f); ::glTranslatef(-(GLfloat)half_size, 0.0f, 0.0f);
@ -124,28 +108,13 @@ void GLGizmoBase::Grabber::render(const float* render_color) const
::glTranslatef(0.0f, 0.0f, (GLfloat)half_size); ::glTranslatef(0.0f, 0.0f, (GLfloat)half_size);
render_face(half_size); render_face(half_size);
::glPopMatrix(); ::glPopMatrix();
#else
::glDisable(GL_CULL_FACE);
::glBegin(GL_TRIANGLES);
::glVertex3f((GLfloat)min_x, (GLfloat)min_y, 0.0f);
::glVertex3f((GLfloat)max_x, (GLfloat)min_y, 0.0f);
::glVertex3f((GLfloat)max_x, (GLfloat)max_y, 0.0f);
::glVertex3f((GLfloat)max_x, (GLfloat)max_y, 0.0f);
::glVertex3f((GLfloat)min_x, (GLfloat)max_y, 0.0f);
::glVertex3f((GLfloat)min_x, (GLfloat)min_y, 0.0f);
::glEnd();
::glEnable(GL_CULL_FACE);
#endif // ENABLE_GIZMOS_3D
::glPopMatrix(); ::glPopMatrix();
#if ENABLE_GIZMOS_3D
if (use_lighting) if (use_lighting)
::glDisable(GL_LIGHTING); ::glDisable(GL_LIGHTING);
#endif // ENABLE_GIZMOS_3D
} }
#if ENABLE_GIZMOS_3D
void GLGizmoBase::Grabber::render_face(float half_size) const void GLGizmoBase::Grabber::render_face(float half_size) const
{ {
::glBegin(GL_TRIANGLES); ::glBegin(GL_TRIANGLES);
@ -158,7 +127,6 @@ void GLGizmoBase::Grabber::render_face(float half_size) const
::glVertex3f(-(GLfloat)half_size, -(GLfloat)half_size, 0.0f); ::glVertex3f(-(GLfloat)half_size, -(GLfloat)half_size, 0.0f);
::glEnd(); ::glEnd();
} }
#endif // ENABLE_GIZMOS_3D
GLGizmoBase::GLGizmoBase(GLCanvas3D& parent) GLGizmoBase::GLGizmoBase(GLCanvas3D& parent)
: m_parent(parent) : m_parent(parent)
@ -282,24 +250,7 @@ void GLGizmoRotate::set_angle(float angle)
bool GLGizmoRotate::on_init() bool GLGizmoRotate::on_init()
{ {
#if !ENABLE_GIZMOS_3D
std::string path = resources_dir() + "/icons/overlay/";
std::string filename = path + "rotate_off.png";
if (!m_textures[Off].load_from_file(filename, false))
return false;
filename = path + "rotate_hover.png";
if (!m_textures[Hover].load_from_file(filename, false))
return false;
filename = path + "rotate_on.png";
if (!m_textures[On].load_from_file(filename, false))
return false;
#endif // !ENABLE_GIZMOS_3D
m_grabbers.push_back(Grabber()); m_grabbers.push_back(Grabber());
return true; return true;
} }
@ -347,55 +298,33 @@ void GLGizmoRotate::on_render(const BoundingBoxf3& box) const
if (m_grabbers[0].dragging) if (m_grabbers[0].dragging)
set_tooltip(format(m_angle * 180.0f / (float)PI, 4)); set_tooltip(format(m_angle * 180.0f / (float)PI, 4));
#if ENABLE_GIZMOS_3D
::glEnable(GL_DEPTH_TEST); ::glEnable(GL_DEPTH_TEST);
#else
::glDisable(GL_DEPTH_TEST);
#endif // ENABLE_GIZMOS_3D
if (!m_keep_initial_values) if (!m_keep_initial_values)
{ {
m_center = box.center(); m_center = box.center();
#if !ENABLE_GIZMOS_3D
const Vec3d& size = box.size();
m_center(2) = 0.0;
#endif // !ENABLE_GIZMOS_3D
#if ENABLE_GIZMOS_3D
m_radius = Offset + box.radius(); m_radius = Offset + box.radius();
#else
m_radius = Offset + ::sqrt(sqr(0.5f * (float)size(0)) + sqr(0.5f * (float)size(1)));
#endif // ENABLE_GIZMOS_3D
m_keep_initial_values = true; m_keep_initial_values = true;
} }
::glPushMatrix(); ::glPushMatrix();
transform_to_local(); transform_to_local();
#if ENABLE_GIZMOS_3D
::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f); ::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f);
::glColor3fv((m_hover_id != -1) ? m_drag_color : m_highlight_color); ::glColor3fv((m_hover_id != -1) ? m_drag_color : m_highlight_color);
#else
::glLineWidth(2.0f);
::glColor3fv(m_drag_color);
#endif // ENABLE_GIZMOS_3D
render_circle(); render_circle();
#if ENABLE_GIZMOS_3D
if (m_hover_id != -1) if (m_hover_id != -1)
{ {
#endif // ENABLE_GIZMOS_3D
render_scale(); render_scale();
render_snap_radii(); render_snap_radii();
render_reference_radius(); render_reference_radius();
#if ENABLE_GIZMOS_3D
} }
#endif // ENABLE_GIZMOS_3D
::glColor3fv(m_highlight_color); ::glColor3fv(m_highlight_color);
#if ENABLE_GIZMOS_3D
if (m_hover_id != -1) if (m_hover_id != -1)
#endif // ENABLE_GIZMOS_3D
render_angle(); render_angle();
render_grabber(); render_grabber();
@ -512,11 +441,7 @@ void GLGizmoRotate::render_grabber() const
m_grabbers[0].center = Vec3d(::cos(m_angle) * grabber_radius, ::sin(m_angle) * grabber_radius, 0.0); m_grabbers[0].center = Vec3d(::cos(m_angle) * grabber_radius, ::sin(m_angle) * grabber_radius, 0.0);
m_grabbers[0].angle_z = m_angle; m_grabbers[0].angle_z = m_angle;
#if ENABLE_GIZMOS_3D
::glColor3fv((m_hover_id != -1) ? m_drag_color : m_highlight_color); ::glColor3fv((m_hover_id != -1) ? m_drag_color : m_highlight_color);
#else
::glColor3fv(m_drag_color);
#endif // ENABLE_GIZMOS_3D
::glBegin(GL_LINES); ::glBegin(GL_LINES);
::glVertex3f(0.0f, 0.0f, 0.0f); ::glVertex3f(0.0f, 0.0f, 0.0f);
@ -698,106 +623,6 @@ void GLGizmoRotate3D::on_render(const BoundingBoxf3& box) const
m_z.render(box); m_z.render(box);
} }
const float GLGizmoScale::Offset = 5.0f;
GLGizmoScale::GLGizmoScale(GLCanvas3D& parent)
: GLGizmoBase(parent)
, m_scale(1.0f)
, m_starting_scale(1.0f)
{
}
bool GLGizmoScale::on_init()
{
std::string path = resources_dir() + "/icons/overlay/";
std::string filename = path + "scale_off.png";
if (!m_textures[Off].load_from_file(filename, false))
return false;
filename = path + "scale_hover.png";
if (!m_textures[Hover].load_from_file(filename, false))
return false;
filename = path + "scale_on.png";
if (!m_textures[On].load_from_file(filename, false))
return false;
for (unsigned int i = 0; i < 4; ++i)
{
m_grabbers.push_back(Grabber());
}
return true;
}
void GLGizmoScale::on_start_dragging()
{
if (m_hover_id != -1)
m_starting_drag_position = to_2d(m_grabbers[m_hover_id].center);
}
void GLGizmoScale::on_update(const Linef3& mouse_ray)
{
Vec2d mouse_pos = to_2d(mouse_ray.intersect_plane(0.0));
Vec2d center(0.5 * (m_grabbers[1].center(0) + m_grabbers[0].center(0)), 0.5 * (m_grabbers[3].center(1) + m_grabbers[0].center(1)));
double orig_len = (m_starting_drag_position - center).norm();
double new_len = (mouse_pos - center).norm();
double ratio = (orig_len != 0.0) ? new_len / orig_len : 1.0;
m_scale = m_starting_scale * (float)ratio;
}
void GLGizmoScale::on_render(const BoundingBoxf3& box) const
{
if (m_grabbers[0].dragging || m_grabbers[1].dragging || m_grabbers[2].dragging || m_grabbers[3].dragging)
set_tooltip(format(100.0f * m_scale, 4) + "%");
::glDisable(GL_DEPTH_TEST);
double min_x = box.min(0) - (double)Offset;
double max_x = box.max(0) + (double)Offset;
double min_y = box.min(1) - (double)Offset;
double max_y = box.max(1) + (double)Offset;
m_grabbers[0].center = Vec3d(min_x, min_y, 0.0);
m_grabbers[1].center = Vec3d(max_x, min_y, 0.0);
m_grabbers[2].center = Vec3d(max_x, max_y, 0.0);
m_grabbers[3].center = Vec3d(min_x, max_y, 0.0);
::glLineWidth(2.0f);
::glColor3fv(m_drag_color);
// draw outline
::glBegin(GL_LINE_LOOP);
for (unsigned int i = 0; i < 4; ++i)
{
::glVertex3f((GLfloat)m_grabbers[i].center(0), (GLfloat)m_grabbers[i].center(1), 0.0f);
}
::glEnd();
// draw grabbers
for (unsigned int i = 0; i < 4; ++i)
{
::memcpy((void*)m_grabbers[i].color, (const void*)m_highlight_color, 3 * sizeof(float));
}
render_grabbers();
}
void GLGizmoScale::on_render_for_picking(const BoundingBoxf3& box) const
{
::glDisable(GL_DEPTH_TEST);
for (unsigned int i = 0; i < 4; ++i)
{
m_grabbers[i].color[0] = 1.0f;
m_grabbers[i].color[1] = 1.0f;
m_grabbers[i].color[2] = picking_color_component(i);
}
render_grabbers_for_picking();
}
const float GLGizmoScale3D::Offset = 5.0f; const float GLGizmoScale3D::Offset = 5.0f;
GLGizmoScale3D::GLGizmoScale3D(GLCanvas3D& parent) GLGizmoScale3D::GLGizmoScale3D(GLCanvas3D& parent)

35
xs/src/slic3r/GUI/GLGizmo.hpp
View File

@ -7,8 +7,6 @@
#include <vector> #include <vector>
#define ENABLE_GIZMOS_3D 1
namespace Slic3r { namespace Slic3r {
class BoundingBoxf3; class BoundingBoxf3;
@ -37,21 +35,11 @@ protected:
Grabber(); Grabber();
void render(bool hover) const; void render(bool hover) const;
#if ENABLE_GIZMOS_3D
void render_for_picking() const { render(color, false); } void render_for_picking() const { render(color, false); }
#else
void render_for_picking() const { render(color); }
#endif // ENABLE_GIZMOS_3D
private: private:
#if ENABLE_GIZMOS_3D
void render(const float* render_color, bool use_lighting) const; void render(const float* render_color, bool use_lighting) const;
#else
void render(const float* render_color) const;
#endif // ENABLE_GIZMOS_3D
#if ENABLE_GIZMOS_3D
void render_face(float half_size) const; void render_face(float half_size) const;
#endif // ENABLE_GIZMOS_3D
}; };
public: public:
@ -234,29 +222,6 @@ protected:
} }
}; };
class GLGizmoScale : public GLGizmoBase
{
static const float Offset;
float m_scale;
float m_starting_scale;
Vec2d m_starting_drag_position;
public:
explicit GLGizmoScale(GLCanvas3D& parent);
float get_scale() const { return m_scale; }
void set_scale(float scale) { m_starting_scale = scale; }
protected:
virtual bool on_init();
virtual void on_start_dragging();
virtual void on_update(const Linef3& mouse_ray);
virtual void on_render(const BoundingBoxf3& box) const;
virtual void on_render_for_picking(const BoundingBoxf3& box) const;
};
class GLGizmoScale3D : public GLGizmoBase class GLGizmoScale3D : public GLGizmoBase
{ {
static const float Offset; static const float Offset;