Merge branch 'terencehill/vec2_optimizations' into 'master'

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

diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc
index ee94af72705e032158b5139980e91a18429a087e..f6469a58b429dbbb1c7bff6f0b1702f4f6d45273 100644 (file)
--- a/qcsrc/client/hud/hud.qc
+++ b/qcsrc/client/hud/hud.qc
@@ -109,10 +109,7 @@ vector HUD_GetTableSize_BestItemAR(int item_count, vector psize, float item_aspe
                rows = ceil(item_count/columns);
        }
 
-       if(vertical)
-               return eX * best_rows + eY * best_columns;
-       else
-               return eX * best_columns + eY * best_rows;
+       return (vertical) ? vec2(best_rows, best_columns) : vec2(best_columns, best_rows);
 }
 
 /*
@@ -490,8 +487,9 @@ void calc_followmodel_ofs(entity view);
 void Hud_Dynamic_Frame()
 {
        vector ofs = '0 0 0';
-       hud_scale = '1 1 0';
-       hud_shift = '0 0 0';
+       hud_scale_current = '1 1 0';
+       hud_shift_current = '0 0 0';
+
        if (autocvar_hud_dynamic_follow)
        {
                entity view = CSQCModel_server2csqc(player_localentnum - 1);
@@ -508,12 +506,12 @@ void Hud_Dynamic_Frame()
                ofs.y = bound(-0.1, ofs.y, 0.1);
                ofs.z = bound(-0.1, ofs.z, 0.1);
 
-               hud_shift.x = ofs.y * vid_conwidth;
-               hud_shift.y = ofs.z * vid_conheight;
-               hud_shift.z = ofs.x;
+               hud_shift_current.x = ofs.y * vid_conwidth;
+               hud_shift_current.y = ofs.z * vid_conheight;
+               hud_shift_current.z = ofs.x;
 
-               hud_scale.x = (1 + hud_shift.z);
-               hud_scale.y = hud_scale.x;
+               hud_scale_current.x = (1 + hud_shift_current.z);
+               hud_scale_current.y = hud_scale_current.x;
        }
 
        if(autocvar_hud_dynamic_shake > 0)
@@ -550,16 +548,15 @@ void Hud_Dynamic_Frame()
 
                if(hud_dynamic_shake_factor > 0)
                {
-                       hud_shift.x += hud_dynamic_shake_realofs.x;
-                       hud_shift.y += hud_dynamic_shake_realofs.y;
+                       hud_shift_current.x += hud_dynamic_shake_realofs.x;
+                       hud_shift_current.y += hud_dynamic_shake_realofs.y;
                }
        }
 
        hud_scale_center.x = 0.5 * vid_conwidth;
        hud_scale_center.y = 0.5 * vid_conheight;
 
-       hud_scale_current = hud_scale;
-       hud_shift_current = hud_shift;
+       HUD_Scale_Disable();
 }
 
 void HUD_Main()
@@ -572,8 +569,6 @@ void HUD_Main()
 
        HUD_Configure_Frame();
 
-       Hud_Dynamic_Frame();
-
        if(scoreboard_fade_alpha == 1)
                if(autocvar__menu_alpha == 1)
                        return;