Menu
▾
▴
[cadcdev-svn-commits] [302] tiki/src/gl/texture.cpp: Tiki: modulate alpha on created canvases so text can be translucent
|
From: <cad...@li...> - 2006-01-07 06:42:21
|
<!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>[302] tiki/src/gl/texture.cpp: Tiki: modulate alpha on created can= vases so text can be translucent</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>302</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2006-01-06 22:32:41 -0800 (Fri, 06 Jan 2006)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: modulate alpha on created canvases so text can be translucent<= /pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikisrcgltexturecpp">tiki/src/gl/texture.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikisrcgltexturecpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/gl/texture.cpp (301 =3D> 30= 2)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/texture.cpp 2006-01-07 06:31:46 UTC = (rev 301) +++ tiki/src/gl/texture.cpp 2006-01-07 06:32:41 UTC (rev 302) </span><span class=3D"lines">@@ -230,6 +230,8 @@ </span><span class=3D"cx"> #if TIKI_PLAT !=3D TIKI_DC //KGL doesn't suppo= rt these </span><span class=3D"cx"> glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG= _FILTER, GL_LINEAR); </span><span class=3D"cx"> glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN= _FILTER, GL_LINEAR); </span><ins>+#else + glTexEnvi(GL_TEXTURE_2D,GL_TEXTURE_ENV_MODE,GL_MODULATEALPHA); </ins><span class=3D"cx"> #endif </span><span class=3D"cx">=20 </span><span class=3D"cx"> m_w =3D w; </span></pre> </div> </div> </body> </html> |
