freeminer
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge r4540 from trunk: 

Fix name and parameters of draw2dImageBatch call, which was not yet used due to wrong override.


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4632 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2014-01-07 21:42:11 +00:00
parent 7165eac356
commit 27b535f472
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/Irrlicht/COpenGLDriver.cpp
View File

@ -1913,10 +1913,11 @@ void COpenGLDriver::draw2DImage(const video::ITexture* texture, const core::rect
//! in one line. All drawings are clipped against clipRect (if != 0).
//! The subtextures are defined by the array of sourceRects and are chosen
//! by the indices given.
void COpenGLDriver::draw2DImage(const video::ITexture* texture,
void COpenGLDriver::draw2DImageBatch(const video::ITexture* texture,
const core::position2d<s32>& pos,
const core::array<core::rect<s32> >& sourceRects,
const core::array<s32>& indices,
s32 kerningWidth,
const core::rect<s32>* clipRect, SColor color,
bool useAlphaChannelOfTexture)
{

3
source/Irrlicht/COpenGLDriver.h
View File

@ -181,10 +181,11 @@ namespace video
Note that the alpha component is used: If alpha is other than 255, the image will be transparent.
\param useAlphaChannelOfTexture: If true, the alpha channel of the texture is
used to draw the image. */
virtual void draw2DImage(const video::ITexture* texture,
virtual void draw2DImageBatch(const video::ITexture* texture,
const core::position2d<s32>& pos,
const core::array<core::rect<s32> >& sourceRects,
const core::array<s32>& indices,
s32 kerningWidth=0,
const core::rect<s32>* clipRect=0,
SColor color=SColor(255,255,255,255),
bool useAlphaChannelOfTexture=false);