self.enemy.classname = "warpzone_from";
}
self.classname = "trigger_warpzone";
+
+ self.WarpZone_isboxy = ReadByte();
self.origin_x = ReadCoord();
self.origin_y = ReadCoord();
self.origin_z = ReadCoord();
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
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;
-}
-
void WarpZone_Camera_Read(float isnew)
{
self.classname = "func_warpzone_camera";
self.avelocity_y = ReadCoord();
self.avelocity_z = ReadCoord();
+ // 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);
//cvar_set("cl_forwardspeed", ftos(warpzone_fixingview_forwardspeed));
}
+vector WarpZone_FixNearClip(vector o, vector c0, vector c1, vector c2, vector c3)
+{
+ float nearclipdistance;
+ 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;
+vector warpzone_saved_cl_viewangles;
#ifndef KEEP_ROLL
var float autocvar_cl_rollkillspeed = 10;
#endif
void WarpZone_FixView()
{
- float pd;
+ float pd, 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(autocvar_cl_rollkillspeed)
- R_SetView(VF_CL_VIEWANGLES_Z, input_angles_z * max(0, (1 - frametime * autocvar_cl_rollkillspeed)));
- else
- R_SetView(VF_CL_VIEWANGLES_Z, 0);
+ if(warpzone_fixview_angles_z != 0 || warpzone_fixview_cl_viewangles_z != 0)
+ {
+ if(autocvar_cl_rollkillspeed)
+ f = max(0, (1 - frametime * autocvar_cl_rollkillspeed));
+ else
+ f = 0;
+ warpzone_fixview_angles_z *= f;
+ warpzone_fixview_cl_viewangles_z *= f;
+ warpzone_saved_angles_z *= f; // PERMANENTLY apply that change!
+ warpzone_saved_cl_viewangles_z *= f; // PERMANENTLY apply that change!
+ warpzone_saved = 2;
+ R_SetView(VF_CL_VIEWANGLES_Z, warpzone_fixview_angles_z);
+ }
#endif
e = WarpZone_Find(warpzone_fixview_origin, warpzone_fixview_origin);
{
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();
}
else
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)
+ if(warpzone_saved == 1)
{
R_SetView(VF_ORIGIN, warpzone_fixview_origin);
- R_SetView(VF_ANGLES, warpzone_fixview_angles);
+ R_SetView(VF_ANGLES, warpzone_fixview_cl_viewangles);
}
}
void WarpZone_UnFixView()
{
warpzone_fixview_origin = warpzone_saved_origin;
warpzone_fixview_angles = warpzone_saved_angles;
+ warpzone_fixview_cl_viewangles = warpzone_saved_cl_viewangles;
R_SetView(VF_ORIGIN, warpzone_fixview_origin);
R_SetView(VF_ANGLES, warpzone_fixview_angles);
+ R_SetView(VF_CL_VIEWANGLES, warpzone_fixview_cl_viewangles);
}
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff