bart
/
network-experiment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: bart:feature/fontrender
Branches Tags
bart:master
bart:WIP-01
bart:feature/fontrender
...
pull from: bart:master
Branches Tags
bart:WIP-01
bart:master
bart:feature/fontrender

3 Commits
feature/fo ... master

Author SHA1 Message Date
Bart Beumer 23d74e35a1 Merge pull request 'Correct formatting of files.' (#2) from feature/clang-format into master 2025-08-16 20:31:17 +00:00
Bart Beumer 5cfaf9881d Correct formatting of files. 2025-08-16 20:28:50 +00:00
Bart Beumer 42561d5ace Merge pull request 'Add functionality to render TTF fonts. A small executable is provided to experiment with this.' (#1) from feature/fontrender into master 2025-08-16 19:43:43 +00:00
10 changed files with 88 additions and 104 deletions
Show Stats Expand all files Collapse all files

4
.devcontainer/Dockerfile
View File

@ -5,15 +5,15 @@ RUN apk update && \
apk add --no-cache \
autoconf \
bash \
boost-build \
build-base \
cmake \
clang \
clang-extra-tools \
gdb \
git \
libstdc++ \
libtool \
linux-headers \
ninja \
m4 \
perl \
python3 \

1
.devcontainer/devcontainer.json
View File

@ -3,7 +3,6 @@
"build": {
"dockerfile": "Dockerfile"
},
// Configure tool-specific properties.
"customizations": {
"vscode": {

29
bmrshared-freetype/include/bmrshared/freetype_face.hpp
View File

@ -7,21 +7,20 @@
//
#pragma once
#include <memory>
#include <functional>
#include <string>
#include <boost/gil/image.hpp>
#include <ft2build.h>
#include <functional>
#include <memory>
#include <string>
#include FT_FREETYPE_H
#include FT_BITMAP_H
namespace bmrshared
{
class freetype_lib;
class freetype_lib;
class freetype_face final : public std::enable_shared_from_this<freetype_face>
{
class freetype_face final : public std::enable_shared_from_this<freetype_face>
{
using character_index = FT_ULong;
using pixel_size = FT_UInt;
@ -30,22 +29,16 @@ namespace bmrshared
const std::string& font_path,
pixel_size pixel_width,
pixel_size pixel_height,
bool render_monochrome
);
bool render_monochrome);
~freetype_face();
FT_BBox get_boundbox() const;
FT_Glyph_Metrics get_dimensions(character_index character_index) const;
void render(
character_index character_index,
std::function<void(int x,
int y,
const uint8_t level
)> painter);
void render(character_index character_index, std::function<void(int x, int y, const uint8_t level)> painter);
private:
private:
FT_Int32 get_load_flags() const;
FT_Render_Mode get_render_mode() const;
@ -53,5 +46,5 @@ private:
std::shared_ptr<freetype_lib> m_lib;
FT_Face m_face;
bool m_renderMonochrome;
};
}
};
} // namespace bmrshared

10
bmrshared-freetype/include/bmrshared/freetype_lib.hpp
View File

@ -6,14 +6,14 @@
// the Free Software Foundation.
//
#pragma once
#include <memory>
#include <ft2build.h>
#include <memory>
#include FT_FREETYPE_H
namespace bmrshared
{
class freetype_lib final : public std::enable_shared_from_this<freetype_lib>
{
class freetype_lib final : public std::enable_shared_from_this<freetype_lib>
{
public:
freetype_lib();
~freetype_lib();
@ -22,5 +22,5 @@ namespace bmrshared
private:
FT_Library m_library;
};
}
};
} // namespace bmrshared

14
bmrshared-freetype/include/bmrshared/freetype_utils.hpp
View File

@ -11,13 +11,15 @@
namespace bmrshared
{
struct dimensions final
{
struct dimensions final
{
FT_Pos width;
FT_Pos height;
FT_Pos vertOriginOffsetY;
};
};
dimensions freetype_calculate_dimensions(freetype_face& face, std::string_view text);
void freetype_paint(freetype_face& face, std::string_view text, const std::function<void(int x, int y, uint8_t level)>& paintfn);
}
dimensions freetype_calculate_dimensions(freetype_face& face, std::string_view text);
void freetype_paint(freetype_face& face,
std::string_view text,
const std::function<void(int x, int y, uint8_t level)>& paintfn);
} // namespace bmrshared

32
bmrshared-freetype/lib/freetype_face.cpp
View File

