Changeset 149 for cafu/trunk/Ca3DE/AppCafu.hpp

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/Ca3DE/AppCafu.hpp (modified) (3 diffs)

cafu/trunk/Ca3DE/AppCafu.hpp

@@ -39 +39 @@
 
 
+namespace cf { class CompositeConsoleT; }
+namespace cf { class ConsoleFileT; }
+namespace cf { class ConsoleStringBufferT; }
 class MainFrameT;
 
@@ -48 +51 @@
 
     AppCafuT();
+    ~AppCafuT();
+
+    /// Returns the composite console that is also available via the global Console pointer.
+    cf::CompositeConsoleT& GetConComposite() const;
+
+    /// Returns the console that buffers all output.
+    cf::ConsoleStringBufferT& GetConBuffer() const { return *m_ConBuffer; }
+
+    // /// Returns the console that logs all output into a file (can be NULL if not used).
+    // cf::ConsoleFileT& GetConFile() const { return *m_ConFile; }
 
     /// Returns whether we successfully set a custom video mode (screen resolution) during initialization.
@@ -68 +81 @@
     bool OnCmdLineParsed(wxCmdLineParser& Parser);
 
-    bool        m_IsCustomVideoMode;  ///< Whether we successfully set a custom video mode (screen resolution) during initialization.
-    wxVideoMode m_CurrentMode;        ///< The video mode that we're currently using.
-    MainFrameT* m_MainFrame;          ///< The Cafu application main frame.
+    cf::ConsoleStringBufferT* m_ConBuffer;          ///< The console that buffers all output.
+    cf::ConsoleFileT*         m_ConFile;            ///< The console that logs all output into a file (can be NULL if not used).
+    bool                      m_IsCustomVideoMode;  ///< Whether we successfully set a custom video mode (screen resolution) during initialization.
+    wxVideoMode               m_CurrentMode;        ///< The video mode that we're currently using.
+    MainFrameT*               m_MainFrame;          ///< The Cafu application main frame.
 };