Just a simple idea to make the crosshair follow the mouse, in an effort to make Nexuiz play nice with my graphics tablet.

Updated to version 3.

Usage:

Code: Select all

seta freeaim 0 "enable free-aiming mode"
seta freeaim_sensitivity 6 "freeaim sensitivity"
seta freeaim_deadzone 0 "freeaim dead zone, as a factor of screen size (try 0.05)"

Code: Select all

Index: data/qcsrc/client/View.qc
===================================================================
--- data/qcsrc/client/View.qc   (revision 7452)
+++ data/qcsrc/client/View.qc   (working copy)
@@ -306,6 +306,19 @@
   return SHOTTYPE_HITWORLD;
}

+vector freeaim_angle, mouse_pos;
+float freeaim_active;
+void drawcrosshair(string name, float sizefloat, vector c, float a, float f)
+{
+   vector s;
+   s = drawgetimagesize(name);
+   s_x *= sizefloat;
+   s_y *= sizefloat;
+   drawpic(mouse_pos + '0.5 0 0' * (vid_conwidth - s_x) + '0 0.5 0' * (vid_conheight - s_y),
+      name, s, c, a, f);
+}
+
+
void CSQC_common_hud(void);

void CSQC_kh_hud(void);
@@ -334,11 +347,73 @@

   ticrate = getstatf(STAT_MOVEVARS_TICRATE) * getstatf(STAT_MOVEVARS_TIMESCALE);

+   vid_width = w;
+   vid_height = h;
+   fov = cvar("fov");
+
   // Render the Scene
   if(!intermission || !view_set)
   {
      view_origin = pmove_org + '0 0 1' * getstati(STAT_VIEWHEIGHT);
-      view_angles = input_angles;
+      view_angles = input_angles - freeaim_angle; // correct for last frame
+      if(cvar("freeaim") == 1)
+      {
+         if(!freeaim_active)
+         {
+            setwantsmousemove(1);
+            freeaim_active = 1;
+         }
+         mouse_pos = getmousepos();
+         if(mouse_pos != '0 0 0')
+         {
+            mouse_pos_x -= 0.5*vid_conwidth;
+            mouse_pos_y -= 0.5*vid_conheight;
+         }
+
+         v = GetCurrentFov(fov);
+         v_x = 1-(v_x/180);
+         v_y = mouse_pos_x/vid_conwidth;
+         v_z = -mouse_pos_y/vid_conwidth;
+         freeaim_angle = normalize(v);
+         f = cvar("freeaim_deadzone")*0.5;
+         if(fabs(v_y) > f || fabs(v_z) > f)
+         {
+            v_x = v_z*cvar("cl_pitchspeed")*-2;
+            v_y = v_y*cvar("cl_yawspeed")*-2;
+            v_z = 0;
+            view_angles += v*cvar_or("freeaim_sensitivity",6)*frametime;
+         }
+         view_angles_x = bound(cvar("in_pitch_min"),view_angles_x,cvar("in_pitch_max"));
+
+         v = freeaim_angle;
+         makevectors(view_angles);
+         input_angles = vectoangles(v_x*v_forward + v_y*v_right + v_z*v_up);
+         input_angles_x = 0-input_angles_x;   // correct vectoangles
+         if(input_angles_x < -90)input_angles_x += 360;
+         if(input_angles_y >= 180)input_angles_y -= 360;
+         freeaim_angle = input_angles - view_angles;
+         if(freeaim_angle_y >=  180)freeaim_angle_y -= 360; // This WILL happen.
+         if(freeaim_angle_y <= -180)freeaim_angle_y += 360;
+
+         if(cvar("chase_active") == 0 && cvar("crosshair") != 0)
+         {
+            R_SetView(VF_ORIGIN, view_origin);
+            R_SetView(VF_ANGLES, view_angles);
+         }
+         else mouse_pos = '0 0 0';
+         R_SetView(VF_CL_VIEWANGLES, input_angles);
+      }
+      else
+      {
+         if(freeaim_active)
+         {
+            input_angles -= freeaim_angle;
+            R_SetView(VF_CL_VIEWANGLES, input_angles);
+            setwantsmousemove(0);
+            freeaim_active = 0;
+         }
+         mouse_pos = freeaim_angle = '0 0 0';
+      }
      makevectors(view_angles);
      view_forward = v_forward;
      view_right = v_right;
@@ -346,9 +421,6 @@
      view_set = 1;
   }

