]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - vid_shared.c
Moved an extern to the proper header.
[xonotic/darkplaces.git] / vid_shared.c
index 6c844d924aff1eb2f38a2ff954f60577066fb539..a6bc8a9f6c8e4ee6a1e538d74de42bb6a209903b 100644 (file)
@@ -1,6 +1,9 @@
 
 #include "quakedef.h"
 
+// Tell startup code that we have a client
+int cl_available = true;
+
 // global video state
 viddef_t vid;
 
@@ -8,6 +11,12 @@ viddef_t vid;
 qboolean isG200 = false; // LordHavoc: the Matrox G200 can't do per pixel alpha, and it uses a D3D driver for GL... ugh...
 qboolean isRagePro = false; // LordHavoc: the ATI Rage Pro has limitations with per pixel alpha (the color scaler does not apply to per pixel alpha images...), although not as bad as a G200.
 
+// AK FIXME -> input_dest
+qboolean in_client_mouse = true;
+
+// AK where should it be placed ?
+float in_mouse_x, in_mouse_y;
+
 // GL_ARB_multitexture
 int gl_textureunits = 0;
 // GL_ARB_texture_env_combine or GL_EXT_texture_env_combine
@@ -40,11 +49,9 @@ int 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;
-// LordHavoc: whether to allow use of hwgamma (disabled when window is inactive)
-int vid_allowhwgamma = false;
 
 // we don't know until we try it!
-int vid_hardwaregammasupported = true;
+cvar_t vid_hardwaregammasupported = {CVAR_READONLY,"vid_hardwaregammasupported","1"};
 // whether hardware gamma ramps are currently in effect
 int vid_usinghwgamma = false;
 
@@ -78,6 +85,7 @@ cvar_t v_color_white_r = {CVAR_SAVE, "v_color_white_r", "1"};
 cvar_t v_color_white_g = {CVAR_SAVE, "v_color_white_g", "1"};
 cvar_t v_color_white_b = {CVAR_SAVE, "v_color_white_b", "1"};
 cvar_t v_hwgamma = {CVAR_SAVE, "v_hwgamma", "1"};
+cvar_t v_psycho = {0, "v_psycho", "0"};
 
 // brand of graphics chip
 const char *gl_vendor;
@@ -513,6 +521,27 @@ void IN_PostMove(void)
        CL_AdjustAngles();
 }
 
