Merge branch 'master' into mirceakitsune/hud_postprocessing

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hook.qc

diff --git a/qcsrc/client/hook.qc b/qcsrc/client/hook.qc
index 8644847b3f92efc78a38f75e5a7801359e153423..7ff5adeca46204beaf8e37d040341b84c3ee6854 100644 (file)
--- a/qcsrc/client/hook.qc
+++ b/qcsrc/client/hook.qc
@@ -1,13 +1,10 @@
-.vector HookStart;
-.vector HookEnd;
-.float HookKillTime;
-.vector LGBeamStart;
-.vector LGBeamEnd;
-.float LGBeamKillTime;
-.float LGBeamSound;
-.float LGBeamSilent;
-
-void Draw_CylindricLine(vector from, vector to, float thickness, string texture, float aspect, float shift, vector rgb, float alpha, float drawflag)
+.float HookType; // ENT_CLIENT_*
+.vector origin;
+.vector velocity;
+.float HookSilent;
+.float HookRange;
+
+void Draw_CylindricLine(vector from, vector to, float thickness, string texture, float aspect, float shift, vector rgb, float alpha, float drawflag, vector vieworg)

 {
        // I want to draw a quad...
        // from and to are MIDPOINTS.
 {
        // I want to draw a quad...
        // from and to are MIDPOINTS.


@@ -19,14 +16,7 @@ void Draw_CylindricLine(vector from, vector to, float thickness, string texture,
        length_tex = aspect * vlen(to - from) / thickness;
 
        // direction is perpendicular to the view normal, and perpendicular to the axis
        length_tex = aspect * vlen(to - from) / thickness;
 
        // direction is perpendicular to the view normal, and perpendicular to the axis

-       thickdir = normalize(cross(axis, view_origin - from));
-
-/*
-       print("from ", vtos(from), "\n");
-       print("to ", vtos(to), "\n");
-       print("org ", vtos(view_origin), "\n");
-       print("dir ", vtos(thickdir), "\n");
-*/
+       thickdir = normalize(cross(axis, vieworg - from));

 
        A = from - thickdir * (thickness / 2);
        B = from + thickdir * (thickness / 2);
 
        A = from - thickdir * (thickness / 2);
        B = from + thickdir * (thickness / 2);


@@ -43,168 +33,264 @@ void Draw_CylindricLine(vector from, vector to, float thickness, string texture,
 
 string Draw_GrapplingHook_trace_callback_tex;
 float Draw_GrapplingHook_trace_callback_rnd;
 
 string Draw_GrapplingHook_trace_callback_tex;
 float Draw_GrapplingHook_trace_callback_rnd;

+vector Draw_GrapplingHook_trace_callback_rgb;
+float Draw_GrapplingHook_trace_callback_a;

 void Draw_GrapplingHook_trace_callback(vector start, vector hit, vector end)
 {
 void Draw_GrapplingHook_trace_callback(vector start, vector hit, vector end)
 {

-       Draw_CylindricLine(hit, start, 8, Draw_GrapplingHook_trace_callback_tex, 0.25, Draw_GrapplingHook_trace_callback_rnd, '1 1 1', 1, DRAWFLAG_NORMAL);
+       float i;
+       vector vorg;
+       vorg = WarpZone_TransformOrigin(WarpZone_trace_transform, view_origin);
+       for(i = 0; i < Draw_GrapplingHook_trace_callback_a; ++i)
+               Draw_CylindricLine(hit, start, 8, Draw_GrapplingHook_trace_callback_tex, 0.25, Draw_GrapplingHook_trace_callback_rnd, Draw_GrapplingHook_trace_callback_rgb, min(1, Draw_GrapplingHook_trace_callback_a - i), DRAWFLAG_NORMAL, vorg);

        Draw_GrapplingHook_trace_callback_rnd += 0.25 * vlen(hit - start) / 8;
 }
 
        Draw_GrapplingHook_trace_callback_rnd += 0.25 * vlen(hit - start) / 8;
 }
 

+.float teleport_time;

 void Draw_GrapplingHook()
 {
 void Draw_GrapplingHook()
 {

-       vector a, b;
+       vector a, b, atrans;

        string tex;
        vector rgb;
        float t;
        float s;
        vector vs;
        string tex;
        vector rgb;
        float t;
        float s;
        vector vs;

+       float intensity, offset;

 
 

-       if(time < self.HookKillTime)
+       if(self.teleport_time)
+       if(time > self.teleport_time)

        {
        {

-               s = cvar("cl_gunalign");
-               if(s != 1 && s != 2 && s != 4)
-                       s = 3; // default value
-               --s;
-               vs = hook_shotorigin[s];
+               sound (self, CHAN_PROJECTILE, "misc/null.wav", VOL_BASE, ATTN_NORM); // safeguard
+               self.teleport_time = 0;
+       }

 
 

-               if(self.sv_entnum == player_localentnum - 1)
-                       a = view_origin + view_forward * vs_x + view_right * -vs_y + view_up * vs_z;
-               else
-                       a = self.HookStart;
-               b = self.HookEnd;
+       InterpolateOrigin_Do();

 
 

-               t = GetPlayerColorForce(self.sv_entnum);
+       s = autocvar_cl_gunalign;
+       if(s != 1 && s != 2 && s != 4)
+               s = 3; // default value
+       --s;
+       switch(self.HookType)
+       {
+               default:
+               case ENT_CLIENT_HOOK:
+                       vs = hook_shotorigin[s];
+                       break;
+               case ENT_CLIENT_LGBEAM:
+                       vs = electro_shotorigin[s];
+                       break;
+               case ENT_CLIENT_GAUNTLET:
+                       vs = gauntlet_shotorigin[s];
+                       break;
+       }

 
 

-               if(t == COLOR_TEAM1)
-               {
-                       tex = "particles/hook_red";
-                       rgb = '1 .3 .3';
-               }
-               else if(t == COLOR_TEAM2)
-               {
-                       tex = "particles/hook_blue";
-                       rgb = '.3 .3 1';
-               }
-               else if(t == COLOR_TEAM3)
-               {
-                       tex = "particles/hook_yellow";
-                       rgb = '1 1 .3';
-               }
-               else if(t == COLOR_TEAM4)
+       if((self.owner.sv_entnum == player_localentnum - 1))
+       {
+               switch(self.HookType)

                {
                {

-                       tex = "particles/hook_pink";
-                       rgb = '1 .3 1';
+                       default:
+                       case ENT_CLIENT_HOOK:
+                               a = view_origin + view_forward * vs_x + view_right * -vs_y + view_up * vs_z;
+                               b = self.origin;
+                               break;
+                       case ENT_CLIENT_LGBEAM:
+                       case ENT_CLIENT_GAUNTLET:
+                               if(self.HookRange)
+                                       b = view_origin + view_forward * self.HookRange;
+                               else
+                                       b = view_origin + view_forward * vlen(self.velocity - self.origin); // honor original length of beam!
+                               WarpZone_TraceLine(view_origin, b, MOVE_NORMAL, world);
+                               b = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos);
+                               a = view_origin + view_forward * vs_x + view_right * -vs_y + view_up * vs_z;
+                               break;

                }
                }

-               else
+       }
+       else
+       {
+               switch(self.HookType)

                {
                {

-                       tex = "particles/hook_green";
-                       rgb = '.3 1 .3';
+                       default:
+                       case ENT_CLIENT_HOOK:
+                               a = self.velocity;
+                               b = self.origin;
+                               break;
+                       case ENT_CLIENT_LGBEAM:
+                       case ENT_CLIENT_GAUNTLET:
+                               a = self.origin;
+                               b = self.velocity;
+                               break;

                }
                }

-
-               Draw_GrapplingHook_trace_callback_tex = tex;
-               Draw_GrapplingHook_trace_callback_rnd = random();
-               WarpZone_TraceBox_ThroughZone(a, '0 0 0', '0 0 0', b, MOVE_NOMONSTERS, world, world, Draw_GrapplingHook_trace_callback);
-               Draw_GrapplingHook_trace_callback_tex = string_null;

        }
 
        }
 

-       if(time < self.LGBeamKillTime)
+       t = GetPlayerColorForce(self.owner.sv_entnum);
+
+       switch(self.HookType)

        {
        {

-               s = cvar("cl_gunalign");
-               if(s != 1 && s != 2 && s != 4)
-                       s = 3; // default value
-               --s;
-               vs = electro_shotorigin[s];
+               default:
+               case ENT_CLIENT_HOOK:
+                       intensity = 1;
+                       offset = 0;
+                       if(t == COLOR_TEAM1)
+                       {
+                               tex = "particles/hook_red";
+                               rgb = '1 .3 .3';
+                       }
+                       else if(t == COLOR_TEAM2)
+                       {
+                               tex = "particles/hook_blue";
+                               rgb = '.3 .3 1';
+                       }
+                       else if(t == COLOR_TEAM3)
+                       {
+                               tex = "particles/hook_yellow";
+                               rgb = '1 1 .3';
+                       }
+                       else if(t == COLOR_TEAM4)
+                       {
+                               tex = "particles/hook_pink";
+                               rgb = '1 .3 1';
+                       }
+                       else
+                       {
+                               tex = "particles/hook_green";
+                               rgb = '.3 1 .3';
+                       }
+                       break;
+               case ENT_CLIENT_LGBEAM:
+                       intensity = bound(0.2, 1 + Noise_Pink(self, frametime) * 1 + Noise_Burst(self, frametime, 0.03) * 0.3, 2);
+                       offset = Noise_Brown(self, frametime) * 10;
+                       tex = "particles/lgbeam";
+                       rgb = '1 1 1';
+                       break;
+               case ENT_CLIENT_GAUNTLET:
+                       intensity = 1;
+                       offset = Noise_White(self, frametime);
+                       tex = "particles/gauntletbeam";
+                       rgb = '1 1 1';
+                       break;
+       }

 
 

-               if(self.sv_entnum == player_localentnum - 1)
-               {
-                       b = view_origin + view_forward * MAX_SHOT_DISTANCE;
-                       WarpZone_TraceLine(view_origin, b, MOVE_NORMAL, world);
-                       a = view_origin + view_forward * vs_x + view_right * -vs_y + view_up * vs_z;
-               }
-               else
-               {
-                       a = self.LGBeamStart;
-                       b = self.LGBeamEnd;
-               }
+       Draw_GrapplingHook_trace_callback_tex = tex;
+       Draw_GrapplingHook_trace_callback_rnd = offset;
+       Draw_GrapplingHook_trace_callback_rgb = rgb;
+       Draw_GrapplingHook_trace_callback_a = intensity;
+       WarpZone_TraceBox_ThroughZone(a, '0 0 0', '0 0 0', b, ((self.HookType == ENT_CLIENT_HOOK) ? MOVE_NOTHING : MOVE_NORMAL), world, world, Draw_GrapplingHook_trace_callback);
+       Draw_GrapplingHook_trace_callback_tex = string_null;

 
 

-               tex = "particles/lgbeam";
-               rgb = '1 1 1';
+       atrans = WarpZone_TransformOrigin(WarpZone_trace_transform, a);

 
 

-               Draw_GrapplingHook_trace_callback_tex = tex;
-               Draw_GrapplingHook_trace_callback_rnd = random();
-               WarpZone_TraceBox_ThroughZone(a, '0 0 0', '0 0 0', b, MOVE_NORMAL, world, world, Draw_GrapplingHook_trace_callback);
-               Draw_GrapplingHook_trace_callback_tex = string_null;
+       switch(self.HookType)
+       {
+               default:
+               case ENT_CLIENT_HOOK:
+                       if(vlen(trace_endpos - atrans) > 0.5)
+                       {
+                               setorigin(self, trace_endpos); // hook endpoint!
+                               self.angles = vectoangles(trace_endpos - atrans);
+                               self.drawmask = MASK_NORMAL;
+                       }
+                       else
+                       {
+                               self.drawmask = 0;
+                       }
+                       break;
+               case ENT_CLIENT_LGBEAM:
+               case ENT_CLIENT_GAUNTLET:
+                       setorigin(self, a); // beam origin!
+                       break;
+       }

 
 

-               // helps the sound
-               setorigin(self, a);
+       switch(self.HookType)
+       {
+               default:
+               case ENT_CLIENT_HOOK:
+                       break;
+               case ENT_CLIENT_LGBEAM:
+                       pointparticles(particleeffectnum("electro_lightning"), trace_endpos, normalize(atrans - trace_endpos), frametime * intensity);
+                       break;
+               case ENT_CLIENT_GAUNTLET:
+                       pointparticles(particleeffectnum("gauntlet_lightning"), b, normalize(a - b), frametime * intensity);
+                       break;

        }
        }

+}

 
 

-       if(time < self.LGBeamKillTime && !self.LGBeamSilent)
+void Remove_GrapplingHook()
+{
+       sound (self, CHAN_PROJECTILE, "misc/null.wav", VOL_BASE, ATTN_NORM);
+}
+
+void Ent_ReadHook(float bIsNew, float type)
+{
+       self.HookType = type;
+
+       float sf;
+       sf = ReadByte();
+
+       self.HookSilent = (sf & 0x80);
+       self.iflags = IFLAG_VELOCITY;
+
+       InterpolateOrigin_Undo();
+
+       if(sf & 1)

        {
        {

-               if(!self.LGBeamSound)
+               self.owner = playerslots[ReadByte() - 1];
+               switch(self.HookType)

                {
                {

-                       sound (self, CHAN_PROJECTILE, "weapons/lgbeam_fly.wav", VOL_BASE, ATTN_NORM);
-                       self.LGBeamSound = 1;
+                       default:
+                       case ENT_CLIENT_HOOK:
+                       case ENT_CLIENT_GAUNTLET:
+                               self.HookRange = 0;
+                               break;
+                       case ENT_CLIENT_LGBEAM:
+                               self.HookRange = ReadCoord();
+                               break;

                }
        }
                }
        }

-       else
+       if(sf & 2)

        {
        {

-               if(self.LGBeamSound)
-               {
-                       sound (self, CHAN_PROJECTILE, "misc/null.wav", VOL_BASE, ATTN_NORM);
-                       self.LGBeamSound = 0;
-               }
+               self.origin_x = ReadCoord();
+               self.origin_y = ReadCoord();
+               self.origin_z = ReadCoord();
+               setorigin(self, self.origin);
+       }
+       if(sf & 4)
+       {
+               self.velocity_x = ReadCoord();
+               self.velocity_y = ReadCoord();
+               self.velocity_z = ReadCoord();

        }
        }

-}

 
 

-void Net_GrapplingHook()
-{
-       float i, t;
-       vector start, end;
-       entity p;
-
-       i = ReadByte();
-       t = ReadByte();
-       end_x = ReadCoord();
-       end_y = ReadCoord();
-       end_z = ReadCoord();
-       start_x = ReadCoord();
-       start_y = ReadCoord();
-       start_z = ReadCoord();
-
-       if(i <= 0 || i >= 256) // not owned by a client
-               return;
-       --i;
-
-       p = playerslots[i];
-       if(!p)
-               return;
-
-       switch(t)
+       InterpolateOrigin_Note();
+
+       if(bIsNew || !self.teleport_time)

        {
        {

-               case 0: // hook beam
-                       p.HookKillTime = time + 0.1;
-                       p.HookStart = start;
-                       p.HookEnd = end;
-                       p.draw = Draw_GrapplingHook;
-                       break;
-               case 1: // electro lgbeam
-                       p.LGBeamKillTime = time + 0.1;
-                       p.LGBeamStart = start;
-                       p.LGBeamEnd = end;
-                       p.LGBeamSilent = 0;
-                       p.draw = Draw_GrapplingHook;
-                       break;
-               case 2: // silent electro lgbeam
-                       p.LGBeamKillTime = time + 0.1;
-                       p.LGBeamStart = start;
-                       p.LGBeamEnd = end;
-                       p.LGBeamSilent = 1;
-                       p.draw = Draw_GrapplingHook;
-                       break;
+               self.draw = Draw_GrapplingHook;
+               self.entremove = Remove_GrapplingHook;
+
+               switch(self.HookType)
+               {
+                       default:
+                       case ENT_CLIENT_HOOK:
+                               // for the model
+                               setmodel(self, "models/hook.md3");
+                               self.drawmask = MASK_NORMAL;
+                               break;
+                       case ENT_CLIENT_LGBEAM:
+                               sound (self, CHAN_PROJECTILE, "weapons/lgbeam_fly.wav", VOL_BASE, ATTN_NORM);
+                               break;
+                       case ENT_CLIENT_GAUNTLET:
+                               sound (self, CHAN_PROJECTILE, "weapons/gauntletbeam_fly.wav", VOL_BASE, ATTN_NORM);
+                               break;
+               }

        }
        }

+
+       self.teleport_time = time + 10;

 }
 
 void Hook_Precache()
 {
        precache_sound("weapons/lgbeam_fly.wav");
 }
 
 void Hook_Precache()
 {
        precache_sound("weapons/lgbeam_fly.wav");

+       precache_sound("weapons/gauntletbeam_fly.wav");
+       precache_model("models/hook.md3");

 }
 }

+
+// TODO: hook: temporarily transform self.origin for drawing the model along warpzones!