Print to Console like a stream

ChangeLog.md

@@ -12,6 +12,7 @@
     * Press dot key in Menu to see hidden files and folders
     * Console is now using std::string instead of char *
     * Added utf8-cpp dependency to allow Console to delete multi-byte chars
+    * Added stream-style printing to Console
 
     [ 20140809 ]
     * Script Unit Test brings it’s own scripts to test

TODO.md

@@ -8,7 +8,6 @@
     * Maybe replace loader with [VT](http://icculus.org/vt/), also used by OpenTomb.
 * Don't use C-Style code, try to replace with C++ lib
     * Use std::strings
-    * Rewrite Console and use operator << to write to the console?
 * Mesh has 2 different approaches of storing the same data (eg. mColors and mColorArray), but half of ‘em isn’t implemented. Unify this, probably even combining Mesh and StaticMesh...
 * Don’t use float everywhere just because (eg. float colors)
 * Add verbose command line flag for debug output also in release builds

include/Console.h

@@ -9,6 +9,7 @@
 #define _CONSOLE_H_
 
 #include <string>
+#include <sstream>
 #include <vector>
 
 /*!
@@ -26,6 +27,10 @@ public:
 
     bool isVisible();
 
+    template<typename T>
+    Console &operator<<(T t);
+
+    // Deprecated!
     void print(const char *s, ...) __attribute__((format(printf, 2, 3)));
 
     void display();
@@ -36,6 +41,8 @@ public:
 
     void handleMouseScroll(int xrel, int yrel);
 
+    const static char endl = '\n';
+
 private:
 
     void moveInHistory(bool up);
@@ -50,6 +57,8 @@ private:
     std::string mUnfinishedInput;
 
     unsigned int mLineOffset;
+
+    std::ostringstream printBuffer;
 };
 
 Console &getConsole();

src/Console.cpp

@@ -31,18 +31,30 @@ bool Console::isVisible() {
     return mVisible;
 }
 
+template<typename T>
+Console &Console::operator<<(T t) {
+    printBuffer << t;
+
+    if (printBuffer.str().back() == '\n') {
+        mHistory.push_back(printBuffer.str().substr(0, printBuffer.str().length() - 1));
+#ifdef DEBUG
+        std::cout << printBuffer.str().substr(0, printBuffer.str().length() - 1) << std::endl;
+#endif
+        printBuffer.str("");
+    }
+
+    return (*this);
+}
+
+// Deprecated!
 void Console::print(const char *s, ...) {
     va_list args;
     va_start(args, s);
     char *tmp = bufferString(s, args);
     va_end(args);
 
-    if (tmp != NULL) {
-        mHistory.push_back(std::string(tmp));
-#ifdef DEBUG
-        std::cout << tmp << std::endl;
-#endif
-    }
+    if (tmp != nullptr)
+        (*this) << tmp << endl;
 
     delete [] tmp;
 }
@@ -80,6 +92,7 @@ void Console::display() {
         mLineOffset = 0;
     }
 
+    // Draw status line
     getFont().drawText(10, 10, 0.70f, BLUE,
             "%s uptime %lus scroll %d%%", VERSION, systemTimerGet() / 1000, scrollIndicator);
 
@@ -93,6 +106,7 @@ void Console::display() {
     } else if (lineCount < mHistory.size()) {
         historyOffset = mHistory.size() - lineCount;
     }
+
     for (int i = 0; i < end; i++) {
         getFont().drawText(10, (unsigned int)((i + drawOffset) * lineSteps) + firstLine,
                 0.75f, BLUE, "%s", mHistory[i + historyOffset - mLineOffset].c_str());
@@ -122,6 +136,7 @@ void Console::handleKeyboard(KeyboardButton key, bool pressed) {
         mHistoryPointer = 0;
     }
 
+    // Delete last character
     if (pressed && (key == backspaceKey)) {
         if ((mPartialInput.length() == 0)
                 && (mInputBuffer.length() > 0)) {