3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-24 00:28:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge fbc641e639 into 506fde8f86

Browse source
This commit is contained in:
Dipl.-Ing. Raoul Rubien, BSc 2025-12-23 16:57:21 -05:00 • committed by GitHub
commit 2d75d19647
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/AABBMesh.cpp
View file

@ -55,7 +55,7 @@ public:
Eigen::Matrix<double, 1, 3> &closest)
{
size_t idx_unsigned = 0;
Vec3d closest_vec3d(closest);
Vec3d closest_vec3d;
double dist =
AABBTreeIndirect::squared_distance_to_indexed_triangle_set(
its.vertices, its.indices, m_tree, point, idx_unsigned,

4
src/libslic3r/AABBTreeIndirect.hpp
View file

@ -593,7 +593,7 @@ namespace detail {
const auto &look_left = [&]()
{
size_t i_left;
Vector c_left = c;
Vector c_left;
Scalar sqr_d_left = squared_distance_to_indexed_primitives_recursive(distancer, left_node_idx, low_sqr_d, up_sqr_d, i_left, c_left);
set_min(sqr_d_left, i_left, c_left);
looked_left = true;
@ -601,7 +601,7 @@ namespace detail {
const auto &look_right = [&]()
{
size_t i_right;
Vector c_right = c;
Vector c_right;
Scalar sqr_d_right = squared_distance_to_indexed_primitives_recursive(distancer, right_node_idx, low_sqr_d, up_sqr_d, i_right, c_right);
set_min(sqr_d_right, i_right, c_right);
looked_right = true;

2
src/libslic3r/GCodeWriter.hpp
View file

@ -257,7 +257,7 @@ public:
}
void emit_string(const std::string &s) {
strncpy(ptr_err.ptr, s.c_str(), s.size());
memcpy(ptr_err.ptr, s.c_str(), s.size());
ptr_err.ptr += s.size();
}

2
src/libslic3r/SLA/IndexedMesh.cpp
View file

@ -57,7 +57,7 @@ public:
Eigen::Matrix<double, 1, 3> &closest)
{
size_t idx_unsigned = 0;
Vec3d closest_vec3d(closest);
Vec3d closest_vec3d;
double dist =
AABBTreeIndirect::squared_distance_to_indexed_triangle_set(
its.vertices, its.indices, m_tree, point, idx_unsigned,

2
src/libslic3r/Support/TreeSupport.cpp
View file

@ -2511,7 +2511,7 @@ void TreeSupport::drop_nodes()
m_object->print()->set_status(60 + int(10 * (1 - float(layer_nr) / contact_nodes.size())), _u8L("Generating support"));// (boost::format(_u8L("Support: propagate branches at layer %d")) % layer_nr).str());
Polygons layer_contours = std::move(m_ts_data->get_contours_with_holes(obj_layer_nr));
Polygons layer_contours { m_ts_data->get_contours_with_holes(obj_layer_nr) };
//std::unordered_map<Line, bool, LineHash>& mst_line_x_layer_contour_cache = m_mst_line_x_layer_contour_caches[layer_nr];
tbb::concurrent_unordered_map<Line, bool, LineHash> mst_line_x_layer_contour_cache;
auto is_line_cut_by_contour = [&mst_line_x_layer_contour_cache,&layer_contours](Point a, Point b)

9
src/libslic3r/libslic3r.h
View file

@ -140,13 +140,12 @@ enum Axis {
NUM_AXES_WITH_UNKNOWN,
};
template <typename T, typename Alloc, typename Alloc2>
inline void append(std::vector<T, Alloc> &dest, const std::vector<T, Alloc2> &src)
template <typename T, typename Alloc>
inline void append(std::vector<T, Alloc> &dest, const std::vector<T, Alloc> &src)
{
if (dest.empty())
dest = src;
else
dest.insert(dest.end(), src.begin(), src.end());
dest.reserve(src.size());
dest.insert(dest.end(), src.begin(), src.end());
}
template <typename T, typename Alloc>

1
src/slic3r/GUI/GUI_ObjectTableSettings.hpp
View file

@ -71,6 +71,7 @@ public:
//return visible count
int update_extra_column_visible_status(ConfigOptionsGroup* option_group, const std::vector<SimpleSettingData>& option_keys, ModelConfig* config);
void update_config_values(bool is_object, ModelObject* object, ModelConfig* config, const std::string& category);
using OTG_Settings::UpdateAndShow;
void UpdateAndShow(int row, const bool show, bool is_object, bool is_multiple_selection, ModelObject* object, ModelConfig* config, const std::string& category);
void ValueChanged(int row, bool is_object, ModelObject* object, ModelConfig* config, const std::string& category, const std::string& key);
void resetAllValues(int row, bool is_object, ModelObject* object, ModelConfig* config, const std::string& category);