Better fix for repetitive spire messages

Author: dcwhite

src/Externals/spire/es-cereal/ComponentSerialize.hpp

@@ -185,6 +185,14 @@ class ComponentSerializeInterface
   virtual const char* getComponentName() const = 0;
 };
 
+class RepetitiveMessageTracker
+{
+public:
+  static bool hasPostedFor(const std::string& className, int glIdNumber, const std::string& objectName);
+private:
+  static std::map<std::string, std::map<int, std::map<std::string, bool>>> tracking_;
+};
+
 } // namespace spire
 
 #endif

src/Externals/spire/es-render/comp/MatUniform.cpp

@@ -70,10 +70,13 @@ void MatUniform::checkUniform(GLuint shaderID)
     }
   }
 
-  if (boundUniform == false)
+  if (!boundUniform)
   {
-    std::cerr << "Unable to find uniform with name: " << uniformName <<
-        " in shader with ID: " << shaderID << std::endl;
+    if (!spire::RepetitiveMessageTracker::hasPostedFor("MatUniform", shaderID, uniformName))
+    {
+      std::cerr << "Unable to find uniform with name: " << uniformName <<
+          " in shader with ID: " << shaderID << std::endl;
+    }
   }
 }
 

src/Externals/spire/es-render/comp/Texture.cpp

@@ -35,9 +35,24 @@
 
 namespace shaders = spire;
 
-namespace ren {
+bool spire::RepetitiveMessageTracker::hasPostedFor(const std::string& className, int glIdNumber, const std::string& objectName)
+{
+  bool trackedBefore = tracking_[className][glIdNumber][objectName];
+  if (trackedBefore)
+  {
+    return true;
+  }
+  else
+  {
+    tracking_[className][glIdNumber][objectName] = true;
+    std::cerr << "[RENDERER LOG] ";
+    return false;
+  }
+}
+
+std::map<std::string, std::map<int, std::map<std::string, bool>>> spire::RepetitiveMessageTracker::tracking_;
 
-static std::map<int, std::map<std::string, bool>> textureUniformLogged;
+namespace ren {
 
 void Texture::checkUniform(GLuint shaderID)
 {
@@ -57,11 +72,13 @@ void Texture::checkUniform(GLuint shaderID)
       }
     }
 
-    if (!boundUniform && textureUniformLogged[shaderID].find(uniformName) == textureUniformLogged[shaderID].end())
+    if (!boundUniform)
     {
-      std::cerr << "Unable to find uniform with name: " << uniformName <<
+      if (!spire::RepetitiveMessageTracker::hasPostedFor("Texture", shaderID, uniformName))
+      {
+        std::cerr << "Unable to find uniform with name: " << uniformName <<
           " in shader with ID: " << shaderID << std::endl;
-      textureUniformLogged[shaderID][uniformName] = true;
+      }
     }
   }
 }

src/Externals/spire/es-render/comp/VecUniform.cpp

@@ -81,10 +81,13 @@ void VecUniform::checkUniform(GLuint shaderID)
     }
   }
 
-  if (boundUniform == false)
+  if (!boundUniform)
   {
-    std::cerr << "Unable to find uniform with name: " << uniformName <<
-        " in shader with ID: " << shaderID << std::endl;
+    if (!spire::RepetitiveMessageTracker::hasPostedFor("VecUniform", shaderID, uniformName))
+    {
+      std::cerr << "Unable to find uniform with name: " << uniformName << " in shader with ID: "
+        << shaderID << std::endl;
+    }
   }
 }
 

src/Externals/spire/es-render/util/TexQuad.cpp

@@ -144,7 +144,6 @@ glm::mat4 getTexQuadTransform(const glm::vec3& center, float width, float height
 
 glm::mat4 getTexQuadTransform(const glm::vec2& topLeft, const glm::vec2& bottomRight, float z)
 {
-  glm::mat4 trafo;
   float width = bottomRight.x - topLeft.x;
   float height = topLeft.y - bottomRight.y;
   glm::vec3 center = glm::vec3(width / 2.0f, height / 2.0f, z);