Finished comicfans mod example

mods/assets/examples/ComicFansFont/meta.json

@@ -1,6 +1,5 @@
 {
     "name": "Comic Fans Font",
-    "author" : "Example",
-    "revision": 3,
-    "description": "Font that was made by damieng. See: https://damieng.com/typography/zx-origins/comic-fans/"
+    "authors" : ["Example", "Damien Guard"],
+    "description": "A fun 8x8 font that was created by Damien Guard. See: https://damieng.com/typography/zx-origins/comic-fans/"
 }

mods/assets/examples/ComicFansFont/textures/2d/font/comicfans/comicfans.json

@@ -1,8 +1,8 @@
 {
     "compressed": true,
     "flags": {
-        "wrap-s": "Wrap",
-        "wrap-t": "Wrap"
+        "wrap-s": "CLAMP",
+        "wrap-t": "CLAMP"
     },
     "format": "IA4",
     "images": [

tools/dkr_assets_tool_src/builder/buildTypes/buildFonts.cpp

@@ -10,7 +10,7 @@ BuildFonts::BuildFonts(DkrAssetsSettings &settings, BuildInfo &info) : _settings
     
     // "rawDataSize" is the size of the FontData structure with the correct number of fonts.
     // Have to do this, since the number of fonts is dynamic.
-    size_t rawDataSize = FileHelper::align16(4 + numberOfFonts * sizeof(FontFile));
+    size_t rawDataSize = FileHelper::align16(sizeof(be_uint32_t) + (numberOfFonts * sizeof(FontFile)));
     uint8_t *rawData = new uint8_t[rawDataSize];
     std::memset(rawData, 0, rawDataSize); // zero out rawData bytes.
     
@@ -56,9 +56,16 @@ BuildFonts::BuildFonts(DkrAssetsSettings &settings, BuildInfo &info) : _settings
             
             int fontTextureIndex = AssetsHelper::get_asset_index(settings, "ASSET_TEXTURES_2D", texBuildId);
             
+            DebugHelper::info(texBuildId, " = ", fontTextureIndex);
+            
             outFontFile->textureIndices[texIndex] = fontTextureIndex;
         }
         
+        // Fills in the rest with nulls
+        for(size_t texIndex = numTextures; texIndex < FONTS_NUMBER_OF_TEXTURE_INDICES; texIndex++) {
+            outFontFile->textureIndices[texIndex] = -1;
+        }
+        
         // Assume ASCII by default.
         std::string encodingType = fontJson->get_string("/encoding/type", "ASCII");
         

tools/dkr_assets_tool_src/builder/buildTypes/buildTexture.cpp

@@ -69,6 +69,8 @@ BuildTexture::BuildTexture(DkrAssetsSettings &settings, BuildInfo &info) : _sett
         header->width = imgWidth;
         header->height = imgHeight;
         
+        // TODO: Check if width and/or height is greater than 255, and error if it is!
+        
         if(writeSize) {
             header->textureSize = DataHelper::align16(sizeof(TextureHeader) + ImageHelper::image_size(imgWidth, imgHeight, format));
         } else {

tools/dkr_assets_tool_src/helpers/fileHelper.cpp

@@ -305,6 +305,12 @@ fs::path FileHelper::get_directory(const fs::path &path) {
     return path.parent_path();
 }
 
+void FileHelper::delete_directory(const fs::path &path) {
+    if(fs::exists(path)) {
+        fs::remove_all(path);
+    }
+}
+
 void FileHelper::rename(const fs::path &oldPath, const fs::path &newPath) {
     fs::rename(oldPath, newPath);
 }

tools/dkr_assets_tool_src/helpers/fileHelper.h

@@ -46,6 +46,8 @@ public:
     
     static fs::path get_directory(const fs::path &path);
     
+    static void delete_directory(const fs::path &path);
+    
     static void rename(const fs::path &oldPath, const fs::path &newPath);
     static void copy(const fs::path &oldPath, const fs::path &newPath, bool recursive = false);
     

tools/dkr_assets_tool_src/prebuild/compileAssets/compile.cpp

@@ -127,8 +127,10 @@ void CompileAssets::_compile_assets() {
     
     _statFile->set_value<int>("/last-order-size", _modOrderCount);
     
-    // First copy the vanilla path to the out path.
-    // This seems to be the slowest part, mainly limited by IO speed (copying thousands of small files).
+    // First clear the output directory (if it exists)
+    FileHelper::delete_directory(_outAssetsPath);
+    
+    // Copy all the vanilla files over to the output directory
     FileHelper::copy(_vanillaAssetsPath, _outAssetsPath, true);
     
     if(_modOrderCount == 0) {