GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-15 22:55:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev2' into lm_sla_supports_ui

Browse Source
This commit is contained in:
Lukas Matena 2018-10-03 12:46:11 +02:00
commit e89465cc3f
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xs/src/libslic3r/Model.cpp
View File

@ -988,6 +988,11 @@ const TriangleMesh& ModelVolume::get_convex_hull() const
return m_convex_hull; return m_convex_hull;
} }
TriangleMesh& ModelVolume::get_convex_hull()
{
return m_convex_hull;
}
ModelVolume::Type ModelVolume::type_from_string(const std::string &s) ModelVolume::Type ModelVolume::type_from_string(const std::string &s)
{ {
// Legacy support // Legacy support

1
xs/src/libslic3r/Model.hpp
View File

@ -200,6 +200,7 @@ public:
void calculate_convex_hull(); void calculate_convex_hull();
const TriangleMesh& get_convex_hull() const; const TriangleMesh& get_convex_hull() const;
TriangleMesh& get_convex_hull();
// Helpers for loading / storing into AMF / 3MF files. // Helpers for loading / storing into AMF / 3MF files.
static Type type_from_string(const std::string &s); static Type type_from_string(const std::string &s);

3
xs/src/slic3r/GUI/GUI_ObjectParts.cpp
View File

@ -1235,7 +1235,10 @@ void load_part( ModelObject* model_object,
part_names.Add(new_volume->name); part_names.Add(new_volume->name);
if (delta != Vec3d::Zero()) if (delta != Vec3d::Zero())
{
new_volume->mesh.translate((float)delta(0), (float)delta(1), (float)delta(2)); new_volume->mesh.translate((float)delta(0), (float)delta(1), (float)delta(2));
new_volume->get_convex_hull().translate((float)delta(0), (float)delta(1), (float)delta(2));
}
// set a default extruder value, since user can't add it manually // set a default extruder value, since user can't add it manually
new_volume->config.set_key_value("extruder", new ConfigOptionInt(0)); new_volume->config.set_key_value("extruder", new ConfigOptionInt(0));