]> icculus.org git repositories - divverent/darkplaces.git/log
divverent/darkplaces.git
14 years agouse different internal sizes
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 19:19:40 +0000 (21:19 +0200)]
use different internal sizes

14 years agoMerge branch 'master' into ft2
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 17:20:50 +0000 (19:20 +0200)]
Merge branch 'master' into ft2

14 years agoremove unused stuff
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 17:18:12 +0000 (19:18 +0200)]
remove unused stuff

14 years agoCompile as C code, not C++ (vcproj setting)
echon [Sun, 6 Sep 2009 17:04:31 +0000 (17:04 +0000)]
Compile as C code, not C++ (vcproj setting)
Include dinput8 libs if SUPPORTDIRECTX is defined
Default to defining SUPPORTDIRECTX on windows builds, otherwise you get crackly sound

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9167 d7cf8633-e32d-0410-b094-e92efae38249

14 years agofinally, this works with the current prep-5.diff
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 16:39:58 +0000 (18:39 +0200)]
finally, this works with the current prep-5.diff

14 years agoDon't generate tangent vectors when GLSL is off, small improvement to anim caching..
echon [Sun, 6 Sep 2009 16:20:53 +0000 (16:20 +0000)]
Don't generate tangent vectors when GLSL is off, small improvement to anim caching..

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9166 d7cf8633-e32d-0410-b094-e92efae38249

14 years agocommitting terrible stuff
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 16:18:10 +0000 (18:18 +0200)]
committing terrible stuff

14 years agogood compromise, mods work, but for utf8-ft2 to work they have to support thhe string...
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 15:40:55 +0000 (17:40 +0200)]
good compromise, mods work, but for utf8-ft2 to work they have to support thhe stringwidth fontsize parameter - well, I'm still working on that one :S

14 years agodon't use bytes for maxlen
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 15:31:28 +0000 (17:31 +0200)]
don't use bytes for maxlen

14 years agodisable font size snapping by default as it needs TextWidth support
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 15:23:20 +0000 (17:23 +0200)]
disable font size snapping by default as it needs TextWidth support

14 years agoyeps
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 15:05:50 +0000 (17:05 +0200)]
yeps

14 years agodisable snapping when default font sizes are used for now, committing stuff for a...
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 15:04:15 +0000 (17:04 +0200)]
disable snapping when default font sizes are used for now, committing stuff for a nice diff

14 years agofont-size snapping
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 14:38:59 +0000 (16:38 +0200)]
font-size snapping

14 years agobetter font sizes loaded now
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 14:24:48 +0000 (16:24 +0200)]
better font sizes loaded now

14 years agoonly use pixel snapping if a size has actually been specified
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 13:03:40 +0000 (15:03 +0200)]
only use pixel snapping if a size has actually been specified

14 years agotesting some stuff
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 12:53:33 +0000 (14:53 +0200)]
testing some stuff

14 years agoMerge branch 'master' into ft2
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 11:13:26 +0000 (13:13 +0200)]
Merge branch 'master' into ft2

14 years agopixelsnapping for TextWidth
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 11:11:44 +0000 (13:11 +0200)]
pixelsnapping for TextWidth

14 years agopixel snapping with round-up at .5 for x and y now, TODO: TextWidth must match
Wolfgang (Blub) Bumiller [Sun, 6 Sep 2009 11:10:12 +0000 (13:10 +0200)]
pixel snapping with round-up at .5 for x and y now, TODO: TextWidth must match

14 years agofixed two warnings
divverent [Sun, 6 Sep 2009 09:47:42 +0000 (09:47 +0000)]
fixed two warnings

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9165 d7cf8633-e32d-0410-b094-e92efae38249

14 years agoAdded animation caching, which speeds up re-renders of all animated meshes
echon [Sun, 6 Sep 2009 07:45:28 +0000 (07:45 +0000)]
Added animation caching, which speeds up re-renders of all animated meshes

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9164 d7cf8633-e32d-0410-b094-e92efae38249

14 years agoAdded a Profile build option, which is simply release with symbols
echon [Sun, 6 Sep 2009 07:13:55 +0000 (07:13 +0000)]
Added a Profile build option, which is simply release with symbols

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9163 d7cf8633-e32d-0410-b094-e92efae38249

14 years agoUpdate for 2k8 sp1... apparently they changed a comment in the solution file. Importa...
echon [Sun, 6 Sep 2009 05:28:45 +0000 (05:28 +0000)]
Update for 2k8 sp1... apparently they changed a comment in the solution file. Important stuff right here.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9162 d7cf8633-e32d-0410-b094-e92efae38249

