[Opentnl-cvs] tnl/osx MyOpenGLView.mm,1.1,1.2
Brought to you by:
mark_frohnmayer,
s_alanet
From: Mark F. <mar...@us...> - 2005-02-25 16:45:42
|
Update of /cvsroot/opentnl/tnl/osx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29524/osx Modified Files: MyOpenGLView.mm Log Message: Integrated mac fixes Index: MyOpenGLView.mm =================================================================== RCS file: /cvsroot/opentnl/tnl/osx/MyOpenGLView.mm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MyOpenGLView.mm 20 Apr 2004 04:27:17 -0000 1.1 --- MyOpenGLView.mm 25 Feb 2005 16:45:24 -0000 1.2 *************** *** 30,34 **** #include "testGame.h" ! class TestGameLog : public LogConsumer { id myView; --- 30,34 ---- #include "testGame.h" ! class TestGameLog : public TNL::LogConsumer { id myView; *************** *** 98,104 **** { if(clientGame) ! clientGame->renderFrame((U32) rect.size.width, (U32) rect.size.height); else if(serverGame) ! serverGame->renderFrame((U32) rect.size.width, (U32) rect.size.height); [[self openGLContext] flushBuffer]; --- 98,104 ---- { if(clientGame) ! clientGame->renderFrame((TNL::U32) rect.size.width, (TNL::U32) rect.size.height); else if(serverGame) ! serverGame->renderFrame((TNL::U32) rect.size.width, (TNL::U32) rect.size.height); [[self openGLContext] flushBuffer]; *************** *** 129,134 **** delete clientGame; ! serverGame = new TestGame(true, Address(IPProtocol, Address::Any, 28999), ! Address("IP:Broadcast:28999")); clientGame = NULL; } --- 129,134 ---- delete clientGame; ! serverGame = new TestGame(true, TNL::Address(TNL::IPProtocol, TNL::Address::Any, 28999), ! TNL::Address("IP:Broadcast:28999")); clientGame = NULL; } *************** *** 139,144 **** delete clientGame; serverGame = NULL; ! clientGame = new TestGame(false, Address(IPProtocol, Address::Any, 0), ! Address("IP:localhost:28999")); } --- 139,144 ---- delete clientGame; serverGame = NULL; ! clientGame = new TestGame(false, TNL::Address(TNL::IPProtocol, TNL::Address::Any, 0), ! TNL::Address("IP:localhost:28999")); } *************** *** 148,153 **** delete clientGame; serverGame = NULL; ! clientGame = new TestGame(false, Address(IPProtocol, Address::Any, 0), ! Address("IP:broadcast:28999")); } --- 148,153 ---- delete clientGame; serverGame = NULL; ! clientGame = new TestGame(false, TNL::Address(TNL::IPProtocol, TNL::Address::Any, 0), ! TNL::Address("IP:broadcast:28999")); } *************** *** 156,163 **** delete serverGame; delete clientGame; ! serverGame = new TestGame(true, Address(IPProtocol, Address::Any, 28999), ! Address("IP:Broadcast:28999")); ! clientGame = new TestGame(false, Address(IPProtocol, Address::Any, 0), ! Address("IP:broadcast:28999")); clientGame->createLocalConnection(serverGame); --- 156,163 ---- delete serverGame; delete clientGame; ! serverGame = new TestGame(true, TNL::Address(TNL::IPProtocol, TNL::Address::Any, 28999), ! TNL::Address("IP:Broadcast:28999")); ! clientGame = new TestGame(false, TNL::Address(TNL::IPProtocol, TNL::Address::Any, 0), ! TNL::Address("IP:broadcast:28999")); clientGame->createLocalConnection(serverGame); |