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

11
source/Irrlicht/CSceneNodeAnimatorDelete.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_SCENE_NODE_ANIMATOR_DELETE_H_INCLUDED__
#define __C_SCENE_NODE_ANIMATOR_DELETE_H_INCLUDED__
#ifndef IRR_C_SCENE_NODE_ANIMATOR_DELETE_H_INCLUDED
#define IRR_C_SCENE_NODE_ANIMATOR_DELETE_H_INCLUDED
#include "ISceneNodeAnimatorFinishing.h"
@@ -19,10 +19,10 @@ namespace scene
CSceneNodeAnimatorDelete(ISceneManager* manager, u32 when);
//! animates a scene node
virtual void animateNode(ISceneNode* node, u32 timeMs) _IRR_OVERRIDE_;
virtual void animateNode(ISceneNode* node, u32 timeMs) IRR_OVERRIDE;
//! Returns type of the scene node animator
virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_
virtual ESCENE_NODE_ANIMATOR_TYPE getType() const IRR_OVERRIDE
{
return ESNAT_DELETION;
}
@@ -31,7 +31,7 @@ namespace scene
/** Please note that you will have to drop
(IReferenceCounted::drop()) the returned pointer after calling
this. */
virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) _IRR_OVERRIDE_;
virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) IRR_OVERRIDE;
private:
@@ -43,4 +43,3 @@ namespace scene
} // end namespace irr
#endif