]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - vid_agl.c
use entity bbox for network culling if model was not found (this allows dedicated...
[xonotic/darkplaces.git] / vid_agl.c
index fb4860b0fbfc45494803d27c5945b3a3acc76950..ee26cc6e0935275823fce999ed2234171aea720d 100644 (file)
--- a/vid_agl.c
+++ b/vid_agl.c
@@ -3,7 +3,7 @@
 
        Mac OS X OpenGL and input module, using Carbon and AGL
 
-       Copyright (C) 2005  Mathieu Olivier
+       Copyright (C) 2005-2006  Mathieu Olivier
 
        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
@@ -38,6 +38,8 @@ AGLPixelFormat (*qaglChoosePixelFormat) (const AGLDevice *gdevs, GLint ndev, con
 AGLContext (*qaglCreateContext) (AGLPixelFormat pix, AGLContext share);
 GLboolean (*qaglDestroyContext) (AGLContext ctx);
 void (*qaglDestroyPixelFormat) (AGLPixelFormat pix);
+const GLubyte* (*qaglErrorString) (GLenum code);
+GLenum (*qaglGetError) (void);
 GLboolean (*qaglSetCurrentContext) (AGLContext ctx);
 GLboolean (*qaglSetDrawable) (AGLContext ctx, AGLDrawable draw);
 GLboolean (*qaglSetFullScreen) (AGLContext ctx, GLsizei width, GLsizei height, GLsizei freq, GLint device);
@@ -54,7 +56,7 @@ static qboolean vid_usingvsync = false;
 static int scr_width, scr_height;
 
 static AGLContext context;
-static         WindowRef window;
+static WindowRef window;
 
 
 void VID_GetWindowSize (int *x, int *y, int *width, int *height)
@@ -74,7 +76,7 @@ static void IN_Activate( qboolean grab )
                        CGPoint winCenter;
 
                        SelectWindow(window);
-                       HideCursor();
+                       CGDisplayHideCursor(CGMainDisplayID());
 
                        // Put the mouse cursor at the center of the window
                        GetWindowBounds (window, kWindowContentRgn, &winBounds);
@@ -94,21 +96,22 @@ static void IN_Activate( qboolean grab )
                if (vid_usingmouse)
                {
                        CGAssociateMouseAndMouseCursorPosition(true);
-                       ShowCursor();
+                       CGDisplayShowCursor(CGMainDisplayID());
 
                        vid_usingmouse = false;
                }
        }
 }
 
-void VID_Finish (void)
+#define GAMMA_TABLE_SIZE 256
+void VID_Finish (qboolean allowmousegrab)
 {
        qboolean vid_usemouse;
        qboolean vid_usevsync;
-       
+
        // handle the mouse state when windowed if that's changed
        vid_usemouse = false;
-       if (vid_mouse.integer && !key_consoleactive && !cls.demoplayback)
+       if (allowmousegrab && vid_mouse.integer && !key_consoleactive && !cls.demoplayback)
                vid_usemouse = true;
        if (!vid_activewindow)
                vid_usemouse = false;
@@ -137,25 +140,25 @@ void VID_Finish (void)
                        qglFinish();
                qaglSwapBuffers(context);
        }
+       VID_UpdateGamma(false, GAMMA_TABLE_SIZE);
 }
 
