diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-26 20:11:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-26 20:11:17 +0200 |
| commit | b3a36f7378ea0f299cfa36c81de42e00adb7292d (patch) | |
| tree | 23d056b575ff0dba8cc759cc00f732099a1f3bce /src/client/tile.h | |
| parent | a8650e785df3f12efa5f8cd3c6a695fb9e22a598 (diff) | |
| download | minetest-b3a36f7378ea0f299cfa36c81de42e00adb7292d.tar.gz minetest-b3a36f7378ea0f299cfa36c81de42e00adb7292d.tar.bz2 minetest-b3a36f7378ea0f299cfa36c81de42e00adb7292d.zip | |
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/client/tile.h')
| -rw-r--r-- | src/client/tile.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/client/tile.h b/src/client/tile.h index a810aa8e5..b4d615427 100644 --- a/src/client/tile.h +++ b/src/client/tile.h @@ -114,7 +114,6 @@ public: * Should be called from the main thread. */ virtual Palette* getPalette(const std::string &name) = 0; - virtual IrrlichtDevice* getDevice()=0; virtual bool isKnownSourceImage(const std::string &name)=0; virtual video::ITexture* generateTextureFromMesh( const TextureFromMeshParams ¶ms)=0; @@ -133,7 +132,6 @@ public: virtual video::ITexture* getTexture(u32 id)=0; virtual video::ITexture* getTexture( const std::string &name, u32 *id = nullptr)=0; - virtual IrrlichtDevice* getDevice()=0; virtual bool isKnownSourceImage(const std::string &name)=0; virtual video::ITexture* generateTextureFromMesh( const TextureFromMeshParams ¶ms)=0; @@ -146,7 +144,7 @@ public: virtual video::ITexture *getShaderFlagsTexture(bool normalmap_present)=0; }; -IWritableTextureSource* createTextureSource(IrrlichtDevice *device); +IWritableTextureSource *createTextureSource(); #ifdef __ANDROID__ video::IImage * Align2Npot2(video::IImage * image, video::IVideoDriver* driver); @@ -302,7 +300,7 @@ struct TileSpec for (int layer = 0; layer < MAX_TILE_LAYERS; layer++) layers[layer] = TileLayer(); } - + /*! * Returns true if this tile can be merged with the other tile. */ |