WIP - Put all textures into an atlas, render whole level in one batch

.clang-format

@@ -58,7 +58,9 @@ AlignAfterOpenBracket: Align
 DerivePointerAlignment: false
 PointerAlignment: Left
 
-# WISHLIST: for all the below, and "allow" option, instead of just true or false
+FixNamespaceComments: false
+
+# WISHLIST: for all the below, an "allow" option, instead of just true or false
 # This would preserve alignment if it's already aligned, but not force it if it
 # wasn't. Without that option, the amount of false positives make these useless
 #AlignConsecutiveAssignments

.travis.yml

@@ -5,16 +5,14 @@ branches:
   - master
 
 sudo: false
-dist: trusty
+dist: bionic
 
-cache:
-  directories:
-  - $HOME/.hunter
-
 addons:
   apt:
     packages:
       - python3-pip
+      - libgl1-mesa-dev
+      - clang-format-7
 
 matrix:
   include:
@@ -23,6 +21,7 @@ matrix:
     - os: linux
       env: JOB=clang-format
     - os: osx
+      osx_image: xcode11.3 # macos 10.14 + xcode 11.3
       env: JOB=build
 
 script: ./travis.sh
@@ -36,6 +35,3 @@ notifications:
   email:
     on_success: change
     on_failure: always
-env:
-  global:
-    secure: b9143BbjFmQvaxruDHiUy1sW4InyZGejs4S/xgb4W1fFTzea9EMpzjWgwospBI3NPpe6xadctdypL9UbzJMXfD0PAZ39FbMIgl56pFkoZv1G9vwLOjG6ka0wXT7Pr6yP2FHkIdrQWECvvc1shTFXU9Yeystl0ISPwgphWUlwFZU=

CMakeLists.txt

@@ -1,109 +1,46 @@
-cmake_minimum_required (VERSION 3.8)
-
-set(
-    HUNTER_CACHE_SERVERS
-    "https://github.com/wheybags/hunter-cache"
-    CACHE
-    STRING
-    "Default cache server"
-)
-
-set(
-    HUNTER_PASSWORDS_PATH
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Hunter/passwords.cmake"
-    CACHE
-    FILEPATH
-    "Hunter passwords"
-)
-
-string(COMPARE EQUAL "$ENV{GITHUB_USER_PASSWORD}" "" password_is_empty)
-
-if (NOT password_is_empty)
-    option(HUNTER_RUN_UPLOAD "Upload cache binaries" ON)
-endif()
+cmake_minimum_required (VERSION 3.11)
 
 ## Windows Config ##
 if (WIN32)
-    set (CMAKE_SYSTEM_VERSION 8.1 CACHE TYPE INTERNAL FORCE)
+    set (CMAKE_SYSTEM_VERSION 8.1 CACHE STRING INTERNAL FORCE)
 
-    set(desired_generator "Visual Studio 14 2015 Win64")
+    set(desired_generators "Visual Studio 16 2019")
 
-    string(COMPARE EQUAL "${CMAKE_GENERATOR}" "${desired_generator}" generator_is_correct)
-    if (NOT generator_is_correct)
-        message(FATAL_ERROR "Incorrect generator, please run cmake with: -G \"${desired_generator}\"")
+    if (NOT "${CMAKE_GENERATOR}" IN_LIST desired_generators)
+        message(FATAL_ERROR "Incorrect generator, please run cmake with: -G GENERATOR, where GENERATOR is one of: ${desired_generators}")
     endif()
-
-    set(HUNTER_CMAKE_GENERATOR "${desired_generator}")
 endif()
 
-
-# cmake policies
-IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.11)
-	cmake_policy(SET CMP0074 NEW) # find_library calls use $LIB_ROOT variables. Shouldn't affect us much/at all, but silences warnings
-ENDIF()
-
-include("cmake/HunterGate.cmake")
-HunterGate(
-    URL "https://github.com/ruslo/hunter/archive/v0.20.64.tar.gz"
-    SHA1 "7b830dfda7a094b2af15f44b24ebd2489404d880"
-    LOCAL
-)
-
 project (Freeablo)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
-
-hunter_add_package(SDL2)
-find_Package(SDL2 CONFIG REQUIRED)
-
-hunter_add_package(SDL_image)
-find_package(SDL_image CONFIG REQUIRED)
-
-hunter_add_package(SDL_mixer)
-find_package(SDL_mixer CONFIG REQUIRED)
-
-hunter_add_package(PNG)
-find_package(PNG CONFIG REQUIRED)
-
-hunter_add_package(enet)
-find_package(enet CONFIG REQUIRED)
-
-hunter_add_package(ZLIB)
-find_package(ZLIB CONFIG REQUIRED)
-
-hunter_add_package(stormlib)
-find_package(stormlib CONFIG REQUIRED)
-
-hunter_add_package(Boost COMPONENTS filesystem system program_options date_time regex)
-find_package(Boost CONFIG REQUIRED  filesystem system program_options date_time regex)
-set(HUNTER_BOOST_LIBS Boost::filesystem Boost::system Boost::program_options Boost::date_time Boost::regex)
-
+set(OpenGL_GL_PREFERENCE LEGACY)
 Find_Package(OpenGL REQUIRED)
 
 set(FA_COMPILER_FLAGS "")
 
-# Use C++11
-if (CMAKE_VERSION VERSION_LESS "3.1")
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
-    endif ()
-else ()
-    set (CMAKE_CXX_STANDARD 11)
-endif ()
+set (CMAKE_CXX_STANDARD 17)
+
 if(WIN32)
 	add_definitions(-DNOMINMAX) # http://stackoverflow.com/questions/5004858/stdmin-gives-error
 endif()
 
 option (FA_TREAT_WARNINGS_AS_ERRORS "Treat warnings as errors")
 