-#define GAMMA_TABLE_SIZE 256
-int VID_SetGamma(unsigned short *ramps)
+int VID_SetGamma(unsigned short *ramps, int rampsize)
 {
        CGGammaValue table_red [GAMMA_TABLE_SIZE];
        CGGammaValue table_green [GAMMA_TABLE_SIZE];
        CGGammaValue table_blue [GAMMA_TABLE_SIZE];
-       unsigned int i;
+       int i;
 
        // Convert the unsigned short table into 3 float tables
-       for (i = 0; i < GAMMA_TABLE_SIZE; i++)
+       for (i = 0; i < rampsize; i++)
                table_red[i] = (float)ramps[i] / 65535.0f;
-       for (i = 0; i < GAMMA_TABLE_SIZE; i++)
-               table_green[i] = (float)ramps[i + GAMMA_TABLE_SIZE] / 65535.0f;
-       for (i = 0; i < GAMMA_TABLE_SIZE; i++)
-               table_blue[i] = (float)ramps[i + 2 * GAMMA_TABLE_SIZE] / 65535.0f;
+       for (i = 0; i < rampsize; i++)
+               table_green[i] = (float)ramps[i + rampsize] / 65535.0f;
+       for (i = 0; i < rampsize; i++)
+               table_blue[i] = (float)ramps[i + 2 * rampsize] / 65535.0f;
 
-       if (CGSetDisplayTransferByTable(CGMainDisplayID(), GAMMA_TABLE_SIZE, table_red, table_green, table_blue) != CGDisplayNoErr)
+       if (CGSetDisplayTransferByTable(CGMainDisplayID(), rampsize, table_red, table_green, table_blue) != CGDisplayNoErr)
        {
                Con_Print("VID_SetGamma: ERROR: CGSetDisplayTransferByTable failed!\n");
                return false;
@@ -164,33 +167,33 @@ int VID_SetGamma(unsigned short *ramps)
        return true;
 }
 
-int VID_GetGamma(unsigned short *ramps)
+int VID_GetGamma(unsigned short *ramps, int rampsize)
 {
        CGGammaValue table_red [GAMMA_TABLE_SIZE];
        CGGammaValue table_green [GAMMA_TABLE_SIZE];
        CGGammaValue table_blue [GAMMA_TABLE_SIZE];
        CGTableCount actualsize = 0;
-       unsigned int i;
-       
+       int i;
+
        // Get the gamma ramps from the system
-       if (CGGetDisplayTransferByTable(CGMainDisplayID(), GAMMA_TABLE_SIZE, table_red, table_green, table_blue, &actualsize) != CGDisplayNoErr)
+       if (CGGetDisplayTransferByTable(CGMainDisplayID(), rampsize, table_red, table_green, table_blue, &actualsize) != CGDisplayNoErr)
        {
                Con_Print("VID_GetGamma: ERROR: CGGetDisplayTransferByTable failed!\n");
                return false;
        }
-       if (actualsize != GAMMA_TABLE_SIZE)
+       if (actualsize != (unsigned int)rampsize)
        {
-               Con_Printf("VID_GetGamma: ERROR: invalid gamma table size (%u != %u)\n", actualsize, GAMMA_TABLE_SIZE);
+               Con_Printf("VID_GetGamma: ERROR: invalid gamma table size (%u != %u)\n", actualsize, rampsize);
                return false;
        }
 
        // Convert the 3 float tables into 1 unsigned short table
-       for (i = 0; i < GAMMA_TABLE_SIZE; i++)
+       for (i = 0; i < rampsize; i++)
                ramps[i] = table_red[i] * 65535.0f;
-       for (i = 0; i < GAMMA_TABLE_SIZE; i++)
-               ramps[i + GAMMA_TABLE_SIZE] = table_green[i] * 65535.0f;
-       for (i = 0; i < GAMMA_TABLE_SIZE; i++)
-               ramps[i + 2 * GAMMA_TABLE_SIZE] = table_blue[i] * 65535.0f;
+       for (i = 0; i < rampsize; i++)
+               ramps[i + rampsize] = table_green[i] * 65535.0f;
+       for (i = 0; i < rampsize; i++)
+               ramps[i + 2 * rampsize] = table_blue[i] * 65535.0f;
 
        return true;
 }
@@ -333,7 +336,7 @@ static void VID_ProcessPendingAsyncEvents (void)
        }
 }
 
-static void VID_BuildAGLAttrib(GLint *attrib, int stencil, qboolean fullscreen)
+static void VID_BuildAGLAttrib(GLint *attrib, qboolean stencil, qboolean fullscreen)
 {
        *attrib++ = AGL_RGBA;
        *attrib++ = AGL_RED_SIZE;*attrib++ = 1;
@@ -363,9 +366,9 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        };
        OSStatus carbonError;
        Rect windowBounds;
