zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use _IRR_OVERRIDE_throughout. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5850 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2019-08-17 14:00:50 +00:00
parent 1d6ab9674f
commit b5f139f8a7
67 changed files with 298 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/CDynamicMeshBuffer.h
View File

@ -35,17 +35,17 @@ namespace scene
IndexBuffer->drop(); IndexBuffer->drop();
} }
virtual IVertexBuffer& getVertexBuffer() const virtual IVertexBuffer& getVertexBuffer() const _IRR_OVERRIDE_
{ {
return *VertexBuffer; return *VertexBuffer;
} }
virtual IIndexBuffer& getIndexBuffer() const virtual IIndexBuffer& getIndexBuffer() const _IRR_OVERRIDE_
{ {
return *IndexBuffer; return *IndexBuffer;
} }
virtual void setVertexBuffer(IVertexBuffer *newVertexBuffer) virtual void setVertexBuffer(IVertexBuffer *newVertexBuffer) _IRR_OVERRIDE_
{ {
if (newVertexBuffer) if (newVertexBuffer)
newVertexBuffer->grab(); newVertexBuffer->grab();
@ -55,7 +55,7 @@ namespace scene
VertexBuffer=newVertexBuffer; VertexBuffer=newVertexBuffer;
} }
virtual void setIndexBuffer(IIndexBuffer *newIndexBuffer) virtual void setIndexBuffer(IIndexBuffer *newIndexBuffer) _IRR_OVERRIDE_
{ {
if (newIndexBuffer) if (newIndexBuffer)
newIndexBuffer->grab(); newIndexBuffer->grab();
@ -66,31 +66,31 @@ namespace scene
} }
//! Get Material of this buffer. //! Get Material of this buffer.
virtual const video::SMaterial& getMaterial() const virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_
{ {
return Material; return Material;
} }
//! Get Material of this buffer. //! Get Material of this buffer.
virtual video::SMaterial& getMaterial() virtual video::SMaterial& getMaterial() _IRR_OVERRIDE_
{ {
return Material; return Material;
} }
//! Get bounding box //! Get bounding box
virtual const core::aabbox3d<f32>& getBoundingBox() const virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_
{ {
return BoundingBox; return BoundingBox;
} }
//! Set bounding box //! Set bounding box
virtual void setBoundingBox( const core::aabbox3df& box) virtual void setBoundingBox( const core::aabbox3df& box) _IRR_OVERRIDE_
{ {
BoundingBox = box; BoundingBox = box;
} }
//! Recalculate bounding box //! Recalculate bounding box
virtual void recalculateBoundingBox() virtual void recalculateBoundingBox() _IRR_OVERRIDE_
{ {
if (!getVertexBuffer().size()) if (!getVertexBuffer().size())
BoundingBox.reset(0,0,0); BoundingBox.reset(0,0,0);
@ -103,13 +103,13 @@ namespace scene
} }
//! Describe what kind of primitive geometry is used by the meshbuffer //! Describe what kind of primitive geometry is used by the meshbuffer
virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) _IRR_OVERRIDE_
{ {
PrimitiveType = type; PrimitiveType = type;
} }
//! Get the kind of primitive geometry which is used by the meshbuffer //! Get the kind of primitive geometry which is used by the meshbuffer
virtual E_PRIMITIVE_TYPE getPrimitiveType() const virtual E_PRIMITIVE_TYPE getPrimitiveType() const _IRR_OVERRIDE_
{ {
return PrimitiveType; return PrimitiveType;
} }

56
include/CIndexBuffer.h
View File

@ -39,46 +39,46 @@ namespace scene
public: public:
core::array<T> Indices; core::array<T> Indices;
virtual u32 stride() const {return sizeof(T);} virtual u32 stride() const _IRR_OVERRIDE_ {return sizeof(T);}
virtual u32 size() const {return Indices.size();} virtual u32 size() const _IRR_OVERRIDE_ {return Indices.size();}
virtual void push_back(const u32 &element) virtual void push_back(const u32 &element) _IRR_OVERRIDE_
{ {
// push const ref due to compiler problem with gcc 4.6, big endian // push const ref due to compiler problem with gcc 4.6, big endian
Indices.push_back((const T&)element); Indices.push_back((const T&)element);
} }
virtual u32 operator [](u32 index) const virtual u32 operator [](u32 index) const _IRR_OVERRIDE_
{ {
return (u32)(Indices[index]); return (u32)(Indices[index]);
} }
virtual u32 getLast() {return (u32)Indices.getLast();} virtual u32 getLast() _IRR_OVERRIDE_ {return (u32)Indices.getLast();}
virtual void setValue(u32 index, u32 value) virtual void setValue(u32 index, u32 value) _IRR_OVERRIDE_
{ {
Indices[index]=(T)value; Indices[index]=(T)value;
} }
virtual void set_used(u32 usedNow) virtual void set_used(u32 usedNow) _IRR_OVERRIDE_
{ {
Indices.set_used(usedNow); Indices.set_used(usedNow);
} }
virtual void reallocate(u32 new_size) virtual void reallocate(u32 new_size) _IRR_OVERRIDE_
{ {
Indices.reallocate(new_size); Indices.reallocate(new_size);
} }
virtual u32 allocated_size() const virtual u32 allocated_size() const _IRR_OVERRIDE_
{ {
return Indices.allocated_size(); return Indices.allocated_size();
} }
virtual void* pointer() {return Indices.pointer();} virtual void* pointer() _IRR_OVERRIDE_ {return Indices.pointer();}
virtual video::E_INDEX_TYPE getType() const virtual video::E_INDEX_TYPE getType() const _IRR_OVERRIDE_
{ {
if (sizeof(T)==sizeof(u16)) if (sizeof(T)==sizeof(u16))
return video::EIT_16BIT; 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);
virtual void setType(video::E_INDEX_TYPE IndexType) virtual void setType(video::E_INDEX_TYPE IndexType) _IRR_OVERRIDE_
{ {
IIndexList *NewIndices=0; IIndexList *NewIndices=0;
@ -141,78 +141,78 @@ namespace scene
Indices=NewIndices; Indices=NewIndices;
} }
virtual void* getData() {return Indices->pointer();} virtual void* getData() _IRR_OVERRIDE_ {return Indices->pointer();}
virtual video::E_INDEX_TYPE getType() const {return Indices->getType();} virtual video::E_INDEX_TYPE getType() const _IRR_OVERRIDE_ {return Indices->getType();}
virtual u32 stride() const {return Indices->stride();} virtual u32 stride() const _IRR_OVERRIDE_ {return Indices->stride();}
virtual u32 size() const virtual u32 size() const _IRR_OVERRIDE_
{ {
return Indices->size(); return Indices->size();
} }
virtual void push_back(const u32 &element) virtual void push_back(const u32 &element) _IRR_OVERRIDE_
{ {
Indices->push_back(element); Indices->push_back(element);
} }
virtual u32 operator [](u32 index) const virtual u32 operator [](u32 index) const _IRR_OVERRIDE_
{ {
return (*Indices)[index]; return (*Indices)[index];
} }
virtual u32 getLast() virtual u32 getLast() _IRR_OVERRIDE_
{ {
return Indices->getLast(); return Indices->getLast();
} }
virtual void setValue(u32 index, u32 value) virtual void setValue(u32 index, u32 value) _IRR_OVERRIDE_
{ {
Indices->setValue(index, value); Indices->setValue(index, value);
} }
virtual void set_used(u32 usedNow) virtual void set_used(u32 usedNow) _IRR_OVERRIDE_
{ {
Indices->set_used(usedNow); Indices->set_used(usedNow);
} }
virtual void reallocate(u32 new_size) virtual void reallocate(u32 new_size) _IRR_OVERRIDE_
{ {
Indices->reallocate(new_size); Indices->reallocate(new_size);
} }
virtual u32 allocated_size() const virtual u32 allocated_size() const _IRR_OVERRIDE_
{ {
return Indices->allocated_size(); return Indices->allocated_size();
} }
virtual void* pointer() virtual void* pointer() _IRR_OVERRIDE_
{ {
return Indices->pointer(); return Indices->pointer();
} }
//! get the current hardware mapping hint //! get the current hardware mapping hint
virtual E_HARDWARE_MAPPING getHardwareMappingHint() const virtual E_HARDWARE_MAPPING getHardwareMappingHint() const _IRR_OVERRIDE_
{ {
return MappingHint; return MappingHint;
} }
//! set the hardware mapping hint, for driver //! set the hardware mapping hint, for driver
virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) _IRR_OVERRIDE_
{ {
MappingHint=NewMappingHint; MappingHint=NewMappingHint;
} }
//! flags the mesh as changed, reloads hardware buffers //! flags the mesh as changed, reloads hardware buffers
virtual void setDirty() virtual void setDirty() _IRR_OVERRIDE_
{ {
++ChangedID; ++ChangedID;
} }
//! Get the currently used ID for identification of changes. //! Get the currently used ID for identification of changes.
/** This shouldn't be used for anything outside the VideoDriver. */ /** This shouldn't be used for anything outside the VideoDriver. */
virtual u32 getChangedID() const {return ChangedID;} virtual u32 getChangedID() const _IRR_OVERRIDE_ {return ChangedID;}
E_HARDWARE_MAPPING MappingHint; E_HARDWARE_MAPPING MappingHint;
u32 ChangedID; u32 ChangedID;

58
include/CMeshBuffer.h
View File

