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

17
source/Irrlicht/CWaterSurfaceSceneNode.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_WATER_SURFACE_SCENE_NODE_H_INCLUDED__
#define __C_WATER_SURFACE_SCENE_NODE_H_INCLUDED__
#ifndef IRR_C_WATER_SURFACE_SCENE_NODE_H_INCLUDED
#define IRR_C_WATER_SURFACE_SCENE_NODE_H_INCLUDED
#include "CMeshSceneNode.h"
@@ -27,22 +27,22 @@ namespace scene
virtual ~CWaterSurfaceSceneNode();
//! frame registration
virtual void OnRegisterSceneNode() _IRR_OVERRIDE_;
virtual void OnRegisterSceneNode() IRR_OVERRIDE;
//! animated update
virtual void OnAnimate(u32 timeMs) _IRR_OVERRIDE_;
virtual void OnAnimate(u32 timeMs) IRR_OVERRIDE;
//! Update mesh
virtual void setMesh(IMesh* mesh) _IRR_OVERRIDE_;
virtual void setMesh(IMesh* mesh) IRR_OVERRIDE;
//! Returns type of the scene node
virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_WATER_SURFACE; }
virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_WATER_SURFACE; }
//! Writes attributes of the scene node.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_;
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the scene node.
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_;
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
private:
@@ -58,4 +58,3 @@ namespace scene
} // end namespace irr
#endif