Screenshot command and other small improvements

ChangeLog.md

@@ -14,6 +14,7 @@
     * Added utf8-cpp dependency to allow Console to delete multi-byte chars
     * Added stream-style printing to Console
     * Using Console like Stream everywhere, removed old print method
+    * Added Screenshot command back
 
     [ 20140809 ]
     * Script Unit Test brings it’s own scripts to test

include/Game.h

@@ -8,6 +8,7 @@
 #ifndef _GAME_H_
 #define _GAME_H_
 
+#include <string>
 #include <vector>
 
 #include "Entity.h"
@@ -50,7 +51,7 @@ private:
     void processModels();
     void processRooms();
 
-    char *mName;
+    std::string levelName;
     bool mLoaded;
 
     TombRaider mTombRaider;

include/Render.h

@@ -53,7 +53,7 @@ public:
      * \brief Makes a screenshot, writes to disk
      * \param filenameBase basename of file to be written
      */
-    void screenShot(char *filenameBase);
+    void screenShot(const char *filenameBase);
 
     /*!
      * \brief Gets current rendering mode

include/TombRaider.h

@@ -134,7 +134,7 @@ public:
      * \returns 0 on success, < 0 on error
      * \sa TombRaider::loadTR5()
      */
-    int Load(char *filename);
+    int Load(const char *filename);
 
     /*!
      * \brief Makes a clamped 0.0 to 1.0 texel from coord pair
@@ -586,7 +586,7 @@ public:
      * \param filename pak to load
      * \returns < 0 on error
      */
-    int loadSFX(char *filename);
+    int loadSFX(const char *filename);
 
     void reset();
 

include/config.h.in

@@ -9,6 +9,7 @@
 #define _CONFIG_H_
 
 extern const char *VERSION;
+extern const char *VERSION_SHORT;
 extern const char *BUILD_HOST;
 
 #cmakedefine USING_AL

include/utils/strings.h

@@ -28,14 +28,6 @@ bool stringEndsWith(const char *str, const char *suffix);
 /*!
  * \brief Generates a buffered string for the printf call
  * \param string format string like for printf
- * \param args arguments matching format string
- * \returns string in a buffer
- */
-char *bufferString(const char *string, va_list args) __attribute__((format(printf, 1, 0)));
-
-/*!
- * \brief Generates a buffered string for the printf call
- * \param string format string like for printf
  * \returns string in a buffer
  */
 char *bufferString(const char *string, ...) __attribute__((format(printf, 1, 2)));

src/Command.cpp

