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

22
source/Irrlicht/CBoneSceneNode.h
View File

@@ -23,39 +23,39 @@ namespace scene
s32 id=-1, u32 boneIndex=0, const c8* boneName=0);
//! Returns the index of the bone
virtual u32 getBoneIndex() const _IRR_OVERRIDE_;
virtual u32 getBoneIndex() const IRR_OVERRIDE;
//! Sets the animation mode of the bone. Returns true if successful.
virtual bool setAnimationMode(E_BONE_ANIMATION_MODE mode) _IRR_OVERRIDE_;
virtual bool setAnimationMode(E_BONE_ANIMATION_MODE mode) IRR_OVERRIDE;
//! Gets the current animation mode of the bone
virtual E_BONE_ANIMATION_MODE getAnimationMode() const _IRR_OVERRIDE_;
virtual E_BONE_ANIMATION_MODE getAnimationMode() const IRR_OVERRIDE;
//! returns the axis aligned bounding box of this node
virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_;
virtual const core::aabbox3d<f32>& getBoundingBox() const IRR_OVERRIDE;
/*
//! Returns the relative transformation of the scene node.
//virtual core::matrix4 getRelativeTransformation() const _IRR_OVERRIDE_;
//virtual core::matrix4 getRelativeTransformation() const IRR_OVERRIDE;
*/
virtual void OnAnimate(u32 timeMs) _IRR_OVERRIDE_;
virtual void OnAnimate(u32 timeMs) IRR_OVERRIDE;
virtual void updateAbsolutePositionOfAllChildren() _IRR_OVERRIDE_;
virtual void updateAbsolutePositionOfAllChildren() IRR_OVERRIDE;
//! Writes attributes of the scene node.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_;
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE;
//! Reads attributes of the scene node.
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_;
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE;
//! How the relative transformation of the bone is used
virtual void setSkinningSpace(E_BONE_SKINNING_SPACE space) _IRR_OVERRIDE_
virtual void setSkinningSpace(E_BONE_SKINNING_SPACE space) IRR_OVERRIDE
{
SkinningSpace=space;
}
virtual E_BONE_SKINNING_SPACE getSkinningSpace() const _IRR_OVERRIDE_
virtual E_BONE_SKINNING_SPACE getSkinningSpace() const IRR_OVERRIDE
{
return SkinningSpace;
}