Style fixes

openscad · Mar 23, 2023 · 2f5ad86 · 2f5ad86
1 parent 661a9d1
commit 2f5ad86
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 58 deletions.
diff --git a/src/glview/GLView.cc b/src/glview/GLView.cc
@@ -213,10 +213,10 @@ void GLView::enable_opencsg_shaders()
 #ifdef _WIN32
            || (WGLEW_ARB_pbuffer && WGLEW_ARB_pixel_format)
 #elif !defined(__APPLE__)
-          // not supported by GLEW when built with EGL
+           // not supported by GLEW when built with EGL
            || (GLXEW_SGIX_pbuffer && GLXEW_SGIX_fbconfig)
 #endif
-  ) {
+           ) {
     this->is_opencsg_capable = true;
   }
 #endif // ifndef GLEW_EGL

diff --git a/src/glview/VertexArray.cc b/src/glview/VertexArray.cc
@@ -272,20 +272,20 @@ void VertexArray::createVertex(const std::array<Vector3d, 3>& points,
         auto index = (GLubyte)entry.first->second;
         GL_TRACE("glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, %d, %d, %p)", elements_offset_ % elementsData()->sizeofAttribute() % (void *)&index);
         GL_CHECKD(glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, elements_offset_,
-																	elementsData()->sizeofAttribute(),
-																	&index));
+                                  elementsData()->sizeofAttribute(),
+                                  &index));
       } else if (elementsData()->sizeofAttribute() == sizeof(GLushort)) {
         auto index = (GLushort)entry.first->second;
         GL_TRACE("glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, %d, %d, %p)", elements_offset_ % elementsData()->sizeofAttribute() % (void *)&index);
         GL_CHECKD(glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, elements_offset_,
-																	elementsData()->sizeofAttribute(),
-																	&index));
+                                  elementsData()->sizeofAttribute(),
+                                  &index));
       } else if (elementsData()->sizeofAttribute() == sizeof(GLuint)) {
         auto index = (GLuint)entry.first->second;
         GL_TRACE("glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, %d, %d, %p)", elements_offset_ % elementsData()->sizeofAttribute() % (void *)&index);
         GL_CHECKD(glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, elements_offset_,
-																	elementsData()->sizeofAttribute(),
-																	&index));
+                                  elementsData()->sizeofAttribute(),
+                                  &index));
       } else {
         assert(false && "create_vertex invalid index attribute size");
       }
@@ -414,7 +414,7 @@ void VertexArray::addAttributePointers(size_t start_offset)
   size_t offset = start_offset + vertex_data->interleavedOffset(vertex_data->positionIndex());
   vs->glBegin().emplace_back([]() {
     GL_TRACE0("glEnableClientState(GL_VERTEX_ARRAY)");
-		GL_CHECKD(glEnableClientState(GL_VERTEX_ARRAY));
+    GL_CHECKD(glEnableClientState(GL_VERTEX_ARRAY));
   });
   vs->glBegin().emplace_back([count, type, stride, offset, vs_ptr = std::weak_ptr<VertexState>(vs)]() {
     auto vs = vs_ptr.lock();
@@ -428,15 +428,15 @@ void VertexArray::addAttributePointers(size_t start_offset)
   });
   vs->glEnd().emplace_back([]() {
     GL_TRACE0("glDisableClientState(GL_VERTEX_ARRAY)");
-		GL_CHECKD(glDisableClientState(GL_VERTEX_ARRAY));
+    GL_CHECKD(glDisableClientState(GL_VERTEX_ARRAY));
   });
 
   if (vertex_data->hasNormalData()) {
     type = vertex_data->normalData()->glType();
     size_t offset = start_offset + vertex_data->interleavedOffset(vertex_data->normalIndex());
     vs->glBegin().emplace_back([]() {
       GL_TRACE0("glEnableClientState(GL_NORMAL_ARRAY)");
-			GL_CHECKD(glEnableClientState(GL_NORMAL_ARRAY));
+      GL_CHECKD(glEnableClientState(GL_NORMAL_ARRAY));
     });
     vs->glBegin().emplace_back([type, stride, offset, vs_ptr = std::weak_ptr<VertexState>(vs)]() {
       auto vs = vs_ptr.lock();
@@ -449,7 +449,7 @@ void VertexArray::addAttributePointers(size_t start_offset)
     });
     vs->glEnd().emplace_back([]() {
       GL_TRACE0("glDisableClientState(GL_NORMAL_ARRAY)");
-			GL_CHECKD(glDisableClientState(GL_NORMAL_ARRAY));
+      GL_CHECKD(glDisableClientState(GL_NORMAL_ARRAY));
     });
   }
   if (vertex_data->hasColorData()) {
@@ -458,7 +458,7 @@ void VertexArray::addAttributePointers(size_t start_offset)
     size_t offset = start_offset + vertex_data->interleavedOffset(vertex_data->colorIndex());
     vs->glBegin().emplace_back([]() {
       GL_TRACE0("glEnableClientState(GL_COLOR_ARRAY)");
-			GL_CHECKD(glEnableClientState(GL_COLOR_ARRAY));
+      GL_CHECKD(glEnableClientState(GL_COLOR_ARRAY));
     });
     vs->glBegin().emplace_back([count, type, stride, offset, vs_ptr = std::weak_ptr<VertexState>(vs)]() {
       auto vs = vs_ptr.lock();
@@ -471,7 +471,7 @@ void VertexArray::addAttributePointers(size_t start_offset)
     });
     vs->glEnd().emplace_back([]() {
       GL_TRACE0("glDisableClientState(GL_COLOR_ARRAY)");
-			GL_CHECKD(glDisableClientState(GL_COLOR_ARRAY));
+      GL_CHECKD(glDisableClientState(GL_COLOR_ARRAY));
     });
   }
 }
