diff options
Diffstat (limited to 'cvs/cvsweb.cgi/code/client/Attic/client.cpp.diff?r1=1.10&r2=1.11&hideattic=0&sortby=date')
-rw-r--r-- | cvs/cvsweb.cgi/code/client/Attic/client.cpp.diff?r1=1.10&r2=1.11&hideattic=0&sortby=date | 219 |
1 files changed, 219 insertions, 0 deletions
diff --git a/cvs/cvsweb.cgi/code/client/Attic/client.cpp.diff?r1=1.10&r2=1.11&hideattic=0&sortby=date b/cvs/cvsweb.cgi/code/client/Attic/client.cpp.diff?r1=1.10&r2=1.11&hideattic=0&sortby=date new file mode 100644 index 00000000..072e7632 --- /dev/null +++ b/cvs/cvsweb.cgi/code/client/Attic/client.cpp.diff?r1=1.10&r2=1.11&hideattic=0&sortby=date @@ -0,0 +1,219 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><HTML> +<HEAD><style> A { color:black }</style> +<!-- hennerik CVSweb $Revision: 1.93 $ --> +<TITLE>code/client/client.cpp - diff - 1.11</TITLE></HEAD> +<BODY BGCOLOR="#eeeeee"> +<table width="100%" border=0 cellspacing=0 cellpadding=1 bgcolor="#aaaaaa"><tr valign=bottom><td><a href="/cvs/cvsweb.cgi/code/client/Attic/client.cpp?hideattic=0&sortby=date"><IMG SRC="http://www.nevrax.org/inc/img/picto-up.gif" ALT="[BACK]" BORDER="0" WIDTH="14" HEIGHT="13"></a> <b>Return to <A HREF="/cvs/cvsweb.cgi/code/client/Attic/client.cpp?hideattic=0&sortby=date">client.cpp</A> + CVS log</b> <IMG SRC="http://www.nevrax.org/inc/img/picto-news.gif" ALT="[TXT]" BORDER="0" WIDTH="13" HEIGHT="15"></td><td align=right><IMG SRC="http://www.nevrax.org/inc/img/picto-dir.gif" ALT="[DIR]" BORDER="0" WIDTH="15" HEIGHT="13"> <b>Up to <a href="/cvs/cvsweb.cgi/?hideattic=0&sortby=date">Nevrax</a> / <a href="/cvs/cvsweb.cgi/code/?hideattic=0&sortby=date">code</a> / <a href="/cvs/cvsweb.cgi/code/client/?hideattic=0&sortby=date">client</a></b></td></tr></table><h3 align=center>Diff for /code/client/Attic/client.cpp between version 1.10 and 1.11</h3> +<table border=0 cellspacing=0 cellpadding=0 width="100%"> +<tr bgcolor="#ffffff"> +<th width="50%" valign=TOP>version 1.10, 2000/12/04 10:47:15</th> +<th width="50%" valign=TOP>version 1.11, 2000/12/04 17:58:09</th> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 56</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 56</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> #endif</font></td><td><font face="Helvetica,Arial" size="-1"> #endif</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> CEventListenerAsync asyncListener;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CMoveListener moveListener;</font></td><td><font face="Helvetica,Arial" size="-1"> CMoveListener moveListener;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 105</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 104</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> */</font></td><td><font face="Helvetica,Arial" size="-1"> */</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> void zoneMainProc(CScene * scene)</font></td><td><font face="Helvetica,Arial" size="-1"> void zoneMainProc(CScene * scene)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> /*</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> static CVector cameraRot(CVector::Null);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> static CVector cameraPos(0,-20,0);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> static uint32 framesCount;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> // time mgt.</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> static float t0= (sint64)CTime::getLocalTime()*0.001f;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> static float t1;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> t1= (sint64)CTime::getLocalTime()*0.001f;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> float dt= t1-t0;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> dt= 0.02f;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> // Speed</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> const uint8 nspeed = 5;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> static float speedBuf[nspeed]= { 1.66f, // 6km/h</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> 3.33f, // 12km/h</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> 8.33f, // 30km/h</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> 40.0f, // 144km/h</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> 200.0f // 700km/h</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> };</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> static uint8 idSpeed = 2;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> float speed = speedBuf[idSpeed];</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if(asyncListener.isKeyPush(KeyS))//getPressKeyState(KeyS))</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> {</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> idSpeed++;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> idSpeed %= nspeed;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> speed = speedBuf[idSpeed];</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> }</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> // Rotation</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> float rotSpeed = 80*(float)Pi/180;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if(asyncListener.isKeyPush(KeyLEFT)) cameraRot.z += rotSpeed*dt;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if(asyncListener.isKeyPush(KeyRIGHT)) cameraRot.z -= rotSpeed*dt;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if(asyncListener.isKeyPush(KeyHOME)) cameraRot.x += rotSpeed*dt;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if(asyncListener.isKeyPush(KeyEND)) cameraRot.x -= rotSpeed*dt;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> // Move</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> CVector dir(0,speed*dt,0);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> CMatrix mat;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> mat.identity();</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> mat.rotateZ(cameraRot.z);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> mat.rotateX(cameraRot.x);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> dir= mat.mulVector(dir);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if(asyncListener.isKeyPush(KeyUP)) cameraPos += dir;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if(asyncListener.isKeyPush(KeyDOWN)) cameraPos -= dir;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if(asyncListener.isKeyPush(KeyA)) cameraPos.z += speed*dt;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if(asyncListener.isKeyPush(KeyQ)) cameraPos.z -= speed*dt;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if(asyncListener.isKeyPush(KeyR)) </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> {</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> cameraPos.set(0,0,0);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> cameraRot.set(0,0,0);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> }</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> // Straff</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> float straff = 0;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if(asyncListener.isKeyPush(KeyW)) straff = -speed*dt;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if(asyncListener.isKeyPush(KeyX)) straff = speed*dt;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if(straff)</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> {</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> CMatrix m;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> m.identity();</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> m.rotateZ(cameraRot.z);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> m.rotateX(cameraRot.x);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> cameraPos += m*CVector(straff,0,0);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> }</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> // Camera</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> CMatrix cam;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> cam.identity();</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> cam.setRot(cameraRot, CMatrix::ZXY);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> cam.setPos(cameraPos);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> CSceneUt::Camera->setMatrix(cam);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> */</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> //scene->getDriver()->setupViewMatrix(moveListener.getViewMatrix());</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> CSceneUt::Camera->setMatrix(moveListener.getViewMatrix());</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // Render.</font></td><td><font face="Helvetica,Arial" size="-1"> // Render.</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> scene->clearBuffers(CRGBA(255,251,240));</font></td><td><font face="Helvetica,Arial" size="-1"> scene->clearBuffers(CRGBA(255,251,240));</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> scene->render();</font></td><td><font face="Helvetica,Arial" size="-1"> scene->render();</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> scene->swapBuffers();</font></td><td><font face="Helvetica,Arial" size="-1"> scene->swapBuffers();</font></td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> //t0 = t1;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> //framesCount++;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 204</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 116</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> /**</font></td><td><font face="Helvetica,Arial" size="-1"> /**</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> * displayZone</font></td><td><font face="Helvetica,Arial" size="-1"> * displayZone</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> */</font></td><td><font face="Helvetica,Arial" size="-1"> */</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> void displayZone(CScene * scene, const char * zonePath)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> void displayZone(CScene * scene, uint w, uint h, const char * zonePath)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // Positioning camera</font></td><td><font face="Helvetica,Arial" size="-1"> // Positioning camera</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CMatrix camera;</font></td><td><font face="Helvetica,Arial" size="-1"> CMatrix camera;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> camera.identity();</font></td><td><font face="Helvetica,Arial" size="-1"> camera.identity();</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> camera.setPos(CVector(0,-20,0));</font></td><td><font face="Helvetica,Arial" size="-1"> camera.setPos(CVector(0,-20,0));</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CSceneUt::Camera->setMatrix(camera);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CNELU::Camera->setMatrix(camera);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // Create a Landscape</font></td><td><font face="Helvetica,Arial" size="-1"> // Create a Landscape</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CLandscapeModel * land;</font></td><td><font face="Helvetica,Arial" size="-1"> CLandscapeModel * land;</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 231</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 143</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> CIFile bankFile("C:/Windows/bureau/tileset/bank.bank");</font></td><td><font face="Helvetica,Arial" size="-1"> CIFile bankFile("C:/Windows/bureau/tileset/bank.bank");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> land->Landscape->TileBank.serial(bankFile);</font></td><td><font face="Helvetica,Arial" size="-1"> land->Landscape->TileBank.serial(bankFile);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> scene->getDriver()->showCursor(false);</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // Events management</font></td><td><font face="Helvetica,Arial" size="-1"> // Events management</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CEventServer server;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CNELU::EventServer.addEmitter(scene->getDriver()->getEventEmitter());</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> server.addEmitter(scene->getDriver()->getEventEmitter());</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CNELU::AsyncListener.addToServer(CNELU::EventServer);</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> asyncListener.addToServer(server);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> moveListener.init(scene, w, h, *CNELU::Camera);</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> moveListener.setWithCamera(*CSceneUt::Camera);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> moveListener.addToServer(CNELU::EventServer);</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> moveListener.setViewport(scene->getViewport());</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> moveListener.addToServer(server);</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> do</font></td><td><font face="Helvetica,Arial" size="-1"> do</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> server.pump();</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CNELU::EventServer.pump();</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> zoneMainProc(scene);</font></td><td><font face="Helvetica,Arial" size="-1"> zoneMainProc(scene);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> while(!asyncListener.isKeyPush(KeyESCAPE));</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> while(!CNELU::AsyncListener.isKeyPush(KeyESCAPE));</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CNELU::AsyncListener.removeFromServer(CNELU::EventServer);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> moveListener.removeFromServer(CNELU::EventServer);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> scene->getDriver()->showCursor(true);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> asyncListener.removeFromServer(server);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> moveListener.removeFromServer(server);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 270</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 186</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> uint w = 800;</font></td><td><font face="Helvetica,Arial" size="-1"> uint w = 800;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> uint h = 600;</font></td><td><font face="Helvetica,Arial" size="-1"> uint h = 600;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> uint bpp = 32;</font></td><td><font face="Helvetica,Arial" size="-1"> uint bpp = 32;</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> bool windowed = true; //false;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> bool windowed = false;</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> NL3D::CScene scene;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> NL3D::CNELU::init(w, h, CViewport(), bpp, windowed); </font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> NL3D::CSceneUt::init3d(scene, w, h, scene.getViewport(), bpp, windowed); </font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // synchronize time with server</font></td><td><font face="Helvetica,Arial" size="-1"> // synchronize time with server</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CUniTime::syncUniTimeFromService();</font></td><td><font face="Helvetica,Arial" size="-1"> CUniTime::syncUniTimeFromService();</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 296</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 211</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> // language choice</font></td><td><font face="Helvetica,Arial" size="-1"> // language choice</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> case LANGUAGE: </font></td><td><font face="Helvetica,Arial" size="-1"> case LANGUAGE: </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> sint languageIndex = chooseLanguage(&scene, &fontGen, w, h);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> sint languageIndex = chooseLanguage(&CNELU::Scene, &fontGen, w, h);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> if(languageIndex==-1) </font></td><td><font face="Helvetica,Arial" size="-1"> if(languageIndex==-1) </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> quit = true;</font></td><td><font face="Helvetica,Arial" size="-1"> quit = true;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> else</font></td><td><font face="Helvetica,Arial" size="-1"> else</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 310</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 225</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> // get user's login and password</font></td><td><font face="Helvetica,Arial" size="-1"> // get user's login and password</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> case LOGIN: </font></td><td><font face="Helvetica,Arial" size="-1"> case LOGIN: </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if(login(&scene, &fontGen, w, h, shards))</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if(login(&CNELU::Scene, &fontGen, w, h, shards))</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> clientState = SHARD;</font></td><td><font face="Helvetica,Arial" size="-1"> clientState = SHARD;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> else</font></td><td><font face="Helvetica,Arial" size="-1"> else</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> clientState = LANGUAGE;</font></td><td><font face="Helvetica,Arial" size="-1"> clientState = LANGUAGE;</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 320</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 235</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> // shard choice</font></td><td><font face="Helvetica,Arial" size="-1"> // shard choice</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> case SHARD:</font></td><td><font face="Helvetica,Arial" size="-1"> case SHARD:</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> shardIndex = chooseShard(&scene, &fontGen, w, h, shards);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> shardIndex = chooseShard(&CNELU::Scene, &fontGen, w, h, shards);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> if(shardIndex==-1)</font></td><td><font face="Helvetica,Arial" size="-1"> if(shardIndex==-1)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> clientState = LOGIN;</font></td><td><font face="Helvetica,Arial" size="-1"> clientState = LOGIN;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> else</font></td><td><font face="Helvetica,Arial" size="-1"> else</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 333</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 248</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // display a zone</font></td><td><font face="Helvetica,Arial" size="-1"> // display a zone</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> displayZone(&scene,"pipo.zon");</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> displayZone(&CNELU::Scene,w,h,"pipo.zon");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> // release scene</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> // release nelu</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> NL3D::CSceneUt::release3d(scene);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> NL3D::CNELU::release();</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> catch(Exception &e)</font></td><td><font face="Helvetica,Arial" size="-1"> catch(Exception &e)</font></td></tr> +</table><br><hr noshade width="100%"> +<table border=0><tr><td><table border=1><tr><td>Legend:<br><table border=0 cellspacing=0 cellpadding=1> +<tr><td align=center bgcolor="#ff9999">Removed from v.1.10</td><td bgcolor="#cccccc"> </td></tr><tr bgcolor="#99ff99"><td align=center colspan=2>changed lines</td></tr><tr><td bgcolor="#cccccc"> </td><td align=center bgcolor="#ccccff">Added in v.1.11</td></tr></table></td></tr></table> +<td><FORM METHOD="GET" ACTION="/cvs/cvsweb.cgi/code/client/Attic/client.cpp.diff"> +<INPUT TYPE=HIDDEN NAME="sortby" VALUE="date"> +<INPUT TYPE=HIDDEN NAME="r1" VALUE="1.10"> +<INPUT TYPE=HIDDEN NAME="r2" VALUE="1.11"> +<INPUT TYPE=HIDDEN NAME="hideattic" VALUE="0"> +<SELECT NAME="f" onchange="submit()"> +<OPTION VALUE=h SELECTED>Colored Diff<OPTION VALUE=H>Long Colored Diff<OPTION VALUE=u>Unidiff<OPTION VALUE=c>Context Diff<OPTION VALUE=s>Side by Side</SELECT><INPUT TYPE=SUBMIT VALUE="Show"> +</FORM> +</td></tr></table>
\ No newline at end of file |