From a062a974414d9c05eb0b9afe93709e05c5a4d09e Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Fri, 3 Jan 2014 20:37:04 -0500 Subject: [PATCH] Always ensure pixel accuracy instead of manually setting it --- defaultXonotic.cfg | 3 +-- qcsrc/client/View.qc | 2 +- qcsrc/client/autocvars.qh | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 6f2eb2b14..2814738e7 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -141,9 +141,8 @@ set rpn_linear_to_sRGB "dup 1.0 2.4 div pow 1.055 mul 0.055 sub exch 12.92 mul d // q3map_skylight 9.32523632 3 alias skybox_nosRGB_to_sRGB "rpn $3 402.123 $4 div div $rpn_sRGB_to_linear 402.123 $4 div mul /new_skylight: $3 402.123 $4 div div $1 256 div $2 0.017453 mul sin mul add $rpn_sRGB_to_linear $3 402.123 $4 div div $rpn_sRGB_to_linear sub 256 mul $2 0.017453 mul sin div /new_sunlight:" -set cl_orthoview 0 "WARNING: WILL BREAK CONFIG!!! enable top-down view of the map- meant to be used for radar map images" +set cl_orthoview 0 "enable top-down view of the map- meant to be used for radar map images (note: orthoview sets cvars temporarily, requires restart to return them to normal)" set cl_orthoview_nofog 1 "disable fog while in orthoview-- note, should not be enabled on ALL maps, i.e. oilrig works fine with this disabled" -set cl_orthoview_resolution 512 "resolution accuracy multiplier for deciding fov scaling and view distance" // these settings determine how much the view is affected by movement/damage cl_smoothviewheight 0.05 // time of the averaging to the viewheight value so that it creates a smooth transition for crouching and such. 0 for instant transition diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index e9e19dd49..41cec30bf 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -572,7 +572,7 @@ void CSQC_UpdateView(float w, float h) float ov_width = (ov_worldmax_x - ov_worldmin_x); float ov_height = (ov_worldmax_y - ov_worldmin_y); - float ov_distance = (autocvar_cl_orthoview_resolution * max(ov_width, ov_height)); + float ov_distance = (max(vid_width, vid_height) * max(ov_width, ov_height)); ov_mid = ((ov_worldmax + ov_worldmin) * 0.5); ov_org = vec3(ov_mid_x, ov_mid_y, (ov_mid_z + ov_distance)); diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index 16c5fc76a..43aab6ae4 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -56,7 +56,6 @@ float autocvar_cl_lockview; float autocvar_cl_nogibs; float autocvar_cl_orthoview; float autocvar_cl_orthoview_nofog; -float autocvar_cl_orthoview_resolution; float autocvar_cl_particlegibs; float autocvar_cl_particles_oldnexbeam; float autocvar_cl_particles_quality; -- 2.39.2