Changeset 8572 in orxonox.OLD for branches/gui/src/lib/graphics/importer/material.cc

Timestamp:

Jun 18, 2006, 10:02:52 PM (19 years ago)

Author:

bensch

Message:

gui: nicer looks of Material

File:

• branches/gui/src/lib/graphics/importer/material.cc (modified) (1 diff)

branches/gui/src/lib/graphics/importer/material.cc

@@ -431 +431 @@
 
 
+/**
+ * @param blendFunc the Enumerator to convert to a String.
+ * @returns the matching String if found
+ */
 const std::string& Material::blendFuncToString(GLenum blendFunc)
 {
   for (unsigned int i = 0; i < 9; ++i)
-    if (blendFunc == glBlendFuncParams[i])
-      return blendFuncNames[i];
-  return blendFuncNames[0];
-}
-
+    if (blendFunc == Material::glBlendFuncParams[i])
+      return Material::blendFuncNames[i];
+  PRINTF(2)("Supplied an Invalid Enumerator to blendfunc %d\n", blendFunc);
+  return Material::blendFuncNames[0];
+}
+
+/**
+ * @param blendFuncString the String to convert into a gl-enumeration
+ * @returns the matching GL-enumeration if found.
+ */
 GLenum Material::stringToBlendFunc(const std::string& blendFuncString)
 {
   for (unsigned int i = 0; i < 9; ++i)
-    if (blendFuncString == blendFuncNames[i])
-      return glBlendFuncParams[i];
-  return glBlendFuncParams[0];
-}
-
+    if (blendFuncString == Material::blendFuncNames[i])
+      return Material::glBlendFuncParams[i];
+  PRINTF(2)("BlendFunction %s not recognized using %s\n", blendFuncString.c_str(), Material::blendFuncNames[0].c_str());
+  return Material::glBlendFuncParams[0];
+}