-       GDHandle screen;
        AGLPixelFormat pixelFormat;
        GLint attributes [32];
+       GLenum error;
 
        if (!GL_OpenLibrary())
        {
@@ -377,6 +380,8 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
         || (qaglCreateContext = (AGLContext (*) (AGLPixelFormat pix, AGLContext share))GL_GetProcAddress("aglCreateContext")) == NULL
         || (qaglDestroyContext = (GLboolean (*) (AGLContext ctx))GL_GetProcAddress("aglDestroyContext")) == NULL
         || (qaglDestroyPixelFormat = (void (*) (AGLPixelFormat pix))GL_GetProcAddress("aglDestroyPixelFormat")) == NULL
+        || (qaglErrorString = (const GLubyte* (*) (GLenum code))GL_GetProcAddress("aglErrorString")) == NULL
+        || (qaglGetError = (GLenum (*) (void))GL_GetProcAddress("aglGetError")) == NULL
         || (qaglSetCurrentContext = (GLboolean (*) (AGLContext ctx))GL_GetProcAddress("aglSetCurrentContext")) == NULL
         || (qaglSetDrawable = (GLboolean (*) (AGLContext ctx, AGLDrawable draw))GL_GetProcAddress("aglSetDrawable")) == NULL
         || (qaglSetFullScreen = (GLboolean (*) (AGLContext ctx, GLsizei width, GLsizei height, GLsizei freq, GLint device))GL_GetProcAddress("aglSetFullScreen")) == NULL
@@ -393,9 +398,11 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        AsyncEvent_Quitting = false;
        AsyncEvent_Collapsed = false;
 
-       // Create the window
-       SetRect(&windowBounds, 0, 0, width, height);
-       OffsetRect(&windowBounds, 100, 100);  // move it a bit towards the center of the screen
+       // Create the window, a bit towards the center of the screen
+       windowBounds.left = 100;
+       windowBounds.top = 100;
+       windowBounds.right = width + 100;
+       windowBounds.bottom = height + 100;
        carbonError = CreateNewWindow(kDocumentWindowClass, kWindowStandardFloatingAttributes | kWindowStandardHandlerAttribute, &windowBounds, &window);
        if (carbonError != noErr || window == NULL)
        {
@@ -413,42 +420,96 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        InstallWindowEventHandler (window, NewEventHandlerUPP (MainWindowEventHandler),
                                                           GetEventTypeCount(winEvents), winEvents, window, NULL);
 
-       screen = GetGWorldDevice(GetWindowPort(window));
-       if (screen == NULL)
+       // Create the desired attribute list
+       VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen);
+
+       if (!fullscreen)
        {
-               Con_Printf("Unable to get GDevice for window\n");
-               ReleaseWindow(window);
-               return false;
+               // Output to Window
+               pixelFormat = qaglChoosePixelFormat(NULL, 0, attributes);
+               error = qaglGetError();
+               if (error != AGL_NO_ERROR)
+               {
+                       Con_Printf("qaglChoosePixelFormat FAILED: %s\n",
+                                       (char *)qaglErrorString(error));
+                       ReleaseWindow(window);
+                       return false;
+               }
+       }
+       else  // Output is fullScreen
+       {
+               CGDirectDisplayID mainDisplay;
+               CFDictionaryRef refDisplayMode;
+               GDHandle gdhDisplay;
+               
+               // Get the mainDisplay and set resolution to current
+               mainDisplay = CGMainDisplayID ();
+               CGDisplayCapture (mainDisplay);
+               refDisplayMode = CGDisplayBestModeForParameters (mainDisplay, bpp, width, height, NULL);
+               CGDisplaySwitchToMode (mainDisplay, refDisplayMode);
+               DMGetGDeviceByDisplayID ((DisplayIDType)mainDisplay, &gdhDisplay, false);
+
+               // Set pixel format with built attribs
+               // Note: specifying a device is *required* for AGL_FullScreen
+               pixelFormat = qaglChoosePixelFormat(&gdhDisplay, 1, attributes);
+               error = qaglGetError();
+               if (error != AGL_NO_ERROR)
+               {
+                       Con_Printf("qaglChoosePixelFormat FAILED: %s\n",
+                                               (char *)qaglErrorString(error));
+                       ReleaseWindow(window);
+                       return false;
+               }
        }
 
-       // Create and set pixel format
-       VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen);
-       pixelFormat = qaglChoosePixelFormat(&screen, 1, attributes);
-       if (pixelFormat == NULL)
+       // Create a context using the pform
+       context = qaglCreateContext(pixelFormat, NULL);
+       error = qaglGetError();
+       if (error != AGL_NO_ERROR)
        {
-               Con_Printf("Unable to create pixel format\n");
+               Con_Printf("qaglCreateContext FAILED: %s\n",
+                                       (char *)qaglErrorString(error));
+       }
+
+       // Make the context the current one ('enable' it)
+       qaglSetCurrentContext(context);   
+       error = qaglGetError();
+       if (error != AGL_NO_ERROR)
+       {
+               Con_Printf("qaglSetCurrentContext FAILED: %s\n",
+                                       (char *)qaglErrorString(error));
                ReleaseWindow(window);
                return false;
        }
 
