On second thought, keep the override cvar

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

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index dd245786bef44c5104f3a56385aacb073970fb85..6e3cc5a8dadc65cdee70dfa834a585894c41af3e 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -199,12 +199,12 @@ vector GetCurrentFov(float fov)
        return '1 0 0' * fovx + '0 1 0' * fovy;
 }
 
-vector GetOrthoviewFOV(void)
+vector GetOrthoviewFOV(vector ov_org)
 {
        float fovx, fovy;
        float width = (mi_picmax_x - mi_picmin_x);
        float height = (mi_picmax_y - mi_picmin_y);
-       float distance_to_middle_of_world = vlen(view_origin);
+       float distance_to_middle_of_world = vlen(ov_org);
        fovx = atan2(width/2, distance_to_middle_of_world) / M_PI * 360.0;
        fovy = atan2(height/2, distance_to_middle_of_world) / M_PI * 360.0;
        return '1 0 0' * fovx + '0 1 0' * fovy;
@@ -396,7 +396,7 @@ float checkfail[16];
 
 float rainbow_last_flicker;
 vector rainbow_prev_color;
-
+float autocvar_cl_orthoview_distanceoverride;
 #define BUTTON_3 4
 #define BUTTON_4 8
 float cl_notice_run();
@@ -559,11 +559,42 @@ void CSQC_UpdateView(float w, float h)
        WarpZone_FixView();
        //WarpZone_FixPMove();
 
+       vector ov_org = '0 0 0';
        if(autocvar_cl_orthoview)
        {
-               float width = (mi_picmax_x - mi_picmin_x);
-               float height = (mi_picmax_y - mi_picmin_y);
-               setproperty(VF_ORIGIN, '0 0 1' * (512 * max(width, height)));
+               #define FL2VEC(x,y,z) (('1 0 0' * x) + ('0 1 0' * y) + ('0 0 1' * z))
+               
+               float ov_width = (mi_picmax_x - mi_picmin_x);
+               float ov_height = (mi_picmax_y - mi_picmin_y);
+               float ov_distance = (512 * max(ov_width, ov_height));
+               if(autocvar_cl_orthoview_distanceoverride) { ov_distance = autocvar_cl_orthoview_distanceoverride; }
+               ov_org = ((mi_picmax + mi_picmin) * 0.5);
+               ov_org = FL2VEC(ov_org_x, ov_org_y, (ov_org_z * ov_distance));
+
+               float ov_nearest = vlen(ov_org - FL2VEC(
+                       bound(mi_picmin_x, ov_org_x, mi_picmax_x),
+                       bound(mi_picmin_y, ov_org_y, mi_picmax_y),
+                       bound(mi_picmin_z, ov_org_z, mi_picmax_z)
+               ));
+
+               float ov_furthest = 0;
+               float dist = 0;
+
+               if((dist = vlen(FL2VEC(mi_picmin_x, mi_picmin_y, mi_picmin_z) - ov_org)) > ov_furthest) { ov_furthest = dist; }
+               if((dist = vlen(FL2VEC(mi_picmax_x, mi_picmin_y, mi_picmin_z) - ov_org)) > ov_furthest) { ov_furthest = dist; }
+               if((dist = vlen(FL2VEC(mi_picmin_x, mi_picmax_y, mi_picmin_z) - ov_org)) > ov_furthest) { ov_furthest = dist; }
+               if((dist = vlen(FL2VEC(mi_picmin_x, mi_picmin_y, mi_picmax_z) - ov_org)) > ov_furthest) { ov_furthest = dist; }
+               if((dist = vlen(FL2VEC(mi_picmax_x, mi_picmax_y, mi_picmin_z) - ov_org)) > ov_furthest) { ov_furthest = dist; }
+               if((dist = vlen(FL2VEC(mi_picmin_x, mi_picmax_y, mi_picmax_z) - ov_org)) > ov_furthest) { ov_furthest = dist; }
+               if((dist = vlen(FL2VEC(mi_picmax_x, mi_picmin_y, mi_picmax_z) - ov_org)) > ov_furthest) { ov_furthest = dist; }
+               if((dist = vlen(FL2VEC(mi_picmax_x, mi_picmax_y, mi_picmax_z) - ov_org)) > ov_furthest) { ov_furthest = dist; }
+               
+               cvar_set("r_nearclip", ftos(ov_nearest));
+               cvar_set("r_farclip_base", ftos(ov_furthest));
+               cvar_set("r_farclip_world", "0");
+               cvar_set("r_useinfinitefarclip", "0");
+               
+               setproperty(VF_ORIGIN, ov_org);
                setproperty(VF_ANGLES, '90 0 0');
        }
 
@@ -708,7 +739,7 @@ void CSQC_UpdateView(float w, float h)
        vid_conheight = autocvar_vid_conheight;
        vid_pixelheight = autocvar_vid_pixelheight;
 
-       if(autocvar_cl_orthoview) { setproperty(VF_FOV, GetOrthoviewFOV()); }
+       if(autocvar_cl_orthoview) { setproperty(VF_FOV, GetOrthoviewFOV(ov_org)); }
        else { setproperty(VF_FOV, GetCurrentFov(fov)); }
 
        // Camera for demo playback