Menu
▾
▴
[cadcdev-svn-commits] [283] tiki/src/gl/font.cpp: Tiki: Apply Jim Ursetto's ARGB4444 font patch for parallax to Tiki
|
From: <cad...@li...> - 2005-11-27 21:59:24
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: = #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica= ,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; fo= nt-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padd= ing: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt= ;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:aut= o;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 = 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 = 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[283] tiki/src/gl/font.cpp: Tiki: Apply Jim Ursetto's ARGB4444 fon= t patch for parallax to Tiki</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>283</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-11-27 13:51:09 -0800 (Sun, 27 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: Apply Jim Ursetto's ARGB4444 font patch for parallax to Tiki</= pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikisrcglfontcpp">tiki/src/gl/font.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikisrcglfontcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/gl/font.cpp (282 =3D> 283)<= /h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/font.cpp 2005-11-27 00:55:14 UTC (re= v 282) +++ tiki/src/gl/font.cpp 2005-11-27 21:51:09 UTC (rev 283) </span><span class=3D"lines">@@ -185,7 +185,7 @@ </span><span class=3D"cx">=20 </span><span class=3D"cx"> /* Make sure we can allocate texture space fo= r it */ </span><span class=3D"cx"> m_fnt.txr =3D new Texture; </span><del>- if (!m_fnt.txr->createCanvas(hdr.txr_width, hdr.txr_heig= ht, Texture::ARGB1555)) { </del><ins>+ if (!m_fnt.txr->createCanvas(hdr.txr_width, hdr.txr_heigh= t, Texture::ARGB4444)) { </ins><span class=3D"cx"> Debug::printf("plx_font_load: can't allo= cate texture for '%s'\n", fn.c_str()); </span><span class=3D"cx"> return false; </span><span class=3D"cx"> } </span><span class=3D"lines">@@ -300,16 +300,15 @@ </span><span class=3D"cx"> return false; </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><del>- /* Convert to ARGB1555 -- go backwards so we can do it in = place */ - /* XXX Technically we should probably switch to ARGB4444 here */ </del><ins>+ /* Convert to ARGB4444 -- go backwards so we can do it in p= lace */ + /* PLIB seems to duplicate the alpha value into luminance. I think it + * looks nicer to hardcode luminance to 1.0; characters look more robu= st. */ </ins><span class=3D"cx"> bmtmp =3D (uint8 *)txrtmp; </span><span class=3D"cx"> for (int x=3Dbmsize-1; x>=3D0; x--) { </span><del>- if (bmtmp[x] =3D=3D 0) - txrtmp[x] =3D 0x0000; - else { - int c =3D ((int)bmtmp[x]) >> 3; - txrtmp[x] =3D 0x8000 | (c << 10) | (c << 5) | (c <<= ; 0); - } </del><ins>+ uint8 alpha =3D (bmtmp[x] & 0xF0) >> 4; + /* uint8 lum =3D alpha; */ + uint8 lum =3D 0x0f; + txrtmp[x] =3D (alpha << 12) | (lum << 8) | (lum << = 4) | (lum << 0); </ins><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><span class=3D"cx"> break; </span></pre> </div> </div> </body> </html> |