@ -31,7 +31,7 @@ namespace scene
//! Get material of this meshbuffer //! Get material of this meshbuffer
/** \return Material of this buffer */ /** \return Material of this buffer */
virtual const video::SMaterial& getMaterial() const virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_
{ {
return Material; return Material;
} }
@ -39,7 +39,7 @@ namespace scene
//! Get material of this meshbuffer //! Get material of this meshbuffer
/** \return Material of this buffer */ /** \return Material of this buffer */
virtual video::SMaterial& getMaterial() virtual video::SMaterial& getMaterial() _IRR_OVERRIDE_
{ {
return Material; return Material;
} }
@ -47,7 +47,7 @@ namespace scene
//! Get pointer to vertices //! Get pointer to vertices
/** \return Pointer to vertices. */ /** \return Pointer to vertices. */
virtual const void* getVertices() const virtual const void* getVertices() const _IRR_OVERRIDE_
{ {
return Vertices.const_pointer(); return Vertices.const_pointer();
} }
@ -55,7 +55,7 @@ namespace scene
//! Get pointer to vertices //! Get pointer to vertices
/** \return Pointer to vertices. */ /** \return Pointer to vertices. */
virtual void* getVertices() virtual void* getVertices() _IRR_OVERRIDE_
{ {
return Vertices.pointer(); return Vertices.pointer();
} }
@ -63,21 +63,21 @@ namespace scene
//! Get number of vertices //! Get number of vertices
/** \return Number of vertices. */ /** \return Number of vertices. */
virtual u32 getVertexCount() const virtual u32 getVertexCount() const _IRR_OVERRIDE_
{ {
return Vertices.size(); return Vertices.size();
} }
//! Get type of index data which is stored in this meshbuffer. //! Get type of index data which is stored in this meshbuffer.
/** \return Index type of this buffer. */ /** \return Index type of this buffer. */
virtual video::E_INDEX_TYPE getIndexType() const virtual video::E_INDEX_TYPE getIndexType() const _IRR_OVERRIDE_
{ {
return video::EIT_16BIT; return video::EIT_16BIT;
} }
//! Get pointer to indices //! Get pointer to indices
/** \return Pointer to indices. */ /** \return Pointer to indices. */
virtual const u16* getIndices() const virtual const u16* getIndices() const _IRR_OVERRIDE_
{ {
return Indices.const_pointer(); return Indices.const_pointer();
} }
@ -85,7 +85,7 @@ namespace scene
//! Get pointer to indices //! Get pointer to indices
/** \return Pointer to indices. */ /** \return Pointer to indices. */
virtual u16* getIndices() virtual u16* getIndices() _IRR_OVERRIDE_
{ {
return Indices.pointer(); return Indices.pointer();
} }
@ -93,7 +93,7 @@ namespace scene
//! Get number of indices //! Get number of indices
/** \return Number of indices. */ /** \return Number of indices. */
virtual u32 getIndexCount() const virtual u32 getIndexCount() const _IRR_OVERRIDE_
{ {
return Indices.size(); return Indices.size();
} }
@ -101,7 +101,7 @@ namespace scene
//! Get the axis aligned bounding box //! Get the axis aligned bounding box
/** \return Axis aligned bounding box of this buffer. */ /** \return Axis aligned bounding box of this buffer. */
virtual const core::aabbox3d<f32>& getBoundingBox() const virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_
{ {
return BoundingBox; return BoundingBox;
} }
@ -110,7 +110,7 @@ namespace scene
//! Set the axis aligned bounding box //! Set the axis aligned bounding box
/** \param box New axis aligned bounding box for this buffer. */ /** \param box New axis aligned bounding box for this buffer. */
//! set user axis aligned bounding box //! set user axis aligned bounding box
virtual void setBoundingBox(const core::aabbox3df& box) virtual void setBoundingBox(const core::aabbox3df& box) _IRR_OVERRIDE_
{ {
BoundingBox = box; BoundingBox = box;
} }
@ -118,7 +118,7 @@ namespace scene
//! Recalculate the bounding box. //! Recalculate the bounding box.
/** should be called if the mesh changed. */ /** should be called if the mesh changed. */
virtual void recalculateBoundingBox() virtual void recalculateBoundingBox() _IRR_OVERRIDE_
{ {
if (!Vertices.empty()) if (!Vertices.empty())
{ {
@ -135,43 +135,43 @@ namespace scene
//! Get type of vertex data stored in this buffer. //! Get type of vertex data stored in this buffer.
/** \return Type of vertex data. */ /** \return Type of vertex data. */
virtual video::E_VERTEX_TYPE getVertexType() const virtual video::E_VERTEX_TYPE getVertexType() const _IRR_OVERRIDE_
{ {
return T().getType(); return T().getType();
} }
//! returns position of vertex i //! returns position of vertex i
virtual const core::vector3df& getPosition(u32 i) const virtual const core::vector3df& getPosition(u32 i) const _IRR_OVERRIDE_
{ {
return Vertices[i].Pos; return Vertices[i].Pos;
} }
//! returns position of vertex i //! returns position of vertex i
virtual core::vector3df& getPosition(u32 i) virtual core::vector3df& getPosition(u32 i) _IRR_OVERRIDE_
{ {
return Vertices[i].Pos; return Vertices[i].Pos;
} }
//! returns normal of vertex i //! returns normal of vertex i
virtual const core::vector3df& getNormal(u32 i) const virtual const core::vector3df& getNormal(u32 i) const _IRR_OVERRIDE_
{ {
return Vertices[i].Normal; return Vertices[i].Normal;
} }
//! returns normal of vertex i //! returns normal of vertex i
virtual core::vector3df& getNormal(u32 i) virtual core::vector3df& getNormal(u32 i) _IRR_OVERRIDE_
{ {
return Vertices[i].Normal; return Vertices[i].Normal;
} }
//! returns texture coord of vertex i //! returns texture coord of vertex i
virtual const core::vector2df& getTCoords(u32 i) const virtual const core::vector2df& getTCoords(u32 i) const _IRR_OVERRIDE_
{ {
return Vertices[i].TCoords; return Vertices[i].TCoords;
} }
//! returns texture coord of vertex i //! returns texture coord of vertex i
virtual core::vector2df& getTCoords(u32 i) virtual core::vector2df& getTCoords(u32 i) _IRR_OVERRIDE_
{ {
return Vertices[i].TCoords; return Vertices[i].TCoords;
} }
@ -182,7 +182,7 @@ namespace scene
or the main buffer is of standard type. Otherwise, behavior is or the main buffer is of standard type. Otherwise, behavior is
undefined. undefined.
*/ */
virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) _IRR_OVERRIDE_
{ {
if (vertices == getVertices()) if (vertices == getVertices())
return; return;
@ -211,7 +211,7 @@ namespace scene
undefined. undefined.
\param other Meshbuffer to be appended to this one. \param other Meshbuffer to be appended to this one.
*/ */
virtual void append(const IMeshBuffer* const other) virtual void append(const IMeshBuffer* const other) _IRR_OVERRIDE_
{ {
/* /*
if (this==other) if (this==other)
@ -237,19 +237,19 @@ namespace scene
//! get the current hardware mapping hint //! get the current hardware mapping hint
virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const _IRR_OVERRIDE_
{ {
return MappingHint_Vertex; return MappingHint_Vertex;
} }
//! get the current hardware mapping hint //! get the current hardware mapping hint
virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const _IRR_OVERRIDE_
{ {
return MappingHint_Index; return MappingHint_Index;
} }
//! set the hardware mapping hint, for driver //! set the hardware mapping hint, for driver
virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) 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) if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX)
MappingHint_Vertex=NewMappingHint; MappingHint_Vertex=NewMappingHint;
@ -258,19 +258,19 @@ namespace scene
} }
//! Describe what kind of primitive geometry is used by the meshbuffer //! Describe what kind of primitive geometry is used by the meshbuffer
virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) _IRR_OVERRIDE_
{ {
PrimitiveType = type; PrimitiveType = type;
} }
//! Get the kind of primitive geometry which is used by the meshbuffer //! Get the kind of primitive geometry which is used by the meshbuffer
virtual E_PRIMITIVE_TYPE getPrimitiveType() const virtual E_PRIMITIVE_TYPE getPrimitiveType() const _IRR_OVERRIDE_
{ {
return PrimitiveType; return PrimitiveType;
} }
//! flags the mesh as changed, reloads hardware buffers //! flags the mesh as changed, reloads hardware buffers
virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_
{ {
if (Buffer==EBT_VERTEX_AND_INDEX ||Buffer==EBT_VERTEX) if (Buffer==EBT_VERTEX_AND_INDEX ||Buffer==EBT_VERTEX)
++ChangedID_Vertex; ++ChangedID_Vertex;
@ -280,11 +280,11 @@ namespace scene
//! Get the currently used ID for identification of changes. //! Get the currently used ID for identification of changes.
/** This shouldn't be used for anything outside the VideoDriver. */ /** This shouldn't be used for anything outside the VideoDriver. */
virtual u32 getChangedID_Vertex() const {return ChangedID_Vertex;} virtual u32 getChangedID_Vertex() const _IRR_OVERRIDE_ {return ChangedID_Vertex;}
//! Get the currently used ID for identification of changes. //! Get the currently used ID for identification of changes.
/** This shouldn't be used for anything outside the VideoDriver. */ /** This shouldn't be used for anything outside the VideoDriver. */
virtual u32 getChangedID_Index() const {return ChangedID_Index;} virtual u32 getChangedID_Index() const _IRR_OVERRIDE_ {return ChangedID_Index;}
u32 ChangedID_Vertex; u32 ChangedID_Vertex;
u32 ChangedID_Index; u32 ChangedID_Index;

52
include/CVertexBuffer.h
View File

@ -40,33 +40,33 @@ namespace scene
public: public:
core::array<T> Vertices; core::array<T> Vertices;
virtual u32 stride() const {return sizeof(T);} virtual u32 stride() const _IRR_OVERRIDE_ {return sizeof(T);}
virtual u32 size() const {return Vertices.size();} virtual u32 size() const _IRR_OVERRIDE_ {return Vertices.size();}
virtual void push_back (const video::S3DVertex &element) virtual void push_back (const video::S3DVertex &element) _IRR_OVERRIDE_
{Vertices.push_back((T&)element);} {Vertices.push_back((T&)element);}
virtual video::S3DVertex& operator [](const u32 index) const virtual video::S3DVertex& operator [](const u32 index) const _IRR_OVERRIDE_
{return (video::S3DVertex&)Vertices[index];} {return (video::S3DVertex&)Vertices[index];}
virtual video::S3DVertex& getLast() virtual video::S3DVertex& getLast() _IRR_OVERRIDE_
{return (video::S3DVertex&)Vertices.getLast();} {return (video::S3DVertex&)Vertices.getLast();}
virtual void set_used(u32 usedNow) virtual void set_used(u32 usedNow) _IRR_OVERRIDE_
{Vertices.set_used(usedNow);} {Vertices.set_used(usedNow);}
virtual void reallocate(u32 new_size) virtual void reallocate(u32 new_size) _IRR_OVERRIDE_
{Vertices.reallocate(new_size);} {Vertices.reallocate(new_size);}
virtual u32 allocated_size() const virtual u32 allocated_size() const _IRR_OVERRIDE_
{ {
return Vertices.allocated_size(); return Vertices.allocated_size();
} }
virtual video::S3DVertex* pointer() {return Vertices.pointer();} virtual video::S3DVertex* pointer() _IRR_OVERRIDE_ {return Vertices.pointer();}
virtual video::E_VERTEX_TYPE getType() const {return T().getType();} virtual video::E_VERTEX_TYPE getType() const _IRR_OVERRIDE_ {return T().getType();}
}; };
public: public:
@ -95,7 +95,7 @@ namespace scene
} }
virtual void setType(video::E_VERTEX_TYPE vertexType) virtual void setType(video::E_VERTEX_TYPE vertexType) _IRR_OVERRIDE_
{ {
IVertexList *NewVertices=0; IVertexList *NewVertices=0;
@ -130,73 +130,73 @@ namespace scene
Vertices=NewVertices; Vertices=NewVertices;
} }
virtual void* getData() {return Vertices->pointer();} virtual void* getData() _IRR_OVERRIDE_ {return Vertices->pointer();}
virtual video::E_VERTEX_TYPE getType() const {return Vertices->getType();} virtual video::E_VERTEX_TYPE getType() const _IRR_OVERRIDE_ {return Vertices->getType();}
virtual u32 stride() const {return Vertices->stride();} virtual u32 stride() const _IRR_OVERRIDE_ {return Vertices->stride();}
virtual u32 size() const virtual u32 size() const _IRR_OVERRIDE_
{ {
return Vertices->size(); return Vertices->size();
} }
virtual void push_back (const video::S3DVertex &element) virtual void push_back (const video::S3DVertex &element) _IRR_OVERRIDE_
{ {
Vertices->push_back(element); Vertices->push_back(element);
} }
virtual video::S3DVertex& operator [](const u32 index) const virtual video::S3DVertex& operator [](const u32 index) const _IRR_OVERRIDE_
{ {
return (*Vertices)[index]; return (*Vertices)[index];
} }
virtual video::S3DVertex& getLast() virtual video::S3DVertex& getLast() _IRR_OVERRIDE_
{ {
return Vertices->getLast(); return Vertices->getLast();
} }
virtual void set_used(u32 usedNow) virtual void set_used(u32 usedNow) _IRR_OVERRIDE_
{ {
Vertices->set_used(usedNow); Vertices->set_used(usedNow);
} }
virtual void reallocate(u32 new_size) virtual void reallocate(u32 new_size) _IRR_OVERRIDE_
{ {
Vertices->reallocate(new_size); Vertices->reallocate(new_size);
} }
virtual u32 allocated_size() const virtual u32 allocated_size() const _IRR_OVERRIDE_
{ {
return Vertices->allocated_size(); return Vertices->allocated_size();
} }
virtual video::S3DVertex* pointer() virtual video::S3DVertex* pointer() _IRR_OVERRIDE_
{ {
return Vertices->pointer(); return Vertices->pointer();
} }
//! get the current hardware mapping hint //! get the current hardware mapping hint
virtual E_HARDWARE_MAPPING getHardwareMappingHint() const virtual E_HARDWARE_MAPPING getHardwareMappingHint() const _IRR_OVERRIDE_
{ {
return MappingHint; return MappingHint;
} }
//! set the hardware mapping hint, for driver //! set the hardware mapping hint, for driver
virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) _IRR_OVERRIDE_
{ {
MappingHint=NewMappingHint; MappingHint=NewMappingHint;
} }
//! flags the mesh as changed, reloads hardware buffers //! flags the mesh as changed, reloads hardware buffers
virtual void setDirty() virtual void setDirty() _IRR_OVERRIDE_
{ {
++ChangedID; ++ChangedID;
} }
//! Get the currently used ID for identification of changes. //! Get the currently used ID for identification of changes.
/** This shouldn't be used for anything outside the VideoDriver. */ /** This shouldn't be used for anything outside the VideoDriver. */
virtual u32 getChangedID() const {return ChangedID;} virtual u32 getChangedID() const _IRR_OVERRIDE_ {return ChangedID;}
E_HARDWARE_MAPPING MappingHint; E_HARDWARE_MAPPING MappingHint;
u32 ChangedID; u32 ChangedID;

2
include/IAnimatedMesh.h
View File

@ -61,7 +61,7 @@ namespace scene
if getMeshType() returns EAMT_MD2 it's safe to cast the if getMeshType() returns EAMT_MD2 it's safe to cast the
IAnimatedMesh to IAnimatedMeshMD2. IAnimatedMesh to IAnimatedMeshMD2.
\returns Type of the mesh. */ \returns Type of the mesh. */
virtual E_ANIMATED_MESH_TYPE getMeshType() const virtual E_ANIMATED_MESH_TYPE getMeshType() const _IRR_OVERRIDE_
{ {
return EAMT_UNKNOWN; return EAMT_UNKNOWN;
} }

2
include/IBoneSceneNode.h
View File

@ -84,7 +84,7 @@ namespace scene
//! The render method. //! The render method.
/** Does nothing as bones are not visible. */ /** Does nothing as bones are not visible. */
virtual void render() { } virtual void render() _IRR_OVERRIDE_ { }
//! How the relative transformation of the bone is used //! How the relative transformation of the bone is used
virtual void setSkinningSpace( E_BONE_SKINNING_SPACE space ) =0; virtual void setSkinningSpace( E_BONE_SKINNING_SPACE space ) =0;

4
include/ICameraSceneNode.h
View File

@ -171,7 +171,7 @@ namespace scene
virtual bool getTargetAndRotationBinding(void) const =0; virtual bool getTargetAndRotationBinding(void) const =0;
//! Writes attributes of the camera node //! Writes attributes of the camera node
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_
{ {
ISceneNode::serializeAttributes(out, options); ISceneNode::serializeAttributes(out, options);
@ -181,7 +181,7 @@ namespace scene
} }
//! Reads attributes of the camera node //! Reads attributes of the camera node
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_
{ {
ISceneNode::deserializeAttributes(in, options); ISceneNode::deserializeAttributes(in, options);
if (!in) if (!in)

46
include/IDynamicMeshBuffer.h
View File

@ -50,7 +50,7 @@ namespace scene
\param numVertices Number of vertices in the array. \param numVertices Number of vertices in the array.
\param indices Pointer to index array. \param indices Pointer to index array.
\param numIndices Number of indices in array. */ \param numIndices Number of indices in array. */
virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) 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 //! Append the meshbuffer to the current buffer
/** Only works for compatible vertex types /** Only works for compatible vertex types
\param other Buffer to append to this one. */ \param other Buffer to append to this one. */
virtual void append(const IMeshBuffer* const other) virtual void append(const IMeshBuffer* const other) _IRR_OVERRIDE_
{ {
} }
@ -66,19 +66,19 @@ namespace scene
// ------------------- To be removed? ------------------- // // ------------------- To be removed? ------------------- //
//! get the current hardware mapping hint //! get the current hardware mapping hint
virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const _IRR_OVERRIDE_
{ {
return getVertexBuffer().getHardwareMappingHint(); return getVertexBuffer().getHardwareMappingHint();
} }
//! get the current hardware mapping hint //! get the current hardware mapping hint
virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const _IRR_OVERRIDE_
{ {
return getIndexBuffer().getHardwareMappingHint(); return getIndexBuffer().getHardwareMappingHint();
} }
//! set the hardware mapping hint, for driver //! set the hardware mapping hint, for driver
virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) 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) if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX)
getVertexBuffer().setHardwareMappingHint(NewMappingHint); getVertexBuffer().setHardwareMappingHint(NewMappingHint);
@ -87,7 +87,7 @@ namespace scene
} }
//! flags the mesh as changed, reloads hardware buffers //! flags the mesh as changed, reloads hardware buffers
virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_
{ {
if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX) if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX)
getVertexBuffer().setDirty(); getVertexBuffer().setDirty();
@ -95,12 +95,12 @@ namespace scene
getIndexBuffer().setDirty(); getIndexBuffer().setDirty();
} }
virtual u32 getChangedID_Vertex() const virtual u32 getChangedID_Vertex() const _IRR_OVERRIDE_
{ {
return getVertexBuffer().getChangedID(); return getVertexBuffer().getChangedID();
} }
virtual u32 getChangedID_Index() const virtual u32 getChangedID_Index() const _IRR_OVERRIDE_
{ {
return getIndexBuffer().getChangedID(); return getIndexBuffer().getChangedID();
} }
@ -109,7 +109,7 @@ namespace scene
//! Get type of vertex data which is stored in this meshbuffer. //! Get type of vertex data which is stored in this meshbuffer.
/** \return Vertex type of this buffer. */ /** \return Vertex type of this buffer. */
virtual video::E_VERTEX_TYPE getVertexType() const virtual video::E_VERTEX_TYPE getVertexType() const _IRR_OVERRIDE_
{ {
return getVertexBuffer().getType(); return getVertexBuffer().getType();
} }
@ -117,7 +117,7 @@ namespace scene
//! Get access to vertex data. The data is an array of vertices. //! Get access to vertex data. The data is an array of vertices.
/** Which vertex type is used can be determined by getVertexType(). /** Which vertex type is used can be determined by getVertexType().
\return Pointer to array of vertices. */ \return Pointer to array of vertices. */
virtual const void* getVertices() const virtual const void* getVertices() const _IRR_OVERRIDE_
{ {
return getVertexBuffer().getData(); return getVertexBuffer().getData();
} }
@ -125,78 +125,78 @@ namespace scene
//! Get access to vertex data. The data is an array of vertices. //! Get access to vertex data. The data is an array of vertices.
/** Which vertex type is used can be determined by getVertexType(). /** Which vertex type is used can be determined by getVertexType().
\return Pointer to array of vertices. */ \return Pointer to array of vertices. */
virtual void* getVertices() virtual void* getVertices() _IRR_OVERRIDE_
{ {
return getVertexBuffer().getData(); return getVertexBuffer().getData();
} }
//! Get amount of vertices in meshbuffer. //! Get amount of vertices in meshbuffer.
/** \return Number of vertices in this buffer. */ /** \return Number of vertices in this buffer. */
virtual u32 getVertexCount() const virtual u32 getVertexCount() const _IRR_OVERRIDE_
{ {
return getVertexBuffer().size(); return getVertexBuffer().size();
} }
//! Get type of index data which is stored in this meshbuffer. //! Get type of index data which is stored in this meshbuffer.
/** \return Index type of this buffer. */ /** \return Index type of this buffer. */
virtual video::E_INDEX_TYPE getIndexType() const virtual video::E_INDEX_TYPE getIndexType() const _IRR_OVERRIDE_
{ {
return getIndexBuffer().getType(); return getIndexBuffer().getType();
} }
//! Get access to indices. //! Get access to indices.
/** \return Pointer to indices array. */ /** \return Pointer to indices array. */
virtual const u16* getIndices() const virtual const u16* getIndices() const _IRR_OVERRIDE_
{ {
return (u16*)getIndexBuffer().getData(); return (u16*)getIndexBuffer().getData();
} }
//! Get access to indices. //! Get access to indices.
/** \return Pointer to indices array. */ /** \return Pointer to indices array. */
virtual u16* getIndices() virtual u16* getIndices() _IRR_OVERRIDE_
{ {
return (u16*)getIndexBuffer().getData(); return (u16*)getIndexBuffer().getData();
} }
//! Get amount of indices in this meshbuffer. //! Get amount of indices in this meshbuffer.
/** \return Number of indices in this buffer. */ /** \return Number of indices in this buffer. */
virtual u32 getIndexCount() const virtual u32 getIndexCount() const _IRR_OVERRIDE_
{ {
return getIndexBuffer().size(); return getIndexBuffer().size();
} }
//! returns position of vertex i //! returns position of vertex i
virtual const core::vector3df& getPosition(u32 i) const virtual const core::vector3df& getPosition(u32 i) const _IRR_OVERRIDE_
{ {
return getVertexBuffer()[i].Pos; return getVertexBuffer()[i].Pos;
} }
//! returns position of vertex i //! returns position of vertex i
virtual core::vector3df& getPosition(u32 i) virtual core::vector3df& getPosition(u32 i) _IRR_OVERRIDE_
{ {
return getVertexBuffer()[i].Pos; return getVertexBuffer()[i].Pos;
} }
//! returns texture coords of vertex i //! returns texture coords of vertex i
virtual const core::vector2df& getTCoords(u32 i) const virtual const core::vector2df& getTCoords(u32 i) const _IRR_OVERRIDE_
{ {
return getVertexBuffer()[i].TCoords; return getVertexBuffer()[i].TCoords;
} }
//! returns texture coords of vertex i //! returns texture coords of vertex i
virtual core::vector2df& getTCoords(u32 i) virtual core::vector2df& getTCoords(u32 i) _IRR_OVERRIDE_
{ {
return getVertexBuffer()[i].TCoords; return getVertexBuffer()[i].TCoords;
} }
//! returns normal of vertex i //! returns normal of vertex i
virtual const core::vector3df& getNormal(u32 i) const virtual const core::vector3df& getNormal(u32 i) const _IRR_OVERRIDE_
{ {
return getVertexBuffer()[i].Normal; return getVertexBuffer()[i].Normal;
} }
//! returns normal of vertex i //! returns normal of vertex i
virtual core::vector3df& getNormal(u32 i) virtual core::vector3df& getNormal(u32 i) _IRR_OVERRIDE_
{ {
return getVertexBuffer()[i].Normal; return getVertexBuffer()[i].Normal;
} }

