X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_shared.c;h=d253881cbd4fea9f2a626a83b62cf2d335b13dd0;hb=73e25915f7fd668a887221bf7658d19c1d48c5ee;hp=2160e4b065f917b365f6f4db8e30ddce6409c8ce;hpb=b173e9be05d41a2440cdb80299f136166c4f79dc;p=xonotic%2Fdarkplaces.git diff --git a/vid_shared.c b/vid_shared.c index 2160e4b0..d253881c 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -50,15 +50,15 @@ int gl_support_vertex_shader = false; int gl_support_fragment_shader = false; // LordHavoc: if window is hidden, don't update screen -int vid_hidden = true; +qboolean vid_hidden = true; // LordHavoc: if window is not the active window, don't hog as much CPU time, // let go of the mouse, turn off sound, and restore system gamma ramps... -int vid_activewindow = true; +qboolean vid_activewindow = true; // we don't know until we try it! cvar_t vid_hardwaregammasupported = {CVAR_READONLY,"vid_hardwaregammasupported","1"}; // whether hardware gamma ramps are currently in effect -int vid_usinghwgamma = false; +qboolean vid_usinghwgamma = false; unsigned short vid_gammaramps[768]; unsigned short vid_systemgammaramps[768]; @@ -70,14 +70,9 @@ cvar_t vid_bitsperpixel = {CVAR_SAVE, "vid_bitsperpixel", "32"}; cvar_t vid_vsync = {CVAR_SAVE, "vid_vsync", "0"}; cvar_t vid_mouse = {CVAR_SAVE, "vid_mouse", "1"}; -cvar_t gl_combine = {CVAR_SAVE, "gl_combine", "1"}; +cvar_t gl_combine = {0, "gl_combine", "1"}; cvar_t gl_finish = {0, "gl_finish", "0"}; -cvar_t in_pitch_min = {0, "in_pitch_min", "-90"}; // quake used -70 -cvar_t in_pitch_max = {0, "in_pitch_max", "90"}; // quake used 80 - -cvar_t m_filter = {CVAR_SAVE, "m_filter","0"}; - cvar_t v_gamma = {CVAR_SAVE, "v_gamma", "1"}; cvar_t v_contrast = {CVAR_SAVE, "v_contrast", "1"}; cvar_t v_brightness = {CVAR_SAVE, "v_brightness", "0"}; @@ -686,7 +681,7 @@ void VID_CheckExtensions(void) gl_support_fragment_shader = GL_CheckExtension("GL_ARB_fragment_shader", NULL, "-nofragmentshader", false); } -int vid_vertexarrays_are_var = false; +qboolean vid_vertexarrays_are_var = false; void *VID_AllocVertexArrays(mempool_t *pool, int size, int fast, float readfrequency, float writefrequency, float priority) { void *m; @@ -723,98 +718,6 @@ void Force_CenterView_f (void) cl.viewangles[PITCH] = 0; } -void IN_PreMove(void) -{ -} - -void CL_AdjustAngles(void); -void IN_PostMove(void) -{ - // clamp after the move as well to prevent messed up rendering angles - CL_AdjustAngles(); -} - -/* -=========== -IN_DoMove -=========== -*/ -void IN_ProcessMove(void) -{ - // get basic movement from keyboard - CL_BaseMove(); - - // OS independent code - IN_PreMove(); - - // allow mice or other external controllers to add to the move - IN_Move(); - - // OS independent code - IN_PostMove(); -} - - -void IN_Mouse(float mx, float my) -{ - int mouselook = (in_mlook.state & 1) || freelook.integer; - float mouse_x, mouse_y; - static float old_mouse_x = 0, old_mouse_y = 0; - - if (m_filter.integer) - { - mouse_x = (mx + old_mouse_x) * 0.5; - mouse_y = (my + old_mouse_y) * 0.5; - } - else - { - mouse_x = mx; - mouse_y = my; - } - - old_mouse_x = mx; - old_mouse_y = my; - - in_mouse_x = (float) mouse_x * vid.conwidth / vid.realwidth; - in_mouse_y = (float) mouse_y * vid.conheight / vid.realheight; - - // AK: eveything else is client stuff - // BTW, this should be seperated somewhen - if(!in_client_mouse) - return; - - if (cl_prydoncursor.integer) - { - cl.cmd.cursor_screen[0] += mouse_x * sensitivity.value / vid.realwidth; - cl.cmd.cursor_screen[1] += mouse_y * sensitivity.value / vid.realheight; - V_StopPitchDrift(); - return; - } - - // LordHavoc: viewzoom affects mouse sensitivity for sniping - mouse_x *= sensitivity.value * cl.viewzoom; - mouse_y *= sensitivity.value * cl.viewzoom; - - // Add mouse X/Y movement to cmd - if ((in_strafe.state & 1) || (lookstrafe.integer && mouselook)) - cl.cmd.sidemove += m_side.value * mouse_x; - else - cl.viewangles[YAW] -= m_yaw.value * mouse_x; - - if (mouselook) - V_StopPitchDrift(); - - if (mouselook && !(in_strafe.state & 1)) - cl.viewangles[PITCH] += m_pitch.value * mouse_y; - else - { - if ((in_strafe.state & 1) && noclip_anglehack) - cl.cmd.upmove -= m_forward.value * mouse_y; - else - cl.cmd.forwardmove -= m_forward.value * mouse_y; - } -} - static float cachegamma, cachebrightness, cachecontrast, cacheblack[3], cachegrey[3], cachewhite[3]; static int cachecolorenable, cachehwgamma; #define BOUNDCVAR(cvar, m1, m2) c = &(cvar);f = bound(m1, c->value, m2);if (c->value != f) Cvar_SetValueQuick(c, f); @@ -978,28 +881,21 @@ void VID_Shared_Init(void) Cvar_RegisterVariable(&vid_mouse); Cvar_RegisterVariable(&gl_combine); Cvar_RegisterVariable(&gl_finish); - Cvar_RegisterVariable(&in_pitch_min); - Cvar_RegisterVariable(&in_pitch_max); - Cvar_RegisterVariable(&m_filter); Cmd_AddCommand("force_centerview", Force_CenterView_f); Cmd_AddCommand("vid_restart", VID_Restart_f); if (gamemode == GAME_GOODVSBAD2) Cvar_Set("gl_combine", "0"); } -int current_vid_fullscreen; -int current_vid_width; -int current_vid_height; -int current_vid_bitsperpixel; int VID_Mode(int fullscreen, int width, int height, int bpp) { Con_Printf("Video: %s %dx%dx%d\n", fullscreen ? "fullscreen" : "window", width, height, bpp); if (VID_InitMode(fullscreen, width, height, bpp)) { - current_vid_fullscreen = fullscreen; - current_vid_width = width; - current_vid_height = height; - current_vid_bitsperpixel = bpp; + vid.fullscreen = fullscreen; + vid.width = width; + vid.height = height; + vid.bitsperpixel = bpp; Cvar_SetValueQuick(&vid_fullscreen, fullscreen); Cvar_SetValueQuick(&vid_width, width); Cvar_SetValueQuick(&vid_height, height); @@ -1022,7 +918,7 @@ static void VID_CloseSystems(void) R_Modules_Shutdown(); } -int vid_commandlinecheck = true; +qboolean vid_commandlinecheck = true; void VID_Restart_f(void) { @@ -1031,19 +927,21 @@ void VID_Restart_f(void) return; Con_Printf("VID_Restart: changing from %s %dx%dx%dbpp, to %s %dx%dx%dbpp.\n", - current_vid_fullscreen ? "fullscreen" : "window", current_vid_width, current_vid_height, current_vid_bitsperpixel, + vid.fullscreen ? "fullscreen" : "window", vid.width, vid.height, vid.bitsperpixel, vid_fullscreen.integer ? "fullscreen" : "window", vid_width.integer, vid_height.integer, vid_bitsperpixel.integer); - VID_Close(); + VID_CloseSystems(); + VID_Shutdown(); if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer)) { Con_Print("Video mode change failed\n"); - if (!VID_Mode(current_vid_fullscreen, current_vid_width, current_vid_height, current_vid_bitsperpixel)) + if (!VID_Mode(vid.fullscreen, vid.width, vid.height, vid.bitsperpixel)) Sys_Error("Unable to restore to last working video mode\n"); } VID_OpenSystems(); } -void VID_Open(void) +// this is only called once by Host_StartVideo +void VID_Start(void) { int i, width, height, success; if (vid_commandlinecheck) @@ -1094,9 +992,3 @@ void VID_Open(void) VID_OpenSystems(); } -void VID_Close(void) -{ - VID_CloseSystems(); - VID_Shutdown(); -} -