-if(UNIX)
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     set(FA_COMPILER_FLAGS "${FA_COMPILER_FLAGS} -Wall -pedantic -Wextra -Wno-unknown-pragmas -Wno-missing-braces")
     SET(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ")
     if (FA_TREAT_WARNINGS_AS_ERRORS)
         set(FA_COMPILER_FLAGS "${FA_COMPILER_FLAGS} -Werror")
     endif()
 endif()
 
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+    SET(GCC_LINKER_FLAGS "-static-libstdc++ -static-libgcc")
+
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_LINKER_FLAGS}")
+    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GCC_LINKER_FLAGS}")
+endif()
+
 if(MSVC)
     set(FA_COMPILER_FLAGS "${FA_COMPILER_FLAGS} /MP /W4 /D_CRT_SECURE_NO_WARNINGS /wd4244 /wd4100 /wd4611 /wd4458 /wd4459 /wd4127 /wd4800 /wd4267 /wd4172")
     # 4244 - e.g. 'argument': conversion from 'const long double' to 'double' -- boost headers
@@ -158,3 +95,8 @@ if(MSVC)
     set_property(TARGET launcher PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
     set_property(TARGET unit_tests PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
 endif()
+
+install(DIRECTORY resources/ DESTINATION resources
+        PATTERN "settings-user.ini" EXCLUDE)
+
+install(FILES changelog.md DESTINATION .)

apps/celview/CMakeLists.txt

@@ -2,10 +2,10 @@ add_executable(celview
     main.cpp
 )
 
-target_link_libraries(celview NuklearMisc)
+target_link_libraries(celview NuklearMisc SDL2main fmt::fmt)
 if (MINGW)
-target_link_libraries(celview -lmingw32 SDL2::SDL2main)
-else ()
-target_link_libraries(celview SDL2::SDL2main)
+    target_link_libraries(celview -lmingw32)
 endif ()
 set_target_properties(celview PROPERTIES COMPILE_FLAGS "${FA_COMPILER_FLAGS}")
+
+install(TARGETS celview DESTINATION bin)

apps/celview/main.cpp

@@ -1,19 +1,21 @@
-//#include "mainwindow.h"
-//#include <QApplication>
-
 #include "../components/settings/settings.h"
-#include <boost/format.hpp>
 #include <chrono>
 #include <faio/fafileobject.h>
+#include <fmt/format.h>
 #include <input/inputmanager.h>
 #include <nfd.h>
 #include <nuklearmisc/inputfwd.h>
 #include <nuklearmisc/standaloneguispritehandler.h>
 #include <nuklearmisc/widgets.h>
 #include <render/render.h>
 
-int main(int, char**)
+int main(int argc, char** argv)
 {
+    Misc::saveArgv0(argv[0]);
+
+    if (argc > 2)
+        message_and_abort_fmt("Usage: %s [filename]", argv[0]);
+
     Render::RenderSettings renderSettings;
     renderSettings.windowWidth = 800;
     renderSettings.windowHeight = 600;
@@ -24,7 +26,7 @@ int main(int, char**)
     nk_context* ctx = guiHandler.getNuklearContext();
 
     Settings::Settings settings;
-    settings.loadFromFile("resources/celview.ini");
+    settings.loadFromFile(Misc::getResourcesPath().str() + "/celview.ini");
 
     bool faioInitDone = false;
     std::string listFile = settings.get<std::string>("celview", "listFile", "Diablo I.txt");
@@ -74,9 +76,9 @@ int main(int, char**)
 
                 if (image)
                 {
-                    nk_label(ctx, (boost::format("Number of Frames: %1%") % image.get()->getSprite()->size()).str().c_str(), NK_TEXT_LEFT);
-                    nk_label(ctx, (boost::format("Width: %1%") % image->getSprite()->getWidth()).str().c_str(), NK_TEXT_LEFT);
-                    nk_label(ctx, (boost::format("Height: %1%") % image->getSprite()->getHeight()).str().c_str(), NK_TEXT_LEFT);
+                    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);
 
                     if (nk_button_label(ctx, "save as png"))
@@ -158,6 +160,13 @@ int main(int, char**)
                         settings.save();
 
                         faioInitDone = true;
+
+                        if (argc > 1)
+                        {
+                            selectedImage = argv[1];
+                            frame = 0;
+                            nextImage = std::unique_ptr<NuklearMisc::GuiSprite>(guiHandler.getSprite(new Render::SpriteGroup(selectedImage)));
+                        }
                     }
                 }
 

apps/exedump/main.cpp

@@ -1,12 +1,13 @@
-#include <diabloexe/diabloexe.h>
-
-#include <iostream>
-
 #include "settings/settings.h"
+#include <diabloexe/diabloexe.h>
 #include <faio/fafileobject.h>
+#include <iostream>
+#include <misc/misc.h>
 
-int main(int, char**)
+int main(int, char** argv)
 {
+    Misc::saveArgv0(argv[0]);
+
     Settings::Settings settings;
     settings.loadUserSettings();
 

apps/fontgenerator/main.cpp

@@ -7,6 +7,7 @@
 #include <faio/fafileobject.h>
 #include <iostream>
 #include <vector>
+#include <algorithm>
 
 void help(char** argv)
 {
@@ -16,6 +17,8 @@ void help(char** argv)
 
 int main(int argc, char** argv)
 {
+    Misc::saveArgv0(argv[0]);
+
     if (argc < 2)
     {
         help(argv);