6
include/IGUIElement.h
View File

@ -524,7 +524,7 @@ public:
//! Called if an event happened. //! Called if an event happened.
virtual bool OnEvent(const SEvent& event) virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_
{ {
return Parent ? Parent->OnEvent(event) : false; return Parent ? Parent->OnEvent(event) : false;
} }
@ -769,7 +769,7 @@ public:
//! Writes attributes of the scene node. //! Writes attributes of the scene node.
/** Implement this to expose the attributes of your scene node for /** Implement this to expose the attributes of your scene node for
scripting languages, editors, debuggers or xml serialization purposes. */ scripting languages, editors, debuggers or xml serialization purposes. */
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_
{ {
out->addString("Name", Name.c_str()); out->addString("Name", Name.c_str());
out->addInt("Id", ID ); out->addInt("Id", ID );
@ -794,7 +794,7 @@ public:
//! Reads attributes of the scene node. //! Reads attributes of the scene node.
/** Implement this to set the attributes of your scene node for /** Implement this to set the attributes of your scene node for
scripting languages, editors, debuggers or xml deserialization purposes. */ scripting languages, editors, debuggers or xml deserialization purposes. */
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_
{ {
setName(in->getAttributeAsString("Name", Name)); setName(in->getAttributeAsString("Name", Name));
setID(in->getAttributeAsInt("Id", ID)); setID(in->getAttributeAsInt("Id", ID));

2
include/IGUIFontBitmap.h
View File

@ -19,7 +19,7 @@ class IGUIFontBitmap : public IGUIFont
public: public:
//! Returns the type of this font //! Returns the type of this font
virtual EGUI_FONT_TYPE getType() const { return EGFT_BITMAP; } virtual EGUI_FONT_TYPE getType() const _IRR_OVERRIDE_ { return EGFT_BITMAP; }
//! returns the parsed Symbol Information //! returns the parsed Symbol Information
virtual IGUISpriteBank* getSpriteBank() const = 0; virtual IGUISpriteBank* getSpriteBank() const = 0;

2
include/IParticleAnimatedMeshSceneNodeEmitter.h
View File

@ -43,7 +43,7 @@ public:
virtual bool getEveryMeshVertex() const = 0; virtual bool getEveryMeshVertex() const = 0;
//! Get emitter type //! Get emitter type
virtual E_PARTICLE_EMITTER_TYPE getType() const { return EPET_ANIMATED_MESH; } virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_ANIMATED_MESH; }
}; };
} // end namespace scene } // end namespace scene

