aboutsummaryrefslogtreecommitdiff
path: root/src/fontengine.cpp
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-06-26 20:11:17 +0200
committerGitHub <noreply@github.com>2017-06-26 20:11:17 +0200
commitb3a36f7378ea0f299cfa36c81de42e00adb7292d (patch)
tree23d056b575ff0dba8cc759cc00f732099a1f3bce /src/fontengine.cpp
parenta8650e785df3f12efa5f8cd3c6a695fb9e22a598 (diff)
downloadminetest-b3a36f7378ea0f299cfa36c81de42e00adb7292d.tar.xz
Isolate irrlicht references and use a singleton (#6041)
* Add Device3D class which will contain IrrlichtDevice interface move getSupportedVideoDrivers to Device3D Add Device3D singleton & use it in various places Rename Device3D to Rendering engine & add helper functions to various device pointers More singleton work RenderingEngine owns draw_load_screen move draw functions to RenderingEngine Reduce IrrlichtDevice exposure and guienvironment RenderingEngine: Expose get_timer_time() to remove device from guiEngine Make irrlichtdevice & scene manager less exposed * Code style fixes * Move porting::getVideoDriverName, getVideoDriverFriendlyName, getDisplayDensity, getDisplaySize to RenderingEngine Fix XORG_USED macro -> RenderingEngine + create_engine_device from RenderingEngine constructor directly * enum paralax => enum parallax
Diffstat (limited to 'src/fontengine.cpp')
-rw-r--r--src/fontengine.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/fontengine.cpp b/src/fontengine.cpp
index 536828ede..a4d96e078 100644
--- a/src/fontengine.cpp
+++ b/src/fontengine.cpp
@@ -16,11 +16,11 @@ You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+
#include "fontengine.h"
-#include "log.h"
+#include "client/renderingengine.h"
#include "config.h"
#include "porting.h"
-#include "constants.h"
#include "filesys.h"
#if USE_FREETYPE
@@ -314,10 +314,8 @@ void FontEngine::initFont(unsigned int basesize, FontMode mode)
if (! is_yes(m_settings->get("freetype"))) {
return;
}
- unsigned int size = floor(
- porting::getDisplayDensity() *
- m_settings->getFloat("gui_scaling") *
- basesize);
+ unsigned int size = floor(RenderingEngine::getDisplayDensity() *
+ m_settings->getFloat("gui_scaling") * basesize);
u32 font_shadow = 0;
u32 font_shadow_alpha = 0;
@@ -395,7 +393,7 @@ void FontEngine::initSimpleFont(unsigned int basesize, FontMode mode)
basesize = DEFAULT_FONT_SIZE;
unsigned int size = floor(
- porting::getDisplayDensity() *
+ RenderingEngine::getDisplayDensity() *
m_settings->getFloat("gui_scaling") *
basesize);