diff --git a/src/glview/cgal/CGAL_OGL_VBO_helper.h b/src/glview/cgal/CGAL_OGL_VBO_helper.h
@@ -254,11 +254,11 @@ class VBOPolyhedron : public virtual Polyhedron
     std::shared_ptr<VertexState> settings = std::make_shared<VertexState>();
     settings->glBegin().emplace_back([]() {
       GL_TRACE0("glDisable(GL_LIGHTING)");
-			GL_CHECKD(glDisable(GL_LIGHTING));
+      GL_CHECKD(glDisable(GL_LIGHTING));
     });
     settings->glBegin().emplace_back([]() {
       GL_TRACE0("glPointSize(10.0f)");
-			GL_CHECKD(glPointSize(10.0f));
+      GL_CHECKD(glPointSize(10.0f));
     });
     points_edges_states.emplace_back(std::move(settings));
 
@@ -285,11 +285,11 @@ class VBOPolyhedron : public virtual Polyhedron
     settings = std::make_shared<VertexState>();
     settings->glBegin().emplace_back([]() {
       GL_TRACE0("glDisable(GL_LIGHTING)");
-			GL_CHECKD(glDisable(GL_LIGHTING));
+      GL_CHECKD(glDisable(GL_LIGHTING));
     });
     settings->glBegin().emplace_back([]() {
       GL_TRACE0("glLineWidth(5.0f)");
-			GL_CHECKD(glLineWidth(5.0f));
+      GL_CHECKD(glLineWidth(5.0f));
     });
     points_edges_states.emplace_back(std::move(settings));
 
@@ -326,20 +326,20 @@ class VBOPolyhedron : public virtual Polyhedron
     settings = std::make_shared<VertexState>();
     settings->glBegin().emplace_back([]() {
       GL_TRACE0("glEnable(GL_LIGHTING)");
-			GL_CHECKD(glEnable(GL_LIGHTING));
+      GL_CHECKD(glEnable(GL_LIGHTING));
     });
     settings->glBegin().emplace_back([]() {
       GL_TRACE0("glLineWidth(5.0f)");
-			GL_CHECKD(glLineWidth(5.0f));
+      GL_CHECKD(glLineWidth(5.0f));
     });
     if (cull_backfaces || color_backfaces) {
       settings->glBegin().emplace_back([]() {
         GL_TRACE0("glEnable(GL_CULL_FACE)");
-				GL_CHECKD(glEnable(GL_CULL_FACE));
+        GL_CHECKD(glEnable(GL_CULL_FACE));
       });
       settings->glBegin().emplace_back([]() {
         GL_TRACE0("glCullFace(GL_BACK)");
-				GL_CHECKD(glCullFace(GL_BACK));
+        GL_CHECKD(glCullFace(GL_BACK));
       });
     }
     halffacets_states.emplace_back(std::move(settings));
@@ -354,7 +354,7 @@ class VBOPolyhedron : public virtual Polyhedron
         settings = std::make_shared<VertexState>();
         settings->glBegin().emplace_back([]() {
           GL_TRACE0("glCullFace(GL_FRONT)");
-					GL_CHECKD(glCullFace(GL_FRONT));
+          GL_CHECKD(glCullFace(GL_FRONT));
         });
         halffacets_states.emplace_back(std::move(settings));
       }