2
include/IParticleAttractionAffector.h
View File

@ -54,7 +54,7 @@ public:
virtual bool getAffectZ() const = 0; virtual bool getAffectZ() const = 0;
//! Get emitter type //! Get emitter type
virtual E_PARTICLE_AFFECTOR_TYPE getType() const { return EPAT_ATTRACT; } virtual E_PARTICLE_AFFECTOR_TYPE getType() const _IRR_OVERRIDE_ { return EPAT_ATTRACT; }
}; };
} // end namespace scene } // end namespace scene

2
include/IParticleBoxEmitter.h
View File

@ -25,7 +25,7 @@ public:
virtual const core::aabbox3df& getBox() const = 0; virtual const core::aabbox3df& getBox() const = 0;
//! Get emitter type //! Get emitter type
virtual E_PARTICLE_EMITTER_TYPE getType() const { return EPET_BOX; } virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_BOX; }
}; };
} // end namespace scene } // end namespace scene

2
include/IParticleCylinderEmitter.h
View File

@ -48,7 +48,7 @@ public:
virtual bool getOutlineOnly() const = 0; virtual bool getOutlineOnly() const = 0;
//! Get emitter type //! Get emitter type
virtual E_PARTICLE_EMITTER_TYPE getType() const { return EPET_CYLINDER; } virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_CYLINDER; }
}; };
} // end namespace scene } // end namespace scene

2
include/IParticleFadeOutAffector.h
View File

@ -30,7 +30,7 @@ public:
virtual u32 getFadeOutTime() const = 0; virtual u32 getFadeOutTime() const = 0;
//! Get emitter type //! Get emitter type
virtual E_PARTICLE_AFFECTOR_TYPE getType() const { return EPAT_FADE_OUT; } virtual E_PARTICLE_AFFECTOR_TYPE getType() const _IRR_OVERRIDE_ { return EPAT_FADE_OUT; }
}; };
} // end namespace scene } // end namespace scene

2
include/IParticleGravityAffector.h
View File

@ -31,7 +31,7 @@ public:
virtual const core::vector3df& getGravity() const = 0; virtual const core::vector3df& getGravity() const = 0;
//! Get emitter type //! Get emitter type
virtual E_PARTICLE_AFFECTOR_TYPE getType() const { return EPAT_GRAVITY; } virtual E_PARTICLE_AFFECTOR_TYPE getType() const _IRR_OVERRIDE_ { return EPAT_GRAVITY; }
}; };
} // end namespace scene } // end namespace scene

2
include/IParticleMeshEmitter.h
View File

@ -43,7 +43,7 @@ public:
virtual bool getEveryMeshVertex() const = 0; virtual bool getEveryMeshVertex() const = 0;
//! Get emitter type //! Get emitter type
virtual E_PARTICLE_EMITTER_TYPE getType() const { return EPET_MESH; } virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_MESH; }
}; };
} // end namespace scene } // end namespace scene

2
include/IParticleRingEmitter.h
View File

@ -36,7 +36,7 @@ public:
virtual f32 getRingThickness() const = 0; virtual f32 getRingThickness() const = 0;
//! Get emitter type //! Get emitter type
virtual E_PARTICLE_EMITTER_TYPE getType() const { return EPET_RING; } virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_RING; }
}; };
} // end namespace scene } // end namespace scene

2
include/IParticleRotationAffector.h
View File

@ -30,7 +30,7 @@ public:
virtual const core::vector3df& getSpeed() const = 0; virtual const core::vector3df& getSpeed() const = 0;
//! Get emitter type //! Get emitter type
virtual E_PARTICLE_AFFECTOR_TYPE getType() const { return EPAT_ROTATE; } virtual E_PARTICLE_AFFECTOR_TYPE getType() const _IRR_OVERRIDE_ { return EPAT_ROTATE; }
}; };
} // end namespace scene } // end namespace scene

2
include/IParticleSphereEmitter.h
View File

@ -30,7 +30,7 @@ public:
virtual f32 getRadius() const = 0; virtual f32 getRadius() const = 0;
//! Get emitter type //! Get emitter type
virtual E_PARTICLE_EMITTER_TYPE getType() const { return EPET_SPHERE; } virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_SPHERE; }
}; };
} // end namespace scene } // end namespace scene

4
include/ISceneNode.h
View File

