oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-05 19:31:04 +00:00
Code Wiki Activity

Android build fixes for c++11

Browse source
This commit is contained in:
stujones11 2017-12-06 20:36:29 +00:00 • committed by Loic Blot
parent 69247ca223
commit 22a891a925
No known key found for this signature in database
GPG key ID: EFAA458E8C153987
15 changed files with 139 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/client/clientlauncher.cpp
View file

@ -215,7 +215,7 @@ bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args)
video::ETCF_CREATE_MIP_MAPS, g_settings->getBool("mip_map"));
#ifdef HAVE_TOUCHSCREENGUI
receiver->m_touchscreengui = new TouchScreenGUI(device, receiver);
receiver->m_touchscreengui = new TouchScreenGUI(RenderingEngine::get_raw_device(), receiver);
g_touchscreengui = receiver->m_touchscreengui;
#endif

15
src/client/renderingengine.cpp
View file

@ -45,6 +45,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <X11/Xutil.h>
#endif
#ifdef __ANDROID__
#include "filesys.h"
#endif
RenderingEngine *RenderingEngine::s_singleton = nullptr;
RenderingEngine::RenderingEngine(IEventReceiver *receiver)
@ -567,4 +571,15 @@ v2u32 RenderingEngine::getDisplaySize()
return deskres;
}
#else // __ANDROID__
float RenderingEngine::getDisplayDensity()
{
return porting::getDisplayDensity();
}
v2u32 RenderingEngine::getDisplaySize()
{
return porting::getDisplaySize();
}
#endif // __ANDROID__

2
src/client/tile.cpp
View file

@ -794,7 +794,7 @@ video::ITexture* TextureSource::generateTextureFromMesh(
g_settings->getBool("inventory_image_hack")
) {
// Get a scene manager
scene::ISceneManager *smgr_main = m_device->getSceneManager();
scene::ISceneManager *smgr_main = RenderingEngine::get_raw_device()->getSceneManager();
sanity_check(smgr_main);
scene::ISceneManager *smgr = smgr_main->createNewSceneManager();
sanity_check(smgr);

6
src/client/tile.h
View file

@ -28,6 +28,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <memory>
#include "util/numeric.h"
#if __ANDROID__
#include <IVideoDriver.h>
#endif
class IGameDef;
struct TileSpec;
struct TileDef;
@ -153,7 +157,7 @@ public:
IWritableTextureSource *createTextureSource();
#ifdef __ANDROID__
video::IImage * Align2Npot2(video::IImage * image, video::IVideoDriver* driver);
video::IImage * Align2Npot2(video::IImage * image, irr::video::IVideoDriver* driver);
#endif
enum MaterialType{