From b3a36f7378ea0f299cfa36c81de42e00adb7292d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Mon, 26 Jun 2017 20:11:17 +0200 Subject: 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 --- build/android/jni/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build/android/jni') diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 22ef20906..6155b0d9c 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -138,7 +138,6 @@ LOCAL_SRC_FILES := \ jni/src/database.cpp \ jni/src/debug.cpp \ jni/src/defaultsettings.cpp \ - jni/src/drawscene.cpp \ jni/src/dungeongen.cpp \ jni/src/emerge.cpp \ jni/src/environment.cpp \ @@ -270,6 +269,7 @@ LOCAL_SRC_FILES := \ jni/src/wieldmesh.cpp \ jni/src/client/clientlauncher.cpp \ jni/src/client/inputhandler.cpp \ + jni/src/client/renderingengine.cpp \ jni/src/client/tile.cpp \ jni/src/client/joystick_controller.cpp \ jni/src/irrlicht_changes/static_text.cpp -- cgit v1.2.3