@ -697,7 +697,7 @@ namespace scene
\param out The attribute container to write into. \param out The attribute container to write into.
\param options Additional options which might influence the \param options Additional options which might influence the
serialization. */ serialization. */
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_
{ {
if (!out) if (!out)
return; return;
@ -722,7 +722,7 @@ namespace scene
\param in The attribute container to read from. \param in The attribute container to read from.
\param options Additional options which might influence the \param options Additional options which might influence the
deserialization. */ deserialization. */
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_
{ {
if (!in) if (!in)
return; return;

2
include/IVolumeLightSceneNode.h
View File

@ -27,7 +27,7 @@ namespace scene
: ISceneNode(parent, mgr, id, position, rotation, scale) {}; : ISceneNode(parent, mgr, id, position, rotation, scale) {};
//! Returns type of the scene node //! Returns type of the scene node
virtual ESCENE_NODE_TYPE getType() const { 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 //! Sets the number of segments across the U axis
virtual void setSubDivideU(const u32 inU) =0; virtual void setSubDivideU(const u32 inU) =0;

26
include/SAnimatedMesh.h
View File

@ -38,14 +38,14 @@ namespace scene
//! Gets the frame count of the animated mesh. //! Gets the frame count of the animated mesh.
/** \return Amount of frames. If the amount is 1, it is a static, non animated mesh. */ /** \return Amount of frames. If the amount is 1, it is a static, non animated mesh. */
virtual u32 getFrameCount() const virtual u32 getFrameCount() const _IRR_OVERRIDE_
{ {
return Meshes.size(); return Meshes.size();
} }
//! Gets the default animation speed of the animated mesh. //! 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. */ /** \return Amount of frames per second. If the amount is 0, it is a static, non animated mesh. */
virtual f32 getAnimationSpeed() const virtual f32 getAnimationSpeed() const _IRR_OVERRIDE_
{ {
return FramesPerSecond; return FramesPerSecond;
} }
@ -53,7 +53,7 @@ namespace scene
//! Gets the frame count of the animated mesh. //! 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. /** \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.*/ The actual speed is set in the scene node the mesh is instantiated in.*/
virtual void setAnimationSpeed(f32 fps) virtual void setAnimationSpeed(f32 fps) _IRR_OVERRIDE_
{ {
FramesPerSecond=fps; FramesPerSecond=fps;
} }
@ -66,7 +66,7 @@ namespace scene
\param startFrameLoop: start frame \param startFrameLoop: start frame
\param endFrameLoop: end frame \param endFrameLoop: end frame
\return The animated mesh based on a detail level. */ \return The animated mesh based on a detail level. */
virtual IMesh* getMesh(s32 frame, s32 detailLevel=255, s32 startFrameLoop=-1, s32 endFrameLoop=-1) virtual IMesh* getMesh(s32 frame, s32 detailLevel=255, s32 startFrameLoop=-1, s32 endFrameLoop=-1) _IRR_OVERRIDE_
{ {
if (Meshes.empty()) if (Meshes.empty())
return 0; return 0;
@ -86,13 +86,13 @@ namespace scene
//! Returns an axis aligned bounding box of the mesh. //! Returns an axis aligned bounding box of the mesh.
/** \return A bounding box of this mesh is returned. */ /** \return A bounding box of this mesh is returned. */
virtual const core::aabbox3d<f32>& getBoundingBox() const virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_
{ {
return Box; return Box;
} }
//! set user axis aligned bounding box //! set user axis aligned bounding box
virtual void setBoundingBox(const core::aabbox3df& box) virtual void setBoundingBox(const core::aabbox3df& box) _IRR_OVERRIDE_
{ {
Box = box; Box = box;
} }
@ -112,13 +112,13 @@ namespace scene
} }
//! Returns the type of the animated mesh. //! Returns the type of the animated mesh.
virtual E_ANIMATED_MESH_TYPE getMeshType() const virtual E_ANIMATED_MESH_TYPE getMeshType() const _IRR_OVERRIDE_
{ {
return Type; return Type;
} }
//! returns amount of mesh buffers. //! returns amount of mesh buffers.
virtual u32 getMeshBufferCount() const virtual u32 getMeshBufferCount() const _IRR_OVERRIDE_
{ {
if (Meshes.empty()) if (Meshes.empty())
return 0; return 0;
@ -127,7 +127,7 @@ namespace scene
} }
//! returns pointer to a mesh buffer //! returns pointer to a mesh buffer
virtual IMeshBuffer* getMeshBuffer(u32 nr) const virtual IMeshBuffer* getMeshBuffer(u32 nr) const _IRR_OVERRIDE_
{ {
if (Meshes.empty()) if (Meshes.empty())
return 0; return 0;
@ -139,7 +139,7 @@ namespace scene
/** \param material: material to search for /** \param material: material to search for
\return Returns the pointer to the mesh buffer or \return Returns the pointer to the mesh buffer or
NULL if there is no such mesh buffer. */ NULL if there is no such mesh buffer. */
virtual IMeshBuffer* getMeshBuffer( const video::SMaterial &material) const virtual IMeshBuffer* getMeshBuffer( const video::SMaterial &material) const _IRR_OVERRIDE_
{ {
if (Meshes.empty()) if (Meshes.empty())
return 0; return 0;
@ -148,21 +148,21 @@ namespace scene
} }
//! Set a material flag for all meshbuffers of this mesh. //! Set a material flag for all meshbuffers of this mesh.
virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) _IRR_OVERRIDE_
{ {
for (u32 i=0; i<Meshes.size(); ++i) for (u32 i=0; i<Meshes.size(); ++i)
Meshes[i]->setMaterialFlag(flag, newvalue); Meshes[i]->setMaterialFlag(flag, newvalue);
} }
//! set the hardware mapping hint, for driver //! set the hardware mapping hint, for driver
virtual void setHardwareMappingHint( E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX ) virtual void setHardwareMappingHint( E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX ) _IRR_OVERRIDE_
{ {
for (u32 i=0; i<Meshes.size(); ++i) for (u32 i=0; i<Meshes.size(); ++i)
Meshes[i]->setHardwareMappingHint(newMappingHint, buffer); Meshes[i]->setHardwareMappingHint(newMappingHint, buffer);
} }
//! flags the meshbuffer as changed, reloads hardware buffers //! flags the meshbuffer as changed, reloads hardware buffers
virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_
{ {
for (u32 i=0; i<Meshes.size(); ++i) for (u32 i=0; i<Meshes.size(); ++i)
Meshes[i]->setDirty(buffer); Meshes[i]->setDirty(buffer);

16
include/SMesh.h
View File

@ -44,20 +44,20 @@ namespace scene
//! returns amount of mesh buffers. //! returns amount of mesh buffers.
virtual u32 getMeshBufferCount() const virtual u32 getMeshBufferCount() const _IRR_OVERRIDE_
{ {
return MeshBuffers.size(); return MeshBuffers.size();
} }
//! returns pointer to a mesh buffer //! returns pointer to a mesh buffer
virtual IMeshBuffer* getMeshBuffer(u32 nr) const virtual IMeshBuffer* getMeshBuffer(u32 nr) const _IRR_OVERRIDE_
{ {
return MeshBuffers[nr]; return MeshBuffers[nr];
} }
//! returns a meshbuffer which fits a material //! returns a meshbuffer which fits a material
/** reverse search */ /** reverse search */
virtual IMeshBuffer* getMeshBuffer( const video::SMaterial & material) const virtual IMeshBuffer* getMeshBuffer( const video::SMaterial & material) const _IRR_OVERRIDE_
{ {
for (s32 i = (s32)MeshBuffers.size()-1; i >= 0; --i) for (s32 i = (s32)MeshBuffers.size()-1; i >= 0; --i)
{ {
@ -69,13 +69,13 @@ namespace scene
} }
//! returns an axis aligned bounding box //! returns an axis aligned bounding box
virtual const core::aabbox3d<f32>& getBoundingBox() const virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_
{ {
return BoundingBox; return BoundingBox;
} }
//! set user axis aligned bounding box //! set user axis aligned bounding box
virtual void setBoundingBox( const core::aabbox3df& box) virtual void setBoundingBox( const core::aabbox3df& box) _IRR_OVERRIDE_
{ {
BoundingBox = box; BoundingBox = box;
} }
@ -118,21 +118,21 @@ namespace scene
} }
//! sets a flag of all contained materials to a new value //! sets a flag of all contained materials to a new value
virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) _IRR_OVERRIDE_
{ {
for (u32 i=0; i<MeshBuffers.size(); ++i) for (u32 i=0; i<MeshBuffers.size(); ++i)
MeshBuffers[i]->getMaterial().setFlag(flag, newvalue); MeshBuffers[i]->getMaterial().setFlag(flag, newvalue);
} }
//! set the hardware mapping hint, for driver //! set the hardware mapping hint, for driver
virtual void setHardwareMappingHint( E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX ) virtual void setHardwareMappingHint( E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX ) _IRR_OVERRIDE_
{ {
for (u32 i=0; i<MeshBuffers.size(); ++i) for (u32 i=0; i<MeshBuffers.size(); ++i)
MeshBuffers[i]->setHardwareMappingHint(newMappingHint, buffer); MeshBuffers[i]->setHardwareMappingHint(newMappingHint, buffer);
} }
//! flags the meshbuffer as changed, reloads hardware buffers //! flags the meshbuffer as changed, reloads hardware buffers
virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_
{ {
for (u32 i=0; i<MeshBuffers.size(); ++i) for (u32 i=0; i<MeshBuffers.size(); ++i)
MeshBuffers[i]->setDirty(buffer); MeshBuffers[i]->setDirty(buffer);

59
include/SSharedMeshBuffer.h
View File

@ -36,19 +36,19 @@ namespace scene
} }
//! returns the material of this meshbuffer //! returns the material of this meshbuffer
virtual const video::SMaterial& getMaterial() const virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_
{ {
return Material; return Material;
} }
//! returns the material of this meshbuffer //! returns the material of this meshbuffer
virtual video::SMaterial& getMaterial() virtual video::SMaterial& getMaterial() _IRR_OVERRIDE_
{ {
return Material; return Material;
} }
//! returns pointer to vertices //! returns pointer to vertices
virtual const void* getVertices() const virtual const void* getVertices() const _IRR_OVERRIDE_
{ {
if (Vertices) if (Vertices)
return Vertices->const_pointer(); return Vertices->const_pointer();
@ -57,7 +57,7 @@ namespace scene
} }
//! returns pointer to vertices //! returns pointer to vertices
virtual void* getVertices() virtual void* getVertices() _IRR_OVERRIDE_
{ {
if (Vertices) if (Vertices)
return Vertices->pointer(); return Vertices->pointer();
@ -66,7 +66,7 @@ namespace scene
} }
//! returns amount of vertices //! returns amount of vertices
virtual u32 getVertexCount() const virtual u32 getVertexCount() const _IRR_OVERRIDE_
{ {
if (Vertices) if (Vertices)
return Vertices->size(); return Vertices->size();
@ -75,49 +75,49 @@ namespace scene
} }
//! returns pointer to indices //! returns pointer to indices
virtual const u16* getIndices() const virtual const u16* getIndices() const _IRR_OVERRIDE_
{ {
return Indices.const_pointer(); return Indices.const_pointer();
} }
//! returns pointer to indices //! returns pointer to indices
virtual u16* getIndices() virtual u16* getIndices() _IRR_OVERRIDE_
{ {
return Indices.pointer(); return Indices.pointer();
} }
//! returns amount of indices //! returns amount of indices
virtual u32 getIndexCount() const virtual u32 getIndexCount() const _IRR_OVERRIDE_
{ {
return Indices.size(); return Indices.size();
} }
//! Get type of index data which is stored in this meshbuffer. //! Get type of index data which is stored in this meshbuffer.
virtual video::E_INDEX_TYPE getIndexType() const virtual video::E_INDEX_TYPE getIndexType() const _IRR_OVERRIDE_
{ {
return video::EIT_16BIT; return video::EIT_16BIT;
} }
//! returns an axis aligned bounding box //! returns an axis aligned bounding box
virtual const core::aabbox3d<f32>& getBoundingBox() const virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_
{ {
return BoundingBox; return BoundingBox;
} }
//! set user axis aligned bounding box //! set user axis aligned bounding box
virtual void setBoundingBox( const core::aabbox3df& box) virtual void setBoundingBox( const core::aabbox3df& box) _IRR_OVERRIDE_
{ {
BoundingBox = box; BoundingBox = box;
} }
//! returns which type of vertex data is stored. //! returns which type of vertex data is stored.
virtual video::E_VERTEX_TYPE getVertexType() const virtual video::E_VERTEX_TYPE getVertexType() const _IRR_OVERRIDE_
{ {
return video::EVT_STANDARD; return video::EVT_STANDARD;
} }
//! recalculates the bounding box. should be called if the mesh changed. //! recalculates the bounding box. should be called if the mesh changed.
virtual void recalculateBoundingBox() virtual void recalculateBoundingBox() _IRR_OVERRIDE_
{ {
if (!Vertices || Vertices->empty() || Indices.empty()) if (!Vertices || Vertices->empty() || Indices.empty())
BoundingBox.reset(0,0,0); BoundingBox.reset(0,0,0);
@ -130,67 +130,66 @@ namespace scene
} }
//! returns position of vertex i //! returns position of vertex i
virtual const core::vector3df& getPosition(u32 i) const 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; return (*Vertices)[Indices[i]].Pos;
} }
//! returns position of vertex i //! returns position of vertex i
virtual core::vector3df& getPosition(u32 i) virtual core::vector3df& getPosition(u32 i) _IRR_OVERRIDE_
{ {
_IRR_DEBUG_BREAK_IF(!Vertices); _IRR_DEBUG_BREAK_IF(!Vertices);
return (*Vertices)[Indices[i]].Pos; return (*Vertices)[Indices[i]].Pos;
} }
//! returns normal of vertex i //! returns normal of vertex i
virtual const core::vector3df& getNormal(u32 i) const 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; return (*Vertices)[Indices[i]].Normal;
} }
//! returns normal of vertex i //! returns normal of vertex i
virtual core::vector3df& getNormal(u32 i) virtual core::vector3df& getNormal(u32 i) _IRR_OVERRIDE_
{ {
_IRR_DEBUG_BREAK_IF(!Vertices); _IRR_DEBUG_BREAK_IF(!Vertices);
return (*Vertices)[Indices[i]].Normal; return (*Vertices)[Indices[i]].Normal;
} }
//! returns texture coord of vertex i //! returns texture coord of vertex i
virtual const core::vector2df& getTCoords(u32 i) const 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; return (*Vertices)[Indices[i]].TCoords;
} }
//! returns texture coord of vertex i //! returns texture coord of vertex i
virtual core::vector2df& getTCoords(u32 i) virtual core::vector2df& getTCoords(u32 i) _IRR_OVERRIDE_
{ {
_IRR_DEBUG_BREAK_IF(!Vertices); _IRR_DEBUG_BREAK_IF(!Vertices);
return (*Vertices)[Indices[i]].TCoords; return (*Vertices)[Indices[i]].TCoords;
} }
//! append the vertices and indices to the current buffer //! append the vertices and indices to the current buffer
virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) {} virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) _IRR_OVERRIDE_ {}
//! append the meshbuffer to the current buffer //! append the meshbuffer to the current buffer
virtual void append(const IMeshBuffer* const other) {} virtual void append(const IMeshBuffer* const other) _IRR_OVERRIDE_ {}
//! get the current hardware mapping hint //! get the current hardware mapping hint
virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const _IRR_OVERRIDE_
{ {
return MappingHintVertex; return MappingHintVertex;
} }
//! get the current hardware mapping hint //! get the current hardware mapping hint
virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const _IRR_OVERRIDE_
{ {
return MappingHintIndex; return MappingHintIndex;
} }
//! set the hardware mapping hint, for driver //! set the hardware mapping hint, for driver
virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX ) 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) if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_VERTEX)
MappingHintVertex=NewMappingHint; MappingHintVertex=NewMappingHint;
@ -199,19 +198,19 @@ namespace scene
} }
//! Describe what kind of primitive geometry is used by the meshbuffer //! Describe what kind of primitive geometry is used by the meshbuffer
virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) _IRR_OVERRIDE_
{ {
PrimitiveType = type; PrimitiveType = type;
} }
//! Get the kind of primitive geometry which is used by the meshbuffer //! Get the kind of primitive geometry which is used by the meshbuffer
virtual E_PRIMITIVE_TYPE getPrimitiveType() const virtual E_PRIMITIVE_TYPE getPrimitiveType() const _IRR_OVERRIDE_
{ {
return PrimitiveType; return PrimitiveType;
} }
//! flags the mesh as changed, reloads hardware buffers //! flags the mesh as changed, reloads hardware buffers
virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_
{ {
if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_VERTEX) if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_VERTEX)
++ChangedID_Vertex; ++ChangedID_Vertex;
@ -221,11 +220,11 @@ namespace scene
//! Get the currently used ID for identification of changes. //! Get the currently used ID for identification of changes.
/** This shouldn't be used for anything outside the VideoDriver. */ /** This shouldn't be used for anything outside the VideoDriver. */
virtual u32 getChangedID_Vertex() const {return ChangedID_Vertex;} virtual u32 getChangedID_Vertex() const _IRR_OVERRIDE_ {return ChangedID_Vertex;}
//! Get the currently used ID for identification of changes. //! Get the currently used ID for identification of changes.
/** This shouldn't be used for anything outside the VideoDriver. */ /** This shouldn't be used for anything outside the VideoDriver. */
virtual u32 getChangedID_Index() const {return ChangedID_Index;} virtual u32 getChangedID_Index() const _IRR_OVERRIDE_ {return ChangedID_Index;}
//! Material of this meshBuffer //! Material of this meshBuffer
video::SMaterial Material; video::SMaterial Material;

