GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

get rid of vcpkg and build freetype from sources

Browse Source
This commit is contained in:
ohyzha
2024-08-07 15:22:50 +03:00
parent c3d4ba84e0
commit 50bb6b62fe
4 changed files with 117 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
3rdParty/msdf/CMakeLists.txt vendored
View File

@@ -1,4 +1,3 @@
if(WIN32 OR UNIX OR APPLE OR IOS)
include(FetchContent)
if(NOT DEFINED MSDFGEN_REPO)
@@ -9,45 +8,47 @@ if(WIN32 OR UNIX OR APPLE OR IOS)
set(MSDFGEN_ATRLAS_REPO https://github.com/Chlumsky/msdf-atlas-gen.git)
endif()
if(NOT DEFINED VCPKG_REPO)
set(VCPKG_REPO https://github.com/microsoft/vcpkg.git)
if(NOT DEFINED FREETYPE_REPO)
set(FREETYPE_REPO https://github.com/freetype/freetype.git)
endif()
set(VCPKG_SRC_DIR "${CMAKE_BINARY_DIR}/_deps/vcpkg-src" CACHE INTERNAL "vcpkg source dir")
if (NOT EXISTS ${VCPKG_SRC_DIR} OR VCPKG_EXECUTABLE STREQUAL "" OR NOT DEFINED VCPKG_EXECUTABLE)
message("Cloning vcpkg...")
unset(Freetype_FOUND)
find_package(Freetype QUIET)
if (NOT Freetype_FOUND OR NOT EXISTS "${CMAKE_BINARY_DIR}/_deps/freetype-src/build")
message("Installing freetype from sources")
FetchContent_Declare(
vcpkg
freetype
EXCLUDE_FROM_ALL
GIT_REPOSITORY ${VCPKG_REPO}
GIT_REPOSITORY ${FREETYPE_REPO}
GIT_TAG master
GIT_SHALLOW TRUE
)
FetchContent_MakeAvailable(vcpkg)
if (WIN32)
execute_process(COMMAND "${VCPKG_SRC_DIR}/bootstrap-vcpkg.bat")
set(VCPKG_EXECUTABLE "${VCPKG_SRC_DIR}/vcpkg.exe" CACHE INTERNAL "vcpkg executable")
else()
execute_process(COMMAND bash "${VCPKG_SRC_DIR}/bootstrap-vcpkg.sh")
set(VCPKG_EXECUTABLE "${VCPKG_SRC_DIR}/vcpkg" CACHE INTERNAL "vcpkg executable")
endif()
endif()
set(FT_DISABLE_ZLIB ON CACHE BOOL "" FORCE)
set(FT_DISABLE_BZIP2 ON CACHE BOOL "" FORCE)
set(FT_DISABLE_PNG ON CACHE BOOL "" FORCE)
set(FT_DISABLE_HARFBUZZ ON CACHE BOOL "" FORCE)
set(FT_DISABLE_BROTLI ON CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(freetype)
if (WIN32)
set(TRIPLET x64-windows-static-md-release CACHE INTERNAL "triplet")
elseif(UNIX AND NOT APPLE)
set(TRIPLET x64-linux CACHE INTERNAL "triplet")
elseif(APPLE AND NOT IOS)
set(TRIPLET arm64-osx CACHE INTERNAL "triplet")
elseif(IOS)
set(TRIPLET arm64-ios CACHE INTERNAL "triplet")
set(FT_SRC_DIR "${CMAKE_BINARY_DIR}/_deps/freetype-src")
set(FT_BUILD_DIR "${FT_SRC_DIR}/build")
file(MAKE_DIRECTORY ${FT_BUILD_DIR})
execute_process(
COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${TOOLCHAIN_FILE} -S ${FT_SRC_DIR} -B ${FT_BUILD_DIR}
-DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=${FT_SRC_DIR}/freetype-install
WORKING_DIRECTORY ${FT_BUILD_DIR}
)
execute_process(
COMMAND ${CMAKE_COMMAND} --build ${FT_BUILD_DIR} --config Release --target install
WORKING_DIRECTORY ${FT_BUILD_DIR} RESULT_VARIABLE build_result
)
if (NOT ${build_result} EQUAL "0")
message(FATAL_ERROR "Failed to build freetype!")
endif()
set(FREETYPE_INCLUDE_DIR "${FT_SRC_DIR}/freetype-install/include/freetype2" CACHE INTERNAL "ft include dir")
set(FREETYPE_BUILT_FROM_SOURCES ON CACHE BOOL "ft built from sources")
list(APPEND CMAKE_PREFIX_PATH "${FT_SRC_DIR}/freetype-install")
endif()
execute_process(COMMAND ${VCPKG_EXECUTABLE} install freetype:${TRIPLET} libpng:${TRIPLET})
set(CMAKE_TOOLCHAIN_FILE "${CMAKE_BINARY_DIR}/_deps/vcpkg-src/scripts/buildsystems/vcpkg.cmake" CACHE STRING "cmake toolchain")
include("${VCPKG_SRC_DIR}/scripts/buildsystems/vcpkg.cmake")
list(APPEND CMAKE_PREFIX_PATH "${VCPKG_SRC_DIR}/installed/${TRIPLET}/lib")
list(APPEND CMAKE_PREFIX_PATH "${VCPKG_SRC_DIR}/installed/${TRIPLET}/include")
set(MSDFGEN_DISABLE_SVG TRUE CACHE INTERNAL "disable msdfgen svg")
set(MSDFGEN_USE_SKIA OFF CACHE BOOL "use skia" FORCE)
@@ -55,6 +56,9 @@ if(WIN32 OR UNIX OR APPLE OR IOS)
set(MSDF_ATLAS_MSDFGEN_EXTERNAL ON CACHE BOOL "do not build msdfgen submodule" FORCE)
set(MSDFGEN_DYNAMIC_RUNTIME ON CACHE BOOL "msvc dynamic runtime" FORCE)
set(MSDF_ATLAS_DYNAMIC_RUNTIME ON CACHE BOOL "msvc dynamic runtime" FORCE)
set(MSDFGEN_DISABLE_PNG ON CACHE BOOL "disable png" FORCE)
set(MSDFGEN_USE_VCPKG OFF CACHE BOOL "do not use vcpkg" FORCE)
set(MSDF_ATLAS_USE_VCPKG OFF CACHE BOOL "do not use vcpkg" FORCE)
FetchContent_Declare(
msdfgen
@@ -73,27 +77,12 @@ if(WIN32 OR UNIX OR APPLE OR IOS)
GIT_SHALLOW TRUE
)
FetchContent_MakeAvailable(msdfgen_atlas)
endif()
function(LinkMsdf TARGET)
if (WIN32 OR UNIX OR APPLE OR IOS)
target_link_libraries(${TARGET} PRIVATE msdfgen::msdfgen msdfgen::msdfgen-ext msdf-atlas-gen)
if(WIN32)
set(STATIC_LIB_EXT "lib")
set(freetype_lib_name "freetype")
if (FREETYPE_BUILT_FROM_SOURCES)
target_include_directories(${TARGET} PUBLIC ${FREETYPE_INCLUDE_DIR})
else()
set(STATIC_LIB_EXT "a")
set(freetype_lib_name "libfreetype")
endif()
target_include_directories(${TARGET} PUBLIC "${VCPKG_SRC_DIR}/installed/${TRIPLET}/include")
# link freetype first to fix linkage issues on linux
target_link_libraries(${TARGET} PUBLIC "${VCPKG_SRC_DIR}/installed/${TRIPLET}/lib/${freetype_lib_name}.${STATIC_LIB_EXT}")
file(GLOB installed_libs "${VCPKG_SRC_DIR}/installed/${TRIPLET}/lib/*.${STATIC_LIB_EXT}")
foreach(lib ${installed_libs})
get_filename_component(libname ${lib} NAME_WE)
if (NOT ${libname} STREQUAL ${freetype_lib_name})
target_link_libraries(${TARGET} PUBLIC ${lib})
endif()
endforeach()
target_include_directories(${TARGET} PUBLIC ${FREETYPE_INCLUDE_DIRS})
endif()
endfunction()

1
examples/ExampleApps/TextExampleApp.cpp
View File

@@ -75,7 +75,6 @@ namespace OpenVulkano
// charset.add(c);
//}
m_atlasGenerator.GenerateAtlas(fontPath, charset);
m_atlasGenerator.SaveAtlasMetadataInfo("atlas_metadata", true);
#endif
for (int i = 0; i < texts.size(); i++)

30
openVulkanoCpp/Scene/FontAtlasGenerator.cpp
View File

@@ -4,12 +4,18 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
#if __has_include("msdfgen.h")
#include "FontAtlasGenerator.hpp"
#include "Base/Logger.hpp"
#include "Scene/AtlasMetadata.hpp"
#define STBI_MSC_SECURE_CRT
#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "stb_image_write.h"
#include <ft2build.h>
#include FT_FREETYPE_H
#include <fstream>
#include <filesystem>
namespace OpenVulkano::Scene
{
@@ -91,7 +97,7 @@ namespace OpenVulkano::Scene
return;
}
std::string fileName = outputFile;
uint32_t packedFlag = 0;
uint32_t packedFlag = packIntoSingleFile;
if (packIntoSingleFile)
{
size_t ext = outputFile.find_last_of('.');
@@ -103,8 +109,8 @@ namespace OpenVulkano::Scene
{
fileName.insert(ext - 1, "_packed");
}
savePng(m_generator.atlasStorage(), fileName.c_str());
packedFlag = 1;
const BitmapConstRef<byte, 1>& storage = m_generator.atlasStorage();
SavePng(m_generator.atlasStorage(), fileName, 1);
}
std::fstream fs(fileName.c_str(), std::ios_base::out | std::ios_base::binary | (packedFlag ? std::ios_base::app : std::ios_base::trunc));
fs.write(reinterpret_cast<const char*>(&m_meta), sizeof(AtlasMetadata));
@@ -208,9 +214,25 @@ namespace OpenVulkano::Scene
if (pngOutput && !pngOutput->empty())
{
savePng(m_generator.atlasStorage(), pngOutput->c_str());
SavePng(storage, pngOutput.value(), 1);
}
destroyFont(font);
deinitializeFreetype(ft);
}
void FontAtlasGenerator::SavePng(const BitmapConstRef<byte, 1>& storage, const std::string& output, int channels) const
{
stbi_flip_vertically_on_write(1);
if (std::filesystem::path(output).extension() == ".png")
{
stbi_write_png(output.c_str(), storage.width, storage.height, channels, storage.pixels,
channels * storage.width);
}
else
{
stbi_write_png((output + ".png").c_str(), storage.width, storage.height, channels, storage.pixels,
channels * storage.width);
}
}
}
#endif

8
openVulkanoCpp/Scene/FontAtlasGenerator.hpp
View File

@@ -6,6 +6,8 @@
#pragma once
#if __has_include("msdfgen.h")
#include <string>
#include <optional>
#include <map>
@@ -25,6 +27,7 @@ namespace OpenVulkano::Scene
class FontAtlasGenerator
{
public:
using SdfGenerator = ImmediateAtlasGenerator<float, 1, sdfGenerator, BitmapAtlasStorage<msdfgen::byte, 1>>;
static Charset LoadAllGlyphs(const std::variant<std::string, Array<char>>& data);
void GenerateAtlas(const std::string& fontFile, const Charset& charset = Charset::ASCII,
const std::optional<std::string>& pngOutput = std::nullopt);
@@ -34,13 +37,16 @@ namespace OpenVulkano::Scene
const Texture& GetAtlas() const { return m_atlasTex; }
std::map<uint32_t, GlyphInfo>& GetGlyphsInfo() { return m_symbols; }
AtlasMetadata& GetAtlasMetadata() { return m_meta; }
SdfGenerator& GetFontAtlsGenerator() { return m_generator; }
private:
void Generate(FreetypeHandle* ft, FontHandle* font, const Charset& chset,
const std::optional<std::string>& pngOutput);
void SavePng(const BitmapConstRef<byte, 1>& storage, const std::string& output, int channels) const;
private:
ImmediateAtlasGenerator<float, 1, sdfGenerator, BitmapAtlasStorage<msdfgen::byte, 1>> m_generator;
SdfGenerator m_generator;
Texture m_atlasTex;
AtlasMetadata m_meta;
std::map<uint32_t, GlyphInfo> m_symbols;
};
}
#endif