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

Further optimization of G-code viewer: Replaced std::set<RenderPaths>

Browse source 
with std::vector.
This commit is contained in:
Vojtech Bubnik 2021-12-06 13:21:34 +01:00
parent c37090a64d
commit 2ed57d1ba5
2 changed files with 14 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/slic3r/GUI/GCodeViewer.cpp
View file

@ -977,8 +977,7 @@ void GCodeViewer::export_toolpaths_to_obj(const char* filename) const
for (const RenderPath& path : t_buffer.render_paths) { for (const RenderPath& path : t_buffer.render_paths) {
colors.push_back(path.color); colors.push_back(path.color);
} }
std::sort(colors.begin(), colors.end()); sort_remove_duplicates(colors);
colors.erase(std::unique(colors.begin(), colors.end()), colors.end());
// save materials file // save materials file
boost::filesystem::path mat_filename(filename); boost::filesystem::path mat_filename(filename);
@ -2020,13 +2019,11 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result)
} }
// roles -> remove duplicates // roles -> remove duplicates
std::sort(m_roles.begin(), m_roles.end()); sort_remove_duplicates(m_roles);
m_roles.erase(std::unique(m_roles.begin(), m_roles.end()), m_roles.end());
m_roles.shrink_to_fit(); m_roles.shrink_to_fit();
// extruder ids -> remove duplicates // extruder ids -> remove duplicates
std::sort(m_extruder_ids.begin(), m_extruder_ids.end()); sort_remove_duplicates(m_extruder_ids);
m_extruder_ids.erase(std::unique(m_extruder_ids.begin(), m_extruder_ids.end()), m_extruder_ids.end());
m_extruder_ids.shrink_to_fit(); m_extruder_ids.shrink_to_fit();
// set layers z range // set layers z range
@ -2374,8 +2371,10 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool
} }
RenderPath key{ tbuffer_id, color, static_cast<unsigned int>(ibuffer_id), path_id }; RenderPath key{ tbuffer_id, color, static_cast<unsigned int>(ibuffer_id), path_id };
if (render_path == nullptr || !RenderPathPropertyEqual()(*render_path, key)) if (render_path == nullptr || !RenderPathPropertyEqual()(*render_path, key)) {
render_path = const_cast<RenderPath*>(&(*buffer.render_paths.emplace(key).first)); buffer.render_paths.emplace_back(key);
render_path = const_cast<RenderPath*>(&buffer.render_paths.back());
}
unsigned int delta_1st = 0; unsigned int delta_1st = 0;
if (sub_path.first.s_id < m_sequential_view.current.first && m_sequential_view.current.first <= sub_path.last.s_id) if (sub_path.first.s_id < m_sequential_view.current.first && m_sequential_view.current.first <= sub_path.last.s_id)
@ -2433,16 +2432,14 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool
#endif #endif
} }
// removes empty render paths // Removes empty render paths and sort.
for (size_t b = 0; b < m_buffers.size(); ++b) { for (size_t b = 0; b < m_buffers.size(); ++b) {
TBuffer* buffer = const_cast<TBuffer*>(&m_buffers[b]); TBuffer* buffer = const_cast<TBuffer*>(&m_buffers[b]);
std::set<RenderPath, RenderPathPropertyLower>::iterator it = buffer->render_paths.begin(); buffer->render_paths.erase(std::remove_if(buffer->render_paths.begin(), buffer->render_paths.end(),
while (it != buffer->render_paths.end()) { [](const auto &path){ return path.sizes.empty() || path.offsets.empty(); }),
if (it->sizes.empty() || it->offsets.empty()) buffer->render_paths.end());
it = buffer->render_paths.erase(it); //FIXME is this sorting needed at all?
else std::sort(buffer->render_paths.begin(), buffer->render_paths.end(), RenderPathPropertyLower{});
++it;
}
} }
// second pass: for buffers using instanced and batched models, update the instances render ranges // second pass: for buffers using instanced and batched models, update the instances render ranges

12
src/slic3r/GUI/GCodeViewer.hpp
View file

@ -259,14 +259,6 @@ class GCodeViewer
return false; return false;
} }
}; };
// // for unordered_set implementation of render_paths
// struct RenderPathPropertyHash {
// size_t operator() (const RenderPath &p) const {
// // Convert the RGB value to an integer hash.
//// return (size_t(int(p.color[0] * 255) + 255 * int(p.color[1] * 255) + (255 * 255) * int(p.color[2] * 255)) * 7919) ^ size_t(p.ibuffer_id);
// return size_t(int(p.color[0] * 255) + 255 * int(p.color[1] * 255) + (255 * 255) * int(p.color[2] * 255)) ^ size_t(p.ibuffer_id);
// }
// };
struct RenderPathPropertyLower { struct RenderPathPropertyLower {
bool operator() (const RenderPath &l, const RenderPath &r) const { bool operator() (const RenderPath &l, const RenderPath &r) const {
if (l.tbuffer_id < r.tbuffer_id) if (l.tbuffer_id < r.tbuffer_id)
@ -319,9 +311,7 @@ class GCodeViewer
std::string shader; std::string shader;
std::vector<Path> paths; std::vector<Path> paths;
// std::set seems to perform significantly better, at least on Windows. std::vector<RenderPath> render_paths;
// std::unordered_set<RenderPath, RenderPathPropertyHash, RenderPathPropertyEqual> render_paths;
std::set<RenderPath, RenderPathPropertyLower> render_paths;
bool visible{ false }; bool visible{ false };
void reset(); void reset();