Menu
▾
▴
[cadcdev-svn-commits] [296] tiki/examples/TikiTest: Added Code::Blocks project file
|
From: <cad...@li...> - 2005-12-23 02:24:52
|
<!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>[296] tiki/examples/TikiTest: Added Code::Blocks project file</tit= le> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>296</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-12-22 18:15:41 -0800 (Thu, 22 Dec 2005)</dd> </dl> <h3>Log Message</h3> <pre>Added Code::Blocks project file test.cpp tab->space conversion Added windows.h and pch.h to TikiTest.cpp, probably pch.h should be pulle= d in from the compiler but I could not figure out how (yet)</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiexamplesTikiTestsrcTikiTestcpp">tiki/examples/TikiTes= t/src/TikiTest.cpp</a></li> <li><a href=3D"#tikiexamplesTikiTestsrctestcpp">tiki/examples/TikiTest/sr= c/test.cpp</a></li> </ul> <h3>Added Paths</h3> <ul> <li><a href=3D"#tikiexamplesTikiTesttikitestcbp">tiki/examples/TikiTest/t= ikitest.cbp</a></li> <li><a href=3D"#tikiexamplesTikiTesttikitestlayout">tiki/examples/TikiTes= t/tikitest.layout</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiexamplesTikiTestsrcTikiTestcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/examples/TikiTest/src/TikiTest.= cpp (295 =3D> 296)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/examples/TikiTest/src/TikiTest.cpp 2005-12-= 23 02:14:28 UTC (rev 295) +++ tiki/examples/TikiTest/src/TikiTest.cpp 2005-12-23 02:15:41 UTC (rev = 296) </span><span class=3D"lines">@@ -6,9 +6,12 @@ </span><span class=3D"cx"> * </span><span class=3D"cx"> */ </span><span class=3D"cx">=20 </span><del>-#include <Tiki/Tiki.h> </del><ins>+#include <Tiki/Tiki.h> +#include <pch.h> </ins><span class=3D"cx">=20 </span><del>-#if TIKI_PLAT =3D=3D TIKI_WIN32 </del><ins>+#if TIKI_PLAT =3D=3D TIKI_WIN32 +#include <windows.h> + </ins><span class=3D"cx"> static char szAppName[] =3D "TikiTest"= ;; </span><span class=3D"cx"> int APIENTRY WinMain(HINSTANCE hInst, HINSTANC= E hPrevInstance, LPSTR lpCmdLine, int nCmdShow) </span><span class=3D"cx"> #else </span></pre></div> <a id=3D"tikiexamplesTikiTestsrctestcpp"></a> <div class=3D"modfile"><h4>Modified: tiki/examples/TikiTest/src/test.cpp = (295 =3D> 296)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/examples/TikiTest/src/test.cpp 2005-12-23 0= 2:14:28 UTC (rev 295) +++ tiki/examples/TikiTest/src/test.cpp 2005-12-23 02:15:41 UTC (rev 296) </span><span class=3D"lines">@@ -39,40 +39,40 @@ </span><span class=3D"cx"> //Draw the mouse pointer, parallax-style! </span><span class=3D"cx"> void draw_mouse(volatile mouse_pos_t *pos) { </span><span class=3D"cx"> plx_vertex_t vert; </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> plx_mat3d_identity(); </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> vert.argb =3D Color(0,0,0); </span><span class=3D"cx"> vert.z =3D 0.3; </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> vert.flags =3D PLX_VERT; </span><span class=3D"cx"> vert.x =3D pos->x-2; </span><span class=3D"cx"> vert.y =3D pos->y-4; </span><span class=3D"cx"> plx_prim(&vert, sizeof(vert)); </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> vert.flags =3D PLX_VERT; </span><span class=3D"cx"> vert.x =3D pos->x+18; </span><span class=3D"cx"> vert.y =3D pos->y+16; </span><span class=3D"cx"> plx_prim(&vert, sizeof(vert)); </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> vert.flags =3D PLX_VERT_EOS; </span><span class=3D"cx"> vert.x =3D pos->x-2; </span><span class=3D"cx"> vert.y =3D pos->y+24; </span><span class=3D"cx"> plx_prim(&vert, sizeof(vert)); </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> vert.argb =3D Color(0.8,0.2,0.1); </span><span class=3D"cx"> vert.z =3D 0.31; </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> vert.flags =3D PLX_VERT; </span><span class=3D"cx"> vert.x =3D pos->x; </span><span class=3D"cx"> vert.y =3D pos->y; </span><span class=3D"cx"> plx_prim(&vert, sizeof(vert)); </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> vert.flags =3D PLX_VERT; </span><span class=3D"cx"> vert.x =3D pos->x+15; </span><span class=3D"cx"> vert.y =3D pos->y+15; </span><span class=3D"cx"> plx_prim(&vert, sizeof(vert)); </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> vert.flags =3D PLX_VERT_EOS; </span><span class=3D"cx"> vert.x =3D pos->x; </span><span class=3D"cx"> vert.y =3D pos->y+21; </span><span class=3D"lines">@@ -126,7 +126,7 @@ </span><span class=3D"cx"> plx_vert_fnd(&dr_state, PLX_VERT, </span><span class=3D"cx"> x, y, z, 1.0f, </span><span class=3D"cx"> 0.0f, g, b); </span><del>- =20 </del><ins>+ </ins><span class=3D"cx"> /* x, y */ </span><span class=3D"cx"> x =3D radius * fcos( yaw ) * fcos( pitch ); </span><span class=3D"cx"> y =3D radius * fsin( pitch ); </span><span class=3D"lines">@@ -159,13 +159,13 @@ </span><span class=3D"cx"> // vid_border_color(0, 255, 0); </span><span class=3D"cx">=20 </span><span class=3D"cx"> //Draw the mice </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> for (i=3D0; i<4; i++) { </span><span class=3D"cx"> if(mp[i].valid) { </span><span class=3D"cx"> draw_mouse(&mp[i]); </span><span class=3D"cx"> } </span><span class=3D"cx"> } </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> plx_mat3d_identity(); </span><span class=3D"cx"> plx_mat3d_translate(0.0f, 0.0f, -12.0f); </span><span class=3D"cx"> plx_mat3d_rotate(r * 2, 0.75f, 1.0f, 0.5f); </span><span class=3D"lines">@@ -218,7 +218,7 @@ </span><span class=3D"cx"> mp[port].valid=3D1; </span><span class=3D"cx"> mp[port].x=3D320; </span><span class=3D"cx"> mp[port].y=3D240; </span><del>- } =09 </del><ins>+ } </ins><span class=3D"cx"> } </span><span class=3D"cx"> if (evt.type =3D=3D Event::EvtDetach) { </span><span class=3D"cx"> printf("Device detached: %s\n",evt= .dev->getName().c_str()); </span><span class=3D"lines">@@ -243,7 +243,7 @@ </span><span class=3D"cx"> mp[0].x=3D320; </span><span class=3D"cx"> mp[0].y=3D240; </span><span class=3D"cx"> #endif </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> RefPtr<TestObject> test =3D new TestObje= ct("1"); </span><span class=3D"cx"> RefPtr<TestObject> test2 =3D new TestOb= ject("2"); </span><span class=3D"cx"> test->connect("testevent", test2= ); </span><span class=3D"lines">@@ -262,7 +262,7 @@ </span><span class=3D"cx"> /* OggVorbis::stop(); </span><span class=3D"cx"> OggVorbis::shutdown(); */ </span><span class=3D"cx"> Tiki::shutdown(); </span><del>-=09 </del><ins>+ </ins><span class=3D"cx"> return 0; </span><span class=3D"cx"> } </span><span class=3D"cx">=20 </span></pre></div> <a id=3D"tikiexamplesTikiTesttikitestcbp"></a> <div class=3D"addfile"><h4>Added: tiki/examples/TikiTest/tikitest.cbp (29= 5 =3D> 296)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/examples/TikiTest/tikitest.cbp 2005-12-23 0= 2:14:28 UTC (rev 295) +++ tiki/examples/TikiTest/tikitest.cbp 2005-12-23 02:15:41 UTC (rev 296) </span><span class=3D"lines">@@ -0,0 +1,50 @@ </span><ins>+<?xml version=3D"1.0"?> +<!DOCTYPE CodeBlocks_project_file> +<CodeBlocks_project_file> + <FileVersion major=3D"1" minor=3D"1"/> + <Project> + <Option title=3D"TikiTest"/> + <Option makefile=3D"Makefile"/> + <Option makefile_is_custom=3D"0"/> + <Option compiler=3D"1"/> + <Build> + <Target title=3D"default"> + <Option output=3D"C:\projects\tiki\examples\TikiTest\tikites= t.exe"/> + <Option working_dir=3D"."/> + <Option object_output=3D".objs"/> + <Option deps_output=3D".deps"/> + <Option type=3D"0"/> + <Option compiler=3D"1"/> + <Option projectResourceIncludeDirsRelation=3D"0"/> + </Target> + </Build> + <Compiler> + <Add directory=3D"..\..\include"/> + <Add directory=3D"..\..\win32\include"/> + </Compiler> + <Linker> + <Add library=3D"gdi32"/> + <Add library=3D"user32"/> + <Add library=3D"kernel32"/> + <Add directory=3D"..\..\win32"/> + </Linker> + <Unit filename=3D"src\TikiTest.cpp"> + <Option compilerVar=3D"CPP"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"src\test.cpp"> + <Option compilerVar=3D"CPP"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"src\testobj.cpp"> + <Option compilerVar=3D"CPP"/> + <Option target=3D"default"/> + </Unit> + <Unit filename=3D"src\testobj.h"> + <Option compilerVar=3D""/> + <Option compile=3D"0"/> + <Option link=3D"0"/> + <Option target=3D"default"/> + </Unit> + </Project> +</CodeBlocks_project_file> </ins></pre></div> <a id=3D"tikiexamplesTikiTesttikitestlayout"></a> <div class=3D"addfile"><h4>Added: tiki/examples/TikiTest/tikitest.layout = (295 =3D> 296)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/examples/TikiTest/tikitest.layout 2005-12-2= 3 02:14:28 UTC (rev 295) +++ tiki/examples/TikiTest/tikitest.layout 2005-12-23 02:15:41 UTC (rev 2= 96) </span><span class=3D"lines">@@ -0,0 +1,10 @@ </span><ins>+<?xml version=3D"1.0"?> +<!DOCTYPE CodeBlocks_layout_file> +<CodeBlocks_layout_file> + <File name=3D"src\TikiTest.cpp" open=3D"0" top=3D= "0"> + <Cursor position=3D"129" topLine=3D"0"/> + </File> + <File name=3D"src\test.cpp" open=3D"0" top=3D&qu= ot;0"> + <Cursor position=3D"5305" topLine=3D"211"/> + </File> +</CodeBlocks_layout_file> </ins></pre> </div> </div> </body> </html> |
