Press dot key in Menu to see hidden files

ChangeLog.md

@@ -7,6 +7,9 @@
       into their own file
     * Menu now acts like a file-manager, only showing one folder,
       and has the ability to go to the parent folder, and do mouse scrolling
+    * Added API to Font to draw strings centered
+    * Folder sorts its items alphabetically
+    * Press dot key in Menu to see hidden files and folders
 
     [ 20140809 ]
     * Script Unit Test brings it’s own scripts to test

include/Font.h

@@ -35,8 +35,13 @@ public:
 
     virtual void writeString(FontString &s) = 0;
 
-    virtual void drawText(unsigned int x, unsigned int y, float scale, const unsigned char color[4], const char *s, ...)
-        __attribute__((format(printf, 6, 0)));
+    virtual void drawText(unsigned int x, unsigned int y, float scale,
+            const unsigned char color[4], const char *s, ...)
+            __attribute__((format(printf, 6, 0)));
+
+    virtual void drawTextCentered(unsigned int x, unsigned int y, float scale,
+            const unsigned char color[4], unsigned int width, const char *s, ...)
+            __attribute__((format(printf, 7, 0)));
 
 protected:
     bool mFontInit;

include/Menu.h

@@ -10,7 +10,6 @@
 
 #include <memory>
 
-#include "Font.h"
 #include "utils/Folder.h"
 
 /*!
@@ -30,7 +29,8 @@ public:
     ~Menu();
 
     int initialize();
-    int initialize(Folder folder);
+    int initialize(std::string folder);
+    int initialize(Folder *folder);
 
     void setVisible(bool visible);
 
@@ -52,9 +52,8 @@ private:
     long mCursor;
     long mMin;
 
-    FontString mainText; //!< Used to draw heading centered
-
     Folder *mapFolder;
+    bool hiddenState;
 };
 
 Menu &getMenu();

src/Font.cpp

@@ -10,6 +10,7 @@
 
 #include "global.h"
 #include "utils/strings.h"
+#include "Window.h"
 #include "Font.h"
 
 Font::~Font() {
@@ -25,7 +26,8 @@ void Font::setFont(const char *font) {
     mFontName = fullPath(font, 0);
 }
 
-void Font::drawText(unsigned int x, unsigned int y, float scale, const unsigned char color[4], const char *s, ...) {
+void Font::drawText(unsigned int x, unsigned int y, float scale,
+        const unsigned char color[4], const char *s, ...) {
     FontString tempText;
     va_list args;
     va_start(args, s);
@@ -49,3 +51,32 @@ void Font::drawText(unsigned int x, unsigned int y, float scale, const unsigned
     va_end(args);
 }
 
+void Font::drawTextCentered(unsigned int x, unsigned int y, float scale,
+        const unsigned char color[4], unsigned int width, const char *s, ...) {
+    FontString tempText;
+    va_list args;
+    va_start(args, s);
+
+    tempText.text = new char[256];
+    tempText.scale = scale;
+    tempText.w = 0;
+    tempText.h = 0;
+    tempText.x = x;
+    tempText.y = y + getWindow().getHeight(); //! \fixme Ugly hack to hide first draw
+    tempText.color[0] = color[0];
+    tempText.color[1] = color[1];
+    tempText.color[2] = color[2];
+    tempText.color[3] = color[3];
+
+    vsnprintf(tempText.text, 256, s, args);
+    tempText.text[255] = '\0';
+    writeString(tempText);
+
+    tempText.x = (width / 2) - ((unsigned int)(tempText.w / 2));
+    tempText.y = y;
+    writeString(tempText);
+
+    delete [] tempText.text;
+    va_end(args);
+}
+

src/Menu.cpp

@@ -10,53 +10,44 @@
 
 #include "global.h"
 #include "Console.h"
+#include "Font.h"
 #include "OpenRaider.h"
 #include "utils/strings.h"
 #include "TombRaider.h"
 #include "Window.h"
 #include "Menu.h"
 
-// TODO
-// Going up to / leads to the current working directory
-
 Menu::Menu() {
     mVisible = false;
     mCursor = 0;
     mMin = 0;
     mapFolder = nullptr;
-
-    mainText.text = bufferString("%s", VERSION);
-    mainText.color[0] = BLUE[0];
-    mainText.color[1] = BLUE[1];
-    mainText.color[2] = BLUE[2];
-    mainText.color[3] = BLUE[3];
-    mainText.scale = 1.2f;
-    mainText.y = 10;
-    mainText.w = 0;
-    mainText.h = 0;
+    hiddenState = false;
 }
 
 Menu::~Menu() {
-    delete [] mainText.text;
-    mainText.text = nullptr;
-
     delete mapFolder;
     mapFolder = nullptr;
 }
 
 int Menu::initialize() {
-    return initialize(Folder(getOpenRaider().mPakDir));
+    return initialize(getOpenRaider().mPakDir);
+}
+
+int Menu::initialize(std::string folder) {
+    return initialize(new Folder(folder, hiddenState));
 }
 
-int Menu::initialize(Folder folder) {
+int Menu::initialize(Folder *folder) {
     if (mapFolder != nullptr)
         delete mapFolder;
-    mapFolder = new Folder(folder);
+    mapFolder = folder;
     mMin = mCursor = 0;
 
     mapFolder->executeRemoveFiles([](File &f) {
         // Filter files based on file name
-        if ((f.getName().compare(f.getName().length() - 4, 4, ".phd") != 0)
+        if ((f.getName().length() > 4)
+            && (f.getName().compare(f.getName().length() - 4, 4, ".phd") != 0)
             && (f.getName().compare(f.getName().length() - 4, 4, ".tr2") != 0)
             && (f.getName().compare(f.getName().length() - 4, 4, ".tr4") != 0)
             && (f.getName().compare(f.getName().length() - 4, 4, ".trc") != 0)) {
@@ -98,10 +89,8 @@ void Menu::display() {
     glRecti(0, 0, (GLint)getWindow().getWidth(), (GLint)getWindow().getHeight());
     glEnable(GL_TEXTURE_2D);
 
-    // Draw heading text, using FontString so we can get the
-    // width of the drawn text to center it
-    mainText.x = (getWindow().getWidth() / 2) - ((unsigned int)(mainText.w / 2));
-    getFont().writeString(mainText);
+    // Draw heading
+    getFont().drawTextCentered(0, 10, 1.2f, BLUE, getWindow().getWidth(), "%s", VERSION);
 
     // Estimate displayable number of items
     int items = (getWindow().getHeight() - 60) / 25;
@@ -161,6 +150,9 @@ void Menu::handleKeyboard(KeyboardButton key, bool pressed) {
             mCursor = 0;
     } else if (key == enterKey) {
         play();
+    } else if (key == dotKey) {
+        hiddenState = !hiddenState;
+        initialize(mapFolder->getPath());
     }
 
     if (mCursor > (mMin + items - 1)) {

src/OpenRaider.cpp

@@ -10,6 +10,7 @@
 
 #include "global.h"
 #include "Console.h"
+#include "Font.h"
 #include "Game.h"
 #include "Menu.h"
 #include "Render.h"

src/utils/Folder.cpp

@@ -54,7 +54,9 @@ Folder::Folder(std::string folder, bool listDotFiles) {
         pos = path.find('\\');
     }
 
-    size_t last = path.rfind('/', path.length() - 2);
+    size_t last = 0;
+    if (path.length() > 1)
+        last = path.rfind('/', path.length() - 2);
     name = path.substr(last + 1);
     if (name.back() == '/')
         name.erase(name.length() - 1);
@@ -100,7 +102,10 @@ Folder &Folder::getFolder(unsigned long i) {
 
 Folder Folder::getParent() {
     size_t last = path.rfind('/', path.length() - 2);
-    return Folder(path.substr(0, last), listDot);
+    std::string parent = path.substr(0, last);
+    if (parent.length() == 0)
+        parent = "/";
+    return Folder(parent, listDot);
 }
 
 void Folder::executeRemoveFiles(std::function<bool (File &f)> func) {
@@ -140,6 +145,9 @@ void Folder::createFolderItems() {
         }
     }
 
+    std::sort(foundFiles.begin(), foundFiles.end());
+    std::sort(foundFolders.begin(), foundFolders.end());
+
     for (unsigned long i = 0; i < foundFiles.size(); i++)
         files.emplace_back(File(foundFiles.at(i)));