stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-13 00:24:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2

Browse source
This commit is contained in:
Alam Ed Arias 2014-07-24 20:27:14 -04:00
commit b19a9077bd
2 changed files with 37 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/sdl2/i_video.c
View file

@ -129,7 +129,6 @@ static Uint16 realheight = BASEVIDHEIGHT;
static const Uint32 surfaceFlagsW = 0/*|SDL_RESIZABLE*/; static const Uint32 surfaceFlagsW = 0/*|SDL_RESIZABLE*/;
static const Uint32 surfaceFlagsF = 0; static const Uint32 surfaceFlagsF = 0;
static SDL_bool mousegrabok = SDL_TRUE; static SDL_bool mousegrabok = SDL_TRUE;
static SDL_bool mousewarp = SDL_FALSE;
#define HalfWarpMouse(x,y) SDL_WarpMouseInWindow(window, (Uint16)(x/2),(Uint16)(y/2)) #define HalfWarpMouse(x,y) SDL_WarpMouseInWindow(window, (Uint16)(x/2),(Uint16)(y/2))
static SDL_bool videoblitok = SDL_FALSE; static SDL_bool videoblitok = SDL_FALSE;
static SDL_bool exposevideo = SDL_FALSE; static SDL_bool exposevideo = SDL_FALSE;
@ -186,14 +185,6 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
{ {
wasfullscreen = SDL_TRUE; wasfullscreen = SDL_TRUE;
SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP); SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP);
// Logical fullscreen is not implemented yet for OpenGL, so...
// Special case handling
if (rendermode == render_opengl)
{
int sdlw, sdlh;
SDL_GetWindowSize(window, &sdlw, &sdlh);
VID_SetMode(VID_GetModeForSize(sdlw, sdlh));
}
} }
else if (!fullscreen && wasfullscreen) else if (!fullscreen && wasfullscreen)
{ {
@ -218,6 +209,15 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
if (rendermode == render_opengl) if (rendermode == render_opengl)
{ {
int sdlw, sdlh;
SDL_GetWindowSize(window, &sdlw, &sdlh);
// Logical fullscreen is not implemented yet for OpenGL, so...
// Special case handling
if (USE_FULLSCREEN && width != sdlw && height != sdlh)
{
VID_SetMode(VID_GetModeForSize(sdlw, sdlh));
return;
}
OglSdlSurface(vid.width, vid.height); OglSdlSurface(vid.width, vid.height);
} }
@ -760,6 +760,7 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
break; break;
case SDL_WINDOWEVENT_FOCUS_GAINED: case SDL_WINDOWEVENT_FOCUS_GAINED:
kbfocus = SDL_TRUE; kbfocus = SDL_TRUE;
mousefocus = SDL_TRUE;
break; break;
case SDL_WINDOWEVENT_FOCUS_LOST: case SDL_WINDOWEVENT_FOCUS_LOST:
kbfocus = SDL_FALSE; kbfocus = SDL_FALSE;
@ -800,7 +801,6 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
if (MOUSE_MENU) if (MOUSE_MENU)
{ {
SDLdoUngrabMouse(); SDLdoUngrabMouse();
return;
} }
} }
@ -832,43 +832,26 @@ static void Impl_HandleMouseMotionEvent(SDL_MouseMotionEvent evt)
SDL_GetWindowSize(window, &wwidth, &wheight); SDL_GetWindowSize(window, &wwidth, &wheight);
if (MOUSE_MENU) if ((SDL_GetMouseFocus() != window && SDL_GetKeyboardFocus() != window))
{ {
SDLdoUngrabMouse(); SDLdoUngrabMouse();
return; return;
} }
if (mousewarp && (evt.x == wwidth/2) && (evt.y == wheight/2)) if ((evt.x == realwidth/2) && (evt.y == realheight/2))
{ {
return; return;
} }
else else
{ {
event.data2 = +evt.xrel; event.data2 = (evt.xrel) * (wwidth / realwidth) * 2;
event.data3 = -evt.yrel; event.data3 = -evt.yrel * (wheight / realheight) * 2;
} }
event.type = ev_mouse; event.type = ev_mouse;
D_PostEvent(&event); D_PostEvent(&event);
if (mousewarp) HalfWarpMouse(wwidth, wheight);
{
// Warp the pointer back to the middle of the window
// or we cannot move any further if it's at a border.
if ((evt.x < (wwidth/2 )-(wwidth/4 )) ||
(evt.y < (wheight/2)-(wheight/4)) ||
(evt.x > (wwidth/2 )+(wwidth/4 )) ||
(evt.y > (wheight/2)+(wheight/4) ) )
{
HalfWarpMouse(wwidth, wheight);
}
}
else
{
SDL_SetWindowGrab(window, mousegrabok);
SDL_SetRelativeMouseMode(SDL_TRUE);
}
} }
static void Impl_HandleMouseButtonEvent(SDL_MouseButtonEvent evt, Uint32 type) static void Impl_HandleMouseButtonEvent(SDL_MouseButtonEvent evt, Uint32 type)
@ -1398,8 +1381,25 @@ void I_FinishUpdate(void)
} }
if (bufSurface) //Alam: New Way to send video data if (bufSurface) //Alam: New Way to send video data
{ {
void *pixels;
int pitch;
SDL_BlitSurface(bufSurface, NULL, vidSurface, &rect); SDL_BlitSurface(bufSurface, NULL, vidSurface, &rect);
SDL_UpdateTexture(texture, NULL, vidSurface->pixels, realwidth * 4); // Fury -- streaming textures are bad on UpdateTexture
SDL_LockSurface(vidSurface);
SDL_LockTexture(texture, &rect, &pixels, &pitch);
if (pitch == vidSurface->pitch)
{
M_Memcpy(pixels, vidSurface->pixels, (pitch * vid.height));
}
else
{
SDL_UnlockTexture(texture);
SDL_UnlockSurface(vidSurface);
I_Error("The intermediate buffer and final texture types are not the same.\n");
}
SDL_UnlockTexture(texture);
SDL_UnlockSurface(vidSurface);
} }
// Blit buffer to texture // Blit buffer to texture
SDL_RenderCopy(renderer, texture, NULL, NULL); SDL_RenderCopy(renderer, texture, NULL, NULL);
@ -1902,8 +1902,6 @@ void I_StartupGraphics(void)
if (M_CheckParm("-nomousegrab")) if (M_CheckParm("-nomousegrab"))
mousegrabok = SDL_FALSE; mousegrabok = SDL_FALSE;
else if (M_CheckParm("-mousewarp") || SDL_SetRelativeMouseMode(SDL_TRUE) == -1)
mousewarp = SDL_TRUE;
#if 0 // defined (_DEBUG) #if 0 // defined (_DEBUG)
else else
{ {

5
src/sdl2/ogl_sdl.c
View file

@ -171,7 +171,10 @@ boolean OglSdlSurface(INT32 w, INT32 h)
DBG_Printf("Extensions : %s\n", gl_extensions); DBG_Printf("Extensions : %s\n", gl_extensions);
oglflags = 0; oglflags = 0;
maximumAnisotropy = 0; if (isExtAvailable("GL_EXT_texture_filter_anisotropic", gl_extensions))
pglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maximumAnisotropy);
else
maximumAnisotropy = 1;
granisotropicmode_cons_t[1].value = maximumAnisotropy; granisotropicmode_cons_t[1].value = maximumAnisotropy;