From: terencehill <piuntn@gmail.com>
Date: Wed, 31 Dec 2014 16:23:11 +0000 (+0100)
Subject: Optimize ModalController_draw code
X-Git-Tag: xonotic-v0.8.1~138^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7d86e0dba1ef2642fc1edc056f59dfb08954126b;p=xonotic%2Fxonotic-data.pk3dir.git

Optimize ModalController_draw code
---

diff --git a/qcsrc/menu/item/modalcontroller.c b/qcsrc/menu/item/modalcontroller.c
index 8a025cb33..cfa3af852 100644
--- a/qcsrc/menu/item/modalcontroller.c
+++ b/qcsrc/menu/item/modalcontroller.c
@@ -208,9 +208,17 @@ void ModalController_draw(entity me)
 		}
 		else
 		{
-			e.Container_origin = e.Container_origin * prevFactor + targetOrigin * targetFactor;
-			e.Container_size   = e.Container_size   * prevFactor + targetSize   * targetFactor;
-			me.setAlphaOf(me, e, e.Container_alpha  * prevFactor + targetAlpha  * targetFactor);
+			if(!e.ModalController_state) // optimize code and avoid precision errors
+				me.setAlphaOf(me, e, e.Container_alpha  * prevFactor);
+			else
+			{
+				if(e.ModalController_state == 1)
+				{
+					e.Container_origin = e.Container_origin * prevFactor + targetOrigin * targetFactor;
+					e.Container_size   = e.Container_size   * prevFactor + targetSize   * targetFactor;
+				}
+				me.setAlphaOf(me, e, e.Container_alpha  * prevFactor + targetAlpha  * targetFactor);
+			}
 		}
 		// assume: o == to * f_prev + X * (1 - f_prev)
 		// make:   o' = to * f  + X * (1 - f)
@@ -220,9 +228,12 @@ void ModalController_draw(entity me)
 		// --> (maxima)
 		// o' = (to * (f - f_prev) + o * (1 - f)) / (1 - f_prev)
 
-		fs = globalToBoxSize(e.Container_size, e.ModalController_initialSize);
-		e.Container_fontscale_x = fs_x * e.ModalController_initialFontScale_x;
-		e.Container_fontscale_y = fs_y * e.ModalController_initialFontScale_y;
+		if(e.ModalController_state == 1)
+		{
+			fs = globalToBoxSize(e.Container_size, e.ModalController_initialSize);
+			e.Container_fontscale_x = fs_x * e.ModalController_initialFontScale_x;
+			e.Container_fontscale_y = fs_y * e.ModalController_initialFontScale_y;
+		}
 	}
 	if(animating || !me.focused)
 		me.setFocus(me, NULL);