hud_postprocessing: disable the postprocess shader when not in use.

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

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 5dc3f53e55994489af943ef1ca14a9f24033fca0..a84d21ce87080b86cc44a709252b21c81faee8ea 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -269,7 +269,6 @@ void viewmodel_animate(entity this)
                this.origin += bobmodel_ofs(view);
 }
 
-.vector viewmodel_origin, viewmodel_angles;
 .float weapon_nextthink;
 .float weapon_eta_last;
 .float weapon_switchdelay;
@@ -278,8 +277,6 @@ void viewmodel_animate(entity this)
 
 void viewmodel_draw(entity this)
 {
-       if(!this.activeweapon || !autocvar_r_drawviewmodel)
-               return;
        int mask = (intermission || (STAT(HEALTH) <= 0) || autocvar_chase_active) ? 0 : MASK_NORMAL;
        float a = ((autocvar_cl_viewmodel_alpha) ? bound(-1, autocvar_cl_viewmodel_alpha, this.m_alpha) : this.m_alpha);
        int wepskin = this.m_skin;
@@ -287,7 +284,7 @@ void viewmodel_draw(entity this)
        if (invehicle) a = -1;
        Weapon wep = this.activeweapon;
        int c = entcs_GetClientColors(current_player);
-       vector g = weaponentity_glowmod(wep, NULL, c, this);
+       vector g = weaponentity_glowmod(wep, c, this);
        entity me = CSQCModel_server2csqc(player_localentnum - 1);
        int fx = ((me.csqcmodel_effects & EFMASK_CHEAP)
                | EF_NODEPTHTEST)
@@ -313,8 +310,7 @@ void viewmodel_draw(entity this)
                {
                        this.name_last = name;
                        CL_WeaponEntity_SetModel(this, name, swap);
-                       this.viewmodel_origin = this.origin;
-                       this.viewmodel_angles = this.angles;
+                       this.origin += autocvar_cl_gunoffset;
                }
                anim_update(this);
                if ((!this.animstate_override && !this.animstate_looping) || time > this.animstate_endtime)
@@ -343,8 +339,6 @@ void viewmodel_draw(entity this)
                }
        }
        this.weapon_eta_last = f;
-       this.origin = this.viewmodel_origin;
-       this.angles = this.viewmodel_angles;
        this.angles_x = (-90 * f * f);
        viewmodel_animate(this);
        MUTATOR_CALLHOOK(DrawViewModel, this);
@@ -1206,6 +1200,7 @@ void View_PostProcessing()
 {
        float e1 = (autocvar_hud_postprocessing_maxbluralpha != 0);
        float e2 = (autocvar_hud_powerup != 0);
+       bool want_postprocessing = false;
        if(autocvar_hud_postprocessing && (e1 || e2)) // TODO: Remove this code and re-do the postprocess handling in the engine, where it properly belongs.
        {
                // enable or disable rendering types if they are used or not
@@ -1223,6 +1218,7 @@ void View_PostProcessing()
                                old_blurradius = blurradius;
                                old_bluralpha = bluralpha;
                        }
+                       want_postprocessing = true;
                }
                else if(cvar_string("r_glsl_postprocess_uservec1") != "0 0 0 0") // reduce cvar_set spam as much as possible
                {
@@ -1249,18 +1245,24 @@ void View_PostProcessing()
                                cvar_set("r_glsl_postprocess_uservec2", strcat(ftos((sharpen_intensity / 5) * autocvar_hud_powerup), " ", ftos(-sharpen_intensity * autocvar_hud_powerup), " 0 0"));
                                old_sharpen_intensity = sharpen_intensity;
                        }
+                       want_postprocessing = true;
                }
                else if(cvar_string("r_glsl_postprocess_uservec2") != "0 0 0 0") // reduce cvar_set spam as much as possible
                {
                        cvar_set("r_glsl_postprocess_uservec2", "0 0 0 0");
                        old_sharpen_intensity = 0;
                }
