From a35f72442e3d44156f88efa58d16222a6a0b7ee0 Mon Sep 17 00:00:00 2001
From: enricoturri1966 <enricoturri@seznam.cz>
Date: Fri, 17 Jul 2020 12:10:55 +0200
Subject: [PATCH] GCodeViewer -> 2nd attempt to fix rendering of toolpaths on
 Mac

---
 src/slic3r/GUI/GCodeViewer.cpp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index 27bd8b6727..0ab43a98c7 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -1221,13 +1221,7 @@ void GCodeViewer::render_toolpaths() const
         glsafe(::glEnable(GL_POINT_SPRITE));
 
         for (const RenderPath& path : buffer.render_paths) {
-#ifdef __APPLE__
-            for (size_t i = 0; i < path.sizes.size(); ++i) {
-                glsafe(::glDrawElements(GL_POINTS, (GLsizei)path.sizes[i], GL_UNSIGNED_INT, (const void*)path.offsets[i]));
-            }
-#else
             glsafe(::glMultiDrawElements(GL_POINTS, (const GLsizei*)path.sizes.data(), GL_UNSIGNED_INT, (const void* const*)path.offsets.data(), (GLsizei)path.sizes.size()));
-#endif // __APPLE__
 #if ENABLE_GCODE_VIEWER_STATISTICS
             ++m_statistics.gl_multi_points_calls_count;
 #endif // ENABLE_GCODE_VIEWER_STATISTICS
@@ -1241,13 +1235,7 @@ void GCodeViewer::render_toolpaths() const
         for (const RenderPath& path : buffer.render_paths)
         {
             shader.set_uniform("uniform_color", path.color);
-#ifdef __APPLE__
-            for (size_t i = 0; i < path.sizes.size(); ++i) {
-                glsafe(::glDrawElements(GL_LINES, (GLsizei)path.sizes[i], GL_UNSIGNED_INT, (const void*)path.offsets[i]));
-            }
-#else
             glsafe(::glMultiDrawElements(GL_LINES, (const GLsizei*)path.sizes.data(), GL_UNSIGNED_INT, (const void* const*)path.offsets.data(), (GLsizei)path.sizes.size()));
-#endif // __APPLE__
 #if ENABLE_GCODE_VIEWER_STATISTICS
             ++m_statistics.gl_multi_line_strip_calls_count;
 #endif // ENABLE_GCODE_VIEWER_STATISTICS
@@ -1255,7 +1243,11 @@ void GCodeViewer::render_toolpaths() const
     };
 
     auto line_width = [zoom]() {
-        return (zoom < 5.0) ? 1.0 : (1.0 + 5.0 * (zoom - 5.0) / (100.0 - 5.0));            
+#ifdef WIN32
+        return (zoom < 5.0) ? 1.0 : (1.0 + 5.0 * (zoom - 5.0) / (100.0 - 5.0));
+#else
+        return 3.0f;
+#endif // WIN32
     };
 
     glsafe(::glCullFace(GL_BACK));