TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move View_zoom out of global scope

Browse source 
It is only used briefly, so it can be local.
This commit is contained in:
Kp 2021-08-26 03:13:45 +00:00
parent f047629051
commit 079ab168a4
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/3d/globvars.cpp
View file

@ -17,7 +17,6 @@
namespace dcx { namespace dcx {
vms_vector View_position; vms_vector View_position;
fix View_zoom;
vms_matrix Unscaled_matrix; //before scaling vms_matrix Unscaled_matrix; //before scaling
vms_matrix View_matrix; vms_matrix View_matrix;

1
common/3d/globvars.h
View file

@ -27,7 +27,6 @@ extern double fCanv_w2, fCanv_h2;
extern vms_vector Window_scale; extern vms_vector Window_scale;
extern fix View_zoom;
extern vms_vector View_position,Matrix_scale; extern vms_vector View_position,Matrix_scale;
extern vms_matrix View_matrix,Unscaled_matrix; extern vms_matrix View_matrix,Unscaled_matrix;

7
common/3d/matrix.cpp
View file

@ -16,19 +16,18 @@
namespace dcx { namespace dcx {
static void scale_matrix(void); static void scale_matrix(fix);
//set view from x,y,z, viewer matrix, and zoom. Must call one of g3_set_view_*() //set view from x,y,z, viewer matrix, and zoom. Must call one of g3_set_view_*()
void g3_set_view_matrix(const vms_vector &view_pos,const vms_matrix &view_matrix,fix zoom) void g3_set_view_matrix(const vms_vector &view_pos,const vms_matrix &view_matrix,fix zoom)
{ {
View_zoom = zoom;
View_position = view_pos; View_position = view_pos;
View_matrix = view_matrix; View_matrix = view_matrix;
scale_matrix(); scale_matrix(zoom);
} }
//performs aspect scaling on global view matrix //performs aspect scaling on global view matrix
static void scale_matrix(void) static void scale_matrix(const fix View_zoom)
{ {
Unscaled_matrix = View_matrix; //so we can use unscaled if we want Unscaled_matrix = View_matrix; //so we can use unscaled if we want