Mgv7 mountains: Remove divide by zero code that creates vast walls

[dragonfireclient.git] / src / porting.cpp

diff --git a/src/porting.cpp b/src/porting.cpp
index 2fc5d036476e9304697924b2386bf239f57c4dcf..8a685539b20d13cbaee599d3b01706a905ee3c85 100644 (file)
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -36,6 +36,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #include <sys/utsname.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"
 #include "filesys.h"
@@ -280,7 +290,11 @@ void pathRemoveFile(char *path, char delim)
 bool detectMSVCBuildDir(char *c_path)
 {
        std::string path(c_path);
-       const char *ends[] = {"bin\\Release", "bin\\Build", NULL};
+       const char *ends[] = {
+               "bin\\Release",
+               "bin\\Debug",
+               "bin\\Build",
+               NULL};
        return (removeStringEnd(path, ends) != "");
 }
 
@@ -518,7 +532,7 @@ void initializePaths()
        {
                dstream<<"Bundle resource path: "<<path<<std::endl;
                //chdir(path);
-               path_share = std::string(path) + DIR_DELIM + "share";
+               path_share = std::string(path) + DIR_DELIM + STATIC_SHAREDIR;
        }
        else
        {
@@ -539,33 +553,144 @@ void initializePaths()
 #endif // RUN_IN_PLACE
 }
 
-static irr::IrrlichtDevice* device;
+static irr::IrrlichtDevice *device;
 
-void initIrrlicht(irr::IrrlichtDevice * _device) {
-       device = _device;
+void initIrrlicht(irr::IrrlichtDevice *device_)
+{
+       device = device_;
+}
+
+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
 }
 
 #ifndef SERVER
-v2u32 getWindowSize() {
+v2u32 getWindowSize()
+{
        return device->getVideoDriver()->getScreenSize();
 }
 
-#ifndef __ANDROID__
 
-float getDisplayDensity() {
-       float gui_scaling = g_settings->getFloat("gui_scaling");
-       // using Y here feels like a bug, this needs to be discussed later!
-       if (getWindowSize().Y <= 800) {
-               return (2.0/3.0) * gui_scaling;
+std::vector<core::vector3d<u32> > getVideoModes()
+{
+       std::vector<core::vector3d<u32> > mlist;
+       video::IVideoModeList *modelist = device->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));
        }
-       if (getWindowSize().Y <= 1280) {
-               return 1.0 * gui_scaling;
+
+       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 (4.0/3.0) * gui_scaling;
+       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];
 }
 
-v2u32 getDisplaySize() {
+
+#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
+float getDisplayDensity()
+{
+       return g_settings->getFloat("screen_dpi")/96.0;
+}
+#endif
+
+v2u32 getDisplaySize()
+{
        IrrlichtDevice *nulldevice = createDevice(video::EDT_NULL);
 
        core::dimension2d<u32> deskres = nulldevice->getVideoModeList()->getDesktopResolution();