Commit f220d109 authored by hybrid's avatar hybrid

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

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4540 dfc29bdd-3216-0410-991c-e03cc46cb475
parent f8d7aab7
...@@ -2312,10 +2312,11 @@ void COpenGLDriver::draw2DImage(const video::ITexture* texture, const core::rect ...@@ -2312,10 +2312,11 @@ void COpenGLDriver::draw2DImage(const video::ITexture* texture, const core::rect
//! in one line. All drawings are clipped against clipRect (if != 0). //! in one line. All drawings are clipped against clipRect (if != 0).
//! The subtextures are defined by the array of sourceRects and are chosen //! The subtextures are defined by the array of sourceRects and are chosen
//! by the indices given. //! 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::position2d<s32>& pos,
const core::array<core::rect<s32> >& sourceRects, const core::array<core::rect<s32> >& sourceRects,
const core::array<s32>& indices, const core::array<s32>& indices,
s32 kerningWidth,
const core::rect<s32>* clipRect, SColor color, const core::rect<s32>* clipRect, SColor color,
bool useAlphaChannelOfTexture) bool useAlphaChannelOfTexture)
{ {
......
...@@ -181,10 +181,11 @@ namespace video ...@@ -181,10 +181,11 @@ namespace video
Note that the alpha component is used: If alpha is other than 255, the image will be transparent. 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 \param useAlphaChannelOfTexture: If true, the alpha channel of the texture is
used to draw the image. */ 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::position2d<s32>& pos,
const core::array<core::rect<s32> >& sourceRects, const core::array<core::rect<s32> >& sourceRects,
const core::array<s32>& indices, const core::array<s32>& indices,
s32 kerningWidth=0,
const core::rect<s32>* clipRect=0, const core::rect<s32>* clipRect=0,
SColor color=SColor(255,255,255,255), SColor color=SColor(255,255,255,255),
bool useAlphaChannelOfTexture=false); bool useAlphaChannelOfTexture=false);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment