Menu
▾
▴
[cadcdev-svn-commits] [271] tiki/src/gl: Tiki: make m_*_prelative protected so subclasses can set them, and actually obey m_t_prelative
|
From: <cad...@li...> - 2005-11-21 23:28:54
|
<!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>[271] tiki/src/gl: Tiki: make m_*_prelative protected so subclasse= s can set them, and actually obey m_t_prelative</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>271</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-11-21 15:21:00 -0800 (Mon, 21 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: make m_*_prelative protected so subclasses can set them, and a= ctually obey m_t_prelative</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiincludeTikidrawableh">tiki/include/Tiki/drawable.h</a= ></li> <li><a href=3D"#tikisrcgldrawablecpp">tiki/src/gl/drawable.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiincludeTikidrawableh"></a> <div class=3D"modfile"><h4>Modified: tiki/include/Tiki/drawable.h (270 =3D= > 271)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/include/Tiki/drawable.h 2005-11-21 23:07:01= UTC (rev 270) +++ tiki/include/Tiki/drawable.h 2005-11-21 23:21:00 UTC (rev 271) </span><span class=3D"lines">@@ -158,7 +158,12 @@ </span><span class=3D"cx">=20 </span><span class=3D"cx"> /// Pops the old matrix off the stack. </span><span class=3D"cx"> void popTransformMatrix() const; </span><del>- </del><ins>+=09 + bool m_t_prelative; ///< Is translation parent-relative? + bool m_r_prelative; ///< Is rotation parent-relative? + bool m_s_prelative; ///< Is scaling parent-relative? + bool m_a_prelative; ///< Is alpha parent-relative? +=09 </ins><span class=3D"cx"> private: </span><span class=3D"cx"> uint64 m_lastUpdate; ///< Last microseco= nd we updated our animations </span><span class=3D"cx">=20 </span><span class=3D"lines">@@ -167,10 +172,6 @@ </span><span class=3D"cx"> Vector m_scale; ///< Scaling (about cent= er) </span><span class=3D"cx"> float m_alpha; ///< Alpha value </span><span class=3D"cx"> Color m_tint; ///< Color tint value </span><del>- bool m_t_prelative; ///< Is translation parent-relativ= e? - bool m_r_prelative; ///< Is rotation parent-relative? - bool m_s_prelative; ///< Is scaling parent-relative? - bool m_a_prelative; ///< Is alpha parent-relative? </del><span class=3D"cx">=20 </span><span class=3D"cx"> bool m_finished; ///< Is it "finish= ed" (i.e., can safely be removed from scene) </span><span class=3D"cx"> bool m_subs_finished; ///< Cached resulte= s if all sub-drawables are finished </span></pre></div> <a id=3D"tikisrcgldrawablecpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/gl/drawable.cpp (270 =3D> 2= 71)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/drawable.cpp 2005-11-21 23:07:01 UTC= (rev 270) +++ tiki/src/gl/drawable.cpp 2005-11-21 23:21:00 UTC (rev 271) </span><span class=3D"lines">@@ -214,7 +214,7 @@ </span><span class=3D"cx">=20 </span><span class=3D"cx"> Vector Drawable::getPosition() const { </span><span class=3D"cx"> Vector pos =3D getTranslate(); </span><del>- if (m_parent) </del><ins>+ if (m_parent && m_t_prelative) </ins><span class=3D"cx"> pos +=3D m_parent->getPosition(); </span><span class=3D"cx">=20 </span><span class=3D"cx"> // This value will be used during sorting for= scene drawing. </span></pre> </div> </div> </body> </html> |
