]>
icculus.org git repositories - divverent/darkplaces.git/log
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 21:11:12 +0000 (23:11 +0200)]
some fixups
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 13:32:05 +0000 (15:32 +0200)]
let's conform to the rest of the code, terencehill :P
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 13:21:35 +0000 (15:21 +0200)]
using u8_prevbyte optimization
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 13:18:23 +0000 (15:18 +0200)]
const-correcting the utf8lib, adding u8_prevbyte as an optimizer for getting the prev char offset
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 13:08:28 +0000 (15:08 +0200)]
console input - backspace - utf8 - you know...
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 13:06:51 +0000 (15:06 +0200)]
key_message needs to handle backspace with utf8 in mind :P
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 13:00:47 +0000 (15:00 +0200)]
Making the console input line utf8-aware
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 12:51:17 +0000 (14:51 +0200)]
working on console input
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 12:50:51 +0000 (14:50 +0200)]
working on console input
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 12:16:29 +0000 (14:16 +0200)]
do not cast unicode values to signed-char in sdl... and use u8 in Key_Message
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 11:45:28 +0000 (13:45 +0200)]
Properly set the face now
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 11:44:17 +0000 (13:44 +0200)]
hrm
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 11:43:13 +0000 (13:43 +0200)]
set the face before using it... stupid gcc didn't warn me
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 11:39:54 +0000 (13:39 +0200)]
use the fallback fonts when rendering glyph maps
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 11:15:07 +0000 (13:15 +0200)]
load fallbacks first to make div0 happy :)
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 10:27:25 +0000 (12:27 +0200)]
fallback fonts can load now
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 09:52:47 +0000 (11:52 +0200)]
preparing for fallback fonts, parsing the font stuff differently now
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 18:08:33 +0000 (20:08 +0200)]
let's do some pixel snapping, it does make a difference
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 17:20:24 +0000 (19:20 +0200)]
hmpf
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 17:10:26 +0000 (19:10 +0200)]
font-size is a float even in fontmap_t, also, use >>6 instead of the sf[xy] values
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 17:00:59 +0000 (19:00 +0200)]
font request sizes are floats now
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 13:02:26 +0000 (15:02 +0200)]
Merge commit 'origin/master' into ft2
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 13:00:32 +0000 (15:00 +0200)]
fix a lil bug in u8_bytelen
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 12:46:46 +0000 (14:46 +0200)]
take fnt scale into account in TextWidth
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 12:43:03 +0000 (14:43 +0200)]
width and height for TextWidth
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 11:08:25 +0000 (13:08 +0200)]
font scaling...
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 10:31:51 +0000 (12:31 +0200)]
better size-seeking and float sizes in DrawQ_TextWidth
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 10:20:41 +0000 (12:20 +0200)]
font can load multiple sizes now
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 09:30:22 +0000 (11:30 +0200)]
committing utf8lib outside of ft2 files
divverent [Thu, 3 Sep 2009 07:48:28 +0000 (07:48 +0000)]
another oops, sorry, forgot to commit this from at home
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9160
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Thu, 3 Sep 2009 07:42:22 +0000 (07:42 +0000)]
stuff I forgot to commit
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9159
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Thu, 3 Sep 2009 05:47:07 +0000 (05:47 +0000)]
Quake menu: show DP's weird resolution set in windowed mode, and really detected modes in fullscreen.
menu QC: getresolution() now has an optional second arg "forfullscreen", that if 0 queries the "hardcoded" resolution list and if 1 (or left out) queries the system-provided list.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9158
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Thu, 3 Sep 2009 05:25:55 +0000 (05:25 +0000)]
as requested by LH, #if 0 out cycleweapon
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9157
d7cf8633 -e32d-0410-b094-
e92efae38249
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 20:38:36 +0000 (22:38 +0200)]
Merge commit 'origin/master' into ft2
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 20:32:25 +0000 (22:32 +0200)]
str2chr and chr2str utf8-aware
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 20:32:17 +0000 (22:32 +0200)]
fix that line breaking
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 20:14:54 +0000 (22:14 +0200)]
a couple of utility functions useful for VM_substring, and VM_substring implementation
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 18:48:31 +0000 (20:48 +0200)]
forgot to revert
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 18:29:41 +0000 (20:29 +0200)]
try to load .otf files too
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 15:30:41 +0000 (17:30 +0200)]
use the utf-8 cursor characters if possible, fallback to + and - if not
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 14:31:13 +0000 (16:31 +0200)]
fix drawing and TextWidth
divverent [Wed, 2 Sep 2009 13:08:52 +0000 (13:08 +0000)]
do not crash when zlib is missing, but instead do not use deflate/inflate
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9156
d7cf8633 -e32d-0410-b094-
e92efae38249
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 12:53:31 +0000 (14:53 +0200)]
r_font_disable_freetype, started with DrawQ_TextWidth support
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 12:34:42 +0000 (14:34 +0200)]
define ft2_oldstyle_map in ft2.h since it won't be limited to DrawQ_String_Font anymore
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 12:23:19 +0000 (14:23 +0200)]
r_font_use_alpha_textures to use TEXTYPE_ALPHA - currently renders black though. unload fonts correctly on module shutdown so r_restart works properly without crashing
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 11:51:34 +0000 (13:51 +0200)]
loadfont with face -1 to disable freetype loading for this font
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 10:11:49 +0000 (12:11 +0200)]
use 16 as default size again
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 10:06:55 +0000 (12:06 +0200)]
support faces
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 09:59:22 +0000 (11:59 +0200)]
this should be fine
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 09:55:49 +0000 (11:55 +0200)]
working on better font rendering
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 09:55:12 +0000 (11:55 +0200)]
working on better font rendering
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 09:32:29 +0000 (11:32 +0200)]
some shortcuts
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 09:22:07 +0000 (11:22 +0200)]
do not render bitmaps, they're ready to use as is
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 08:35:00 +0000 (10:35 +0200)]
check if the current charmap contains the character before searching the list for the new charmap
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 17:28:28 +0000 (19:28 +0200)]
removed testfont and old drawing routine
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 17:27:03 +0000 (19:27 +0200)]
correct offsets when parsing color codes
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 17:19:26 +0000 (19:19 +0200)]
adding font attachments, supporting type-1 fonts with .afm kerning info
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 16:36:07 +0000 (18:36 +0200)]
what was I thinking
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 15:10:02 +0000 (17:10 +0200)]
oops
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 15:08:06 +0000 (17:08 +0200)]
kerning support, let's test
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 15:00:24 +0000 (17:00 +0200)]
starting with kerning support
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 14:07:54 +0000 (16:07 +0200)]
rendering now works
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 14:01:10 +0000 (16:01 +0200)]
first find map then draw the batches
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:53:57 +0000 (15:53 +0200)]
use the texpath for Font_LoadFont actually...
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:52:11 +0000 (15:52 +0200)]
okay, let's work with old-style fonts now
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:48:55 +0000 (15:48 +0200)]
do not try to use ft2 if not available for that font
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:47:22 +0000 (15:47 +0200)]
...
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:46:39 +0000 (15:46 +0200)]
Integrated font rendering - untested
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:45:02 +0000 (15:45 +0200)]
Integrated font rendering - untested
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:20:48 +0000 (15:20 +0200)]
revert to the real text rendering function
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:18:02 +0000 (15:18 +0200)]
Font_Init before GL_Draw_Init
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:16:42 +0000 (15:16 +0200)]
Font_Alloc, and load ttf fonts for every other font we load
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:10:00 +0000 (15:10 +0200)]
no mipmapping for ft2 font textures
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:08:31 +0000 (15:08 +0200)]
now this works, let's start to integrate
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 12:52:13 +0000 (14:52 +0200)]
loading internal ft2 data into ft2_fontdefs.h to share with gl_draw.c
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 12:17:23 +0000 (14:17 +0200)]
use the developer cvar for debug prints
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 12:14:14 +0000 (14:14 +0200)]
remove my working-comments
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 12:13:54 +0000 (14:13 +0200)]
remove my working-comments
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 12:13:01 +0000 (14:13 +0200)]
fill the arrays and render when necessary
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 12:09:32 +0000 (14:09 +0200)]
a little speedup
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 11:15:15 +0000 (13:15 +0200)]
16 pixel font and PIXEL_ precision started - not finished though
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 10:22:33 +0000 (12:22 +0200)]
one of those cases... easy fix but impossible to see when simply reading over it...
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 10:08:22 +0000 (12:08 +0200)]
stashing changes...
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 09:41:05 +0000 (11:41 +0200)]
use doubles... see how that works out, use test font size 32, fix array accesses
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 09:11:35 +0000 (11:11 +0200)]
now we're getting somewhere
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 09:08:39 +0000 (11:08 +0200)]
now we're getting somewhere
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 08:19:49 +0000 (10:19 +0200)]
TEXTYPE_ALPHA support again
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 08:18:29 +0000 (10:18 +0200)]
using alpha textures
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 08:18:25 +0000 (10:18 +0200)]
TEXTYPE_ALPHA support
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 07:59:21 +0000 (09:59 +0200)]
testing freetype rendering with VM_CL_drawstring
Wolfgang (Blub) Bumiller [Mon, 31 Aug 2009 20:29:34 +0000 (22:29 +0200)]
compiles now
Wolfgang (Blub) Bumiller [Mon, 31 Aug 2009 20:25:05 +0000 (22:25 +0200)]
stuff...
Wolfgang (Blub) Bumiller [Mon, 31 Aug 2009 20:24:43 +0000 (22:24 +0200)]
stuff...
Wolfgang (Blub) Bumiller [Mon, 31 Aug 2009 19:17:55 +0000 (21:17 +0200)]
preparing for rendering using freetype
Wolfgang (Blub) Bumiller [Mon, 31 Aug 2009 18:51:01 +0000 (20:51 +0200)]
line/row/column mixup ...
Wolfgang (Blub) Bumiller [Mon, 31 Aug 2009 18:44:39 +0000 (20:44 +0200)]
library must be unloaded AFTER Done_FreeType
Wolfgang (Blub) Bumiller [Mon, 31 Aug 2009 18:41:51 +0000 (20:41 +0200)]
initialize as module
Wolfgang (Blub) Bumiller [Mon, 31 Aug 2009 18:35:58 +0000 (20:35 +0200)]
error msg
Wolfgang (Blub) Bumiller [Mon, 31 Aug 2009 18:30:18 +0000 (20:30 +0200)]
Font_Init
Wolfgang (Blub) Bumiller [Mon, 31 Aug 2009 18:05:47 +0000 (20:05 +0200)]
finish loading of character maps