minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-07-06 10:10:25 +02:00
Code Issues Projects Releases Wiki 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

36
source/Irrlicht/CSceneNodeAnimatorCameraFPS.h
View File

@ -36,31 +36,31 @@ namespace scene
virtual ~CSceneNodeAnimatorCameraFPS();
//! Animates the scene node, currently only works on cameras
virtual void animateNode(ISceneNode* node, u32 timeMs) _IRR_OVERRIDE_;
virtual void animateNode(ISceneNode* node, u32 timeMs) IRR_OVERRIDE;
//! Event receiver
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_;
virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! Returns the speed of movement in units per second
virtual f32 getMoveSpeed() const _IRR_OVERRIDE_;
virtual f32 getMoveSpeed() const IRR_OVERRIDE;
//! Sets the speed of movement in units per second
virtual void setMoveSpeed(f32 moveSpeed) _IRR_OVERRIDE_;
virtual void setMoveSpeed(f32 moveSpeed) IRR_OVERRIDE;
//! Returns the rotation speed when moving mouse
virtual f32 getRotateSpeed() const _IRR_OVERRIDE_;
virtual f32 getRotateSpeed() const IRR_OVERRIDE;
//! Set the rotation speed when moving mouse
virtual void setRotateSpeed(f32 rotateSpeed) _IRR_OVERRIDE_;
virtual void setRotateSpeed(f32 rotateSpeed) IRR_OVERRIDE;
//! Returns the rotation speed when using keyboard
virtual f32 getRotateSpeedKeyboard() const _IRR_OVERRIDE_
virtual f32 getRotateSpeedKeyboard() const IRR_OVERRIDE
{
return RotateSpeedKeyboard;
}
//! Set the rotation speed when using keyboard
virtual void setRotateSpeedKeyboard(f32 rotateSpeed) _IRR_OVERRIDE_
virtual void setRotateSpeedKeyboard(f32 rotateSpeed) IRR_OVERRIDE
{
RotateSpeedKeyboard = rotateSpeed;
}
@ -68,31 +68,31 @@ namespace scene
//! Sets the keyboard mapping for this animator (old style)
//! \param keymap: an array of keyboard mappings, see SKeyMap
//! \param count: the size of the keyboard map array
virtual void setKeyMap(SKeyMap *map, u32 count) _IRR_OVERRIDE_;
virtual void setKeyMap(SKeyMap *map, u32 count) IRR_OVERRIDE;
//! Sets the keyboard mapping for this animator
//! \param keymap The new keymap array
virtual void setKeyMap(const core::array<SKeyMap>& keymap) _IRR_OVERRIDE_;
virtual void setKeyMap(const core::array<SKeyMap>& keymap) IRR_OVERRIDE;
//! Gets the keyboard mapping for this animator
virtual const core::array<SKeyMap>& getKeyMap() const _IRR_OVERRIDE_;
virtual const core::array<SKeyMap>& getKeyMap() const IRR_OVERRIDE;
//! Sets whether vertical movement should be allowed.
virtual void setVerticalMovement(bool allow) _IRR_OVERRIDE_;
virtual void setVerticalMovement(bool allow) IRR_OVERRIDE;
//! Sets whether the Y axis of the mouse should be inverted.
/** If enabled then moving the mouse down will cause
the camera to look up. It is disabled by default. */
virtual void setInvertMouse(bool invert) _IRR_OVERRIDE_;
virtual void setInvertMouse(bool invert) IRR_OVERRIDE;
//! This animator will receive events when attached to the active camera
virtual bool isEventReceiverEnabled() const _IRR_OVERRIDE_
virtual bool isEventReceiverEnabled() const IRR_OVERRIDE
{
return true;
}
//! Returns the type of this animator
virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_
virtual ESCENE_NODE_ANIMATOR_TYPE getType() const IRR_OVERRIDE
{
return ESNAT_CAMERA_FPS;
}
@ -101,13 +101,13 @@ namespace scene
/** Please note that you will have to drop
(IReferenceCounted::drop()) the returned pointer once you're
done with it. */
virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) _IRR_OVERRIDE_;
virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) IRR_OVERRIDE;
//! Writes attributes of the scene node animator.
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 animator.
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_;
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE;
private: