Merge remote-tracking branch 'upstream/master' into scripting

Author: vieiraa

CMakeLists.txt

@@ -87,7 +87,6 @@ add_subdirectory(apps/celview)
 add_subdirectory(apps/mpqtool)
 add_subdirectory(apps/exedump)
 add_subdirectory(apps/launcher)
-add_subdirectory(apps/fontgenerator)
 add_subdirectory(test)
 
 if(MSVC)

apps/celview/main.cpp

@@ -1,8 +1,10 @@
 #include "../components/settings/settings.h"
+#include <cel/celfile.h>
 #include <chrono>
 #include <faio/fafileobject.h>
 #include <fmt/format.h>
 #include <input/inputmanager.h>
+#include <misc/stringops.h>
 #include <nfd.h>
 #include <nuklearmisc/inputfwd.h>
 #include <nuklearmisc/standaloneguispritehandler.h>
@@ -16,7 +18,9 @@ int main(int argc, char** argv)
     if (argc > 2)
         message_and_abort_fmt("Usage: %s [filename]", argv[0]);
 
-    Render::RenderSettings renderSettings;
+    Cel::CelDecoder::loadConfigFiles();
+
+    Render::RenderSettings renderSettings = {};
     renderSettings.windowWidth = 800;
     renderSettings.windowHeight = 600;
     renderSettings.fullscreen = false;
@@ -29,12 +33,12 @@ int main(int argc, char** argv)
     settings.loadFromFile(Misc::getResourcesPath().str() + "/celview.ini");
 
     bool faioInitDone = false;
-    std::string listFile = settings.get<std::string>("celview", "listFile", "Diablo I.txt");
-    std::string mpqFile = settings.get<std::string>("celview", "mpqFile", "DIABDAT.MPQ");
+    auto listFile = settings.get<std::string>("celview", "listFile", "Diablo I.txt");
+    auto mpqFile = settings.get<std::string>("celview", "mpqFile", "DIABDAT.MPQ");
 
     std::vector<std::string> celFiles;
 
-    std::string selectedImage = "";
+    std::string selectedImage;
     std::unique_ptr<NuklearMisc::GuiSprite> image;
 
     std::unique_ptr<NuklearMisc::GuiSprite> nextImage;
@@ -67,7 +71,7 @@ int main(int argc, char** argv)
 
                 std::string label = selectedImage;
 
-                if (selectedImage == "")
+                if (selectedImage.empty())
                     label = "No image selected";
 
                 nk_label(ctx, label.c_str(), NK_TEXT_CENTERED);
@@ -76,31 +80,53 @@ int main(int argc, char** argv)
 
                 if (image)
                 {
-                    nk_label(ctx, fmt::format("Number of Frames: {}", image.get()->getSprite()->size()).c_str(), NK_TEXT_LEFT);
-                    nk_label(ctx, fmt::format("Width: {}", image->getSprite()->getWidth()).c_str(), NK_TEXT_LEFT);
-                    nk_label(ctx, fmt::format("Height: {}", image->getSprite()->getHeight()).c_str(), NK_TEXT_LEFT);
-                    frame = nk_propertyi(ctx, "Frame", 0, frame, image->getSprite()->size(), 1, 0.2f);
+                    nk_label(ctx, fmt::format("Number of Frames: {}", image->size()).c_str(), NK_TEXT_LEFT);
+                    nk_label(ctx, fmt::format("Width: {}", image->getNkImage(frame).w).c_str(), NK_TEXT_LEFT);
+                    nk_label(ctx, fmt::format("Height: {}", image->getNkImage(frame).h).c_str(), NK_TEXT_LEFT);
+                    frame = nk_propertyi(ctx, "Frame", 0, frame, image->size(), 1, 0.2f);
 
                     if (nk_button_label(ctx, "save as png"))
                     {
-                        nfdchar_t* outPath = NULL;
-                        nfdresult_t result = NFD_SaveDialog("png", NULL, &outPath);
+                        nfdchar_t* outPath = nullptr;
+                        nfdresult_t result = NFD_SaveDialog("png", nullptr, &outPath);
                         if (result == NFD_OKAY)
                         {
-                            Render::SpriteGroup::toPng(selectedImage, outPath);
-                            free(outPath);
+                            Cel::CelFile cel(selectedImage);
+                            std::vector<Image> images = cel.decode();
+
+                            int32_t sumWidth = 0;
+                            int32_t maxHeight = 0;
+                            for (int32_t i = 0; i < int32_t(images.size()); i++)
+                            {
+                                sumWidth += images[i].width();
+                                if (images[i].height() > maxHeight)
+                                    maxHeight = images[i].height();
+                            }
+
+                            Image tmp(sumWidth, maxHeight);
+
+                            int32_t x = 0;
+                            for (int32_t i = 0; i < int32_t(images.size()); i++)
+                            {
+                                images[i].blitTo(tmp, x, 0);
+                                x += images[i].width();
+                            }
+
+                            Image::saveToPng(tmp, outPath);
                         }
+                        free(outPath);
                     }
 
                     if (nk_button_label(ctx, "save as gif"))
                     {
-                        nfdchar_t* outPath = NULL;
-                        nfdresult_t result = NFD_SaveDialog("gif", NULL, &outPath);
+                        nfdchar_t* outPath = nullptr;
+                        nfdresult_t result = NFD_SaveDialog("gif", nullptr, &outPath);
                         if (result == NFD_OKAY)
                         {
-                            Render::SpriteGroup::toGif(selectedImage, outPath);
-                            free(outPath);
+                            Cel::CelDecoder cel(selectedImage);
+                            Image::saveToGif(cel.decode(), outPath);
                         }
+                        free(outPath);
                     }
 
                     auto msSinceLastFrame = std::chrono::duration_cast<std::chrono::milliseconds>(now - lastFrame).count();
@@ -110,25 +136,23 @@ int main(int argc, char** argv)
                         frame++;
                     }
 
-                    if (frame >= (int32_t)image.get()->getSprite()->size())
+                    if (frame >= (int32_t)image->size())
                         frame = 0;
 
-                    Render::Sprite sprite = image.get()->getSprite()->operator[](frame);
-
-                    int32_t w, h;
-                    Render::spriteSize(sprite, w, h);
+                    int32_t w = image->getNkImage(frame).w;
+                    int32_t h = image->getNkImage(frame).h;
 
                     nk_layout_space_begin(ctx, NK_STATIC, h, 1);
                     {
                         nk_layout_space_push(ctx, nk_rect(0, 0, w, h));
 
                         auto canvas = nk_window_get_canvas(ctx);
 
-                        struct nk_rect imageRect;
+                        struct nk_rect imageRect = {};
                         nk_widget(&imageRect, ctx);
                         nk_fill_rect(canvas, imageRect, 0.0, nk_rgb(0, 255, 0));
 
-                        auto img = image.get()->getNkImage(frame);
+                        auto img = image->getNkImage(frame);
                         nk_draw_image(canvas, imageRect, &img, nk_rgb(255, 255, 255));
                     }
                     nk_layout_space_end(ctx);
@@ -153,7 +177,9 @@ int main(int argc, char** argv)
                         auto tmp = FAIO::listMpqFiles("*.cl2");
                         celFiles.insert(celFiles.end(), tmp.begin(), tmp.end());
 
-                        std::sort(celFiles.begin(), celFiles.end());
+                        std::sort(celFiles.begin(), celFiles.end(), [](const std::string& l, const std::string& r) {
+                            return Misc::StringUtils::toLower(l) < Misc::StringUtils::toLower(r);
+                        });
 
                         settings.set<std::string>("celview", "listFile", listFile);
                         settings.set<std::string>("celview", "mpqFile", mpqFile);
@@ -165,25 +191,29 @@ int main(int argc, char** argv)
                         {
                             selectedImage = argv[1];
                             frame = 0;
-                            nextImage = std::unique_ptr<NuklearMisc::GuiSprite>(guiHandler.getSprite(new Render::SpriteGroup(selectedImage, false)));
+
+                            Cel::CelFile cel(selectedImage);
+                            nextImage = std::make_unique<NuklearMisc::GuiSprite>(cel.decode());
                         }
                     }
                 }
 
                 nk_layout_row_dynamic(ctx, rowHeight, 1);
 
-                for (size_t i = 0; i < celFiles.size(); i++)
+                for (auto& celFile : celFiles)
                 {
                     auto buttonStyle = ctx->style.button;
 
-                    if (selectedImage == celFiles[i])
+                    if (selectedImage == celFile)
                         buttonStyle.normal = buttonStyle.hover;
 
-                    if (nk_button_label_styled(ctx, &buttonStyle, celFiles[i].c_str()))
+                    if (nk_button_label_styled(ctx, &buttonStyle, celFile.c_str()))
                     {
-                        selectedImage = celFiles[i];
+                        selectedImage = celFile;
                         frame = 0;
-                        nextImage = std::unique_ptr<NuklearMisc::GuiSprite>(guiHandler.getSprite(new Render::SpriteGroup(selectedImage, false)));
+
+                        Cel::CelFile cel(selectedImage);
+                        nextImage = std::make_unique<NuklearMisc::GuiSprite>(cel.decode());
                     }
                 }
 

apps/fontgenerator/CMakeLists.txt

@@ -10,14 +10,14 @@ add_library(freeablo_lib # split into a library so I can link to it from tests
 
     farender/renderer.cpp
     farender/renderer.h
-    farender/spritecache.cpp
-    farender/spritecache.h
-    farender/spritemanager.cpp
-    farender/spritemanager.h
     farender/animationplayer.cpp
     farender/animationplayer.h
     farender/fontinfo.cpp
     farender/fontinfo.h
+    farender/spriteloader.cpp
+    farender/spriteloader.h
+    farender/spritegroup.cpp
+    farender/spritegroup.h
 
     faworld/actor/basestate.cpp
     faworld/actor/basestate.h
@@ -165,8 +165,7 @@ add_library(freeablo_lib # split into a library so I can link to it from tests
     fasavegame/objectidmapper.h
     fasavegame/objectidmapper.cpp
     fasavegame/gameloader.h
-    fasavegame/gameloader.cpp
-)
+    fasavegame/gameloader.cpp farender/levelrenderer.cpp farender/levelrenderer.h)
 
 target_link_libraries(freeablo_lib PUBLIC NuklearMisc Render Audio Serial Input Random Image enet cxxopts fmt::fmt Script)
 target_include_directories(freeablo_lib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})