@ -5,14 +5,13 @@
// under the terms of the GNU Lesser General Public License v3.0 as published by
// the Free Software Foundation.
//
#include <algorithm>
#include <bmrshared/freetype_face.hpp>
#include <bmrshared/freetype_lib.hpp>
#include <algorithm>
using namespace bmrshared;
freetype_face::freetype_face(
std::shared_ptr<freetype_lib> lib,
freetype_face::freetype_face(std::shared_ptr<freetype_lib> lib,
const std::string& font_path,
pixel_size pixel_width,
pixel_size pixel_height,
@ -20,16 +19,9 @@ freetype_face::freetype_face(
: m_lib(lib)
, m_renderMonochrome(render_monochrome)
{
FT_New_Face(
m_lib->get_ft_library(),
font_path.c_str(),
0,
&m_face);
FT_New_Face(m_lib->get_ft_library(), font_path.c_str(), 0, &m_face);
FT_Set_Pixel_Sizes(
m_face,
pixel_width,
pixel_height);
FT_Set_Pixel_Sizes(m_face, pixel_width, pixel_height);
}
freetype_face::~freetype_face()
@ -42,8 +34,7 @@ FT_BBox freetype_face::get_boundbox() const
return m_face->bbox;
}
FT_Glyph_Metrics freetype_face::get_dimensions(
character_index character_index) const
FT_Glyph_Metrics freetype_face::get_dimensions(character_index character_index) const
{
// Load glyph and retrieve metrics.
const auto glyph_index = FT_Get_Char_Index(m_face, character_index);
@ -54,12 +45,7 @@ FT_Glyph_Metrics freetype_face::get_dimensions(
}
void freetype_face::render(
FT_ULong character_index,
std::function<void(int x,
int y,
uint8_t level
)> painter)
void freetype_face::render(FT_ULong character_index, std::function<void(int x, int y, uint8_t level)> painter)
{
// Load glyph and retrieve metrics.
const auto glyph_index = FT_Get_Char_Index(m_face, character_index);
@ -74,12 +60,12 @@ void freetype_face::render(
FT_Bitmap_Init(&target);
FT_Bitmap_Convert(m_lib->get_ft_library(), &bitmap, &target, 1);
for(unsigned int x = 0; x < target.width; ++x)
for (unsigned int x = 0; x < target.width; ++x)
{
for(unsigned int y = 0; y < target.rows; ++y)
for (unsigned int y = 0; y < target.rows; ++y)
{
const uint8_t& value = 0xff * target.buffer[x + target.width * y];
painter(x,y,value);
painter(x, y, value);
}
}

18
bmrshared-freetype/lib/freetype_utils.cpp
View File

@ -5,8 +5,8 @@
// under the terms of the GNU Lesser General Public License v3.0 as published by
// the Free Software Foundation.
//
#include <bmrshared/freetype_utils.hpp>
#include <algorithm>
#include <bmrshared/freetype_utils.hpp>
#include <functional>
namespace bmrshared
@ -29,10 +29,14 @@ dimensions freetype_calculate_dimensions(freetype_face& face, std::string_view t
line_above_origin = std::max(line_above_origin, char_above_origin);
line_below_origin = std::max(line_below_origin, char_below_origin);
}
return {.width = line_width, .height = (line_above_origin + line_below_origin), .vertOriginOffsetY = line_above_origin};
return {.width = line_width,
.height = (line_above_origin + line_below_origin),
.vertOriginOffsetY = line_above_origin};
}
void freetype_paint(freetype_face& face, std::string_view text, const std::function<void(int x, int y, uint8_t level)>& paintfn)
void freetype_paint(freetype_face& face,
std::string_view text,
const std::function<void(int x, int y, uint8_t level)>& paintfn)
{
FT_Pos line_x = 0;
FT_Pos char_offset_x = 0;
@ -42,15 +46,15 @@ void freetype_paint(freetype_face& face, std::string_view text, const std::funct
paintfn((char_offset_x + x), (y - char_offset_y), level);
};
for( const char& c : text)
for (const char& c : text)
{
const FT_Glyph_Metrics& dim = face.get_dimensions(c);
char_offset_x = (line_x + (dim.horiAdvance - dim.width)/2)/64;
char_offset_y = dim.horiBearingY/64;
char_offset_x = (line_x + (dim.horiAdvance - dim.width) / 2) / 64;
char_offset_y = dim.horiBearingY / 64;
face.render(c, painter_char);
line_x += dim.horiAdvance;
}
}
}
} // namespace bmrshared

2
bmrshared-magic/tst/test_magic.cpp
View File

@ -10,7 +10,7 @@
namespace
{
constexpr std::string_view magic_file_location = "/usr/local/bin/magic.mgc";
constexpr std::string_view magic_file_location = "/usr/local/bin/magic.mgc";
}
TEST(test_magic, no_throw_on_query)

4
bmrshared/include/bmrshared/function_wrapper.hpp
View File

@ -29,7 +29,7 @@ struct function_wrapper<T, TExtraArguments...>
using wrapper_type = std::function<flexible_value(const T&, const IDataSource&, TExtraArguments...)>;
template<typename M, typename... TSourceParams>
static wrapper_type Wrap(M T::*callableFn, TSourceParams... paramNames)
static wrapper_type Wrap(M T::* callableFn, TSourceParams... paramNames)
{
std::array<std::string, sizeof...(TSourceParams)> names{paramNames...};
return [callableFn, names](const T& obj, const IDataSource& source, TExtraArguments... args)
@ -47,7 +47,7 @@ struct function_wrapper<T, TExtraArguments...>
using wrapper_type = std::function<flexible_value(T&, const IDataSource&, TExtraArguments...)>;
template<typename M, typename... TSourceParams>
static wrapper_type Wrap(M T::*callableFn, TSourceParams... paramNames)
static wrapper_type Wrap(M T::* callableFn, TSourceParams... paramNames)
{
std::array<std::string, sizeof...(TSourceParams)> names{paramNames...};
return [callableFn, names](T& obj, const IDataSource& source, TExtraArguments... args)

8
bmrshared/include/bmrshared/invoke.hpp
View File

@ -52,10 +52,10 @@ namespace detail
} // namespace detail
template<typename M, typename T, std::size_t TParameterCount, typename... TExtraArguments>
requires(function_info<M T::*>::is_const_member == false)
requires(function_info<M T::*>::is_const_member == false)
flexible_value invoke(T& callableObj,
M T::*callableFn,
M T::* callableFn,
std::array<std::string, TParameterCount> names,
const IDataSource& source,
TExtraArguments&&... arguments)
@ -72,10 +72,10 @@ flexible_value invoke(T& callableObj,
}
template<typename M, typename T, std::size_t TParameterCount, typename... TExtraArguments>
requires(function_info<M T::*>::is_const_member == true)
requires(function_info<M T::*>::is_const_member == true)
flexible_value invoke(const T& callableObj,
M T::*callableFn,
M T::* callableFn,
std::array<std::string, TParameterCount> names,
const IDataSource& source,
TExtraArguments&&... arguments)