From: Gregory P. <gre...@us...> - 2003-01-02 05:44:20
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/macosx In directory sc8-pr-cvs1:/tmp/cvs-serv29259/src/native/macosx Modified Files: RenderingContext.h RenderingContext.cpp Log Message: Clean OSX release, changed the platform flag to TARGET_OS_MAC to match what's in OpenAL so everything builds smootly together. Index: RenderingContext.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/RenderingContext.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/RenderingContext.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- RenderingContext.h 1 Jan 2003 23:05:26 -0000 1.4 +++ RenderingContext.h 2 Jan 2003 05:44:15 -0000 1.5 @@ -42,9 +42,8 @@ #ifndef _RENDERING_CONTEXT_H #define _RENDERING_CONTEXT_H -#define _OSX + #include "extgl.h" -//#include <OpenGL/glext.h> #include <Carbon/Carbon.h> class RenderingContext Index: RenderingContext.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/RenderingContext.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/RenderingContext.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- RenderingContext.cpp 1 Jan 2003 23:05:26 -0000 1.4 +++ RenderingContext.cpp 2 Jan 2003 05:44:15 -0000 1.5 @@ -71,10 +71,8 @@ // aglSetCurrentContext(NULL); - /* aglSetDrawable(aglContext, NULL); aglDestroyContext(aglContext); - */ // cleanup the window // @@ -83,7 +81,7 @@ bool RenderingContext::createGL( int colorBits, int alphaBits, int depthBits, int stencilBits ) { - /* + AGLPixelFormat fmt; GLboolean ok; GLint attrib[] = { AGL_RGBA, AGL_NONE }; @@ -148,7 +146,7 @@ printf("Available extensions:\n%s\n", p); } #endif -*/ + return true; } @@ -161,7 +159,7 @@ // destroy the context // - //aglDestroyContext( aglContext ); + aglDestroyContext( aglContext ); // close the gl extension context // @@ -172,21 +170,21 @@ { // swap the rendering buffer // - //aglSwapBuffers( aglContext ); + aglSwapBuffers( aglContext ); } void RenderingContext::makeContextCurrent() { // make the current context the one we have stored // - //aglSetCurrentContext( aglContext ); + aglSetCurrentContext( aglContext ); } void RenderingContext::releaseContext() { // release the context // - // aglSetCurrentContext( NULL ); + aglSetCurrentContext( NULL ); } RenderingContext::~RenderingContext() |