X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fwarpzonelib%2Fclient.qc;h=f02fa4a30266d097b9c595d413829300999eeb4d;hb=4fc59bbd7e2d4f25ba21952ed50ae754295a7faa;hp=773e90d5ecd655752f4fa02ca10ac2e36f951361;hpb=fef280899c7d1bb27078da823b0a64843b2f1129;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/warpzonelib/client.qc b/qcsrc/warpzonelib/client.qc index 773e90d5e..f02fa4a30 100644 --- a/qcsrc/warpzonelib/client.qc +++ b/qcsrc/warpzonelib/client.qc @@ -1,14 +1,38 @@ +void WarpZone_Fade_PreDraw() +{ + if(self.warpzone_fadestart) + self.alpha = bound(0, (self.warpzone_fadeend - vlen(view_origin - self.origin - 0.5 * (self.mins + self.maxs))) / (self.warpzone_fadeend - self.warpzone_fadestart), 1); + else + self.alpha = 1; + //print(sprintf("%v <-> %v\n", view_origin, self.origin + 0.5 * (self.mins + self.maxs))); + if(self.alpha <= 0) + self.drawmask = 0; + else + self.drawmask = MASK_NORMAL; +} + void WarpZone_Read(float isnew) { + float f; + + warpzone_warpzones_exist = 1; if not(self.enemy) { self.enemy = spawn(); self.enemy.classname = "warpzone_from"; } self.classname = "trigger_warpzone"; - self.origin_x = ReadCoord(); - self.origin_y = ReadCoord(); - self.origin_z = ReadCoord(); + + f = ReadByte(); + self.warpzone_isboxy = (f & 1); + if(f & 4) + { + self.origin_x = ReadCoord(); + self.origin_y = ReadCoord(); + self.origin_z = ReadCoord(); + } + else + self.origin = '0 0 0'; self.modelindex = ReadShort(); self.mins_x = ReadCoord(); self.mins_y = ReadCoord(); @@ -30,33 +54,48 @@ void WarpZone_Read(float isnew) self.avelocity_y = ReadCoord(); self.avelocity_z = ReadCoord(); + if(f & 2) + { + self.warpzone_fadestart = ReadShort(); + self.warpzone_fadeend = max(self.warpzone_fadestart + 1, ReadShort()); + } + else + { + self.warpzone_fadestart = 0; + self.warpzone_fadeend = 0; + } + // common stuff WarpZone_SetUp(self, self.enemy.oldorigin, self.enemy.avelocity, self.oldorigin, self.avelocity); - // engine currently wants this - self.avelocity = AnglesTransform_TurnDirectionFR(self.avelocity); - self.drawmask = MASK_NORMAL; - // link me //setmodel(self, self.model); setorigin(self, self.origin); setsize(self, self.mins, self.maxs); -} -vector WarpZone_Camera_camera_transform(vector org, vector ang) -{ - // a fixed camera view - trace_endpos = self.oldorigin; - makevectors(self.avelocity); - return self.oldorigin; + // how to draw + // engine currently wants this + if(self.warpzone_fadestart) + self.predraw = WarpZone_Fade_PreDraw; + else + self.drawmask = MASK_NORMAL; } void WarpZone_Camera_Read(float isnew) { + float f; + warpzone_cameras_exist = 1; self.classname = "func_warpzone_camera"; - self.origin_x = ReadCoord(); - self.origin_y = ReadCoord(); - self.origin_z = ReadCoord(); + + f = ReadByte(); + if(f & 4) + { + self.origin_x = ReadCoord(); + self.origin_y = ReadCoord(); + self.origin_z = ReadCoord(); + } + else + self.origin = '0 0 0'; self.modelindex = ReadShort(); self.mins_x = ReadCoord(); self.mins_y = ReadCoord(); @@ -72,14 +111,34 @@ void WarpZone_Camera_Read(float isnew) self.avelocity_y = ReadCoord(); self.avelocity_z = ReadCoord(); + if(f & 2) + { + self.warpzone_fadestart = ReadShort(); + self.warpzone_fadeend = max(self.warpzone_fadestart + 1, ReadShort()); + } + else + { + self.warpzone_fadestart = 0; + self.warpzone_fadeend = 0; + } + + // common stuff + WarpZone_Camera_SetUp(self, self.oldorigin, self.avelocity); + // engine currently wants this self.drawmask = MASK_NORMAL; - self.camera_transform = WarpZone_Camera_camera_transform; // link me //setmodel(self, self.model); setorigin(self, self.origin); setsize(self, self.mins, self.maxs); + + // how to draw + // engine currently wants this + if(self.warpzone_fadestart) + self.predraw = WarpZone_Fade_PreDraw; + else + self.drawmask = MASK_NORMAL; } float warpzone_fixingview; @@ -109,6 +168,38 @@ void WarpZone_Outside() //cvar_set("cl_forwardspeed", ftos(warpzone_fixingview_forwardspeed)); } +vector WarpZone_FixNearClip(vector o, vector c0, vector c1, vector c2, vector c3) +{ + vector mi, ma; + entity e; + float pd; + + mi_x = min5(o_x, c0_x, c1_x, c2_x, c3_x); + ma_x = max5(o_x, c0_x, c1_x, c2_x, c3_x); + mi_y = min5(o_y, c0_y, c1_y, c2_y, c3_y); + ma_y = max5(o_y, c0_y, c1_y, c2_y, c3_y); + mi_z = min5(o_z, c0_z, c1_z, c2_z, c3_z); + ma_z = max5(o_z, c0_z, c1_z, c2_z, c3_z); + + e = WarpZone_Find(mi, ma); + if(e) + { + if(WarpZone_PlaneDist(e, o) < 0) + return '0 0 0'; + // can't really be, though, but if it is, this is not my warpzone, but a random different one in the same mins/maxs + pd = min4( + WarpZone_PlaneDist(e, c0), + WarpZone_PlaneDist(e, c1), + WarpZone_PlaneDist(e, c2), + WarpZone_PlaneDist(e, c3) + ); + if(pd < 0) + return e.warpzone_forward * -pd; + } + + return '0 0 0'; +} + float warpzone_saved; vector warpzone_saved_origin; vector warpzone_saved_angles; @@ -118,13 +209,22 @@ var float autocvar_cl_rollkillspeed = 10; #endif void WarpZone_FixView() { - float pd, f; + float f; + vector o; entity e; + vector corner0, corner1, corner2, corner3, nearclip; + warpzone_saved = 0; warpzone_saved_origin = warpzone_fixview_origin; warpzone_saved_angles = warpzone_fixview_angles; warpzone_saved_cl_viewangles = warpzone_fixview_cl_viewangles; + nearclip = '0 0 1' * (cvar("r_nearclip") * 1.125); + corner0 = cs_unproject('0 0 0' + nearclip); + corner1 = cs_unproject('1 0 0' * cvar("vid_conwidth") + nearclip); + corner2 = cs_unproject('0 1 0' * cvar("vid_conheight") + nearclip); + corner3 = cs_unproject('1 0 0' * cvar("vid_conwidth") + '0 1 0' * cvar("vid_conheight") + nearclip); + #ifndef KEEP_ROLL if(warpzone_fixview_angles_z != 0 || warpzone_fixview_cl_viewangles_z != 0) { @@ -146,6 +246,10 @@ void WarpZone_FixView() { warpzone_saved = 1; warpzone_fixview_origin = WarpZone_TransformOrigin(e, warpzone_fixview_origin); + corner0 = WarpZone_TransformOrigin(e, corner0); + corner1 = WarpZone_TransformOrigin(e, corner1); + corner2 = WarpZone_TransformOrigin(e, corner2); + corner3 = WarpZone_TransformOrigin(e, corner3); warpzone_fixview_angles = WarpZone_TransformVAngles(e, warpzone_fixview_angles); warpzone_fixview_cl_viewangles = WarpZone_TransformVAngles(e, warpzone_fixview_cl_viewangles); WarpZone_Inside(); @@ -154,16 +258,11 @@ void WarpZone_FixView() WarpZone_Outside(); // if we are near any warpzone planes - MOVE AWAY (work around nearclip) - float nearclip = 2; - e = WarpZone_Find(warpzone_fixview_origin - '1 1 1' * nearclip, warpzone_fixview_origin + '1 1 1' * nearclip); - if(e) + o = WarpZone_FixNearClip(warpzone_fixview_origin, corner0, corner1, corner2, corner3); + if(o != '0 0 0') { - pd = WarpZone_PlaneDist(e, warpzone_fixview_origin); - if(pd >= 0 && pd < nearclip) - { - warpzone_saved = 1; - warpzone_fixview_origin = warpzone_fixview_origin + e.warpzone_forward * (nearclip - pd); - } + warpzone_saved = 1; + warpzone_fixview_origin += o; } if(warpzone_saved == 1)