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

cafu/trunk/Libs/MaterialSystem/MapComposition.cpp

@@ -27 +27 @@
 
 #include <math.h>
-#include <stdio.h>
 
 #include "MapComposition.hpp"
@@ -748 +747 @@
 
         case HeightMapToNormalMap:
-        {
-            char hmScaleString[32];
-
-            sprintf(hmScaleString, "%f", HeightScale);
-            return std::string("hm2nm(")+Child1->GetString()+", "+hmScaleString+")";
-        }
+            return std::string("hm2nm(")+Child1->GetString()+", "+cf::va("%f", HeightScale)+")";
 
         case FlipNormalMapYAxis: