more fullscreen cleanup

[xonotic/darkplaces.git] / draw.h

diff --git a/draw.h b/draw.h
index 17c366bc8d975f8d7ed34e591c52c0f68ee9af33..259ed9b05f6f856b672824e8f15c44ac5683c1be 100644 (file)
--- a/draw.h
+++ b/draw.h
@@ -43,6 +43,7 @@ typedef enum cachepicflags_e
        CACHEPICFLAG_NOTPERSISTENT = 1,
        CACHEPICFLAG_QUIET = 2,
        CACHEPICFLAG_NOCOMPRESSION = 4,
+       CACHEPICFLAG_NOCLAMP = 8,
 }
 cachepicflags_t;
 
@@ -75,13 +76,18 @@ DRAWFLAG_NORMAL,
 DRAWFLAG_ADDITIVE,
 DRAWFLAG_MODULATE,
 DRAWFLAG_2XMODULATE,
-DRAWFLAG_NUMFLAGS
+DRAWFLAG_SCREEN,
+DRAWFLAG_NUMFLAGS,
+DRAWFLAG_MASK = 0xFF,   // ONLY R_BeginPolygon()
+DRAWFLAG_MIPMAP = 0x100 // ONLY R_BeginPolygon()
 };
 
 typedef struct dp_font_s
 {
        rtexture_t *tex;
-       float width_of[256]; // width_of[0] == max width of any char; 1.0f is base width (1/16 of texture width); therefore, all widths have to be <= 1
+       float width_of[256]; // width_of[0] == max width of any char; 1.0f is base width (1/16 of texture width); therefore, all widths have to be <= 1 (does not include scale)
+       float maxwidth; // precalculated max width of the font (includes scale)
+       float scale; // scales the font (without changing line height!)
        char texpath[MAX_QPATH];
        char title[MAX_QPATH];
 }
@@ -104,6 +110,10 @@ extern dp_font_t dp_fonts[MAX_FONTS];
 #define STRING_COLOR_TAG                       '^'
 #define STRING_COLOR_DEFAULT           7
 #define STRING_COLOR_DEFAULT_STR       "^7"
+#define STRING_COLOR_RGB_DEFAULT 'x'
+#define STRING_COLOR_RGB_DEFAULT_STR "^xfff"
+//#define STRING_COLOR_ALPHA_DEFAULT 'a'
+//#define STRING_COLOR_ALPHA_DEFAULT_STR "^af"
 
 // all of these functions will set r_defdef.draw2dstage if not in 2D rendering mode (and of course prepare for 2D rendering in that case)