@@ -364,11 +364,11 @@ class VBOPolyhedron : public virtual Polyhedron
       settings = std::make_shared<VertexState>();
       settings->glBegin().emplace_back([]() {
         GL_TRACE0("glCullFace(GL_BACK)");
-				GL_CHECKD(glCullFace(GL_BACK));
+        GL_CHECKD(glCullFace(GL_BACK));
       });
       settings->glBegin().emplace_back([]() {
         GL_TRACE0("glDisable(GL_CULL_FACE)");
-				GL_CHECKD(glDisable(GL_CULL_FACE));
+        GL_CHECKD(glDisable(GL_CULL_FACE));
       });
       halffacets_states.emplace_back(std::move(settings));
     }

diff --git a/src/glview/fbo.cc b/src/glview/fbo.cc
@@ -77,7 +77,9 @@ bool fbo_ext_init(fbo_t *fbo, size_t width, size_t height)
 
   // Attach render and depth buffers
   IF_GL_CHECK(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
-                                        GL_RENDERBUFFER_EXT, fbo->renderbuf_id)) return false;
+                                           GL_RENDERBUFFER_EXT, fbo->renderbuf_id)) {
+    return false;
+  }
 
   if (!check_fbo_status()) {
     cerr << "Problem with OpenGL EXT framebuffer after specifying color render buffer.\n";
@@ -86,12 +88,14 @@ bool fbo_ext_init(fbo_t *fbo, size_t width, size_t height)
 
   if (glewIsSupported("GL_EXT_packed_depth_stencil")) {
     IF_GL_CHECK(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
-                                             GL_RENDERBUFFER_EXT, fbo->depthbuf_id))
+                                             GL_RENDERBUFFER_EXT, fbo->depthbuf_id)) {
       return false;
+    }
 
     IF_GL_CHECK(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT,
-                                             GL_RENDERBUFFER_EXT, fbo->depthbuf_id))
+                                             GL_RENDERBUFFER_EXT, fbo->depthbuf_id)) {
       return false;
+    }
 
     if (!check_fbo_status()) {
       cerr << "Problem with OpenGL EXT framebuffer after specifying depth render buffer.\n";
@@ -100,8 +104,9 @@ bool fbo_ext_init(fbo_t *fbo, size_t width, size_t height)
   } else {
     cerr << "Warning: Cannot create stencil buffer (GL_EXT_packed_depth_stencil not supported)\n";
     IF_GL_CHECK(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
-                                             GL_RENDERBUFFER_EXT, fbo->depthbuf_id))
+                                             GL_RENDERBUFFER_EXT, fbo->depthbuf_id)) {
       return false;
+    }
 
     if (!check_fbo_status()) {
       cerr << "Problem with OpenGL EXT framebuffer after specifying depth stencil render buffer.\n";
@@ -127,8 +132,9 @@ bool fbo_arb_init(fbo_t *fbo, size_t width, size_t height)
 
   // Attach render and depth buffers
   IF_GL_CHECK(glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                                        GL_RENDERBUFFER, fbo->renderbuf_id))
+                                        GL_RENDERBUFFER, fbo->renderbuf_id)) {
     return false;
+  }
 
   if (!check_fbo_status()) {
     cerr << "Problem with OpenGL framebuffer after specifying color render buffer.\n";
@@ -141,8 +147,9 @@ bool fbo_arb_init(fbo_t *fbo, size_t width, size_t height)
   glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
                             GL_RENDERBUFFER, fbo->depthbuf_id);
   IF_GL_CHECK(glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
-                                        GL_RENDERBUFFER, fbo->depthbuf_id))
+                                        GL_RENDERBUFFER, fbo->depthbuf_id)) {
     return false;
+  }
 
   if (!check_fbo_status()) {
     cerr << "Problem with OpenGL framebuffer after specifying depth render buffer.\n";
@@ -181,25 +188,29 @@ bool fbo_resize(fbo_t *fbo, size_t width, size_t height)
   if (use_ext()) {
     glBindRenderbufferEXT(GL_RENDERBUFFER, fbo->depthbuf_id);
     if (glewIsSupported("GL_EXT_packed_depth_stencil")) {
-      IF_GL_CHECK(glRenderbufferStorageEXT(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, width, height))
-        return false;
+      IF_GL_CHECK(glRenderbufferStorageEXT(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, width, height)) {
+	return false;
+      }
     } else {
-      IF_GL_CHECK(glRenderbufferStorageEXT(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, width, height))
-        return false;
+      IF_GL_CHECK(glRenderbufferStorageEXT(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, width, height)) {
+	return false;
+      }
     }
 
     glBindRenderbufferEXT(GL_RENDERBUFFER, fbo->renderbuf_id);
-    IF_GL_CHECK(glRenderbufferStorageEXT(GL_RENDERBUFFER, GL_RGBA8, width, height))
+    IF_GL_CHECK(glRenderbufferStorageEXT(GL_RENDERBUFFER, GL_RGBA8, width, height)) {
       return false;
+    }
   } else {
     glBindRenderbuffer(GL_RENDERBUFFER, fbo->renderbuf_id);
-    IF_GL_CHECK(glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, width, height))
+    IF_GL_CHECK(glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, width, height)) {
       return false;
+    }
 
     glBindRenderbuffer(GL_RENDERBUFFER, fbo->depthbuf_id);
