Mapnode: Replace rotateAlongYAxis with improved version

[dragonfireclient.git] / src / touchscreengui.cpp

diff --git a/src/touchscreengui.cpp b/src/touchscreengui.cpp
index 2d489c1f86ccfae4c2a0b003f2e57b3f79c63fb7..e4f785f60d4f4284893621e714cf328e3e22de36 100644 (file)
--- a/src/touchscreengui.cpp
+++ b/src/touchscreengui.cpp
@@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "gettime.h"
 #include "util/numeric.h"
 #include "porting.h"
+#include "guiscalingfilter.h"
 
 #include <iostream>
 #include <algorithm>
@@ -130,15 +131,23 @@ TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, IEventReceiver* receiver)
        m_screensize = m_device->getVideoDriver()->getScreenSize();
 }
 
-void TouchScreenGUI::loadButtonTexture(button_info* btn, const char* path)
+void TouchScreenGUI::loadButtonTexture(button_info* btn, const char* path, rect<s32> button_rect)
 {
        unsigned int tid;
-       video::ITexture *texture = m_texturesource->getTexture(path,&tid);
+       video::ITexture *texture = guiScalingImageButton(m_device->getVideoDriver(),
+               m_texturesource->getTexture(path, &tid), button_rect.getWidth(), button_rect.getHeight());
        if (texture) {
                btn->guibutton->setUseAlphaChannel(true);
-               btn->guibutton->setImage(texture);
-               btn->guibutton->setPressedImage(texture);
-               btn->guibutton->setScaleImage(true);
+               if (g_settings->getBool("gui_scaling_filter")) {
+                       rect<s32> txr_rect = rect<s32>(0, 0, button_rect.getWidth(), button_rect.getHeight());
+                       btn->guibutton->setImage(texture, txr_rect);
+                       btn->guibutton->setPressedImage(texture, txr_rect);
+                       btn->guibutton->setScaleImage(false);
+               } else {
+                       btn->guibutton->setImage(texture);
+                       btn->guibutton->setPressedImage(texture);
+                       btn->guibutton->setScaleImage(true);
+               }
                btn->guibutton->setDrawBorder(false);
                btn->guibutton->setText(L"");
                }
@@ -157,7 +166,7 @@ void TouchScreenGUI::initButton(touch_gui_button_id id, rect<s32> button_rect,
        btn->immediate_release = immediate_release;
        btn->ids.clear();
 
-       loadButtonTexture(btn,touchgui_button_imagenames[id]);
+       loadButtonTexture(btn,touchgui_button_imagenames[id], button_rect);
 }
 
 static int getMaxControlPadSize(float density) {
@@ -322,7 +331,7 @@ bool TouchScreenGUI::isHUDButton(const SEvent &event)
 {
        // check if hud item is pressed
        for (std::map<int,rect<s32> >::iterator iter = m_hud_rects.begin();
-                       iter != m_hud_rects.end(); iter++) {
+                       iter != m_hud_rects.end(); ++iter) {
                if (iter->second.isPointInside(
                                v2s32(event.TouchInput.X,
                                                event.TouchInput.Y)
@@ -501,7 +510,7 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
                }
 
                for (std::vector<id_status>::iterator iter = m_known_ids.begin();
-                               iter != m_known_ids.end(); iter++) {
+                               iter != m_known_ids.end(); ++iter) {
                        if (iter->id == event.TouchInput.ID) {
                                m_known_ids.erase(iter);
                                break;
@@ -582,7 +591,7 @@ void TouchScreenGUI::handleChangedButton(const SEvent &event)
                        continue;
                }
                for(std::vector<int>::iterator iter = m_buttons[i].ids.begin();
-                               iter != m_buttons[i].ids.end(); iter++) {
+                               iter != m_buttons[i].ids.end(); ++iter) {
 
                        if (event.TouchInput.ID == *iter) {