render: merge R_View_UpdateWithScissor() and R_View_Update()

[xonotic/darkplaces.git] / ft2_fontdefs.h

diff --git a/ft2_fontdefs.h b/ft2_fontdefs.h
index 34c1637014c9ef7863e44987a90ba113f065d6bf..68956b9082d6682c42c7b8492bd2801155071502 100644 (file)
--- a/ft2_fontdefs.h
+++ b/ft2_fontdefs.h
@@ -7,9 +7,12 @@
 #define FONT_CHAR_LINES 16
 #define FONT_CHARS_PER_MAP (FONT_CHARS_PER_LINE * FONT_CHAR_LINES)
 
+// map.start value for incremental maps to hold a place
+#define INCMAP_START 0x110000
+
 typedef struct glyph_slot_s
 {
-       qboolean image;
+       qbool image;
        // we keep the quad coords here only currently
        // if you need other info, make Font_LoadMapForIndex fill it into this slot
        float txmin; // texture coordinate in [0,1]
@@ -26,36 +29,56 @@ typedef struct glyph_slot_s
 
 struct ft2_font_map_s
 {
-       Uchar                  start;
-       struct ft2_font_map_s *next;
-       float                  size;
+       Uchar  start;
+       float  size;
+
        // the actual size used in the freetype code
        // by convention, the requested size is the height of the font's bounding box.
-       float                  intSize;
-       int                    glyphSize;
+       float  intSize;
+       int    glyphSize;
+
+       ft2_font_map_t *next;
+       cachepic_t     *pic;
+       qbool           static_tex;
+       glyph_slot_t    glyphs[FONT_CHARS_PER_MAP];
+       Uchar           glyphchars[FONT_CHARS_PER_MAP];
+
+       // saves us the trouble of calculating these over and over again
+       double          sfx, sfy;
 
-       rtexture_t            *texture;
-       qboolean               static_tex;
-       glyph_slot_t           glyphs[FONT_CHARS_PER_MAP];
+       // note: float width_of[256] was moved to `struct dp_font_s` as width_of_ft2
 
+       // these may only present in a startmap
        // contains the kerning information for the first 256 characters
        // for the other characters, we will lookup the kerning information
-       ft2_kerning_t          kerning;
-       // safes us the trouble of calculating these over and over again
-       double                 sfx, sfy;
+       ft2_kerning_t  *kerning;
+       // for accessing incremental maps for bigblock glyphs
+       font_incmap_t  *incmap;
+};
+
+struct font_incmap_s
+{
+       // associated fontmap; startmap of incmaps
+       struct ft2_font_map_s *fontmap;
+       int charcount;
+       int newmap_start;
+
+       // two rounds of merge will take place, keep those data until then
+       unsigned char *data_tier1[FONT_CHARS_PER_LINE];
+       unsigned char *data_tier2[FONT_CHAR_LINES];
 
-       // the width_of for the image-font, pixel-snapped for this size
-       float           width_of[256];
+       // count of merged maps
+       int tier1_merged, tier2_merged;
 };
 
 struct ft2_attachment_s
 {
        const unsigned char *data;
-       fs_offset_t    size;
+       fs_offset_t          size;
 };
 
-//qboolean Font_LoadMapForIndex(ft2_font_t *font, Uchar _ch, ft2_font_map_t **outmap);
-qboolean Font_LoadMapForIndex(ft2_font_t *font, int map_index, Uchar _ch, ft2_font_map_t **outmap);
+//qbool Font_LoadMapForIndex(ft2_font_t *font, Uchar _ch, ft2_font_map_t **outmap);
+qbool Font_LoadMapForIndex(ft2_font_t *font, int map_index, Uchar _ch, ft2_font_map_t **outmap);
 
 void font_start(void);
 void font_shutdown(void);