luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/Irrlicht/CGUISpriteBank.h
View File

@@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_SPRITE_BANK_H_INCLUDED__
#define __C_GUI_SPRITE_BANK_H_INCLUDED__
#ifndef IRR_C_GUI_SPRITE_BANK_H_INCLUDED
#define IRR_C_GUI_SPRITE_BANK_H_INCLUDED
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_
@@ -32,38 +32,38 @@ public:
CGUISpriteBank(IGUIEnvironment* env);
virtual ~CGUISpriteBank();
virtual core::array< core::rect<s32> >& getPositions() _IRR_OVERRIDE_;
virtual core::array< SGUISprite >& getSprites() _IRR_OVERRIDE_;
virtual core::array< core::rect<s32> >& getPositions() IRR_OVERRIDE;
virtual core::array< SGUISprite >& getSprites() IRR_OVERRIDE;
virtual u32 getTextureCount() const _IRR_OVERRIDE_;
virtual video::ITexture* getTexture(u32 index) const _IRR_OVERRIDE_;
virtual void addTexture(video::ITexture* texture) _IRR_OVERRIDE_;
virtual void setTexture(u32 index, video::ITexture* texture) _IRR_OVERRIDE_;
virtual u32 getTextureCount() const IRR_OVERRIDE;
virtual video::ITexture* getTexture(u32 index) const IRR_OVERRIDE;
virtual void addTexture(video::ITexture* texture) IRR_OVERRIDE;
virtual void setTexture(u32 index, video::ITexture* texture) IRR_OVERRIDE;
//! Add the texture and use it for a single non-animated sprite.
virtual s32 addTextureAsSprite(video::ITexture* texture) _IRR_OVERRIDE_;
virtual s32 addTextureAsSprite(video::ITexture* texture) IRR_OVERRIDE;
//! clears sprites, rectangles and textures
virtual void clear() _IRR_OVERRIDE_;
virtual void clear() IRR_OVERRIDE;
//! Draws a sprite in 2d with position and color
virtual void draw2DSprite(u32 index, const core::position2di& pos, const core::rect<s32>* clip=0,
const video::SColor& color= video::SColor(255,255,255,255),
u32 starttime=0, u32 currenttime=0, bool loop=true, bool center=false) _IRR_OVERRIDE_;
u32 starttime=0, u32 currenttime=0, bool loop=true, bool center=false) IRR_OVERRIDE;
//! Draws a sprite in 2d with destination rectangle and colors
virtual void draw2DSprite(u32 index, const core::rect<s32>& destRect,
const core::rect<s32>* clip=0,
const video::SColor * const colors=0,
u32 timeTicks = 0,
bool loop=true) _IRR_OVERRIDE_;
bool loop=true) IRR_OVERRIDE;
//! Draws a sprite batch in 2d using an array of positions and a color
virtual void draw2DSpriteBatch(const core::array<u32>& indices, const core::array<core::position2di>& pos,
const core::rect<s32>* clip=0,
const video::SColor& color= video::SColor(255,255,255,255),
u32 starttime=0, u32 currenttime=0,
bool loop=true, bool center=false) _IRR_OVERRIDE_;
bool loop=true, bool center=false) IRR_OVERRIDE;
protected:
@@ -101,5 +101,4 @@ protected:
#endif // _IRR_COMPILE_WITH_GUI_
#endif // __C_GUI_SPRITE_BANK_H_INCLUDED__
#endif // IRR_C_GUI_SPRITE_BANK_H_INCLUDED