diff --git a/changes.txt b/changes.txt index 6ee71071..4b5067cb 100644 --- a/changes.txt +++ b/changes.txt @@ -9,6 +9,11 @@ Changes in ogl-es (not yet released - will be merged with trunk at some point) -------------------------- Changes in 1.9 (not yet released) +- Many defines changed because they were using names which are reserved identifiers in c++. + Mostly it's about replacing __IRRxxx or _IRRxxx identifiers by versions without underscores + Sometimes underscores at end also got removed. + There is a header file irrLegacyDefines.h which can be included to allow having the old defines back. + Thanks @Markus Elfring for reporting this (bug #427) - Add equals and set_data functions to core::array for easier working with blocks of data. - SIrrlichtCreationParameters::IgnoreInput set to false works again on X11. Thanks @ Victor Gaydov for report + patch + very good test cases! (bug #401) @@ -3930,7 +3935,7 @@ Changes in version 0.12.0 (24 August 2005) - Changed the names the driver return (now "OpenGL 1.5", "Direct3D 9.0" and "Direct3D 8.1") -- Added a new macro _IRR_DEBUG_BREAK_IF which is now used instead of the _asm int 3 break points in +- Added a new macro IRR_DEBUG_BREAK_IF which is now used instead of the _asm int 3 break points in debug mode. - Fixed a bug were the software renderer didn't clip 2d rectangles. This effect was visible for diff --git a/include/CDynamicMeshBuffer.h b/include/CDynamicMeshBuffer.h index 4424fc86..cb776d2f 100644 --- a/include/CDynamicMeshBuffer.h +++ b/include/CDynamicMeshBuffer.h @@ -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_DYNAMIC_MESHBUFFER_H_INCLUDED__ -#define __C_DYNAMIC_MESHBUFFER_H_INCLUDED__ +#ifndef IRR_C_DYNAMIC_MESHBUFFER_H_INCLUDED +#define IRR_C_DYNAMIC_MESHBUFFER_H_INCLUDED #include "IDynamicMeshBuffer.h" @@ -35,17 +35,17 @@ namespace scene IndexBuffer->drop(); } - virtual IVertexBuffer& getVertexBuffer() const _IRR_OVERRIDE_ + virtual IVertexBuffer& getVertexBuffer() const IRR_OVERRIDE { return *VertexBuffer; } - virtual IIndexBuffer& getIndexBuffer() const _IRR_OVERRIDE_ + virtual IIndexBuffer& getIndexBuffer() const IRR_OVERRIDE { return *IndexBuffer; } - virtual void setVertexBuffer(IVertexBuffer *newVertexBuffer) _IRR_OVERRIDE_ + virtual void setVertexBuffer(IVertexBuffer *newVertexBuffer) IRR_OVERRIDE { if (newVertexBuffer) newVertexBuffer->grab(); @@ -55,7 +55,7 @@ namespace scene VertexBuffer=newVertexBuffer; } - virtual void setIndexBuffer(IIndexBuffer *newIndexBuffer) _IRR_OVERRIDE_ + virtual void setIndexBuffer(IIndexBuffer *newIndexBuffer) IRR_OVERRIDE { if (newIndexBuffer) newIndexBuffer->grab(); @@ -66,31 +66,31 @@ namespace scene } //! Get Material of this buffer. - virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_ + virtual const video::SMaterial& getMaterial() const IRR_OVERRIDE { return Material; } //! Get Material of this buffer. - virtual video::SMaterial& getMaterial() _IRR_OVERRIDE_ + virtual video::SMaterial& getMaterial() IRR_OVERRIDE { return Material; } //! Get bounding box - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_ + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE { return BoundingBox; } //! Set bounding box - virtual void setBoundingBox( const core::aabbox3df& box) _IRR_OVERRIDE_ + virtual void setBoundingBox( const core::aabbox3df& box) IRR_OVERRIDE { BoundingBox = box; } //! Recalculate bounding box - virtual void recalculateBoundingBox() _IRR_OVERRIDE_ + virtual void recalculateBoundingBox() IRR_OVERRIDE { if (!getVertexBuffer().size()) BoundingBox.reset(0,0,0); @@ -103,13 +103,13 @@ namespace scene } //! Describe what kind of primitive geometry is used by the meshbuffer - virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) _IRR_OVERRIDE_ + virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) IRR_OVERRIDE { PrimitiveType = type; } //! Get the kind of primitive geometry which is used by the meshbuffer - virtual E_PRIMITIVE_TYPE getPrimitiveType() const _IRR_OVERRIDE_ + virtual E_PRIMITIVE_TYPE getPrimitiveType() const IRR_OVERRIDE { return PrimitiveType; } @@ -130,4 +130,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/CIndexBuffer.h b/include/CIndexBuffer.h index 69253c34..152fb040 100644 --- a/include/CIndexBuffer.h +++ b/include/CIndexBuffer.h @@ -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_INDEX_BUFFER_H_INCLUDED__ -#define __C_INDEX_BUFFER_H_INCLUDED__ +#ifndef IRR_C_INDEX_BUFFER_H_INCLUDED +#define IRR_C_INDEX_BUFFER_H_INCLUDED #include "IIndexBuffer.h" @@ -39,46 +39,46 @@ namespace scene public: core::array Indices; - virtual u32 stride() const _IRR_OVERRIDE_ {return sizeof(T);} + virtual u32 stride() const IRR_OVERRIDE {return sizeof(T);} - virtual u32 size() const _IRR_OVERRIDE_ {return Indices.size();} + virtual u32 size() const IRR_OVERRIDE {return Indices.size();} - virtual void push_back(const u32 &element) _IRR_OVERRIDE_ + virtual void push_back(const u32 &element) IRR_OVERRIDE { // push const ref due to compiler problem with gcc 4.6, big endian Indices.push_back((const T&)element); } - virtual u32 operator [](u32 index) const _IRR_OVERRIDE_ + virtual u32 operator [](u32 index) const IRR_OVERRIDE { return (u32)(Indices[index]); } - virtual u32 getLast() _IRR_OVERRIDE_ {return (u32)Indices.getLast();} + virtual u32 getLast() IRR_OVERRIDE {return (u32)Indices.getLast();} - virtual void setValue(u32 index, u32 value) _IRR_OVERRIDE_ + virtual void setValue(u32 index, u32 value) IRR_OVERRIDE { Indices[index]=(T)value; } - virtual void set_used(u32 usedNow) _IRR_OVERRIDE_ + virtual void set_used(u32 usedNow) IRR_OVERRIDE { Indices.set_used(usedNow); } - virtual void reallocate(u32 new_size) _IRR_OVERRIDE_ + virtual void reallocate(u32 new_size) IRR_OVERRIDE { Indices.reallocate(new_size); } - virtual u32 allocated_size() const _IRR_OVERRIDE_ + virtual u32 allocated_size() const IRR_OVERRIDE { return Indices.allocated_size(); } - virtual void* pointer() _IRR_OVERRIDE_ {return Indices.pointer();} + virtual void* pointer() IRR_OVERRIDE {return Indices.pointer();} - virtual video::E_INDEX_TYPE getType() const _IRR_OVERRIDE_ + virtual video::E_INDEX_TYPE getType() const IRR_OVERRIDE { if (sizeof(T)==sizeof(u16)) return video::EIT_16BIT; @@ -110,7 +110,7 @@ namespace scene } //virtual void setType(video::E_INDEX_TYPE IndexType); - virtual void setType(video::E_INDEX_TYPE IndexType) _IRR_OVERRIDE_ + virtual void setType(video::E_INDEX_TYPE IndexType) IRR_OVERRIDE { IIndexList *NewIndices=0; @@ -141,78 +141,78 @@ namespace scene Indices=NewIndices; } - virtual void* getData() _IRR_OVERRIDE_ {return Indices->pointer();} + virtual void* getData() IRR_OVERRIDE {return Indices->pointer();} - virtual video::E_INDEX_TYPE getType() const _IRR_OVERRIDE_ {return Indices->getType();} + virtual video::E_INDEX_TYPE getType() const IRR_OVERRIDE {return Indices->getType();} - virtual u32 stride() const _IRR_OVERRIDE_ {return Indices->stride();} + virtual u32 stride() const IRR_OVERRIDE {return Indices->stride();} - virtual u32 size() const _IRR_OVERRIDE_ + virtual u32 size() const IRR_OVERRIDE { return Indices->size(); } - virtual void push_back(const u32 &element) _IRR_OVERRIDE_ + virtual void push_back(const u32 &element) IRR_OVERRIDE { Indices->push_back(element); } - virtual u32 operator [](u32 index) const _IRR_OVERRIDE_ + virtual u32 operator [](u32 index) const IRR_OVERRIDE { return (*Indices)[index]; } - virtual u32 getLast() _IRR_OVERRIDE_ + virtual u32 getLast() IRR_OVERRIDE { return Indices->getLast(); } - virtual void setValue(u32 index, u32 value) _IRR_OVERRIDE_ + virtual void setValue(u32 index, u32 value) IRR_OVERRIDE { Indices->setValue(index, value); } - virtual void set_used(u32 usedNow) _IRR_OVERRIDE_ + virtual void set_used(u32 usedNow) IRR_OVERRIDE { Indices->set_used(usedNow); } - virtual void reallocate(u32 new_size) _IRR_OVERRIDE_ + virtual void reallocate(u32 new_size) IRR_OVERRIDE { Indices->reallocate(new_size); } - virtual u32 allocated_size() const _IRR_OVERRIDE_ + virtual u32 allocated_size() const IRR_OVERRIDE { return Indices->allocated_size(); } - virtual void* pointer() _IRR_OVERRIDE_ + virtual void* pointer() IRR_OVERRIDE { return Indices->pointer(); } //! get the current hardware mapping hint - virtual E_HARDWARE_MAPPING getHardwareMappingHint() const _IRR_OVERRIDE_ + virtual E_HARDWARE_MAPPING getHardwareMappingHint() const IRR_OVERRIDE { return MappingHint; } //! set the hardware mapping hint, for driver - virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) _IRR_OVERRIDE_ + virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) IRR_OVERRIDE { MappingHint=NewMappingHint; } //! flags the mesh as changed, reloads hardware buffers - virtual void setDirty() _IRR_OVERRIDE_ + virtual void setDirty() IRR_OVERRIDE { ++ChangedID; } //! Get the currently used ID for identification of changes. /** This shouldn't be used for anything outside the VideoDriver. */ - virtual u32 getChangedID() const _IRR_OVERRIDE_ {return ChangedID;} + virtual u32 getChangedID() const IRR_OVERRIDE {return ChangedID;} E_HARDWARE_MAPPING MappingHint; u32 ChangedID; @@ -223,4 +223,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/CMeshBuffer.h b/include/CMeshBuffer.h index 05b8acdf..b5cbcb25 100644 --- a/include/CMeshBuffer.h +++ b/include/CMeshBuffer.h @@ -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 __T_MESH_BUFFER_H_INCLUDED__ -#define __T_MESH_BUFFER_H_INCLUDED__ +#ifndef IRR_T_MESH_BUFFER_H_INCLUDED +#define IRR_T_MESH_BUFFER_H_INCLUDED #include "irrArray.h" #include "IMeshBuffer.h" @@ -31,7 +31,7 @@ namespace scene //! Get material of this meshbuffer /** \return Material of this buffer */ - virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_ + virtual const video::SMaterial& getMaterial() const IRR_OVERRIDE { return Material; } @@ -39,7 +39,7 @@ namespace scene //! Get material of this meshbuffer /** \return Material of this buffer */ - virtual video::SMaterial& getMaterial() _IRR_OVERRIDE_ + virtual video::SMaterial& getMaterial() IRR_OVERRIDE { return Material; } @@ -47,7 +47,7 @@ namespace scene //! Get pointer to vertices /** \return Pointer to vertices. */ - virtual const void* getVertices() const _IRR_OVERRIDE_ + virtual const void* getVertices() const IRR_OVERRIDE { return Vertices.const_pointer(); } @@ -55,7 +55,7 @@ namespace scene //! Get pointer to vertices /** \return Pointer to vertices. */ - virtual void* getVertices() _IRR_OVERRIDE_ + virtual void* getVertices() IRR_OVERRIDE { return Vertices.pointer(); } @@ -63,21 +63,21 @@ namespace scene //! Get number of vertices /** \return Number of vertices. */ - virtual u32 getVertexCount() const _IRR_OVERRIDE_ + virtual u32 getVertexCount() const IRR_OVERRIDE { return Vertices.size(); } //! Get type of index data which is stored in this meshbuffer. /** \return Index type of this buffer. */ - virtual video::E_INDEX_TYPE getIndexType() const _IRR_OVERRIDE_ + virtual video::E_INDEX_TYPE getIndexType() const IRR_OVERRIDE { return video::EIT_16BIT; } //! Get pointer to indices /** \return Pointer to indices. */ - virtual const u16* getIndices() const _IRR_OVERRIDE_ + virtual const u16* getIndices() const IRR_OVERRIDE { return Indices.const_pointer(); } @@ -85,7 +85,7 @@ namespace scene //! Get pointer to indices /** \return Pointer to indices. */ - virtual u16* getIndices() _IRR_OVERRIDE_ + virtual u16* getIndices() IRR_OVERRIDE { return Indices.pointer(); } @@ -93,7 +93,7 @@ namespace scene //! Get number of indices /** \return Number of indices. */ - virtual u32 getIndexCount() const _IRR_OVERRIDE_ + virtual u32 getIndexCount() const IRR_OVERRIDE { return Indices.size(); } @@ -101,7 +101,7 @@ namespace scene //! Get the axis aligned bounding box /** \return Axis aligned bounding box of this buffer. */ - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_ + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE { return BoundingBox; } @@ -110,7 +110,7 @@ namespace scene //! Set the axis aligned bounding box /** \param box New axis aligned bounding box for this buffer. */ //! set user axis aligned bounding box - virtual void setBoundingBox(const core::aabbox3df& box) _IRR_OVERRIDE_ + virtual void setBoundingBox(const core::aabbox3df& box) IRR_OVERRIDE { BoundingBox = box; } @@ -118,7 +118,7 @@ namespace scene //! Recalculate the bounding box. /** should be called if the mesh changed. */ - virtual void recalculateBoundingBox() _IRR_OVERRIDE_ + virtual void recalculateBoundingBox() IRR_OVERRIDE { if (!Vertices.empty()) { @@ -135,43 +135,43 @@ namespace scene //! Get type of vertex data stored in this buffer. /** \return Type of vertex data. */ - virtual video::E_VERTEX_TYPE getVertexType() const _IRR_OVERRIDE_ + virtual video::E_VERTEX_TYPE getVertexType() const IRR_OVERRIDE { return T::getType(); } //! returns position of vertex i - virtual const core::vector3df& getPosition(u32 i) const _IRR_OVERRIDE_ + virtual const core::vector3df& getPosition(u32 i) const IRR_OVERRIDE { return Vertices[i].Pos; } //! returns position of vertex i - virtual core::vector3df& getPosition(u32 i) _IRR_OVERRIDE_ + virtual core::vector3df& getPosition(u32 i) IRR_OVERRIDE { return Vertices[i].Pos; } //! returns normal of vertex i - virtual const core::vector3df& getNormal(u32 i) const _IRR_OVERRIDE_ + virtual const core::vector3df& getNormal(u32 i) const IRR_OVERRIDE { return Vertices[i].Normal; } //! returns normal of vertex i - virtual core::vector3df& getNormal(u32 i) _IRR_OVERRIDE_ + virtual core::vector3df& getNormal(u32 i) IRR_OVERRIDE { return Vertices[i].Normal; } //! returns texture coord of vertex i - virtual const core::vector2df& getTCoords(u32 i) const _IRR_OVERRIDE_ + virtual const core::vector2df& getTCoords(u32 i) const IRR_OVERRIDE { return Vertices[i].TCoords; } //! returns texture coord of vertex i - virtual core::vector2df& getTCoords(u32 i) _IRR_OVERRIDE_ + virtual core::vector2df& getTCoords(u32 i) IRR_OVERRIDE { return Vertices[i].TCoords; } @@ -182,7 +182,7 @@ namespace scene or the main buffer is of standard type. Otherwise, behavior is undefined. */ - virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) _IRR_OVERRIDE_ + virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) IRR_OVERRIDE { if (vertices == getVertices()) return; @@ -211,7 +211,7 @@ namespace scene undefined. \param other Meshbuffer to be appended to this one. */ - virtual void append(const IMeshBuffer* const other) _IRR_OVERRIDE_ + virtual void append(const IMeshBuffer* const other) IRR_OVERRIDE { /* if (this==other) @@ -237,19 +237,19 @@ namespace scene //! get the current hardware mapping hint - virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const _IRR_OVERRIDE_ + virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const IRR_OVERRIDE { return MappingHint_Vertex; } //! get the current hardware mapping hint - virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const _IRR_OVERRIDE_ + virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const IRR_OVERRIDE { return MappingHint_Index; } //! set the hardware mapping hint, for driver - virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) _IRR_OVERRIDE_ + virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) IRR_OVERRIDE { if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX) MappingHint_Vertex=NewMappingHint; @@ -258,19 +258,19 @@ namespace scene } //! Describe what kind of primitive geometry is used by the meshbuffer - virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) _IRR_OVERRIDE_ + virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) IRR_OVERRIDE { PrimitiveType = type; } //! Get the kind of primitive geometry which is used by the meshbuffer - virtual E_PRIMITIVE_TYPE getPrimitiveType() const _IRR_OVERRIDE_ + virtual E_PRIMITIVE_TYPE getPrimitiveType() const IRR_OVERRIDE { return PrimitiveType; } //! flags the mesh as changed, reloads hardware buffers - virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_ + virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) IRR_OVERRIDE { if (Buffer==EBT_VERTEX_AND_INDEX ||Buffer==EBT_VERTEX) ++ChangedID_Vertex; @@ -280,11 +280,11 @@ namespace scene //! Get the currently used ID for identification of changes. /** This shouldn't be used for anything outside the VideoDriver. */ - virtual u32 getChangedID_Vertex() const _IRR_OVERRIDE_ {return ChangedID_Vertex;} + virtual u32 getChangedID_Vertex() const IRR_OVERRIDE {return ChangedID_Vertex;} //! Get the currently used ID for identification of changes. /** This shouldn't be used for anything outside the VideoDriver. */ - virtual u32 getChangedID_Index() const _IRR_OVERRIDE_ {return ChangedID_Index;} + virtual u32 getChangedID_Index() const IRR_OVERRIDE {return ChangedID_Index;} u32 ChangedID_Vertex; u32 ChangedID_Index; @@ -315,5 +315,3 @@ namespace scene } // end namespace irr #endif - - diff --git a/include/CVertexBuffer.h b/include/CVertexBuffer.h index 4d52779b..2a984268 100644 --- a/include/CVertexBuffer.h +++ b/include/CVertexBuffer.h @@ -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_VERTEX_BUFFER_H_INCLUDED__ -#define __C_VERTEX_BUFFER_H_INCLUDED__ +#ifndef IRR_C_VERTEX_BUFFER_H_INCLUDED +#define IRR_C_VERTEX_BUFFER_H_INCLUDED #include "IVertexBuffer.h" @@ -40,33 +40,33 @@ namespace scene public: core::array Vertices; - virtual u32 stride() const _IRR_OVERRIDE_ {return sizeof(T);} + virtual u32 stride() const IRR_OVERRIDE {return sizeof(T);} - virtual u32 size() const _IRR_OVERRIDE_ {return Vertices.size();} + virtual u32 size() const IRR_OVERRIDE {return Vertices.size();} - virtual void push_back (const video::S3DVertex &element) _IRR_OVERRIDE_ + virtual void push_back (const video::S3DVertex &element) IRR_OVERRIDE {Vertices.push_back((T&)element);} - virtual video::S3DVertex& operator [](const u32 index) const _IRR_OVERRIDE_ + virtual video::S3DVertex& operator [](const u32 index) const IRR_OVERRIDE {return (video::S3DVertex&)Vertices[index];} - virtual video::S3DVertex& getLast() _IRR_OVERRIDE_ + virtual video::S3DVertex& getLast() IRR_OVERRIDE {return (video::S3DVertex&)Vertices.getLast();} - virtual void set_used(u32 usedNow) _IRR_OVERRIDE_ + virtual void set_used(u32 usedNow) IRR_OVERRIDE {Vertices.set_used(usedNow);} - virtual void reallocate(u32 new_size) _IRR_OVERRIDE_ + virtual void reallocate(u32 new_size) IRR_OVERRIDE {Vertices.reallocate(new_size);} - virtual u32 allocated_size() const _IRR_OVERRIDE_ + virtual u32 allocated_size() const IRR_OVERRIDE { return Vertices.allocated_size(); } - virtual video::S3DVertex* pointer() _IRR_OVERRIDE_ {return Vertices.pointer();} + virtual video::S3DVertex* pointer() IRR_OVERRIDE {return Vertices.pointer();} - virtual video::E_VERTEX_TYPE getType() const _IRR_OVERRIDE_ {return T::getType();} + virtual video::E_VERTEX_TYPE getType() const IRR_OVERRIDE {return T::getType();} }; public: @@ -95,7 +95,7 @@ namespace scene } - virtual void setType(video::E_VERTEX_TYPE vertexType) _IRR_OVERRIDE_ + virtual void setType(video::E_VERTEX_TYPE vertexType) IRR_OVERRIDE { IVertexList *NewVertices=0; @@ -130,73 +130,73 @@ namespace scene Vertices=NewVertices; } - virtual void* getData() _IRR_OVERRIDE_ {return Vertices->pointer();} + virtual void* getData() IRR_OVERRIDE {return Vertices->pointer();} - virtual video::E_VERTEX_TYPE getType() const _IRR_OVERRIDE_ {return Vertices->getType();} + virtual video::E_VERTEX_TYPE getType() const IRR_OVERRIDE {return Vertices->getType();} - virtual u32 stride() const _IRR_OVERRIDE_ {return Vertices->stride();} + virtual u32 stride() const IRR_OVERRIDE {return Vertices->stride();} - virtual u32 size() const _IRR_OVERRIDE_ + virtual u32 size() const IRR_OVERRIDE { return Vertices->size(); } - virtual void push_back (const video::S3DVertex &element) _IRR_OVERRIDE_ + virtual void push_back (const video::S3DVertex &element) IRR_OVERRIDE { Vertices->push_back(element); } - virtual video::S3DVertex& operator [](const u32 index) const _IRR_OVERRIDE_ + virtual video::S3DVertex& operator [](const u32 index) const IRR_OVERRIDE { return (*Vertices)[index]; } - virtual video::S3DVertex& getLast() _IRR_OVERRIDE_ + virtual video::S3DVertex& getLast() IRR_OVERRIDE { return Vertices->getLast(); } - virtual void set_used(u32 usedNow) _IRR_OVERRIDE_ + virtual void set_used(u32 usedNow) IRR_OVERRIDE { Vertices->set_used(usedNow); } - virtual void reallocate(u32 new_size) _IRR_OVERRIDE_ + virtual void reallocate(u32 new_size) IRR_OVERRIDE { Vertices->reallocate(new_size); } - virtual u32 allocated_size() const _IRR_OVERRIDE_ + virtual u32 allocated_size() const IRR_OVERRIDE { return Vertices->allocated_size(); } - virtual video::S3DVertex* pointer() _IRR_OVERRIDE_ + virtual video::S3DVertex* pointer() IRR_OVERRIDE { return Vertices->pointer(); } //! get the current hardware mapping hint - virtual E_HARDWARE_MAPPING getHardwareMappingHint() const _IRR_OVERRIDE_ + virtual E_HARDWARE_MAPPING getHardwareMappingHint() const IRR_OVERRIDE { return MappingHint; } //! set the hardware mapping hint, for driver - virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) _IRR_OVERRIDE_ + virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) IRR_OVERRIDE { MappingHint=NewMappingHint; } //! flags the mesh as changed, reloads hardware buffers - virtual void setDirty() _IRR_OVERRIDE_ + virtual void setDirty() IRR_OVERRIDE { ++ChangedID; } //! Get the currently used ID for identification of changes. /** This shouldn't be used for anything outside the VideoDriver. */ - virtual u32 getChangedID() const _IRR_OVERRIDE_ {return ChangedID;} + virtual u32 getChangedID() const IRR_OVERRIDE {return ChangedID;} E_HARDWARE_MAPPING MappingHint; u32 ChangedID; @@ -207,4 +207,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/EAttributes.h b/include/EAttributes.h index 51f102b2..22bc8914 100644 --- a/include/EAttributes.h +++ b/include/EAttributes.h @@ -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 __E_ATTRIBUTES_H_INCLUDED__ -#define __E_ATTRIBUTES_H_INCLUDED__ +#ifndef IRR_E_ATTRIBUTES_H_INCLUDED +#define IRR_E_ATTRIBUTES_H_INCLUDED namespace irr { diff --git a/include/ECullingTypes.h b/include/ECullingTypes.h index eeb3d912..86b7d120 100644 --- a/include/ECullingTypes.h +++ b/include/ECullingTypes.h @@ -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 __E_CULLING_TYPES_H_INCLUDED__ -#define __E_CULLING_TYPES_H_INCLUDED__ +#ifndef IRR_E_CULLING_TYPES_H_INCLUDED +#define IRR_E_CULLING_TYPES_H_INCLUDED #include "irrTypes.h" @@ -36,6 +36,4 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif // __E_CULLING_TYPES_H_INCLUDED__ - +#endif // IRR_E_CULLING_TYPES_H_INCLUDED diff --git a/include/EDebugSceneTypes.h b/include/EDebugSceneTypes.h index 987b7902..ce542b18 100644 --- a/include/EDebugSceneTypes.h +++ b/include/EDebugSceneTypes.h @@ -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 __E_DEBUG_SCENE_TYPES_H_INCLUDED__ -#define __E_DEBUG_SCENE_TYPES_H_INCLUDED__ +#ifndef IRR_E_DEBUG_SCENE_TYPES_H_INCLUDED +#define IRR_E_DEBUG_SCENE_TYPES_H_INCLUDED namespace irr { @@ -45,6 +45,4 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif // __E_DEBUG_SCENE_TYPES_H_INCLUDED__ - +#endif // IRR_E_DEBUG_SCENE_TYPES_H_INCLUDED diff --git a/include/EDeviceTypes.h b/include/EDeviceTypes.h index 6b67c1af..646d88e1 100644 --- a/include/EDeviceTypes.h +++ b/include/EDeviceTypes.h @@ -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 __E_DEVICE_TYPES_H_INCLUDED__ -#define __E_DEVICE_TYPES_H_INCLUDED__ +#ifndef IRR_E_DEVICE_TYPES_H_INCLUDED +#define IRR_E_DEVICE_TYPES_H_INCLUDED namespace irr { @@ -66,5 +66,4 @@ namespace irr } // end namespace irr -#endif // __E_DEVICE_TYPES_H_INCLUDED__ - +#endif // IRR_E_DEVICE_TYPES_H_INCLUDED diff --git a/include/EDriverFeatures.h b/include/EDriverFeatures.h index 6d7fee40..651333ce 100644 --- a/include/EDriverFeatures.h +++ b/include/EDriverFeatures.h @@ -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 __E_DRIVER_FEATURES_H_INCLUDED__ -#define __E_DRIVER_FEATURES_H_INCLUDED__ +#ifndef IRR_E_DRIVER_FEATURES_H_INCLUDED +#define IRR_E_DRIVER_FEATURES_H_INCLUDED namespace irr { @@ -152,6 +152,4 @@ namespace video } // end namespace video } // end namespace irr - #endif - diff --git a/include/EDriverTypes.h b/include/EDriverTypes.h index f5a2e929..d82882f1 100644 --- a/include/EDriverTypes.h +++ b/include/EDriverTypes.h @@ -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 __E_DRIVER_TYPES_H_INCLUDED__ -#define __E_DRIVER_TYPES_H_INCLUDED__ +#ifndef IRR_E_DRIVER_TYPES_H_INCLUDED +#define IRR_E_DRIVER_TYPES_H_INCLUDED #include "irrTypes.h" @@ -97,5 +97,4 @@ namespace video } // end namespace video } // end namespace irr - #endif diff --git a/include/EFocusFlags.h b/include/EFocusFlags.h index c5180024..e511dc6a 100644 --- a/include/EFocusFlags.h +++ b/include/EFocusFlags.h @@ -1,8 +1,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef E_FOCUS_FLAGS_H_INCLUDED__ -#define E_FOCUS_FLAGS_H_INCLUDED__ +#ifndef IRR_E_FOCUS_FLAGS_H_INCLUDED +#define IRR_E_FOCUS_FLAGS_H_INCLUDED namespace irr { @@ -35,4 +35,3 @@ enum EFOCUS_FLAG } // namespace irr #endif - diff --git a/include/EGUIAlignment.h b/include/EGUIAlignment.h index 4876503b..436298f3 100644 --- a/include/EGUIAlignment.h +++ b/include/EGUIAlignment.h @@ -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 __E_GUI_ALIGNMENT_H_INCLUDED__ -#define __E_GUI_ALIGNMENT_H_INCLUDED__ +#ifndef IRR_E_GUI_ALIGNMENT_H_INCLUDED +#define IRR_E_GUI_ALIGNMENT_H_INCLUDED #include "irrTypes.h" @@ -36,4 +36,4 @@ const c8* const GUIAlignmentNames[] = } // namespace gui } // namespace irr -#endif // __E_GUI_ALIGNMENT_H_INCLUDED__ +#endif // IRR_E_GUI_ALIGNMENT_H_INCLUDED diff --git a/include/EGUIElementTypes.h b/include/EGUIElementTypes.h index a26a02cf..1051723d 100644 --- a/include/EGUIElementTypes.h +++ b/include/EGUIElementTypes.h @@ -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 __E_GUI_ELEMENT_TYPES_H_INCLUDED__ -#define __E_GUI_ELEMENT_TYPES_H_INCLUDED__ +#ifndef IRR_E_GUI_ELEMENT_TYPES_H_INCLUDED +#define IRR_E_GUI_ELEMENT_TYPES_H_INCLUDED #include "irrTypes.h" @@ -138,7 +138,3 @@ const c8* const GUIElementTypeNames[] = } // end namespace irr #endif - - - - diff --git a/include/EHardwareBufferFlags.h b/include/EHardwareBufferFlags.h index d7594555..d29b0e18 100644 --- a/include/EHardwareBufferFlags.h +++ b/include/EHardwareBufferFlags.h @@ -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 __E_HARDWARE_BUFFER_FLAGS_INCLUDED__ -#define __E_HARDWARE_BUFFER_FLAGS_INCLUDED__ +#ifndef IRR_E_HARDWARE_BUFFER_FLAGS_INCLUDED +#define IRR_E_HARDWARE_BUFFER_FLAGS_INCLUDED namespace irr { @@ -41,4 +41,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/EMaterialFlags.h b/include/EMaterialFlags.h index 04ef13ea..d3ee86d8 100644 --- a/include/EMaterialFlags.h +++ b/include/EMaterialFlags.h @@ -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 __E_MATERIAL_FLAGS_H_INCLUDED__ -#define __E_MATERIAL_FLAGS_H_INCLUDED__ +#ifndef IRR_E_MATERIAL_FLAGS_H_INCLUDED +#define IRR_E_MATERIAL_FLAGS_H_INCLUDED namespace irr { @@ -96,6 +96,4 @@ namespace video } // end namespace video } // end namespace irr - -#endif // __E_MATERIAL_FLAGS_H_INCLUDED__ - +#endif // IRR_E_MATERIAL_FLAGS_H_INCLUDED diff --git a/include/EMaterialTypes.h b/include/EMaterialTypes.h index cdbd4997..26b5f9e2 100644 --- a/include/EMaterialTypes.h +++ b/include/EMaterialTypes.h @@ -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 __E_MATERIAL_TYPES_H_INCLUDED__ -#define __E_MATERIAL_TYPES_H_INCLUDED__ +#ifndef IRR_E_MATERIAL_TYPES_H_INCLUDED +#define IRR_E_MATERIAL_TYPES_H_INCLUDED namespace irr { @@ -229,6 +229,4 @@ namespace video } // end namespace video } // end namespace irr - -#endif // __E_MATERIAL_TYPES_H_INCLUDED__ - +#endif // IRR_E_MATERIAL_TYPES_H_INCLUDED diff --git a/include/EMeshWriterEnums.h b/include/EMeshWriterEnums.h index 16e1e376..22a2a127 100644 --- a/include/EMeshWriterEnums.h +++ b/include/EMeshWriterEnums.h @@ -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 __E_MESH_WRITER_ENUMS_H_INCLUDED__ -#define __E_MESH_WRITER_ENUMS_H_INCLUDED__ +#ifndef IRR_E_MESH_WRITER_ENUMS_H_INCLUDED +#define IRR_E_MESH_WRITER_ENUMS_H_INCLUDED #include "irrTypes.h" @@ -60,6 +60,4 @@ namespace scene } // end namespace scene } // end namespace irr - -#endif // __E_MESH_WRITER_ENUMS_H_INCLUDED__ - +#endif // IRR_E_MESH_WRITER_ENUMS_H_INCLUDED diff --git a/include/EMessageBoxFlags.h b/include/EMessageBoxFlags.h index 06468043..e51cf47e 100644 --- a/include/EMessageBoxFlags.h +++ b/include/EMessageBoxFlags.h @@ -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 __E_MESSAGE_BOX_FLAGS_H_INCLUDED__ -#define __E_MESSAGE_BOX_FLAGS_H_INCLUDED__ +#ifndef IRR_E_MESSAGE_BOX_FLAGS_H_INCLUDED +#define IRR_E_MESSAGE_BOX_FLAGS_H_INCLUDED namespace irr { @@ -33,4 +33,3 @@ enum EMESSAGE_BOX_FLAG } // namespace irr #endif - diff --git a/include/EPrimitiveTypes.h b/include/EPrimitiveTypes.h index ae8f5f50..3134821e 100644 --- a/include/EPrimitiveTypes.h +++ b/include/EPrimitiveTypes.h @@ -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 __E_PRIMITIVE_TYPES_H_INCLUDED__ -#define __E_PRIMITIVE_TYPES_H_INCLUDED__ +#ifndef IRR_E_PRIMITIVE_TYPES_H_INCLUDED +#define IRR_E_PRIMITIVE_TYPES_H_INCLUDED namespace irr { @@ -58,4 +58,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/EReadFileType.h b/include/EReadFileType.h index b4124ccf..e9989603 100644 --- a/include/EReadFileType.h +++ b/include/EReadFileType.h @@ -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 __E_READ_FILE_TYPES_H_INCLUDED__ -#define __E_READ_FILE_TYPES_H_INCLUDED__ +#ifndef IRR_E_READ_FILE_TYPES_H_INCLUDED +#define IRR_E_READ_FILE_TYPES_H_INCLUDED #include "irrTypes.h" @@ -30,5 +30,4 @@ namespace io } // end namespace io } // end namespace irr - #endif diff --git a/include/ESceneNodeAnimatorTypes.h b/include/ESceneNodeAnimatorTypes.h index f771d128..8094457a 100644 --- a/include/ESceneNodeAnimatorTypes.h +++ b/include/ESceneNodeAnimatorTypes.h @@ -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 __E_SCENE_NODE_ANIMATOR_TYPES_H_INCLUDED__ -#define __E_SCENE_NODE_ANIMATOR_TYPES_H_INCLUDED__ +#ifndef IRR_E_SCENE_NODE_ANIMATOR_TYPES_H_INCLUDED +#define IRR_E_SCENE_NODE_ANIMATOR_TYPES_H_INCLUDED namespace irr { @@ -53,6 +53,4 @@ namespace scene } // end namespace scene } // end namespace irr - #endif - diff --git a/include/ESceneNodeTypes.h b/include/ESceneNodeTypes.h index 0eeab92a..b7e8f249 100644 --- a/include/ESceneNodeTypes.h +++ b/include/ESceneNodeTypes.h @@ -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 __E_SCENE_NODE_TYPES_H_INCLUDED__ -#define __E_SCENE_NODE_TYPES_H_INCLUDED__ +#ifndef IRR_E_SCENE_NODE_TYPES_H_INCLUDED +#define IRR_E_SCENE_NODE_TYPES_H_INCLUDED #include "irrTypes.h" @@ -99,11 +99,7 @@ namespace scene ESNT_ANY = MAKE_IRR_ID('a','n','y','_') }; - - } // end namespace scene } // end namespace irr - #endif - diff --git a/include/EShaderTypes.h b/include/EShaderTypes.h index 29eef56a..0b3afa9e 100644 --- a/include/EShaderTypes.h +++ b/include/EShaderTypes.h @@ -1,5 +1,5 @@ -#ifndef __E_SHADER_TYPES_H_INCLUDED__ -#define __E_SHADER_TYPES_H_INCLUDED__ +#ifndef IRR_E_SHADER_TYPES_H_INCLUDED +#define IRR_E_SHADER_TYPES_H_INCLUDED #include "irrTypes.h" @@ -86,5 +86,4 @@ const c8* const GEOMETRY_SHADER_TYPE_NAMES[] = { } // end namespace video } // end namespace irr -#endif // __E_SHADER_TYPES_H_INCLUDED__ - +#endif // IRR_E_SHADER_TYPES_H_INCLUDED diff --git a/include/ETerrainElements.h b/include/ETerrainElements.h index 5bb48c0a..24ec4b14 100644 --- a/include/ETerrainElements.h +++ b/include/ETerrainElements.h @@ -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 __E_TERRAIN_ELEMENTS_H__ -#define __E_TERRAIN_ELEMENTS_H__ +#ifndef IRR_E_TERRAIN_ELEMENTS_H +#define IRR_E_TERRAIN_ELEMENTS_H namespace irr { @@ -33,4 +33,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/IAnimatedMesh.h b/include/IAnimatedMesh.h index 0d252e8d..ab9be06d 100644 --- a/include/IAnimatedMesh.h +++ b/include/IAnimatedMesh.h @@ -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 __I_ANIMATED_MESH_H_INCLUDED__ -#define __I_ANIMATED_MESH_H_INCLUDED__ +#ifndef IRR_I_ANIMATED_MESH_H_INCLUDED +#define IRR_I_ANIMATED_MESH_H_INCLUDED #include "aabbox3d.h" #include "IMesh.h" @@ -61,7 +61,7 @@ namespace scene if getMeshType() returns EAMT_MD2 it's safe to cast the IAnimatedMesh to IAnimatedMeshMD2. \returns Type of the mesh. */ - virtual E_ANIMATED_MESH_TYPE getMeshType() const _IRR_OVERRIDE_ + virtual E_ANIMATED_MESH_TYPE getMeshType() const IRR_OVERRIDE { return EAMT_UNKNOWN; } @@ -71,4 +71,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/IAnimatedMeshMD2.h b/include/IAnimatedMeshMD2.h index 6830f37e..071025e9 100644 --- a/include/IAnimatedMeshMD2.h +++ b/include/IAnimatedMeshMD2.h @@ -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 __I_ANIMATED_MESH_MD2_H_INCLUDED__ -#define __I_ANIMATED_MESH_MD2_H_INCLUDED__ +#ifndef IRR_I_ANIMATED_MESH_MD2_H_INCLUDED +#define IRR_I_ANIMATED_MESH_MD2_H_INCLUDED #include "IAnimatedMesh.h" @@ -76,4 +76,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/IAnimatedMeshMD3.h b/include/IAnimatedMeshMD3.h index 08c897d0..6612516b 100644 --- a/include/IAnimatedMeshMD3.h +++ b/include/IAnimatedMeshMD3.h @@ -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 __I_ANIMATED_MESH_MD3_H_INCLUDED__ -#define __I_ANIMATED_MESH_MD3_H_INCLUDED__ +#ifndef IRR_I_ANIMATED_MESH_MD3_H_INCLUDED +#define IRR_I_ANIMATED_MESH_MD3_H_INCLUDED #include "IAnimatedMesh.h" #include "IQ3Shader.h" @@ -301,4 +301,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/IAnimatedMeshSceneNode.h b/include/IAnimatedMeshSceneNode.h index 5a399039..a69b7b5f 100644 --- a/include/IAnimatedMeshSceneNode.h +++ b/include/IAnimatedMeshSceneNode.h @@ -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 __I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__ -#define __I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED +#define IRR_I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" #include "IBoneSceneNode.h" @@ -230,4 +230,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/IAttributeExchangingObject.h b/include/IAttributeExchangingObject.h index 5b13cdba..25cdbbec 100644 --- a/include/IAttributeExchangingObject.h +++ b/include/IAttributeExchangingObject.h @@ -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 __I_ATTRIBUTE_EXCHANGING_OBJECT_H_INCLUDED__ -#define __I_ATTRIBUTE_EXCHANGING_OBJECT_H_INCLUDED__ +#ifndef IRR_I_ATTRIBUTE_EXCHANGING_OBJECT_H_INCLUDED +#define IRR_I_ATTRIBUTE_EXCHANGING_OBJECT_H_INCLUDED #include "IReferenceCounted.h" @@ -19,10 +19,10 @@ class IAttributes; //! Enumeration flags passed through SAttributeReadWriteOptions to the IAttributeExchangingObject object enum E_ATTRIBUTE_READ_WRITE_FLAGS { - //! Serialization/Deserializion is done for an xml file + //! Serialization/deserialization is done for an xml file EARWF_FOR_FILE = 0x00000001, - //! Serialization/Deserializion is done for an editor property box + //! Serialization/deserialization is done for an editor property box EARWF_FOR_EDITOR = 0x00000002, //! When writing filenames, relative paths should be used @@ -68,4 +68,3 @@ public: } // end namespace irr #endif - diff --git a/include/IAttributes.h b/include/IAttributes.h index 507561d8..cd3086cf 100644 --- a/include/IAttributes.h +++ b/include/IAttributes.h @@ -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 __I_ATTRIBUTES_H_INCLUDED__ -#define __I_ATTRIBUTES_H_INCLUDED__ +#ifndef IRR_I_ATTRIBUTES_H_INCLUDED +#define IRR_I_ATTRIBUTES_H_INCLUDED #include "IReferenceCounted.h" #include "SColor.h" @@ -759,6 +759,3 @@ public: } // end namespace irr #endif - - - diff --git a/include/IBillboardSceneNode.h b/include/IBillboardSceneNode.h index 63846561..ee7a3327 100644 --- a/include/IBillboardSceneNode.h +++ b/include/IBillboardSceneNode.h @@ -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 __I_BILLBOARD_SCENE_NODE_H_INCLUDED__ -#define __I_BILLBOARD_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_BILLBOARD_SCENE_NODE_H_INCLUDED +#define IRR_I_BILLBOARD_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" @@ -79,6 +79,4 @@ public: } // end namespace scene } // end namespace irr - #endif - diff --git a/include/IBillboardTextSceneNode.h b/include/IBillboardTextSceneNode.h index 0526b63f..6f104985 100644 --- a/include/IBillboardTextSceneNode.h +++ b/include/IBillboardTextSceneNode.h @@ -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 __I_BILLBOARD_TEXT_SCENE_NODE_H_INCLUDED__ -#define __I_BILLBOARD_TEXT_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_BILLBOARD_TEXT_SCENE_NODE_H_INCLUDED +#define IRR_I_BILLBOARD_TEXT_SCENE_NODE_H_INCLUDED #include "IBillboardSceneNode.h" @@ -73,6 +73,4 @@ public: } // end namespace scene } // end namespace irr - #endif - diff --git a/include/IBoneSceneNode.h b/include/IBoneSceneNode.h index a96a28be..0a4a9b16 100644 --- a/include/IBoneSceneNode.h +++ b/include/IBoneSceneNode.h @@ -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 __I_BONE_SCENE_NODE_H_INCLUDED__ -#define __I_BONE_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_BONE_SCENE_NODE_H_INCLUDED +#define IRR_I_BONE_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" @@ -61,7 +61,7 @@ namespace scene //! Get the name of the bone /** \deprecated Use getName instead. This method may be removed by Irrlicht 1.9 */ - _IRR_DEPRECATED_ virtual const c8* getBoneName() const { return getName(); } + IRR_DEPRECATED virtual const c8* getBoneName() const { return getName(); } //! Get the index of the bone virtual u32 getBoneIndex() const = 0; @@ -74,17 +74,17 @@ namespace scene virtual E_BONE_ANIMATION_MODE getAnimationMode() const = 0; //! Get the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_ = 0; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE = 0; //! Returns the relative transformation of the scene node. //virtual core::matrix4 getRelativeTransformation() const = 0; //! The animation method. - virtual void OnAnimate(u32 timeMs) _IRR_OVERRIDE_ =0; + virtual void OnAnimate(u32 timeMs) IRR_OVERRIDE =0; //! The render method. /** Does nothing as bones are not visible. */ - virtual void render() _IRR_OVERRIDE_ { } + virtual void render() IRR_OVERRIDE { } //! How the relative transformation of the bone is used virtual void setSkinningSpace( E_BONE_SKINNING_SPACE space ) =0; @@ -105,4 +105,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ICameraSceneNode.h b/include/ICameraSceneNode.h index a157aac8..feb3cefc 100644 --- a/include/ICameraSceneNode.h +++ b/include/ICameraSceneNode.h @@ -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 __I_CAMERA_SCENE_NODE_H_INCLUDED__ -#define __I_CAMERA_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_CAMERA_SCENE_NODE_H_INCLUDED +#define IRR_I_CAMERA_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" #include "IEventReceiver.h" @@ -72,7 +72,7 @@ namespace scene ISceneManager::addCameraSceneNodeFPS, may want to get this input for changing their position, look at target or whatever. */ - virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_ =0; + virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE =0; //! Sets the look at target of the camera /** If the camera's target and rotation are bound ( @see @@ -90,7 +90,7 @@ namespace scene bindTargetAndRotation() ) then calling this will also change the camera's target to match the rotation. \param rotation New rotation of the node in degrees. */ - virtual void setRotation(const core::vector3df& rotation) _IRR_OVERRIDE_ =0; + virtual void setRotation(const core::vector3df& rotation) IRR_OVERRIDE =0; //! Gets the current look at target of the camera /** \return The current look at target of the camera, in world co-ordinates */ @@ -173,7 +173,7 @@ namespace scene virtual bool getTargetAndRotationBinding(void) const =0; //! Writes attributes of the camera 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 { ISceneNode::serializeAttributes(out, options); @@ -183,7 +183,7 @@ namespace scene } //! Reads attributes of the camera 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 { ISceneNode::deserializeAttributes(in, options); if (!in) @@ -207,4 +207,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/IColladaMeshWriter.h b/include/IColladaMeshWriter.h index a8c6dd24..0c700810 100644 --- a/include/IColladaMeshWriter.h +++ b/include/IColladaMeshWriter.h @@ -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 __IRR_I_COLLADA_MESH_WRITER_H_INCLUDED__ -#define __IRR_I_COLLADA_MESH_WRITER_H_INCLUDED__ +#ifndef IRR_I_COLLADA_MESH_WRITER_H_INCLUDED +#define IRR_I_COLLADA_MESH_WRITER_H_INCLUDED #include "IMeshWriter.h" #include "ISceneNode.h" diff --git a/include/IContextManager.h b/include/IContextManager.h index 1937190e..cd59168b 100644 --- a/include/IContextManager.h +++ b/include/IContextManager.h @@ -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 __IRR_I_CONTEXT_MANAGER_H_INCLUDED__ -#define __IRR_I_CONTEXT_MANAGER_H_INCLUDED__ +#ifndef IRR_I_CONTEXT_MANAGER_H_INCLUDED +#define IRR_I_CONTEXT_MANAGER_H_INCLUDED #include "SExposedVideoData.h" #include "SIrrCreationParameters.h" diff --git a/include/ICursorControl.h b/include/ICursorControl.h index 13c99c45..4a9c6171 100644 --- a/include/ICursorControl.h +++ b/include/ICursorControl.h @@ -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 __I_CURSOR_CONTROL_H_INCLUDED__ -#define __I_CURSOR_CONTROL_H_INCLUDED__ +#ifndef IRR_I_CURSOR_CONTROL_H_INCLUDED +#define IRR_I_CURSOR_CONTROL_H_INCLUDED #include "IReferenceCounted.h" #include "position2d.h" @@ -196,4 +196,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IDummyTransformationSceneNode.h b/include/IDummyTransformationSceneNode.h index 60dfe208..7e70e265 100644 --- a/include/IDummyTransformationSceneNode.h +++ b/include/IDummyTransformationSceneNode.h @@ -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 __I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__ -#define __I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED +#define IRR_I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" @@ -39,4 +39,3 @@ public: #endif - diff --git a/include/IDynamicMeshBuffer.h b/include/IDynamicMeshBuffer.h index 7f9ee48f..00ebbaaf 100644 --- a/include/IDynamicMeshBuffer.h +++ b/include/IDynamicMeshBuffer.h @@ -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 __I_DYNAMIC_MESH_BUFFER_H_INCLUDED__ -#define __I_DYNAMIC_MESH_BUFFER_H_INCLUDED__ +#ifndef IRR_I_DYNAMIC_MESH_BUFFER_H_INCLUDED +#define IRR_I_DYNAMIC_MESH_BUFFER_H_INCLUDED #include "IMeshBuffer.h" #include "IVertexBuffer.h" @@ -26,23 +26,23 @@ namespace scene //! Get the material of this meshbuffer /** \return Material of this buffer. */ - virtual video::SMaterial& getMaterial() _IRR_OVERRIDE_ =0; + virtual video::SMaterial& getMaterial() IRR_OVERRIDE =0; //! Get the material of this meshbuffer /** \return Material of this buffer. */ - virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_ =0; + virtual const video::SMaterial& getMaterial() const IRR_OVERRIDE =0; //! Get the axis aligned bounding box of this meshbuffer. /** \return Axis aligned bounding box of this buffer. */ - virtual const core::aabbox3df& getBoundingBox() const _IRR_OVERRIDE_ =0; + virtual const core::aabbox3df& getBoundingBox() const IRR_OVERRIDE =0; //! Set axis aligned bounding box /** \param box User defined axis aligned bounding box to use for this buffer. */ - virtual void setBoundingBox(const core::aabbox3df& box) _IRR_OVERRIDE_ =0; + virtual void setBoundingBox(const core::aabbox3df& box) IRR_OVERRIDE =0; //! Recalculates the bounding box. Should be called if the mesh changed. - virtual void recalculateBoundingBox() _IRR_OVERRIDE_ =0; + virtual void recalculateBoundingBox() IRR_OVERRIDE =0; //! Append the vertices and indices to the current buffer /** Only works for compatible vertex types. @@ -50,7 +50,7 @@ namespace scene \param numVertices Number of vertices in the array. \param indices Pointer to index array. \param numIndices Number of indices in array. */ - virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) _IRR_OVERRIDE_ + virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) IRR_OVERRIDE { } @@ -58,7 +58,7 @@ namespace scene //! Append the meshbuffer to the current buffer /** Only works for compatible vertex types \param other Buffer to append to this one. */ - virtual void append(const IMeshBuffer* const other) _IRR_OVERRIDE_ + virtual void append(const IMeshBuffer* const other) IRR_OVERRIDE { } @@ -66,19 +66,19 @@ namespace scene // ------------------- To be removed? ------------------- // //! get the current hardware mapping hint - virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const _IRR_OVERRIDE_ + virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const IRR_OVERRIDE { return getVertexBuffer().getHardwareMappingHint(); } //! get the current hardware mapping hint - virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const _IRR_OVERRIDE_ + virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const IRR_OVERRIDE { return getIndexBuffer().getHardwareMappingHint(); } //! set the hardware mapping hint, for driver - virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) _IRR_OVERRIDE_ + virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) IRR_OVERRIDE { if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX) getVertexBuffer().setHardwareMappingHint(NewMappingHint); @@ -87,7 +87,7 @@ namespace scene } //! flags the mesh as changed, reloads hardware buffers - virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_ + virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) IRR_OVERRIDE { if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX) getVertexBuffer().setDirty(); @@ -95,12 +95,12 @@ namespace scene getIndexBuffer().setDirty(); } - virtual u32 getChangedID_Vertex() const _IRR_OVERRIDE_ + virtual u32 getChangedID_Vertex() const IRR_OVERRIDE { return getVertexBuffer().getChangedID(); } - virtual u32 getChangedID_Index() const _IRR_OVERRIDE_ + virtual u32 getChangedID_Index() const IRR_OVERRIDE { return getIndexBuffer().getChangedID(); } @@ -109,7 +109,7 @@ namespace scene //! Get type of vertex data which is stored in this meshbuffer. /** \return Vertex type of this buffer. */ - virtual video::E_VERTEX_TYPE getVertexType() const _IRR_OVERRIDE_ + virtual video::E_VERTEX_TYPE getVertexType() const IRR_OVERRIDE { return getVertexBuffer().getType(); } @@ -117,7 +117,7 @@ namespace scene //! Get access to vertex data. The data is an array of vertices. /** Which vertex type is used can be determined by getVertexType(). \return Pointer to array of vertices. */ - virtual const void* getVertices() const _IRR_OVERRIDE_ + virtual const void* getVertices() const IRR_OVERRIDE { return getVertexBuffer().getData(); } @@ -125,78 +125,78 @@ namespace scene //! Get access to vertex data. The data is an array of vertices. /** Which vertex type is used can be determined by getVertexType(). \return Pointer to array of vertices. */ - virtual void* getVertices() _IRR_OVERRIDE_ + virtual void* getVertices() IRR_OVERRIDE { return getVertexBuffer().getData(); } //! Get amount of vertices in meshbuffer. /** \return Number of vertices in this buffer. */ - virtual u32 getVertexCount() const _IRR_OVERRIDE_ + virtual u32 getVertexCount() const IRR_OVERRIDE { return getVertexBuffer().size(); } //! Get type of index data which is stored in this meshbuffer. /** \return Index type of this buffer. */ - virtual video::E_INDEX_TYPE getIndexType() const _IRR_OVERRIDE_ + virtual video::E_INDEX_TYPE getIndexType() const IRR_OVERRIDE { return getIndexBuffer().getType(); } //! Get access to indices. /** \return Pointer to indices array. */ - virtual const u16* getIndices() const _IRR_OVERRIDE_ + virtual const u16* getIndices() const IRR_OVERRIDE { return (u16*)getIndexBuffer().getData(); } //! Get access to indices. /** \return Pointer to indices array. */ - virtual u16* getIndices() _IRR_OVERRIDE_ + virtual u16* getIndices() IRR_OVERRIDE { return (u16*)getIndexBuffer().getData(); } //! Get amount of indices in this meshbuffer. /** \return Number of indices in this buffer. */ - virtual u32 getIndexCount() const _IRR_OVERRIDE_ + virtual u32 getIndexCount() const IRR_OVERRIDE { return getIndexBuffer().size(); } //! returns position of vertex i - virtual const core::vector3df& getPosition(u32 i) const _IRR_OVERRIDE_ + virtual const core::vector3df& getPosition(u32 i) const IRR_OVERRIDE { return getVertexBuffer()[i].Pos; } //! returns position of vertex i - virtual core::vector3df& getPosition(u32 i) _IRR_OVERRIDE_ + virtual core::vector3df& getPosition(u32 i) IRR_OVERRIDE { return getVertexBuffer()[i].Pos; } //! returns texture coords of vertex i - virtual const core::vector2df& getTCoords(u32 i) const _IRR_OVERRIDE_ + virtual const core::vector2df& getTCoords(u32 i) const IRR_OVERRIDE { return getVertexBuffer()[i].TCoords; } //! returns texture coords of vertex i - virtual core::vector2df& getTCoords(u32 i) _IRR_OVERRIDE_ + virtual core::vector2df& getTCoords(u32 i) IRR_OVERRIDE { return getVertexBuffer()[i].TCoords; } //! returns normal of vertex i - virtual const core::vector3df& getNormal(u32 i) const _IRR_OVERRIDE_ + virtual const core::vector3df& getNormal(u32 i) const IRR_OVERRIDE { return getVertexBuffer()[i].Normal; } //! returns normal of vertex i - virtual core::vector3df& getNormal(u32 i) _IRR_OVERRIDE_ + virtual core::vector3df& getNormal(u32 i) IRR_OVERRIDE { return getVertexBuffer()[i].Normal; } @@ -207,5 +207,3 @@ namespace scene } // end namespace irr #endif - - diff --git a/include/IEventReceiver.h b/include/IEventReceiver.h index f5870fb8..ae697057 100644 --- a/include/IEventReceiver.h +++ b/include/IEventReceiver.h @@ -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 __I_EVENT_RECEIVER_H_INCLUDED__ -#define __I_EVENT_RECEIVER_H_INCLUDED__ +#ifndef IRR_I_EVENT_RECEIVER_H_INCLUDED +#define IRR_I_EVENT_RECEIVER_H_INCLUDED #include "ILogger.h" #include "Keycodes.h" @@ -654,4 +654,3 @@ struct SJoystickInfo } // end namespace irr #endif - diff --git a/include/IFileArchive.h b/include/IFileArchive.h index 7c2ed866..b74e64d6 100644 --- a/include/IFileArchive.h +++ b/include/IFileArchive.h @@ -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 __I_FILE_ARCHIVE_H_INCLUDED__ -#define __I_FILE_ARCHIVE_H_INCLUDED__ +#ifndef IRR_I_FILE_ARCHIVE_H_INCLUDED +#define IRR_I_FILE_ARCHIVE_H_INCLUDED #include "IReadFile.h" #include "IFileList.h" @@ -145,4 +145,3 @@ public: } // end namespace irr #endif - diff --git a/include/IFileList.h b/include/IFileList.h index 2d0af466..140e69d9 100644 --- a/include/IFileList.h +++ b/include/IFileList.h @@ -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 __I_FILE_LIST_H_INCLUDED__ -#define __I_FILE_LIST_H_INCLUDED__ +#ifndef IRR_I_FILE_LIST_H_INCLUDED +#define IRR_I_FILE_LIST_H_INCLUDED #include "IReferenceCounted.h" #include "path.h" @@ -89,6 +89,4 @@ public: } // end namespace irr } // end namespace io - #endif - diff --git a/include/IFileSystem.h b/include/IFileSystem.h index f9a6ee61..b3e8e4f6 100644 --- a/include/IFileSystem.h +++ b/include/IFileSystem.h @@ -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 __I_FILE_SYSTEM_H_INCLUDED__ -#define __I_FILE_SYSTEM_H_INCLUDED__ +#ifndef IRR_I_FILE_SYSTEM_H_INCLUDED +#define IRR_I_FILE_SYSTEM_H_INCLUDED #include "IReferenceCounted.h" #include "IXMLReader.h" @@ -225,7 +225,7 @@ public: \param ignorePaths: If set to true, files in the added archive can be accessed without its complete path. \return True if the archive was added successfully, false if not. */ - _IRR_DEPRECATED_ virtual bool addZipFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true) + IRR_DEPRECATED virtual bool addZipFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true) { return addFileArchive(filename, ignoreCase, ignorePaths, EFAT_ZIP); } @@ -241,7 +241,7 @@ public: \param ignorePaths: If set to true, files in the added archive can be accessed without its complete path. \return True if the archive was added successful, false if not. */ - _IRR_DEPRECATED_ virtual bool addFolderFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true) + IRR_DEPRECATED virtual bool addFolderFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true) { return addFileArchive(filename, ignoreCase, ignorePaths, EFAT_FOLDER); } @@ -259,7 +259,7 @@ public: \param ignorePaths: If set to true, files in the added archive can be accessed without its complete path.(should not use with Quake2 paks \return True if the archive was added successful, false if not. */ - _IRR_DEPRECATED_ virtual bool addPakFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true) + IRR_DEPRECATED virtual bool addPakFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true) { return addFileArchive(filename, ignoreCase, ignorePaths, EFAT_PAK); } @@ -396,4 +396,3 @@ public: } // end namespace irr #endif - diff --git a/include/IGPUProgrammingServices.h b/include/IGPUProgrammingServices.h index abe910fc..70ebe539 100644 --- a/include/IGPUProgrammingServices.h +++ b/include/IGPUProgrammingServices.h @@ -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 __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__ -#define __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__ +#ifndef IRR_I_GPU_PROGRAMMING_SERVICES_H_INCLUDED +#define IRR_I_GPU_PROGRAMMING_SERVICES_H_INCLUDED #include "EShaderTypes.h" #include "EMaterialTypes.h" @@ -452,4 +452,3 @@ public: } // end namespace irr #endif - diff --git a/include/IGUIButton.h b/include/IGUIButton.h index 88eb97bb..1a461c6c 100644 --- a/include/IGUIButton.h +++ b/include/IGUIButton.h @@ -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 __I_GUI_BUTTON_H_INCLUDED__ -#define __I_GUI_BUTTON_H_INCLUDED__ +#ifndef IRR_I_GUI_BUTTON_H_INCLUDED +#define IRR_I_GUI_BUTTON_H_INCLUDED #include "IGUIElement.h" @@ -265,4 +265,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUICheckBox.h b/include/IGUICheckBox.h index 3c0c8e3d..7a9958ff 100644 --- a/include/IGUICheckBox.h +++ b/include/IGUICheckBox.h @@ -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 __I_GUI_CHECKBOX_H_INCLUDED__ -#define __I_GUI_CHECKBOX_H_INCLUDED__ +#ifndef IRR_I_GUI_CHECKBOX_H_INCLUDED +#define IRR_I_GUI_CHECKBOX_H_INCLUDED #include "IGUIElement.h" @@ -50,4 +50,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUIColorSelectDialog.h b/include/IGUIColorSelectDialog.h index a27991c9..c41ad11f 100644 --- a/include/IGUIColorSelectDialog.h +++ b/include/IGUIColorSelectDialog.h @@ -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 __I_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__ -#define __I_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__ +#ifndef IRR_I_GUI_COLOR_SELECT_DIALOG_H_INCLUDED +#define IRR_I_GUI_COLOR_SELECT_DIALOG_H_INCLUDED #include "IGUIElement.h" @@ -34,4 +34,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUIComboBox.h b/include/IGUIComboBox.h index 8d238341..7027d4fb 100644 --- a/include/IGUIComboBox.h +++ b/include/IGUIComboBox.h @@ -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 __I_GUI_COMBO_BOX_H_INCLUDED__ -#define __I_GUI_COMBO_BOX_H_INCLUDED__ +#ifndef IRR_I_GUI_COMBO_BOX_H_INCLUDED +#define IRR_I_GUI_COMBO_BOX_H_INCLUDED #include "IGUIElement.h" @@ -71,4 +71,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUIContextMenu.h b/include/IGUIContextMenu.h index 66237632..e686b8c2 100644 --- a/include/IGUIContextMenu.h +++ b/include/IGUIContextMenu.h @@ -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 __I_GUI_CONTEXT_MENU_H_INCLUDED__ -#define __I_GUI_CONTEXT_MENU_H_INCLUDED__ +#ifndef IRR_I_GUI_CONTEXT_MENU_H_INCLUDED +#define IRR_I_GUI_CONTEXT_MENU_H_INCLUDED #include "IGUIElement.h" @@ -159,4 +159,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUIEditBox.h b/include/IGUIEditBox.h index 0c126a3f..3d444854 100644 --- a/include/IGUIEditBox.h +++ b/include/IGUIEditBox.h @@ -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 __I_GUI_EDIT_BOX_H_INCLUDED__ -#define __I_GUI_EDIT_BOX_H_INCLUDED__ +#ifndef IRR_I_GUI_EDIT_BOX_H_INCLUDED +#define IRR_I_GUI_EDIT_BOX_H_INCLUDED #include "IGUIElement.h" #include "SColor.h" @@ -154,4 +154,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUIElement.h b/include/IGUIElement.h index 5968430a..aa1e8922 100644 --- a/include/IGUIElement.h +++ b/include/IGUIElement.h @@ -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 __I_GUI_ELEMENT_H_INCLUDED__ -#define __I_GUI_ELEMENT_H_INCLUDED__ +#ifndef IRR_I_GUI_ELEMENT_H_INCLUDED +#define IRR_I_GUI_ELEMENT_H_INCLUDED #include "IAttributeExchangingObject.h" #include "irrList.h" @@ -547,7 +547,7 @@ public: //! Called if an event happened. - virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_ + virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE { return Parent ? Parent->OnEvent(event) : false; } @@ -792,7 +792,7 @@ public: //! Writes attributes of the scene node. /** Implement this to expose the attributes of your scene node for scripting languages, editors, debuggers or xml serialization purposes. */ - 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 { out->addString("Name", Name.c_str()); out->addInt("Id", ID ); @@ -817,7 +817,7 @@ public: //! Reads attributes of the scene node. /** Implement this to set the attributes of your scene node for scripting languages, editors, debuggers or xml deserialization purposes. */ - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_ + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE { setName(in->getAttributeAsString("Name", Name)); setID(in->getAttributeAsInt("Id", ID)); @@ -1066,4 +1066,3 @@ protected: } // end namespace irr #endif - diff --git a/include/IGUIElementFactory.h b/include/IGUIElementFactory.h index a447c048..d82c15e9 100644 --- a/include/IGUIElementFactory.h +++ b/include/IGUIElementFactory.h @@ -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 __I_GUI_ELEMENT_FACTORY_H_INCLUDED__ -#define __I_GUI_ELEMENT_FACTORY_H_INCLUDED__ +#ifndef IRR_I_GUI_ELEMENT_FACTORY_H_INCLUDED +#define IRR_I_GUI_ELEMENT_FACTORY_H_INCLUDED #include "IReferenceCounted.h" #include "EGUIElementTypes.h" @@ -62,5 +62,4 @@ namespace gui } // end namespace gui } // end namespace irr -#endif // __I_GUI_ELEMENT_FACTORY_H_INCLUDED__ - +#endif // IRR_I_GUI_ELEMENT_FACTORY_H_INCLUDED diff --git a/include/IGUIEnvironment.h b/include/IGUIEnvironment.h index e631b1dc..fd573342 100644 --- a/include/IGUIEnvironment.h +++ b/include/IGUIEnvironment.h @@ -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 __I_GUI_ENVIRONMENT_H_INCLUDED__ -#define __I_GUI_ENVIRONMENT_H_INCLUDED__ +#ifndef IRR_I_GUI_ENVIRONMENT_H_INCLUDED +#define IRR_I_GUI_ENVIRONMENT_H_INCLUDED #include "IReferenceCounted.h" #include "IGUISkin.h" @@ -668,4 +668,3 @@ public: } // end namespace irr #endif - diff --git a/include/IGUIFileOpenDialog.h b/include/IGUIFileOpenDialog.h index 96744cc8..1c1229d9 100644 --- a/include/IGUIFileOpenDialog.h +++ b/include/IGUIFileOpenDialog.h @@ -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 __I_GUI_FILE_OPEN_DIALOG_H_INCLUDED__ -#define __I_GUI_FILE_OPEN_DIALOG_H_INCLUDED__ +#ifndef IRR_I_GUI_FILE_OPEN_DIALOG_H_INCLUDED +#define IRR_I_GUI_FILE_OPEN_DIALOG_H_INCLUDED #include "IGUIElement.h" #include "path.h" @@ -47,4 +47,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUIFont.h b/include/IGUIFont.h index 4746c81a..40020a70 100644 --- a/include/IGUIFont.h +++ b/include/IGUIFont.h @@ -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 __I_GUI_FONT_H_INCLUDED__ -#define __I_GUI_FONT_H_INCLUDED__ +#ifndef IRR_I_GUI_FONT_H_INCLUDED +#define IRR_I_GUI_FONT_H_INCLUDED #include "IReferenceCounted.h" #include "SColor.h" @@ -101,4 +101,3 @@ public: } // end namespace irr #endif - diff --git a/include/IGUIFontBitmap.h b/include/IGUIFontBitmap.h index 4141236e..ab715ffe 100644 --- a/include/IGUIFontBitmap.h +++ b/include/IGUIFontBitmap.h @@ -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 __I_GUI_FONT_BITMAP_H_INCLUDED__ -#define __I_GUI_FONT_BITMAP_H_INCLUDED__ +#ifndef IRR_I_GUI_FONT_BITMAP_H_INCLUDED +#define IRR_I_GUI_FONT_BITMAP_H_INCLUDED #include "IGUIFont.h" @@ -19,7 +19,7 @@ class IGUIFontBitmap : public IGUIFont public: //! Returns the type of this font - virtual EGUI_FONT_TYPE getType() const _IRR_OVERRIDE_ { return EGFT_BITMAP; } + virtual EGUI_FONT_TYPE getType() const IRR_OVERRIDE { return EGFT_BITMAP; } //! returns the parsed Symbol Information virtual IGUISpriteBank* getSpriteBank() const = 0; @@ -36,11 +36,10 @@ public: kerning value. For example, EGFT_BITMAP will add the right kerning value of previousLetter to the left side kerning value of thisLetter, then add the global value. */ - virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const _IRR_OVERRIDE_ = 0; + virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const IRR_OVERRIDE = 0; }; } // end namespace gui } // end namespace irr #endif - diff --git a/include/IGUIImage.h b/include/IGUIImage.h index c99de0dd..d2acacf2 100644 --- a/include/IGUIImage.h +++ b/include/IGUIImage.h @@ -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 __I_GUI_IMAGE_H_INCLUDED__ -#define __I_GUI_IMAGE_H_INCLUDED__ +#ifndef IRR_I_GUI_IMAGE_H_INCLUDED +#define IRR_I_GUI_IMAGE_H_INCLUDED #include "IGUIElement.h" diff --git a/include/IGUIImageList.h b/include/IGUIImageList.h index 7f27a99e..2280f05c 100644 --- a/include/IGUIImageList.h +++ b/include/IGUIImageList.h @@ -1,8 +1,8 @@ // This file is part of the "Irrlicht Engine". // written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de -#ifndef __I_GUI_IMAGE_LIST_H_INCLUDED__ -#define __I_GUI_IMAGE_LIST_H_INCLUDED__ +#ifndef IRR_I_GUI_IMAGE_LIST_H_INCLUDED +#define IRR_I_GUI_IMAGE_LIST_H_INCLUDED #include "IGUIElement.h" #include "rect.h" @@ -42,4 +42,3 @@ public: } // end namespace irr #endif - diff --git a/include/IGUIInOutFader.h b/include/IGUIInOutFader.h index a89f615f..7afd552f 100644 --- a/include/IGUIInOutFader.h +++ b/include/IGUIInOutFader.h @@ -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 __I_GUI_IN_OUT_FADER_H_INCLUDED__ -#define __I_GUI_IN_OUT_FADER_H_INCLUDED__ +#ifndef IRR_I_GUI_IN_OUT_FADER_H_INCLUDED +#define IRR_I_GUI_IN_OUT_FADER_H_INCLUDED #include "IGUIElement.h" #include "SColor.h" @@ -42,7 +42,7 @@ namespace gui //! Starts the fade in process. /** In the beginning the whole rect is drawn by the set color - (black by default) and at the end of the overgiven time the + (black by default) and at the end of the given time the color has faded out. \param time: Time specifying how long it should need to fade in, in milliseconds. */ @@ -64,4 +64,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUIListBox.h b/include/IGUIListBox.h index b76888c8..a74b4499 100644 --- a/include/IGUIListBox.h +++ b/include/IGUIListBox.h @@ -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 __I_GUI_LIST_BOX_H_INCLUDED__ -#define __I_GUI_LIST_BOX_H_INCLUDED__ +#ifndef IRR_I_GUI_LIST_BOX_H_INCLUDED +#define IRR_I_GUI_LIST_BOX_H_INCLUDED #include "IGUIElement.h" #include "SColor.h" @@ -139,4 +139,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUIMeshViewer.h b/include/IGUIMeshViewer.h index 3255f4ed..25e079d1 100644 --- a/include/IGUIMeshViewer.h +++ b/include/IGUIMeshViewer.h @@ -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 __I_GUI_MESH_VIEWER_H_INCLUDED__ -#define __I_GUI_MESH_VIEWER_H_INCLUDED__ +#ifndef IRR_I_GUI_MESH_VIEWER_H_INCLUDED +#define IRR_I_GUI_MESH_VIEWER_H_INCLUDED #include "IGUIElement.h" @@ -50,4 +50,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUIProfiler.h b/include/IGUIProfiler.h index 995899c1..36cb16e4 100644 --- a/include/IGUIProfiler.h +++ b/include/IGUIProfiler.h @@ -2,8 +2,8 @@ // For conditions of distribution and use, see copyright notice in irrlicht.h // Written by Michael Zeilfelder -#ifndef I_GUI_PROFILER_H_INCLUDED__ -#define I_GUI_PROFILER_H_INCLUDED__ +#ifndef IRR_I_GUI_PROFILER_H_INCLUDED +#define IRR_I_GUI_PROFILER_H_INCLUDED #include "IGUIElement.h" diff --git a/include/IGUIScrollBar.h b/include/IGUIScrollBar.h index c75900e9..e943cd30 100644 --- a/include/IGUIScrollBar.h +++ b/include/IGUIScrollBar.h @@ -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 __I_GUI_SCROLL_BAR_H_INCLUDED__ -#define __I_GUI_SCROLL_BAR_H_INCLUDED__ +#ifndef IRR_I_GUI_SCROLL_BAR_H_INCLUDED +#define IRR_I_GUI_SCROLL_BAR_H_INCLUDED #include "IGUIElement.h" @@ -62,4 +62,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUISkin.h b/include/IGUISkin.h index e685a1ed..814f5af3 100644 --- a/include/IGUISkin.h +++ b/include/IGUISkin.h @@ -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 __I_GUI_SKIN_H_INCLUDED__ -#define __I_GUI_SKIN_H_INCLUDED__ +#ifndef IRR_I_GUI_SKIN_H_INCLUDED +#define IRR_I_GUI_SKIN_H_INCLUDED #include "IAttributeExchangingObject.h" #include "EGUIAlignment.h" @@ -577,4 +577,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUISpinBox.h b/include/IGUISpinBox.h index 1c647627..6251d673 100644 --- a/include/IGUISpinBox.h +++ b/include/IGUISpinBox.h @@ -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 __I_GUI_SPIN_BOX_H_INCLUDED__ -#define __I_GUI_SPIN_BOX_H_INCLUDED__ +#ifndef IRR_I_GUI_SPIN_BOX_H_INCLUDED +#define IRR_I_GUI_SPIN_BOX_H_INCLUDED #include "IGUIElement.h" @@ -88,5 +88,4 @@ namespace gui } // end namespace gui } // end namespace irr -#endif // __I_GUI_SPIN_BOX_H_INCLUDED__ - +#endif // IRR_I_GUI_SPIN_BOX_H_INCLUDED diff --git a/include/IGUISpriteBank.h b/include/IGUISpriteBank.h index 84816164..19a9a417 100644 --- a/include/IGUISpriteBank.h +++ b/include/IGUISpriteBank.h @@ -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 __I_GUI_SPRITE_BANK_H_INCLUDED__ -#define __I_GUI_SPRITE_BANK_H_INCLUDED__ +#ifndef IRR_I_GUI_SPRITE_BANK_H_INCLUDED +#define IRR_I_GUI_SPRITE_BANK_H_INCLUDED #include "IReferenceCounted.h" #include "irrArray.h" @@ -138,5 +138,4 @@ public: } // end namespace gui } // end namespace irr -#endif // __I_GUI_SPRITE_BANK_H_INCLUDED__ - +#endif // IRR_I_GUI_SPRITE_BANK_H_INCLUDED diff --git a/include/IGUIStaticText.h b/include/IGUIStaticText.h index 33db281e..b7abb412 100644 --- a/include/IGUIStaticText.h +++ b/include/IGUIStaticText.h @@ -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 __I_GUI_STATIC_TEXT_H_INCLUDED__ -#define __I_GUI_STATIC_TEXT_H_INCLUDED__ +#ifndef IRR_I_GUI_STATIC_TEXT_H_INCLUDED +#define IRR_I_GUI_STATIC_TEXT_H_INCLUDED #include "IGUIElement.h" #include "SColor.h" @@ -136,4 +136,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUITabControl.h b/include/IGUITabControl.h index 8301238d..dc4b145e 100644 --- a/include/IGUITabControl.h +++ b/include/IGUITabControl.h @@ -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 __I_GUI_TAB_CONTROL_H_INCLUDED__ -#define __I_GUI_TAB_CONTROL_H_INCLUDED__ +#ifndef IRR_I_GUI_TAB_CONTROL_H_INCLUDED +#define IRR_I_GUI_TAB_CONTROL_H_INCLUDED #include "IGUIElement.h" #include "SColor.h" @@ -131,7 +131,7 @@ namespace gui //! Returns zero based index of tab if in tabcontrol. /** \deprecated Deprecated in 1.9, use IGUITabControl::getTabIndex instead*/ - _IRR_DEPRECATED_ virtual s32 getNumber() const + IRR_DEPRECATED virtual s32 getNumber() const { if (Parent && Parent->getType() == EGUIET_TAB_CONTROL) return static_cast(Parent)->getTabIndex(this); @@ -161,4 +161,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUITable.h b/include/IGUITable.h index ea3afccc..b6377633 100644 --- a/include/IGUITable.h +++ b/include/IGUITable.h @@ -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 __I_GUI_TABLE_H_INCLUDED__ -#define __I_GUI_TABLE_H_INCLUDED__ +#ifndef IRR_I_GUI_TABLE_H_INCLUDED +#define IRR_I_GUI_TABLE_H_INCLUDED #include "IGUIElement.h" #include "SColor.h" @@ -232,4 +232,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUIToolbar.h b/include/IGUIToolbar.h index 58796bf4..05dd6530 100644 --- a/include/IGUIToolbar.h +++ b/include/IGUIToolbar.h @@ -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 __I_GUI_TOOL_BAR_H_INCLUDED__ -#define __I_GUI_TOOL_BAR_H_INCLUDED__ +#ifndef IRR_I_GUI_TOOL_BAR_H_INCLUDED +#define IRR_I_GUI_TOOL_BAR_H_INCLUDED #include "IGUIElement.h" @@ -37,4 +37,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUITreeView.h b/include/IGUITreeView.h index 8bcd824d..d08b041d 100644 --- a/include/IGUITreeView.h +++ b/include/IGUITreeView.h @@ -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 __I_GUI_TREE_VIEW_H_INCLUDED__ -#define __I_GUI_TREE_VIEW_H_INCLUDED__ +#ifndef IRR_I_GUI_TREE_VIEW_H_INCLUDED +#define IRR_I_GUI_TREE_VIEW_H_INCLUDED #include "IGUIElement.h" #include "IGUIImageList.h" @@ -80,7 +80,7 @@ namespace gui //! removes all children (recursive) from this node /** \deprecated Deprecated in 1.8, use clearChildren() instead. This method may be removed by Irrlicht 1.9 */ - _IRR_DEPRECATED_ void clearChilds() + IRR_DEPRECATED void clearChilds() { return clearChildren(); } @@ -91,7 +91,7 @@ namespace gui //! returns true if this node has child nodes /** \deprecated Deprecated in 1.8, use hasChildren() instead. This method may be removed by Irrlicht 1.9 */ - _IRR_DEPRECATED_ bool hasChilds() const + IRR_DEPRECATED bool hasChilds() const { return hasChildren(); } @@ -295,4 +295,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGUIWindow.h b/include/IGUIWindow.h index 60349d67..88723b00 100644 --- a/include/IGUIWindow.h +++ b/include/IGUIWindow.h @@ -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 __I_GUI_WINDOW_H_INCLUDED__ -#define __I_GUI_WINDOW_H_INCLUDED__ +#ifndef IRR_I_GUI_WINDOW_H_INCLUDED +#define IRR_I_GUI_WINDOW_H_INCLUDED #include "IGUIElement.h" #include "EMessageBoxFlags.h" @@ -71,4 +71,3 @@ namespace gui } // end namespace irr #endif - diff --git a/include/IGeometryCreator.h b/include/IGeometryCreator.h index 6b711fea..7a4bdf87 100644 --- a/include/IGeometryCreator.h +++ b/include/IGeometryCreator.h @@ -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 __I_GEOMETRY_CREATOR_H_INCLUDED__ -#define __I_GEOMETRY_CREATOR_H_INCLUDED__ +#ifndef IRR_I_GEOMETRY_CREATOR_H_INCLUDED +#define IRR_I_GEOMETRY_CREATOR_H_INCLUDED #include "IReferenceCounted.h" #include "IMesh.h" @@ -225,5 +225,4 @@ public: } // end namespace scene } // end namespace irr -#endif // __I_GEOMETRY_CREATOR_H_INCLUDED__ - +#endif // IRR_I_GEOMETRY_CREATOR_H_INCLUDED diff --git a/include/IImage.h b/include/IImage.h index 3d4d5fa0..81cd24a5 100644 --- a/include/IImage.h +++ b/include/IImage.h @@ -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 __I_IMAGE_H_INCLUDED__ -#define __I_IMAGE_H_INCLUDED__ +#ifndef IRR_I_IMAGE_H_INCLUDED +#define IRR_I_IMAGE_H_INCLUDED #include "IReferenceCounted.h" #include "position2d.h" @@ -190,7 +190,7 @@ public: depends on the color format of the image. For example if the color format is ECF_A8R8G8B8, it is of u32. Be sure to call unlock() after you don't need the pointer any more. */ - _IRR_DEPRECATED_ void* lock() + IRR_DEPRECATED void* lock() { return getData(); } @@ -198,7 +198,7 @@ public: //! Unlock function. /** Should be called after the pointer received by lock() is not needed anymore. */ - _IRR_DEPRECATED_ void unlock() + IRR_DEPRECATED void unlock() { } @@ -363,14 +363,14 @@ public: virtual void fill(const SColor &color) =0; //! Inform whether the image is compressed - _IRR_DEPRECATED_ bool isCompressed() const + IRR_DEPRECATED bool isCompressed() const { return IImage::isCompressedFormat(Format); } //! Check whether the image has MipMaps /** \return True if image has MipMaps, else false. */ - _IRR_DEPRECATED_ bool hasMipMaps() const + IRR_DEPRECATED bool hasMipMaps() const { return (getMipMapsData() != 0); } @@ -589,4 +589,3 @@ protected: } // end namespace irr #endif - diff --git a/include/IImageLoader.h b/include/IImageLoader.h index 13eef977..ad936c0e 100644 --- a/include/IImageLoader.h +++ b/include/IImageLoader.h @@ -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 __I_SURFACE_LOADER_H_INCLUDED__ -#define __I_SURFACE_LOADER_H_INCLUDED__ +#ifndef IRR_I_SURFACE_LOADER_H_INCLUDED +#define IRR_I_SURFACE_LOADER_H_INCLUDED #include "IReferenceCounted.h" #include "IImage.h" @@ -63,4 +63,3 @@ public: } // end namespace irr #endif - diff --git a/include/IImageWriter.h b/include/IImageWriter.h index 884a488e..7ac8ada1 100644 --- a/include/IImageWriter.h +++ b/include/IImageWriter.h @@ -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 _I_IMAGE_WRITER_H_INCLUDED__ -#define _I_IMAGE_WRITER_H_INCLUDED__ +#ifndef IRR_I_IMAGE_WRITER_H_INCLUDED +#define IRR_I_IMAGE_WRITER_H_INCLUDED #include "IReferenceCounted.h" #include "irrString.h" @@ -41,5 +41,4 @@ public: } // namespace video } // namespace irr -#endif // _I_IMAGE_WRITER_H_INCLUDED__ - +#endif // IRR_I_IMAGE_WRITER_H_INCLUDED diff --git a/include/IIndexBuffer.h b/include/IIndexBuffer.h index 6aee1a1d..d1bb961a 100644 --- a/include/IIndexBuffer.h +++ b/include/IIndexBuffer.h @@ -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 __I_INDEX_BUFFER_H_INCLUDED__ -#define __I_INDEX_BUFFER_H_INCLUDED__ +#ifndef IRR_I_INDEX_BUFFER_H_INCLUDED +#define IRR_I_INDEX_BUFFER_H_INCLUDED #include "IReferenceCounted.h" #include "irrArray.h" @@ -13,11 +13,6 @@ namespace irr { -namespace video -{ - -} - namespace scene { @@ -62,4 +57,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ILightManager.h b/include/ILightManager.h index 297e981b..ad8988c8 100644 --- a/include/ILightManager.h +++ b/include/ILightManager.h @@ -3,8 +3,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_LIGHT_MANAGER_H_INCLUDED__ -#define __I_LIGHT_MANAGER_H_INCLUDED__ +#ifndef IRR_I_LIGHT_MANAGER_H_INCLUDED +#define IRR_I_LIGHT_MANAGER_H_INCLUDED #include "IReferenceCounted.h" #include "irrArray.h" diff --git a/include/ILightSceneNode.h b/include/ILightSceneNode.h index 62533a0d..ccf7cdb9 100644 --- a/include/ILightSceneNode.h +++ b/include/ILightSceneNode.h @@ -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 __I_LIGHT_SCENE_NODE_H_INCLUDED__ -#define __I_LIGHT_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_LIGHT_SCENE_NODE_H_INCLUDED +#define IRR_I_LIGHT_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" #include "SLight.h" @@ -84,4 +84,3 @@ public: #endif - diff --git a/include/ILogger.h b/include/ILogger.h index b6c9f6f0..4f4210c9 100644 --- a/include/ILogger.h +++ b/include/ILogger.h @@ -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 __I_LOGGER_H_INCLUDED__ -#define __I_LOGGER_H_INCLUDED__ +#ifndef IRR_I_LOGGER_H_INCLUDED +#define IRR_I_LOGGER_H_INCLUDED #include "IReferenceCounted.h" @@ -99,4 +99,3 @@ public: } // end namespace #endif - diff --git a/include/IMaterialRenderer.h b/include/IMaterialRenderer.h index f23d0284..8ada1530 100644 --- a/include/IMaterialRenderer.h +++ b/include/IMaterialRenderer.h @@ -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 __I_MATERIAL_RENDERER_H_INCLUDED__ -#define __I_MATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_I_MATERIAL_RENDERER_H_INCLUDED +#define IRR_I_MATERIAL_RENDERER_H_INCLUDED #include "IReferenceCounted.h" #include "SMaterial.h" @@ -104,4 +104,3 @@ public: } // end namespace irr #endif - diff --git a/include/IMaterialRendererServices.h b/include/IMaterialRendererServices.h index f57e4198..69b9fe75 100644 --- a/include/IMaterialRendererServices.h +++ b/include/IMaterialRendererServices.h @@ -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 __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__ -#define __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__ +#ifndef IRR_I_MATERIAL_RENDERER_SERVICES_H_INCLUDED +#define IRR_I_MATERIAL_RENDERER_SERVICES_H_INCLUDED #include "SMaterial.h" #include "S3DVertex.h" @@ -28,7 +28,7 @@ public: /** Sets all basic renderstates if needed. Basic render states are diffuse, ambient, specular, and emissive color, specular power, bilinear and trilinear filtering, wireframe mode, - grouraudshading, lighting, zbuffer, zwriteenable, backfaceculling and + gouraudshading, lighting, zbuffer, zwriteenable, backfaceculling and fog enabling. \param material The new material to be used. \param lastMaterial The material used until now. @@ -116,25 +116,25 @@ public: virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) = 0; //! \deprecated. This method may be removed by Irrlicht 2.0 - _IRR_DEPRECATED_ bool setVertexShaderConstant(const c8* name, const f32* floats, int count) + IRR_DEPRECATED bool setVertexShaderConstant(const c8* name, const f32* floats, int count) { return setVertexShaderConstant(getVertexShaderConstantID(name), floats, count); } //! \deprecated. This method may be removed by Irrlicht 2.0 - _IRR_DEPRECATED_ bool setVertexShaderConstant(const c8* name, const s32* ints, int count) + IRR_DEPRECATED bool setVertexShaderConstant(const c8* name, const s32* ints, int count) { return setVertexShaderConstant(getVertexShaderConstantID(name), ints, count); } //! \deprecated. This method may be removed by Irrlicht 2.0 - _IRR_DEPRECATED_ bool setPixelShaderConstant(const c8* name, const f32* floats, int count) + IRR_DEPRECATED bool setPixelShaderConstant(const c8* name, const f32* floats, int count) { return setPixelShaderConstant(getPixelShaderConstantID(name), floats, count); } //! \deprecated. This method may be removed by Irrlicht 2.0 - _IRR_DEPRECATED_ bool setPixelShaderConstant(const c8* name, const s32* ints, int count) + IRR_DEPRECATED bool setPixelShaderConstant(const c8* name, const s32* ints, int count) { return setPixelShaderConstant(getPixelShaderConstantID(name), ints, count); } @@ -148,4 +148,3 @@ public: } // end namespace irr #endif - diff --git a/include/IMemoryReadFile.h b/include/IMemoryReadFile.h index 435cfa53..1f471a31 100644 --- a/include/IMemoryReadFile.h +++ b/include/IMemoryReadFile.h @@ -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 __I_MEMORY_READ_FILE_H_INCLUDED__ -#define __I_MEMORY_READ_FILE_H_INCLUDED__ +#ifndef IRR_I_MEMORY_READ_FILE_H_INCLUDED +#define IRR_I_MEMORY_READ_FILE_H_INCLUDED #include "IReadFile.h" @@ -28,4 +28,3 @@ namespace io } // end namespace irr #endif - diff --git a/include/IMesh.h b/include/IMesh.h index 227ef509..cb6dba59 100644 --- a/include/IMesh.h +++ b/include/IMesh.h @@ -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 __I_MESH_H_INCLUDED__ -#define __I_MESH_H_INCLUDED__ +#ifndef IRR_I_MESH_H_INCLUDED +#define IRR_I_MESH_H_INCLUDED #include "IReferenceCounted.h" #include "SMaterial.h" @@ -120,7 +120,7 @@ namespace scene if getMeshType() returns EAMT_MD2 it's safe to cast the IMesh to IAnimatedMeshMD2. Note: It's no longer just about animated meshes, that name has just historical reasons. - \returns Type of the mesh */ + \return Type of the mesh */ virtual E_ANIMATED_MESH_TYPE getMeshType() const { return EAMT_STATIC; @@ -131,4 +131,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/IMeshBuffer.h b/include/IMeshBuffer.h index 488eb029..8b14177a 100644 --- a/include/IMeshBuffer.h +++ b/include/IMeshBuffer.h @@ -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 __I_MESH_BUFFER_H_INCLUDED__ -#define __I_MESH_BUFFER_H_INCLUDED__ +#ifndef IRR_I_MESH_BUFFER_H_INCLUDED +#define IRR_I_MESH_BUFFER_H_INCLUDED #include "IReferenceCounted.h" #include "SMaterial.h" diff --git a/include/IMeshCache.h b/include/IMeshCache.h index 8916d77d..828ba156 100644 --- a/include/IMeshCache.h +++ b/include/IMeshCache.h @@ -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 __I_MESH_CACHE_H_INCLUDED__ -#define __I_MESH_CACHE_H_INCLUDED__ +#ifndef IRR_I_MESH_CACHE_H_INCLUDED +#define IRR_I_MESH_CACHE_H_INCLUDED #include "IReferenceCounted.h" #include "path.h" @@ -81,7 +81,7 @@ namespace scene //! Returns a mesh based on its name (often a filename). /** \deprecated Use getMeshByName() instead. This method may be removed by Irrlicht 1.9 */ - _IRR_DEPRECATED_ IAnimatedMesh* getMeshByFilename(const io::path& filename) + IRR_DEPRECATED IAnimatedMesh* getMeshByFilename(const io::path& filename) { return getMeshByName(filename); } @@ -89,7 +89,7 @@ namespace scene //! Get the name of a loaded mesh, based on its index. (Name is often identical to the filename). /** \deprecated Use getMeshName() instead. This method may be removed by Irrlicht 1.9 */ - _IRR_DEPRECATED_ const io::path& getMeshFilename(u32 index) const + IRR_DEPRECATED const io::path& getMeshFilename(u32 index) const { return getMeshName(index).getInternalName(); } @@ -97,7 +97,7 @@ namespace scene //! Get the name of a loaded mesh, if there is any. (Name is often identical to the filename). /** \deprecated Use getMeshName() instead. This method may be removed by Irrlicht 1.9 */ - _IRR_DEPRECATED_ const io::path& getMeshFilename(const IMesh* const mesh) const + IRR_DEPRECATED const io::path& getMeshFilename(const IMesh* const mesh) const { return getMeshName(mesh).getInternalName(); } @@ -105,7 +105,7 @@ namespace scene //! Renames a loaded mesh. /** \deprecated Use renameMesh() instead. This method may be removed by Irrlicht 1.9 */ - _IRR_DEPRECATED_ bool setMeshFilename(u32 index, const io::path& filename) + IRR_DEPRECATED bool setMeshFilename(u32 index, const io::path& filename) { return renameMesh(index, filename); } @@ -113,7 +113,7 @@ namespace scene //! Renames a loaded mesh. /** \deprecated Use renameMesh() instead. This method may be removed by Irrlicht 1.9 */ - _IRR_DEPRECATED_ bool setMeshFilename(const IMesh* const mesh, const io::path& filename) + IRR_DEPRECATED bool setMeshFilename(const IMesh* const mesh, const io::path& filename) { return renameMesh(mesh, filename); } @@ -174,4 +174,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/IMeshLoader.h b/include/IMeshLoader.h index f81f3307..25df3efe 100644 --- a/include/IMeshLoader.h +++ b/include/IMeshLoader.h @@ -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 __I_MESH_LOADER_H_INCLUDED__ -#define __I_MESH_LOADER_H_INCLUDED__ +#ifndef IRR_I_MESH_LOADER_H_INCLUDED +#define IRR_I_MESH_LOADER_H_INCLUDED #include "IReferenceCounted.h" #include "path.h" diff --git a/include/IMeshManipulator.h b/include/IMeshManipulator.h index 8ff59564..f53a651d 100644 --- a/include/IMeshManipulator.h +++ b/include/IMeshManipulator.h @@ -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 __I_MESH_MANIPULATOR_H_INCLUDED__ -#define __I_MESH_MANIPULATOR_H_INCLUDED__ +#ifndef IRR_I_MESH_MANIPULATOR_H_INCLUDED +#define IRR_I_MESH_MANIPULATOR_H_INCLUDED #include "IReferenceCounted.h" #include "vector3d.h" @@ -122,7 +122,7 @@ namespace scene /** \deprecated Use scale() instead. This method may be removed by Irrlicht 1.9 \param mesh Mesh on which the operation is performed. \param factor Scale factor for each axis. */ - _IRR_DEPRECATED_ void scaleMesh(IMesh* mesh, const core::vector3df& factor) const {return scale(mesh,factor);} + IRR_DEPRECATED void scaleMesh(IMesh* mesh, const core::vector3df& factor) const {return scale(mesh,factor);} //! Scale the texture coords of a mesh. /** \param mesh Mesh on which the operation is performed. @@ -188,7 +188,7 @@ namespace scene /** \deprecated Use transform() instead. This method may be removed by Irrlicht 1.9 \param mesh Mesh on which the operation is performed. \param m transformation matrix. */ - _IRR_DEPRECATED_ virtual void transformMesh(IMesh* mesh, const core::matrix4& m) const {return transform(mesh,m);} + IRR_DEPRECATED virtual void transformMesh(IMesh* mesh, const core::matrix4& m) const {return transform(mesh,m);} //! Creates a planar texture mapping on the mesh /** \param mesh: Mesh on which the operation is performed. @@ -441,5 +441,4 @@ protected: } // end namespace scene } // end namespace irr - #endif diff --git a/include/IMeshSceneNode.h b/include/IMeshSceneNode.h index 03c5c522..990e1da4 100644 --- a/include/IMeshSceneNode.h +++ b/include/IMeshSceneNode.h @@ -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 __I_MESH_SCENE_NODE_H_INCLUDED__ -#define __I_MESH_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_MESH_SCENE_NODE_H_INCLUDED +#define IRR_I_MESH_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" @@ -78,6 +78,4 @@ public: } // end namespace scene } // end namespace irr - #endif - diff --git a/include/IMeshTextureLoader.h b/include/IMeshTextureLoader.h index 92df7b0d..9f6a079d 100644 --- a/include/IMeshTextureLoader.h +++ b/include/IMeshTextureLoader.h @@ -1,8 +1,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef IRR_I_MESH_TEXTURE_LOADER_H_INCLUDED__ -#define IRR_I_MESH_TEXTURE_LOADER_H_INCLUDED__ +#ifndef IRR_I_MESH_TEXTURE_LOADER_H_INCLUDED +#define IRR_I_MESH_TEXTURE_LOADER_H_INCLUDED #include "path.h" #include "IReferenceCounted.h" diff --git a/include/IMeshWriter.h b/include/IMeshWriter.h index 8394c922..597453be 100644 --- a/include/IMeshWriter.h +++ b/include/IMeshWriter.h @@ -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 __IRR_I_MESH_WRITER_H_INCLUDED__ -#define __IRR_I_MESH_WRITER_H_INCLUDED__ +#ifndef IRR_I_MESH_WRITER_H_INCLUDED +#define IRR_I_MESH_WRITER_H_INCLUDED #include "IReferenceCounted.h" #include "EMeshWriterEnums.h" @@ -55,4 +55,3 @@ namespace scene } // end namespace #endif - diff --git a/include/IMetaTriangleSelector.h b/include/IMetaTriangleSelector.h index 2cbb385c..ffdceeb9 100644 --- a/include/IMetaTriangleSelector.h +++ b/include/IMetaTriangleSelector.h @@ -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 __I_META_TRIANGLE_SELECTOR_H_INCLUDED__ -#define __I_META_TRIANGLE_SELECTOR_H_INCLUDED__ +#ifndef IRR_I_META_TRIANGLE_SELECTOR_H_INCLUDED +#define IRR_I_META_TRIANGLE_SELECTOR_H_INCLUDED #include "ITriangleSelector.h" @@ -38,6 +38,4 @@ public: } // end namespace scene } // end namespace irr - #endif - diff --git a/include/IOSOperator.h b/include/IOSOperator.h index eeb1856d..c62cc18c 100644 --- a/include/IOSOperator.h +++ b/include/IOSOperator.h @@ -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 __I_OS_OPERATOR_H_INCLUDED__ -#define __I_OS_OPERATOR_H_INCLUDED__ +#ifndef IRR_I_OS_OPERATOR_H_INCLUDED +#define IRR_I_OS_OPERATOR_H_INCLUDED #include "IReferenceCounted.h" #include "irrString.h" @@ -20,7 +20,7 @@ public: //! Get the current operation system version as string. /** \deprecated Use getOperatingSystemVersion instead. This method will be removed in Irrlicht 1.9. */ - _IRR_DEPRECATED_ const wchar_t* getOperationSystemVersion() const + IRR_DEPRECATED const wchar_t* getOperationSystemVersion() const { return core::stringw(getOperatingSystemVersion()).c_str(); } diff --git a/include/IOctreeSceneNode.h b/include/IOctreeSceneNode.h index 352a274a..d4bc7a35 100644 --- a/include/IOctreeSceneNode.h +++ b/include/IOctreeSceneNode.h @@ -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 __I_OCTREE_SCENE_NODE_H_INCLUDED__ -#define __I_OCTREE_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_OCTREE_SCENE_NODE_H_INCLUDED +#define IRR_I_OCTREE_SCENE_NODE_H_INCLUDED #include "IMeshSceneNode.h" @@ -78,6 +78,4 @@ public: } // end namespace scene } // end namespace irr - #endif - diff --git a/include/IParticleAffector.h b/include/IParticleAffector.h index e2b83e8f..f35c8555 100644 --- a/include/IParticleAffector.h +++ b/include/IParticleAffector.h @@ -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 __I_PARTICLE_AFFECTOR_H_INCLUDED__ -#define __I_PARTICLE_AFFECTOR_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_AFFECTOR_H_INCLUDED +#define IRR_I_PARTICLE_AFFECTOR_H_INCLUDED #include "IAttributeExchangingObject.h" #include "SParticle.h" @@ -67,6 +67,4 @@ protected: } // end namespace scene } // end namespace irr - #endif - diff --git a/include/IParticleAnimatedMeshSceneNodeEmitter.h b/include/IParticleAnimatedMeshSceneNodeEmitter.h index 0e0646f2..3ac92d39 100644 --- a/include/IParticleAnimatedMeshSceneNodeEmitter.h +++ b/include/IParticleAnimatedMeshSceneNodeEmitter.h @@ -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 __I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__ -#define __I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED +#define IRR_I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED #include "IParticleEmitter.h" #include "IAnimatedMeshSceneNode.h" @@ -43,12 +43,10 @@ public: virtual bool getEveryMeshVertex() const = 0; //! Get emitter type - virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_ANIMATED_MESH; } + virtual E_PARTICLE_EMITTER_TYPE getType() const IRR_OVERRIDE { return EPET_ANIMATED_MESH; } }; } // end namespace scene } // end namespace irr - -#endif // __I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__ - +#endif // IRR_I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED diff --git a/include/IParticleAttractionAffector.h b/include/IParticleAttractionAffector.h index e858f8ac..9db26459 100644 --- a/include/IParticleAttractionAffector.h +++ b/include/IParticleAttractionAffector.h @@ -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 __I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__ -#define __I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED +#define IRR_I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED #include "IParticleAffector.h" @@ -54,12 +54,10 @@ public: virtual bool getAffectZ() const = 0; //! Get emitter type - virtual E_PARTICLE_AFFECTOR_TYPE getType() const _IRR_OVERRIDE_ { return EPAT_ATTRACT; } + virtual E_PARTICLE_AFFECTOR_TYPE getType() const IRR_OVERRIDE { return EPAT_ATTRACT; } }; } // end namespace scene } // end namespace irr - -#endif // __I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__ - +#endif // IRR_I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED diff --git a/include/IParticleBoxEmitter.h b/include/IParticleBoxEmitter.h index 10790bf8..470e8a7f 100644 --- a/include/IParticleBoxEmitter.h +++ b/include/IParticleBoxEmitter.h @@ -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 __I_PARTICLE_BOX_EMITTER_H_INCLUDED__ -#define __I_PARTICLE_BOX_EMITTER_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_BOX_EMITTER_H_INCLUDED +#define IRR_I_PARTICLE_BOX_EMITTER_H_INCLUDED #include "IParticleEmitter.h" #include "aabbox3d.h" @@ -25,12 +25,10 @@ public: virtual const core::aabbox3df& getBox() const = 0; //! Get emitter type - virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_BOX; } + virtual E_PARTICLE_EMITTER_TYPE getType() const IRR_OVERRIDE { return EPET_BOX; } }; } // end namespace scene } // end namespace irr - #endif - diff --git a/include/IParticleCylinderEmitter.h b/include/IParticleCylinderEmitter.h index ca42defe..8f71b477 100644 --- a/include/IParticleCylinderEmitter.h +++ b/include/IParticleCylinderEmitter.h @@ -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 __I_PARTICLE_CYLINDER_EMITTER_H_INCLUDED__ -#define __I_PARTICLE_CYLINDER_EMITTER_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_CYLINDER_EMITTER_H_INCLUDED +#define IRR_I_PARTICLE_CYLINDER_EMITTER_H_INCLUDED #include "IParticleEmitter.h" @@ -48,12 +48,10 @@ public: virtual bool getOutlineOnly() const = 0; //! Get emitter type - virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_CYLINDER; } + virtual E_PARTICLE_EMITTER_TYPE getType() const IRR_OVERRIDE { return EPET_CYLINDER; } }; } // end namespace scene } // end namespace irr - #endif - diff --git a/include/IParticleEmitter.h b/include/IParticleEmitter.h index 4e54e85d..0c6b5b6a 100644 --- a/include/IParticleEmitter.h +++ b/include/IParticleEmitter.h @@ -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 __I_PARTICLE_EMITTER_H_INCLUDED__ -#define __I_PARTICLE_EMITTER_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_EMITTER_H_INCLUDED +#define IRR_I_PARTICLE_EMITTER_H_INCLUDED #include "IAttributeExchangingObject.h" #include "SParticle.h" @@ -123,6 +123,4 @@ typedef IParticleEmitter IParticlePointEmitter; } // end namespace scene } // end namespace irr - #endif - diff --git a/include/IParticleFadeOutAffector.h b/include/IParticleFadeOutAffector.h index 67000c0b..b2d4c839 100644 --- a/include/IParticleFadeOutAffector.h +++ b/include/IParticleFadeOutAffector.h @@ -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 __I_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED__ -#define __I_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED +#define IRR_I_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED #include "IParticleAffector.h" @@ -30,12 +30,10 @@ public: virtual u32 getFadeOutTime() const = 0; //! Get emitter type - virtual E_PARTICLE_AFFECTOR_TYPE getType() const _IRR_OVERRIDE_ { return EPAT_FADE_OUT; } + virtual E_PARTICLE_AFFECTOR_TYPE getType() const IRR_OVERRIDE { return EPAT_FADE_OUT; } }; } // end namespace scene } // end namespace irr - #endif // __I_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED__ - diff --git a/include/IParticleGravityAffector.h b/include/IParticleGravityAffector.h index be2c244b..40055c2c 100644 --- a/include/IParticleGravityAffector.h +++ b/include/IParticleGravityAffector.h @@ -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 __I_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED__ -#define __I_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED +#define IRR_I_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED #include "IParticleAffector.h" @@ -31,12 +31,10 @@ public: virtual const core::vector3df& getGravity() const = 0; //! Get emitter type - virtual E_PARTICLE_AFFECTOR_TYPE getType() const _IRR_OVERRIDE_ { return EPAT_GRAVITY; } + virtual E_PARTICLE_AFFECTOR_TYPE getType() const IRR_OVERRIDE { return EPAT_GRAVITY; } }; } // end namespace scene } // end namespace irr - -#endif // __I_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED__ - +#endif // IRR_I_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED diff --git a/include/IParticleMeshEmitter.h b/include/IParticleMeshEmitter.h index 7f078064..148fa930 100644 --- a/include/IParticleMeshEmitter.h +++ b/include/IParticleMeshEmitter.h @@ -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 __I_PARTICLE_MESH_EMITTER_H_INCLUDED__ -#define __I_PARTICLE_MESH_EMITTER_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_MESH_EMITTER_H_INCLUDED +#define IRR_I_PARTICLE_MESH_EMITTER_H_INCLUDED #include "IParticleEmitter.h" #include "IMesh.h" @@ -43,12 +43,10 @@ public: virtual bool getEveryMeshVertex() const = 0; //! Get emitter type - virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_MESH; } + virtual E_PARTICLE_EMITTER_TYPE getType() const IRR_OVERRIDE { return EPET_MESH; } }; } // end namespace scene } // end namespace irr - #endif - diff --git a/include/IParticleRingEmitter.h b/include/IParticleRingEmitter.h index 7828b898..bc1ed528 100644 --- a/include/IParticleRingEmitter.h +++ b/include/IParticleRingEmitter.h @@ -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 __I_PARTICLE_RING_EMITTER_H_INCLUDED__ -#define __I_PARTICLE_RING_EMITTER_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_RING_EMITTER_H_INCLUDED +#define IRR_I_PARTICLE_RING_EMITTER_H_INCLUDED #include "IParticleEmitter.h" @@ -36,12 +36,10 @@ public: virtual f32 getRingThickness() const = 0; //! Get emitter type - virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_RING; } + virtual E_PARTICLE_EMITTER_TYPE getType() const IRR_OVERRIDE { return EPET_RING; } }; } // end namespace scene } // end namespace irr - #endif - diff --git a/include/IParticleRotationAffector.h b/include/IParticleRotationAffector.h index 374a2682..77780807 100644 --- a/include/IParticleRotationAffector.h +++ b/include/IParticleRotationAffector.h @@ -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 __I_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED__ -#define __I_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED +#define IRR_I_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED #include "IParticleAffector.h" @@ -30,12 +30,10 @@ public: virtual const core::vector3df& getSpeed() const = 0; //! Get emitter type - virtual E_PARTICLE_AFFECTOR_TYPE getType() const _IRR_OVERRIDE_ { return EPAT_ROTATE; } + virtual E_PARTICLE_AFFECTOR_TYPE getType() const IRR_OVERRIDE { return EPAT_ROTATE; } }; } // end namespace scene } // end namespace irr - -#endif // __I_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED__ - +#endif // IRR_I_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED diff --git a/include/IParticleSphereEmitter.h b/include/IParticleSphereEmitter.h index 1bfe98c3..1c39db73 100644 --- a/include/IParticleSphereEmitter.h +++ b/include/IParticleSphereEmitter.h @@ -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 __I_PARTICLE_SPHERE_EMITTER_H_INCLUDED__ -#define __I_PARTICLE_SPHERE_EMITTER_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_SPHERE_EMITTER_H_INCLUDED +#define IRR_I_PARTICLE_SPHERE_EMITTER_H_INCLUDED #include "IParticleEmitter.h" @@ -30,12 +30,10 @@ public: virtual f32 getRadius() const = 0; //! Get emitter type - virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_SPHERE; } + virtual E_PARTICLE_EMITTER_TYPE getType() const IRR_OVERRIDE { return EPET_SPHERE; } }; } // end namespace scene } // end namespace irr - #endif - diff --git a/include/IParticleSystemSceneNode.h b/include/IParticleSystemSceneNode.h index b124cbc5..56826bd3 100644 --- a/include/IParticleSystemSceneNode.h +++ b/include/IParticleSystemSceneNode.h @@ -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 __I_PARTICLE_SYSTEM_SCENE_NODE_H_INCLUDED__ -#define __I_PARTICLE_SYSTEM_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_PARTICLE_SYSTEM_SCENE_NODE_H_INCLUDED +#define IRR_I_PARTICLE_SYSTEM_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" #include "IParticleAnimatedMeshSceneNodeEmitter.h" @@ -551,13 +551,13 @@ public: const core::vector3df& pivotPoint = core::vector3df(0.0f,0.0f,0.0f) ) = 0; //! 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 { out->addInt("ParticleBehavior", ParticleBehavior); } //! 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 { ParticleBehavior = in->getAttributeAsInt("ParticleBehavior", ParticleBehavior); } diff --git a/include/IProfiler.h b/include/IProfiler.h index c2e837db..bfc24301 100644 --- a/include/IProfiler.h +++ b/include/IProfiler.h @@ -2,8 +2,8 @@ // For conditions of distribution and use, see copyright notice in irrlicht.h // Written by Michael Zeilfelder -#ifndef __I_PROFILER_H_INCLUDED__ -#define __I_PROFILER_H_INCLUDED__ +#ifndef IRR_I_PROFILER_H_INCLUDED +#define IRR_I_PROFILER_H_INCLUDED #include "IrrCompileConfig.h" #include "irrString.h" @@ -477,4 +477,4 @@ void IProfiler::resetAll() } // namespace irr -#endif // __I_PROFILER_H_INCLUDED__ +#endif // IRR_I_PROFILER_H_INCLUDED diff --git a/include/IQ3LevelMesh.h b/include/IQ3LevelMesh.h index 62feffc6..65cda3ee 100644 --- a/include/IQ3LevelMesh.h +++ b/include/IQ3LevelMesh.h @@ -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 __I_Q3_LEVEL_MESH_H_INCLUDED__ -#define __I_Q3_LEVEL_MESH_H_INCLUDED__ +#ifndef IRR_I_Q3_LEVEL_MESH_H_INCLUDED +#define IRR_I_Q3_LEVEL_MESH_H_INCLUDED #include "IAnimatedMesh.h" #include "IQ3Shader.h" @@ -43,4 +43,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/IQ3Shader.h b/include/IQ3Shader.h index d4108f63..31b3c2df 100644 --- a/include/IQ3Shader.h +++ b/include/IQ3Shader.h @@ -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 __I_Q3_LEVEL_SHADER_H_INCLUDED__ -#define __I_Q3_LEVEL_SHADER_H_INCLUDED__ +#ifndef IRR_I_Q3_LEVEL_SHADER_H_INCLUDED +#define IRR_I_Q3_LEVEL_SHADER_H_INCLUDED #include "irrArray.h" #include "fast_atof.h" @@ -879,4 +879,3 @@ namespace quake3 } // end namespace irr #endif - diff --git a/include/IRandomizer.h b/include/IRandomizer.h index a0c07301..9b5fb120 100644 --- a/include/IRandomizer.h +++ b/include/IRandomizer.h @@ -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 __I_RANDOMIZER_H_INCLUDED__ -#define __I_RANDOMIZER_H_INCLUDED__ +#ifndef IRR_I_RANDOMIZER_H_INCLUDED +#define IRR_I_RANDOMIZER_H_INCLUDED #include "IReferenceCounted.h" @@ -24,7 +24,7 @@ public: //! generates a pseudo random number in the range 0..1 virtual f32 frand() const =0; - //! get maxmimum number generated by rand() + //! get maximum number generated by rand() virtual s32 randMax() const =0; }; diff --git a/include/IReadFile.h b/include/IReadFile.h index f3de9ebb..f90a4544 100644 --- a/include/IReadFile.h +++ b/include/IReadFile.h @@ -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 __I_READ_FILE_H_INCLUDED__ -#define __I_READ_FILE_H_INCLUDED__ +#ifndef IRR_I_READ_FILE_H_INCLUDED +#define IRR_I_READ_FILE_H_INCLUDED #include "IReferenceCounted.h" #include "coreutil.h" @@ -58,4 +58,3 @@ namespace io } // end namespace irr #endif - diff --git a/include/IReferenceCounted.h b/include/IReferenceCounted.h index 42dfc92a..fe4659d2 100644 --- a/include/IReferenceCounted.h +++ b/include/IReferenceCounted.h @@ -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 __I_IREFERENCE_COUNTED_H_INCLUDED__ -#define __I_IREFERENCE_COUNTED_H_INCLUDED__ +#ifndef IRR_I_IREFERENCE_COUNTED_H_INCLUDED +#define IRR_I_IREFERENCE_COUNTED_H_INCLUDED #include "irrTypes.h" @@ -126,7 +126,7 @@ namespace irr bool drop() const { // someone is doing bad reference counting. - _IRR_DEBUG_BREAK_IF(ReferenceCounter <= 0) + IRR_DEBUG_BREAK_IF(ReferenceCounter <= 0) --ReferenceCounter; if (!ReferenceCounter) @@ -177,4 +177,3 @@ namespace irr } // end namespace irr #endif - diff --git a/include/IRenderTarget.h b/include/IRenderTarget.h index 0247f798..1a1ccd3e 100644 --- a/include/IRenderTarget.h +++ b/include/IRenderTarget.h @@ -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 __I_RENDER_TARGET_H_INCLUDED__ -#define __I_RENDER_TARGET_H_INCLUDED__ +#ifndef IRR_I_RENDER_TARGET_H_INCLUDED +#define IRR_I_RENDER_TARGET_H_INCLUDED #include "IReferenceCounted.h" #include "EDriverTypes.h" diff --git a/include/ISceneCollisionManager.h b/include/ISceneCollisionManager.h index ccfe8639..067581f2 100644 --- a/include/ISceneCollisionManager.h +++ b/include/ISceneCollisionManager.h @@ -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 __I_SCENE_COLLISION_MANAGER_H_INCLUDED__ -#define __I_SCENE_COLLISION_MANAGER_H_INCLUDED__ +#ifndef IRR_I_SCENE_COLLISION_MANAGER_H_INCLUDED +#define IRR_I_SCENE_COLLISION_MANAGER_H_INCLUDED #include "IReferenceCounted.h" #include "vector3d.h" diff --git a/include/ISceneLoader.h b/include/ISceneLoader.h index c71c15dd..fcadaa31 100644 --- a/include/ISceneLoader.h +++ b/include/ISceneLoader.h @@ -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 __I_SCENE_LOADER_H_INCLUDED__ -#define __I_SCENE_LOADER_H_INCLUDED__ +#ifndef IRR_I_SCENE_LOADER_H_INCLUDED +#define IRR_I_SCENE_LOADER_H_INCLUDED #include "IReferenceCounted.h" #include "path.h" @@ -59,4 +59,3 @@ public: } // end namespace irr #endif - diff --git a/include/ISceneManager.h b/include/ISceneManager.h index e0733b19..3df4678c 100644 --- a/include/ISceneManager.h +++ b/include/ISceneManager.h @@ -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 __I_SCENE_MANAGER_H_INCLUDED__ -#define __I_SCENE_MANAGER_H_INCLUDED__ +#ifndef IRR_I_SCENE_MANAGER_H_INCLUDED +#define IRR_I_SCENE_MANAGER_H_INCLUDED #include "IReferenceCounted.h" #include "irrArray.h" @@ -1370,7 +1370,7 @@ namespace scene //! //! Creates a Triangle Selector, optimized by an octree. /** \deprecated Use createOctreeTriangleSelector instead. This method may be removed by Irrlicht 1.9. */ - _IRR_DEPRECATED_ ITriangleSelector* createOctTreeTriangleSelector(IMesh* mesh, + IRR_DEPRECATED ITriangleSelector* createOctTreeTriangleSelector(IMesh* mesh, ISceneNode* node, s32 minimalPolysPerNode=32) { return createOctreeTriangleSelector(mesh, node, minimalPolysPerNode); @@ -1693,4 +1693,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISceneNode.h b/include/ISceneNode.h index 71910276..f26cc8a2 100644 --- a/include/ISceneNode.h +++ b/include/ISceneNode.h @@ -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 __I_SCENE_NODE_H_INCLUDED__ -#define __I_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_SCENE_NODE_H_INCLUDED +#define IRR_I_SCENE_NODE_H_INCLUDED #include "IAttributeExchangingObject.h" #include "ESceneNodeTypes.h" @@ -697,7 +697,7 @@ namespace scene \param out The attribute container to write into. \param options Additional options which might influence the serialization. */ - 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 { if (!out) return; @@ -722,7 +722,7 @@ namespace scene \param in The attribute container to read from. \param options Additional options which might influence the deserialization. */ - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_ + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE { if (!in) return; @@ -871,4 +871,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISceneNodeAnimator.h b/include/ISceneNodeAnimator.h index cdff7009..b2848652 100644 --- a/include/ISceneNodeAnimator.h +++ b/include/ISceneNodeAnimator.h @@ -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 __I_SCENE_NODE_ANIMATOR_H_INCLUDED__ -#define __I_SCENE_NODE_ANIMATOR_H_INCLUDED__ +#ifndef IRR_I_SCENE_NODE_ANIMATOR_H_INCLUDED +#define IRR_I_SCENE_NODE_ANIMATOR_H_INCLUDED #include "IReferenceCounted.h" #include "vector3d.h" @@ -55,7 +55,7 @@ namespace scene } //! Event receiver, override this function for camera controlling animators - virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_ + virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE { return false; } @@ -79,7 +79,7 @@ namespace scene This value is ignored by animators which don't work with a starttime. Known problems: CSceneNodeAnimatorRotation currently overwrites this value constantly (might be changed in the future). \param time Commonly you will use irr::ITimer::getTime(). - \param resetPauseTime Reset internal pause time for enabling/diabling animators as well + \param resetPauseTime Reset internal pause time for enabling/disabling animators as well */ virtual void setStartTime(u32 time, bool resetPauseTime=true) { @@ -129,14 +129,14 @@ namespace scene } //! 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 { out->addBool("IsEnabled", IsEnabled); // timers not serialized as they usually depend on system-time which is different on each application start. } //! 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 { IsEnabled = in->getAttributeAsBool("IsEnabled", IsEnabled); PauseTimeSum = 0; @@ -167,4 +167,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISceneNodeAnimatorCameraFPS.h b/include/ISceneNodeAnimatorCameraFPS.h index 91a00680..8caaef9d 100644 --- a/include/ISceneNodeAnimatorCameraFPS.h +++ b/include/ISceneNodeAnimatorCameraFPS.h @@ -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 __I_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED__ -#define __I_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED__ +#ifndef IRR_I_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED +#define IRR_I_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED #include "ISceneNodeAnimator.h" #include "IEventReceiver.h" @@ -72,4 +72,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISceneNodeAnimatorCameraMaya.h b/include/ISceneNodeAnimatorCameraMaya.h index a1dba263..52c02ecd 100644 --- a/include/ISceneNodeAnimatorCameraMaya.h +++ b/include/ISceneNodeAnimatorCameraMaya.h @@ -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 __I_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED__ -#define __I_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED__ +#ifndef IRR_I_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED +#define IRR_I_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED #include "ISceneNodeAnimator.h" @@ -62,4 +62,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISceneNodeAnimatorCollisionResponse.h b/include/ISceneNodeAnimatorCollisionResponse.h index 66334127..86afe05c 100644 --- a/include/ISceneNodeAnimatorCollisionResponse.h +++ b/include/ISceneNodeAnimatorCollisionResponse.h @@ -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 __I_SCENE_NODE_ANIMATOR_COLLISION_RESPONSE_H_INCLUDED__ -#define __I_SCENE_NODE_ANIMATOR_COLLISION_RESPONSE_H_INCLUDED__ +#ifndef IRR_I_SCENE_NODE_ANIMATOR_COLLISION_RESPONSE_H_INCLUDED +#define IRR_I_SCENE_NODE_ANIMATOR_COLLISION_RESPONSE_H_INCLUDED #include "ISceneNode.h" @@ -168,4 +168,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISceneNodeAnimatorFactory.h b/include/ISceneNodeAnimatorFactory.h index a50703f2..de6e5c5c 100644 --- a/include/ISceneNodeAnimatorFactory.h +++ b/include/ISceneNodeAnimatorFactory.h @@ -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 __I_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED__ -#define __I_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED__ +#ifndef IRR_I_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED +#define IRR_I_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED #include "IReferenceCounted.h" #include "ESceneNodeAnimatorTypes.h" @@ -66,4 +66,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISceneNodeFactory.h b/include/ISceneNodeFactory.h index 43043bd2..6e9f9338 100644 --- a/include/ISceneNodeFactory.h +++ b/include/ISceneNodeFactory.h @@ -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 __I_SCENE_NODE_FACTORY_H_INCLUDED__ -#define __I_SCENE_NODE_FACTORY_H_INCLUDED__ +#ifndef IRR_I_SCENE_NODE_FACTORY_H_INCLUDED +#define IRR_I_SCENE_NODE_FACTORY_H_INCLUDED #include "IReferenceCounted.h" #include "ESceneNodeTypes.h" @@ -65,4 +65,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISceneUserDataSerializer.h b/include/ISceneUserDataSerializer.h index 46b15b53..8978ce91 100644 --- a/include/ISceneUserDataSerializer.h +++ b/include/ISceneUserDataSerializer.h @@ -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 __I_SCENE_USER_DATA_SERIALIZER_H_INCLUDED__ -#define __I_SCENE_USER_DATA_SERIALIZER_H_INCLUDED__ +#ifndef IRR_I_SCENE_USER_DATA_SERIALIZER_H_INCLUDED +#define IRR_I_SCENE_USER_DATA_SERIALIZER_H_INCLUDED #include "IReferenceCounted.h" @@ -48,4 +48,3 @@ public: } // end namespace irr #endif - diff --git a/include/IShaderConstantSetCallBack.h b/include/IShaderConstantSetCallBack.h index fdf9e9af..eef3be3b 100644 --- a/include/IShaderConstantSetCallBack.h +++ b/include/IShaderConstantSetCallBack.h @@ -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 __I_SHADER_CONSTANT_SET_CALLBACT_H_INCLUDED__ -#define __I_SHADER_CONSTANT_SET_CALLBACT_H_INCLUDED__ +#ifndef IRR_I_SHADER_CONSTANT_SET_CALLBACT_H_INCLUDED +#define IRR_I_SHADER_CONSTANT_SET_CALLBACT_H_INCLUDED #include "IReferenceCounted.h" @@ -82,4 +82,3 @@ public: } // end namespace irr #endif - diff --git a/include/IShadowVolumeSceneNode.h b/include/IShadowVolumeSceneNode.h index f19e6aab..7f661cd9 100644 --- a/include/IShadowVolumeSceneNode.h +++ b/include/IShadowVolumeSceneNode.h @@ -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 __I_SHADOW_VOLUME_SCENE_NODE_H_INCLUDED__ -#define __I_SHADOW_VOLUME_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_SHADOW_VOLUME_SCENE_NODE_H_INCLUDED +#define IRR_I_SHADOW_VOLUME_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" @@ -62,4 +62,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ISkinnedMesh.h b/include/ISkinnedMesh.h index 783b26eb..baa487a7 100644 --- a/include/ISkinnedMesh.h +++ b/include/ISkinnedMesh.h @@ -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 __I_SKINNED_MESH_H_INCLUDED__ -#define __I_SKINNED_MESH_H_INCLUDED__ +#ifndef IRR_I_SKINNED_MESH_H_INCLUDED +#define IRR_I_SKINNED_MESH_H_INCLUDED #include "irrArray.h" #include "IBoneSceneNode.h" @@ -216,4 +216,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/ITerrainSceneNode.h b/include/ITerrainSceneNode.h index b0c822ce..9c14f15a 100644 --- a/include/ITerrainSceneNode.h +++ b/include/ITerrainSceneNode.h @@ -7,8 +7,8 @@ // code available for Irrlicht and allowed it to be distributed under this // licence. I only modified some parts. A lot of thanks go to them. -#ifndef __I_TERRAIN_SCENE_NODE_H__ -#define __I_TERRAIN_SCENE_NODE_H__ +#ifndef IRR_I_TERRAIN_SCENE_NODE_H +#define IRR_I_TERRAIN_SCENE_NODE_H #include "ETerrainElements.h" #include "ISceneNode.h" @@ -186,5 +186,4 @@ namespace scene } // end namespace irr -#endif // __I_TERRAIN_SCENE_NODE_H__ - +#endif // IRR_I_TERRAIN_SCENE_NODE_H diff --git a/include/ITextSceneNode.h b/include/ITextSceneNode.h index 2e12379f..113e20d5 100644 --- a/include/ITextSceneNode.h +++ b/include/ITextSceneNode.h @@ -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 __I_TEXT_SCENE_NODE_H_INCLUDED__ -#define __I_TEXT_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_TEXT_SCENE_NODE_H_INCLUDED +#define IRR_I_TEXT_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" @@ -50,6 +50,4 @@ public: } // end namespace scene } // end namespace irr - #endif - diff --git a/include/ITexture.h b/include/ITexture.h index 3976ba37..9be26775 100644 --- a/include/ITexture.h +++ b/include/ITexture.h @@ -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 __I_TEXTURE_H_INCLUDED__ -#define __I_TEXTURE_H_INCLUDED__ +#ifndef IRR_I_TEXTURE_H_INCLUDED +#define IRR_I_TEXTURE_H_INCLUDED #include "IReferenceCounted.h" #include "IImage.h" @@ -355,4 +355,3 @@ protected: } // end namespace irr #endif - diff --git a/include/ITimer.h b/include/ITimer.h index 709db975..c60c57f5 100644 --- a/include/ITimer.h +++ b/include/ITimer.h @@ -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 __I_TIMER_H_INCLUDED__ -#define __I_TIMER_H_INCLUDED__ +#ifndef IRR_I_TIMER_H_INCLUDED +#define IRR_I_TIMER_H_INCLUDED #include "IReferenceCounted.h" diff --git a/include/ITriangleSelector.h b/include/ITriangleSelector.h index 04aa0467..dcc73333 100644 --- a/include/ITriangleSelector.h +++ b/include/ITriangleSelector.h @@ -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 __I_TRIANGLE_SELECTOR_H_INCLUDED__ -#define __I_TRIANGLE_SELECTOR_H_INCLUDED__ +#ifndef IRR_I_TRIANGLE_SELECTOR_H_INCLUDED +#define IRR_I_TRIANGLE_SELECTOR_H_INCLUDED #include "IReferenceCounted.h" #include "triangle3d.h" diff --git a/include/IVertexBuffer.h b/include/IVertexBuffer.h index 8467d7c7..5c513546 100644 --- a/include/IVertexBuffer.h +++ b/include/IVertexBuffer.h @@ -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 __I_VERTEX_BUFFER_H_INCLUDED__ -#define __I_VERTEX_BUFFER_H_INCLUDED__ +#ifndef IRR_I_VERTEX_BUFFER_H_INCLUDED +#define IRR_I_VERTEX_BUFFER_H_INCLUDED #include "IReferenceCounted.h" #include "irrArray.h" @@ -50,4 +50,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/IVideoDriver.h b/include/IVideoDriver.h index 4416f9aa..26a4927f 100644 --- a/include/IVideoDriver.h +++ b/include/IVideoDriver.h @@ -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 __IRR_I_VIDEO_DRIVER_H_INCLUDED__ -#define __IRR_I_VIDEO_DRIVER_H_INCLUDED__ +#ifndef IRR_I_VIDEO_DRIVER_H_INCLUDED +#define IRR_I_VIDEO_DRIVER_H_INCLUDED #include "rect.h" #include "SColor.h" @@ -330,7 +330,7 @@ namespace video \return Pointer to the newly created texture. This pointer should not be dropped. See IReferenceCounted::drop() for more information. */ - _IRR_DEPRECATED_ ITexture* addTexture(const io::path& name, IImage* image, void* mipmapData) + IRR_DEPRECATED ITexture* addTexture(const io::path& name, IImage* image, void* mipmapData) { if (image) image->setMipMapsData(mipmapData, false, true); @@ -1260,7 +1260,7 @@ namespace video \return The created image. If you no longer need the image, you should call IImage::drop(). See IReferenceCounted::drop() for more information. */ - _IRR_DEPRECATED_ virtual IImage* createImage(ECOLOR_FORMAT format, IImage *imageToCopy) =0; + IRR_DEPRECATED virtual IImage* createImage(ECOLOR_FORMAT format, IImage *imageToCopy) =0; //! Creates a software image from a part of another image. /** \deprecated Create an empty image and use copyTo(). This method may be removed by Irrlicht 1.9. @@ -1270,7 +1270,7 @@ namespace video \return The created image. If you no longer need the image, you should call IImage::drop(). See IReferenceCounted::drop() for more information. */ - _IRR_DEPRECATED_ virtual IImage* createImage(IImage* imageToCopy, + IRR_DEPRECATED virtual IImage* createImage(IImage* imageToCopy, const core::position2d& pos, const core::dimension2d& size) =0; @@ -1400,7 +1400,7 @@ namespace video virtual void clearBuffers(u16 flag, SColor color = SColor(255,0,0,0), f32 depth = 1.f, u8 stencil = 0) = 0; //! Clear the color, depth and/or stencil buffers. - _IRR_DEPRECATED_ void clearBuffers(bool backBuffer, bool depthBuffer, bool stencilBuffer, SColor color) + IRR_DEPRECATED void clearBuffers(bool backBuffer, bool depthBuffer, bool stencilBuffer, SColor color) { u16 flag = 0; @@ -1423,7 +1423,7 @@ namespace video you have to render some special things, you can clear the zbuffer during the rendering process with this method any time. */ - _IRR_DEPRECATED_ void clearZBuffer() + IRR_DEPRECATED void clearZBuffer() { clearBuffers(ECBF_DEPTH, SColor(255,0,0,0), 1.f, 0); } diff --git a/include/IVideoModeList.h b/include/IVideoModeList.h index cc87b2e2..49e41990 100644 --- a/include/IVideoModeList.h +++ b/include/IVideoModeList.h @@ -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 __IRR_I_VIDEO_MODE_LIST_H_INCLUDED__ -#define __IRR_I_VIDEO_MODE_LIST_H_INCLUDED__ +#ifndef IRR_I_VIDEO_MODE_LIST_H_INCLUDED +#define IRR_I_VIDEO_MODE_LIST_H_INCLUDED #include "IReferenceCounted.h" #include "dimension2d.h" @@ -53,6 +53,4 @@ namespace video } // end namespace video } // end namespace irr - #endif - diff --git a/include/IVolumeLightSceneNode.h b/include/IVolumeLightSceneNode.h index d67dff58..695e07bb 100644 --- a/include/IVolumeLightSceneNode.h +++ b/include/IVolumeLightSceneNode.h @@ -4,8 +4,8 @@ // // created by Dean Wadsworth aka Varmint Dec 31 2007 -#ifndef __I_VOLUME_LIGHT_SCENE_NODE_H_INCLUDED__ -#define __I_VOLUME_LIGHT_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_I_VOLUME_LIGHT_SCENE_NODE_H_INCLUDED +#define IRR_I_VOLUME_LIGHT_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" @@ -27,7 +27,7 @@ namespace scene : ISceneNode(parent, mgr, id, position, rotation, scale) {}; //! Returns type of the scene node - virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_VOLUME_LIGHT; } + virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_VOLUME_LIGHT; } //! Sets the number of segments across the U axis virtual void setSubDivideU(const u32 inU) =0; diff --git a/include/IWriteFile.h b/include/IWriteFile.h index 5cc48352..9fdad1f1 100644 --- a/include/IWriteFile.h +++ b/include/IWriteFile.h @@ -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 __I_WRITE_FILE_H_INCLUDED__ -#define __I_WRITE_FILE_H_INCLUDED__ +#ifndef IRR_I_WRITE_FILE_H_INCLUDED +#define IRR_I_WRITE_FILE_H_INCLUDED #include "IReferenceCounted.h" #include "path.h" @@ -48,4 +48,3 @@ namespace io } // end namespace irr #endif - diff --git a/include/IXMLReader.h b/include/IXMLReader.h index 7babb454..9d343dd5 100644 --- a/include/IXMLReader.h +++ b/include/IXMLReader.h @@ -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 __I_XML_READER_H_INCLUDED__ -#define __I_XML_READER_H_INCLUDED__ +#ifndef IRR_I_XML_READER_H_INCLUDED +#define IRR_I_XML_READER_H_INCLUDED #include "IReferenceCounted.h" #include "irrXML.h" @@ -28,4 +28,3 @@ namespace io } // end namespace irr #endif - diff --git a/include/IXMLWriter.h b/include/IXMLWriter.h index 18c40e28..22986d7a 100644 --- a/include/IXMLWriter.h +++ b/include/IXMLWriter.h @@ -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 __I_XML_WRITER_H_INCLUDED__ -#define __I_XML_WRITER_H_INCLUDED__ +#ifndef IRR_I_XML_WRITER_H_INCLUDED +#define IRR_I_XML_WRITER_H_INCLUDED #include "IReferenceCounted.h" #include "irrXML.h" diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h index 1d0ba7bc..1bc01cd4 100644 --- a/include/IrrCompileConfig.h +++ b/include/IrrCompileConfig.h @@ -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 __IRR_COMPILE_CONFIG_H_INCLUDED__ -#define __IRR_COMPILE_CONFIG_H_INCLUDED__ +#ifndef IRR_COMPILE_CONFIG_H_INCLUDED +#define IRR_COMPILE_CONFIG_H_INCLUDED //! Irrlicht SDK Version #define IRRLICHT_VERSION_MAJOR 1 @@ -962,5 +962,4 @@ precision will be lower but speed higher. currently X86 only #endif #endif -#endif // __IRR_COMPILE_CONFIG_H_INCLUDED__ - +#endif // IRR_COMPILE_CONFIG_H_INCLUDED diff --git a/include/IrrlichtDevice.h b/include/IrrlichtDevice.h index ac02342b..6c850c0c 100644 --- a/include/IrrlichtDevice.h +++ b/include/IrrlichtDevice.h @@ -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 __I_IRRLICHT_DEVICE_H_INCLUDED__ -#define __I_IRRLICHT_DEVICE_H_INCLUDED__ +#ifndef IRR_I_IRRLICHT_DEVICE_H_INCLUDED +#define IRR_I_IRRLICHT_DEVICE_H_INCLUDED #include "IReferenceCounted.h" #include "dimension2d.h" @@ -393,4 +393,3 @@ namespace irr } // end namespace irr #endif - diff --git a/include/Keycodes.h b/include/Keycodes.h index 8fb85942..244d9aa7 100644 --- a/include/Keycodes.h +++ b/include/Keycodes.h @@ -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 __IRR_KEY_CODES_H_INCLUDED__ -#define __IRR_KEY_CODES_H_INCLUDED__ +#ifndef IRR_KEY_CODES_H_INCLUDED +#define IRR_KEY_CODES_H_INCLUDED namespace irr { @@ -186,4 +186,3 @@ namespace irr } // end namespace irr #endif - diff --git a/include/S3DVertex.h b/include/S3DVertex.h index 2040f9d1..0b48ee96 100644 --- a/include/S3DVertex.h +++ b/include/S3DVertex.h @@ -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 __S_3D_VERTEX_H_INCLUDED__ -#define __S_3D_VERTEX_H_INCLUDED__ +#ifndef S_3D_VERTEX_H_INCLUDED +#define S_3D_VERTEX_H_INCLUDED #include "vector3d.h" #include "vector2d.h" @@ -278,4 +278,3 @@ inline u32 getVertexPitchFromType(E_VERTEX_TYPE vertexType) } // end namespace irr #endif - diff --git a/include/SAnimatedMesh.h b/include/SAnimatedMesh.h index 45a4d486..a422a5f5 100644 --- a/include/SAnimatedMesh.h +++ b/include/SAnimatedMesh.h @@ -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 __S_ANIMATED_MESH_H_INCLUDED__ -#define __S_ANIMATED_MESH_H_INCLUDED__ +#ifndef S_ANIMATED_MESH_H_INCLUDED +#define S_ANIMATED_MESH_H_INCLUDED #include "IAnimatedMesh.h" #include "IMesh.h" @@ -38,14 +38,14 @@ namespace scene //! Gets the frame count of the animated mesh. /** \return Amount of frames. If the amount is 1, it is a static, non animated mesh. */ - virtual u32 getFrameCount() const _IRR_OVERRIDE_ + virtual u32 getFrameCount() const IRR_OVERRIDE { return Meshes.size(); } //! Gets the default animation speed of the animated mesh. /** \return Amount of frames per second. If the amount is 0, it is a static, non animated mesh. */ - virtual f32 getAnimationSpeed() const _IRR_OVERRIDE_ + virtual f32 getAnimationSpeed() const IRR_OVERRIDE { return FramesPerSecond; } @@ -53,7 +53,7 @@ namespace scene //! Gets the frame count of the animated mesh. /** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated. The actual speed is set in the scene node the mesh is instantiated in.*/ - virtual void setAnimationSpeed(f32 fps) _IRR_OVERRIDE_ + virtual void setAnimationSpeed(f32 fps) IRR_OVERRIDE { FramesPerSecond=fps; } @@ -66,7 +66,7 @@ namespace scene \param startFrameLoop: start frame \param endFrameLoop: end frame \return The animated mesh based on a detail level. */ - virtual IMesh* getMesh(s32 frame, s32 detailLevel=255, s32 startFrameLoop=-1, s32 endFrameLoop=-1) _IRR_OVERRIDE_ + virtual IMesh* getMesh(s32 frame, s32 detailLevel=255, s32 startFrameLoop=-1, s32 endFrameLoop=-1) IRR_OVERRIDE { if (Meshes.empty()) return 0; @@ -86,13 +86,13 @@ namespace scene //! Returns an axis aligned bounding box of the mesh. /** \return A bounding box of this mesh is returned. */ - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_ + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE { return Box; } //! set user axis aligned bounding box - virtual void setBoundingBox(const core::aabbox3df& box) _IRR_OVERRIDE_ + virtual void setBoundingBox(const core::aabbox3df& box) IRR_OVERRIDE { Box = box; } @@ -112,13 +112,13 @@ namespace scene } //! Returns the type of the animated mesh. - virtual E_ANIMATED_MESH_TYPE getMeshType() const _IRR_OVERRIDE_ + virtual E_ANIMATED_MESH_TYPE getMeshType() const IRR_OVERRIDE { return Type; } //! returns amount of mesh buffers. - virtual u32 getMeshBufferCount() const _IRR_OVERRIDE_ + virtual u32 getMeshBufferCount() const IRR_OVERRIDE { if (Meshes.empty()) return 0; @@ -127,7 +127,7 @@ namespace scene } //! returns pointer to a mesh buffer - virtual IMeshBuffer* getMeshBuffer(u32 nr) const _IRR_OVERRIDE_ + virtual IMeshBuffer* getMeshBuffer(u32 nr) const IRR_OVERRIDE { if (Meshes.empty()) return 0; @@ -139,7 +139,7 @@ namespace scene /** \param material: material to search for \return Returns the pointer to the mesh buffer or NULL if there is no such mesh buffer. */ - virtual IMeshBuffer* getMeshBuffer( const video::SMaterial &material) const _IRR_OVERRIDE_ + virtual IMeshBuffer* getMeshBuffer( const video::SMaterial &material) const IRR_OVERRIDE { if (Meshes.empty()) return 0; @@ -148,21 +148,21 @@ namespace scene } //! Set a material flag for all meshbuffers of this mesh. - virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) _IRR_OVERRIDE_ + virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) IRR_OVERRIDE { for (u32 i=0; isetMaterialFlag(flag, newvalue); } //! set the hardware mapping hint, for driver - virtual void setHardwareMappingHint( E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX ) _IRR_OVERRIDE_ + virtual void setHardwareMappingHint( E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX ) IRR_OVERRIDE { for (u32 i=0; isetHardwareMappingHint(newMappingHint, buffer); } //! flags the meshbuffer as changed, reloads hardware buffers - virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_ + virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) IRR_OVERRIDE { for (u32 i=0; isetDirty(buffer); @@ -186,4 +186,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/SColor.h b/include/SColor.h index 7384da9b..66f03cc2 100644 --- a/include/SColor.h +++ b/include/SColor.h @@ -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 __COLOR_H_INCLUDED__ -#define __COLOR_H_INCLUDED__ +#ifndef IRR_S_COLOR_H_INCLUDED +#define IRR_S_COLOR_H_INCLUDED #include "irrTypes.h" #include "irrMath.h" diff --git a/include/SExposedVideoData.h b/include/SExposedVideoData.h index 35108f00..184cd993 100644 --- a/include/SExposedVideoData.h +++ b/include/SExposedVideoData.h @@ -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 __S_EXPOSED_VIDEO_DATA_H_INCLUDED__ -#define __S_EXPOSED_VIDEO_DATA_H_INCLUDED__ +#ifndef S_EXPOSED_VIDEO_DATA_H_INCLUDED +#define S_EXPOSED_VIDEO_DATA_H_INCLUDED // forward declarations for internal pointers struct IDirect3D9; @@ -114,6 +114,4 @@ struct SExposedVideoData } // end namespace video } // end namespace irr - #endif - diff --git a/include/SIrrCreationParameters.h b/include/SIrrCreationParameters.h index f07cdf7d..d9599131 100644 --- a/include/SIrrCreationParameters.h +++ b/include/SIrrCreationParameters.h @@ -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 __I_IRRLICHT_CREATION_PARAMETERS_H_INCLUDED__ -#define __I_IRRLICHT_CREATION_PARAMETERS_H_INCLUDED__ +#ifndef IRR_IRRLICHT_CREATION_PARAMETERS_H_INCLUDED +#define IRR_IRRLICHT_CREATION_PARAMETERS_H_INCLUDED #include "EDriverTypes.h" #include "EDeviceTypes.h" @@ -328,4 +328,3 @@ namespace irr } // end namespace irr #endif - diff --git a/include/SKeyMap.h b/include/SKeyMap.h index 3f1b68c5..a4388835 100644 --- a/include/SKeyMap.h +++ b/include/SKeyMap.h @@ -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 __S_KEY_MAP_H_INCLUDED__ -#define __S_KEY_MAP_H_INCLUDED__ +#ifndef S_KEY_MAP_H_INCLUDED +#define S_KEY_MAP_H_INCLUDED #include "Keycodes.h" @@ -40,4 +40,3 @@ namespace irr } // end namespace irr #endif - diff --git a/include/SLight.h b/include/SLight.h index 8f725945..f23b375a 100644 --- a/include/SLight.h +++ b/include/SLight.h @@ -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 __S_LIGHT_H_INCLUDED__ -#define __S_LIGHT_H_INCLUDED__ +#ifndef S_LIGHT_H_INCLUDED +#define S_LIGHT_H_INCLUDED #include "SColor.h" #include "vector3d.h" diff --git a/include/SMaterial.h b/include/SMaterial.h index 29bc3327..9d775c86 100644 --- a/include/SMaterial.h +++ b/include/SMaterial.h @@ -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 __S_MATERIAL_H_INCLUDED__ -#define __S_MATERIAL_H_INCLUDED__ +#ifndef S_MATERIAL_H_INCLUDED +#define S_MATERIAL_H_INCLUDED #include "SColor.h" #include "matrix4.h" diff --git a/include/SMaterialLayer.h b/include/SMaterialLayer.h index 2ef72c82..51ddf668 100644 --- a/include/SMaterialLayer.h +++ b/include/SMaterialLayer.h @@ -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 __S_MATERIAL_LAYER_H_INCLUDED__ -#define __S_MATERIAL_LAYER_H_INCLUDED__ +#ifndef S_MATERIAL_LAYER_H_INCLUDED +#define S_MATERIAL_LAYER_H_INCLUDED #include "matrix4.h" #include "irrAllocator.h" @@ -227,4 +227,4 @@ namespace video } // end namespace video } // end namespace irr -#endif // __S_MATERIAL_LAYER_H_INCLUDED__ +#endif // S_MATERIAL_LAYER_H_INCLUDED diff --git a/include/SMesh.h b/include/SMesh.h index add6c9fb..c87cee81 100644 --- a/include/SMesh.h +++ b/include/SMesh.h @@ -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 __S_MESH_H_INCLUDED__ -#define __S_MESH_H_INCLUDED__ +#ifndef S_MESH_H_INCLUDED +#define S_MESH_H_INCLUDED #include "IMesh.h" #include "IMeshBuffer.h" @@ -44,20 +44,20 @@ namespace scene //! returns amount of mesh buffers. - virtual u32 getMeshBufferCount() const _IRR_OVERRIDE_ + virtual u32 getMeshBufferCount() const IRR_OVERRIDE { return MeshBuffers.size(); } //! returns pointer to a mesh buffer - virtual IMeshBuffer* getMeshBuffer(u32 nr) const _IRR_OVERRIDE_ + virtual IMeshBuffer* getMeshBuffer(u32 nr) const IRR_OVERRIDE { return MeshBuffers[nr]; } //! returns a meshbuffer which fits a material /** reverse search */ - virtual IMeshBuffer* getMeshBuffer( const video::SMaterial & material) const _IRR_OVERRIDE_ + virtual IMeshBuffer* getMeshBuffer( const video::SMaterial & material) const IRR_OVERRIDE { for (s32 i = (s32)MeshBuffers.size()-1; i >= 0; --i) { @@ -69,13 +69,13 @@ namespace scene } //! returns an axis aligned bounding box - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_ + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE { return BoundingBox; } //! set user axis aligned bounding box - virtual void setBoundingBox( const core::aabbox3df& box) _IRR_OVERRIDE_ + virtual void setBoundingBox( const core::aabbox3df& box) IRR_OVERRIDE { BoundingBox = box; } @@ -118,21 +118,21 @@ namespace scene } //! sets a flag of all contained materials to a new value - virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) _IRR_OVERRIDE_ + virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) IRR_OVERRIDE { for (u32 i=0; igetMaterial().setFlag(flag, newvalue); } //! set the hardware mapping hint, for driver - virtual void setHardwareMappingHint( E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX ) _IRR_OVERRIDE_ + virtual void setHardwareMappingHint( E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX ) IRR_OVERRIDE { for (u32 i=0; isetHardwareMappingHint(newMappingHint, buffer); } //! flags the meshbuffer as changed, reloads hardware buffers - virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_ + virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) IRR_OVERRIDE { for (u32 i=0; isetDirty(buffer); @@ -150,4 +150,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/SOverrideMaterial.h b/include/SOverrideMaterial.h index 8ecbae25..84f3f7b3 100644 --- a/include/SOverrideMaterial.h +++ b/include/SOverrideMaterial.h @@ -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 __S_OVERRIDE_MATERIAL_H_INCLUDED__ -#define __S_OVERRIDE_MATERIAL_H_INCLUDED__ +#ifndef S_OVERRIDE_MATERIAL_H_INCLUDED +#define S_OVERRIDE_MATERIAL_H_INCLUDED #include "SMaterial.h" @@ -178,5 +178,4 @@ namespace video } // end namespace video } // end namespace irr -#endif // __S_OVERRIDE_MATERIAL_H_INCLUDED__ - +#endif // S_OVERRIDE_MATERIAL_H_INCLUDED diff --git a/include/SParticle.h b/include/SParticle.h index d1507a12..73787547 100644 --- a/include/SParticle.h +++ b/include/SParticle.h @@ -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 __S_PARTICLE_H_INCLUDED__ -#define __S_PARTICLE_H_INCLUDED__ +#ifndef S_PARTICLE_H_INCLUDED +#define S_PARTICLE_H_INCLUDED #include "vector3d.h" #include "dimension2d.h" @@ -53,4 +53,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/SSharedMeshBuffer.h b/include/SSharedMeshBuffer.h index 51172998..0a171be6 100644 --- a/include/SSharedMeshBuffer.h +++ b/include/SSharedMeshBuffer.h @@ -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 __S_SHARED_MESH_BUFFER_H_INCLUDED__ -#define __S_SHARED_MESH_BUFFER_H_INCLUDED__ +#ifndef S_SHARED_MESH_BUFFER_H_INCLUDED +#define S_SHARED_MESH_BUFFER_H_INCLUDED #include "irrArray.h" #include "IMeshBuffer.h" @@ -36,19 +36,19 @@ namespace scene } //! returns the material of this meshbuffer - virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_ + virtual const video::SMaterial& getMaterial() const IRR_OVERRIDE { return Material; } //! returns the material of this meshbuffer - virtual video::SMaterial& getMaterial() _IRR_OVERRIDE_ + virtual video::SMaterial& getMaterial() IRR_OVERRIDE { return Material; } //! returns pointer to vertices - virtual const void* getVertices() const _IRR_OVERRIDE_ + virtual const void* getVertices() const IRR_OVERRIDE { if (Vertices) return Vertices->const_pointer(); @@ -57,7 +57,7 @@ namespace scene } //! returns pointer to vertices - virtual void* getVertices() _IRR_OVERRIDE_ + virtual void* getVertices() IRR_OVERRIDE { if (Vertices) return Vertices->pointer(); @@ -66,7 +66,7 @@ namespace scene } //! returns amount of vertices - virtual u32 getVertexCount() const _IRR_OVERRIDE_ + virtual u32 getVertexCount() const IRR_OVERRIDE { if (Vertices) return Vertices->size(); @@ -75,49 +75,49 @@ namespace scene } //! returns pointer to indices - virtual const u16* getIndices() const _IRR_OVERRIDE_ + virtual const u16* getIndices() const IRR_OVERRIDE { return Indices.const_pointer(); } //! returns pointer to indices - virtual u16* getIndices() _IRR_OVERRIDE_ + virtual u16* getIndices() IRR_OVERRIDE { return Indices.pointer(); } //! returns amount of indices - virtual u32 getIndexCount() const _IRR_OVERRIDE_ + virtual u32 getIndexCount() const IRR_OVERRIDE { return Indices.size(); } //! Get type of index data which is stored in this meshbuffer. - virtual video::E_INDEX_TYPE getIndexType() const _IRR_OVERRIDE_ + virtual video::E_INDEX_TYPE getIndexType() const IRR_OVERRIDE { return video::EIT_16BIT; } //! returns an axis aligned bounding box - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_ + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE { return BoundingBox; } //! set user axis aligned bounding box - virtual void setBoundingBox( const core::aabbox3df& box) _IRR_OVERRIDE_ + virtual void setBoundingBox( const core::aabbox3df& box) IRR_OVERRIDE { BoundingBox = box; } //! returns which type of vertex data is stored. - virtual video::E_VERTEX_TYPE getVertexType() const _IRR_OVERRIDE_ + virtual video::E_VERTEX_TYPE getVertexType() const IRR_OVERRIDE { return video::EVT_STANDARD; } //! recalculates the bounding box. should be called if the mesh changed. - virtual void recalculateBoundingBox() _IRR_OVERRIDE_ + virtual void recalculateBoundingBox() IRR_OVERRIDE { if (!Vertices || Vertices->empty() || Indices.empty()) BoundingBox.reset(0,0,0); @@ -130,66 +130,66 @@ namespace scene } //! returns position of vertex i - virtual const core::vector3df& getPosition(u32 i) const _IRR_OVERRIDE_ + virtual const core::vector3df& getPosition(u32 i) const IRR_OVERRIDE { - _IRR_DEBUG_BREAK_IF(!Vertices); + IRR_DEBUG_BREAK_IF(!Vertices); return (*Vertices)[Indices[i]].Pos; } //! returns position of vertex i - virtual core::vector3df& getPosition(u32 i) _IRR_OVERRIDE_ + virtual core::vector3df& getPosition(u32 i) IRR_OVERRIDE { - _IRR_DEBUG_BREAK_IF(!Vertices); + IRR_DEBUG_BREAK_IF(!Vertices); return (*Vertices)[Indices[i]].Pos; } //! returns normal of vertex i - virtual const core::vector3df& getNormal(u32 i) const _IRR_OVERRIDE_ + virtual const core::vector3df& getNormal(u32 i) const IRR_OVERRIDE { - _IRR_DEBUG_BREAK_IF(!Vertices); + IRR_DEBUG_BREAK_IF(!Vertices); return (*Vertices)[Indices[i]].Normal; } //! returns normal of vertex i - virtual core::vector3df& getNormal(u32 i) _IRR_OVERRIDE_ + virtual core::vector3df& getNormal(u32 i) IRR_OVERRIDE { - _IRR_DEBUG_BREAK_IF(!Vertices); + IRR_DEBUG_BREAK_IF(!Vertices); return (*Vertices)[Indices[i]].Normal; } //! returns texture coord of vertex i - virtual const core::vector2df& getTCoords(u32 i) const _IRR_OVERRIDE_ + virtual const core::vector2df& getTCoords(u32 i) const IRR_OVERRIDE { - _IRR_DEBUG_BREAK_IF(!Vertices); + IRR_DEBUG_BREAK_IF(!Vertices); return (*Vertices)[Indices[i]].TCoords; } //! returns texture coord of vertex i - virtual core::vector2df& getTCoords(u32 i) _IRR_OVERRIDE_ + virtual core::vector2df& getTCoords(u32 i) IRR_OVERRIDE { - _IRR_DEBUG_BREAK_IF(!Vertices); + IRR_DEBUG_BREAK_IF(!Vertices); return (*Vertices)[Indices[i]].TCoords; } //! append the vertices and indices to the current buffer - virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) _IRR_OVERRIDE_ {} + virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) IRR_OVERRIDE {} //! append the meshbuffer to the current buffer - virtual void append(const IMeshBuffer* const other) _IRR_OVERRIDE_ {} + virtual void append(const IMeshBuffer* const other) IRR_OVERRIDE {} //! get the current hardware mapping hint - virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const _IRR_OVERRIDE_ + virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const IRR_OVERRIDE { return MappingHintVertex; } //! get the current hardware mapping hint - virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const _IRR_OVERRIDE_ + virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const IRR_OVERRIDE { return MappingHintIndex; } //! set the hardware mapping hint, for driver - virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX ) _IRR_OVERRIDE_ + virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX ) IRR_OVERRIDE { if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_VERTEX) MappingHintVertex=NewMappingHint; @@ -198,19 +198,19 @@ namespace scene } //! Describe what kind of primitive geometry is used by the meshbuffer - virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) _IRR_OVERRIDE_ + virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) IRR_OVERRIDE { PrimitiveType = type; } //! Get the kind of primitive geometry which is used by the meshbuffer - virtual E_PRIMITIVE_TYPE getPrimitiveType() const _IRR_OVERRIDE_ + virtual E_PRIMITIVE_TYPE getPrimitiveType() const IRR_OVERRIDE { return PrimitiveType; } //! flags the mesh as changed, reloads hardware buffers - virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_ + virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) IRR_OVERRIDE { if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_VERTEX) ++ChangedID_Vertex; @@ -220,11 +220,11 @@ namespace scene //! Get the currently used ID for identification of changes. /** This shouldn't be used for anything outside the VideoDriver. */ - virtual u32 getChangedID_Vertex() const _IRR_OVERRIDE_ {return ChangedID_Vertex;} + virtual u32 getChangedID_Vertex() const IRR_OVERRIDE {return ChangedID_Vertex;} //! Get the currently used ID for identification of changes. /** This shouldn't be used for anything outside the VideoDriver. */ - virtual u32 getChangedID_Index() const _IRR_OVERRIDE_ {return ChangedID_Index;} + virtual u32 getChangedID_Index() const IRR_OVERRIDE {return ChangedID_Index;} //! Material of this meshBuffer video::SMaterial Material; @@ -257,4 +257,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/SSkinMeshBuffer.h b/include/SSkinMeshBuffer.h index a6c2b68d..726deffe 100644 --- a/include/SSkinMeshBuffer.h +++ b/include/SSkinMeshBuffer.h @@ -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 __I_SKIN_MESH_BUFFER_H_INCLUDED__ -#define __I_SKIN_MESH_BUFFER_H_INCLUDED__ +#ifndef S_SKIN_MESH_BUFFER_H_INCLUDED +#define S_SKIN_MESH_BUFFER_H_INCLUDED #include "IMeshBuffer.h" #include "S3DVertex.h" @@ -31,13 +31,13 @@ struct SSkinMeshBuffer : public IMeshBuffer } //! Get Material of this buffer. - virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_ + virtual const video::SMaterial& getMaterial() const IRR_OVERRIDE { return Material; } //! Get Material of this buffer. - virtual video::SMaterial& getMaterial() _IRR_OVERRIDE_ + virtual video::SMaterial& getMaterial() IRR_OVERRIDE { return Material; } @@ -57,7 +57,7 @@ struct SSkinMeshBuffer : public IMeshBuffer } //! Get pointer to vertex array - virtual const void* getVertices() const _IRR_OVERRIDE_ + virtual const void* getVertices() const IRR_OVERRIDE { switch (VertexType) { @@ -71,7 +71,7 @@ struct SSkinMeshBuffer : public IMeshBuffer } //! Get pointer to vertex array - virtual void* getVertices() _IRR_OVERRIDE_ + virtual void* getVertices() IRR_OVERRIDE { switch (VertexType) { @@ -85,7 +85,7 @@ struct SSkinMeshBuffer : public IMeshBuffer } //! Get vertex count - virtual u32 getVertexCount() const _IRR_OVERRIDE_ + virtual u32 getVertexCount() const IRR_OVERRIDE { switch (VertexType) { @@ -100,43 +100,43 @@ struct SSkinMeshBuffer : public IMeshBuffer //! Get type of index data which is stored in this meshbuffer. /** \return Index type of this buffer. */ - virtual video::E_INDEX_TYPE getIndexType() const _IRR_OVERRIDE_ + virtual video::E_INDEX_TYPE getIndexType() const IRR_OVERRIDE { return video::EIT_16BIT; } //! Get pointer to index array - virtual const u16* getIndices() const _IRR_OVERRIDE_ + virtual const u16* getIndices() const IRR_OVERRIDE { return Indices.const_pointer(); } //! Get pointer to index array - virtual u16* getIndices() _IRR_OVERRIDE_ + virtual u16* getIndices() IRR_OVERRIDE { return Indices.pointer(); } //! Get index count - virtual u32 getIndexCount() const _IRR_OVERRIDE_ + virtual u32 getIndexCount() const IRR_OVERRIDE { return Indices.size(); } //! Get bounding box - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_ + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE { return BoundingBox; } //! Set bounding box - virtual void setBoundingBox( const core::aabbox3df& box) _IRR_OVERRIDE_ + virtual void setBoundingBox( const core::aabbox3df& box) IRR_OVERRIDE { BoundingBox = box; } //! Recalculate bounding box - virtual void recalculateBoundingBox() _IRR_OVERRIDE_ + virtual void recalculateBoundingBox() IRR_OVERRIDE { if(!BoundingBoxNeedsRecalculated) return; @@ -185,7 +185,7 @@ struct SSkinMeshBuffer : public IMeshBuffer } //! Get vertex type - virtual video::E_VERTEX_TYPE getVertexType() const _IRR_OVERRIDE_ + virtual video::E_VERTEX_TYPE getVertexType() const IRR_OVERRIDE { return VertexType; } @@ -243,7 +243,7 @@ struct SSkinMeshBuffer : public IMeshBuffer } //! returns position of vertex i - virtual const core::vector3df& getPosition(u32 i) const _IRR_OVERRIDE_ + virtual const core::vector3df& getPosition(u32 i) const IRR_OVERRIDE { switch (VertexType) { @@ -257,7 +257,7 @@ struct SSkinMeshBuffer : public IMeshBuffer } //! returns position of vertex i - virtual core::vector3df& getPosition(u32 i) _IRR_OVERRIDE_ + virtual core::vector3df& getPosition(u32 i) IRR_OVERRIDE { switch (VertexType) { @@ -271,7 +271,7 @@ struct SSkinMeshBuffer : public IMeshBuffer } //! returns normal of vertex i - virtual const core::vector3df& getNormal(u32 i) const _IRR_OVERRIDE_ + virtual const core::vector3df& getNormal(u32 i) const IRR_OVERRIDE { switch (VertexType) { @@ -285,7 +285,7 @@ struct SSkinMeshBuffer : public IMeshBuffer } //! returns normal of vertex i - virtual core::vector3df& getNormal(u32 i) _IRR_OVERRIDE_ + virtual core::vector3df& getNormal(u32 i) IRR_OVERRIDE { switch (VertexType) { @@ -299,7 +299,7 @@ struct SSkinMeshBuffer : public IMeshBuffer } //! returns texture coords of vertex i - virtual const core::vector2df& getTCoords(u32 i) const _IRR_OVERRIDE_ + virtual const core::vector2df& getTCoords(u32 i) const IRR_OVERRIDE { switch (VertexType) { @@ -313,7 +313,7 @@ struct SSkinMeshBuffer : public IMeshBuffer } //! returns texture coords of vertex i - virtual core::vector2df& getTCoords(u32 i) _IRR_OVERRIDE_ + virtual core::vector2df& getTCoords(u32 i) IRR_OVERRIDE { switch (VertexType) { @@ -327,25 +327,25 @@ struct SSkinMeshBuffer : public IMeshBuffer } //! append the vertices and indices to the current buffer - virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) _IRR_OVERRIDE_ {} + virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) IRR_OVERRIDE {} //! append the meshbuffer to the current buffer - virtual void append(const IMeshBuffer* const other) _IRR_OVERRIDE_ {} + virtual void append(const IMeshBuffer* const other) IRR_OVERRIDE {} //! get the current hardware mapping hint for vertex buffers - virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const _IRR_OVERRIDE_ + virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const IRR_OVERRIDE { return MappingHint_Vertex; } //! get the current hardware mapping hint for index buffers - virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const _IRR_OVERRIDE_ + virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const IRR_OVERRIDE { return MappingHint_Index; } //! set the hardware mapping hint, for driver - virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) _IRR_OVERRIDE_ + virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) IRR_OVERRIDE { if (Buffer==EBT_VERTEX) MappingHint_Vertex=NewMappingHint; @@ -359,19 +359,19 @@ struct SSkinMeshBuffer : public IMeshBuffer } //! Describe what kind of primitive geometry is used by the meshbuffer - virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) _IRR_OVERRIDE_ + virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) IRR_OVERRIDE { PrimitiveType = type; } //! Get the kind of primitive geometry which is used by the meshbuffer - virtual E_PRIMITIVE_TYPE getPrimitiveType() const _IRR_OVERRIDE_ + virtual E_PRIMITIVE_TYPE getPrimitiveType() const IRR_OVERRIDE { return PrimitiveType; } //! flags the mesh as changed, reloads hardware buffers - virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_ + virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) IRR_OVERRIDE { if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX) ++ChangedID_Vertex; @@ -379,9 +379,9 @@ struct SSkinMeshBuffer : public IMeshBuffer ++ChangedID_Index; } - virtual u32 getChangedID_Vertex() const _IRR_OVERRIDE_ {return ChangedID_Vertex;} + virtual u32 getChangedID_Vertex() const IRR_OVERRIDE {return ChangedID_Vertex;} - virtual u32 getChangedID_Index() const _IRR_OVERRIDE_ {return ChangedID_Index;} + virtual u32 getChangedID_Index() const IRR_OVERRIDE {return ChangedID_Index;} //! Call this after changing the positions of any vertex. void boundingBoxNeedsRecalculated(void) { BoundingBoxNeedsRecalculated = true; } @@ -417,4 +417,3 @@ struct SSkinMeshBuffer : public IMeshBuffer } // end namespace irr #endif - diff --git a/include/SVertexIndex.h b/include/SVertexIndex.h index d6837dc2..3bad8395 100644 --- a/include/SVertexIndex.h +++ b/include/SVertexIndex.h @@ -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 __S_VERTEX_INDEX_H_INCLUDED__ -#define __S_VERTEX_INDEX_H_INCLUDED__ +#ifndef S_VERTEX_INDEX_H_INCLUDED +#define S_VERTEX_INDEX_H_INCLUDED #include "irrTypes.h" @@ -76,4 +76,3 @@ typedef u32 SVertexIndex; } // end namespace irr #endif - diff --git a/include/SVertexManipulator.h b/include/SVertexManipulator.h index 3cb1477c..1c32d4c9 100644 --- a/include/SVertexManipulator.h +++ b/include/SVertexManipulator.h @@ -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 __S_VERTEX_MANIPULATOR_H_INCLUDED__ -#define __S_VERTEX_MANIPULATOR_H_INCLUDED__ +#ifndef S_VERTEX_MANIPULATOR_H_INCLUDED +#define S_VERTEX_MANIPULATOR_H_INCLUDED #include "matrix4.h" #include "S3DVertex.h" @@ -303,5 +303,4 @@ namespace scene } // end namespace scene } // end namespace irr - #endif diff --git a/include/SViewFrustum.h b/include/SViewFrustum.h index 1b522976..0a973490 100644 --- a/include/SViewFrustum.h +++ b/include/SViewFrustum.h @@ -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 __S_VIEW_FRUSTUM_H_INCLUDED__ -#define __S_VIEW_FRUSTUM_H_INCLUDED__ +#ifndef S_VIEW_FRUSTUM_H_INCLUDED +#define S_VIEW_FRUSTUM_H_INCLUDED #include "plane3d.h" #include "vector3d.h" @@ -459,4 +459,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/SceneParameters.h b/include/SceneParameters.h index 6e2aaced..2fb73995 100644 --- a/include/SceneParameters.h +++ b/include/SceneParameters.h @@ -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 __I_SCENE_PARAMETERS_H_INCLUDED__ -#define __I_SCENE_PARAMETERS_H_INCLUDED__ +#ifndef IRR_I_SCENE_PARAMETERS_H_INCLUDED +#define IRR_I_SCENE_PARAMETERS_H_INCLUDED #include "irrTypes.h" @@ -181,4 +181,3 @@ namespace scene } // end namespace irr #endif - diff --git a/include/aabbox3d.h b/include/aabbox3d.h index 27dfc384..c3ec0186 100644 --- a/include/aabbox3d.h +++ b/include/aabbox3d.h @@ -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 __IRR_AABBOX_3D_H_INCLUDED__ -#define __IRR_AABBOX_3D_H_INCLUDED__ +#ifndef IRR_AABBOX_3D_H_INCLUDED +#define IRR_AABBOX_3D_H_INCLUDED #include "irrMath.h" #include "plane3d.h" diff --git a/include/coreutil.h b/include/coreutil.h index b4d5e19f..74e27f15 100644 --- a/include/coreutil.h +++ b/include/coreutil.h @@ -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 __IRR_CORE_UTIL_H_INCLUDED__ -#define __IRR_CORE_UTIL_H_INCLUDED__ +#ifndef IRR_CORE_UTIL_H_INCLUDED +#define IRR_CORE_UTIL_H_INCLUDED #include "irrString.h" #include "path.h" @@ -177,15 +177,15 @@ static inline io::path mergeFilename(const io::path& path, const io::path& filen if ( !result.empty() ) { fschar_t last = result.lastChar(); - if ( last != _IRR_TEXT('/') && last != _IRR_TEXT('\\') ) - result += _IRR_TEXT('/'); + if ( last != IRR_TEXT('/') && last != IRR_TEXT('\\') ) + result += IRR_TEXT('/'); } if ( !filename.empty() ) result += filename; if ( !extension.empty() ) { - if ( !result.empty() && extension[0] != _IRR_TEXT('.') ) - result += _IRR_TEXT('.'); + if ( !result.empty() && extension[0] != IRR_TEXT('.') ) + result += IRR_TEXT('.'); result += extension; } diff --git a/include/dimension2d.h b/include/dimension2d.h index 4f0a87a1..7bd96ae3 100644 --- a/include/dimension2d.h +++ b/include/dimension2d.h @@ -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 __IRR_DIMENSION2D_H_INCLUDED__ -#define __IRR_DIMENSION2D_H_INCLUDED__ +#ifndef IRR_DIMENSION2D_H_INCLUDED +#define IRR_DIMENSION2D_H_INCLUDED #include "irrTypes.h" #include "irrMath.h" // for irr::core::equals() diff --git a/include/driverChoice.h b/include/driverChoice.h index accd4034..402e71c1 100644 --- a/include/driverChoice.h +++ b/include/driverChoice.h @@ -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 __E_DRIVER_CHOICE_H_INCLUDED__ -#define __E_DRIVER_CHOICE_H_INCLUDED__ +#ifndef IRR_E_DRIVER_CHOICE_H_INCLUDED +#define IRR_E_DRIVER_CHOICE_H_INCLUDED #include #include diff --git a/include/exampleHelper.h b/include/exampleHelper.h index e1e7cb2e..70a4e8ce 100755 --- a/include/exampleHelper.h +++ b/include/exampleHelper.h @@ -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 __EXAMPLE_HELPER_H_INCLUDED__ -#define __EXAMPLE_HELPER_H_INCLUDED__ +#ifndef IRR_EXAMPLE_HELPER_H_INCLUDED +#define IRR_EXAMPLE_HELPER_H_INCLUDED #include "IrrCompileConfig.h" #include "path.h" diff --git a/include/fast_atof.h b/include/fast_atof.h index bb1077fe..7b7ca7d2 100644 --- a/include/fast_atof.h +++ b/include/fast_atof.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine" and the "irrXML" project. // For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h -#ifndef __FAST_ATOF_H_INCLUDED__ -#define __FAST_ATOF_H_INCLUDED__ +#ifndef IRR_FAST_ATOF_H_INCLUDED +#define IRR_FAST_ATOF_H_INCLUDED #include "irrMath.h" #include "irrString.h" @@ -378,4 +378,3 @@ inline float fast_atof(const char* floatAsString, const char** out=0) } // end namespace irr #endif - diff --git a/include/heapsort.h b/include/heapsort.h index 36211c4d..cbee7c73 100644 --- a/include/heapsort.h +++ b/include/heapsort.h @@ -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 __IRR_HEAPSORT_H_INCLUDED__ -#define __IRR_HEAPSORT_H_INCLUDED__ +#ifndef IRR_HEAPSORT_H_INCLUDED +#define IRR_HEAPSORT_H_INCLUDED #include "irrTypes.h" diff --git a/include/irrAllocator.h b/include/irrAllocator.h index c7450ed7..39f9293b 100644 --- a/include/irrAllocator.h +++ b/include/irrAllocator.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine" and the "irrXML" project. // For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h -#ifndef __IRR_ALLOCATOR_H_INCLUDED__ -#define __IRR_ALLOCATOR_H_INCLUDED__ +#ifndef IRR_ALLOCATOR_H_INCLUDED +#define IRR_ALLOCATOR_H_INCLUDED #include "irrTypes.h" #include diff --git a/include/irrArray.h b/include/irrArray.h index b133b62d..3572e626 100644 --- a/include/irrArray.h +++ b/include/irrArray.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine" and the "irrXML" project. // For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h -#ifndef __IRR_ARRAY_H_INCLUDED__ -#define __IRR_ARRAY_H_INCLUDED__ +#ifndef IRR_ARRAY_H_INCLUDED +#define IRR_ARRAY_H_INCLUDED #include "irrTypes.h" #include "heapsort.h" @@ -131,7 +131,7 @@ public: \param index: Where position to insert the new element. */ void insert(const T& element, u32 index=0) { - _IRR_DEBUG_BREAK_IF(index>used) // access violation + IRR_DEBUG_BREAK_IF(index>used) // access violation if (used + 1 > allocated) { @@ -337,7 +337,7 @@ public: //! Direct access operator T& operator [](u32 index) { - _IRR_DEBUG_BREAK_IF(index>=used) // access violation + IRR_DEBUG_BREAK_IF(index>=used) // access violation return data[index]; } @@ -346,7 +346,7 @@ public: //! Direct const access operator const T& operator [](u32 index) const { - _IRR_DEBUG_BREAK_IF(index>=used) // access violation + IRR_DEBUG_BREAK_IF(index>=used) // access violation return data[index]; } @@ -355,7 +355,7 @@ public: //! Gets last element. T& getLast() { - _IRR_DEBUG_BREAK_IF(!used) // access violation + IRR_DEBUG_BREAK_IF(!used) // access violation return data[used-1]; } @@ -364,7 +364,7 @@ public: //! Gets last element const T& getLast() const { - _IRR_DEBUG_BREAK_IF(!used) // access violation + IRR_DEBUG_BREAK_IF(!used) // access violation return data[used-1]; } @@ -558,7 +558,7 @@ public: \param index: Index of element to be erased. */ void erase(u32 index) { - _IRR_DEBUG_BREAK_IF(index>=used) // access violation + IRR_DEBUG_BREAK_IF(index>=used) // access violation for (u32 i=index+1; i IRR_DONT_DO_MEMORY_DEBUGGING_HERE + +#endif diff --git a/include/irrList.h b/include/irrList.h index 27044a45..04a00194 100644 --- a/include/irrList.h +++ b/include/irrList.h @@ -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 __IRR_LIST_H_INCLUDED__ -#define __IRR_LIST_H_INCLUDED__ +#ifndef IRR_LIST_H_INCLUDED +#define IRR_LIST_H_INCLUDED #include "irrTypes.h" #include "irrAllocator.h" diff --git a/include/irrMap.h b/include/irrMap.h index 430f0adc..20674646 100644 --- a/include/irrMap.h +++ b/include/irrMap.h @@ -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 __IRR_MAP_H_INCLUDED__ -#define __IRR_MAP_H_INCLUDED__ +#ifndef IRR_MAP_H_INCLUDED +#define IRR_MAP_H_INCLUDED #include "irrTypes.h" #include "irrMath.h" @@ -185,7 +185,7 @@ class map Node& operator*() { - _IRR_DEBUG_BREAK_IF(atEnd()) // access violation + IRR_DEBUG_BREAK_IF(atEnd()) // access violation return *Cur; } @@ -333,7 +333,7 @@ class map const Node& operator*() { - _IRR_DEBUG_BREAK_IF(atEnd()) // access violation + IRR_DEBUG_BREAK_IF(atEnd()) // access violation return *Cur; } @@ -472,7 +472,7 @@ class map Node& operator* () { - _IRR_DEBUG_BREAK_IF(atEnd()) // access violation + IRR_DEBUG_BREAK_IF(atEnd()) // access violation return *getNode(); } @@ -571,7 +571,7 @@ class map Node& operator* () { - _IRR_DEBUG_BREAK_IF(atEnd()) // access violation + IRR_DEBUG_BREAK_IF(atEnd()) // access violation return *getNode(); } @@ -639,7 +639,7 @@ class map Node* node = Tree.find(Key); // Not found - _IRR_DEBUG_BREAK_IF(node==0) // access violation + IRR_DEBUG_BREAK_IF(node==0) // access violation return node->getValue(); } @@ -881,7 +881,7 @@ class map } //! \deprecated Use empty() instead. This method may be removed by Irrlicht 1.9 - _IRR_DEPRECATED_ bool isEmpty() const + IRR_DEPRECATED bool isEmpty() const { return empty(); } @@ -1110,5 +1110,4 @@ class map } // end namespace core } // end namespace irr -#endif // __IRR_MAP_H_INCLUDED__ - +#endif // IRR_MAP_H_INCLUDED diff --git a/include/irrMath.h b/include/irrMath.h index 94eda174..1bae6667 100644 --- a/include/irrMath.h +++ b/include/irrMath.h @@ -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 __IRR_MATH_H_INCLUDED__ -#define __IRR_MATH_H_INCLUDED__ +#ifndef IRR_MATH_H_INCLUDED +#define IRR_MATH_H_INCLUDED #include "IrrCompileConfig.h" #include "irrTypes.h" diff --git a/include/irrString.h b/include/irrString.h index 0b57864a..021086f6 100644 --- a/include/irrString.h +++ b/include/irrString.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine" and the "irrXML" project. // For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h -#ifndef __IRR_STRING_H_INCLUDED__ -#define __IRR_STRING_H_INCLUDED__ +#ifndef IRR_STRING_H_INCLUDED +#define IRR_STRING_H_INCLUDED #include "irrTypes.h" #include "irrAllocator.h" @@ -429,7 +429,7 @@ public: //! Direct access operator T& operator [](const u32 index) { - _IRR_DEBUG_BREAK_IF(index>=used) // bad index + IRR_DEBUG_BREAK_IF(index>=used) // bad index return array[index]; } @@ -437,7 +437,7 @@ public: //! Direct access operator const T& operator [](const u32 index) const { - _IRR_DEBUG_BREAK_IF(index>=used) // bad index + IRR_DEBUG_BREAK_IF(index>=used) // bad index return array[index]; } @@ -1325,7 +1325,7 @@ public: \param index: Index of element to be erased. */ string& erase(u32 index) { - _IRR_DEBUG_BREAK_IF(index>=used) // access violation + IRR_DEBUG_BREAK_IF(index>=used) // access violation for (u32 i=index+1; i - #define _IRR_DEBUG_BREAK_IF( _CONDITION_ ) if (_CONDITION_) {_CrtDbgBreak();} + #define IRR_DEBUG_BREAK_IF( _CONDITION_ ) if (_CONDITION_) {_CrtDbgBreak();} #else - #define _IRR_DEBUG_BREAK_IF( _CONDITION_ ) if (_CONDITION_) {_asm int 3} + #define IRR_DEBUG_BREAK_IF( _CONDITION_ ) if (_CONDITION_) {_asm int 3} #endif #else #include "assert.h" - #define _IRR_DEBUG_BREAK_IF( _CONDITION_ ) assert( !(_CONDITION_) ); + #define IRR_DEBUG_BREAK_IF( _CONDITION_ ) assert( !(_CONDITION_) ); #endif #else - #define _IRR_DEBUG_BREAK_IF( _CONDITION_ ) + #define IRR_DEBUG_BREAK_IF( _CONDITION_ ) #endif //! Defines a deprecated macro which generates a warning at compile time /** The usage is simple -For typedef: typedef _IRR_DEPRECATED_ int test1; -For classes/structs: class _IRR_DEPRECATED_ test2 { ... }; -For methods: class test3 { _IRR_DEPRECATED_ virtual void foo() {} }; -For functions: template _IRR_DEPRECATED_ void test4(void) {} +For typedef: typedef IRR_DEPRECATED int test1; +For classes/structs: class IRR_DEPRECATED test2 { ... }; +For methods: class test3 { IRR_DEPRECATED virtual void foo() {} }; +For functions: template IRR_DEPRECATED void test4(void) {} **/ #if defined(IGNORE_DEPRECATED_WARNING) -#define _IRR_DEPRECATED_ +#define IRR_DEPRECATED #elif _MSC_VER >= 1310 //vs 2003 or higher -#define _IRR_DEPRECATED_ __declspec(deprecated) +#define IRR_DEPRECATED __declspec(deprecated) #elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) // all versions above 3.0 should support this feature -#define _IRR_DEPRECATED_ __attribute__ ((deprecated)) +#define IRR_DEPRECATED __attribute__ ((deprecated)) #else -#define _IRR_DEPRECATED_ +#define IRR_DEPRECATED #endif //! Defines an override macro, to protect virtual functions from typos and other mismatches /** Usage in a derived class: -virtual void somefunc() _IRR_OVERRIDE_; +virtual void somefunc() IRR_OVERRIDE; */ #if ( ((__GNUC__ > 4 ) || ((__GNUC__ == 4 ) && (__GNUC_MINOR__ >= 7))) && (defined(__GXX_EXPERIMENTAL_CXX0X) || __cplusplus >= 201103L) ) -#define _IRR_OVERRIDE_ override +#define IRR_OVERRIDE override #elif (_MSC_VER >= 1600 ) /* supported since MSVC 2010 */ -#define _IRR_OVERRIDE_ override +#define IRR_OVERRIDE override #elif (__clang_major__ >= 3 && __has_feature(cxx_override_control)) -#define _IRR_OVERRIDE_ override +#define IRR_OVERRIDE override #else -#define _IRR_OVERRIDE_ +#define IRR_OVERRIDE #endif // memory debugging #if defined(_DEBUG) && defined(IRRLICHT_EXPORTS) && defined(_MSC_VER) && \ - (_MSC_VER > 1299) && !defined(_IRR_DONT_DO_MEMORY_DEBUGGING_HERE) && !defined(_WIN32_WCE) + (_MSC_VER > 1299) && !defined(IRR_DONT_DO_MEMORY_DEBUGGING_HERE) && !defined(_WIN32_WCE) #define CRTDBG_MAP_ALLOC #define _CRTDBG_MAP_ALLOC @@ -244,4 +245,4 @@ code like 'code', but some generate warnings so we use this macro here */ ((irr::u32)(irr::u8)(c0) | ((irr::u32)(irr::u8)(c1) << 8) | \ ((irr::u32)(irr::u8)(c2) << 16) | ((irr::u32)(irr::u8)(c3) << 24 )) -#endif // __IRR_TYPES_H_INCLUDED__ +#endif // IRR_TYPES_H_INCLUDED diff --git a/include/irrXML.h b/include/irrXML.h index 57c3b549..6d6ae01b 100644 --- a/include/irrXML.h +++ b/include/irrXML.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine" and the "irrXML" project. // For conditions of distribution and use, see copyright notice in irrlicht.h and/or irrXML.h -#ifndef __IRR_XML_H_INCLUDED__ -#define __IRR_XML_H_INCLUDED__ +#ifndef IRR_XML_H_INCLUDED +#define IRR_XML_H_INCLUDED #include #include "IrrCompileConfig.h" @@ -641,5 +641,4 @@ namespace io } // end namespace io } // end namespace irr -#endif // __IRR_XML_H_INCLUDED__ - +#endif // IRR_XML_H_INCLUDED diff --git a/include/irrlicht.h b/include/irrlicht.h index ec623487..3c00a4b0 100644 --- a/include/irrlicht.h +++ b/include/irrlicht.h @@ -26,8 +26,8 @@ in the jpeglib, the zlib and libPng for further information. */ -#ifndef __IRRLICHT_H_INCLUDED__ -#define __IRRLICHT_H_INCLUDED__ +#ifndef IRRLICHT_H_INCLUDED +#define IRRLICHT_H_INCLUDED #include "IrrCompileConfig.h" #include "aabbox3d.h" @@ -396,4 +396,3 @@ namespace irr */ #endif - diff --git a/include/leakHunter.h b/include/leakHunter.h index 4e1ada45..e3e9361e 100644 --- a/include/leakHunter.h +++ b/include/leakHunter.h @@ -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 __LEAK_HUNTER_INCLUDED__ -#define __LEAK_HUNTER_INCLUDED__ +#ifndef IRR_LEAK_HUNTER_INCLUDED +#define IRR_LEAK_HUNTER_INCLUDED #include "IrrCompileConfig.h" diff --git a/include/line2d.h b/include/line2d.h index dca02a45..2f2cace8 100644 --- a/include/line2d.h +++ b/include/line2d.h @@ -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 __IRR_LINE_2D_H_INCLUDED__ -#define __IRR_LINE_2D_H_INCLUDED__ +#ifndef IRR_LINE_2D_H_INCLUDED +#define IRR_LINE_2D_H_INCLUDED #include "irrTypes.h" #include "vector2d.h" diff --git a/include/line3d.h b/include/line3d.h index 355c52f5..e61f9b0a 100644 --- a/include/line3d.h +++ b/include/line3d.h @@ -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 __IRR_LINE_3D_H_INCLUDED__ -#define __IRR_LINE_3D_H_INCLUDED__ +#ifndef IRR_LINE_3D_H_INCLUDED +#define IRR_LINE_3D_H_INCLUDED #include "irrTypes.h" #include "vector3d.h" diff --git a/include/matrix4.h b/include/matrix4.h index 01289011..90d13ada 100644 --- a/include/matrix4.h +++ b/include/matrix4.h @@ -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 __IRR_MATRIX_H_INCLUDED__ -#define __IRR_MATRIX_H_INCLUDED__ +#ifndef IRR_MATRIX_H_INCLUDED +#define IRR_MATRIX_H_INCLUDED #include "irrMath.h" #include "vector3d.h" @@ -1265,7 +1265,7 @@ namespace core //! Deprecated as it's usually not what people need (regards only 2 corners, but other corners might be outside the box after transformation) //! Use transformBoxEx instead. template - _IRR_DEPRECATED_ inline void CMatrix4::transformBox(core::aabbox3d& box) const + IRR_DEPRECATED inline void CMatrix4::transformBox(core::aabbox3d& box) const { #if defined ( USE_MATRIX_TEST ) if (isIdentity()) @@ -1558,10 +1558,10 @@ namespace core f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 zFar, bool zClipFromZero) { const f64 h = reciprocal(tan(fieldOfViewRadians*0.5)); - _IRR_DEBUG_BREAK_IF(aspectRatio==0.f); //divide by zero + IRR_DEBUG_BREAK_IF(aspectRatio==0.f); //divide by zero const T w = static_cast(h / aspectRatio); - _IRR_DEBUG_BREAK_IF(zNear==zFar); //divide by zero + IRR_DEBUG_BREAK_IF(zNear==zFar); //divide by zero M[0] = w; M[1] = 0; M[2] = 0; @@ -1606,10 +1606,10 @@ namespace core f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 zFar, bool zClipFromZero) { const f64 h = reciprocal(tan(fieldOfViewRadians*0.5)); - _IRR_DEBUG_BREAK_IF(aspectRatio==0.f); //divide by zero + IRR_DEBUG_BREAK_IF(aspectRatio==0.f); //divide by zero const T w = static_cast(h / aspectRatio); - _IRR_DEBUG_BREAK_IF(zNear==zFar); //divide by zero + IRR_DEBUG_BREAK_IF(zNear==zFar); //divide by zero M[0] = w; M[1] = 0; M[2] = 0; @@ -1654,7 +1654,7 @@ namespace core f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 epsilon) { const f64 h = reciprocal(tan(fieldOfViewRadians*0.5)); - _IRR_DEBUG_BREAK_IF(aspectRatio==0.f); //divide by zero + IRR_DEBUG_BREAK_IF(aspectRatio==0.f); //divide by zero const T w = static_cast(h / aspectRatio); M[0] = w; @@ -1689,9 +1689,9 @@ namespace core inline CMatrix4& CMatrix4::buildProjectionMatrixOrthoLH( f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar, bool zClipFromZero) { - _IRR_DEBUG_BREAK_IF(widthOfViewVolume==0.f); //divide by zero - _IRR_DEBUG_BREAK_IF(heightOfViewVolume==0.f); //divide by zero - _IRR_DEBUG_BREAK_IF(zNear==zFar); //divide by zero + IRR_DEBUG_BREAK_IF(widthOfViewVolume==0.f); //divide by zero + IRR_DEBUG_BREAK_IF(heightOfViewVolume==0.f); //divide by zero + IRR_DEBUG_BREAK_IF(zNear==zFar); //divide by zero M[0] = (T)(2/widthOfViewVolume); M[1] = 0; M[2] = 0; @@ -1735,9 +1735,9 @@ namespace core inline CMatrix4& CMatrix4::buildProjectionMatrixOrthoRH( f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar, bool zClipFromZero) { - _IRR_DEBUG_BREAK_IF(widthOfViewVolume==0.f); //divide by zero - _IRR_DEBUG_BREAK_IF(heightOfViewVolume==0.f); //divide by zero - _IRR_DEBUG_BREAK_IF(zNear==zFar); //divide by zero + IRR_DEBUG_BREAK_IF(widthOfViewVolume==0.f); //divide by zero + IRR_DEBUG_BREAK_IF(heightOfViewVolume==0.f); //divide by zero + IRR_DEBUG_BREAK_IF(zNear==zFar); //divide by zero M[0] = (T)(2/widthOfViewVolume); M[1] = 0; M[2] = 0; @@ -1781,9 +1781,9 @@ namespace core inline CMatrix4& CMatrix4::buildProjectionMatrixPerspectiveRH( f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar, bool zClipFromZero) { - _IRR_DEBUG_BREAK_IF(widthOfViewVolume==0.f); //divide by zero - _IRR_DEBUG_BREAK_IF(heightOfViewVolume==0.f); //divide by zero - _IRR_DEBUG_BREAK_IF(zNear==zFar); //divide by zero + IRR_DEBUG_BREAK_IF(widthOfViewVolume==0.f); //divide by zero + IRR_DEBUG_BREAK_IF(heightOfViewVolume==0.f); //divide by zero + IRR_DEBUG_BREAK_IF(zNear==zFar); //divide by zero M[0] = (T)(2*zNear/widthOfViewVolume); M[1] = 0; M[2] = 0; @@ -1827,9 +1827,9 @@ namespace core inline CMatrix4& CMatrix4::buildProjectionMatrixPerspectiveLH( f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar, bool zClipFromZero) { - _IRR_DEBUG_BREAK_IF(widthOfViewVolume==0.f); //divide by zero - _IRR_DEBUG_BREAK_IF(heightOfViewVolume==0.f); //divide by zero - _IRR_DEBUG_BREAK_IF(zNear==zFar); //divide by zero + IRR_DEBUG_BREAK_IF(widthOfViewVolume==0.f); //divide by zero + IRR_DEBUG_BREAK_IF(heightOfViewVolume==0.f); //divide by zero + IRR_DEBUG_BREAK_IF(zNear==zFar); //divide by zero M[0] = (T)(2*zNear/widthOfViewVolume); M[1] = 0; M[2] = 0; diff --git a/include/path.h b/include/path.h index 6bfa2a0b..9e55f574 100644 --- a/include/path.h +++ b/include/path.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine" and the "irrXML" project. // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __IRR_PATH_H_INCLUDED__ -#define __IRR_PATH_H_INCLUDED__ +#ifndef IRR_PATH_H_INCLUDED +#define IRR_PATH_H_INCLUDED #include "irrString.h" @@ -87,4 +87,4 @@ private: } // io } // irr -#endif // __IRR_PATH_H_INCLUDED__ +#endif // IRR_PATH_H_INCLUDED diff --git a/include/plane3d.h b/include/plane3d.h index 21701f04..6f7c4d7c 100644 --- a/include/plane3d.h +++ b/include/plane3d.h @@ -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 __IRR_PLANE_3D_H_INCLUDED__ -#define __IRR_PLANE_3D_H_INCLUDED__ +#ifndef IRR_PLANE_3D_H_INCLUDED +#define IRR_PLANE_3D_H_INCLUDED #include "irrMath.h" #include "vector3d.h" diff --git a/include/position2d.h b/include/position2d.h index 63275d2c..3eb3b2cd 100644 --- a/include/position2d.h +++ b/include/position2d.h @@ -5,8 +5,8 @@ //! As of Irrlicht 1.6, position2d is a synonym for vector2d. /** You should consider position2d to be deprecated, and use vector2d by preference. */ -#ifndef __IRR_POSITION_H_INCLUDED__ -#define __IRR_POSITION_H_INCLUDED__ +#ifndef IRR_POSITION_H_INCLUDED +#define IRR_POSITION_H_INCLUDED #include "vector2d.h" @@ -28,5 +28,4 @@ typedef vector2d position2di; // ...and use a #define to catch the rest, for (e.g.) position2d #define position2d vector2d -#endif // __IRR_POSITION_H_INCLUDED__ - +#endif // IRR_POSITION_H_INCLUDED diff --git a/include/quaternion.h b/include/quaternion.h index 5fdff798..f816ada3 100644 --- a/include/quaternion.h +++ b/include/quaternion.h @@ -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 __IRR_QUATERNION_H_INCLUDED__ -#define __IRR_QUATERNION_H_INCLUDED__ +#ifndef IRR_QUATERNION_H_INCLUDED +#define IRR_QUATERNION_H_INCLUDED #include "irrTypes.h" #include "irrMath.h" @@ -768,4 +768,3 @@ inline core::quaternion& quaternion::rotationFromTo(const vector3df& from, const } // end namespace irr #endif - diff --git a/include/rect.h b/include/rect.h index 85becf0e..be5012bc 100644 --- a/include/rect.h +++ b/include/rect.h @@ -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 __IRR_RECT_H_INCLUDED__ -#define __IRR_RECT_H_INCLUDED__ +#ifndef IRR_RECT_H_INCLUDED +#define IRR_RECT_H_INCLUDED #include "irrTypes.h" #include "dimension2d.h" @@ -285,4 +285,3 @@ namespace core } // end namespace irr #endif - diff --git a/include/triangle3d.h b/include/triangle3d.h index 61d23a4b..7e0ff81e 100644 --- a/include/triangle3d.h +++ b/include/triangle3d.h @@ -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 __IRR_TRIANGLE_3D_H_INCLUDED__ -#define __IRR_TRIANGLE_3D_H_INCLUDED__ +#ifndef IRR_TRIANGLE_3D_H_INCLUDED +#define IRR_TRIANGLE_3D_H_INCLUDED #include "vector3d.h" #include "line3d.h" @@ -276,4 +276,3 @@ namespace core } // end namespace irr #endif - diff --git a/include/vector2d.h b/include/vector2d.h index 2d28ce72..93ab5049 100644 --- a/include/vector2d.h +++ b/include/vector2d.h @@ -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 __IRR_POINT_2D_H_INCLUDED__ -#define __IRR_POINT_2D_H_INCLUDED__ +#ifndef IRR_POINT_2D_H_INCLUDED +#define IRR_POINT_2D_H_INCLUDED #include "irrMath.h" #include "dimension2d.h" @@ -66,14 +66,14 @@ public: T& operator [](u32 index) { - _IRR_DEBUG_BREAK_IF(index>1) // access violation + IRR_DEBUG_BREAK_IF(index>1) // access violation return *(&X+index); } const T& operator [](u32 index) const { - _IRR_DEBUG_BREAK_IF(index>1) // access violation + IRR_DEBUG_BREAK_IF(index>1) // access violation return *(&X+index); } @@ -419,4 +419,3 @@ public: } // end namespace irr #endif - diff --git a/include/vector3d.h b/include/vector3d.h index 5f4f6133..c348cd74 100644 --- a/include/vector3d.h +++ b/include/vector3d.h @@ -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 __IRR_POINT_3D_H_INCLUDED__ -#define __IRR_POINT_3D_H_INCLUDED__ +#ifndef IRR_POINT_3D_H_INCLUDED +#define IRR_POINT_3D_H_INCLUDED #include "irrMath.h" @@ -59,14 +59,14 @@ namespace core T& operator [](u32 index) { - _IRR_DEBUG_BREAK_IF(index>2) // access violation + IRR_DEBUG_BREAK_IF(index>2) // access violation return *(&X+index); } const T& operator [](u32 index) const { - _IRR_DEBUG_BREAK_IF(index>2) // access violation + IRR_DEBUG_BREAK_IF(index>2) // access violation return *(&X+index); } @@ -471,4 +471,3 @@ namespace core } // end namespace irr #endif - diff --git a/source/Irrlicht/CIrrDeviceOSX.h b/source/Irrlicht/CIrrDeviceOSX.h index 7c34ce46..7034febf 100644 --- a/source/Irrlicht/CIrrDeviceOSX.h +++ b/source/Irrlicht/CIrrDeviceOSX.h @@ -47,60 +47,60 @@ namespace irr virtual ~CIrrDeviceMacOSX(); //! runs the device. Returns false if device wants to be deleted - virtual bool run() _IRR_OVERRIDE_; + virtual bool run() IRR_OVERRIDE; //! Cause the device to temporarily pause execution and let other processes to run // This should bring down processor usage without major performance loss for Irrlicht - virtual void yield() _IRR_OVERRIDE_; + virtual void yield() IRR_OVERRIDE; //! Pause execution and let other processes to run for a specified amount of time. - virtual void sleep(u32 timeMs, bool pauseTimer) _IRR_OVERRIDE_; + virtual void sleep(u32 timeMs, bool pauseTimer) IRR_OVERRIDE; //! sets the caption of the window - virtual void setWindowCaption(const wchar_t* text) _IRR_OVERRIDE_; + virtual void setWindowCaption(const wchar_t* text) IRR_OVERRIDE; //! returns if window is active. if not, nothing need to be drawn - virtual bool isWindowActive() const _IRR_OVERRIDE_; + virtual bool isWindowActive() const IRR_OVERRIDE; //! Checks if the Irrlicht window has focus - virtual bool isWindowFocused() const _IRR_OVERRIDE_; + virtual bool isWindowFocused() const IRR_OVERRIDE; //! Checks if the Irrlicht window is minimized - virtual bool isWindowMinimized() const _IRR_OVERRIDE_; + virtual bool isWindowMinimized() const IRR_OVERRIDE; //! presents a surface in the client area - virtual bool present(video::IImage* surface, void* windowId=0, core::rect* src=0 ) _IRR_OVERRIDE_; + virtual bool present(video::IImage* surface, void* windowId=0, core::rect* src=0 ) IRR_OVERRIDE; //! notifies the device that it should close itself - virtual void closeDevice() _IRR_OVERRIDE_; + virtual void closeDevice() IRR_OVERRIDE; //! Sets if the window should be resizable in windowed mode. - virtual void setResizable(bool resize) _IRR_OVERRIDE_; + virtual void setResizable(bool resize) IRR_OVERRIDE; //! Returns true if the window is resizable, false if not virtual bool isResizable() const; //! Minimizes the window if possible - virtual void minimizeWindow() _IRR_OVERRIDE_; + virtual void minimizeWindow() IRR_OVERRIDE; //! Maximizes the window if possible. - virtual void maximizeWindow() _IRR_OVERRIDE_; + virtual void maximizeWindow() IRR_OVERRIDE; //! Restore the window to normal size if possible. - virtual void restoreWindow() _IRR_OVERRIDE_; + virtual void restoreWindow() IRR_OVERRIDE; //! Get the position of this window on screen - virtual core::position2di getWindowPosition() _IRR_OVERRIDE_; + virtual core::position2di getWindowPosition() IRR_OVERRIDE; //! Activate any joysticks, and generate events for them. - virtual bool activateJoysticks(core::array & joystickInfo) _IRR_OVERRIDE_; + virtual bool activateJoysticks(core::array & joystickInfo) IRR_OVERRIDE; //! \return Returns a pointer to a list with all video modes //! supported by the gfx adapter. - virtual video::IVideoModeList* getVideoModeList() _IRR_OVERRIDE_; + virtual video::IVideoModeList* getVideoModeList() IRR_OVERRIDE; //! Get the device type - virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_DEVICE_TYPE getType() const IRR_OVERRIDE { return EIDT_OSX; } @@ -131,39 +131,39 @@ namespace irr } //! Changes the visible state of the mouse cursor. - virtual void setVisible(bool visible) _IRR_OVERRIDE_ + virtual void setVisible(bool visible) IRR_OVERRIDE { IsVisible = visible; Device->setCursorVisible(visible); } //! Returns if the cursor is currently visible. - virtual bool isVisible() const _IRR_OVERRIDE_ + virtual bool isVisible() const IRR_OVERRIDE { return IsVisible; } //! Sets the new position of the cursor. - virtual void setPosition(const core::position2d &pos) _IRR_OVERRIDE_ + virtual void setPosition(const core::position2d &pos) IRR_OVERRIDE { setPosition(pos.X, pos.Y); } //! Sets the new position of the cursor. - virtual void setPosition(f32 x, f32 y) _IRR_OVERRIDE_ + virtual void setPosition(f32 x, f32 y) IRR_OVERRIDE { setPosition((s32)(x*WindowSize.Width), (s32)(y*WindowSize.Height)); } //! Sets the new position of the cursor. - virtual void setPosition(const core::position2d &pos) _IRR_OVERRIDE_ + virtual void setPosition(const core::position2d &pos) IRR_OVERRIDE { if (CursorPos.X != pos.X || CursorPos.Y != pos.Y) setPosition(pos.X, pos.Y); } //! Sets the new position of the cursor. - virtual void setPosition(s32 x, s32 y) _IRR_OVERRIDE_ + virtual void setPosition(s32 x, s32 y) IRR_OVERRIDE { if (UseReferenceRect) { @@ -176,13 +176,13 @@ namespace irr } //! Returns the current position of the mouse cursor. - virtual const core::position2d& getPosition(bool updateCursor) _IRR_OVERRIDE_ + virtual const core::position2d& getPosition(bool updateCursor) IRR_OVERRIDE { return CursorPos; } //! Returns the current position of the mouse cursor. - virtual core::position2d getRelativePosition(bool updateCursor) _IRR_OVERRIDE_ + virtual core::position2d getRelativePosition(bool updateCursor) IRR_OVERRIDE { if (!UseReferenceRect) { @@ -195,7 +195,7 @@ namespace irr } //! Sets an absolute reference rect for calculating the cursor position. - virtual void setReferenceRect(core::rect* rect=0) _IRR_OVERRIDE_ + virtual void setReferenceRect(core::rect* rect=0) IRR_OVERRIDE { if (rect) { diff --git a/source/Irrlicht/CNSOGLManager.h b/source/Irrlicht/CNSOGLManager.h index 4f47e52d..a05e6ec4 100644 --- a/source/Irrlicht/CNSOGLManager.h +++ b/source/Irrlicht/CNSOGLManager.h @@ -31,31 +31,31 @@ namespace video ~CNSOGLManager(); // Initialize - bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) _IRR_OVERRIDE_; + bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) IRR_OVERRIDE; // Terminate - void terminate() _IRR_OVERRIDE_; + void terminate() IRR_OVERRIDE; // Create surface. - bool generateSurface() _IRR_OVERRIDE_; + bool generateSurface() IRR_OVERRIDE; // Destroy surface. - void destroySurface() _IRR_OVERRIDE_; + void destroySurface() IRR_OVERRIDE; // Create context. - bool generateContext() _IRR_OVERRIDE_; + bool generateContext() IRR_OVERRIDE; // Destroy EGL context. - void destroyContext() _IRR_OVERRIDE_; + void destroyContext() IRR_OVERRIDE; //! Get current context const SExposedVideoData& getContext() const; //! Change render context, disable old and activate new defined by videoData - bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) _IRR_OVERRIDE_; + bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) IRR_OVERRIDE; // Swap buffers. - bool swapBuffers() _IRR_OVERRIDE_; + bool swapBuffers() IRR_OVERRIDE; private: SIrrlichtCreationParameters Params; diff --git a/tests/coreutil.cpp b/tests/coreutil.cpp index 672cce0a..35a2cd31 100644 --- a/tests/coreutil.cpp +++ b/tests/coreutil.cpp @@ -6,43 +6,43 @@ using namespace core; bool testMergeFilename() { // path mergeFilename(const path& path, const path& filename, const path& extension = ""); - if ( mergeFilename(_IRR_TEXT(""), _IRR_TEXT(""), _IRR_TEXT("") ) != io::path(_IRR_TEXT("")) ) + if ( mergeFilename(IRR_TEXT(""), IRR_TEXT(""), IRR_TEXT("") ) != io::path(IRR_TEXT("")) ) return false; - if ( mergeFilename(_IRR_TEXT("folder"), _IRR_TEXT(""), _IRR_TEXT("") ) != io::path(_IRR_TEXT("folder/")) ) + if ( mergeFilename(IRR_TEXT("folder"), IRR_TEXT(""), IRR_TEXT("") ) != io::path(IRR_TEXT("folder/")) ) return false; - if ( mergeFilename(_IRR_TEXT("folder/"), _IRR_TEXT(""), _IRR_TEXT("") ) != io::path(_IRR_TEXT("folder/")) ) + if ( mergeFilename(IRR_TEXT("folder/"), IRR_TEXT(""), IRR_TEXT("") ) != io::path(IRR_TEXT("folder/")) ) return false; - if ( mergeFilename(_IRR_TEXT("folder"), _IRR_TEXT("file"), _IRR_TEXT("") ) != io::path(_IRR_TEXT("folder/file")) ) + if ( mergeFilename(IRR_TEXT("folder"), IRR_TEXT("file"), IRR_TEXT("") ) != io::path(IRR_TEXT("folder/file")) ) return false; - if ( mergeFilename(_IRR_TEXT("folder/"), _IRR_TEXT("file"), _IRR_TEXT("") ) != io::path(_IRR_TEXT("folder/file")) ) + if ( mergeFilename(IRR_TEXT("folder/"), IRR_TEXT("file"), IRR_TEXT("") ) != io::path(IRR_TEXT("folder/file")) ) return false; - if ( mergeFilename(_IRR_TEXT("folder\\"), _IRR_TEXT("file"), _IRR_TEXT("") ) != io::path(_IRR_TEXT("folder\\file")) ) + if ( mergeFilename(IRR_TEXT("folder\\"), IRR_TEXT("file"), IRR_TEXT("") ) != io::path(IRR_TEXT("folder\\file")) ) return false; - if ( mergeFilename(_IRR_TEXT(""), _IRR_TEXT("file"), _IRR_TEXT("") ) != io::path(_IRR_TEXT("file")) ) + if ( mergeFilename(IRR_TEXT(""), IRR_TEXT("file"), IRR_TEXT("") ) != io::path(IRR_TEXT("file")) ) return false; - if ( mergeFilename(_IRR_TEXT("."), _IRR_TEXT("file"), _IRR_TEXT("") ) != io::path(_IRR_TEXT("./file")) ) + if ( mergeFilename(IRR_TEXT("."), IRR_TEXT("file"), IRR_TEXT("") ) != io::path(IRR_TEXT("./file")) ) return false; - if ( mergeFilename(_IRR_TEXT("folder"), _IRR_TEXT(""), _IRR_TEXT(".bmp") ) != io::path(_IRR_TEXT("folder/.bmp")) ) + if ( mergeFilename(IRR_TEXT("folder"), IRR_TEXT(""), IRR_TEXT(".bmp") ) != io::path(IRR_TEXT("folder/.bmp")) ) return false; - if ( mergeFilename(_IRR_TEXT("folder/"), _IRR_TEXT(""), _IRR_TEXT(".bmp") ) != io::path(_IRR_TEXT("folder/.bmp")) ) + if ( mergeFilename(IRR_TEXT("folder/"), IRR_TEXT(""), IRR_TEXT(".bmp") ) != io::path(IRR_TEXT("folder/.bmp")) ) return false; - if ( mergeFilename(_IRR_TEXT("folder"), _IRR_TEXT(""), _IRR_TEXT("bmp") ) != io::path(_IRR_TEXT("folder/.bmp")) ) + if ( mergeFilename(IRR_TEXT("folder"), IRR_TEXT(""), IRR_TEXT("bmp") ) != io::path(IRR_TEXT("folder/.bmp")) ) return false; - if ( mergeFilename(_IRR_TEXT("."), _IRR_TEXT(""), _IRR_TEXT("bmp") ) != io::path(_IRR_TEXT("./.bmp")) ) + if ( mergeFilename(IRR_TEXT("."), IRR_TEXT(""), IRR_TEXT("bmp") ) != io::path(IRR_TEXT("./.bmp")) ) return false; - if ( mergeFilename(_IRR_TEXT("folder"), _IRR_TEXT("file"), _IRR_TEXT("bmp") ) != io::path(_IRR_TEXT("folder/file.bmp")) ) + if ( mergeFilename(IRR_TEXT("folder"), IRR_TEXT("file"), IRR_TEXT("bmp") ) != io::path(IRR_TEXT("folder/file.bmp")) ) return false; - if ( mergeFilename(_IRR_TEXT("folder/"), _IRR_TEXT("file"), _IRR_TEXT("bmp") ) != io::path(_IRR_TEXT("folder/file.bmp")) ) + if ( mergeFilename(IRR_TEXT("folder/"), IRR_TEXT("file"), IRR_TEXT("bmp") ) != io::path(IRR_TEXT("folder/file.bmp")) ) return false; - if ( mergeFilename(_IRR_TEXT("folder/"), _IRR_TEXT("file"), _IRR_TEXT(".bmp") ) != io::path(_IRR_TEXT("folder/file.bmp")) ) + if ( mergeFilename(IRR_TEXT("folder/"), IRR_TEXT("file"), IRR_TEXT(".bmp") ) != io::path(IRR_TEXT("folder/file.bmp")) ) return false; - if ( mergeFilename(_IRR_TEXT("folder"), _IRR_TEXT("file.bmp"), _IRR_TEXT("") ) != io::path(_IRR_TEXT("folder/file.bmp")) ) + if ( mergeFilename(IRR_TEXT("folder"), IRR_TEXT("file.bmp"), IRR_TEXT("") ) != io::path(IRR_TEXT("folder/file.bmp")) ) return false; - if ( mergeFilename(_IRR_TEXT(""), _IRR_TEXT("file"), _IRR_TEXT("bmp") ) != io::path(_IRR_TEXT("file.bmp")) ) + if ( mergeFilename(IRR_TEXT(""), IRR_TEXT("file"), IRR_TEXT("bmp") ) != io::path(IRR_TEXT("file.bmp")) ) return false; - if ( mergeFilename(_IRR_TEXT(""), _IRR_TEXT("file"), _IRR_TEXT(".bmp") ) != io::path(_IRR_TEXT("file.bmp")) ) + if ( mergeFilename(IRR_TEXT(""), IRR_TEXT("file"), IRR_TEXT(".bmp") ) != io::path(IRR_TEXT("file.bmp")) ) return false; - if ( mergeFilename(_IRR_TEXT("c:"), _IRR_TEXT("file"), _IRR_TEXT(".bmp") ) != io::path(_IRR_TEXT("c:/file.bmp")) ) // TODO: is this actually correct on windows? + if ( mergeFilename(IRR_TEXT("c:"), IRR_TEXT("file"), IRR_TEXT(".bmp") ) != io::path(IRR_TEXT("c:/file.bmp")) ) // TODO: is this actually correct on windows? return false; return true; diff --git a/tools/GUIEditor/CMemoryReadWriteFile.h b/tools/GUIEditor/CMemoryReadWriteFile.h index 4b110bf9..02e84f3b 100644 --- a/tools/GUIEditor/CMemoryReadWriteFile.h +++ b/tools/GUIEditor/CMemoryReadWriteFile.h @@ -56,7 +56,7 @@ namespace io virtual const io::path& getFileName() const; //! Flush the content of the buffer in the file - virtual bool flush() _IRR_OVERRIDE_; + virtual bool flush() IRR_OVERRIDE; //! Returns file data as an array core::array& getData(); diff --git a/tools/IrrFontTool/newFontTool/CFontTool.h b/tools/IrrFontTool/newFontTool/CFontTool.h index 5a35938b..e1b43ead 100644 --- a/tools/IrrFontTool/newFontTool/CFontTool.h +++ b/tools/IrrFontTool/newFontTool/CFontTool.h @@ -1,5 +1,5 @@ -#ifndef __IRR_FONT_TOOL_INCLUDED__ -#define __IRR_FONT_TOOL_INCLUDED__ +#ifndef IRR_FONT_TOOL_INCLUDED +#define IRR_FONT_TOOL_INCLUDED #include "irrlicht.h" @@ -75,4 +75,4 @@ namespace irr { }; } -#endif // __IRR_FONT_TOOL_INCLUDED__ +#endif // IRR_FONT_TOOL_INCLUDED