Added: Interface auto scaling to view renderer

--HG--
branch : experimental-ui-scaling

code/nel/include/nel/gui/view_renderer.h

@@ -176,6 +176,12 @@ namespace NLGUI
 		 */
 		void getScreenOOSize (float &oow, float &ooh);
 
+		/*
+		 * UI scaling
+		 */
+		void setInterfaceScale(float scale, sint32 width = 0, sint32 height = 0);
+		float getInterfaceScale() const { return _InterfaceScale; }
+
 		/*
 		 * is the Screen minimized?
 		 */
@@ -526,6 +532,13 @@ namespace NLGUI
 		float		_OneOverScreenW, _OneOverScreenH;
 		bool		_IsMinimized;
 
+		// UI scaling
+		float		_InterfaceScale;
+		float		_InterfaceUserScale;
+		sint32		_InterfaceBaseW, _InterfaceBaseH;
+		sint32		_EffectiveScreenW, _EffectiveScreenH;
+
+		void updateInterfaceScale();
 
 		//map linking a uint to a bitmap. Used to display figurs
 		std::vector<sint32> _IndexesToTextureIds;
@@ -585,14 +598,12 @@ namespace NLGUI
 		static CViewRenderer *instance;
 		static NL3D::UDriver *driver;
 		static NL3D::UTextContext *textcontext;
-
 	public:
 		static NL3D::UTextContext* getTextContext(){ return textcontext; }
 
 		/// Set of hw cursor images
 		static std::set< std::string > *hwCursors;
 		static float hwCursorScale;
-
 	};
 
 

code/nel/src/gui/view_renderer.cpp

@@ -91,8 +91,23 @@ namespace NLGUI
 		if(w!=0 && h!=0)
 		{
 			_IsMinimized= false;
+			if (w != _ScreenW || h != _ScreenH)
+			{
 				_ScreenW = w;
 				_ScreenH = h;
+
+				updateInterfaceScale();
+			}
+		}
+		else
+		{
+			// Keep old coordinates (suppose resolution won't change, even if typically false wen we swithch from outgame to ingame)
+			_IsMinimized= true;
+		}
+	}
+
+	void CViewRenderer::updateInterfaceScale()
+	{
 		if(_ScreenW>0)
 			_OneOverScreenW = 1.0f / (float)_ScreenW;
 		else
@@ -101,11 +116,27 @@ namespace NLGUI
 			_OneOverScreenH = 1.0f / (float)_ScreenH;
 		else
 			_OneOverScreenH = 1000;
+
+		_InterfaceScale = _InterfaceUserScale;
+		if (_InterfaceBaseW > 0 && _InterfaceBaseH > 0)
+		{
+			float wRatio = (float)_ScreenW / _InterfaceBaseW;
+			float rRatio = (float)_ScreenH / _InterfaceBaseH;
+			_InterfaceScale *= std::min(wRatio, rRatio);
+		}
+
+		if (_InterfaceScale != 1.0f)
+		{
+			_OneOverScreenW *= _InterfaceScale;
+			_OneOverScreenH *= _InterfaceScale;
+
+			_EffectiveScreenW = sint(_ScreenW / _InterfaceScale);
+			_EffectiveScreenH = sint(_ScreenH / _InterfaceScale);
 		}
 		else
 		{
-			// Keep old coordinates (suppose resolution won't change, even if typically false wen we swithch from outgame to ingame)
+			_EffectiveScreenW = _ScreenW;
-			_IsMinimized= true;
+			_EffectiveScreenH = _ScreenH;
 		}
 	}
 
@@ -115,8 +146,8 @@ namespace NLGUI
 	 */
 	void CViewRenderer::getScreenSize (uint32 &w, uint32 &h)
 	{
-		w = _ScreenW;
+		w = _EffectiveScreenW;
-		h = _ScreenH;
+		h = _EffectiveScreenH;
 	}
 
 	/*
@@ -128,6 +159,20 @@ namespace NLGUI
 		ooh= _OneOverScreenH;
 	}
 
+	void CViewRenderer::setInterfaceScale(float scale, sint32 width/*=0*/, sint32 height/*=0*/)
+	{
+		// prevent #div/0
+		if (sint(scale*100) > 0)
+			_InterfaceUserScale = scale;
+		else
+			_InterfaceUserScale = 1.0f;
+
+		_InterfaceBaseW = width;
+		_InterfaceBaseH = height;
+
+		updateInterfaceScale();
+	}
+
 	void CViewRenderer::setup()
 	{
 		_ClipX = _ClipY = 0;
@@ -135,8 +180,10 @@ namespace NLGUI
 		_ClipH = 600;
 		_ScreenW = 800;
 		_ScreenH = 600;
-		_OneOverScreenW= 1.0f / (float)_ScreenW;
+		_InterfaceScale = 1.0f;
-		_OneOverScreenH= 1.0f / (float)_ScreenH;
+		_InterfaceUserScale = 1.0f;
+		_InterfaceBaseW = 0;
+		_InterfaceBaseH = 0;
 		_IsMinimized= false;
 		_WFigurTexture= 0;
 		_HFigurTexture= 0;
@@ -152,6 +199,8 @@ namespace NLGUI
 			_EmptyLayer[i]= true;
 		}
 		_BlankGlobalTexture  = NULL;
+
+		updateInterfaceScale();
 	}