From: terencehill Date: Sun, 12 May 2019 09:28:38 +0000 (+0200) Subject: Small optimization X-Git-Tag: xonotic-v0.8.5~1501 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=6637ce359f0e6f410662af2ef2ea321d0a100f44 Small optimization --- diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qc b/qcsrc/common/mutators/mutator/overkill/oknex.qc index e1b26c36d..225b3d93f 100644 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qc +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qc @@ -12,15 +12,17 @@ METHOD(OverkillNex, wr_glow, vector(OverkillNex this, entity actor, entity wepen if (!WEP_CVAR(oknex, charge)) return '0 0 0'; float charge = wepent.oknex_charge; float animlimit = WEP_CVAR(oknex, charge_animlimit); + float f = autocvar_g_weapon_charge_colormod_hdrmultiplier * min(1, charge / animlimit); vector g; - g.x = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_red_half * min(1, charge / animlimit); - g.y = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_green_half * min(1, charge / animlimit); - g.z = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_blue_half * min(1, charge / animlimit); + g.x = f * autocvar_g_weapon_charge_colormod_red_half; + g.y = f * autocvar_g_weapon_charge_colormod_green_half; + g.z = f * autocvar_g_weapon_charge_colormod_blue_half; if (charge > animlimit) { - g.x += autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_red_full * (charge - animlimit) / (1 - animlimit); - g.y += autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_green_full * (charge - animlimit) / (1 - animlimit); - g.z += autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_blue_full * (charge - animlimit) / (1 - animlimit); + f = autocvar_g_weapon_charge_colormod_hdrmultiplier * (charge - animlimit) / (1 - animlimit); + g.x += f * autocvar_g_weapon_charge_colormod_red_full; + g.y += f * autocvar_g_weapon_charge_colormod_green_full; + g.z += f * autocvar_g_weapon_charge_colormod_blue_full; } return g; } diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc index edd9d4761..f1e147503 100644 --- a/qcsrc/common/weapons/weapon/vortex.qc +++ b/qcsrc/common/weapons/weapon/vortex.qc @@ -17,15 +17,17 @@ METHOD(Vortex, wr_glow, vector(Vortex this, entity actor, entity wepent)) if (!WEP_CVAR(vortex, charge)) return '0 0 0'; float charge = wepent.vortex_charge; float animlimit = WEP_CVAR(vortex, charge_animlimit); + float f = autocvar_g_weapon_charge_colormod_hdrmultiplier * min(1, charge / animlimit); vector g; - g.x = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_red_half * min(1, charge / animlimit); - g.y = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_green_half * min(1, charge / animlimit); - g.z = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_blue_half * min(1, charge / animlimit); + g.x = f * autocvar_g_weapon_charge_colormod_red_half; + g.y = f * autocvar_g_weapon_charge_colormod_green_half; + g.z = f * autocvar_g_weapon_charge_colormod_blue_half; if (charge > animlimit) { - g.x += autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_red_full * (charge - animlimit) / (1 - animlimit); - g.y += autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_green_full * (charge - animlimit) / (1 - animlimit); - g.z += autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_blue_full * (charge - animlimit) / (1 - animlimit); + f = autocvar_g_weapon_charge_colormod_hdrmultiplier * (charge - animlimit) / (1 - animlimit); + g.x += f * autocvar_g_weapon_charge_colormod_red_full; + g.y += f * autocvar_g_weapon_charge_colormod_green_full; + g.z += f * autocvar_g_weapon_charge_colormod_blue_full; } return g; }