Merge pull request #1347 from seanpaultaylor/next

Fixes repeating MaterialParameter warnings each frame to only log once for missing uniforms and unset parameter values.

gameplay/src/MaterialParameter.cpp

@@ -6,7 +6,7 @@ namespace gameplay
 {
 
 MaterialParameter::MaterialParameter(const char* name) :
-    _type(MaterialParameter::NONE), _count(1), _dynamic(false), _name(name ? name : ""), _uniform(NULL)
+_type(MaterialParameter::NONE), _count(1), _dynamic(false), _name(name ? name : ""), _uniform(NULL), _loggerDirtyBits(0)
 {
     clearValue();
 }
@@ -458,8 +458,12 @@ void MaterialParameter::bind(Effect* effect)
 
         if (!_uniform)
         {
-            // This parameter was not found in the specified effect, so do nothing.
-            GP_WARN("Warning: Material parameter '%s' not found in effect '%s'.", _name.c_str(), effect->getId());
+            if ((_loggerDirtyBits & UNIFORM_NOT_FOUND) == 0)
+            {
+                // This parameter was not found in the specified effect, so do nothing.
+                GP_WARN("Material parameter for uniform '%s' not found in effect: '%s'.", _name.c_str(), effect->getId());
+                _loggerDirtyBits |= UNIFORM_NOT_FOUND;
+            }
             return;
         }
     }
@@ -501,8 +505,14 @@ void MaterialParameter::bind(Effect* effect)
             _value.method->setValue(effect);
         break;
     default:
-        GP_WARN("Unknown type (%d) for material parameter: %s", _type, _name.c_str());
-        break;
+        {
+             if ((_loggerDirtyBits & PARAMETER_VALUE_NOT_SET) == 0)
+             {
+                 GP_WARN("Material parameter value not set for: '%s' in effect: '%s'.", _name.c_str(), effect->getId());
+                 _loggerDirtyBits |= PARAMETER_VALUE_NOT_SET;
+             }
+            break;
+        }
     }
 }
 
@@ -592,7 +602,7 @@ void MaterialParameter::bindValue(Node* node, const char* binding)
     }
     else
     {
-        GP_ERROR("Unsupported material parameter binding '%s'.", binding);
+        GP_WARN("Unsupported material parameter binding '%s'.", binding);
     }
 }
 
@@ -623,7 +633,6 @@ unsigned int MaterialParameter::getAnimationPropertyComponentCount(int propertyI
                 case VECTOR4:
                     return 4 * _count;
                 default:
-                    GP_ERROR("Unsupported material parameter type (%d).", _type);
                     return 0;
             }
         }
@@ -679,7 +688,6 @@ void MaterialParameter::getAnimationPropertyValue(int propertyId, AnimationValue
                     // Unsupported material parameter types for animation.
                     break;
                 default:
-                    GP_ERROR("Unsupported material parameter type (%d).", _type);
                     break;
             }
         }
@@ -729,7 +737,6 @@ void MaterialParameter::setAnimationPropertyValue(int propertyId, AnimationValue
                     // Unsupported material parameter types for animation.
                     break;
                 default:
-                    GP_ERROR("Unsupported material parameter type (%d).", _type);
                     break;
             }
         }

gameplay/src/MaterialParameter.h

@@ -435,6 +435,12 @@ private:
     void applyAnimationValue(AnimationValue* value, float blendWeight, int components);
 
     void cloneInto(MaterialParameter* materialParameter) const;
+
+    enum LOGGER_DIRTYBITS
+    {
+        UNIFORM_NOT_FOUND = 0x01,
+        PARAMETER_VALUE_NOT_SET = 0x02
+    };
     
     union
     {
@@ -474,6 +480,7 @@ private:
     bool _dynamic;
     std::string _name;
     Uniform* _uniform;
+    char _loggerDirtyBits;
 };
 
 template <class ClassType, class ParameterType>