|
From: <cad...@li...> - 2005-11-21 23:39:46
|
<!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>[273] tiki/src/gl/drawables: Tiki: rename pointerArrow to PointerA= rrow</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>273</dd> <dt>Author</dt> <dd>sam.steele</dd> <dt>Date</dt> <dd>2005-11-21 15:31:52 -0800 (Mon, 21 Nov 2005)</dd> </dl> <h3>Log Message</h3> <pre>Tiki: rename pointerArrow to PointerArrow</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiincludeTikidrawablescursorh">tiki/include/Tiki/drawab= les/cursor.h</a></li> <li><a href=3D"#tikiincludeTikidrawablespointerArrowh">tiki/include/Tiki/= drawables/pointerArrow.h</a></li> <li><a href=3D"#tikisrcgldrawablescursorcpp">tiki/src/gl/drawables/cursor= .cpp</a></li> <li><a href=3D"#tikisrcgldrawablespointerArrowcpp">tiki/src/gl/drawables/= pointerArrow.cpp</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiincludeTikidrawablescursorh"></a> <div class=3D"modfile"><h4>Modified: tiki/include/Tiki/drawables/cursor.h= (272 =3D> 273)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/include/Tiki/drawables/cursor.h 2005-11-21 = 23:22:01 UTC (rev 272) +++ tiki/include/Tiki/drawables/cursor.h 2005-11-21 23:31:52 UTC (rev 273= ) </span><span class=3D"lines">@@ -9,7 +9,7 @@ </span><span class=3D"cx"> #ifndef __TIKI_DRW_CURSOR_H </span><span class=3D"cx"> #define __TIKI_DRW_CURSOR_H </span><span class=3D"cx">=20 </span><del>-#include <Tiki/drawable.h> </del><ins>+#include "Tiki/drawable.h" </ins><span class=3D"cx">=20 </span><span class=3D"cx"> namespace Tiki { </span><span class=3D"cx"> namespace GL { </span></pre></div> <a id=3D"tikiincludeTikidrawablespointerArrowh"></a> <div class=3D"modfile"><h4>Modified: tiki/include/Tiki/drawables/pointerA= rrow.h (272 =3D> 273)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/include/Tiki/drawables/pointerArrow.h 2005-= 11-21 23:22:01 UTC (rev 272) +++ tiki/include/Tiki/drawables/pointerArrow.h 2005-11-21 23:31:52 UTC (r= ev 273) </span><span class=3D"lines">@@ -15,14 +15,14 @@ </span><span class=3D"cx"> namespace Tiki { </span><span class=3D"cx"> namespace GL { </span><span class=3D"cx">=20 </span><del>-/* pointerArrow is an arrow-shaped Drawable, normally used a= s a Cursor pointer */ -class pointerArrow : public Tiki::GL::Drawable { </del><ins>+/* PointerArrow is an arrow-shaped Drawable, normally used as= a Cursor pointer */ +class PointerArrow : public Drawable { </ins><span class=3D"cx"> public: </span><del>- pointerArrow(); - ~pointerArrow(); </del><ins>+ PointerArrow(); + ~PointerArrow(); </ins><span class=3D"cx"> =09 </span><span class=3D"cx"> //Overloaded functions </span><del>- void draw(Tiki::GL::Drawable::ObjType list); </del><ins>+ void draw(ObjType list); </ins><span class=3D"cx"> }; </span><span class=3D"cx">=20 </span><span class=3D"cx"> }; </span></pre></div> <a id=3D"tikisrcgldrawablescursorcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/gl/drawables/cursor.cpp (27= 2 =3D> 273)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/drawables/cursor.cpp 2005-11-21 23:2= 2:01 UTC (rev 272) +++ tiki/src/gl/drawables/cursor.cpp 2005-11-21 23:31:52 UTC (rev 273) </span><span class=3D"lines">@@ -30,7 +30,7 @@ </span><span class=3D"cx"> subRemoveAll(); </span><span class=3D"cx"> =09 </span><span class=3D"cx"> if(pointer=3D=3DNULL) { </span><del>- subAdd(new pointerArrow()); </del><ins>+ subAdd(new PointerArrow()); </ins><span class=3D"cx"> } else { </span><span class=3D"cx"> subAdd(pointer); </span><span class=3D"cx"> } </span></pre></div> <a id=3D"tikisrcgldrawablespointerArrowcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/src/gl/drawables/pointerArrow.c= pp (272 =3D> 273)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/src/gl/drawables/pointerArrow.cpp 2005-11-2= 1 23:22:01 UTC (rev 272) +++ tiki/src/gl/drawables/pointerArrow.cpp 2005-11-21 23:31:52 UTC (rev 2= 73) </span><span class=3D"lines">@@ -15,20 +15,20 @@ </span><span class=3D"cx"> using namespace Tiki::GL; </span><span class=3D"cx"> using namespace Tiki::GL::Plxcompat; </span><span class=3D"cx">=20 </span><del>-pointerArrow::pointerArrow() { </del><ins>+PointerArrow::PointerArrow() { </ins><span class=3D"cx"> setTint(Color(1.0,0.2,0.1)); </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><del>-pointerArrow::~pointerArrow() { </del><ins>+PointerArrow::~PointerArrow() { </ins><span class=3D"cx"> } </span><span class=3D"cx">=20 </span><del>-void pointerArrow::draw(ObjType list) { </del><ins>+void PointerArrow::draw(ObjType list) { </ins><span class=3D"cx"> plx_vertex_t vert; </span><span class=3D"cx"> const Vector & tv =3D getPosition(); </span><span class=3D"cx">=20 </span><span class=3D"cx"> if(list=3D=3DTrans) { </span><span class=3D"cx"> vert.argb =3D Color(0,0,0); </span><del>- vert.z =3D 0; </del><ins>+ vert.z =3D tv.z; </ins><span class=3D"cx"> =09 </span><span class=3D"cx"> vert.flags =3D PLX_VERT; </span><span class=3D"cx"> vert.x =3D tv.x-2; </span><span class=3D"lines">@@ -46,7 +46,7 @@ </span><span class=3D"cx"> plx_prim(&vert, sizeof(vert)); </span><span class=3D"cx"> =09 </span><span class=3D"cx"> vert.argb =3D getTint(); </span><del>- vert.z =3D 0.01; </del><ins>+ vert.z =3D tv.z + 0.01; </ins><span class=3D"cx"> =09 </span><span class=3D"cx"> vert.flags =3D PLX_VERT; </span><span class=3D"cx"> vert.x =3D tv.x; </span></pre> </div> </div> </body> </html> |