14 years agoIgnore *.suo and *.user visual studio local files
echon [Sun, 6 Sep 2009 05:24:59 +0000 (05:24 +0000)]
Ignore *.suo and *.user visual studio local files

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9161 d7cf8633-e32d-0410-b094-e92efae38249

14 years agou8_Init, cvar utf8_disabled
Wolfgang (Blub) Bumiller [Sat, 5 Sep 2009 08:14:14 +0000 (10:14 +0200)]
u8_Init, cvar utf8_disabled

14 years agofix dynamic fontmap not loading lower maps if higher exist
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 21:44:37 +0000 (23:44 +0200)]
fix dynamic fontmap not loading lower maps if higher exist

14 years ago*ahem*...
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 21:12:04 +0000 (23:12 +0200)]
*ahem*...

14 years agosome fixups
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 21:11:12 +0000 (23:11 +0200)]
some fixups

14 years agolet's conform to the rest of the code, terencehill :P
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

14 years agousing u8_prevbyte optimization
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 13:21:35 +0000 (15:21 +0200)]
using u8_prevbyte optimization

14 years agoconst-correcting the utf8lib, adding u8_prevbyte as an optimizer for getting the...
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

14 years agoconsole input - backspace - utf8 - you know...
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 13:08:28 +0000 (15:08 +0200)]
console input - backspace - utf8 - you know...

14 years agokey_message needs to handle backspace with utf8 in mind :P
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

14 years agoMaking the console input line utf8-aware
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 13:00:47 +0000 (15:00 +0200)]
Making the console input line utf8-aware

14 years agoworking on console input
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 12:51:17 +0000 (14:51 +0200)]
working on console input

14 years agoworking on console input
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 12:50:51 +0000 (14:50 +0200)]
working on console input

14 years agodo not cast unicode values to signed-char in sdl... and use u8 in Key_Message
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

14 years agoProperly set the face now
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 11:45:28 +0000 (13:45 +0200)]
Properly set the face now

14 years agohrm
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 11:44:17 +0000 (13:44 +0200)]
hrm

14 years agoset the face before using it... stupid gcc didn't warn me
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

14 years agouse the fallback fonts when rendering glyph maps
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 11:39:54 +0000 (13:39 +0200)]
use the fallback fonts when rendering glyph maps

14 years agoload fallbacks first to make div0 happy :)
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 11:15:07 +0000 (13:15 +0200)]
load fallbacks first to make div0 happy :)

14 years agofallback fonts can load now
Wolfgang (Blub) Bumiller [Fri, 4 Sep 2009 10:27:25 +0000 (12:27 +0200)]
fallback fonts can load now

14 years agopreparing for fallback fonts, parsing the font stuff differently 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

14 years agolet's do some pixel snapping, it does make a difference
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

14 years agohmpf
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 17:20:24 +0000 (19:20 +0200)]
hmpf

14 years agofont-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:10:26 +0000 (19:10 +0200)]
font-size is a float even in fontmap_t, also, use >>6 instead of the sf[xy] values

14 years agofont request sizes are floats now
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 17:00:59 +0000 (19:00 +0200)]
font request sizes are floats now

14 years agoMerge commit 'origin/master' into ft2
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 13:02:26 +0000 (15:02 +0200)]
Merge commit 'origin/master' into ft2

14 years agofix a lil bug in u8_bytelen
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 13:00:32 +0000 (15:00 +0200)]
fix a lil bug in u8_bytelen

14 years agotake fnt scale into account in TextWidth
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 12:46:46 +0000 (14:46 +0200)]
take fnt scale into account in TextWidth

14 years agowidth and height for TextWidth
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 12:43:03 +0000 (14:43 +0200)]
width and height for TextWidth

14 years agofont scaling...
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 11:08:25 +0000 (13:08 +0200)]
font scaling...

14 years agobetter size-seeking and float sizes in DrawQ_TextWidth
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 10:31:51 +0000 (12:31 +0200)]
better size-seeking and float sizes in DrawQ_TextWidth

14 years agofont can load multiple sizes now
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 10:20:41 +0000 (12:20 +0200)]
font can load multiple sizes now

14 years agocommitting utf8lib outside of ft2 files
Wolfgang (Blub) Bumiller [Thu, 3 Sep 2009 09:30:22 +0000 (11:30 +0200)]
committing utf8lib outside of ft2 files

14 years agoanother oops, sorry, forgot to commit this from at home
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

14 years agostuff I forgot to commit
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

14 years agoQuake menu: show DP's weird resolution set in windowed mode, and really detected...
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

14 years agoas requested by LH, #if 0 out cycleweapon
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