-    IF_GL_CHECK(glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, width, height))
+    IF_GL_CHECK(glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, width, height)) {
       return false;
-
+    }
   }
 
   return true;

diff --git a/src/glview/preview/OpenCSGRenderer.cc b/src/glview/preview/OpenCSGRenderer.cc
@@ -329,11 +329,11 @@ void OpenCSGRenderer::createCSGProducts(const CSGProducts& products, const Rende
         std::shared_ptr<VertexState> cull = std::make_shared<VertexState>();
         cull->glBegin().emplace_back([]() {
           GL_TRACE0("glEnable(GL_CULL_FACE)");
-					GL_CHECKD(glEnable(GL_CULL_FACE));
+          GL_CHECKD(glEnable(GL_CULL_FACE));
         });
         cull->glBegin().emplace_back([]() {
           GL_TRACE0("glCullFace(GL_FRONT)");
-					GL_CHECKD(glCullFace(GL_FRONT));
+          GL_CHECKD(glCullFace(GL_FRONT));
         });
         vertex_states->emplace_back(std::move(cull));
 
@@ -351,7 +351,7 @@ void OpenCSGRenderer::createCSGProducts(const CSGProducts& products, const Rende
         cull = std::make_shared<VertexState>();
         cull->glEnd().emplace_back([]() {
           GL_TRACE0("glDisable(GL_CULL_FACE)");
-					GL_CHECKD(glDisable(GL_CULL_FACE));
+          GL_CHECKD(glDisable(GL_CULL_FACE));
         });
         vertex_states->emplace_back(std::move(cull));
       }
@@ -405,8 +405,8 @@ void OpenCSGRenderer::renderCSGProducts(const std::shared_ptr<CSGProducts>& prod
         if (shaderinfo && shaderinfo->type == Renderer::SELECT_RENDERING) {
           int identifier = csgobj.leaf->index;
           GL_CHECKD(glUniform3f(shaderinfo->data.select_rendering.identifier,
-                      ((identifier >> 0) & 0xff) / 255.0f, ((identifier >> 8) & 0xff) / 255.0f,
-																((identifier >> 16) & 0xff) / 255.0f));
+                                ((identifier >> 0) & 0xff) / 255.0f, ((identifier >> 8) & 0xff) / 255.0f,
+                                ((identifier >> 16) & 0xff) / 255.0f));
         }
 
         const Color4f& c = csgobj.leaf->color;
@@ -499,9 +499,9 @@ void OpenCSGRenderer::renderCSGProducts(const std::shared_ptr<CSGProducts>& prod
                        (((csg_vs->csgObjectIndex() >> 8) & 0xff) / 255.0f) %
                        (((csg_vs->csgObjectIndex() >> 16) & 0xff) / 255.0f));
               GL_CHECKD(glUniform3f(shaderinfo->data.select_rendering.identifier,
-																		((csg_vs->csgObjectIndex() >> 0) & 0xff) / 255.0f,
-																		((csg_vs->csgObjectIndex() >> 8) & 0xff) / 255.0f,
-																		((csg_vs->csgObjectIndex() >> 16) & 0xff) / 255.0f));
+                                    ((csg_vs->csgObjectIndex() >> 0) & 0xff) / 255.0f,
+                                    ((csg_vs->csgObjectIndex() >> 8) & 0xff) / 255.0f,
+                                    ((csg_vs->csgObjectIndex() >> 16) & 0xff) / 255.0f));
             }
           }
           std::shared_ptr<VBOShaderVertexState> shader_vs = std::dynamic_pointer_cast<VBOShaderVertexState>(vs);

