mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
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
This commit is contained in:
Loïc Blot
GitHub
parent
a8650e785d
commit
b3a36f7378
50 changed files with 1568 additions and 1567 deletions
306
src/porting.cpp
306
src/porting.cpp
|
|
@ -41,14 +41,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
#define _PSTAT64
|
||||
#include <sys/pstat.h>
|
||||
#endif
|
||||
#if !defined(_WIN32) && !defined(__APPLE__) && \
|
||||
!defined(__ANDROID__) && !defined(SERVER)
|
||||
#define XORG_USED
|
||||
#endif
|
||||
#ifdef XORG_USED
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
#endif
|
||||
|
||||
#include "config.h"
|
||||
#include "debug.h"
|
||||
|
|
@ -592,304 +584,6 @@ void initializePaths()
|
|||
#endif // USE_GETTEXT
|
||||
}
|
||||
|
||||
|
||||
|
||||
void setXorgClassHint(const video::SExposedVideoData &video_data,
|
||||
const std::string &name)
|
||||
{
|
||||
#ifdef XORG_USED
|
||||
if (video_data.OpenGLLinux.X11Display == NULL)
|
||||
return;
|
||||
|
||||
XClassHint *classhint = XAllocClassHint();
|
||||
classhint->res_name = (char *)name.c_str();
|
||||
classhint->res_class = (char *)name.c_str();
|
||||
|
||||
XSetClassHint((Display *)video_data.OpenGLLinux.X11Display,
|
||||
video_data.OpenGLLinux.X11Window, classhint);
|
||||
XFree(classhint);
|
||||
#endif
|
||||
}
|
||||
|
||||
bool setWindowIcon(IrrlichtDevice *device)
|
||||
{
|
||||
#if defined(XORG_USED)
|
||||
# if RUN_IN_PLACE
|
||||
return setXorgWindowIconFromPath(device,
|
||||
path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png");
|
||||
# else
|
||||
// We have semi-support for reading in-place data if we are
|
||||
// compiled with RUN_IN_PLACE. Don't break with this and
|
||||
// also try the path_share location.
|
||||
return
|
||||
setXorgWindowIconFromPath(device,
|
||||
ICON_DIR "/hicolor/128x128/apps/" PROJECT_NAME ".png") ||
|
||||
setXorgWindowIconFromPath(device,
|
||||
path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png");
|
||||
# endif
|
||||
#elif defined(_WIN32)
|
||||
const video::SExposedVideoData exposedData = device->getVideoDriver()->getExposedVideoData();
|
||||
HWND hWnd; // Window handle
|
||||
|
||||
switch (device->getVideoDriver()->getDriverType()) {
|
||||
case video::EDT_DIRECT3D8:
|
||||
hWnd = reinterpret_cast<HWND>(exposedData.D3D8.HWnd);
|
||||
break;
|
||||
case video::EDT_DIRECT3D9:
|
||||
hWnd = reinterpret_cast<HWND>(exposedData.D3D9.HWnd);
|
||||
break;
|
||||
case video::EDT_OPENGL:
|
||||
hWnd = reinterpret_cast<HWND>(exposedData.OpenGLWin32.HWnd);
|
||||
break;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
// Load the ICON from resource file
|
||||
const HICON hicon = LoadIcon(
|
||||
GetModuleHandle(NULL),
|
||||
MAKEINTRESOURCE(130) // The ID of the ICON defined in winresource.rc
|
||||
);
|
||||
|
||||
if (hicon) {
|
||||
SendMessage(hWnd, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(hicon));
|
||||
SendMessage(hWnd, WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(hicon));
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
bool setXorgWindowIconFromPath(IrrlichtDevice *device,
|
||||
const std::string &icon_file)
|
||||
{
|
||||
#ifdef XORG_USED
|
||||
|
||||
video::IVideoDriver *v_driver = device->getVideoDriver();
|
||||
|
||||
video::IImageLoader *image_loader = NULL;
|
||||
u32 cnt = v_driver->getImageLoaderCount();
|
||||
for (u32 i = 0; i < cnt; i++) {
|
||||
if (v_driver->getImageLoader(i)->isALoadableFileExtension(icon_file.c_str())) {
|
||||
image_loader = v_driver->getImageLoader(i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!image_loader) {
|
||||
warningstream << "Could not find image loader for file '"
|
||||
<< icon_file << "'" << std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
io::IReadFile *icon_f = device->getFileSystem()->createAndOpenFile(icon_file.c_str());
|
||||
|
||||
if (!icon_f) {
|
||||
warningstream << "Could not load icon file '"
|
||||
<< icon_file << "'" << std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
video::IImage *img = image_loader->loadImage(icon_f);
|
||||
|
||||
if (!img) {
|
||||
warningstream << "Could not load icon file '"
|
||||
<< icon_file << "'" << std::endl;
|
||||
icon_f->drop();
|
||||
return false;
|
||||
}
|
||||
|
||||
u32 height = img->getDimension().Height;
|
||||
u32 width = img->getDimension().Width;
|
||||
|
||||
size_t icon_buffer_len = 2 + height * width;
|
||||
long *icon_buffer = new long[icon_buffer_len];
|
||||
|
||||
icon_buffer[0] = width;
|
||||
icon_buffer[1] = height;
|
||||
|
||||
for (u32 x = 0; x < width; x++) {
|
||||
for (u32 y = 0; y < height; y++) {
|
||||
video::SColor col = img->getPixel(x, y);
|
||||
long pixel_val = 0;
|
||||
pixel_val |= (u8)col.getAlpha() << 24;
|
||||
pixel_val |= (u8)col.getRed() << 16;
|
||||
pixel_val |= (u8)col.getGreen() << 8;
|
||||
pixel_val |= (u8)col.getBlue();
|
||||
icon_buffer[2 + x + y * width] = pixel_val;
|
||||
}
|
||||
}
|
||||
|
||||
img->drop();
|
||||
icon_f->drop();
|
||||
|
||||
const video::SExposedVideoData &video_data = v_driver->getExposedVideoData();
|
||||
|
||||
Display *x11_dpl = (Display *)video_data.OpenGLLinux.X11Display;
|
||||
|
||||
if (x11_dpl == NULL) {
|
||||
warningstream << "Could not find x11 display for setting its icon."
|
||||
<< std::endl;
|
||||
delete [] icon_buffer;
|
||||
return false;
|
||||
}
|
||||
|
||||
Window x11_win = (Window)video_data.OpenGLLinux.X11Window;
|
||||
|
||||
Atom net_wm_icon = XInternAtom(x11_dpl, "_NET_WM_ICON", False);
|
||||
Atom cardinal = XInternAtom(x11_dpl, "CARDINAL", False);
|
||||
XChangeProperty(x11_dpl, x11_win,
|
||||
net_wm_icon, cardinal, 32,
|
||||
PropModeReplace, (const unsigned char *)icon_buffer,
|
||||
icon_buffer_len);
|
||||
|
||||
delete [] icon_buffer;
|
||||
|
||||
#endif
|
||||
return true;
|
||||
}
|
||||
|
||||
////
|
||||
//// Video/Display Information (Client-only)
|
||||
////
|
||||
|
||||
#ifndef SERVER
|
||||
|
||||
static irr::IrrlichtDevice *device;
|
||||
|
||||
void initIrrlicht(irr::IrrlichtDevice *device_)
|
||||
{
|
||||
device = device_;
|
||||
}
|
||||
|
||||
v2u32 getWindowSize()
|
||||
{
|
||||
return device->getVideoDriver()->getScreenSize();
|
||||
}
|
||||
|
||||
|
||||
std::vector<core::vector3d<u32> > getSupportedVideoModes()
|
||||
{
|
||||
IrrlichtDevice *nulldevice = createDevice(video::EDT_NULL);
|
||||
sanity_check(nulldevice != NULL);
|
||||
|
||||
std::vector<core::vector3d<u32> > mlist;
|
||||
video::IVideoModeList *modelist = nulldevice->getVideoModeList();
|
||||
|
||||
u32 num_modes = modelist->getVideoModeCount();
|
||||
for (u32 i = 0; i != num_modes; i++) {
|
||||
core::dimension2d<u32> mode_res = modelist->getVideoModeResolution(i);
|
||||
s32 mode_depth = modelist->getVideoModeDepth(i);
|
||||
mlist.push_back(core::vector3d<u32>(mode_res.Width, mode_res.Height, mode_depth));
|
||||
}
|
||||
|
||||
nulldevice->drop();
|
||||
|
||||
return mlist;
|
||||
}
|
||||
|
||||
std::vector<irr::video::E_DRIVER_TYPE> getSupportedVideoDrivers()
|
||||
{
|
||||
std::vector<irr::video::E_DRIVER_TYPE> drivers;
|
||||
|
||||
for (int i = 0; i != irr::video::EDT_COUNT; i++) {
|
||||
if (irr::IrrlichtDevice::isDriverSupported((irr::video::E_DRIVER_TYPE)i))
|
||||
drivers.push_back((irr::video::E_DRIVER_TYPE)i);
|
||||
}
|
||||
|
||||
return drivers;
|
||||
}
|
||||
|
||||
const char *getVideoDriverName(irr::video::E_DRIVER_TYPE type)
|
||||
{
|
||||
static const char *driver_ids[] = {
|
||||
"null",
|
||||
"software",
|
||||
"burningsvideo",
|
||||
"direct3d8",
|
||||
"direct3d9",
|
||||
"opengl",
|
||||
"ogles1",
|
||||
"ogles2",
|
||||
};
|
||||
|
||||
return driver_ids[type];
|
||||
}
|
||||
|
||||
|
||||
const char *getVideoDriverFriendlyName(irr::video::E_DRIVER_TYPE type)
|
||||
{
|
||||
static const char *driver_names[] = {
|
||||
"NULL Driver",
|
||||
"Software Renderer",
|
||||
"Burning's Video",
|
||||
"Direct3D 8",
|
||||
"Direct3D 9",
|
||||
"OpenGL",
|
||||
"OpenGL ES1",
|
||||
"OpenGL ES2",
|
||||
};
|
||||
|
||||
return driver_names[type];
|
||||
}
|
||||
|
||||
# ifndef __ANDROID__
|
||||
# ifdef XORG_USED
|
||||
|
||||
static float calcDisplayDensity()
|
||||
{
|
||||
const char *current_display = getenv("DISPLAY");
|
||||
|
||||
if (current_display != NULL) {
|
||||
Display *x11display = XOpenDisplay(current_display);
|
||||
|
||||
if (x11display != NULL) {
|
||||
/* try x direct */
|
||||
float dpi_height = floor(DisplayHeight(x11display, 0) /
|
||||
(DisplayHeightMM(x11display, 0) * 0.039370) + 0.5);
|
||||
float dpi_width = floor(DisplayWidth(x11display, 0) /
|
||||
(DisplayWidthMM(x11display, 0) * 0.039370) + 0.5);
|
||||
|
||||
XCloseDisplay(x11display);
|
||||
|
||||
return std::max(dpi_height,dpi_width) / 96.0;
|
||||
}
|
||||
}
|
||||
|
||||
/* return manually specified dpi */
|
||||
return g_settings->getFloat("screen_dpi")/96.0;
|
||||
}
|
||||
|
||||
|
||||
float getDisplayDensity()
|
||||
{
|
||||
static float cached_display_density = calcDisplayDensity();
|
||||
return cached_display_density;
|
||||
}
|
||||
|
||||
|
||||
# else // XORG_USED
|
||||
float getDisplayDensity()
|
||||
{
|
||||
return g_settings->getFloat("screen_dpi")/96.0;
|
||||
}
|
||||
# endif // XORG_USED
|
||||
|
||||
v2u32 getDisplaySize()
|
||||
{
|
||||
IrrlichtDevice *nulldevice = createDevice(video::EDT_NULL);
|
||||
|
||||
core::dimension2d<u32> deskres = nulldevice->getVideoModeList()->getDesktopResolution();
|
||||
nulldevice -> drop();
|
||||
|
||||
return deskres;
|
||||
}
|
||||
# endif // __ANDROID__
|
||||
#endif // SERVER
|
||||
|
||||
|
||||
////
|
||||
//// OS-specific Secure Random
|
||||
////
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue