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/guiFormSpecMenu.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/guiFormSpecMenu.h')
| -rw-r--r-- | src/guiFormSpecMenu.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h index 66b9b019a..6d015e5c4 100644 --- a/src/guiFormSpecMenu.h +++ b/src/guiFormSpecMenu.h @@ -287,8 +287,7 @@ class GUIFormSpecMenu : public GUIModalMenu }; public: - GUIFormSpecMenu(irr::IrrlichtDevice* dev, - JoystickController *joystick, + GUIFormSpecMenu(JoystickController *joystick, gui::IGUIElement* parent, s32 id, IMenuManager *menumgr, Client *client, @@ -378,7 +377,6 @@ protected: v2s32 pos_offset; std::stack<v2s32> container_stack; - irr::IrrlichtDevice* m_device; InventoryManager *m_invmgr; ISimpleTextureSource *m_tsrc; Client *m_client; @@ -386,7 +384,6 @@ protected: std::string m_formspec_string; InventoryLocation m_current_inventory_location; - std::vector<ListDrawSpec> m_inventorylists; std::vector<ListRingSpec> m_inventory_rings; std::vector<ImageDrawSpec> m_backgrounds; |