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

API BREAKER: Replacing defines in irrTypes.h which are conflicting with c++ reserved identifier rules.

Browse Source 
C++ has undefined behavior for identifiers starting with __ or with _ followed by an uppercase letter.
We still have many more (in IrrCompileConfig.h and in all header-guards), will likely replace those later as well.
As a workaround for users which might use irrlicht defines in their code, I've added the header irrLegacyDefines.h
Including that allows to continue using old defines for a while - or make it easier to have code which compiles 
with old and new Irrlicht library versions.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6251 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 12:55:10 +00:00
parent ee180dbd24
commit ffd7b63af0
289 changed files with 3401 additions and 3379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/Irrlicht/CImage.h
View File

@@ -30,33 +30,33 @@ public:
CImage(ECOLOR_FORMAT format, const core::dimension2d<u32>& size);
//! returns a pixel
virtual SColor getPixel(u32 x, u32 y) const _IRR_OVERRIDE_;
virtual SColor getPixel(u32 x, u32 y) const IRR_OVERRIDE;
//! sets a pixel
virtual void setPixel(u32 x, u32 y, const SColor &color, bool blend = false ) _IRR_OVERRIDE_;
virtual void setPixel(u32 x, u32 y, const SColor &color, bool blend = false ) IRR_OVERRIDE;
//! copies this surface into another, scaling it to fit.
virtual void copyToScaling(void* target, u32 width, u32 height, ECOLOR_FORMAT format, u32 pitch=0) _IRR_OVERRIDE_;
virtual void copyToScaling(void* target, u32 width, u32 height, ECOLOR_FORMAT format, u32 pitch=0) IRR_OVERRIDE;
//! copies this surface into another, scaling it to fit.
virtual void copyToScaling(IImage* target) _IRR_OVERRIDE_;
virtual void copyToScaling(IImage* target) IRR_OVERRIDE;
//! copies this surface into another
virtual void copyTo(IImage* target, const core::position2d<s32>& pos=core::position2d<s32>(0,0)) _IRR_OVERRIDE_;
virtual void copyTo(IImage* target, const core::position2d<s32>& pos=core::position2d<s32>(0,0)) IRR_OVERRIDE;
//! copies this surface into another
virtual void copyTo(IImage* target, const core::position2d<s32>& pos, const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect=0) _IRR_OVERRIDE_;
virtual void copyTo(IImage* target, const core::position2d<s32>& pos, const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect=0) IRR_OVERRIDE;
//! copies this surface into another, using the alpha mask, an cliprect and a color to add with
virtual void copyToWithAlpha(IImage* target, const core::position2d<s32>& pos,
const core::rect<s32>& sourceRect, const SColor &color,
const core::rect<s32>* clipRect = 0, bool combineAlpha=false) _IRR_OVERRIDE_;
const core::rect<s32>* clipRect = 0, bool combineAlpha=false) IRR_OVERRIDE;
//! copies this surface into another, scaling it to fit, applying a box filter
virtual void copyToScalingBoxFilter(IImage* target, s32 bias = 0, bool blend = false) _IRR_OVERRIDE_;
virtual void copyToScalingBoxFilter(IImage* target, s32 bias = 0, bool blend = false) IRR_OVERRIDE;
//! fills the surface with given color
virtual void fill(const SColor &color) _IRR_OVERRIDE_;
virtual void fill(const SColor &color) IRR_OVERRIDE;
private:
inline SColor getPixelBox ( s32 x, s32 y, s32 fx, s32 fy, s32 bias ) const;