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

Picking using rectangle selection WIP 3 -> Use parallel_for to extract data from the framebuffer copy

Browse Source
This commit is contained in:
Enrico Turri 2019-04-23 12:07:35 +02:00
parent 43ad9ff8b7
commit a6ba6865bb
1 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -3737,6 +3737,33 @@ void GLCanvas3D::_rectangular_selection_picking_pass() const
int top = get_canvas_size().get_height() - (int)m_rectangle_selection.get_top(); int top = get_canvas_size().get_height() - (int)m_rectangle_selection.get_top();
if ((left >= 0) && (top >= 0)) if ((left >= 0) && (top >= 0))
{ {
#define USE_PARALLEL 1
#if USE_PARALLEL
struct Pixel
{
std::array<GLubyte, 4> data;
int id() const { return data[0] + (data[1] << 8) + (data[2] << 16); }
};
std::vector<Pixel> frame(px_count);
glsafe(::glReadPixels(left, top, width, height, GL_RGBA, GL_UNSIGNED_BYTE, (void*)frame.data()));
tbb::spin_mutex mutex;
tbb::parallel_for(tbb::blocked_range<size_t>(0, frame.size(), (size_t)width),
[this, &frame, &idxs, &mutex](const tbb::blocked_range<size_t>& range) {
for (size_t i = range.begin(); i < range.end(); ++i)
{
int volume_id = frame[i].id();
if ((0 <= volume_id) && (volume_id < (int)m_volumes.volumes.size()))
{
mutex.lock();
idxs.insert(volume_id);
mutex.unlock();
}
}
}
);
#else
std::vector<GLubyte> frame(4 * px_count); std::vector<GLubyte> frame(4 * px_count);
glsafe(::glReadPixels(left, top, width, height, GL_RGBA, GL_UNSIGNED_BYTE, (void*)frame.data())); glsafe(::glReadPixels(left, top, width, height, GL_RGBA, GL_UNSIGNED_BYTE, (void*)frame.data()));
@ -3747,6 +3774,7 @@ void GLCanvas3D::_rectangular_selection_picking_pass() const
if ((0 <= volume_id) && (volume_id < (int)m_volumes.volumes.size())) if ((0 <= volume_id) && (volume_id < (int)m_volumes.volumes.size()))
idxs.insert(volume_id); idxs.insert(volume_id);
} }
#endif // USE_PARALLEL
} }
} }
} }
@ -3764,23 +3792,19 @@ void GLCanvas3D::_rectangular_selection_picking_pass() const
for (int idx : idxs) for (int idx : idxs)
{ {
GLVolume* volume = m_volumes.volumes[idx]; GLVolume* volume = m_volumes.volumes[idx];
// if ((!volume->selected && (state == GLSelectionRectangle::Select)) || if (volume->is_modifier)
// (volume->selected && (state == GLSelectionRectangle::Deselect))) volume->hover = true;
// { else
if (volume->is_modifier) {
volume->hover = true; int object_idx = volume->object_idx();
else int instance_idx = volume->instance_idx();
{
int object_idx = volume->object_idx();
int instance_idx = volume->instance_idx();
for (GLVolume* v : m_volumes.volumes) for (GLVolume* v : m_volumes.volumes)
{ {
if ((v->object_idx() == object_idx) && (v->instance_idx() == instance_idx)) if ((v->object_idx() == object_idx) && (v->instance_idx() == instance_idx))
v->hover = true; v->hover = true;
}
} }
// } }
} }
} }
} }