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/drawscene.h | |
| parent | a8650e785df3f12efa5f8cd3c6a695fb9e22a598 (diff) | |
| download | minetest-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/drawscene.h')
| -rw-r--r-- | src/drawscene.h | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/src/drawscene.h b/src/drawscene.h deleted file mode 100644 index 99ff1a6bc..000000000 --- a/src/drawscene.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Minetest -Copyright (C) 2010-2014 celeron55, Perttu Ahola <celeron55@gmail.com> - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation; either version 2.1 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -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. -*/ - -#ifndef DRAWSCENE_H_ -#define DRAWSCENE_H_ - -#include "camera.h" -#include "hud.h" -#include "minimap.h" -#include "irrlichttypes_extrabloated.h" - - -void draw_load_screen(const std::wstring &text, IrrlichtDevice *device, - gui::IGUIEnvironment *guienv, ITextureSource *tsrc, float dtime = 0, - int percent = 0, bool clouds = true); - -void draw_scene(video::IVideoDriver *driver, scene::ISceneManager *smgr, - Camera &camera, Client &client, LocalPlayer *player, - Hud &hud, Minimap *mapper, gui::IGUIEnvironment *guienv, - const v2u32 &screensize, const video::SColor &skycolor, - bool show_hud, bool show_minimap); - -#endif /* DRAWSCENE_H_ */ |