3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-22 22:24:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ENABLE_SEAMS_USING_INSTANCED_MODELS -> Completed implementation of rendering models using instancing

Browse source
This commit is contained in:
enricoturri1966 2021-08-27 10:16:50 +02:00
parent c471c3c7c4
commit 03dc2f7c11
2 changed files with 67 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -96,14 +96,22 @@ void GCodeViewer::VBuffer::reset()
} }
#if ENABLE_SEAMS_USING_INSTANCED_MODELS #if ENABLE_SEAMS_USING_INSTANCED_MODELS
void GCodeViewer::InstanceVBuffer::Ranges::reset()
{
for (Range& range : ranges) {
// release gpu memory
if (range.vbo > 0)
glsafe(::glDeleteBuffers(1, &range.vbo));
}
ranges.clear();
}
void GCodeViewer::InstanceVBuffer::reset() void GCodeViewer::InstanceVBuffer::reset()
{ {
// release gpu memory
if (vbo > 0)
glsafe(::glDeleteBuffers(1, &vbo));
s_ids.clear(); s_ids.clear();
buffer.clear(); buffer.clear();
render_ranges.clear(); render_ranges.reset();
} }
#endif // ENABLE_SEAMS_USING_INSTANCED_MODELS #endif // ENABLE_SEAMS_USING_INSTANCED_MODELS
@ -862,6 +870,9 @@ void GCodeViewer::render()
#if ENABLE_GCODE_VIEWER_STATISTICS #if ENABLE_GCODE_VIEWER_STATISTICS
m_statistics.reset_opengl(); m_statistics.reset_opengl();
#if ENABLE_SEAMS_USING_INSTANCED_MODELS
m_statistics.total_instances_gpu_size = 0;
#endif // ENABLE_SEAMS_USING_INSTANCED_MODELS
#endif // ENABLE_GCODE_VIEWER_STATISTICS #endif // ENABLE_GCODE_VIEWER_STATISTICS
// OpenGL data must be initialized after the glContext has been created. // OpenGL data must be initialized after the glContext has been created.
@ -1760,7 +1771,11 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
} }
} }
#if ENABLE_SEAMS_USING_INSTANCED_MODELS
// send vertices data to gpu, where needed
#else
// send vertices data to gpu // send vertices data to gpu
#endif // ENABLE_SEAMS_USING_INSTANCED_MODELS
for (size_t i = 0; i < m_buffers.size(); ++i) { for (size_t i = 0; i < m_buffers.size(); ++i) {
TBuffer& t_buffer = m_buffers[i]; TBuffer& t_buffer = m_buffers[i];
#if ENABLE_SEAMS_USING_MODELS #if ENABLE_SEAMS_USING_MODELS
@ -1768,19 +1783,6 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
if (t_buffer.render_primitive_type == TBuffer::ERenderPrimitiveType::Model) { if (t_buffer.render_primitive_type == TBuffer::ERenderPrimitiveType::Model) {
const InstanceBuffer& inst_buffer = instances[i]; const InstanceBuffer& inst_buffer = instances[i];
if (!inst_buffer.empty()) { if (!inst_buffer.empty()) {
const size_t size_bytes = inst_buffer.size() * sizeof(float);
#if ENABLE_GCODE_VIEWER_STATISTICS
m_statistics.total_instances_gpu_size += static_cast<int64_t>(size_bytes);
#endif // ENABLE_GCODE_VIEWER_STATISTICS
GLuint id = 0;
glsafe(::glGenBuffers(1, &id));
glsafe(::glBindBuffer(GL_ARRAY_BUFFER, id));
glsafe(::glBufferData(GL_ARRAY_BUFFER, size_bytes, inst_buffer.data(), GL_STATIC_DRAW));
glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
t_buffer.model.instances.vbo = id;
t_buffer.model.instances.buffer = inst_buffer; t_buffer.model.instances.buffer = inst_buffer;
t_buffer.model.instances.s_ids = instances_ids[i]; t_buffer.model.instances.s_ids = instances_ids[i];
} }
@ -2293,7 +2295,11 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool
sequential_view->current.first = !top_layer_only && keep_sequential_current_first ? std::clamp(sequential_view->current.first, global_endpoints.first, global_endpoints.last) : global_endpoints.first; sequential_view->current.first = !top_layer_only && keep_sequential_current_first ? std::clamp(sequential_view->current.first, global_endpoints.first, global_endpoints.last) : global_endpoints.first;
sequential_view->current.last = keep_sequential_current_last ? std::clamp(sequential_view->current.last, global_endpoints.first, global_endpoints.last) : global_endpoints.last; sequential_view->current.last = keep_sequential_current_last ? std::clamp(sequential_view->current.last, global_endpoints.first, global_endpoints.last) : global_endpoints.last;
#if ENABLE_SEAMS_USING_INSTANCED_MODELS
// get the world position from the vertex buffer
#else
// get the world position from gpu // get the world position from gpu
#endif // ENABLE_SEAMS_USING_INSTANCED_MODELS
bool found = false; bool found = false;
for (const TBuffer& buffer : m_buffers) { for (const TBuffer& buffer : m_buffers) {
#if ENABLE_SEAMS_USING_MODELS #if ENABLE_SEAMS_USING_MODELS
@ -2301,11 +2307,10 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool
#if ENABLE_SEAMS_USING_INSTANCED_MODELS #if ENABLE_SEAMS_USING_INSTANCED_MODELS
for (size_t i = 0; i < buffer.model.instances.s_ids.size(); ++i) { for (size_t i = 0; i < buffer.model.instances.s_ids.size(); ++i) {
if (buffer.model.instances.s_ids[i] == m_sequential_view.current.last) { if (buffer.model.instances.s_ids[i] == m_sequential_view.current.last) {
size_t offset = i * buffer.model.instances.instance_size_floats();
// gets the position from the vertices buffer on gpu sequential_view->current_position.x() = buffer.model.instances.buffer[offset + 0];
glsafe(::glBindBuffer(GL_ARRAY_BUFFER, buffer.model.instances.vbo)); sequential_view->current_position.y() = buffer.model.instances.buffer[offset + 1];
glsafe(::glGetBufferSubData(GL_ARRAY_BUFFER, static_cast<GLintptr>(i * buffer.model.instances.instance_size_bytes()), static_cast<GLsizeiptr>(3 * sizeof(float)), static_cast<void*>(sequential_view->current_position.data()))); sequential_view->current_position.z() = buffer.model.instances.buffer[offset + 2];
glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
found = true; found = true;
break; break;
@ -2475,33 +2480,33 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool
if (buffer.render_primitive_type != TBuffer::ERenderPrimitiveType::Model) if (buffer.render_primitive_type != TBuffer::ERenderPrimitiveType::Model)
continue; continue;
buffer.model.instances.render_ranges.clear(); buffer.model.instances.render_ranges.reset();
if (!buffer.visible) if (!buffer.visible)
continue; continue;
buffer.model.instances.render_ranges.push_back({ 0, 0, buffer.model.color }); buffer.model.instances.render_ranges.ranges.push_back({ 0, 0, 0, buffer.model.color });
bool has_second_range = top_layer_only && m_sequential_view.current.last != m_sequential_view.global.last; bool has_second_range = top_layer_only && m_sequential_view.current.last != m_sequential_view.global.last;
if (has_second_range) if (has_second_range)
buffer.model.instances.render_ranges.push_back({ 0, 0, Neutral_Color }); buffer.model.instances.render_ranges.ranges.push_back({ 0, 0, 0, Neutral_Color });
if (m_sequential_view.current.first <= buffer.model.instances.s_ids.back() && buffer.model.instances.s_ids.front() <= m_sequential_view.current.last) { if (m_sequential_view.current.first <= buffer.model.instances.s_ids.back() && buffer.model.instances.s_ids.front() <= m_sequential_view.current.last) {
for (size_t id : buffer.model.instances.s_ids) { for (size_t id : buffer.model.instances.s_ids) {
if (has_second_range) { if (has_second_range) {
if (id <= m_sequential_view.endpoints.first) { if (id <= m_sequential_view.endpoints.first) {
buffer.model.instances.render_ranges.front().offset += buffer.model.instances.instance_size_bytes(); ++buffer.model.instances.render_ranges.ranges.front().offset;
++buffer.model.instances.render_ranges.back().count; ++buffer.model.instances.render_ranges.ranges.back().count;
} }
else if (id <= m_sequential_view.current.last) else if (id <= m_sequential_view.current.last)
++buffer.model.instances.render_ranges.front().count; ++buffer.model.instances.render_ranges.ranges.front().count;
else else
break; break;
} }
else { else {
if (id <= m_sequential_view.current.first) if (id <= m_sequential_view.current.first)
buffer.model.instances.render_ranges.front().offset += buffer.model.instances.instance_size_bytes(); ++buffer.model.instances.render_ranges.ranges.front().offset;
else if (id <= m_sequential_view.current.last) else if (id <= m_sequential_view.current.last)
++buffer.model.instances.render_ranges.front().count; ++buffer.model.instances.render_ranges.ranges.front().count;
else else
break; break;
} }
@ -2641,7 +2646,7 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool
#if ENABLE_SEAMS_USING_INSTANCED_MODELS #if ENABLE_SEAMS_USING_INSTANCED_MODELS
statistics->models_instances_size += SLIC3R_STDVEC_MEMSIZE(buffer.model.instances.buffer, float); statistics->models_instances_size += SLIC3R_STDVEC_MEMSIZE(buffer.model.instances.buffer, float);
statistics->models_instances_size += SLIC3R_STDVEC_MEMSIZE(buffer.model.instances.s_ids, size_t); statistics->models_instances_size += SLIC3R_STDVEC_MEMSIZE(buffer.model.instances.s_ids, size_t);
statistics->models_instances_size += SLIC3R_STDVEC_MEMSIZE(buffer.model.instances.render_ranges, InstanceVBuffer::RenderRange); statistics->models_instances_size += SLIC3R_STDVEC_MEMSIZE(buffer.model.instances.render_ranges.ranges, InstanceVBuffer::Ranges::Range);
#else #else
statistics->models_instances_size += SLIC3R_STDVEC_MEMSIZE(buffer.model.instances, TBuffer::Model::Instance); statistics->models_instances_size += SLIC3R_STDVEC_MEMSIZE(buffer.model.instances, TBuffer::Model::Instance);
#endif // ENABLE_SEAMS_USING_INSTANCED_MODELS #endif // ENABLE_SEAMS_USING_INSTANCED_MODELS
@ -2738,12 +2743,22 @@ void GCodeViewer::render_toolpaths()
auto render_as_instanced_model = [this] auto render_as_instanced_model = [this]
(TBuffer& buffer, GLShaderProgram & shader) { (TBuffer& buffer, GLShaderProgram & shader) {
#if ENABLE_SEAMS_USING_INSTANCED_MODELS #if ENABLE_SEAMS_USING_INSTANCED_MODELS
if (buffer.model.instances.vbo > 0) { for (auto& range : buffer.model.instances.render_ranges.ranges) {
for (const InstanceVBuffer::RenderRange& range : buffer.model.instances.render_ranges) { if (range.vbo == 0 && range.count > 0) {
std::cout << range.offset * buffer.model.instances.instance_size_bytes() << " + " << range.count * buffer.model.instances.instance_size_bytes() << " = " << buffer.model.instances.buffer.size() * sizeof(float) << "\n";
glsafe(::glGenBuffers(1, &range.vbo));
glsafe(::glBindBuffer(GL_ARRAY_BUFFER, range.vbo));
glsafe(::glBufferData(GL_ARRAY_BUFFER, range.count * buffer.model.instances.instance_size_bytes(), (const void*)&buffer.model.instances.buffer[range.offset * buffer.model.instances.instance_size_floats()], GL_STATIC_DRAW));
glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
}
if (range.vbo > 0) {
buffer.model.model.set_color(-1, range.color); buffer.model.model.set_color(-1, range.color);
buffer.model.model.render_instanced(buffer.model.instances.vbo, range.count); buffer.model.model.render_instanced(range.vbo, range.count);
#if ENABLE_GCODE_VIEWER_STATISTICS #if ENABLE_GCODE_VIEWER_STATISTICS
++m_statistics.gl_instanced_models_calls_count; ++m_statistics.gl_instanced_models_calls_count;
m_statistics.total_instances_gpu_size += static_cast<int64_t>(range.count * buffer.model.instances.instance_size_bytes());
#endif // ENABLE_GCODE_VIEWER_STATISTICS #endif // ENABLE_GCODE_VIEWER_STATISTICS
} }
} }

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

@ -110,24 +110,31 @@ class GCodeViewer
// which is sent to the shader as -> vec3 (offset) + vec2 (scales) in GLModel::render_instanced() // which is sent to the shader as -> vec3 (offset) + vec2 (scales) in GLModel::render_instanced()
struct InstanceVBuffer struct InstanceVBuffer
{ {
struct RenderRange // ranges used to render only subparts of the intances
struct Ranges
{
struct Range
{ {
// offset in bytes of the 1st instance to render // offset in bytes of the 1st instance to render
unsigned int offset; unsigned int offset;
// count of instances to render // count of instances to render
unsigned int count; unsigned int count;
// vbo id
unsigned int vbo{ 0 };
// Color to apply to the instances // Color to apply to the instances
Color color; Color color;
}; };
// vbo id std::vector<Range> ranges;
unsigned int vbo{ 0 };
void reset();
};
// cpu-side buffer containing all instances data // cpu-side buffer containing all instances data
InstanceBuffer buffer; InstanceBuffer buffer;
// indices of the moves for all instances // indices of the moves for all instances
std::vector<size_t> s_ids; std::vector<size_t> s_ids;
// ranges used to render only subparts of the intances Ranges render_ranges;
std::vector<RenderRange> render_ranges;
size_t data_size_bytes() const { return s_ids.size() * instance_size_bytes(); } size_t data_size_bytes() const { return s_ids.size() * instance_size_bytes(); }