From 7d690926a4dfd4086c9ecae8868d020d5869af18 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Sat, 28 Dec 2013 13:50:06 -0500 Subject: [PATCH] Use vec3 and get rid of FL2VEC -- This function didn't exist when I first made orthoview :) --- qcsrc/client/View.qc | 20 ++++++++++---------- qcsrc/common/util.qh | 3 --- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 5de6e467e..d58704803 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -573,9 +573,9 @@ void CSQC_UpdateView(float w, float h) float ov_distance = (autocvar_cl_orthoview_resolution * max(ov_width, ov_height)); ov_mid = ((ov_worldmax + ov_worldmin) * 0.5); - ov_org = FL2VEC(ov_mid_x, ov_mid_y, (ov_mid_z + ov_distance)); + ov_org = vec3(ov_mid_x, ov_mid_y, (ov_mid_z + ov_distance)); - float ov_nearest = vlen(ov_org - FL2VEC( + float ov_nearest = vlen(ov_org - vec3( bound(ov_worldmin_x, ov_org_x, ov_worldmax_x), bound(ov_worldmin_y, ov_org_y, ov_worldmax_y), bound(ov_worldmin_z, ov_org_z, ov_worldmax_z) @@ -584,14 +584,14 @@ void CSQC_UpdateView(float w, float h) float ov_furthest = 0; float dist = 0; - if((dist = vlen(FL2VEC(ov_worldmin_x, ov_worldmin_y, ov_worldmin_z) - ov_org)) > ov_furthest) { ov_furthest = dist; } - if((dist = vlen(FL2VEC(ov_worldmax_x, ov_worldmin_y, ov_worldmin_z) - ov_org)) > ov_furthest) { ov_furthest = dist; } - if((dist = vlen(FL2VEC(ov_worldmin_x, ov_worldmax_y, ov_worldmin_z) - ov_org)) > ov_furthest) { ov_furthest = dist; } - if((dist = vlen(FL2VEC(ov_worldmin_x, ov_worldmin_y, ov_worldmax_z) - ov_org)) > ov_furthest) { ov_furthest = dist; } - if((dist = vlen(FL2VEC(ov_worldmax_x, ov_worldmax_y, ov_worldmin_z) - ov_org)) > ov_furthest) { ov_furthest = dist; } - if((dist = vlen(FL2VEC(ov_worldmin_x, ov_worldmax_y, ov_worldmax_z) - ov_org)) > ov_furthest) { ov_furthest = dist; } - if((dist = vlen(FL2VEC(ov_worldmax_x, ov_worldmin_y, ov_worldmax_z) - ov_org)) > ov_furthest) { ov_furthest = dist; } - if((dist = vlen(FL2VEC(ov_worldmax_x, ov_worldmax_y, ov_worldmax_z) - ov_org)) > ov_furthest) { ov_furthest = dist; } + if((dist = vlen(vec3(ov_worldmin_x, ov_worldmin_y, ov_worldmin_z) - ov_org)) > ov_furthest) { ov_furthest = dist; } + if((dist = vlen(vec3(ov_worldmax_x, ov_worldmin_y, ov_worldmin_z) - ov_org)) > ov_furthest) { ov_furthest = dist; } + if((dist = vlen(vec3(ov_worldmin_x, ov_worldmax_y, ov_worldmin_z) - ov_org)) > ov_furthest) { ov_furthest = dist; } + if((dist = vlen(vec3(ov_worldmin_x, ov_worldmin_y, ov_worldmax_z) - ov_org)) > ov_furthest) { ov_furthest = dist; } + if((dist = vlen(vec3(ov_worldmax_x, ov_worldmax_y, ov_worldmin_z) - ov_org)) > ov_furthest) { ov_furthest = dist; } + if((dist = vlen(vec3(ov_worldmin_x, ov_worldmax_y, ov_worldmax_z) - ov_org)) > ov_furthest) { ov_furthest = dist; } + if((dist = vlen(vec3(ov_worldmax_x, ov_worldmin_y, ov_worldmax_z) - ov_org)) > ov_furthest) { ov_furthest = dist; } + if((dist = vlen(vec3(ov_worldmax_x, ov_worldmax_y, ov_worldmax_z) - ov_org)) > ov_furthest) { ov_furthest = dist; } cvar_set("r_nearclip", ftos(ov_nearest)); cvar_set("r_farclip_base", ftos(ov_furthest)); diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index 184cdec34..a9f9095c7 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -430,6 +430,3 @@ void dedicated_print(string input); #define CNT_ROUNDSTART 6 float Announcer_PickNumber(float type, float num); #endif - -// TODO: Replace this with new gmqcc syntax when available -#define FL2VEC(x,y,z) ((eX * (x)) + (eY * (y)) + (eZ * (z))) -- 2.39.2