3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-22 06:04:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed rendering of gizmos' grabbers

Browse source
This commit is contained in:
enricoturri1966 2021-05-25 15:42:22 +02:00 • committed by Lukas Matena
parent 9605d10caa
commit f69bd75464
5 changed files with 73 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
View file

@ -29,8 +29,7 @@ GLGizmoBase::Grabber::Grabber()
void GLGizmoBase::Grabber::render(bool hover, float size) const void GLGizmoBase::Grabber::render(bool hover, float size) const
{ {
std::array<float, 4> render_color; std::array<float, 4> render_color;
if (hover) if (hover) {
{
render_color[0] = (1.0f - color[0]); render_color[0] = (1.0f - color[0]);
render_color[1] = (1.0f - color[1]); render_color[1] = (1.0f - color[1]);
render_color[2] = (1.0f - color[2]); render_color[2] = (1.0f - color[2]);
@ -57,7 +56,7 @@ void GLGizmoBase::Grabber::render(float size, const std::array<float, 4>& render
float fullsize = 2 * (dragging ? get_dragging_half_size(size) : get_half_size(size)); float fullsize = 2 * (dragging ? get_dragging_half_size(size) : get_half_size(size));
GLShaderProgram* shader = picking ? nullptr : wxGetApp().get_current_shader(); GLShaderProgram* shader = picking ? nullptr : wxGetApp().get_current_shader();
if (shader) if (shader != nullptr)
shader->set_uniform("uniform_color", render_color); shader->set_uniform("uniform_color", render_color);
else else
glsafe(::glColor4fv(render_color.data())); // picking glsafe(::glColor4fv(render_color.data())); // picking
@ -173,33 +172,29 @@ std::array<float, 4> GLGizmoBase::picking_color_component(unsigned int id) const
void GLGizmoBase::render_grabbers(const BoundingBoxf3& box) const void GLGizmoBase::render_grabbers(const BoundingBoxf3& box) const
{ {
render_grabbers((float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0)); render_grabbers((float)((box.size().x() + box.size().y() + box.size().z()) / 3.0));
} }
void GLGizmoBase::render_grabbers(float size) const void GLGizmoBase::render_grabbers(float size) const
{ {
GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light"); GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light");
if (! shader) if (shader == nullptr)
return; return;
shader->start_using(); shader->start_using();
shader->set_uniform("emission_factor", 0.1); shader->set_uniform("emission_factor", 0.1);
for (int i = 0; i < (int)m_grabbers.size(); ++i) for (int i = 0; i < (int)m_grabbers.size(); ++i) {
{
if (m_grabbers[i].enabled) if (m_grabbers[i].enabled)
m_grabbers[i].render((m_hover_id == i), size); m_grabbers[i].render(m_hover_id == i, size);
} }
shader->set_uniform("emission_factor", 0.);
shader->stop_using(); shader->stop_using();
} }
void GLGizmoBase::render_grabbers_for_picking(const BoundingBoxf3& box) const void GLGizmoBase::render_grabbers_for_picking(const BoundingBoxf3& box) const
{ {
float mean_size = (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0); float mean_size = (float)((box.size().x() + box.size().y() + box.size().z()) / 3.0);
for (unsigned int i = 0; i < (unsigned int)m_grabbers.size(); ++i) for (unsigned int i = 0; i < (unsigned int)m_grabbers.size(); ++i) {
{ if (m_grabbers[i].enabled) {
if (m_grabbers[i].enabled)
{
std::array<float, 4> color = picking_color_component(i); std::array<float, 4> color = picking_color_component(i);
m_grabbers[i].color = color; m_grabbers[i].color = color;
m_grabbers[i].render_for_picking(mean_size); m_grabbers[i].render_for_picking(mean_size);
@ -215,8 +210,7 @@ std::string GLGizmoBase::format(float value, unsigned int decimals) const
void GLGizmoBase::render_input_window(float x, float y, float bottom_limit) void GLGizmoBase::render_input_window(float x, float y, float bottom_limit)
{ {
on_render_input_window(x, y, bottom_limit); on_render_input_window(x, y, bottom_limit);
if (m_first_input_window_render) if (m_first_input_window_render) {
{
// for some reason, the imgui dialogs are not shown on screen in the 1st frame where they are rendered, but show up only with the 2nd rendered frame // for some reason, the imgui dialogs are not shown on screen in the 1st frame where they are rendered, but show up only with the 2nd rendered frame
// so, we forces another frame rendering the first time the imgui window is shown // so, we forces another frame rendering the first time the imgui window is shown
m_parent.set_as_dirty(); m_parent.set_as_dirty();

35
src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
View file

@ -51,7 +51,7 @@ bool GLGizmoCut::on_init()
std::string GLGizmoCut::on_get_name() const std::string GLGizmoCut::on_get_name() const
{ {
return (_(L("Cut")) + " [C]").ToUTF8().data(); return (_L("Cut") + " [C]").ToUTF8().data();
} }
void GLGizmoCut::on_set_state() void GLGizmoCut::on_set_state()
@ -96,12 +96,12 @@ void GLGizmoCut::on_render() const
const BoundingBoxf3& box = selection.get_bounding_box(); const BoundingBoxf3& box = selection.get_bounding_box();
Vec3d plane_center = box.center(); Vec3d plane_center = box.center();
plane_center(2) = m_cut_z; plane_center.z() = m_cut_z;
const float min_x = box.min(0) - Margin; const float min_x = box.min.x() - Margin;
const float max_x = box.max(0) + Margin; const float max_x = box.max.x() + Margin;
const float min_y = box.min(1) - Margin; const float min_y = box.min.y() - Margin;
const float max_y = box.max(1) + Margin; const float max_y = box.max.y() + Margin;
glsafe(::glEnable(GL_DEPTH_TEST)); glsafe(::glEnable(GL_DEPTH_TEST));
glsafe(::glDisable(GL_CULL_FACE)); glsafe(::glDisable(GL_CULL_FACE));
glsafe(::glEnable(GL_BLEND)); glsafe(::glEnable(GL_BLEND));
@ -110,10 +110,10 @@ void GLGizmoCut::on_render() const
// Draw the cutting plane // Draw the cutting plane
::glBegin(GL_QUADS); ::glBegin(GL_QUADS);
::glColor4f(0.8f, 0.8f, 0.8f, 0.5f); ::glColor4f(0.8f, 0.8f, 0.8f, 0.5f);
::glVertex3f(min_x, min_y, plane_center(2)); ::glVertex3f(min_x, min_y, plane_center.z());
::glVertex3f(max_x, min_y, plane_center(2)); ::glVertex3f(max_x, min_y, plane_center.z());
::glVertex3f(max_x, max_y, plane_center(2)); ::glVertex3f(max_x, max_y, plane_center.z());
::glVertex3f(min_x, max_y, plane_center(2)); ::glVertex3f(min_x, max_y, plane_center.z());
glsafe(::glEnd()); glsafe(::glEnd());
glsafe(::glEnable(GL_CULL_FACE)); glsafe(::glEnable(GL_CULL_FACE));
@ -123,9 +123,10 @@ void GLGizmoCut::on_render() const
// Draw the grabber and the connecting line // Draw the grabber and the connecting line
m_grabbers[0].center = plane_center; m_grabbers[0].center = plane_center;
m_grabbers[0].center(2) = plane_center(2) + Offset; m_grabbers[0].center.z() = plane_center.z() + Offset;
glsafe(::glClear(GL_DEPTH_BUFFER_BIT));
glsafe(::glDisable(GL_DEPTH_TEST));
glsafe(::glLineWidth(m_hover_id != -1 ? 2.0f : 1.5f)); glsafe(::glLineWidth(m_hover_id != -1 ? 2.0f : 1.5f));
glsafe(::glColor3f(1.0, 1.0, 0.0)); glsafe(::glColor3f(1.0, 1.0, 0.0));
::glBegin(GL_LINES); ::glBegin(GL_LINES);
@ -133,8 +134,16 @@ void GLGizmoCut::on_render() const
::glVertex3dv(m_grabbers[0].center.data()); ::glVertex3dv(m_grabbers[0].center.data());
glsafe(::glEnd()); glsafe(::glEnd());
GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light");
if (shader == nullptr)
return;
shader->start_using();
shader->set_uniform("emission_factor", 0.1);
m_grabbers[0].color = GrabberColor; m_grabbers[0].color = GrabberColor;
m_grabbers[0].render(m_hover_id == 0, (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0)); m_grabbers[0].render(m_hover_id == 0, (float)((box.size().x() + box.size().y() + box.size().z()) / 3.0));
shader->stop_using();
} }
void GLGizmoCut::on_render_for_picking() const void GLGizmoCut::on_render_for_picking() const

44
src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
View file

@ -1,6 +1,7 @@
// Include GLGizmoBase.hpp before I18N.hpp as it includes some libigl code, which overrides our localization "L" macro. // Include GLGizmoBase.hpp before I18N.hpp as it includes some libigl code, which overrides our localization "L" macro.
#include "GLGizmoMove.hpp" #include "GLGizmoMove.hpp"
#include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GLCanvas3D.hpp"
#include "slic3r/GUI/GUI_App.hpp"
#include <GL/glew.h> #include <GL/glew.h>
@ -40,8 +41,7 @@ std::string GLGizmoMove3D::get_tooltip() const
bool GLGizmoMove3D::on_init() bool GLGizmoMove3D::on_init()
{ {
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i) {
{
m_grabbers.push_back(Grabber()); m_grabbers.push_back(Grabber());
} }
@ -52,7 +52,7 @@ bool GLGizmoMove3D::on_init()
std::string GLGizmoMove3D::on_get_name() const std::string GLGizmoMove3D::on_get_name() const
{ {
return (_(L("Move")) + " [M]").ToUTF8().data(); return (_L("Move") + " [M]").ToUTF8().data();
} }
bool GLGizmoMove3D::on_is_activable() const bool GLGizmoMove3D::on_is_activable() const
@ -62,8 +62,7 @@ bool GLGizmoMove3D::on_is_activable() const
void GLGizmoMove3D::on_start_dragging() void GLGizmoMove3D::on_start_dragging()
{ {
if (m_hover_id != -1) if (m_hover_id != -1) {
{
m_displacement = Vec3d::Zero(); m_displacement = Vec3d::Zero();
const BoundingBoxf3& box = m_parent.get_selection().get_bounding_box(); const BoundingBoxf3& box = m_parent.get_selection().get_bounding_box();
m_starting_drag_position = m_grabbers[m_hover_id].center; m_starting_drag_position = m_grabbers[m_hover_id].center;
@ -99,16 +98,16 @@ void GLGizmoMove3D::on_render() const
const Vec3d& center = box.center(); const Vec3d& center = box.center();
// x axis // x axis
m_grabbers[0].center = Vec3d(box.max(0) + Offset, center(1), center(2)); m_grabbers[0].center = Vec3d(box.max.x() + Offset, center.y(), center.z());
::memcpy((void*)m_grabbers[0].color.data(), (const void*)&AXES_COLOR[0], 4 * sizeof(float)); m_grabbers[0].color = AXES_COLOR[0];
// y axis // y axis
m_grabbers[1].center = Vec3d(center(0), box.max(1) + Offset, center(2)); m_grabbers[1].center = Vec3d(center.x(), box.max.y() + Offset, center.z());
::memcpy((void*)m_grabbers[1].color.data(), (const void*)&AXES_COLOR[1], 4 * sizeof(float)); m_grabbers[1].color = AXES_COLOR[1];
// z axis // z axis
m_grabbers[2].center = Vec3d(center(0), center(1), box.max(2) + Offset); m_grabbers[2].center = Vec3d(center.x(), center.y(), box.max.z() + Offset);
::memcpy((void*)m_grabbers[2].color.data(), (const void*)&AXES_COLOR[2], 4 * sizeof(float)); m_grabbers[2].color = AXES_COLOR[2];
glsafe(::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f)); glsafe(::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f));
@ -140,7 +139,7 @@ void GLGizmoMove3D::on_render() const
glsafe(::glEnd()); glsafe(::glEnd());
// draw grabber // draw grabber
float mean_size = (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0); float mean_size = (float)((box.size().x() + box.size().y() + box.size().z()) / 3.0);
m_grabbers[m_hover_id].render(true, mean_size); m_grabbers[m_hover_id].render(true, mean_size);
render_grabber_extension((Axis)m_hover_id, box, false); render_grabber_extension((Axis)m_hover_id, box, false);
} }
@ -163,8 +162,7 @@ double GLGizmoMove3D::calc_projection(const UpdateData& data) const
Vec3d starting_vec = m_starting_drag_position - m_starting_box_center; Vec3d starting_vec = m_starting_drag_position - m_starting_box_center;
double len_starting_vec = starting_vec.norm(); double len_starting_vec = starting_vec.norm();
if (len_starting_vec != 0.0) if (len_starting_vec != 0.0) {
{
Vec3d mouse_dir = data.mouse_ray.unit_vector(); Vec3d mouse_dir = data.mouse_ray.unit_vector();
// finds the intersection of the mouse ray with the plane parallel to the camera viewport and passing throught the starting position // finds the intersection of the mouse ray with the plane parallel to the camera viewport and passing throught the starting position
// use ray-plane intersection see i.e. https://en.wikipedia.org/wiki/Line%E2%80%93plane_intersection algebric form // use ray-plane intersection see i.e. https://en.wikipedia.org/wiki/Line%E2%80%93plane_intersection algebric form
@ -186,21 +184,27 @@ double GLGizmoMove3D::calc_projection(const UpdateData& data) const
void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box, bool picking) const void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box, bool picking) const
{ {
float mean_size = (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0); float mean_size = (float)((box.size().x() + box.size().y() + box.size().z()) / 3.0);
double size = m_dragging ? (double)m_grabbers[axis].get_dragging_half_size(mean_size) : (double)m_grabbers[axis].get_half_size(mean_size); double size = m_dragging ? (double)m_grabbers[axis].get_dragging_half_size(mean_size) : (double)m_grabbers[axis].get_half_size(mean_size);
std::array<float, 4> color = m_grabbers[axis].color; std::array<float, 4> color = m_grabbers[axis].color;
if (!picking && (m_hover_id != -1)) if (!picking && m_hover_id != -1) {
{
color[0] = 1.0f - color[0]; color[0] = 1.0f - color[0];
color[1] = 1.0f - color[1]; color[1] = 1.0f - color[1];
color[2] = 1.0f - color[2]; color[2] = 1.0f - color[2];
color[3] = color[3]; color[3] = color[3];
} }
glsafe(::glColor4fv(color.data())); GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light");
if (shader == nullptr)
return;
shader->start_using();
shader->set_uniform("emission_factor", 0.1);
shader->set_uniform("uniform_color", color);
glsafe(::glPushMatrix()); glsafe(::glPushMatrix());
glsafe(::glTranslated(m_grabbers[axis].center(0), m_grabbers[axis].center(1), m_grabbers[axis].center(2))); glsafe(::glTranslated(m_grabbers[axis].center.x(), m_grabbers[axis].center.y(), m_grabbers[axis].center.z()));
if (axis == X) if (axis == X)
glsafe(::glRotated(90.0, 0.0, 1.0, 0.0)); glsafe(::glRotated(90.0, 0.0, 1.0, 0.0));
else if (axis == Y) else if (axis == Y)
@ -210,6 +214,8 @@ void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box
glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size)); glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size));
m_vbo_cone.render(); m_vbo_cone.render();
glsafe(::glPopMatrix()); glsafe(::glPopMatrix());
shader->stop_using();
} }

21
src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
View file

@ -326,16 +326,22 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick
double size = m_dragging ? (double)m_grabbers[0].get_dragging_half_size(mean_size) : (double)m_grabbers[0].get_half_size(mean_size); double size = m_dragging ? (double)m_grabbers[0].get_dragging_half_size(mean_size) : (double)m_grabbers[0].get_half_size(mean_size);
std::array<float, 4> color = m_grabbers[0].color; std::array<float, 4> color = m_grabbers[0].color;
if (!picking && (m_hover_id != -1)) if (!picking && m_hover_id != -1) {
{
color[0] = 1.0f - color[0]; color[0] = 1.0f - color[0];
color[1] = 1.0f - color[1]; color[1] = 1.0f - color[1];
color[2] = 1.0f - color[2]; color[2] = 1.0f - color[2];
} }
glsafe(::glColor4fv(color.data())); GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light");
if (shader == nullptr)
return;
shader->start_using();
shader->set_uniform("emission_factor", 0.1);
shader->set_uniform("uniform_color", color);
glsafe(::glPushMatrix()); glsafe(::glPushMatrix());
glsafe(::glTranslated(m_grabbers[0].center(0), m_grabbers[0].center(1), m_grabbers[0].center(2))); glsafe(::glTranslated(m_grabbers[0].center.x(), m_grabbers[0].center.y(), m_grabbers[0].center.z()));
glsafe(::glRotated(Geometry::rad2deg(m_angle), 0.0, 0.0, 1.0)); glsafe(::glRotated(Geometry::rad2deg(m_angle), 0.0, 0.0, 1.0));
glsafe(::glRotated(90.0, 1.0, 0.0, 0.0)); glsafe(::glRotated(90.0, 1.0, 0.0, 0.0));
glsafe(::glTranslated(0.0, 0.0, 2.0 * size)); glsafe(::glTranslated(0.0, 0.0, 2.0 * size));
@ -343,21 +349,22 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick
m_cone.render(); m_cone.render();
glsafe(::glPopMatrix()); glsafe(::glPopMatrix());
glsafe(::glPushMatrix()); glsafe(::glPushMatrix());
glsafe(::glTranslated(m_grabbers[0].center(0), m_grabbers[0].center(1), m_grabbers[0].center(2))); glsafe(::glTranslated(m_grabbers[0].center.x(), m_grabbers[0].center.y(), m_grabbers[0].center.z()));
glsafe(::glRotated(Geometry::rad2deg(m_angle), 0.0, 0.0, 1.0)); glsafe(::glRotated(Geometry::rad2deg(m_angle), 0.0, 0.0, 1.0));
glsafe(::glRotated(-90.0, 1.0, 0.0, 0.0)); glsafe(::glRotated(-90.0, 1.0, 0.0, 0.0));
glsafe(::glTranslated(0.0, 0.0, 2.0 * size)); glsafe(::glTranslated(0.0, 0.0, 2.0 * size));
glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size)); glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size));
m_cone.render(); m_cone.render();
glsafe(::glPopMatrix()); glsafe(::glPopMatrix());
shader->stop_using();
} }
void GLGizmoRotate::transform_to_local(const Selection& selection) const void GLGizmoRotate::transform_to_local(const Selection& selection) const
{ {
glsafe(::glTranslated(m_center(0), m_center(1), m_center(2))); glsafe(::glTranslated(m_center(0), m_center(1), m_center(2)));
if (selection.is_single_volume() || selection.is_single_modifier() || selection.requires_local_axes()) if (selection.is_single_volume() || selection.is_single_modifier() || selection.requires_local_axes()) {
{
Transform3d orient_matrix = selection.get_volume(*selection.get_volume_idxs().begin())->get_instance_transformation().get_matrix(true, false, true, true); Transform3d orient_matrix = selection.get_volume(*selection.get_volume_idxs().begin())->get_instance_transformation().get_matrix(true, false, true, true);
glsafe(::glMultMatrixd(orient_matrix.data())); glsafe(::glMultMatrixd(orient_matrix.data()));
} }

6
src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
View file

@ -119,13 +119,11 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking)
return; return;
GLShaderProgram* shader = picking ? nullptr : wxGetApp().get_shader("gouraud_light"); GLShaderProgram* shader = picking ? nullptr : wxGetApp().get_shader("gouraud_light");
if (shader) if (shader != nullptr)
shader->start_using(); shader->start_using();
ScopeGuard guard([shader]() { ScopeGuard guard([shader]() {
if (shader) { if (shader != nullptr)
shader->set_uniform("emission_factor", 0.);
shader->stop_using(); shader->stop_using();
}
}); });
const GLVolume* vol = selection.get_volume(*selection.get_volume_idxs().begin()); const GLVolume* vol = selection.get_volume(*selection.get_volume_idxs().begin());