-       // Set context and show the window
-       context = qaglCreateContext(pixelFormat, NULL);
-       if (context == NULL)
-               Sys_Error ("aglCreateContext failed");
+       // Discard pform
+       qaglDestroyPixelFormat(pixelFormat);
+
+       // Attempt fullscreen if requested
        if (fullscreen)
        {
-               if (!qaglSetFullScreen (context, width, height, refreshrate, 0))
-                       Sys_Error("aglSetFullScreen failed");
-               vid_isfullscreen = true;
+               qaglSetFullScreen (context, width, height, refreshrate, 0);
+               error = qaglGetError();
+               if (error != AGL_NO_ERROR)
+               {
+                       Con_Printf("qaglSetFullScreen FAILED: %s\n",
+                                               (char *)qaglErrorString(error));
+                       return false;
+               }
        }
        else
        {
-               if (!qaglSetDrawable(context, GetWindowPort(window)))
-                       Sys_Error ("aglSetDrawable failed");
+               // Set Window as Drawable
+               qaglSetDrawable(context, GetWindowPort(window));
+               error = qaglGetError();
+               if (error != AGL_NO_ERROR)
+               {
+                       Con_Printf("qaglSetDrawable FAILED: %s\n",
+                                               (char *)qaglErrorString(error));
+                       ReleaseWindow(window);
+                       return false;
+               }
        }
-       if (!qaglSetCurrentContext(context))
-               Sys_Error ("aglSetCurrentContext failed");
-       qaglDestroyPixelFormat(pixelFormat);
 
        scr_width = width;
        scr_height = height;
@@ -463,6 +524,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        gl_platform = "AGL";
        gl_videosyncavailable = true;
 
+       vid_isfullscreen = fullscreen;
        vid_usingmouse = false;
        vid_hidden = false;
        vid_activewindow = true;
@@ -625,7 +687,10 @@ void Sys_SendKeyEvents(void)
                                                Key_Event(key, '\0', eventKind == kEventMouseDown);
                                                break;
 
+                                       // Note: These two events are mutual exclusives
+                                       // Treat MouseDragged in the same statement, so we don't block MouseMoved while a mousebutton is held
                                        case kEventMouseMoved:
+                                       case kEventMouseDragged:
                                        {
                                                HIPoint deltaPos;
 
@@ -649,9 +714,6 @@ void Sys_SendKeyEvents(void)
                                                break;
                                        }
 
-                                       case kEventMouseDragged:
-                                               break;
-
                                        default:
                                                Con_Printf (">> kEventClassMouse (UNKNOWN eventKind: %d) <<\n", eventKind);
                                                break;