@@ -97,8 +97,8 @@ int OpenRaider::command(std::string c) {
             getConsole() << "  bind      - bind a keyboard/mouse action" << Console::endl;
             getConsole() << "  animate   - [BOOL|n|p] - Animate models" << Console::endl;
             getConsole() << "  move      - [walk|fly|noclip]" << Console::endl;
-/*
             getConsole() << "  sshot     - make a screenshot" << Console::endl;
+/*
             getConsole() << "  sound     - INT - Test play sound" << Console::endl;
             getConsole() << "  mode      - MODE - Render mode" << Console::endl;
             getConsole() << "  light     - BOOL - GL Lights" << Console::endl;
@@ -184,7 +184,35 @@ int OpenRaider::command(std::string c) {
             return -9;
         }
         getConsole() << temp.c_str()  << "ing" << Console::endl;
-
+    } else if (cmd.compare("sshot") == 0) {
+        if (!mRunning) {
+            getConsole() << "Use sshot command interactively!" << Console::endl;
+            return -999;
+        }
+        std::string filename(mBaseDir);
+        filename += "/sshots/";
+        filename += VERSION_SHORT;
+        bool console = false, menu = false;
+        std::string temp;
+        command >> temp;
+        if (temp.compare("console") == 0)
+            console = true;
+        if (temp.compare("menu") == 0)
+            menu = true;
+        if (!console) {
+            getConsole().setVisible(false);
+            if (menu)
+                getMenu().setVisible(true);
+            frame();
+            frame(); // Double buffered
+        }
+        getRender().screenShot(filename.c_str());
+        if (!console) {
+            getConsole().setVisible(true);
+            if (menu)
+                getMenu().setVisible(false);
+        }
+        getConsole() << "Screenshot stored..." << Console::endl;
 /*
     } else if (cmd.compare("mode") == 0) {
         std::string mode;
@@ -308,29 +336,6 @@ int OpenRaider::command(std::string c) {
             getConsole().print("Invalid use of ponytail-command!");
             return -45;
         }
-    } else if (cmd.compare("sshot") == 0) {
-        if (!mRunning) {
-            getConsole().print("Use sshot command interactively!");
-            return -999;
-        }
-        char *filename = bufferString("%s/sshots/%s", mBaseDir, VERSION);
-        bool console = (args->size() > 0) && (strcmp(args->at(0), "console") == 0);
-        bool menu = (args->size() > 0) && (strcmp(args->at(0), "menu") == 0);
-        if (!console) {
-            getConsole().setVisible(false);
-            if (menu)
-                getMenu().setVisible(true);
-            frame();
-            frame(); // Double buffered
-        }
-        getRender().screenShot(filename);
-        if (!console) {
-            getConsole().setVisible(true);
-            if (menu)
-                getMenu().setVisible(false);
-        }
-        getConsole().print("Screenshot stored...");
-        delete filename;
     } else if (cmd.compare("sound") == 0) {
         if ((!mRunning) || (!getGame().isLoaded())) {
             getConsole().print("Use sound command interactively!");
@@ -439,11 +444,11 @@ int OpenRaider::help(std::string &cmd) {
     } else if (cmd.compare("load") == 0) {
         getConsole() << "load-Command Usage:" << Console::endl;
         getConsole() << "  load /path/to/level" << Console::endl;
-/*
     } else if (cmd.compare("sshot") == 0) {
-        getConsole().print("sshot-Command Usage:");
-        getConsole().print("  sshot [console|menu]");
-        getConsole().print("Add console/menu to capture them too");
+        getConsole() << "sshot-Command Usage:" << Console::endl;
+        getConsole() << "  sshot [console|menu]" << Console::endl;
+        getConsole() << "Add console/menu to capture them too" << Console::endl;
+/*
     } else if (cmd.compare("sound") == 0) {
         getConsole().print("sound-Command Usage:");
         getConsole().print("  sound INT");

src/Game.cpp

@@ -30,7 +30,6 @@ std::map<int, int> gMapTex2Bump;
 
 Game::Game() {
     mLoaded = false;
-    mName = NULL;
     mLara = -1;
     mTextureStart = 0;
     mTextureOffset = 0;
@@ -58,9 +57,6 @@ int Game::initialize() {
 }
 
 void Game::destroy() {
-    delete [] mName;
-    mName = NULL;
-
     mLoaded = false;
     mLara = -1;
     getRender().setMode(Render::modeDisabled);
@@ -78,30 +74,22 @@ int Game::loadLevel(const char *level) {
     if (mLoaded)
         destroy();
 
-    mName = bufferString("%s", level);
+    levelName = level;
 
-    getConsole() << "Loading " << mName << Console::endl;
-    int error = mTombRaider.Load(mName);
+    getConsole() << "Loading " << levelName << Console::endl;
+    int error = mTombRaider.Load(levelName.c_str());
     if (error != 0)
         return error;
 
     // If required, load the external sound effect file MAIN.SFX into TombRaider
     if ((mTombRaider.getEngine() == TR_VERSION_2) || (mTombRaider.getEngine() == TR_VERSION_3)) {
-        char *tmp = bufferString("%sMAIN.SFX", level); // Ensure theres enough space
-        size_t length = strlen(tmp);
-        size_t dir = 0;
-        for (long i = length - 1; i >= 0; i--) {
-            if ((tmp[i] == '/') || (tmp[i] == '\\')) {
-                dir = i + 1; // Find where the filename (bla.tr2) starts
-                break;
-            }
-        }
-        strcpy(tmp + dir, "MAIN.SFX"); // overwrite the name itself with MAIN.SFX
-        tmp[dir + 8] = '\0';
-        error = mTombRaider.loadSFX(tmp);
+        std::string tmp(levelName);
+        size_t pos = tmp.rfind('/');
+        tmp.erase(pos + 1);
+        tmp += "MAIN.SFX";
+        error = mTombRaider.loadSFX(tmp.c_str());
         if (error != 0)
             getConsole() << "Could not load " << tmp << Console::endl;
-        delete [] tmp;
     }
 
     // Process data
@@ -115,6 +103,7 @@ int Game::loadLevel(const char *level) {
     mTombRaider.reset();
 
     if (mLara == -1) {
+        //! \todo Cutscene support
         getConsole() << "Can't find Lara entity in level pak!" << Console::endl;
         destroy();
         return -1;

src/Menu.cpp

@@ -120,14 +120,13 @@ void Menu::play() {
             //! \todo Display something if an error occurs
         }
     } else {
-        char *tmp = bufferString("load %s",
-                mapFolder->getFile((unsigned long)mCursor - 1 - mapFolder->folderCount()).getPath().c_str());
-        if (getOpenRaider().command(tmp) == 0) {
+        std::string tmp = "load ";
+        tmp += mapFolder->getFile((unsigned long)mCursor - 1 - mapFolder->folderCount()).getPath();
+        if (getOpenRaider().command(tmp.c_str()) == 0) {
             setVisible(false);
         } else {
             //! \todo Display something if an error occurs
         }
-        delete [] tmp;
     }
 }
 

src/Render.cpp

@@ -7,6 +7,7 @@
  */
 
 #include <algorithm>
+#include <sstream>
 
 #include <stdlib.h>
 #include <math.h>
@@ -41,35 +42,30 @@ void Render::ClearWorld() {
 }
 
 
-void Render::screenShot(char *filenameBase)
+void Render::screenShot(const char *filenameBase)
 {
     int sz = getWindow().getWidth() * getWindow().getHeight();
     unsigned char *image = new unsigned char[sz * 3];
-    char *filename = NULL;
     static int count = 0;
     bool done = false;
 
-    assert(filenameBase != NULL);
+    assert(filenameBase != nullptr);
 
     // Don't overwrite files
+    std::ostringstream filename;
     while (!done) {
-        filename = bufferString("%s-%04i.tga", filenameBase, count++);
+        filename << filenameBase << "-" << count++ << ".tga";
 
-        FILE *f = fopen(filename, "rb");
-
-        if (f)
+        FILE *f = fopen(filename.str().c_str(), "rb");
+        if (f) {
             fclose(f);
-        else
+        } else {
             done = true;
+        }
     }
 
-    // Capture frame buffer
     glReadPixels(0, 0, getWindow().getWidth(), getWindow().getHeight(), GL_BGR_EXT, GL_UNSIGNED_BYTE, image);
-
-    tgaSave(filename, image, getWindow().getWidth(), getWindow().getHeight(), 0);
-    printf("Took screenshot '%s'.\n", filename);
-
-    delete [] filename;
+    tgaSave(filename.str().c_str(), image, getWindow().getWidth(), getWindow().getHeight(), 0);
     delete [] image;
 }
 

src/TextureManager.cpp

@@ -46,14 +46,14 @@ int TextureManager::initialize() {
     delete [] image;
 
     //! \fixme Temporary
-    char *filename = bufferString("%s/tr2/TITLE.PCX", getOpenRaider().mPakDir);
-    if (loadPCX(filename) < 0) {
-        delete [] filename;
+    std::string filename(getOpenRaider().mPakDir);
+    filename += "/tr2/TITLE.PCX";
+    if (loadPCX(filename.c_str()) < 0) {
         //! \fixme Error Checking. Return negative error code, check in calling place too
-        filename = bufferString("%s/%s", getOpenRaider().mDataDir, "splash.tga");
-        loadTGA(filename);
+        filename = getOpenRaider().mDataDir;
+        filename += "/splash.tga";
+        loadTGA(filename.c_str());
     }
-    delete [] filename;
 
     return (mTextureIds.size() == 0) ? -1 : 0;
 }

src/TombRaider.cpp

@@ -400,7 +400,7 @@ int TombRaider::checkMime(const char *filename) {
 }
 
 
-int TombRaider::Load(char *filename)
+int TombRaider::Load(const char *filename)
 {
     FILE *f;
     int i, j, l;
@@ -4046,7 +4046,7 @@ bool TombRaider::isRoomValid(int index)
 // Public Mutators
 ////////////////////////////////////////////////////////////
 
-int TombRaider::loadSFX(char *filename)
+int TombRaider::loadSFX(const char *filename)
 {
     FILE *f = fopen(filename, "rb");
     long bytes = 0;

src/config.cpp.in

@@ -9,5 +9,7 @@
 
 const char *VERSION = "OpenRaider-@OpenRaider_VERSION_MAJOR@.@OpenRaider_VERSION_MINOR@.@OpenRaider_VERSION_MICRO@@OpenRaider_VERSION_RELEASE@ (@CMAKE_BUILD_TYPE@)";
 
+const char *VERSION_SHORT = "OpenRaider-@OpenRaider_VERSION_MAJOR@.@OpenRaider_VERSION_MINOR@.@OpenRaider_VERSION_MICRO@@OpenRaider_VERSION_RELEASE@";
+
 const char *BUILD_HOST = "@OpenRaider_BUILD_HOST@ @OpenRaider_HOSTNAME@";
 

src/utils/strings.cpp

@@ -80,40 +80,31 @@ bool stringEndsWith(const char *str, const char *suffix) {
     return strncmp(str + lenstr - lensuffix, suffix, lensuffix) == 0;
 }
 
-char *bufferString(const char *string, va_list args) {
+char *bufferString(const char *string, ...) {
+    va_list args, tmp;
     int sz = 60;
     int n;
     char *text;
-    va_list tmp;
 
     assert(string != NULL);
     assert(string[0] != '\0');
 
     text = new char[sz];
 
-    va_copy(tmp, args);
-    n = vsnprintf(text, sz, string, tmp);
-    va_end(tmp);
+    va_start(args, string);
+    n = vsnprintf(text, sz, string, args);
 
     if (n < 0) {
         delete [] text;
+        va_end(args);
         return NULL; // encoding error
     } else if (n >= sz) {
         sz = n + 1; // buffer too small
         delete [] text;
         text = new char[sz + 1];
-        va_copy(tmp, args);
-        vsnprintf(text, sz, string, tmp);
-        va_end(tmp);
+        vsnprintf(text, sz, string, args);
     }
 
-    return text;
-}
-
-char *bufferString(const char *string, ...) {
-    va_list args;
-    va_start(args, string);
-    char *text = bufferString(string, args);
     va_end(args);
     return text;
 }