Add --disable-texture-name-zero-padding flag for disable texture name…

… zero padding

README.md

@@ -44,7 +44,8 @@ option  | default | comment
 --texture-height | 256 | texture height
 --monochrome | | disable anti-aliasing
 --extra-info | | write extra information to data file
---max-texture-count | | maximum generated texture count (unlimited if not defined)
+--disable-texture-name-zero-padding | | disable texture name zero padding
+--max-texture-count | 0 | maximum generated texture count (unlimited if zero)
 
 ## Building Linux
 

src/App.cpp

@@ -120,8 +120,7 @@ std::vector<std::string> App::renderTextures(const Glyphs& glyphs, const Config&
 {
     std::vector<std::string> fileNames;
 
-    //TODO: should we decrement pageCount before calculate?
-    const auto pageNameDigits = getNumberLen(pageCount);
+    const auto pageNameDigits = config.disableTextureNameZeroPadding ? 0 : getNumberLen(pageCount - 1);
 
     for (std::uint32_t page = 0; page < pageCount; ++page)
     {

src/Config.h

@@ -67,6 +67,7 @@ struct Config
     std::uint32_t maxTextureCount = 0;
     bool monochrome = false;
     bool extraInfo = false;
+    bool disableTextureNameZeroPadding = false;
 
     void validate() const
     {

src/FontInfo.cpp

@@ -79,8 +79,6 @@ std::string FontInfo::getCharSetName(std::uint8_t charSet)
 
 void FontInfo::writeToXmlFile(const std::string &fileName) const
 {
-    testPages();
-
     tinyxml2::XMLDocument doc;
     tinyxml2::XMLDeclaration* declaration = doc.NewDeclaration("xml version=\"1.0\"");
     doc.InsertFirstChild(declaration);
@@ -178,8 +176,6 @@ void FontInfo::writeToXmlFile(const std::string &fileName) const
 
 void FontInfo::writeToTextFile(const std::string &fileName) const
 {
-    testPages();
-
     std::ofstream f(fileName);
 
     f << "info"
@@ -255,8 +251,6 @@ void FontInfo::writeToTextFile(const std::string &fileName) const
 
 void FontInfo::writeToBinFile(const std::string &fileName) const
 {
-    testPages();
-
     std::ofstream f(fileName, std::ios::binary);
 
 #pragma pack(push, 1)
@@ -487,16 +481,3 @@ void FontInfo::writeToJsonFile(const std::string &fileName) const
     std::ofstream f(fileName);
     f << j.dump(4);
 }
-
-void FontInfo::testPages() const
-{
-    if (!pages.empty())
-    {
-        size_t l = pages[0].length();
-        if (!l)
-            throw std::runtime_error("page name is empty");
-        for (size_t i = 1; i < pages.size(); ++i)
-            if (l != pages[i].length())
-                throw std::runtime_error("page names have different length");
-    }
-}

src/FontInfo.h

@@ -86,6 +86,5 @@ struct FontInfo
     void writeToJsonFile(const std::string &fileName) const;
 
 private:
-    void testPages() const;
     static std::string getCharSetName(std::uint8_t charSet);
 };

src/ProgramOptions.cpp

@@ -61,6 +61,7 @@ Config ProgramOptions::parseCommandLine(int argc, char* argv[])
             ("include-kerning-pairs", "include kerning pairs to output file", cxxopts::value<bool>(config.includeKerningPairs))
             ("monochrome", "disable antialiasing", cxxopts::value<bool>(config.monochrome))
             ("extra-info", "write extra information to data file", cxxopts::value<bool>(config.extraInfo))
+            ("disable-texture-name-zero-padding", "disable texture name zero padding", cxxopts::value<bool>(config.disableTextureNameZeroPadding))
             ("max-texture-count", "maximum generated textures", cxxopts::value<std::uint32_t>(config.maxTextureCount)->default_value("0"));
 
         auto result = options.parse(argc, argv);