ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Route a few more controls rendering through the skin, to make them use OpenGL 3

Browse Source
This commit is contained in:
Marianne Gagnon 2014-10-04 19:38:44 -04:00
parent 5a07fd0fa4
commit c1d6c054c8
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/irrlicht/source/Irrlicht/CGUIButton.cpp
View File

@ -277,7 +277,7 @@ void CGUIButton::draw()
pos.X += skin->getSize(EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X); pos.X += skin->getSize(EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X);
pos.Y += skin->getSize(EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y); pos.Y += skin->getSize(EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y);
} }
driver->draw2DImage(PressedImage, skin->draw2DImage(PressedImage,
ScaleImage? AbsoluteRect : ScaleImage? AbsoluteRect :
core::recti(pos, PressedImageRect.getSize()), core::recti(pos, PressedImageRect.getSize()),
PressedImageRect, &AbsoluteClippingRect, PressedImageRect, &AbsoluteClippingRect,

20
lib/irrlicht/source/Irrlicht/CGUIImage.cpp
View File

@ -78,20 +78,20 @@ void CGUIImage::draw()
if (Texture) if (Texture)
{ {
if (ScaleImage) //if (ScaleImage)
{ //{
const video::SColor Colors[] = {Color,Color,Color,Color}; const video::SColor Colors[] = {Color,Color,Color,Color};
driver->draw2DImage(Texture, AbsoluteRect, skin->draw2DImage(Texture, AbsoluteRect,
core::rect<s32>(core::position2d<s32>(0,0), core::dimension2di(Texture->getOriginalSize())), core::rect<s32>(core::position2d<s32>(0,0), core::dimension2di(Texture->getOriginalSize())),
&AbsoluteClippingRect, Colors, UseAlphaChannel); &AbsoluteClippingRect, Colors, UseAlphaChannel);
} //}
else //else
{ //{
driver->draw2DImage(Texture, AbsoluteRect.UpperLeftCorner, // driver->draw2DImage(Texture, AbsoluteRect.UpperLeftCorner,
core::rect<s32>(core::position2d<s32>(0,0), core::dimension2di(Texture->getOriginalSize())), // core::rect<s32>(core::position2d<s32>(0,0), core::dimension2di(Texture->getOriginalSize())),
&AbsoluteClippingRect, Color, UseAlphaChannel); // &AbsoluteClippingRect, Color, UseAlphaChannel);
} //}
} }
else else
{ {