GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-14 03:41:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cut WIP: Fixed some bugs

Browse Source 
* Fixed a crash on adding of the object (ObjectDataViewModel:volume_type wasn't initialized)
* Cur grabber color is changed to YELLOW
* Check position of the cut plane center on moving of the cut plane
This commit is contained in:
YuSanka 2022-05-12 13:23:59 +02:00
parent 04145abdfc
commit d6f46bedeb
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
View File

@ -23,7 +23,7 @@ namespace Slic3r {
namespace GUI { namespace GUI {
static const double Margin = 20.0; static const double Margin = 20.0;
static const ColorRGBA GRABBER_COLOR = ColorRGBA::ORANGE(); static const ColorRGBA GRABBER_COLOR = ColorRGBA::YELLOW();
#define use_grabber_extension 1 #define use_grabber_extension 1
@ -163,7 +163,7 @@ void GLGizmoCut3D::shift_cut_z(double delta)
{ {
Vec3d new_cut_center = m_plane_center; Vec3d new_cut_center = m_plane_center;
new_cut_center[Z] += delta; new_cut_center[Z] += delta;
set_center_pos(new_cut_center); set_center(new_cut_center);
} }
void GLGizmoCut3D::rotate_vec3d_around_center(Vec3d& vec, const Vec3d& angles, const Vec3d& center) void GLGizmoCut3D::rotate_vec3d_around_center(Vec3d& vec, const Vec3d& angles, const Vec3d& center)
@ -616,7 +616,7 @@ void GLGizmoCut3D::render_cut_line()
GLModel::Geometry init_data; GLModel::Geometry init_data;
init_data.format = { GLModel::Geometry::EPrimitiveType::Lines, GLModel::Geometry::EVertexLayout::P3 }; init_data.format = { GLModel::Geometry::EPrimitiveType::Lines, GLModel::Geometry::EVertexLayout::P3 };
init_data.color = ColorRGBA::YELLOW(); init_data.color = GRABBER_COLOR;
init_data.reserve_vertices(2); init_data.reserve_vertices(2);
init_data.reserve_indices(2); init_data.reserve_indices(2);
@ -773,6 +773,10 @@ void GLGizmoCut3D::on_stop_dragging()
void GLGizmoCut3D::set_center_pos(const Vec3d& center_pos) void GLGizmoCut3D::set_center_pos(const Vec3d& center_pos)
{ {
const BoundingBoxf3 tbb = transformed_bounding_box(true);
if (!tbb.contains(center_pos))
return;
m_plane_center = center_pos; m_plane_center = center_pos;
// !!! ysFIXME add smart clamp calculation // !!! ysFIXME add smart clamp calculation

2
src/slic3r/GUI/ObjectDataViewModel.hpp
View File

@ -83,7 +83,7 @@ class ObjectDataViewModelNode
bool m_has_lock{false}; bool m_has_lock{false};
std::string m_action_icon_name = ""; std::string m_action_icon_name = "";
ModelVolumeType m_volume_type; ModelVolumeType m_volume_type{ -1 };
InfoItemType m_info_item_type {InfoItemType::Undef}; InfoItemType m_info_item_type {InfoItemType::Undef};
public: public: