Fix two irrString bugs

[irrlicht.git] / include / SSkinMeshBuffer.h

diff --git a/include/SSkinMeshBuffer.h b/include/SSkinMeshBuffer.h
index 809bd6800dee8fb6efa1e328ea24229e98a5e15d..29b67d8b56d47d450f05f3b3eeb30c129f3ac715 100644 (file)
--- a/include/SSkinMeshBuffer.h
+++ b/include/SSkinMeshBuffer.h
@@ -32,13 +32,13 @@ struct SSkinMeshBuffer : public IMeshBuffer
        }\r
 \r
        //! Get Material of this buffer.\r
-       virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_\r
+       const video::SMaterial& getMaterial() const override\r
        {\r
                return Material;\r
        }\r
 \r
        //! Get Material of this buffer.\r
-       virtual video::SMaterial& getMaterial() _IRR_OVERRIDE_\r
+       video::SMaterial& getMaterial() override\r
        {\r
                return Material;\r
        }\r
@@ -58,7 +58,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
        }\r
 \r
        //! Get pointer to vertex array\r
-       virtual const void* getVertices() const _IRR_OVERRIDE_\r
+       const void* getVertices() const override\r
        {\r
                switch (VertexType)\r
                {\r
@@ -72,7 +72,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
        }\r
 \r
        //! Get pointer to vertex array\r
-       virtual void* getVertices() _IRR_OVERRIDE_\r
+       void* getVertices() override\r
        {\r
                switch (VertexType)\r
                {\r
@@ -86,7 +86,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
        }\r
 \r
        //! Get vertex count\r
-       virtual u32 getVertexCount() const _IRR_OVERRIDE_\r
+       u32 getVertexCount() const override\r
        {\r
                switch (VertexType)\r
                {\r
@@ -101,43 +101,43 @@ struct SSkinMeshBuffer : public IMeshBuffer
 \r
        //! Get type of index data which is stored in this meshbuffer.\r
        /** \return Index type of this buffer. */\r
-       virtual video::E_INDEX_TYPE getIndexType() const _IRR_OVERRIDE_\r
+       video::E_INDEX_TYPE getIndexType() const override\r
        {\r
                return video::EIT_16BIT;\r
        }\r
 \r
        //! Get pointer to index array\r
-       virtual const u16* getIndices() const _IRR_OVERRIDE_\r
+       const u16* getIndices() const override\r
        {\r
                return Indices.const_pointer();\r
        }\r
 \r
        //! Get pointer to index array\r
-       virtual u16* getIndices() _IRR_OVERRIDE_\r
+       u16* getIndices() override\r
        {\r
                return Indices.pointer();\r
        }\r
 \r
        //! Get index count\r
-       virtual u32 getIndexCount() const _IRR_OVERRIDE_\r
+       u32 getIndexCount() const override\r
        {\r
                return Indices.size();\r
        }\r
 \r
        //! Get bounding box\r
-       virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_\r
+       const core::aabbox3d<f32>& getBoundingBox() const override\r
        {\r
                return BoundingBox;\r
        }\r
 \r
        //! Set bounding box\r
-       virtual void setBoundingBox( const core::aabbox3df& box) _IRR_OVERRIDE_\r
+       void setBoundingBox( const core::aabbox3df& box) override\r
        {\r
                BoundingBox = box;\r
        }\r
 \r
        //! Recalculate bounding box\r
-       virtual void recalculateBoundingBox() _IRR_OVERRIDE_\r
+       void recalculateBoundingBox() override\r
        {\r
                if(!BoundingBoxNeedsRecalculated)\r
                        return;\r
@@ -186,7 +186,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
        }\r
 \r
        //! Get vertex type\r
-       virtual video::E_VERTEX_TYPE getVertexType() const _IRR_OVERRIDE_\r
+       video::E_VERTEX_TYPE getVertexType() const override\r
        {\r
                return VertexType;\r
        }\r
@@ -244,7 +244,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
        }\r
 \r
        //! returns position of vertex i\r
-       virtual const core::vector3df& getPosition(u32 i) const _IRR_OVERRIDE_\r
+       const core::vector3df& getPosition(u32 i) const override\r
        {\r
                switch (VertexType)\r
                {\r
@@ -258,7 +258,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
        }\r
 \r
        //! returns position of vertex i\r
-       virtual core::vector3df& getPosition(u32 i) _IRR_OVERRIDE_\r
+       core::vector3df& getPosition(u32 i) override\r
        {\r
                switch (VertexType)\r
                {\r
@@ -272,7 +272,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
        }\r
 \r
        //! returns normal of vertex i\r
-       virtual const core::vector3df& getNormal(u32 i) const _IRR_OVERRIDE_\r
+       const core::vector3df& getNormal(u32 i) const override\r
        {\r
                switch (VertexType)\r
                {\r
@@ -286,7 +286,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
        }\r
 \r
        //! returns normal of vertex i\r
-       virtual core::vector3df& getNormal(u32 i) _IRR_OVERRIDE_\r
+       core::vector3df& getNormal(u32 i) override\r
        {\r
                switch (VertexType)\r
                {\r
@@ -300,7 +300,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
        }\r
 \r
        //! returns texture coords of vertex i\r
-       virtual const core::vector2df& getTCoords(u32 i) const _IRR_OVERRIDE_\r
+       const core::vector2df& getTCoords(u32 i) const override\r
        {\r
                switch (VertexType)\r
                {\r
@@ -314,7 +314,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
        }\r
 \r
        //! returns texture coords of vertex i\r
-       virtual core::vector2df& getTCoords(u32 i) _IRR_OVERRIDE_\r
+       core::vector2df& getTCoords(u32 i) override\r
        {\r
                switch (VertexType)\r
                {\r
@@ -328,25 +328,25 @@ struct SSkinMeshBuffer : public IMeshBuffer
        }\r
 \r
        //! append the vertices and indices to the current buffer\r
-       virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) _IRR_OVERRIDE_ {}\r
+       void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) override {}\r
 \r
        //! append the meshbuffer to the current buffer\r
-       virtual void append(const IMeshBuffer* const other) _IRR_OVERRIDE_ {}\r
+       void append(const IMeshBuffer* const other) override {}\r
 \r
        //! get the current hardware mapping hint for vertex buffers\r
-       virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const _IRR_OVERRIDE_\r
+       E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const override\r
        {\r
                return MappingHint_Vertex;\r
        }\r
 \r
        //! get the current hardware mapping hint for index buffers\r
-       virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const _IRR_OVERRIDE_\r
+       E_HARDWARE_MAPPING getHardwareMappingHint_Index() const override\r
        {\r
                return MappingHint_Index;\r
        }\r
 \r
        //! set the hardware mapping hint, for driver\r
-       virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) _IRR_OVERRIDE_\r
+       void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) override\r
        {\r
                if (Buffer==EBT_VERTEX)\r
                        MappingHint_Vertex=NewMappingHint;\r
@@ -360,19 +360,19 @@ struct SSkinMeshBuffer : public IMeshBuffer
        }\r
 \r
        //! Describe what kind of primitive geometry is used by the meshbuffer\r
-       virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) _IRR_OVERRIDE_\r
+       void setPrimitiveType(E_PRIMITIVE_TYPE type) override\r
        {\r
                PrimitiveType = type;\r
        }\r
 \r
        //! Get the kind of primitive geometry which is used by the meshbuffer\r
-       virtual E_PRIMITIVE_TYPE getPrimitiveType() const _IRR_OVERRIDE_\r
+       E_PRIMITIVE_TYPE getPrimitiveType() const override\r
        {\r
                return PrimitiveType;\r
        }\r
 \r
        //! flags the mesh as changed, reloads hardware buffers\r
-       virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_\r
+       void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) override\r
        {\r
                if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX)\r
                        ++ChangedID_Vertex;\r
@@ -380,15 +380,15 @@ struct SSkinMeshBuffer : public IMeshBuffer
                        ++ChangedID_Index;\r
        }\r
 \r
-       virtual u32 getChangedID_Vertex() const _IRR_OVERRIDE_ {return ChangedID_Vertex;}\r
+       u32 getChangedID_Vertex() const override {return ChangedID_Vertex;}\r
 \r
-       virtual u32 getChangedID_Index() const _IRR_OVERRIDE_ {return ChangedID_Index;}\r
+       u32 getChangedID_Index() const override {return ChangedID_Index;}\r
 \r
-       virtual void setHWBuffer(void *ptr) const _IRR_OVERRIDE_ {\r
+       void setHWBuffer(void *ptr) const override {\r
                HWBuffer = ptr;\r
        }\r
 \r
-       virtual void *getHWBuffer() const _IRR_OVERRIDE_ {\r
+       void *getHWBuffer() const override {\r
                return HWBuffer;\r
        }\r
 \r