62
include/SSkinMeshBuffer.h
View File

@ -31,13 +31,13 @@ struct SSkinMeshBuffer : public IMeshBuffer
} }
//! Get Material of this buffer. //! Get Material of this buffer.
virtual const video::SMaterial& getMaterial() const virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_
{ {
return Material; return Material;
} }
//! Get Material of this buffer. //! Get Material of this buffer.
virtual video::SMaterial& getMaterial() virtual video::SMaterial& getMaterial() _IRR_OVERRIDE_
{ {
return Material; return Material;
} }
@ -57,7 +57,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
} }
//! Get pointer to vertex array //! Get pointer to vertex array
virtual const void* getVertices() const virtual const void* getVertices() const _IRR_OVERRIDE_
{ {
switch (VertexType) switch (VertexType)
{ {
@ -71,7 +71,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
} }
//! Get pointer to vertex array //! Get pointer to vertex array
virtual void* getVertices() virtual void* getVertices() _IRR_OVERRIDE_
{ {
switch (VertexType) switch (VertexType)
{ {
@ -85,7 +85,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
} }
//! Get vertex count //! Get vertex count
virtual u32 getVertexCount() const virtual u32 getVertexCount() const _IRR_OVERRIDE_
{ {
switch (VertexType) switch (VertexType)
{ {
@ -100,43 +100,43 @@ struct SSkinMeshBuffer : public IMeshBuffer
//! Get type of index data which is stored in this meshbuffer. //! Get type of index data which is stored in this meshbuffer.
/** \return Index type of this buffer. */ /** \return Index type of this buffer. */
virtual video::E_INDEX_TYPE getIndexType() const virtual video::E_INDEX_TYPE getIndexType() const _IRR_OVERRIDE_
{ {
return video::EIT_16BIT; return video::EIT_16BIT;
} }
//! Get pointer to index array //! Get pointer to index array
virtual const u16* getIndices() const virtual const u16* getIndices() const _IRR_OVERRIDE_
{ {
return Indices.const_pointer(); return Indices.const_pointer();
} }
//! Get pointer to index array //! Get pointer to index array
virtual u16* getIndices() virtual u16* getIndices() _IRR_OVERRIDE_
{ {
return Indices.pointer(); return Indices.pointer();
} }
//! Get index count //! Get index count
virtual u32 getIndexCount() const virtual u32 getIndexCount() const _IRR_OVERRIDE_
{ {
return Indices.size(); return Indices.size();
} }
//! Get bounding box //! Get bounding box
virtual const core::aabbox3d<f32>& getBoundingBox() const virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_
{ {
return BoundingBox; return BoundingBox;
} }
//! Set bounding box //! Set bounding box
virtual void setBoundingBox( const core::aabbox3df& box) virtual void setBoundingBox( const core::aabbox3df& box) _IRR_OVERRIDE_
{ {
BoundingBox = box; BoundingBox = box;
} }
//! Recalculate bounding box //! Recalculate bounding box
virtual void recalculateBoundingBox() virtual void recalculateBoundingBox() _IRR_OVERRIDE_
{ {
if(!BoundingBoxNeedsRecalculated) if(!BoundingBoxNeedsRecalculated)
return; return;
@ -185,13 +185,13 @@ struct SSkinMeshBuffer : public IMeshBuffer
} }
//! Get vertex type //! Get vertex type
virtual video::E_VERTEX_TYPE getVertexType() const virtual video::E_VERTEX_TYPE getVertexType() const _IRR_OVERRIDE_
{ {
return VertexType; return VertexType;
} }
//! Convert to 2tcoords vertex type //! Convert to 2tcoords vertex type
virtual void convertTo2TCoords() void convertTo2TCoords()
{ {
if (VertexType==video::EVT_STANDARD) if (VertexType==video::EVT_STANDARD)
{ {
@ -210,7 +210,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
} }
//! Convert to tangents vertex type //! Convert to tangents vertex type
virtual void convertToTangents() void convertToTangents()
{ {
if (VertexType==video::EVT_STANDARD) if (VertexType==video::EVT_STANDARD)
{ {
@ -243,7 +243,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
} }
//! returns position of vertex i //! returns position of vertex i
virtual const core::vector3df& getPosition(u32 i) const virtual const core::vector3df& getPosition(u32 i) const _IRR_OVERRIDE_
{ {
switch (VertexType) switch (VertexType)
{ {
@ -257,7 +257,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
} }
//! returns position of vertex i //! returns position of vertex i
virtual core::vector3df& getPosition(u32 i) virtual core::vector3df& getPosition(u32 i) _IRR_OVERRIDE_
{ {
switch (VertexType) switch (VertexType)
{ {
@ -271,7 +271,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
} }
//! returns normal of vertex i //! returns normal of vertex i
virtual const core::vector3df& getNormal(u32 i) const virtual const core::vector3df& getNormal(u32 i) const _IRR_OVERRIDE_
{ {
switch (VertexType) switch (VertexType)
{ {
@ -285,7 +285,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
} }
//! returns normal of vertex i //! returns normal of vertex i
virtual core::vector3df& getNormal(u32 i) virtual core::vector3df& getNormal(u32 i) _IRR_OVERRIDE_
{ {
switch (VertexType) switch (VertexType)
{ {
@ -299,7 +299,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
} }
//! returns texture coords of vertex i //! returns texture coords of vertex i
virtual const core::vector2df& getTCoords(u32 i) const virtual const core::vector2df& getTCoords(u32 i) const _IRR_OVERRIDE_
{ {
switch (VertexType) switch (VertexType)
{ {
@ -313,7 +313,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
} }
//! returns texture coords of vertex i //! returns texture coords of vertex i
virtual core::vector2df& getTCoords(u32 i) virtual core::vector2df& getTCoords(u32 i) _IRR_OVERRIDE_
{ {
switch (VertexType) switch (VertexType)
{ {
@ -327,25 +327,25 @@ struct SSkinMeshBuffer : public IMeshBuffer
} }
//! append the vertices and indices to the current buffer //! append the vertices and indices to the current buffer
virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) {} virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) _IRR_OVERRIDE_ {}
//! append the meshbuffer to the current buffer //! append the meshbuffer to the current buffer
virtual void append(const IMeshBuffer* const other) {} virtual void append(const IMeshBuffer* const other) _IRR_OVERRIDE_ {}
//! get the current hardware mapping hint for vertex buffers //! get the current hardware mapping hint for vertex buffers
virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const _IRR_OVERRIDE_
{ {
return MappingHint_Vertex; return MappingHint_Vertex;
} }
//! get the current hardware mapping hint for index buffers //! get the current hardware mapping hint for index buffers
virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const _IRR_OVERRIDE_
{ {
return MappingHint_Index; return MappingHint_Index;
} }
//! set the hardware mapping hint, for driver //! set the hardware mapping hint, for driver
virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) _IRR_OVERRIDE_
{ {
if (Buffer==EBT_VERTEX) if (Buffer==EBT_VERTEX)
MappingHint_Vertex=NewMappingHint; MappingHint_Vertex=NewMappingHint;
@ -359,19 +359,19 @@ struct SSkinMeshBuffer : public IMeshBuffer
} }
//! Describe what kind of primitive geometry is used by the meshbuffer //! Describe what kind of primitive geometry is used by the meshbuffer
virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) _IRR_OVERRIDE_
{ {
PrimitiveType = type; PrimitiveType = type;
} }
//! Get the kind of primitive geometry which is used by the meshbuffer //! Get the kind of primitive geometry which is used by the meshbuffer
virtual E_PRIMITIVE_TYPE getPrimitiveType() const virtual E_PRIMITIVE_TYPE getPrimitiveType() const _IRR_OVERRIDE_
{ {
return PrimitiveType; return PrimitiveType;
} }
//! flags the mesh as changed, reloads hardware buffers //! flags the mesh as changed, reloads hardware buffers
virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_
{ {
if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX) if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX)
++ChangedID_Vertex; ++ChangedID_Vertex;
@ -379,9 +379,9 @@ struct SSkinMeshBuffer : public IMeshBuffer
++ChangedID_Index; ++ChangedID_Index;
} }
virtual u32 getChangedID_Vertex() const {return ChangedID_Vertex;} virtual u32 getChangedID_Vertex() const _IRR_OVERRIDE_ {return ChangedID_Vertex;}
virtual u32 getChangedID_Index() const {return ChangedID_Index;} virtual u32 getChangedID_Index() const _IRR_OVERRIDE_ {return ChangedID_Index;}
//! Call this after changing the positions of any vertex. //! Call this after changing the positions of any vertex.
void boundingBoxNeedsRecalculated(void) { BoundingBoxNeedsRecalculated = true; } void boundingBoxNeedsRecalculated(void) { BoundingBoxNeedsRecalculated = true; }

4
source/Irrlicht/CB3DMeshWriter.h
View File

@ -27,10 +27,10 @@ public:
CB3DMeshWriter(); CB3DMeshWriter();
//! Returns the type of the mesh writer //! Returns the type of the mesh writer
virtual EMESH_WRITER_TYPE getType() const; virtual EMESH_WRITER_TYPE getType() const _IRR_OVERRIDE_;
//! writes a mesh //! writes a mesh
virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE); virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE) _IRR_OVERRIDE_;
private: private:
u32 Size; u32 Size;

4
source/Irrlicht/CBurningShader_Raster_Reference.cpp
View File

@ -512,9 +512,9 @@ public:
CBurningShader_Raster_Reference(CBurningVideoDriver* driver); CBurningShader_Raster_Reference(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
virtual void setMaterial ( const SBurningShaderMaterial &material ); virtual void setMaterial ( const SBurningShaderMaterial &material ) _IRR_OVERRIDE_;
private: private:

12
source/Irrlicht/CColladaFileLoader.cpp
View File

@ -143,14 +143,14 @@ namespace
//! creates an instance of this prefab //! creates an instance of this prefab
virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent, virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent,
scene::ISceneManager* mgr) scene::ISceneManager* mgr) _IRR_OVERRIDE_
{ {
// empty implementation // empty implementation
return 0; return 0;
} }
//! returns id of this prefab //! returns id of this prefab
virtual const core::stringc& getId() virtual const core::stringc& getId() _IRR_OVERRIDE_
{ {
return Id; return Id;
} }
@ -177,7 +177,7 @@ namespace
//! creates an instance of this prefab //! creates an instance of this prefab
virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent, virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent,
scene::ISceneManager* mgr) scene::ISceneManager* mgr) _IRR_OVERRIDE_
{ {
#ifdef COLLADA_READER_DEBUG #ifdef COLLADA_READER_DEBUG
os::Printer::log("COLLADA: Constructing light instance", Id.c_str(), ELL_DEBUG); os::Printer::log("COLLADA: Constructing light instance", Id.c_str(), ELL_DEBUG);
@ -213,7 +213,7 @@ namespace
//! creates an instance of this prefab //! creates an instance of this prefab
virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent, virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent,
scene::ISceneManager* mgr) scene::ISceneManager* mgr) _IRR_OVERRIDE_
{ {
#ifdef COLLADA_READER_DEBUG #ifdef COLLADA_READER_DEBUG
os::Printer::log("COLLADA: Constructing mesh instance", Id.c_str(), ELL_DEBUG); os::Printer::log("COLLADA: Constructing mesh instance", Id.c_str(), ELL_DEBUG);
@ -251,7 +251,7 @@ namespace
//! creates an instance of this prefab //! creates an instance of this prefab
virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent, virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent,
scene::ISceneManager* mgr) scene::ISceneManager* mgr) _IRR_OVERRIDE_
{ {
#ifdef COLLADA_READER_DEBUG #ifdef COLLADA_READER_DEBUG
os::Printer::log("COLLADA: Constructing camera instance", Id.c_str(), ELL_DEBUG); os::Printer::log("COLLADA: Constructing camera instance", Id.c_str(), ELL_DEBUG);
@ -285,7 +285,7 @@ namespace
//! creates an instance of this prefab //! creates an instance of this prefab
virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent, virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent,
scene::ISceneManager* mgr) scene::ISceneManager* mgr) _IRR_OVERRIDE_
{ {
#ifdef COLLADA_READER_DEBUG #ifdef COLLADA_READER_DEBUG
os::Printer::log("COLLADA: Constructing scene instance", Id.c_str(), ELL_DEBUG); os::Printer::log("COLLADA: Constructing scene instance", Id.c_str(), ELL_DEBUG);

2
source/Irrlicht/CD3D9Driver.h
View File

@ -364,7 +364,7 @@ namespace video
//! vertex shaders to render geometry. //! vertex shaders to render geometry.
s32 addShaderMaterial(const c8* vertexShaderProgram, const c8* pixelShaderProgram, s32 addShaderMaterial(const c8* vertexShaderProgram, const c8* pixelShaderProgram,
IShaderConstantSetCallBack* callback, IShaderConstantSetCallBack* callback,
E_MATERIAL_TYPE baseMaterial, s32 userData); E_MATERIAL_TYPE baseMaterial, s32 userData) _IRR_OVERRIDE_;
//! Adds a new material renderer to the VideoDriver, based on a high level shading //! Adds a new material renderer to the VideoDriver, based on a high level shading
//! language. //! language.

2
source/Irrlicht/CD3D9HLSLMaterialRenderer.h
View File

@ -56,7 +56,7 @@ public:
//! Int interface for the above. //! Int interface for the above.
virtual bool setVariable(bool vertexShader, s32 index, const s32* ints, int count); virtual bool setVariable(bool vertexShader, s32 index, const s32* ints, int count);
bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype); bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) _IRR_OVERRIDE_;
protected: protected:

30
source/Irrlicht/CGeometryCreator.h
View File

@ -19,44 +19,44 @@ class CGeometryCreator : public IGeometryCreator
{ {
void addToBuffer(const video::S3DVertex& v, SMeshBuffer* Buffer) const; void addToBuffer(const video::S3DVertex& v, SMeshBuffer* Buffer) const;
public: public:
IMesh* createCubeMesh(const core::vector3df& size) const; virtual IMesh* createCubeMesh(const core::vector3df& size) const _IRR_OVERRIDE_;
IMesh* createHillPlaneMesh( virtual IMesh* createHillPlaneMesh(
const core::dimension2d<f32>& tileSize, const core::dimension2d<u32>& tileCount, const core::dimension2d<f32>& tileSize, const core::dimension2d<u32>& tileCount,
video::SMaterial* material, f32 hillHeight, const core::dimension2d<f32>& countHills, video::SMaterial* material, f32 hillHeight, const core::dimension2d<f32>& countHills,
const core::dimension2d<f32>& textureRepeatCount) const; const core::dimension2d<f32>& textureRepeatCount) const _IRR_OVERRIDE_;
IMesh* createGeoplaneMesh(f32 radius, u32 rows, u32 columns) const; virtual IMesh* createGeoplaneMesh(f32 radius, u32 rows, u32 columns) const _IRR_OVERRIDE_;
IMesh* createTerrainMesh(video::IImage* texture, virtual IMesh* createTerrainMesh(video::IImage* texture,
video::IImage* heightmap, const core::dimension2d<f32>& stretchSize, video::IImage* heightmap, const core::dimension2d<f32>& stretchSize,
f32 maxHeight, video::IVideoDriver* driver, f32 maxHeight, video::IVideoDriver* driver,
const core::dimension2d<u32>& defaultVertexBlockSize, const core::dimension2d<u32>& defaultVertexBlockSize,
bool debugBorders=false) const; bool debugBorders=false) const _IRR_OVERRIDE_;
IMesh* createArrowMesh(const u32 tesselationCylinder, virtual IMesh* createArrowMesh(const u32 tesselationCylinder,
const u32 tesselationCone, const f32 height, const u32 tesselationCone, const f32 height,
const f32 cylinderHeight, const f32 width0, const f32 cylinderHeight, const f32 width0,
const f32 width1, const video::SColor vtxColor0, const f32 width1, const video::SColor vtxColor0,
const video::SColor vtxColor1) const; const video::SColor vtxColor1) const _IRR_OVERRIDE_;
IMesh* createSphereMesh(f32 radius, u32 polyCountX, u32 polyCountY) const; virtual IMesh* createSphereMesh(f32 radius, u32 polyCountX, u32 polyCountY) const _IRR_OVERRIDE_;
IMesh* createCylinderMesh(f32 radius, f32 length, u32 tesselation, virtual IMesh* createCylinderMesh(f32 radius, f32 length, u32 tesselation,
const video::SColor& color=0xffffffff, const video::SColor& color=0xffffffff,
bool closeTop=true, f32 oblique=0.f) const; bool closeTop=true, f32 oblique=0.f) const _IRR_OVERRIDE_;
IMesh* createConeMesh(f32 radius, f32 length, u32 tesselation, virtual IMesh* createConeMesh(f32 radius, f32 length, u32 tesselation,
const video::SColor& colorTop=0xffffffff, const video::SColor& colorTop=0xffffffff,
const video::SColor& colorBottom=0xffffffff, const video::SColor& colorBottom=0xffffffff,
f32 oblique=0.f) const; f32 oblique=0.f) const _IRR_OVERRIDE_;
IMesh* createVolumeLightMesh( virtual IMesh* createVolumeLightMesh(
const u32 subdivideU=32, const u32 subdivideV=32, const u32 subdivideU=32, const u32 subdivideV=32,
const video::SColor footColor=0xffffffff, const video::SColor footColor=0xffffffff,
const video::SColor tailColor=0xffffffff, const video::SColor tailColor=0xffffffff,
const f32 lpDistance = 8.f, const f32 lpDistance = 8.f,
const core::vector3df& lightDim = core::vector3df(1.f,1.2f,1.f)) const; const core::vector3df& lightDim = core::vector3df(1.f,1.2f,1.f)) const _IRR_OVERRIDE_;
}; };

8
source/Irrlicht/CImageLoaderPVR.h
View File

@ -39,13 +39,13 @@ struct SPVRHeader
class CImageLoaderPVR : public IImageLoader class CImageLoaderPVR : public IImageLoader
{ {
public: public:
virtual bool isALoadableFileExtension(const io::path& filename) const; virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_;
virtual bool isALoadableFileFormat(io::IReadFile* file) const; virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_;
virtual IImage* loadImage(io::IReadFile* file) const; virtual IImage* loadImage(io::IReadFile* file) const _IRR_OVERRIDE_;
virtual core::array<IImage*> loadImages(io::IReadFile* file, E_TEXTURE_TYPE* type) const; virtual core::array<IImage*> loadImages(io::IReadFile* file, E_TEXTURE_TYPE* type) const _IRR_OVERRIDE_;
}; };
} }

8
source/Irrlicht/CIrrDeviceStub.cpp
View File

@ -298,22 +298,22 @@ namespace
{ {
struct SDefaultRandomizer : public IRandomizer struct SDefaultRandomizer : public IRandomizer
{ {
virtual void reset(s32 value=0x0f0f0f0f) virtual void reset(s32 value=0x0f0f0f0f) _IRR_OVERRIDE_
{ {
os::Randomizer::reset(value); os::Randomizer::reset(value);
} }
virtual s32 rand() const virtual s32 rand() const _IRR_OVERRIDE_
{ {
return os::Randomizer::rand(); return os::Randomizer::rand();
} }
virtual f32 frand() const virtual f32 frand() const _IRR_OVERRIDE_
{ {
return os::Randomizer::frand(); return os::Randomizer::frand();
} }
virtual s32 randMax() const virtual s32 randMax() const _IRR_OVERRIDE_
{ {
return os::Randomizer::randMax(); return os::Randomizer::randMax();
} }

2
source/Irrlicht/CTRFlat.cpp
View File

@ -25,7 +25,7 @@ public:
} }
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_
{ {
const S2DVertex *v1, *v2, *v3; const S2DVertex *v1, *v2, *v3;

2
source/Irrlicht/CTRFlatWire.cpp
View File

@ -25,7 +25,7 @@ public:
} }
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_
{ {
const S2DVertex *v1, *v2, *v3; const S2DVertex *v1, *v2, *v3;

2
source/Irrlicht/CTRGouraud.cpp
View File

@ -26,7 +26,7 @@ public:
} }
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_
{ {
const S2DVertex *v1, *v2, *v3; const S2DVertex *v1, *v2, *v3;

2
source/Irrlicht/CTRGouraud2.cpp
View File

@ -83,7 +83,7 @@ public:
CTRGouraud2(CBurningVideoDriver* driver); CTRGouraud2(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
private: private:

2
source/Irrlicht/CTRGouraudAlpha2.cpp
View File

@ -84,7 +84,7 @@ public:
CTRGouraudAlpha2(CBurningVideoDriver* driver); CTRGouraudAlpha2(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
private: private:

2
source/Irrlicht/CTRGouraudAlphaNoZ2.cpp
View File

@ -84,7 +84,7 @@ public:
CTRGouraudAlphaNoZ2(CBurningVideoDriver* driver); CTRGouraudAlphaNoZ2(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
private: private:

2
source/Irrlicht/CTRGouraudWire.cpp
View File

@ -25,7 +25,7 @@ public:
} }
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_
{ {
const S2DVertex *v1, *v2, *v3; const S2DVertex *v1, *v2, *v3;

2
source/Irrlicht/CTRNormalMap.cpp
View File

@ -87,7 +87,7 @@ public:
CTRNormalMap(CBurningVideoDriver* driver); CTRNormalMap(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
private: private:

4
source/Irrlicht/CTRStencilShadow.cpp
View File

@ -84,8 +84,8 @@ public:
CTRStencilShadow(CBurningVideoDriver* driver); CTRStencilShadow(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
virtual void setParam ( u32 index, f32 value); virtual void setParam ( u32 index, f32 value) _IRR_OVERRIDE_;
private: private:
// fragment shader // fragment shader

6
source/Irrlicht/CTRTextureBlend.cpp
View File

@ -84,10 +84,10 @@ public:
CTRTextureBlend(CBurningVideoDriver* driver); CTRTextureBlend(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
virtual void setZCompareFunc ( u32 func); virtual void setZCompareFunc ( u32 func) _IRR_OVERRIDE_;
virtual void setParam ( u32 index, f32 value); virtual void setParam ( u32 index, f32 value) _IRR_OVERRIDE_;
private: private:

2
source/Irrlicht/CTRTextureDetailMap2.cpp
View File

@ -84,7 +84,7 @@ public:
CTRTextureDetailMap2(CBurningVideoDriver* driver); CTRTextureDetailMap2(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
private: private:

2
source/Irrlicht/CTRTextureFlat.cpp
View File

@ -25,7 +25,7 @@ public:
} }
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_
{ {
const S2DVertex *v1, *v2, *v3; const S2DVertex *v1, *v2, *v3;

2
source/Irrlicht/CTRTextureFlatWire.cpp
View File

@ -25,7 +25,7 @@ public:
} }
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_
{ {
const S2DVertex *v1, *v2, *v3; const S2DVertex *v1, *v2, *v3;

2
source/Irrlicht/CTRTextureGouraud2.cpp
View File

@ -83,7 +83,7 @@ public:
CTRTextureGouraud2(CBurningVideoDriver* driver); CTRTextureGouraud2(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
private: private:

2
source/Irrlicht/CTRTextureGouraudAdd.cpp
View File

@ -20,7 +20,7 @@ public:
CTRTextureGouraudAdd(IZBuffer* zbuffer); CTRTextureGouraudAdd(IZBuffer* zbuffer);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount); virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_;
protected: protected:

2
source/Irrlicht/CTRTextureGouraudAdd2.cpp
View File

@ -84,7 +84,7 @@ public:
CTRTextureGouraudAdd2(CBurningVideoDriver* driver); CTRTextureGouraudAdd2(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
private: private:

2
source/Irrlicht/CTRTextureGouraudAddNoZ2.cpp
View File

@ -83,7 +83,7 @@ public:
CTRTextureGouraudAddNoZ2(CBurningVideoDriver* driver); CTRTextureGouraudAddNoZ2(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
private: private:

4
source/Irrlicht/CTRTextureGouraudAlpha.cpp
View File

@ -84,9 +84,9 @@ public:
CTRTextureGouraudAlpha2(CBurningVideoDriver* driver); CTRTextureGouraudAlpha2(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
virtual void setParam ( u32 index, f32 value); virtual void setParam ( u32 index, f32 value) _IRR_OVERRIDE_;
private: private:

4
source/Irrlicht/CTRTextureGouraudAlphaNoZ.cpp
View File

@ -84,9 +84,9 @@ public:
CTRTextureGouraudAlphaNoZ(CBurningVideoDriver* driver); CTRTextureGouraudAlphaNoZ(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
virtual void setParam ( u32 index, f32 value); virtual void setParam ( u32 index, f32 value) _IRR_OVERRIDE_;
private: private:

2
source/Irrlicht/CTRTextureGouraudNoZ.cpp
View File

@ -26,7 +26,7 @@ public:
} }
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_
{ {
const S2DVertex *v1, *v2, *v3; const S2DVertex *v1, *v2, *v3;

2
source/Irrlicht/CTRTextureGouraudNoZ2.cpp
View File

@ -88,7 +88,7 @@ public:
CTRTextureGouraudNoZ2(CBurningVideoDriver* driver); CTRTextureGouraudNoZ2(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
private: private:

2
source/Irrlicht/CTRTextureGouraudVertexAlpha2.cpp
View File

@ -82,7 +82,7 @@ public:
CTRTextureVertexAlpha2(CBurningVideoDriver* driver); CTRTextureVertexAlpha2(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
private: private:

2
source/Irrlicht/CTRTextureGouraudWire.cpp
View File

@ -25,7 +25,7 @@ public:
} }
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_
{ {
const S2DVertex *v1, *v2, *v3; const S2DVertex *v1, *v2, *v3;

2
source/Irrlicht/CTRTextureLightMap2_Add.cpp
View File

@ -82,7 +82,7 @@ public:
CTRTextureLightMap2_Add(CBurningVideoDriver* driver); CTRTextureLightMap2_Add(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
private: private:

2
source/Irrlicht/CTRTextureLightMap2_M1.cpp
View File

@ -82,7 +82,7 @@ public:
CTRTextureLightMap2_M1(CBurningVideoDriver* driver); CTRTextureLightMap2_M1(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
private: private:

2
source/Irrlicht/CTRTextureLightMap2_M2.cpp
View File

@ -82,7 +82,7 @@ public:
CTRTextureLightMap2_M2(CBurningVideoDriver* driver); CTRTextureLightMap2_M2(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
private: private:

2
source/Irrlicht/CTRTextureLightMap2_M4.cpp
View File

@ -82,7 +82,7 @@ public:
CTRTextureLightMap2_M4(CBurningVideoDriver* driver); CTRTextureLightMap2_M4(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
private: private:

2
source/Irrlicht/CTRTextureLightMapGouraud2_M4.cpp
View File

@ -82,7 +82,7 @@ public:
CTRGTextureLightMap2_M4(CBurningVideoDriver* driver); CTRGTextureLightMap2_M4(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
private: private:

4
source/Irrlicht/CTRTextureWire2.cpp
View File

@ -80,8 +80,8 @@ public:
CTRTextureWire2(CBurningVideoDriver* driver); CTRTextureWire2(CBurningVideoDriver* driver);
//! draws an indexed triangle list //! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ); virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
virtual void drawLine ( const s4DVertex *a,const s4DVertex *b); virtual void drawLine ( const s4DVertex *a,const s4DVertex *b) _IRR_OVERRIDE_;

4
source/Irrlicht/CXMLReader.cpp
View File

@ -31,13 +31,13 @@ namespace io
} }
//! Reads an amount of bytes from the file. //! Reads an amount of bytes from the file.
virtual int read(void* buffer, int sizeToRead) virtual int read(void* buffer, int sizeToRead) _IRR_OVERRIDE_
{ {
return (int)ReadFile->read(buffer, sizeToRead); return (int)ReadFile->read(buffer, sizeToRead);
} }
//! Returns size of file in bytes //! Returns size of file in bytes
virtual long getSize() const virtual long getSize() const _IRR_OVERRIDE_
{ {
return ReadFile->getSize(); return ReadFile->getSize();
} }

2
source/Irrlicht/ISceneNodeAnimatorFinishing.h
View File

@ -20,7 +20,7 @@ namespace scene
ISceneNodeAnimatorFinishing(u32 finishTime) ISceneNodeAnimatorFinishing(u32 finishTime)
: FinishTime(finishTime), HasFinished(false) { } : FinishTime(finishTime), HasFinished(false) { }
virtual bool hasFinished(void) const { return HasFinished; } virtual bool hasFinished(void) const _IRR_OVERRIDE_ { return HasFinished; }
protected: protected:

4
source/Irrlicht/Irrlicht.ruleset
View File

@ -241,10 +241,12 @@
<Rule Id="C26402" Action="None" /> <Rule Id="C26402" Action="None" />
<Rule Id="C26408" Action="None" /> <Rule Id="C26408" Action="None" />
<Rule Id="C26409" Action="None" /> <Rule Id="C26409" Action="None" />
<Rule Id="C26426" Action="Warning" />
<Rule Id="C26429" Action="None" /> <Rule Id="C26429" Action="None" />
<Rule Id="C26431" Action="None" /> <Rule Id="C26431" Action="None" />
<Rule Id="C26432" Action="None" /> <Rule Id="C26432" Action="None" />
<Rule Id="C26435" Action="None" /> <Rule Id="C26435" Action="None" />
<Rule Id="C26438" Action="None" />
<Rule Id="C26440" Action="None" /> <Rule Id="C26440" Action="None" />
<Rule Id="C26443" Action="None" /> <Rule Id="C26443" Action="None" />
<Rule Id="C26445" Action="None" /> <Rule Id="C26445" Action="None" />
@ -262,6 +264,8 @@
<Rule Id="C26493" Action="None" /> <Rule Id="C26493" Action="None" />
<Rule Id="C26494" Action="Warning" /> <Rule Id="C26494" Action="Warning" />
<Rule Id="C26495" Action="None" /> <Rule Id="C26495" Action="None" />
<Rule Id="C26496" Action="Warning" />
<Rule Id="C26497" Action="None" /> <Rule Id="C26497" Action="None" />
<Rule Id="C28251" Action="None" />
</Rules> </Rules>
</RuleSet> </RuleSet>

4
source/Irrlicht/irrXML.cpp
View File

@ -48,7 +48,7 @@ public:
} }
//! Reads an amount of bytes from the file. //! Reads an amount of bytes from the file.
virtual int read(void* buffer, int sizeToRead) virtual int read(void* buffer, int sizeToRead) _IRR_OVERRIDE_
{ {
if (!File) if (!File)
return 0; return 0;
@ -57,7 +57,7 @@ public:
} }
//! Returns size of file in bytes //! Returns size of file in bytes
virtual long getSize() const virtual long getSize() const _IRR_OVERRIDE_
{ {
return Size; return Size;
} }