Changeset 149 for cafu/trunk/Libs/MaterialSystem/RendererOpenGL12/RendererImpl.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/RendererOpenGL12/RendererImpl.cpp (modified) (5 diffs)

cafu/trunk/Libs/MaterialSystem/RendererOpenGL12/RendererImpl.cpp

@@ -41 +41 @@
 
 #include "../Common/OpenGLEx.hpp"
+#include "ConsoleCommands/Console.hpp"
 #include "Templates/Array.hpp"
 
@@ -89 +90 @@
     // glGetError();   // Clear the error flag manually (will set error GL_INVALID_OPERATION on invalid RC).
 #ifdef DEBUG
-    printf("\n%s (%u): Entering RendererImplT::IsSupported().\n", __FILE__, __LINE__);
+    Console->Print(cf::va("\n%s (%u): Entering RendererImplT::IsSupported().\n", __FILE__, __LINE__));
 #endif
     GLenum LastError=glGetError();
@@ -95 +96 @@
     {
 #ifdef DEBUG
-        printf("%s (%u): glGetError() returned error %lu (0x%X).\n", __FILE__, __LINE__, (unsigned long)LastError, LastError);
+        Console->Print(cf::va("%s (%u): glGetError() returned error %lu (0x%X).\n", __FILE__, __LINE__, (unsigned long)LastError, LastError));
 #endif
         return false;
@@ -105 +106 @@
 
 #ifdef DEBUG
-    printf("%s (%u): GL_VERSION string is \"%s\".\n", __FILE__, __LINE__, Version==NULL ? "NULL" : Version);
+    Console->Print(cf::va("%s (%u): GL_VERSION string is \"%s\".\n", __FILE__, __LINE__, Version==NULL ? "NULL" : Version));
 #endif
     if (Version==NULL) return false;                    // This is another way to see if the RC is valid.
@@ -113 +114 @@
     cf::Init_GL_ARB_multitexture();
 #ifdef DEBUG
-    printf("%s (%u): GL_ARB_multitexture_AVAIL==%u.\n", __FILE__, __LINE__, cf::GL_ARB_multitexture_AVAIL);
+    Console->Print(cf::va("%s (%u): GL_ARB_multitexture_AVAIL==%u.\n", __FILE__, __LINE__, cf::GL_ARB_multitexture_AVAIL));
 #endif
     if (!cf::GL_ARB_multitexture_AVAIL) return false;       // Require the GL_ARB_multitexture extension.