From: Cirilo B. <pin...@us...> - 2004-09-28 10:31:02
|
Update of /cvsroot/once/oncecode/src/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2250/src/client Modified Files: ocawsmgr.cpp ocawsmgr.h occlient.cpp occlient.h ocstatemgr.cpp Log Message: Client looks normal again, with console and navbar Index: ocawsmgr.h =================================================================== RCS file: /cvsroot/once/oncecode/src/client/ocawsmgr.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ocawsmgr.h 21 Sep 2004 08:37:52 -0000 1.9 --- ocawsmgr.h 28 Sep 2004 10:30:43 -0000 1.10 *************** *** 50,54 **** * overlays classes must use or keep a pointer to aws. Use the Ask* and the * Hide() function to require the display of specific windows. DisplayStarted ! * and DisplayStoped must be used to notify the aws manager when the 3d * display is started or stopped. */ --- 50,54 ---- * overlays classes must use or keep a pointer to aws. Use the Ask* and the * Hide() function to require the display of specific windows. DisplayStarted ! * and DisplayStopped must be used to notify the aws manager when the 3d * display is started or stopped. */ *************** *** 200,206 **** void DisplayStarted(); ! /** This function must be called when the 3D display is stoped. It hides * some specific components (and all the overlays) */ ! void DisplayStoped(); /* Functions used to require the display of specific overlays */ --- 200,206 ---- void DisplayStarted(); ! /** This function must be called when the 3D display is stopped. It hides * some specific components (and all the overlays) */ ! void DisplayStopped(); /* Functions used to require the display of specific overlays */ Index: ocstatemgr.cpp =================================================================== RCS file: /cvsroot/once/oncecode/src/client/ocstatemgr.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ocstatemgr.cpp 18 Sep 2004 01:08:57 -0000 1.2 --- ocstatemgr.cpp 28 Sep 2004 10:30:49 -0000 1.3 *************** *** 176,185 **** void ocStateDisplayEnabled::End() { ! clientsys->GetDisplay()->Disable(); } void ocStateDisplayEnabled::Begin() { ! clientsys->GetDisplay()->Enable(); } --- 176,185 ---- void ocStateDisplayEnabled::End() { ! clientsys->DisplayDisable(); } void ocStateDisplayEnabled::Begin() { ! clientsys->DisplayEnable(); } Index: ocawsmgr.cpp =================================================================== RCS file: /cvsroot/once/oncecode/src/client/ocawsmgr.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ocawsmgr.cpp 24 Jul 2004 11:29:09 -0000 1.11 --- ocawsmgr.cpp 28 Sep 2004 10:30:41 -0000 1.12 *************** *** 181,185 **** } ! void ocAwsMgr::DisplayStoped() { Hide(); --- 181,185 ---- } ! void ocAwsMgr::DisplayStopped() { Hide(); Index: occlient.cpp =================================================================== RCS file: /cvsroot/once/oncecode/src/client/occlient.cpp,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** occlient.cpp 27 Sep 2004 12:10:15 -0000 1.68 --- occlient.cpp 28 Sep 2004 10:30:43 -0000 1.69 *************** *** 279,282 **** --- 279,284 ---- } + g3d->BeginDraw(CSDRAW_CLEARSCREEN|CSDRAW_3DGRAPHICS); + //Handle incoming NETWORK messages HandleIncomingMessages(); *************** *** 291,300 **** */ - /* - if (!g3d->BeginDraw(engine->GetBeginDrawFlags() | CSDRAW_3DGRAPHICS)) - return; - */ - if (!g3d->BeginDraw(CSDRAW_3DGRAPHICS)) - return; // see if cursor of console should be visible --- 293,296 ---- *************** *** 564,565 **** --- 560,573 ---- return 0; } + + void ocClient::DisplayEnable() + { + display->Enable(); + awsmgr->DisplayStarted(); + } + + void ocClient::DisplayDisable() + { + awsmgr->DisplayStopped(); + display->Disable(); + } Index: occlient.h =================================================================== RCS file: /cvsroot/once/oncecode/src/client/occlient.h,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** occlient.h 27 Sep 2004 12:10:15 -0000 1.36 --- occlient.h 28 Sep 2004 10:30:49 -0000 1.37 *************** *** 184,187 **** --- 184,191 ---- /// Get the display ocDisplay* GetDisplay() const { return display; } + /// Enable the display (on login) -- Shows the camera (ocDisplay) and the NAVBAR (ocAWS) + void DisplayEnable(); + /// Disable the display (on logout) -- Hides the camera (ocDisplay) and the NAVBAR (ocAWS) + void DisplayDisable(); /// Get the state manager ocStateMgr* GetStateMgr() const { return state_mgr; } |