michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed unnecessary struct. No point consuming memory for something that's unnecessary.

This commit is contained in:
Gregory Pierce 2003-05-10 17:21:39 +00:00
parent ad12445e75
commit bcd0b40bce
1 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/native/macosx/org_lwjgl_opengl_BaseGL.cpp
View File

@ -43,18 +43,9 @@
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
#include <OpenGL/OpenGL.h> #include <OpenGL/OpenGL.h>
typedef struct
{
CGDirectDisplayID displayID;
CGLContextObj contextObj;
CGGammaValue redMin, redMax, redGamma,
greenMin, greenMax, greenGamma,
blueMin, blueMax, blueGamma;
} RenderingContext;
static RenderingContext * renderingContext;
static CGLContextObj contextObj;
static CGDirectDisplayID displayID = kCGDirectMainDisplay;
/* /*
* Class: org_lwjgl_opengl_BaseGL * Class: org_lwjgl_opengl_BaseGL
@ -64,26 +55,22 @@ static RenderingContext * renderingContext;
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_BaseGL_nCreate JNIEXPORT void JNICALL Java_org_lwjgl_opengl_BaseGL_nCreate
(JNIEnv * env, jobject obj, jstring title, jint x, jint y, jint width, jint height, jint bpp, jint alpha, jint depth, jint stencil, jboolean fullscreen) (JNIEnv * env, jobject obj, jstring title, jint x, jint y, jint width, jint height, jint bpp, jint alpha, jint depth, jint stencil, jboolean fullscreen)
{ {
if ( CGDisplayCapture( renderingContext->displayID ) != kCGErrorSuccess ) if ( CGDisplayCapture( displayID ) != kCGErrorSuccess )
{ {
return; return;
} }
CGDisplayHideCursor( renderingContext->displayID );
CGDisplayMoveCursorToPoint( renderingContext->displayID, CGPointZero );
CGAssociateMouseAndMouseCursorPosition( FALSE );
CGLPixelFormatObj pixelFormatObj; CGLPixelFormatObj pixelFormatObj;
long numPixelFormats; long numPixelFormats;
CFDictionaryRef displayMode; CFDictionaryRef displayMode;
displayMode = CGDisplayBestModeForParametersAndRefreshRate( kCGDirectMainDisplay, displayMode = CGDisplayBestModeForParametersAndRefreshRate( displayID,
bpp, bpp,
width, height, width, height,
60, 60,
NULL ); NULL );
CGDisplaySwitchToMode( kCGDirectMainDisplay, displayMode ); CGDisplaySwitchToMode( displayID, displayMode );
CGLPixelFormatAttribute attribs[2]; CGLPixelFormatAttribute attribs[2];
attribs[0] = kCGLPFAFullScreen; attribs[0] = kCGLPFAFullScreen;
@ -92,12 +79,12 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_BaseGL_nCreate
CGLChoosePixelFormat( attribs, &pixelFormatObj, &numPixelFormats ); CGLChoosePixelFormat( attribs, &pixelFormatObj, &numPixelFormats );
if ( pixelFormatObj != NULL ) if ( pixelFormatObj != NULL )
{ {
CGLCreateContext( pixelFormatObj, NULL, &renderingContext->contextObj ); CGLCreateContext( pixelFormatObj, NULL, &contextObj );
CGLDestroyPixelFormat( pixelFormatObj ); CGLDestroyPixelFormat( pixelFormatObj );
} }
CGLSetCurrentContext( renderingContext->contextObj ); CGLSetCurrentContext( contextObj );
CGLSetFullScreen( renderingContext->contextObj ); CGLSetFullScreen( contextObj );
} }
/* /*
@ -108,18 +95,16 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_BaseGL_nCreate
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_BaseGL_nDestroyGL JNIEXPORT void JNICALL Java_org_lwjgl_opengl_BaseGL_nDestroyGL
(JNIEnv * env, jobject obj) (JNIEnv * env, jobject obj)
{ {
if ( renderingContext->contextObj != NULL ) if ( contextObj != NULL )
{ {
CGLSetCurrentContext( NULL ); CGLSetCurrentContext( NULL );
CGLClearDrawable( renderingContext->contextObj ); CGLClearDrawable( contextObj );
CGLDestroyContext( renderingContext->contextObj ); CGLDestroyContext( contextObj );
renderingContext->contextObj = NULL; contextObj = NULL;
} }
CGAssociateMouseAndMouseCursorPosition( TRUE );
CGDisplayShowCursor( kCGDirectMainDisplay );
CGReleaseAllDisplays(); CGReleaseAllDisplays();
} }