bilbo/dreamcast
1
0
Fork 0
Code Pull Requests Activity

font.hpp -> font.h

Browse Source
This commit is contained in:
Zack Buhman 2024-12-08 17:30:29 -06:00
parent eeb2de8de1
commit 870254efd2
7 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/font_outline.cpp
View File

@ -20,7 +20,7 @@
#include "palette.hpp" #include "palette.hpp"
#include "sh7091/serial.hpp" #include "sh7091/serial.hpp"
#include "font/font.hpp" #include "font/font.h"
#include "font/dejavusansmono/dejavusansmono.data.h" #include "font/dejavusansmono/dejavusansmono.data.h"
struct vertex { struct vertex {

2
example/font_outline_punch_through.cpp
View File

@ -19,7 +19,7 @@
#include "twiddle.hpp" #include "twiddle.hpp"
#include "palette.hpp" #include "palette.hpp"
#include "font/font.hpp" #include "font/font.h"
#include "font/dejavusansmono/dejavusansmono_mono.data.h" #include "font/dejavusansmono/dejavusansmono_mono.data.h"
struct vertex { struct vertex {

22
font/font.hpp → font/font.h
View File

@ -1,7 +1,11 @@
// this file is designed to be platform-agnostic // this file is designed to be platform-agnostic
#pragma once #pragma once
#include <cstdint> #include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif
// metrics are 26.6 fixed point // metrics are 26.6 fixed point
struct glyph_metrics { struct glyph_metrics {
@ -10,7 +14,7 @@ struct glyph_metrics {
int32_t horiAdvance; int32_t horiAdvance;
} __attribute__ ((packed)); } __attribute__ ((packed));
static_assert((sizeof (glyph_metrics)) == ((sizeof (int32_t)) * 3)); static_assert((sizeof (struct glyph_metrics)) == ((sizeof (int32_t)) * 3));
struct glyph_bitmap { struct glyph_bitmap {
uint16_t x; uint16_t x;
@ -19,14 +23,14 @@ struct glyph_bitmap {
uint16_t height; uint16_t height;
} __attribute__ ((packed)); } __attribute__ ((packed));
static_assert((sizeof (glyph_bitmap)) == ((sizeof (uint16_t)) * 4)); static_assert((sizeof (struct glyph_bitmap)) == ((sizeof (uint16_t)) * 4));
struct glyph { struct glyph {
glyph_bitmap bitmap; struct glyph_bitmap bitmap;
glyph_metrics metrics; struct glyph_metrics metrics;
} __attribute__ ((packed)); } __attribute__ ((packed));
static_assert((sizeof (glyph)) == ((sizeof (glyph_bitmap)) + (sizeof (glyph_metrics)))); static_assert((sizeof (struct glyph)) == ((sizeof (struct glyph_bitmap)) + (sizeof (struct glyph_metrics))));
struct font { struct font {
uint32_t first_char_code; uint32_t first_char_code;
@ -42,4 +46,8 @@ struct font {
uint32_t max_z_curve_ix; uint32_t max_z_curve_ix;
} __attribute__ ((packed)); } __attribute__ ((packed));
static_assert((sizeof (font)) == ((sizeof (uint32_t)) * 7)); static_assert((sizeof (struct font)) == ((sizeof (uint32_t)) * 7));
#ifdef __cplusplus
}
#endif

2
text_editor/render.hpp
View File

@ -4,7 +4,7 @@
#include "holly/ta_parameter.hpp" #include "holly/ta_parameter.hpp"
#include "font/font.hpp" #include "font/font.h"
#include "gap_buffer.hpp" #include "gap_buffer.hpp"
#include "viewport_window.hpp" #include "viewport_window.hpp"

2
text_editor/text_editor.cpp
View File

@ -17,7 +17,7 @@
#include "sh7091/serial.hpp" #include "sh7091/serial.hpp"
#include "font/font.hpp" #include "font/font.h"
#include "ter_u20n.hpp" #include "ter_u20n.hpp"

2
text_editor/transform.hpp
View File

@ -3,7 +3,7 @@
#include <cstdint> #include <cstdint>
#include "holly/ta_parameter.hpp" #include "holly/ta_parameter.hpp"
#include "font/font.hpp" #include "font/font.h"
void transform_sprite(ta_parameter_writer& parameter, void transform_sprite(ta_parameter_writer& parameter,
const float origin_x, const float origin_x,

2
tools/ttf_outline.cpp
View File

@ -8,7 +8,7 @@
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include "../font/font.hpp" #include "../font/font.h"
#include "rect.hpp" #include "rect.hpp"
#include "ttf_2d_pack.hpp" #include "ttf_2d_pack.hpp"
#include "../twiddle.hpp" #include "../twiddle.hpp"