Commit graph

98 commits

Author SHA1 Message Date
spherallic
444cfc180f Use alignment enum for drawing aligned font strings 2024-03-08 00:39:53 +01: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
Zwip-Zwap Zapony
cd6cd53959 Combine vid.dupx and vid.dupy 2023-10-30 04:38:51 +00: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
f95b6df128 Use V_FontStringWidth for name tag width, add kerning value to name tag 2022-11-02 01:26:28 +01: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
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
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
39a0bb4df8 First attempt at string drawing functions that take a supplied font. 2022-01-21 16:17:53 +01:00
sphere
3802f601a9 blentran part 1: Flag changes & semibright support. 2021-12-05 00:48:21 +01:00
Tatsuru
eec765749b Merge branch 'drawcroppedpatch-improvements' into 'next'
V_DrawCroppedPatch(...) Lua exposure and improvements

See merge request STJr/SRB2!1316
2021-09-10 16:14:38 +00:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
Zwip-Zwap Zapony
029e79024b V_DrawCroppedPatch Lua exposure and improvements
Separated X and Y scale, and added colormap argument
Added V_*SCALEPATCH and V_PERPLAYER flags support
Made sx,sy,w,h into fixed-point values
Exposed to Lua as "v.drawCropped(...)"
(Also fix HWR_DrawStretchyFixedPatch ignoring vscale without pscale)
2020-12-11 23:43:38 +01:00
Jaime Passos
b15bbd505c Merge branch 'next' into patch-stuff-again-2 2020-10-10 17:01:10 -03:00
SteelT
a033f482be Merge branch 'pictureformats' into 'next'
PNG conversion refactoring

See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Jaime Passos
4e437076c1 Use color look-up table for PNG conversion 2020-09-10 02:10:31 -03:00
Jaime Passos
f24647dc4d Change method of color look-up table generation 2020-09-10 01:43:46 -03:00
James R
bcb0854db8 . 2020-08-14 22:38:15 -07:00
James R
5ccafe0314 REMOVE THE LAST OF CV_ALLCAPS 2020-08-14 21:01:41 -07:00
Jaime Passos
78cc4a78d0 Refactor renderer switching 2020-08-14 22:27:16 -03:00
SwitchKaze
b37c73b008 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
sphere
0287c6956e Fix some errors and add some comments. Also, actnum is not an INT32. 2020-05-12 17:20:28 +02:00
Steel Titanium
76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
62d943b609 Merge branch 'thin-fixed' into 'next'
Add more strings (and respective functions) for v.drawString().

See merge request STJr/SRB2!770
2020-02-20 19:27:01 -05:00
James R
7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
GoldenTails
fe17933156 Make V_DrawCenteredSmallThinString() a less precise wrapper for V_DrawCenteredSmallThinStringAtFixed() for new "small-thin-center" option in v.drawString() 2020-02-01 11:01:39 -06:00
GoldenTails
7d9f138160 Make V_DrawRightAlignedSmallThinString() a less precise wrapper for V_DrawRightAlignedSmallThinStringAtFixed() for new "small-thin-right" option in v.drawString() 2020-02-01 11:01:22 -06:00
GoldenTails
b2b4c4c79e Create V_DrawCenteredSmallThinStringAtFixed() for new "small-thin-fixed-center" option in v.drawString()
Thankfully "center" is just "right" but with the X offset divided by 2.
2020-02-01 11:01:03 -06:00
GoldenTails
4cbcb68795 Create V_DrawRightAlignedSmallThinStringAtFixed() for new "small-thin-fixed-right" option in v.drawString()
You guys have no idea how long this took to code.
2020-02-01 11:00:45 -06:00
GoldenTails
75d94c6c1a Create V_DrawSmallThinStringAtFixed() for new "small-thin-fixed" option in v.drawString()
I removed the limitation present in "small-thin" by converting all relevant variables to fixed_t's and using FixedMul() and FixedDiv() when necessary. Who'da thunk it would actually work?
2020-02-01 11:00:02 -06:00
GoldenTails
a216736ef4 Create V_DrawCenteredSmallStringAtFixed() for new "small-fixed-center" option in v.drawString() 2020-02-01 10:59:38 -06:00
GoldenTails
5f56d19a43 Create V_DrawRightAlignedSmallStringAtFixed() for new "small-fixed-right" option in v.drawString() 2020-02-01 10:59:21 -06:00
GoldenTails
f7085fc171 Create V_DrawCenteredThinStringAtFixed() for new "thin-fixed-center" option in v.drawString() 2020-02-01 10:58:55 -06:00
GoldenTails
f1655d32f5 Fixed V_DrawRightAlignedThinStringAtFixed declaration to use fixed_t for positioning. 2020-02-01 10:58:19 -06:00
GoldenTails
cb5c90fc40 Create V_DrawRightAlignedThinStringAtFixed() for new "thin-fixed-right" option in v.drawString()
These function names are starting to become rediculous...
2020-02-01 10:55:54 -06:00
GoldenTails
6527b5d16b Create V_DrawSmallThinString() for new "small-thin" option in v.drawString()
Note this has some major limitations to prevent squished text. It defaults to using V_MONOSPACE|V_OLDSPACING and you cannot change the size of characters. V_6WIDTHSPACE seems to act exactly the same as V_OLDSPACING too.
2020-02-01 10:53:06 -06:00
GoldenTails
9f50b6ef73 Create V_DrawCenteredStringAtFixed() for new "fixed-center" option in v.drawString() 2020-02-01 10:51:43 -06:00
GoldenTails
b0e66874d3 Fixed v_video.h declaration for V_DrawRightAlignedStringAtFixed() 2020-02-01 10:51:31 -06:00