Commit graph

274 commits

Author SHA1 Message Date
sphere
df18cc0960 Merge branch 'font_drawer' into 'next'
Refactor string drawing functions

See merge request STJr/SRB2!1726
2024-03-10 12:48:59 +00:00
spherallic
31e58f1156 Rewrite aligned string drawing, using a modified version of strtok 2024-03-09 18:08:02 +01:00
spherallic
444cfc180f Use alignment enum for drawing aligned font strings 2024-03-08 00:39:53 +01:00
spherallic
02f31a4922 Add character width to font definitions
Used for V_MONOSPACE and V_OLDSPACING instead of spacewidth*2
2024-03-07 21:36:59 +01:00
Alam Ed Arias
703ee972e6 Clean up stringop-truncation warnings 2024-02-20 16:30:15 -05:00
spherallic
03c138b782 Merge branch 'next' into font_drawer 2024-02-18 17:43:39 +01:00
Lactozilla
76c7dccd00 Delete old pic_t format from Doom Legacy 2024-01-16 15:54:29 -03:00
Lactozilla
72b63a1305 Merge branch 'next' into patch-refactor 2024-01-14 22:16:32 -03:00
Logan Aerl Arias
487b0d22ed Merge branch 'next' into raise-skin-limit 2024-01-01 16:55:04 -05:00
Logan Aerl Arias
48d06337be Merge branch SRB2:next into drawfill-transparency 2023-12-31 16:28:26 +00:00
Lactozilla
a3e6b5e0fb Merge remote-tracking branch 'stjr/next' into raise-skin-limit 2023-11-23 13:48:18 -03:00
Lactozilla
376022f3d7 Merge remote-tracking branch 'stjr/next' into patch-refactor 2023-11-07 00:56:28 -03:00
Zwip-Zwap Zapony
cd6cd53959 Combine vid.dupx and vid.dupy 2023-10-30 04:38:51 +00:00
Alam Ed Arias
49d9619192 Merge branch 'master' into raise-skin-limit 2023-10-28 18:09:42 -04:00
Alam Ed Arias
6613886198 Update v_video.c
Killed `unused variable` warning
2023-10-26 18:36:43 +00:00
Alam Ed Arias
f3ad50e654 Merge branch SRB2:next into drawfill-transparency 2023-10-25 19:24:23 +00:00
Alam Ed Arias
244cca8e9d Merge branch 'master' into font_drawer 2023-10-25 15:06:35 -04:00
Gustaf Alhäll
b53b2df7ee
Fix saturation option not being applied on OpenGL 2023-09-17 22:48:26 +02:00
Lactozilla
2f25102b79 Make num_posts unsigned
size_t was a bit overkill for that.
2023-09-03 13:27:49 -03:00
Lactozilla
9c758e68e8 Merge remote-tracking branch 'stjr/next' into patch-refactor 2023-08-16 14:22:52 -03:00
Lactozilla
821460d208 Patch refactor 2023-07-30 20:56:28 -03:00
katsy
7634a96031 delete ASM code, remove NASM 2023-07-27 23:58:53 -05:00
spherallic
34abe808e4 Merge branch 'next' into font_drawer 2023-04-13 10:43:39 +02:00
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
spherallic
66042ef8a1 Improved handling of multi-line strings:
- Centered/right-aligned string drawing now properly handles newlines
- Measuring string width/height takes newlines into account
- String height also takes V_RETURN8 into account
- Cleaned up menu message code, removed now-redundant M_StringHeight
2023-03-09 11:20:26 +01:00
spherallic
df9065d159 Clean up character drawing & word wrapping 2023-03-06 15:05:46 +01:00
spherallic
77f7374b98 Merge branch 'next' into font_drawer 2023-01-11 22:59:06 +01:00
ashifolfi
754a11f7f1 add transparency flag support to V_DrawFill 2022-11-20 17:39:46 -05:00
Lactozilla
86a052537e Add PO2 flat cases for sizes smaller than 32x32 2022-11-16 01:40:54 +00:00
Zwip-Zwap Zapony
59399e9fcf Uncap water ripples 2022-11-13 16:15:15 +01:00
spherallic
f95b6df128 Use V_FontStringWidth for name tag width, add kerning value to name tag 2022-11-02 01:26:28 +01:00
spherallic
c74cbb6868 Remove HU_ prefix from font start/end/size defines 2022-09-05 17:18:26 +02:00
spherallic
79fb15f00e Merge branch 'next' into font_drawer 2022-03-07 21:09:50 +01:00
spherallic
14295ac7de 2022 2022-03-03 20:24:46 +01:00
spherallic
a6153b62f2 Make name tag font(s) into fontdefs, and some more general cleanup. 2022-02-14 21:35:11 +01:00
spherallic
f1bf065777 Reorganize v_video.c a little, clean up v_video.h a little. 2022-02-05 16:08:35 +01:00
spherallic
7929a89394 Make level title font use generalized functions, plus:
- Fixed V_FontStringWidth not accounting for lowercase characters.
- Added V_FontStringHeight.
- Combine name tag base & outline loading.
2022-02-05 15:45:27 +01:00
spherallic
412381da4c Make credits font functions use the generalized functions. 2022-02-05 14:40:05 +01:00
spherallic
b8cae8e735 Add kerning option to fontdefs, rename width and height. 2022-02-04 13:36:27 +01:00
spherallic
908fb8b026 Add fontdef_t struct, move the width and height variables there. 2022-02-03 13:41:24 +01:00
spherallic
7b3c89c989 Separate scale into pscale and vscale. 2022-02-03 12:03:44 +01:00
spherallic
1630364775 Turn the old string drawing functions into defines. 2022-01-27 16:52:44 +01:00
spherallic
df7efe29cb Clean up string width-related functions. 2022-01-27 16:01:28 +01:00
spherallic
3013c8aa42 Third pass for generalized font drawer:
- Added AtFixed version, which also takes scale into account when 
calculating space widths & newline height
- Made some more string drawing functions use the generalized version
2022-01-27 15:22:36 +01:00
spherallic
41cb8cc494 Second pass for generalized font drawer:
- Added width/height parameters for spacing stuff
- Made some string drawing functions use the generalized version.
2022-01-25 23:55:18 +01:00
spherallic
9bdc376f16 Fix a few small errors. 2022-01-21 16:22:39 +01:00
spherallic
39a0bb4df8 First attempt at string drawing functions that take a supplied font. 2022-01-21 16:17:53 +01:00
spherallic
15755ef992 Remove unneeded R_GetTranslucencyTable calls, add V_HUDTRANS* comments 2022-01-19 13:17:57 +01:00
spherallic
9a07c1ca8c Fix HUD/graphic blendmodes not working at full opacity in Software. 2022-01-19 10:09:57 +01:00
sphere
a3be09bb3f blentran part 2: Sprite & patch blendmodes. 2021-12-05 00:48:21 +01:00