diff options
| author | Aaron Suen <warr1024@gmail.com> | 2015-03-09 09:32:11 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-04-01 00:01:05 -0400 |
| commit | 6d61375cc72bad5c569d25c253adca4e3701dd27 (patch) | |
| tree | 790accab0443ebcff77790da83a306d713045b01 /src/guiFormSpecMenu.cpp | |
| parent | b4247dff2e003dd8c5ea5a1f3ae349d0bfab90bc (diff) | |
| download | minetest-6d61375cc72bad5c569d25c253adca4e3701dd27.tar.gz minetest-6d61375cc72bad5c569d25c253adca4e3701dd27.tar.bz2 minetest-6d61375cc72bad5c569d25c253adca4e3701dd27.zip | |
Clean scaling pre-filter for formspec/HUD.
Diffstat (limited to 'src/guiFormSpecMenu.cpp')
| -rw-r--r-- | src/guiFormSpecMenu.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 11360a0fc..56729846e 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -51,6 +51,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/hex.h" #include "util/numeric.h" #include "util/string.h" // for parseColorString() +#include "guiscalingfilter.h" #define MY_CHECKPOS(a,b) \ if (v_pos.size() != 2) { \ @@ -1307,8 +1308,8 @@ void GUIFormSpecMenu::parseImageButton(parserData* data,std::string element, } e->setUseAlphaChannel(true); - e->setImage(texture); - e->setPressedImage(pressed_texture); + e->setImage(guiScalingImageButton(Environment->getVideoDriver(), texture, geom.X, geom.Y)); + e->setPressedImage(guiScalingImageButton(Environment->getVideoDriver(), pressed_texture, geom.X, geom.Y)); e->setScaleImage(true); e->setNotClipped(noclip); e->setDrawBorder(drawborder); @@ -1452,8 +1453,8 @@ void GUIFormSpecMenu::parseItemImageButton(parserData* data,std::string element) } e->setUseAlphaChannel(true); - e->setImage(texture); - e->setPressedImage(texture); + e->setImage(guiScalingImageButton(Environment->getVideoDriver(), texture, geom.X, geom.Y)); + e->setPressedImage(guiScalingImageButton(Environment->getVideoDriver(), texture, geom.X, geom.Y)); e->setScaleImage(true); spec.ftype = f_Button; rect+=data->basepos-padding; @@ -2283,7 +2284,7 @@ void GUIFormSpecMenu::drawMenu() const video::SColor color(255,255,255,255); const video::SColor colors[] = {color,color,color,color}; - driver->draw2DImage(texture, rect, + draw2DImageFilterScaled(driver, texture, rect, core::rect<s32>(core::position2d<s32>(0,0), core::dimension2di(texture->getOriginalSize())), NULL/*&AbsoluteClippingRect*/, colors, true); @@ -2333,7 +2334,7 @@ void GUIFormSpecMenu::drawMenu() core::rect<s32> rect = imgrect + spec.pos; const video::SColor color(255,255,255,255); const video::SColor colors[] = {color,color,color,color}; - driver->draw2DImage(texture, rect, + draw2DImageFilterScaled(driver, texture, rect, core::rect<s32>(core::position2d<s32>(0,0),img_origsize), NULL/*&AbsoluteClippingRect*/, colors, true); } @@ -2362,7 +2363,7 @@ void GUIFormSpecMenu::drawMenu() core::rect<s32> rect = imgrect + spec.pos; const video::SColor color(255,255,255,255); const video::SColor colors[] = {color,color,color,color}; - driver->draw2DImage(texture, rect, + draw2DImageFilterScaled(driver, texture, rect, core::rect<s32>(core::position2d<s32>(0,0), core::dimension2di(texture->getOriginalSize())), NULL/*&AbsoluteClippingRect*/, colors, true); |