diff --git a/src/glview/preview/ThrownTogetherRenderer.cc b/src/glview/preview/ThrownTogetherRenderer.cc
@@ -214,9 +214,9 @@ void ThrownTogetherRenderer::renderCSGProducts(const std::shared_ptr<CSGProducts
                      (((csg_vs->csgObjectIndex() >> 8) & 0xff) / 255.0f) %
                      (((csg_vs->csgObjectIndex() >> 16) & 0xff) / 255.0f));
             GL_CHECKD(glUniform3f(shaderinfo->data.select_rendering.identifier,
-																	((csg_vs->csgObjectIndex() >> 0) & 0xff) / 255.0f,
-																	((csg_vs->csgObjectIndex() >> 8) & 0xff) / 255.0f,
-																	((csg_vs->csgObjectIndex() >> 16) & 0xff) / 255.0f));
+                                  ((csg_vs->csgObjectIndex() >> 0) & 0xff) / 255.0f,
+                                  ((csg_vs->csgObjectIndex() >> 8) & 0xff) / 255.0f,
+                                  ((csg_vs->csgObjectIndex() >> 16) & 0xff) / 255.0f));
           }
         }
         std::shared_ptr<VBOShaderVertexState> shader_vs = std::dynamic_pointer_cast<VBOShaderVertexState>(vs);
@@ -281,11 +281,11 @@ void ThrownTogetherRenderer::createChainObject(VertexArray& vertex_array,
       std::shared_ptr<VertexState> cull = std::make_shared<VertexState>();
       cull->glBegin().emplace_back([]() {
         GL_TRACE0("glEnable(GL_CULL_FACE)");
-				GL_CHECKD(glEnable(GL_CULL_FACE));
+        GL_CHECKD(glEnable(GL_CULL_FACE));
       });
       cull->glBegin().emplace_back([]() {
         GL_TRACE0("glCullFace(GL_BACK)");
-				GL_CHECKD(glCullFace(GL_BACK));
+        GL_CHECKD(glCullFace(GL_BACK));
       });
       vertex_states.emplace_back(std::move(cull));
 
@@ -313,7 +313,7 @@ void ThrownTogetherRenderer::createChainObject(VertexArray& vertex_array,
       cull = std::make_shared<VertexState>();
       cull->glBegin().emplace_back([]() {
         GL_TRACE0("glCullFace(GL_FRONT)");
-				GL_CHECKD(glCullFace(GL_FRONT));
+        GL_CHECKD(glCullFace(GL_FRONT));
       });
       vertex_states.emplace_back(std::move(cull));
 
@@ -325,7 +325,7 @@ void ThrownTogetherRenderer::createChainObject(VertexArray& vertex_array,
 
       vertex_states.back()->glEnd().emplace_back([]() {
         GL_TRACE0("glDisable(GL_CULL_FACE)");
-				GL_CHECKD(glDisable(GL_CULL_FACE));
+        GL_CHECKD(glDisable(GL_CULL_FACE));
       });
     }
   }

diff --git a/src/glview/system-gl.h b/src/glview/system-gl.h
@@ -20,8 +20,8 @@ bool glCheck(const char *stmt, const char *file, int line)
 {
   if (const auto err = glGetError(); err != GL_NO_ERROR) {
     LOG(message_group::Error, Location::NONE, "",
-	"OpenGL error: %1$s (0x%2$04x) in %3$s:%4$d\n"
-	"              %5$s\n", gluErrorString(err), err, file, line, stmt);
+        "OpenGL error: %1$s (0x%2$04x) in %3$s:%4$d\n"
+        "              %5$s\n", gluErrorString(err), err, file, line, stmt);
     return false;
   }
   return true;
@@ -32,7 +32,7 @@ bool glCheckd(const char *stmt, const char *file, int line)
 {
   if (const auto err = glGetError(); err != GL_NO_ERROR) {
     PRINTDB("OpenGL error: %s (0x%04x) in %s:%d\n"
-	    "              %s\n", gluErrorString(err) % err % file % line % stmt);
+            "              %s\n", gluErrorString(err) % err % file % line % stmt);
     return false;
   }
   return true;

diff --git a/src/gui/MouseSelector.cc b/src/gui/MouseSelector.cc
@@ -147,7 +147,7 @@ int MouseSelector::select(const Renderer *renderer, int x, int y) {
   // of the currently selected frame.
   // For now, i will use a texture the same size as the normal viewport
   // and select the identifier at the mouse coordinates
-	GL_DEBUG_CHECKD(this->framebuffer->bind());
+  GL_DEBUG_CHECKD(this->framebuffer->bind());
 
   glClearColor(0, 0, 0, 1.0);
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);