clean up print statements

Author: nmwsharp

src/color_management.cpp

@@ -9,9 +9,6 @@
 #include <cmath>
 #include <iostream>
 
-using std::cout;
-using std::endl;
-
 namespace polyscope {
 
 namespace {

src/curve_network_scalar_quantity.cpp

@@ -7,9 +7,6 @@
 
 #include "imgui.h"
 
-using std::cout;
-using std::endl;
-
 namespace polyscope {
 
 CurveNetworkScalarQuantity::CurveNetworkScalarQuantity(std::string name, CurveNetwork& network_, std::string definedOn_,

src/render/mock_opengl/mock_gl_engine.cpp

@@ -1555,9 +1555,7 @@ MockGLEngine::MockGLEngine() {}
 
 void MockGLEngine::initialize() {
 
-  if (options::verbosity > 0) {
-    std::cout << options::printPrefix << "Backend: openGL_mock" << std::endl;
-  }
+  info(0, "Backend: openGL_mock");
 
   GLFrameBuffer* glScreenBuffer = new GLFrameBuffer(view::bufferWidth, view::bufferHeight, true);
   displayBuffer.reset(glScreenBuffer);

src/render/opengl/gl_engine_egl.cpp

@@ -15,6 +15,7 @@
 #include <cctype>
 #include <dlfcn.h>
 #include <set>
+#include <sstream>
 #include <string>
 
 #include <EGL/egl.h>
@@ -120,9 +121,8 @@ void GLEngineEGL::checkEGLError(bool fatal) {
     break;
   }
 
-  if (polyscope::options::verbosity > 0) {
-    std::cout << polyscope::options::printPrefix << "EGL Error!  Type: " << errText << std::endl;
-  }
+  info(0, "EGL Error!  Type: " + errText);
+
   if (fatal) {
     exception("EGL error occurred. Text: " + errText);
   }
@@ -248,10 +248,13 @@ void GLEngineEGL::initialize() {
     exception(options::printPrefix + "ERROR: Failed to load openGL using GLAD");
   }
 #endif
-  if (options::verbosity > 0) {
-    std::cout << options::printPrefix << "Backend: openGL3_egl -- "
-              << "Loaded openGL version: " << glGetString(GL_VERSION) << " -- "
-              << "EGL version: " << majorVer << "." << minorVer << std::endl;
+
+  {
+    std::stringstring ss;
+    ss << "Backend: openGL3_egl -- "
+       << "Loaded openGL version: " << glGetString(GL_VERSION) << " -- "
+       << "EGL version: " << majorVer << "." << minorVer;
+    info(0, ss.str());
   }
 
   { // Manually create the screen frame buffer
@@ -325,9 +328,9 @@ void GLEngineEGL::resolveEGL() {
     }
     error("EGL: Error loading symbol " + errText);
   }
-  if (options::verbosity > 5) {
-    std::cout << polyscope::options::printPrefix << "  ...resolved EGL functions" << std::endl;
-  }
+
+  info(5, "...resolved EGL functions");
+
   // ... at this point, we have essentially loaded libEGL.so
 
   // === Resolve EGL extension functions
@@ -405,7 +408,8 @@ void GLEngineEGL::sortAvailableDevicesByPreference(
 
     // at high verbosity levels, log the priority
     if (polyscope::options::verbosity > 5) {
-      info(5, "EGLDevice " + std::to_string(iDevice) + " -- vendor: " + vendorStr + "  priority score: " + std::to_string(score));
+      info(5, "EGLDevice " + std::to_string(iDevice) + " -- vendor: " + vendorStr +
+                  "  priority score: " + std::to_string(score));
     }
 
     scoreDevices.emplace_back(score, iDevice);

src/render/opengl/gl_engine_glfw.cpp

@@ -12,6 +12,7 @@
 
 #include <algorithm>
 #include <set>
+#include <sstream>
 
 namespace polyscope {
 namespace render {
@@ -35,9 +36,7 @@ void GLEngineGLFW::initialize() {
 
   // Small callback function for GLFW errors
   auto error_print_callback = [](int error, const char* description) {
-    if (polyscope::options::verbosity > 0) {
-      std::cout << "GLFW emitted error: " << description << std::endl;
-    }
+    info(0, "GLFW emitted error: " + std::string(description));
   };
 
   // === Initialize glfw
@@ -79,9 +78,12 @@ void GLEngineGLFW::initialize() {
     exception("ERROR: Failed to load openGL using GLAD");
   }
 #endif
-  if (options::verbosity > 0) {
-    std::cout << options::printPrefix << "Backend: openGL3_glfw -- "
-              << "Loaded openGL version: " << glGetString(GL_VERSION) << std::endl;
+
+  {
+    std::stringstream ss;
+    ss << "Backend: openGL3_glfw -- "
+       << "Loaded openGL version: " << glGetString(GL_VERSION);
+    info(0, ss.str());
   }
 
 #ifdef __APPLE__

src/render/shader_builder.cpp

@@ -12,12 +12,9 @@ std::vector<ShaderStageSpecification>
 applyShaderReplacements(const std::vector<ShaderStageSpecification>& stages,
                         const std::vector<ShaderReplacementRule>& replacementRules) {
 
-  bool debugPrint = false;
-
   // accumulate the text to be inserted at each tag from all of the rules
   std::map<std::string, std::string> replacements;
   for (const ShaderReplacementRule& rule : replacementRules) {
-    if (debugPrint) std::cout << "Replacement rule: " << rule.ruleName << std::endl;
 
     for (const std::pair<std::string, std::string>& r : rule.replacements) {
       std::string key = r.first;
@@ -42,8 +39,6 @@ applyShaderReplacements(const std::vector<ShaderStageSpecification>& stages,
 
     while (!progText.empty()) {
 
-      if (debugPrint) std::cout << "searching " << progText << std::endl;
-
       // Find the next tag in the program
       auto tagStart = progText.find(startTagToken);
       auto tagEnd = progText.find(endTagToken);
@@ -57,20 +52,15 @@ applyShaderReplacements(const std::vector<ShaderStageSpecification>& stages,
         progText = "";
       } else {
 
-        if (debugPrint) std::cout << "FOUND TAG: " << tagStart << " " << tagEnd << std::endl;
-
         std::string srcBefore = progText.substr(0, tagStart);
         std::string tag = progText.substr(tagStart + startTagToken.size(), tagEnd - (tagStart + startTagToken.size()));
         std::string srcAfter = progText.substr(tagEnd + endTagToken.size(), npos);
 
-        if (debugPrint) std::cout << "  TAG NAME: [" << tag << "]\n";
-
         resultText += srcBefore + "\n// tag ${ " + tag + " }$\n";
         if (replacements.find(tag) != replacements.end()) {
           resultText += replacements[tag];
-          // std::cout << "  ADDING REPLACEMENT: [" << replacements[tag] << "]\n";
         }
-        // resultText += "// END ADDIITIONS FROM TAG ${ " + tag + " $}\n";
+
         progText = srcAfter; // continue processing the remaining program text
       }
     }