+/*
+===========
+IN_DoMove
+===========
+*/
+void IN_ProcessMove(usercmd_t *cmd)
+{
+       // get basic movement from keyboard
+       CL_BaseMove(cmd);
+
+       // OS independent code
+       IN_PreMove();
+
+       // allow mice or other external controllers to add to the move
+       IN_Move(cmd);
+
+       // OS independent code
+       IN_PostMove();
+}
+
+
 void IN_Mouse(usercmd_t *cmd, float mx, float my)
 {
        int mouselook = (in_mlook.state & 1) || freelook.integer;
@@ -533,6 +562,14 @@ void IN_Mouse(usercmd_t *cmd, float mx, float 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;
+
        // LordHavoc: viewzoom affects mouse sensitivity for sniping
        mouse_x *= sensitivity.value * cl.viewzoom;
        mouse_y *= sensitivity.value * cl.viewzoom;
@@ -564,13 +601,16 @@ void VID_UpdateGamma(qboolean force)
 {
        cvar_t *c;
        float f;
+       static int forcenextframe = false;
 
        // LordHavoc: don't mess with gamma tables if running dedicated
        if (cls.state == ca_dedicated)
                return;
 
        if (!force
-        && vid_usinghwgamma == (vid_allowhwgamma && v_hwgamma.integer)
+        && !forcenextframe
+        && !v_psycho.integer
+        && vid_usinghwgamma == (vid_activewindow && v_hwgamma.integer)
         && v_gamma.value == cachegamma
         && v_contrast.value == cachecontrast
         && v_brightness.value == cachebrightness
@@ -585,13 +625,15 @@ void VID_UpdateGamma(qboolean force)
         && cachewhite[1] == v_color_white_g.value
         && cachewhite[2] == v_color_white_b.value)
                return;
+               
+       forcenextframe = false;
 
-       if (vid_allowhwgamma && v_hwgamma.integer)
+       if (vid_activewindow && v_hwgamma.integer)
        {
                if (!vid_usinghwgamma)
                {
                        vid_usinghwgamma = true;
-                       vid_hardwaregammasupported = VID_GetGamma(vid_systemgammaramps);
+                       Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_GetGamma(vid_systemgammaramps));
                }
 
                BOUNDCVAR(v_gamma, 0.1, 5);cachegamma = v_gamma.value;
@@ -622,14 +664,53 @@ void VID_UpdateGamma(qboolean force)
                        BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + 512);
                }
 
-               vid_hardwaregammasupported = VID_SetGamma(vid_gammaramps);
+               // LordHavoc: this code came from Ben Winslow and Zinx Verituse, I have
+               // immensely butchered it to work with variable framerates and fit in with
+               // the rest of darkplaces.
+               if (v_psycho.integer)
+               {
+                       int x, y;
+                       float t;
+                       static float n[3], nd[3], nt[3];
+                       static int init = true;
+                       unsigned short *ramp;
+                       forcenextframe = true;
+                       if (init)
+                       {
+                               init = false;
+                               for (x = 0;x < 3;x++)
+                               {
+                                       n[x] = lhrandom(0, 1);
+                                       nd[x] = (rand()&1)?-0.25:0.25;
+                                       nt[x] = lhrandom(1, 8.2);
+                               }
+                       }
+                       
+                       for (x = 0;x < 3;x++)
+                       {
+                               nt[x] -= host_realframetime;
+                               if (nt[x] < 0)
+                               {
+                                       nd[x] = -nd[x];
+                                       nt[x] += lhrandom(1, 8.2);
+                               }
+                               n[x] += nd[x] * host_realframetime;
+                               n[x] -= floor(n[x]);
+                       }
+               
+                       for (x = 0, ramp = vid_gammaramps;x < 3;x++)
+                               for (y = 0, t = n[x] - 0.75f;y < 256;y++, t += 0.75f * (2.0f / 256.0f))
+                                       *ramp++ = cos(t*(M_PI*2.0)) * 32767.0f + 32767.0f;
+               }
+
+               Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(vid_gammaramps));
        }
        else
        {
                if (vid_usinghwgamma)
                {
                        vid_usinghwgamma = false;
-                       vid_hardwaregammasupported = VID_SetGamma(vid_systemgammaramps);
+                       Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(vid_systemgammaramps));
                }
        }
 }
@@ -645,6 +726,7 @@ void VID_RestoreSystemGamma(void)
 
 void VID_Shared_Init(void)
 {
+       Cvar_RegisterVariable(&vid_hardwaregammasupported);
        Cvar_RegisterVariable(&v_gamma);
        Cvar_RegisterVariable(&v_brightness);
        Cvar_RegisterVariable(&v_contrast);
@@ -661,6 +743,8 @@ void VID_Shared_Init(void)
        Cvar_RegisterVariable(&v_color_white_b);
 
        Cvar_RegisterVariable(&v_hwgamma);
+       
+       Cvar_RegisterVariable(&v_psycho);
 
        Cvar_RegisterVariable(&vid_fullscreen);
        Cvar_RegisterVariable(&vid_width);
@@ -681,7 +765,6 @@ int current_vid_fullscreen;
 int current_vid_width;
 int current_vid_height;
 int current_vid_bitsperpixel;
-extern int VID_InitMode (int fullscreen, int width, int height, int bpp);
 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);
@@ -715,8 +798,14 @@ static void VID_CloseSystems(void)
        R_Modules_Shutdown();
 }
 
+int vid_commandlinecheck = true;
+
 void VID_Restart_f(void)
 {
+       // don't crash if video hasn't started yet
+       if (vid_commandlinecheck)
+               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.integer ? "fullscreen" : "window", vid_width.integer, vid_height.integer, vid_bitsperpixel.integer);
@@ -730,7 +819,6 @@ void VID_Restart_f(void)
        VID_OpenSystems();
 }
 
-int vid_commandlinecheck = true;
 void VID_Open(void)
 {
        int i, width, height;