-   vid_width = w;
-   vid_height = h;
-
#ifdef BLURTEST
   if(time > blurtest_time0 && time < blurtest_time1)
   {
@@ -382,7 +454,6 @@
   CheckForGamestartChange();
   maptimeAnnouncer();

-   fov = cvar("fov");
   if(button_zoom || fov <= 59.5)
   {
      if(!zoomscript_caught)
@@ -551,12 +622,8 @@
     hud = getstati(STAT_HUD);
     if(hud == HUD_SPIDERBOT)
     {
-        vector sz;
-        CSQC_spider_HUD();
-        sz = drawgetimagesize(SPIDER_CROSS);
-        sz_x *= cvar_or("cl_vehicle_spiderbot_cross_size",1);
-        sz_y *= cvar_or("cl_vehicle_spiderbot_cross_size",1);
-        drawpic('0.5 0 0' * (vid_conwidth - sz_x) + '0 0.5 0' * (vid_conheight - sz_y), SPIDER_CROSS, sz, '1 1 1', cvar_or("cl_vehicle_spiderbot_cross_alpha",0.6), DRAWFLAG_NORMAL);
+   CSQC_spider_HUD();
+   drawcrosshair(SPIDER_CROSS, cvar_or("cl_vehicle_spiderbot_cross_size",1), '1 1 1', cvar_or("cl_vehicle_spiderbot_cross_alpha",0.6), DRAWFLAG_NORMAL);
     }
     else
     {
@@ -595,7 +662,7 @@
             wcross_style = cvar_string("crosshair");

             if (wcross_style != "0") {
-                vector wcross_color, wcross_size;
+                vector wcross_color;
                 string wcross_wep, wcross_name;
                 float wcross_alpha, wcross_sizefloat;

@@ -631,10 +698,6 @@
               wcross_sizefloat *= cvar("crosshair_hittest"); // is not queried if hittest is 0
            if(shottype == SHOTTYPE_HITTEAM)
               wcross_sizefloat /= cvar("crosshair_hittest"); // is not queried if hittest is 0
-
-                wcross_size = drawgetimagesize(wcross_name);
-                wcross_size_x *= wcross_sizefloat;
-                wcross_size_y *= wcross_sizefloat;
            
            // ring around crosshair representing bullets left in camping rifle clip
            if (activeweapon == WEP_CAMPINGRIFLE)
@@ -652,15 +715,15 @@
                         for(j = -2; j <= 2; ++j)
                  {
                     if (bullets)
-                        drawpic(wcross_origin - '0.5 0 0' * (wcross_size_x * ring_scale + i) - '0 0.5 0' * (wcross_size_y * ring_scale + j), strcat("gfx/hud/rifle_ring_", ftos(bullets)), wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL);
-                            drawpic(wcross_origin - '0.5 0 0' * (wcross_size_x + i) - '0 0.5 0' * (wcross_size_y + j), wcross_name, wcross_size, wcross_color, wcross_alpha, DRAWFLAG_NORMAL);
+                        drawcrosshair(strcat("gfx/hud/rifle_ring_", ftos(bullets)), wcross_sizefloat * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL);
+                            drawcrosshair( wcross_name, wcross_sizefloat, wcross_color, wcross_alpha, DRAWFLAG_NORMAL);
                  }
                 }
                 else
                 {
               if (bullets)
-                  drawpic(wcross_origin - '0.5 0 0' * (wcross_size_x * ring_scale) - '0 0.5 0' * (wcross_size_y * ring_scale), strcat("gfx/hud/rifle_ring_", ftos(bullets)), wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL);
-                    drawpic(wcross_origin - '0.5 0 0' * (wcross_size_x) - '0 0.5 0' * ( wcross_size_y), wcross_name, wcross_size, wcross_color, wcross_alpha, DRAWFLAG_NORMAL);
+                  drawcrosshair(strcat("gfx/hud/rifle_ring_", ftos(bullets)), wcross_sizefloat * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL);
+                    drawcrosshair(wcross_name, wcross_sizefloat, wcross_color, wcross_alpha, DRAWFLAG_NORMAL);
                 }
             }
         }


Hint: http://dev.alientrap.org/projects/show/nexuiz

Patch is cool idea, not so cool implementation... as you removed lots of existing features, like the spiderbot support, and the wcross_size handling.

Can you add that back in?

Have you tested the spiderbot? I didn't intend to remove it... wcross_size got factored into drawcrosshair. It works exactly as before. Has anyone actually tested it? I can't tell what I broke vs. what not having the full svn broke...

Proof-of-concept, 2 hours max, round 2 coming right up.

I've tested it but with the mouse, I don't have a graphics tablet.

So, with the mouse it seems too much sensitive, maybe it is ok with the tablet...
Maybe adding a tiny dead zone (could be another cvar), to avoid small unwanted movements would be nice...

Since the crosshair no longer follows the target, maybe it should be better to show 2 kinds of crosshair: the REAL crosshair, fixed at the center, and the fake crosshair to indicate the movement, as it is now.

BUG: When resetting the normal aim with freeaim 0, the crosshair just disappears!


PS: U can create a new issue here http://dev.alientrap.org/projects/nexuiz/issues it's the recommended place to post the patches, u need to be registered though.

Thanks for testing! I've fixed the vanishing crosshair. The fire follows the crosshair, so why have a second one?

New version in first post. Also uses accurate aim, accounting for FOV and solving gimbal lock. Unfortunately, it got messier. If anything else breaks, I really want to know!

Sorry for the rush, I have to be somewhere ten minutes ago!

for what is this: @@ -652,15 +700,15 @@?
i think its the lines where add or delete something but if im right for what is ",15"?

+ is add and -delete ,right?

With a tablet, it takes sensitivity 0.5 to make the game playable - in a very framerate-dependant way. This patch makes it actually fun. It doesn't need a dead zone for this, but adding a cvar for it won't hurt.

Gimbal lock makes aiming up/down impossible, but fixing it breaks things. The screen center stays locked inside min/max pitch, but you can aim right to the edge. Shouldn't matter for gameplay, but it looks silly to other players and since movement follows pointer it flips the controls.

Dammit, I can't fix bugs I can't see. How does it look with weaponmodels? Should I make them turn to point at the crosshair?

Sven wrote:for what is this: @@ -652,15 +700,15 @@?
i think its the lines where add or delete something but if im right for what is ",15"?

+ is add and -delete ,right?

It's a diff. Meant for computers, not humans. Try Wikipedia or Google if you really want to know.

The patch v2 is broken, cannot be applied. Somehow the TAB characters were replaced with spaces.

BTW, looking at your patch again, still CSQC_spider_HUD(); is removed, breaking the HUD of the spiderbot I think...


Another better place than this to post your patch is http://pastebin.com/ , no need to be registered there. This way we can download the patch with one click, instead of doing copy, open a text editor, paste, save file...

EDIT: Crap! I forgot to press the button quote to copy the patch, for that reason it was broken... add this too :/

kk thy but also dont what diff is xDD

the patch file is created automaticly?


EDIT: yes it is how i imagine it before then its cool i tought, that i have to write the .patch file per hand

i'll google it thy

terencehill wrote:Another better place than this to post your patch is http://pastebin.com/ , no need to be registered there. This way we can download the patch with one click, instead of doing copy, open a text editor, paste, save file...

Erm, it would be better to put it on its own item in http://dev.alientrap.org

Mr. Bougo wrote:

terencehill wrote:Another better place than this to post your patch is http://pastebin.com/ , no need to be registered there. This way we can download the patch with one click, instead of doing copy, open a text editor, paste, save file...

Erm, it would be better to put it on its own item in http://dev.alientrap.org

I've already suggested it, look at my first post. But if he doesn't want to register, I've suggested a quick alternative, where there is no need to register. I confirm the better place is http://dev.alientrap.org/projects/nexuiz/issues

Rahsennor wrote:

Sven wrote:for what is this: @@ -652,15 +700,15 @@?
i think its the lines where add or delete something but if im right for what is ",15"?

+ is add and -delete ,right?

It's a diff. Meant for computers, not humans. Try Wikipedia or Google if you really want to know.

i want to get the diff or the patch thing...
so i just make a backup from qcsrc then mod it and start the diff thing which compare the modded and the original files and create a .pach file, right?
i searched but the links i found didnt work -.-

found this but no download link... http://stephenjungels.com/jungels.net/a ... nutes.html

found link: http://gnuwin32.sourceforge.net/packages/diffutils.htm

I stay with the regular

is it right when i make a atch file?

Code: Select all

diff -u phys_subs.qc phys_subs2.qc > difftest_phys_subs.patch


and is it right that my windows takes aa long time for this:

Code: Select all

vector(vector c_maxs, vector c_mins, vector c_org) Clamp =
{
   local vector ret_vec;

   ret_vec_x = min(c_maxs_x, c_org_x);
   ret_vec_x = max(c_mins_x, ret_vec_x);
   ret_vec_y = min(c_maxs_y, c_org_y);
   ret_vec_y = max(c_mins_y, ret_vec_y);
   ret_vec_z = min(c_maxs_z, c_org_z);
   ret_vec_z = max(c_mins_z, ret_vec_z);
   return ret_vec;
};

vector(vector a, vector b) crossproduct =
{
   local vector v;
   v_x = a_y * b_z - a_z * b_y;
   v_y = a_z * b_x - a_x * b_z;
   v_z = a_x * b_y - a_y * b_x;
   return v;
};

float(float f) Snap2Grid =
{
   float rh, rl, r, rval;

   if (f == 0)
      return 0;

   if (f < 0)
   {
      rval = -1;
      f = f*-1;
   }
   else
      rval = 1;

   while(rh < f)
      rh = rh + self.pe_grid;
   rl = rh - self.pe_grid;
   r = (rh-rl)*0.5;
   f = f - rl;
   if (f < r)
      return rl*rval;
   else
      return rh*rval;
};

float BT_LIGHTNING = 0;
float BT_BEAM = 1;

void(float beamtype, vector bmins, vector bmaxs) BeamBox =
{
   local vector v1, v2;

   v1 = bmaxs;
   v2 = bmaxs;
   v2_x = bmins_x;
   if (beamtype == BT_LIGHTNING)
      te_lightning1(world, v1, v2);
   else
      te_beam(world, v1, v2);
   v1 = bmaxs;
   v2 = bmaxs;
   v2_y = bmins_y;
   if (beamtype == BT_LIGHTNING)
      te_lightning1(world, v1, v2);
   else
      te_beam(world, v1, v2);
   v1 = bmaxs;
   v2 = bmaxs;
   v2_z = bmins_z;
   if (beamtype == BT_LIGHTNING)
      te_lightning1(world, v1, v2);
   else
      te_beam(world, v1, v2);
   v1 = bmins;
   v2 = bmins;
   v2_x = bmaxs_x;
   if (beamtype == BT_LIGHTNING)
      te_lightning1(world, v1, v2);
   else
      te_beam(world, v1, v2);
   v1 = bmins;
   v2 = bmins;
   v2_y = bmaxs_y;
   if (beamtype == BT_LIGHTNING)
      te_lightning1(world, v1, v2);
   else
      te_beam(world, v1, v2);
   v1 = bmins;
   v2 = bmins;
   v2_z = bmaxs_z;
   if (beamtype == BT_LIGHTNING)
      te_lightning1(world, v1, v2);
   else
      te_beam(world, v1, v2);
   v1 = bmins;
   v1_z = bmaxs_z;
   v2 = bmins;
   v2_x = bmaxs_x;
   v2_z = bmaxs_z;
   if (beamtype == BT_LIGHTNING)
      te_lightning1(world, v1, v2);
   else
      te_beam(world, v1, v2);
   v1 = bmins;
   v1_z = bmaxs_z;
   v2 = bmins;
   v2_y = bmaxs_y;
   v2_z = bmaxs_z;
   if (beamtype == BT_LIGHTNING)
      te_lightning1(world, v1, v2);
   else
      te_beam(world, v1, v2);
   v1 = bmaxs;
   v1_z = bmins_z;
   v2 = bmaxs;
   v2_x = bmins_x;
   v2_z = bmins_z;
   if (beamtype == BT_LIGHTNING)
      te_lightning1(world, v1, v2);
   else
      te_beam(world, v1, v2);
   v1 = bmaxs;
   v1_z = bmins_z;
   v2 = bmaxs;
   v2_y = bmins_y;
   v2_z = bmins_z;
   if (beamtype == BT_LIGHTNING)
      te_lightning1(world, v1, v2);
   else
      te_beam(world, v1, v2);
   v1 = bmins;
   v1_x = bmaxs_x;
   v2 = bmaxs;
   v2_y = bmins_y;
   if (beamtype == BT_LIGHTNING)
      te_lightning1(world, v1, v2);
   else
      te_beam(world, v1, v2);
   v1 = bmins;
   v1_y = bmaxs_y;
   v2 = bmaxs;
   v2_x = bmins_x;
   if (beamtype == BT_LIGHTNING)
      te_lightning1(world, v1, v2);
   else
      te_beam(world, v1, v2);
};


after ~10min i canceled is and he created a .patch file with nothing(99% because i canceled it)...

terencehill wrote:I've already suggested it, look at my first post. But if he doesn't want to register, I've suggested a quick alternative, where there is no need to register. I confirm the better place is http://dev.alientrap.org/projects/nexuiz/issues

I want to. I just haven't had a chance to check it out. It doesn't say, does it show my email to anyone? I don't want spam...

Chubby: You mean you don't like the patch? It's not meant for use with a mouse, but for other pointers that normally make the game unplayable.

Sven: try "svn diff > path/filename.patch" to get a diff of your working copy against the svn. Note this will diff all files, not just one.

EDIT: I fixed the spiderbot.

Update!

Code: Select all

Made playing without crosshair ("crosshair 0" only) easier.
Fixed chasecam.
Made another broken attempt at correcting for FOVs other than 90.
Added cvar for deadzone, as requested.
Added cvar for sensitivity.
(Slightly) cleaner code.

How can I test the spiderbot?

i think this will be good, and useful, as i've been playing with eye tracking lately and this would help enhance the experience.

Rahsennor wrote:I want to. I just haven't had a chance to check it out. It doesn't say, does it show my email to anyone? I don't want spam...

U can choose in your profile to don't show your email address, like I did: http://dev.alientrap.org/account/show/19

Ok, now the only weird thing is the difference of sensitivity with horizontal/vertical movement, the vertical one seems very lower.

Another idea to implement, if u like, is to cap the movement speed to a max value, to avoid unwanted very fast movements or simply to allow fast movements, without the need of dosing the hand movement.

terencehill wrote:Ok, now the only weird thing is the difference of sensitivity with horizontal/vertical movement, the vertical one seems very lower.

It uses the keyboard pitch/yaw speed, with full press at edge of screen. I should probably give it a new cvar, or scrap it entirely and just use freeaim_sensitivity.

Mizu Kitsune:

Rahsennor wrote:Mizu Kitsune:

lol, its harder than you think, i had to bind keys on my numpad to shoot, alt fire and turn left and right to be able to turn all the way around normal speed, and it has some mouse lag, other than that, i like it., no more mousey for nexy for mi. ^_^

Remind me never to play you in MinstaGib!

Back to topic, I tried to register on dev.alientrap.org, but failed. Said it sent me an email but I got nothing. Triple-checked everything, tried again and it whinged about already-taken name and email. Tried to log in and failed. Waited several hours just in case, still no email. I think my webmail's spam filter ate it.

Patch staying here for now.