Changeset 149 for cafu/trunk/Libs/MaterialSystem/MaterialManagerImpl.cpp

Timestamp:

09/03/10 00:25:58 (21 months ago)

Author:

Carsten

Message:

Revision of Console code:

• New "composite console" is the new default console, making it easy to add logging into a file and the graphical console during init, and making it unnecessary to reset the console pointer in DLLs that have been initialized before the graphical console.
• Replaced several old/obsolete printf-statements (in the renderer DLLs) with their proper Console->Print() counterparts.
• Put the Lua bindings to the global Console into separate files. This way the DLLs can include Console.hpp without being forced to link the Lua libraries in.

Files:

• cafu/trunk/Libs/MaterialSystem/MaterialManagerImpl.cpp (modified) (6 diffs)

cafu/trunk/Libs/MaterialSystem/MaterialManagerImpl.cpp

@@ -46 +46 @@
 #include "Expression.hpp"
 #include "Material.hpp"
+#include "ConsoleCommands/Console.hpp"
 #include "TextParser/TextParser.hpp"
 
@@ -202 +203 @@
                 if (!T)
                 {
-                    printf("Error parsing %s near %s at input byte %lu.\n", FileName.c_str(), Token.c_str(), TextParser.GetReadPosByte());
+                    Console->Print("Error parsing "+FileName+" near "+Token+cf::va(" at input byte %lu.\n", TextParser.GetReadPosByte()));
                     break;
                 }
@@ -226 +227 @@
                 else
                 {
-                    printf("File %s, material \"%s\": duplicate definition (ignored).\n", FileName.c_str(), NewMat->Name.c_str());
+                    Console->Print("File " + FileName + ", material \"" + NewMat->Name + "\": duplicate definition (ignored).\n");
                     delete NewMat;
                 }
@@ -234 +235 @@
     catch (const TextParserT::ParseError&)
     {
-        printf("Error parsing %s at input byte %lu.\n", FileName.c_str(), TextParser.GetReadPosByte());
+        Console->Print("Error parsing "+FileName+cf::va(" at input byte %lu.\n", TextParser.GetReadPosByte()));
     }
 
@@ -339 +340 @@
 MaterialT* MaterialManagerImplT::GetMaterial(const std::string& MaterialName)
 {
-    // Note that I'm *not* just writing   return Materials[MaterialName]   here, because that
+    // Note that we are *not* just writing   return Materials[MaterialName]   here, because that
     // would implicitly create a NULL entry for every MaterialName that does not actually exist.
     std::map<std::string, MaterialT*>::const_iterator It=Materials.find(MaterialName);
@@ -345 +346 @@
     if (It!=Materials.end()) return It->second;
 
-    printf("%s (%u): GetMaterial(\"%s\") returns NULL.\n", __FILE__, __LINE__, MaterialName.c_str());
+    Console->Print(cf::va("%s (%u): ", __FILE__, __LINE__)+"GetMaterial(\""+MaterialName+"\") returns NULL.\n");
     return NULL;
 }