14 years agoMerge commit 'origin/master' into ft2
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 20:38:36 +0000 (22:38 +0200)]
Merge commit 'origin/master' into ft2

14 years agostr2chr and chr2str utf8-aware
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 20:32:25 +0000 (22:32 +0200)]
str2chr and chr2str utf8-aware

14 years agofix that line breaking
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 20:32:17 +0000 (22:32 +0200)]
fix that line breaking

14 years agoa couple of utility functions useful for VM_substring, and VM_substring implementation
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

14 years agoforgot to revert
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 18:48:31 +0000 (20:48 +0200)]
forgot to revert

14 years agotry to load .otf files too
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 18:29:41 +0000 (20:29 +0200)]
try to load .otf files too

14 years agouse the utf-8 cursor characters if possible, fallback to + and - if not
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

14 years agofix drawing and TextWidth
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 14:31:13 +0000 (16:31 +0200)]
fix drawing and TextWidth

14 years agodo not crash when zlib is missing, but instead do not use deflate/inflate
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

14 years agor_font_disable_freetype, started with DrawQ_TextWidth support
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 12:53:31 +0000 (14:53 +0200)]
r_font_disable_freetype, started with DrawQ_TextWidth support

14 years agodefine 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:34:42 +0000 (14:34 +0200)]
define ft2_oldstyle_map in ft2.h since it won't be limited to DrawQ_String_Font anymore

14 years agor_font_use_alpha_textures to use TEXTYPE_ALPHA - currently renders black though....
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

14 years agoloadfont with face -1 to disable freetype loading for this font
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

14 years agouse 16 as default size again
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 10:11:49 +0000 (12:11 +0200)]
use 16 as default size again

14 years agosupport faces
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 10:06:55 +0000 (12:06 +0200)]
support faces

14 years agothis should be fine
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 09:59:22 +0000 (11:59 +0200)]
this should be fine

14 years agoworking on better font rendering
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 09:55:49 +0000 (11:55 +0200)]
working on better font rendering

14 years agoworking on better font rendering
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 09:55:12 +0000 (11:55 +0200)]
working on better font rendering

14 years agosome shortcuts
Wolfgang (Blub) Bumiller [Wed, 2 Sep 2009 09:32:29 +0000 (11:32 +0200)]
some shortcuts

14 years agodo not render bitmaps, they're ready to use as is
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

14 years agocheck if the current charmap contains the character before searching the list for...
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

14 years agoremoved testfont and old drawing routine
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 17:28:28 +0000 (19:28 +0200)]
removed testfont and old drawing routine

14 years agocorrect offsets when parsing color codes
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 17:27:03 +0000 (19:27 +0200)]
correct offsets when parsing color codes

14 years agoadding font attachments, supporting type-1 fonts with .afm kerning info
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

14 years agowhat was I thinking
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 16:36:07 +0000 (18:36 +0200)]
what was I thinking

14 years agooops
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 15:10:02 +0000 (17:10 +0200)]
oops

14 years agokerning support, let's test
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 15:08:06 +0000 (17:08 +0200)]
kerning support, let's test

14 years agostarting with kerning support
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 15:00:24 +0000 (17:00 +0200)]
starting with kerning support

14 years agorendering now works
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 14:07:54 +0000 (16:07 +0200)]
rendering now works

14 years agofirst find map then draw the batches
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 14:01:10 +0000 (16:01 +0200)]
first find map then draw the batches

14 years agouse the texpath for Font_LoadFont actually...
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:53:57 +0000 (15:53 +0200)]
use the texpath for Font_LoadFont actually...

14 years agookay, let's work with old-style fonts now
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:52:11 +0000 (15:52 +0200)]
okay, let's work with old-style fonts now

14 years agodo not try to use ft2 if not available for that font
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

14 years ago...
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:47:22 +0000 (15:47 +0200)]
...

14 years agoIntegrated font rendering - untested
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:46:39 +0000 (15:46 +0200)]
Integrated font rendering - untested

14 years agoIntegrated font rendering - untested
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:45:02 +0000 (15:45 +0200)]
Integrated font rendering - untested

14 years agorevert to the real text rendering function
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:20:48 +0000 (15:20 +0200)]
revert to the real text rendering function

14 years agoFont_Init before GL_Draw_Init
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:18:02 +0000 (15:18 +0200)]
Font_Init before GL_Draw_Init

14 years agoFont_Alloc, and load ttf fonts for every other font we load
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

14 years agono mipmapping for ft2 font textures
Wolfgang (Blub) Bumiller [Tue, 1 Sep 2009 13:10:00 +0000 (15:10 +0200)]
no mipmapping for ft2 font textures