-
+       }
+       if (want_postprocessing)
+       {
                if(cvar("r_glsl_postprocess") == 0)
                        cvar_set("r_glsl_postprocess", "2");
        }
-       else if(cvar("r_glsl_postprocess") == 2)
-               cvar_set("r_glsl_postprocess", "0");
+       else
+       {
+               if(cvar("r_glsl_postprocess") == 2)
+                       cvar_set("r_glsl_postprocess", "0");
+       }
 }
 
 void View_Lock()
@@ -1609,8 +1611,10 @@ void CSQC_UpdateView(entity this, float w, float h)
 
        // run viewmodel_draw before updating view_angles to the angles calculated by WarpZone_FixView
        // viewmodel_draw needs to use the view_angles set by the engine on every CSQC_UpdateView call
-       for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
-               viewmodel_draw(viewmodels[slot]);
+       if(autocvar_r_drawviewmodel)
+               for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+                       if(viewmodels[slot].activeweapon)
+                               viewmodel_draw(viewmodels[slot]);
 
        // Render the Scene
        view_origin = getpropertyvec(VF_ORIGIN);
@@ -1707,6 +1711,7 @@ void CSQC_UpdateView(entity this, float w, float h)
 
        // draw 2D entities
        IL_EACH(g_drawables_2d, it.draw2d, it.draw2d(it));
+       IL_EACH(g_damagetext, it.draw2d, it.draw2d(it));
        Draw_ShowNames_All();
 #if ENABLE_DEBUGDRAW
        Debug_Draw();
@@ -1746,7 +1751,7 @@ vector camera_offset, current_camera_offset, mouse_angles, current_angles, curre
 void CSQC_Demo_Camera()
 {
        float speed, attenuation, dimensions;
-       vector tmp, delta;
+       vector tmp;
 
        if( autocvar_camera_reset || !camera_mode )
        {
@@ -1787,30 +1792,22 @@ void CSQC_Demo_Camera()
                }
        }
 
-       while (mouse_angles.x < -180) mouse_angles.x = mouse_angles.x + 360;
-       while (mouse_angles.x > 180) mouse_angles.x = mouse_angles.x - 360;
-       while (mouse_angles.y < -180) mouse_angles.y = mouse_angles.y + 360;
-       while (mouse_angles.y > 180) mouse_angles.y = mouse_angles.y - 360;
-
-       // Fix difference when angles don't have the same sign
-       delta = '0 0 0';
-       if(mouse_angles.y < -60 && current_angles.y > 60)
-               delta = '0 360 0';
-       if(mouse_angles.y > 60 && current_angles.y < -60)
-               delta = '0 -360 0';
-
        if(autocvar_camera_look_player)
                attenuation = autocvar_camera_look_attenuation;
        else
                attenuation = autocvar_camera_speed_attenuation;
 
        attenuation = 1 / max(1, attenuation);
-       current_angles += (mouse_angles - current_angles + delta) * attenuation;
+       current_angles += (mouse_angles - current_angles) * attenuation;
+
+       // limit current pitch angle to sane values
+       if (current_angles.x < -90) current_angles.x = -90;
+       if (current_angles.x > 90 ) current_angles.x = 90;
 
-       while (current_angles.x < -180) current_angles.x = current_angles.x + 360;
-       while (current_angles.x > 180) current_angles.x = current_angles.x - 360;
-       while (current_angles.y < -180) current_angles.y = current_angles.y + 360;
-       while (current_angles.y > 180) current_angles.y = current_angles.y - 360;
+       // limit mouse and current yaw angles to standard values simultaneously so that the difference
+       // between these angles is not altered
+       while (current_angles.y < -180 && mouse_angles.y < -180) {current_angles.y += 360; mouse_angles.y += 360;}
+       while (current_angles.y > 180  && mouse_angles.y > 180 ) {current_angles.y -= 360; mouse_angles.y -= 360;}
 
        // Camera position
        tmp = '0 0 0';