Skip to content

D
deprecated-irrlicht-mac
Commit 37437196 authored by hybrid's avatar hybrid
Browse files
Options

Third round of override macro updates. Should have touched all functions... 

Third round of override macro updates. Should have touched all functions stating virtual for now. This might still have missed some, as sometimes the virtual keyword is missing on derived functions. And some open points are also still under consideration, will be fixed in future.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4547 dfc29bdd-3216-0410-991c-e03cc46cb475
parent fc35c230
Expand all Show whitespace changes
Inline Side-by-side
Showing with 689 additions and 677 deletions
source/Irrlicht/CAnimatedMeshHalfLife.h
View file @ 37437196
......@@ -514,7 +514,7 @@ namespace scene
//! Gets the default animation speed of the animated mesh.
/** \return Amount of frames per second. If the amount is 0, it is a static, non animated mesh. */
virtual f32 getAnimationSpeed() const
virtual f32 getAnimationSpeed() const _IRR_OVERRIDE_
{
return FramesPerSecond;
}
......@@ -522,7 +522,7 @@ namespace scene
//! Gets the frame count of the animated mesh.
/** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated.
The actual speed is set in the scene node the mesh is instantiated in.*/
virtual void setAnimationSpeed(f32 fps)
virtual void setAnimationSpeed(f32 fps) _IRR_OVERRIDE_
{
FramesPerSecond=fps;
}
......
source/Irrlicht/CAnimatedMeshMD2.h
View file @ 37437196
......@@ -33,7 +33,7 @@ namespace scene
//! Gets the default animation speed of the animated mesh.
/** \return Amount of frames per second. If the amount is 0, it is a static, non animated mesh. */
virtual f32 getAnimationSpeed() const
virtual f32 getAnimationSpeed() const _IRR_OVERRIDE_
{
return FramesPerSecond;
}
......@@ -41,7 +41,7 @@ namespace scene
//! Gets the frame count of the animated mesh.
/** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated.
The actual speed is set in the scene node the mesh is instantiated in.*/
virtual void setAnimationSpeed(f32 fps)
virtual void setAnimationSpeed(f32 fps) _IRR_OVERRIDE_
{
FramesPerSecond=fps;
}
......@@ -81,11 +81,11 @@ namespace scene
//! Returns frame loop data for a special MD2 animation type.
virtual void getFrameLoop(EMD2_ANIMATION_TYPE,
s32& outBegin, s32& outEnd, s32& outFps) const;
s32& outBegin, s32& outEnd, s32& outFps) const _IRR_OVERRIDE_;
//! Returns frame loop data for a special MD2 animation type.
virtual bool getFrameLoop(const c8* name,
s32& outBegin, s32& outEnd, s32& outFps) const;
s32& outBegin, s32& outEnd, s32& outFps) const _IRR_OVERRIDE_;
//! Returns amount of md2 animations in this file.
virtual s32 getAnimationCount() const _IRR_OVERRIDE_;
......
source/Irrlicht/CAnimatedMeshMD3.h
View file @ 37437196
......@@ -30,7 +30,7 @@ namespace scene
virtual ~CAnimatedMeshMD3();
//! loads a quake3 md3 file
virtual bool loadModelFile(u32 modelIndex, io::IReadFile* file,
bool loadModelFile(u32 modelIndex, io::IReadFile* file,
io::IFileSystem* fs, video::IVideoDriver* driver);
// IAnimatedMeshMD3
......@@ -43,7 +43,7 @@ namespace scene
//! Gets the default animation speed of the animated mesh.
/** \return Amount of frames per second. If the amount is 0, it is a static, non animated mesh. */
virtual f32 getAnimationSpeed() const
virtual f32 getAnimationSpeed() const _IRR_OVERRIDE_
{
return FramesPerSecond;
}
......@@ -51,13 +51,13 @@ namespace scene
//! Gets the frame count of the animated mesh.
/** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated.
The actual speed is set in the scene node the mesh is instantiated in.*/
virtual void setAnimationSpeed(f32 fps)
virtual void setAnimationSpeed(f32 fps) _IRR_OVERRIDE_
{
FramesPerSecond=fps;
}
virtual IMesh* getMesh(s32 frame, s32 detailLevel,
s32 startFrameLoop, s32 endFrameLoop);
s32 startFrameLoop, s32 endFrameLoop) _IRR_OVERRIDE_;
virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_;
virtual E_ANIMATED_MESH_TYPE getMeshType() const _IRR_OVERRIDE_;
......
source/Irrlicht/CAnimatedMeshSceneNode.h
View file @ 37437196
......@@ -79,7 +79,7 @@ namespace scene
//! Creates shadow volume scene node as child of this node
//! and returns a pointer to it.
virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh,
s32 id, bool zfailmethod=true, f32 infinity=1000.0f);
s32 id, bool zfailmethod=true, f32 infinity=1000.0f) _IRR_OVERRIDE_;
//! Returns a pointer to a child node, which has the same transformation as
//! the corrsesponding joint, if the mesh in this scene node is a skinned mesh.
......
source/Irrlicht/CAttributeImpl.h
View file @ 37437196
This diff is collapsed.
source/Irrlicht/CAttributes.h
View file @ 37437196
......@@ -66,7 +66,7 @@ public:
//! \param readCurrentElementOnly: If set to true, reading only works if current element has the name 'attributes'.
//! IF set to false, the first appearing list attributes are read.
virtual bool read(io::IXMLReader* reader, bool readCurrentElementOnly=false,
const wchar_t* nonDefaultElementName = 0);
const wchar_t* nonDefaultElementName = 0) _IRR_OVERRIDE_;
//! Write these attributes into a xml file
virtual bool write(io::IXMLWriter* writer, bool writeXMLHeader=false, const wchar_t* nonDefaultElementName=0) _IRR_OVERRIDE_;
......
source/Irrlicht/CBillboardSceneNode.h
View file @ 37437196
......@@ -59,13 +59,13 @@ public:
//! \param topColor: the color to set the top vertices
//! \param bottomColor: the color to set the bottom vertices
virtual void setColor(const video::SColor& topColor,
const video::SColor& bottomColor);
const video::SColor& bottomColor) _IRR_OVERRIDE_;
//! Gets the color of the top and bottom vertices of the billboard
//! \param[out] topColor: stores the color of the top vertices
//! \param[out] bottomColor: stores the color of the bottom vertices
virtual void getColor(video::SColor& topColor,
video::SColor& bottomColor) const;
video::SColor& bottomColor) const _IRR_OVERRIDE_;
//! Writes attributes of the scene node.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_;
......
source/Irrlicht/CBoneSceneNode.h
View file @ 37437196
......@@ -50,12 +50,12 @@ namespace scene
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_;
//! How the relative transformation of the bone is used
virtual void setSkinningSpace( E_BONE_SKINNING_SPACE space )
virtual void setSkinningSpace(E_BONE_SKINNING_SPACE space) _IRR_OVERRIDE_
{
SkinningSpace=space;
}
virtual E_BONE_SKINNING_SPACE getSkinningSpace() const
virtual E_BONE_SKINNING_SPACE getSkinningSpace() const _IRR_OVERRIDE_
{
return SkinningSpace;
}
......
source/Irrlicht/CCubeSceneNode.h
View file @ 37437196
......@@ -48,7 +48,7 @@ namespace scene
//! Creates shadow volume scene node as child of this node
//! and returns a pointer to it.
virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh,
s32 id, bool zfailmethod=true, f32 infinity=10000.0f);
s32 id, bool zfailmethod=true, f32 infinity=10000.0f) _IRR_OVERRIDE_;
//! Writes attributes of the scene node.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_;
......
source/Irrlicht/CD3D8Driver.h
View file @ 37437196
......@@ -41,7 +41,7 @@ namespace video
virtual bool beginScene(bool backBuffer=true, bool zBuffer=true,
SColor color=SColor(255,0,0,0),
const SExposedVideoData& videoData=SExposedVideoData(),
core::rect<s32>* sourceRect=0);
core::rect<s32>* sourceRect=0) _IRR_OVERRIDE_;
//! applications must call this method after performing any rendering. returns false if failed.
virtual bool endScene() _IRR_OVERRIDE_;
......@@ -58,7 +58,7 @@ namespace video
//! sets a render target
virtual bool setRenderTarget(video::ITexture* texture,
bool clearBackBuffer=true, bool clearZBuffer=true,
SColor color=video::SColor(0,0,0,0));
SColor color=video::SColor(0,0,0,0)) _IRR_OVERRIDE_;
//! sets a viewport
virtual void setViewPort(const core::rect<s32>& area) _IRR_OVERRIDE_;
......@@ -70,40 +70,40 @@ namespace video
virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
const void* indexList, u32 primitiveCount,
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType,
E_INDEX_TYPE iType);
E_INDEX_TYPE iType) _IRR_OVERRIDE_;
//! draws a vertex primitive list in 2d
virtual void draw2DVertexPrimitiveList(const void* vertices, u32 vertexCount,
const void* indexList, u32 primitiveCount,
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType,
E_INDEX_TYPE iType);
E_INDEX_TYPE iType) _IRR_OVERRIDE_;
//! draws an 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
virtual void draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos,
const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false);
SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_;
//! Draws a part of the texture into the rectangle.
virtual void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect,
const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
const video::SColor* const colors=0, bool useAlphaChannelOfTexture=false);
const video::SColor* const colors=0, bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_;
//!Draws an 2d rectangle with a gradient.
virtual void draw2DRectangle(const core::rect<s32>& pos,
SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
const core::rect<s32>* clip = 0);
const core::rect<s32>* clip = 0) _IRR_OVERRIDE_;
//! Draws a 2d line.
virtual void draw2DLine(const core::position2d<s32>& start,
const core::position2d<s32>& end,
SColor color=SColor(255,255,255,255));
SColor color=SColor(255,255,255,255)) _IRR_OVERRIDE_;
//! Draws a pixel.
virtual void drawPixel(u32 x, u32 y, const SColor & color) _IRR_OVERRIDE_;
//! Draws a 3d line.
virtual void draw3DLine(const core::vector3df& start,
const core::vector3df& end, SColor color = SColor(255,255,255,255));
const core::vector3df& end, SColor color = SColor(255,255,255,255)) _IRR_OVERRIDE_;
//! initialises the Direct3D API
bool initDriver(HWND hwnd, bool pureSoftware);
......@@ -145,7 +145,7 @@ namespace video
video::SColor leftUpEdge = video::SColor(0,0,0,0),
video::SColor rightUpEdge = video::SColor(0,0,0,0),
video::SColor leftDownEdge = video::SColor(0,0,0,0),
video::SColor rightDownEdge = video::SColor(0,0,0,0));
video::SColor rightDownEdge = video::SColor(0,0,0,0)) _IRR_OVERRIDE_;
//! Returns the maximum amount of primitives (mostly vertices) which
//! the device is able to render with one drawIndexedTriangleList
......@@ -157,7 +157,7 @@ namespace video
//! Sets the fog mode.
virtual void setFog(SColor color, E_FOG_TYPE fogType, f32 start,
f32 end, f32 density, bool pixelFog, bool rangeFog);
f32 end, f32 density, bool pixelFog, bool rangeFog) _IRR_OVERRIDE_;
//! Only used by the internal engine. Used to notify the driver that
//! the window was resized.
......@@ -171,7 +171,7 @@ namespace video
//! Can be called by an IMaterialRenderer to make its work easier.
virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates);
bool resetAllRenderstates) _IRR_OVERRIDE_;
//! Get a vertex shader constant index.
virtual s32 getVertexShaderConstantID(const c8* name) _IRR_OVERRIDE_;
......@@ -203,7 +203,7 @@ namespace video
//! Creates a render target texture.
virtual ITexture* addRenderTargetTexture(const core::dimension2d<u32>& size,
const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN);
const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) _IRR_OVERRIDE_;
//! Clears the ZBuffer.
virtual void clearZBuffer() _IRR_OVERRIDE_;
......
source/Irrlicht/CD3D8MaterialRenderer.h
View file @ 37437196
......@@ -76,7 +76,7 @@ public:
: CD3D8MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -100,7 +100,7 @@ public:
: CD3D8MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -155,7 +155,7 @@ public:
materials by opaque and transparent.
The return value could be optimized, but we'd need to know the
MaterialTypeParam for it. */
virtual bool isTransparent() const
virtual bool isTransparent() const _IRR_OVERRIDE_
{
return true;
}
......@@ -206,7 +206,7 @@ public:
: CD3D8MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -232,7 +232,7 @@ public:
: CD3D8MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -250,7 +250,7 @@ public:
//! Returns if the material is transparent. The scene management needs to know this
//! for being able to sort the materials by opaque and transparent.
virtual bool isTransparent() const
virtual bool isTransparent() const _IRR_OVERRIDE_
{
return true;
}
......@@ -266,7 +266,7 @@ public:
: CD3D8MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -285,7 +285,7 @@ public:
//! Returns if the material is transparent. The scene managment needs to know this
//! for being able to sort the materials by opaque and transparent.
virtual bool isTransparent() const
virtual bool isTransparent() const _IRR_OVERRIDE_
{
return true;
}
......@@ -301,7 +301,7 @@ public:
: CD3D8MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -323,14 +323,14 @@ public:
}
}
virtual void OnUnsetMaterial()
virtual void OnUnsetMaterial() _IRR_OVERRIDE_
{
pID3DDevice->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);
}
//! Returns if the material is transparent. The scene managment needs to know this
//! for being able to sort the materials by opaque and transparent.
virtual bool isTransparent() const
virtual bool isTransparent() const _IRR_OVERRIDE_
{
return true;
}
......@@ -346,7 +346,7 @@ public:
: CD3D8MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -367,14 +367,14 @@ public:
}
}
virtual void OnUnsetMaterial()
virtual void OnUnsetMaterial() _IRR_OVERRIDE_
{
pID3DDevice->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);
}
//! Returns if the material is transparent. The scene managment needs to know this
//! for being able to sort the materials by opaque and transparent.
virtual bool isTransparent() const
virtual bool isTransparent() const _IRR_OVERRIDE_
{
return false; // this material is not really transparent because it does no blending.
}
......@@ -390,7 +390,7 @@ public:
: CD3D8MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -435,7 +435,7 @@ public:
: CD3D8MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -461,7 +461,7 @@ public:
: CD3D8MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -479,7 +479,7 @@ public:
}
}
virtual void OnUnsetMaterial()
virtual void OnUnsetMaterial() _IRR_OVERRIDE_
{
pID3DDevice->SetTextureStageState( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE );
pID3DDevice->SetTextureStageState( 0, D3DTSS_TEXCOORDINDEX, 0);
......@@ -497,7 +497,7 @@ public:
: CD3D8MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -516,7 +516,7 @@ public:
}
}
virtual void OnUnsetMaterial()
virtual void OnUnsetMaterial() _IRR_OVERRIDE_
{
pID3DDevice->SetTextureStageState( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE );
pID3DDevice->SetTextureStageState( 1, D3DTSS_TEXCOORDINDEX, 1);
......@@ -534,7 +534,7 @@ public:
: CD3D8MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -557,7 +557,7 @@ public:
}
}
virtual void OnUnsetMaterial()
virtual void OnUnsetMaterial() _IRR_OVERRIDE_
{
pID3DDevice->SetTextureStageState(1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
pID3DDevice->SetTextureStageState(1, D3DTSS_TEXCOORDINDEX, 1);
......@@ -566,7 +566,7 @@ public:
//! Returns if the material is transparent. The scene managment needs to know this
//! for being able to sort the materials by opaque and transparent.
virtual bool isTransparent() const
virtual bool isTransparent() const _IRR_OVERRIDE_
{
return true;
}
......
source/Irrlicht/CD3D8ParallaxMapRenderer.h
View file @ 37437196
......@@ -38,7 +38,7 @@ public:
virtual void OnSetMaterial(const SMaterial& material) _IRR_OVERRIDE_ { }
virtual void OnSetMaterial(const video::SMaterial& material,
const video::SMaterial& lastMaterial,
bool resetAllRenderstates, video::IMaterialRendererServices* services);
bool resetAllRenderstates, video::IMaterialRendererServices* services) _IRR_OVERRIDE_;
//! Returns the render capability of the material.
virtual s32 getRenderCapability() const _IRR_OVERRIDE_;
......
source/Irrlicht/CD3D8ShaderMaterialRenderer.h
View file @ 37437196
......@@ -38,7 +38,7 @@ public:
~CD3D8ShaderMaterialRenderer();
virtual void OnSetMaterial(const video::SMaterial& material, const video::SMaterial& lastMaterial,
bool resetAllRenderstates, video::IMaterialRendererServices* services);
bool resetAllRenderstates, video::IMaterialRendererServices* services) _IRR_OVERRIDE_;
virtual void OnUnsetMaterial() _IRR_OVERRIDE_;
......
source/Irrlicht/CD3D9Driver.h
View file @ 37437196
......@@ -65,7 +65,7 @@ namespace video
virtual bool beginScene(bool backBuffer=true, bool zBuffer=true,
SColor color=SColor(255,0,0,0),
const SExposedVideoData& videoData=SExposedVideoData(),
core::rect<s32>* sourceRect=0);
core::rect<s32>* sourceRect=0) _IRR_OVERRIDE_;
//! applications must call this method after performing any rendering. returns false if failed.
virtual bool endScene() _IRR_OVERRIDE_;
......@@ -82,12 +82,12 @@ namespace video
//! sets a render target
virtual bool setRenderTarget(video::ITexture* texture,
bool clearBackBuffer=true, bool clearZBuffer=true,
SColor color=video::SColor(0,0,0,0));
SColor color=video::SColor(0,0,0,0)) _IRR_OVERRIDE_;
//! Sets multiple render targets
virtual bool setRenderTarget(const core::array<video::IRenderTarget>& texture,
bool clearBackBuffer=true, bool clearZBuffer=true,
SColor color=video::SColor(0,0,0,0));
SColor color=video::SColor(0,0,0,0)) _IRR_OVERRIDE_;
//! sets a viewport
virtual void setViewPort(const core::rect<s32>& area) _IRR_OVERRIDE_;
......@@ -127,7 +127,7 @@ namespace video
//! Create occlusion query.
/** Use node for identification and mesh for occlusion test. */
virtual void addOcclusionQuery(scene::ISceneNode* node,
const scene::IMesh* mesh=0);
const scene::IMesh* mesh=0) _IRR_OVERRIDE_;
//! Remove occlusion query.
virtual void removeOcclusionQuery(scene::ISceneNode* node) _IRR_OVERRIDE_;
......@@ -152,23 +152,23 @@ namespace video
virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
const void* indexList, u32 primitiveCount,
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType,
E_INDEX_TYPE iType);
E_INDEX_TYPE iType) _IRR_OVERRIDE_;
//! draws a vertex primitive list in 2d
virtual void draw2DVertexPrimitiveList(const void* vertices, u32 vertexCount,
const void* indexList, u32 primitiveCount,
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType,
E_INDEX_TYPE iType);
E_INDEX_TYPE iType) _IRR_OVERRIDE_;
//! draws an 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
virtual void draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos,
const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false);
SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_;
//! Draws a part of the texture into the rectangle.
virtual void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect,
const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
const video::SColor* const colors=0, bool useAlphaChannelOfTexture=false);
const video::SColor* const colors=0, bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_;
//! Draws a set of 2d images, using a color and the alpha channel of the texture.
virtual void draw2DImageBatch(const video::ITexture* texture,
......@@ -176,24 +176,24 @@ namespace video
const core::array<core::rect<s32> >& sourceRects,
const core::rect<s32>* clipRect=0,
SColor color=SColor(255,255,255,255),
bool useAlphaChannelOfTexture=false);
bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_;
//!Draws an 2d rectangle with a gradient.
virtual void draw2DRectangle(const core::rect<s32>& pos,
SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
const core::rect<s32>* clip);
const core::rect<s32>* clip) _IRR_OVERRIDE_;
//! Draws a 2d line.
virtual void draw2DLine(const core::position2d<s32>& start,
const core::position2d<s32>& end,
SColor color=SColor(255,255,255,255));
SColor color=SColor(255,255,255,255)) _IRR_OVERRIDE_;
//! Draws a pixel.
virtual void drawPixel(u32 x, u32 y, const SColor & color) _IRR_OVERRIDE_;
//! Draws a 3d line.
virtual void draw3DLine(const core::vector3df& start,
const core::vector3df& end, SColor color = SColor(255,255,255,255));
const core::vector3df& end, SColor color = SColor(255,255,255,255)) _IRR_OVERRIDE_;
//! initialises the Direct3D API
bool initDriver(HWND hwnd, bool pureSoftware);
......@@ -231,7 +231,7 @@ namespace video
video::SColor leftUpEdge = video::SColor(0,0,0,0),
video::SColor rightUpEdge = video::SColor(0,0,0,0),
video::SColor leftDownEdge = video::SColor(0,0,0,0),
video::SColor rightDownEdge = video::SColor(0,0,0,0));
video::SColor rightDownEdge = video::SColor(0,0,0,0)) _IRR_OVERRIDE_;
//! Returns the maximum amount of primitives (mostly vertices) which
//! the device is able to render with one drawIndexedTriangleList
......@@ -243,7 +243,7 @@ namespace video
//! Sets the fog mode.
virtual void setFog(SColor color, E_FOG_TYPE fogType, f32 start,
f32 end, f32 density, bool pixelFog, bool rangeFog);
f32 end, f32 density, bool pixelFog, bool rangeFog) _IRR_OVERRIDE_;
//! Only used by the internal engine. Used to notify the driver that
//! the window was resized.
......@@ -251,7 +251,7 @@ namespace video
//! Can be called by an IMaterialRenderer to make its work easier.
virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates);
bool resetAllRenderstates) _IRR_OVERRIDE_;
//! Returns type of video driver
virtual E_DRIVER_TYPE getDriverType() const _IRR_OVERRIDE_;
......@@ -289,7 +289,7 @@ namespace video
//! Creates a render target texture.
virtual ITexture* addRenderTargetTexture(const core::dimension2d<u32>& size,
const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN);
const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) _IRR_OVERRIDE_;
//! Clears the ZBuffer.
virtual void clearZBuffer() _IRR_OVERRIDE_;
......@@ -405,7 +405,7 @@ namespace video
IShaderConstantSetCallBack* callback = 0,
E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
s32 userData = 0,
E_GPU_SHADING_LANGUAGE shadingLang = EGSL_DEFAULT);
E_GPU_SHADING_LANGUAGE shadingLang = EGSL_DEFAULT) _IRR_OVERRIDE_;
void createMaterialRenderers();
......
source/Irrlicht/CD3D9MaterialRenderer.h
View file @ 37437196
......@@ -104,7 +104,7 @@ public:
: CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -128,7 +128,7 @@ public:
: CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -183,7 +183,7 @@ public:
materials by opaque and transparent.
The return value could be optimized, but we'd need to know the
MaterialTypeParam for it. */
virtual bool isTransparent() const
virtual bool isTransparent() const _IRR_OVERRIDE_
{
return true;
}
......@@ -223,7 +223,6 @@ public:
}
bool transparent;
};
......@@ -237,7 +236,7 @@ public:
: CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -263,7 +262,7 @@ public:
: CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -281,7 +280,7 @@ public:
//! Returns if the material is transparent. The scene management needs to know this
//! for being able to sort the materials by opaque and transparent.
virtual bool isTransparent() const
virtual bool isTransparent() const _IRR_OVERRIDE_
{
return true;
}
......@@ -297,7 +296,7 @@ public:
: CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -316,7 +315,7 @@ public:
//! Returns if the material is transparent. The scene managment needs to know this
//! for being able to sort the materials by opaque and transparent.
virtual bool isTransparent() const
virtual bool isTransparent() const _IRR_OVERRIDE_
{
return true;
}
......@@ -332,7 +331,7 @@ public:
: CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -354,14 +353,14 @@ public:
}
}
virtual void OnUnsetMaterial()
virtual void OnUnsetMaterial() _IRR_OVERRIDE_
{
pID3DDevice->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);
}
//! Returns if the material is transparent. The scene managment needs to know this
//! for being able to sort the materials by opaque and transparent.
virtual bool isTransparent() const
virtual bool isTransparent() const _IRR_OVERRIDE_
{
return true;
}
......@@ -378,7 +377,7 @@ public:
: CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -399,14 +398,14 @@ public:
}
}
virtual void OnUnsetMaterial()
virtual void OnUnsetMaterial() _IRR_OVERRIDE_
{
pID3DDevice->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);
}
//! Returns if the material is transparent. The scene managment needs to know this
//! for being able to sort the materials by opaque and transparent.
virtual bool isTransparent() const
virtual bool isTransparent() const _IRR_OVERRIDE_
{
return false; // this material is not really transparent because it does no blending.
}
......@@ -422,7 +421,7 @@ public:
: CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -468,7 +467,7 @@ public:
: CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -494,7 +493,7 @@ public:
: CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -512,7 +511,7 @@ public:
}
}
virtual void OnUnsetMaterial()
virtual void OnUnsetMaterial() _IRR_OVERRIDE_
{
pID3DDevice->SetTextureStageState( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE );
pID3DDevice->SetTextureStageState( 0, D3DTSS_TEXCOORDINDEX, 0);
......@@ -530,7 +529,7 @@ public:
: CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -549,7 +548,7 @@ public:
}
}
virtual void OnUnsetMaterial()
virtual void OnUnsetMaterial() _IRR_OVERRIDE_
{
pID3DDevice->SetTextureStageState( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE );
pID3DDevice->SetTextureStageState( 1, D3DTSS_TEXCOORDINDEX, 1);
......@@ -567,7 +566,7 @@ public:
: CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
......@@ -590,7 +589,7 @@ public:
}
}
virtual void OnUnsetMaterial()
virtual void OnUnsetMaterial() _IRR_OVERRIDE_
{
pID3DDevice->SetTextureStageState(1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
pID3DDevice->SetTextureStageState(1, D3DTSS_TEXCOORDINDEX, 1);
......@@ -599,7 +598,7 @@ public:
//! Returns if the material is transparent. The scene managment needs to know this
//! for being able to sort the materials by opaque and transparent.
virtual bool isTransparent() const
virtual bool isTransparent() const _IRR_OVERRIDE_
{
return true;
}
......
source/Irrlicht/CD3D9ParallaxMapRenderer.h
View file @ 37437196
......@@ -46,7 +46,7 @@ public:
virtual void OnSetMaterial(const SMaterial& material) _IRR_OVERRIDE_ { }
virtual void OnSetMaterial(const video::SMaterial& material,
const video::SMaterial& lastMaterial,
bool resetAllRenderstates, video::IMaterialRendererServices* services);
bool resetAllRenderstates, video::IMaterialRendererServices* services) _IRR_OVERRIDE_;
private:
......
source/Irrlicht/CD3D9ShaderMaterialRenderer.h
View file @ 37437196
......@@ -39,7 +39,7 @@ public:
~CD3D9ShaderMaterialRenderer();
virtual void OnSetMaterial(const video::SMaterial& material, const video::SMaterial& lastMaterial,
bool resetAllRenderstates, video::IMaterialRendererServices* services);
bool resetAllRenderstates, video::IMaterialRendererServices* services) _IRR_OVERRIDE_;
virtual void OnUnsetMaterial() _IRR_OVERRIDE_;
......
source/Irrlicht/CFileSystem.h
View file @ 37437196
......@@ -50,14 +50,14 @@ public:
bool ignoreCase = true, bool ignorePaths = true,
E_FILE_ARCHIVE_TYPE archiveType = EFAT_UNKNOWN,
const core::stringc& password="",
IFileArchive** retArchive = 0);
IFileArchive** retArchive = 0) _IRR_OVERRIDE_;
//! Adds an archive to the file system.
virtual bool addFileArchive(IReadFile* file, bool ignoreCase=true,
bool ignorePaths=true,
E_FILE_ARCHIVE_TYPE archiveType=EFAT_UNKNOWN,
const core::stringc& password="",
IFileArchive** retArchive = 0);
IFileArchive** retArchive = 0) _IRR_OVERRIDE_;
//! Adds an archive to the file system.
virtual bool addFileArchive(IFileArchive* archive) _IRR_OVERRIDE_;
......
source/Irrlicht/CGUIButton.h
View file @ 37437196
......@@ -65,7 +65,7 @@ namespace gui
\param color: The color of the sprite
*/
virtual void setSprite(EGUI_BUTTON_STATE state, s32 index,
video::SColor color=video::SColor(255,255,255,255), bool loop=false);
video::SColor color=video::SColor(255,255,255,255), bool loop=false) _IRR_OVERRIDE_;
//! Sets if the button should behave like a push button. Which means it
//! can be in two states: Normal or Pressed. With a click on the button,
......
source/Irrlicht/CGUIContextMenu.h
View file @ 37437196
......@@ -42,11 +42,11 @@ namespace gui
//! Adds a menu item.
virtual u32 addItem(const wchar_t* text, s32 commandid,
bool enabled, bool hasSubMenu, bool checked, bool autoChecking);
bool enabled, bool hasSubMenu, bool checked, bool autoChecking) _IRR_OVERRIDE_;
//! Insert a menu item at specified position.
virtual u32 insertItem(u32 idx, const wchar_t* text, s32 commandId, bool enabled,
bool hasSubMenu, bool checked, bool autoChecking);
bool hasSubMenu, bool checked, bool autoChecking) _IRR_OVERRIDE_;
//! Find a item which has the given CommandId starting from given index
virtual s32 findItemWithCommandId(s32 commandId, u32 idxStartSearch) const _IRR_OVERRIDE_;
......
source/Irrlicht/CGUIEnvironment.h
View file @ 37437196
......@@ -71,8 +71,8 @@ public:
virtual IGUISkin* createSkin(EGUI_SKIN_TYPE type) _IRR_OVERRIDE_;
//! Creates the image list from the given texture.
virtual IGUIImageList* createImageList( video::ITexture* texture,
core::dimension2d<s32> imageSize, bool useAlphaChannel );
virtual IGUIImageList* createImageList(video::ITexture* texture,
core::dimension2d<s32> imageSize, bool useAlphaChannel) _IRR_OVERRIDE_;
//! returns the font
virtual IGUIFont* getFont(const io::path& filename) _IRR_OVERRIDE_;
......@@ -97,73 +97,76 @@ public:
//! adds a window. The returned pointer must not be dropped.
virtual IGUIWindow* addWindow(const core::rect<s32>& rectangle, bool modal = false,
const wchar_t* text=0, IGUIElement* parent=0, s32 id=-1);
const wchar_t* text=0, IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_;
//! adds a modal screen. The returned pointer must not be dropped.
virtual IGUIElement* addModalScreen(IGUIElement* parent) _IRR_OVERRIDE_;
//! Adds a message box.
virtual IGUIWindow* addMessageBox(const wchar_t* caption, const wchar_t* text=0,
bool modal = true, s32 flag = EMBF_OK, IGUIElement* parent=0, s32 id=-1, video::ITexture* image=0);
bool modal = true, s32 flag = EMBF_OK, IGUIElement* parent=0, s32 id=-1, video::ITexture* image=0) _IRR_OVERRIDE_;
//! adds a scrollbar. The returned pointer must not be dropped.
virtual IGUIScrollBar* addScrollBar(bool horizontal, const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1);
IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_;
//! Adds an image element.
virtual IGUIImage* addImage(video::ITexture* image, core::position2d<s32> pos,
bool useAlphaChannel=true, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0);
bool useAlphaChannel=true, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) _IRR_OVERRIDE_;
//! adds an image. The returned pointer must not be dropped.
virtual IGUIImage* addImage(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0, bool useAlphaChannel=true);
IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0, bool useAlphaChannel=true) _IRR_OVERRIDE_;
//! adds a checkbox
virtual IGUICheckBox* addCheckBox(bool checked, const core::rect<s32>& rectangle, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) _IRR_OVERRIDE_;
virtual IGUICheckBox* addCheckBox(bool checked, const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) _IRR_OVERRIDE_;
//! adds a list box
virtual IGUIListBox* addListBox(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1, bool drawBackground=false);
IGUIElement* parent=0, s32 id=-1, bool drawBackground=false) _IRR_OVERRIDE_;
//! adds a tree view
virtual IGUITreeView* addTreeView(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1, bool drawBackground=false,
bool scrollBarVertical = true, bool scrollBarHorizontal = false);
bool scrollBarVertical = true, bool scrollBarHorizontal = false) _IRR_OVERRIDE_;
//! adds an mesh viewer. The returned pointer must not be dropped.
virtual IGUIMeshViewer* addMeshViewer(const core::rect<s32>& rectangle, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) _IRR_OVERRIDE_;
virtual IGUIMeshViewer* addMeshViewer(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) _IRR_OVERRIDE_;
//! Adds a file open dialog.
virtual IGUIFileOpenDialog* addFileOpenDialog(const wchar_t* title = 0,
bool modal=true, IGUIElement* parent=0, s32 id=-1,
bool restoreCWD=false, io::path::char_type* startDir=0);
bool restoreCWD=false, io::path::char_type* startDir=0) _IRR_OVERRIDE_;
//! Adds a color select dialog.
virtual IGUIColorSelectDialog* addColorSelectDialog(const wchar_t* title = 0, bool modal=true, IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_;
virtual IGUIColorSelectDialog* addColorSelectDialog(const wchar_t* title = 0,
bool modal=true, IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_;
//! adds a static text. The returned pointer must not be dropped.
virtual IGUIStaticText* addStaticText(const wchar_t* text, const core::rect<s32>& rectangle,
bool border=false, bool wordWrap=true, IGUIElement* parent=0, s32 id=-1, bool drawBackground = false);
bool border=false, bool wordWrap=true, IGUIElement* parent=0, s32 id=-1, bool drawBackground = false) _IRR_OVERRIDE_;
//! Adds an edit box. The returned pointer must not be dropped.
virtual IGUIEditBox* addEditBox(const wchar_t* text, const core::rect<s32>& rectangle,
bool border=false, IGUIElement* parent=0, s32 id=-1);
bool border=false, IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_;
//! Adds a spin box to the environment
virtual IGUISpinBox* addSpinBox(const wchar_t* text, const core::rect<s32>& rectangle,
bool border=false,IGUIElement* parent=0, s32 id=-1);
bool border=false,IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_;
//! Adds a tab control to the environment.
virtual IGUITabControl* addTabControl(const core::rect<s32>& rectangle,
IGUIElement* parent=0, bool fillbackground=false, bool border=true, s32 id=-1);
IGUIElement* parent=0, bool fillbackground=false, bool border=true, s32 id=-1) _IRR_OVERRIDE_;
//! Adds tab to the environment.
virtual IGUITab* addTab(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1);
IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_;
//! Adds a context menu to the environment.
virtual IGUIContextMenu* addContextMenu(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1);
IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_;
//! Adds a menu to the environment.
virtual IGUIContextMenu* addMenu(IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_;
......@@ -174,11 +177,11 @@ public:
//! Adds a combo box to the environment.
virtual IGUIComboBox* addComboBox(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1);
IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_;
//! Adds a table element.
virtual IGUITable* addTable(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1, bool drawBackground=false);
IGUIElement* parent=0, s32 id=-1, bool drawBackground=false) _IRR_OVERRIDE_;
//! sets the focus to an element
virtual bool setFocus(IGUIElement* element) _IRR_OVERRIDE_;
......
source/Irrlicht/CGUIFont.h
View file @ 37437196
......@@ -51,7 +51,7 @@ public:
//! draws an text and clips it to the specified rectangle if wanted
virtual void draw(const core::stringw& text, const core::rect<s32>& position,
video::SColor color, bool hcenter=false,
bool vcenter=false, const core::rect<s32>* clip=0);
bool vcenter=false, const core::rect<s32>* clip=0) _IRR_OVERRIDE_;
//! returns the dimension of a text
virtual core::dimension2d<u32> getDimension(const wchar_t* text) const _IRR_OVERRIDE_;
......
source/Irrlicht/CGUIImageList.h
View file @ 37437196
......@@ -38,16 +38,16 @@ public:
//! \param clip: Optional pointer to a rectalgle against which the text will be clipped.
//! If the pointer is null, no clipping will be done.
virtual void draw( s32 index, const core::position2d<s32>& destPos,
const core::rect<s32>* clip = 0 );
const core::rect<s32>* clip = 0 ) _IRR_OVERRIDE_;
//! Returns the count of Images in the list.
//! \return Returns the count of Images in the list.
virtual s32 getImageCount() const
virtual s32 getImageCount() const _IRR_OVERRIDE_
{ return ImageCount; }
//! Returns the size of the images in the list.
//! \return Returns the size of the images in the list.
virtual core::dimension2d<s32> getImageSize() const
virtual core::dimension2d<s32> getImageSize() const _IRR_OVERRIDE_
{ return ImageSize; }
private:
......
source/Irrlicht/CGUISkin.h
View file @ 37437196
......@@ -85,7 +85,7 @@ namespace gui
implementations to find out how to draw the part exactly. */
virtual void draw3DButtonPaneStandard(IGUIElement* element,
const core::rect<s32>& rect,
const core::rect<s32>* clip=0);
const core::rect<s32>* clip=0) _IRR_OVERRIDE_;
//! draws a pressed 3d button pane
/** Used for drawing for example buttons in pressed state.
......@@ -98,7 +98,7 @@ namespace gui
implementations to find out how to draw the part exactly. */
virtual void draw3DButtonPanePressed(IGUIElement* element,
const core::rect<s32>& rect,
const core::rect<s32>* clip=0);
const core::rect<s32>* clip=0) _IRR_OVERRIDE_;
//! draws a sunken 3d pane
/** Used for drawing the background of edit, combo or check boxes.
......@@ -114,7 +114,7 @@ namespace gui
video::SColor bgcolor, bool flat,
bool fillBackGround,
const core::rect<s32>& rect,
const core::rect<s32>* clip=0);
const core::rect<s32>* clip=0) _IRR_OVERRIDE_;
//! draws a window background
/** Used for drawing the background of dialogs and windows.
......@@ -134,7 +134,7 @@ namespace gui
bool drawTitleBar, video::SColor titleBarColor,
const core::rect<s32>& rect,
const core::rect<s32>* clip,
core::rect<s32>* checkClientArea);
core::rect<s32>* checkClientArea) _IRR_OVERRIDE_;
//! draws a standard 3d menu pane
/** Used for drawing for menus and context menus.
......@@ -147,7 +147,7 @@ namespace gui
\param clip: Clip area. */
virtual void draw3DMenuPane(IGUIElement* element,
const core::rect<s32>& rect,
const core::rect<s32>* clip=0);
const core::rect<s32>* clip=0) _IRR_OVERRIDE_;
//! draws a standard 3d tool bar
/** Used for drawing for toolbars and menus.
......@@ -158,7 +158,7 @@ namespace gui
\param clip: Clip area. */
virtual void draw3DToolBar(IGUIElement* element,
const core::rect<s32>& rect,
const core::rect<s32>* clip=0);
const core::rect<s32>* clip=0) _IRR_OVERRIDE_;
//! draws a tab button
/** Used for drawing for tab buttons on top of tabs.
......@@ -169,7 +169,8 @@ namespace gui
\param rect: Defining area where to draw.
\param clip: Clip area. */
virtual void draw3DTabButton(IGUIElement* element, bool active,
const core::rect<s32>& rect, const core::rect<s32>* clip=0, EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT);
const core::rect<s32>& rect, const core::rect<s32>* clip=0,
EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT) _IRR_OVERRIDE_;
//! draws a tab control body
/** \param element: Pointer to the element which wishes to draw this. This parameter
......@@ -180,7 +181,8 @@ namespace gui
\param rect: Defining area where to draw.
\param clip: Clip area. */
virtual void draw3DTabBody(IGUIElement* element, bool border, bool background,
const core::rect<s32>& rect, const core::rect<s32>* clip=0, s32 tabHeight=-1, EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT);
const core::rect<s32>& rect, const core::rect<s32>* clip=0, s32 tabHeight=-1,
EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT) _IRR_OVERRIDE_;
//! draws an icon, usually from the skin's sprite bank
/** \param element: Pointer to the element which wishes to draw this icon.
......@@ -195,7 +197,7 @@ namespace gui
virtual void drawIcon(IGUIElement* element, EGUI_DEFAULT_ICON icon,
const core::position2di position,
u32 starttime=0, u32 currenttime=0,
bool loop=false, const core::rect<s32>* clip=0);
bool loop=false, const core::rect<s32>* clip=0) _IRR_OVERRIDE_;
//! draws a 2d rectangle.
......@@ -208,7 +210,7 @@ namespace gui
\param clip: Pointer to rectangle against which the rectangle will be clipped.
If the pointer is null, no clipping will be performed. */
virtual void draw2DRectangle(IGUIElement* element, const video::SColor &color,
const core::rect<s32>& pos, const core::rect<s32>* clip = 0);
const core::rect<s32>& pos, const core::rect<s32>* clip = 0) _IRR_OVERRIDE_;
//! get the type of this skin
......
source/Irrlicht/CGUISpriteBank.h
View file @ 37437196
......@@ -49,14 +49,14 @@ public:
//! Draws a sprite in 2d with position and color
virtual void draw2DSprite(u32 index, const core::position2di& pos, const core::rect<s32>* clip=0,
const video::SColor& color= video::SColor(255,255,255,255),
u32 starttime=0, u32 currenttime=0, bool loop=true, bool center=false);
u32 starttime=0, u32 currenttime=0, bool loop=true, bool center=false) _IRR_OVERRIDE_;
//! Draws a sprite batch in 2d using an array of positions and a color
virtual void draw2DSpriteBatch(const core::array<u32>& indices, const core::array<core::position2di>& pos,
const core::rect<s32>* clip=0,
const video::SColor& color= video::SColor(255,255,255,255),
u32 starttime=0, u32 currenttime=0,
bool loop=true, bool center=false);
bool loop=true, bool center=false) _IRR_OVERRIDE_;
protected:
......
source/Irrlicht/CGUIToolBar.h
View file @ 37437196
......@@ -35,7 +35,7 @@ namespace gui
//! Adds a button to the tool bar
virtual IGUIButton* addButton(s32 id=-1, const wchar_t* text=0,const wchar_t* tooltiptext=0,
video::ITexture* img=0, video::ITexture* pressed=0,
bool isPushButton=false, bool useAlphaChannel=false);
bool isPushButton=false, bool useAlphaChannel=false) _IRR_OVERRIDE_;
private:
......
source/Irrlicht/CGUITreeView.h
View file @ 37437196
......@@ -36,49 +36,49 @@ namespace gui
virtual IGUITreeViewNode* getParent() const _IRR_OVERRIDE_;
//! returns the text of the node
virtual const wchar_t* getText() const
virtual const wchar_t* getText() const _IRR_OVERRIDE_
{ return Text.c_str(); }
//! sets the text of the node
virtual void setText( const wchar_t* text ) _IRR_OVERRIDE_;
//! returns the icon text of the node
virtual const wchar_t* getIcon() const
virtual const wchar_t* getIcon() const _IRR_OVERRIDE_
{ return Icon.c_str(); }
//! sets the icon text of the node
virtual void setIcon( const wchar_t* icon ) _IRR_OVERRIDE_;
//! returns the image index of the node
virtual u32 getImageIndex() const
virtual u32 getImageIndex() const _IRR_OVERRIDE_
{ return ImageIndex; }
//! sets the image index of the node
virtual void setImageIndex( u32 imageIndex )
virtual void setImageIndex( u32 imageIndex ) _IRR_OVERRIDE_
{ ImageIndex = imageIndex; }
//! returns the image index of the node
virtual u32 getSelectedImageIndex() const
virtual u32 getSelectedImageIndex() const _IRR_OVERRIDE_
{ return SelectedImageIndex; }
//! sets the image index of the node
virtual void setSelectedImageIndex( u32 imageIndex )
virtual void setSelectedImageIndex( u32 imageIndex ) _IRR_OVERRIDE_
{ SelectedImageIndex = imageIndex; }
//! returns the user data (void*) of this node
virtual void* getData() const
virtual void* getData() const _IRR_OVERRIDE_
{ return Data; }
//! sets the user data (void*) of this node
virtual void setData( void* data )
virtual void setData( void* data ) _IRR_OVERRIDE_
{ Data = data; }
//! returns the user data2 (IReferenceCounted) of this node
virtual IReferenceCounted* getData2() const
virtual IReferenceCounted* getData2() const _IRR_OVERRIDE_
{ return Data2; }
//! sets the user data2 (IReferenceCounted) of this node
virtual void setData2( IReferenceCounted* data )
virtual void setData2( IReferenceCounted* data ) _IRR_OVERRIDE_
{
if( Data2 )
{
......@@ -92,14 +92,14 @@ namespace gui
}
//! returns the child item count
virtual u32 getChildCount() const
virtual u32 getChildCount() const _IRR_OVERRIDE_
{ return Children.getSize(); }
//! removes all children (recursive) from this node
virtual void clearChildren() _IRR_OVERRIDE_;
//! returns true if this node has child nodes
virtual bool hasChildren() const
virtual bool hasChildren() const _IRR_OVERRIDE_
{ return !Children.empty(); }
//! Adds a new node behind the last child node.
......@@ -117,7 +117,7 @@ namespace gui
s32 imageIndex = -1,
s32 selectedImageIndex = -1,
void* data = 0,
IReferenceCounted* data2 = 0);
IReferenceCounted* data2 = 0) _IRR_OVERRIDE_;
//! Adds a new node before the first child node.
//! \param text text of the new node
......@@ -134,7 +134,7 @@ namespace gui
s32 imageIndex = -1,
s32 selectedImageIndex = -1,
void* data = 0,
IReferenceCounted* data2 = 0 );
IReferenceCounted* data2 = 0 ) _IRR_OVERRIDE_;
//! Adds a new node behind the other node.
//! The other node has also te be a child node from this node.
......@@ -153,7 +153,7 @@ namespace gui
s32 imageIndex = -1,
s32 selectedImageIndex = -1,
void* data = 0,
IReferenceCounted* data2 = 0 );
IReferenceCounted* data2 = 0 ) _IRR_OVERRIDE_;
//! Adds a new node before the other node.
//! The other node has also te be a child node from this node.
......@@ -172,7 +172,7 @@ namespace gui
s32 imageIndex = -1,
s32 selectedImageIndex = -1,
void* data = 0,
IReferenceCounted* data2 = 0 );
IReferenceCounted* data2 = 0 ) _IRR_OVERRIDE_;
//! Return the first child note from this node.
virtual IGUITreeViewNode* getFirstChild() const _IRR_OVERRIDE_;
......@@ -199,7 +199,7 @@ namespace gui
virtual bool moveChildDown( IGUITreeViewNode* child ) _IRR_OVERRIDE_;
//! Returns true if the node is expanded (children are visible).
virtual bool getExpanded() const
virtual bool getExpanded() const _IRR_OVERRIDE_
{ return Expanded; }
//! Sets if the node is expanded.
......@@ -250,19 +250,19 @@ namespace gui
virtual ~CGUITreeView();
//! returns the root node (not visible) from the tree.
virtual IGUITreeViewNode* getRoot() const
virtual IGUITreeViewNode* getRoot() const _IRR_OVERRIDE_
{ return Root; }
//! returns the selected node of the tree or 0 if none is selected
virtual IGUITreeViewNode* getSelected() const
virtual IGUITreeViewNode* getSelected() const _IRR_OVERRIDE_
{ return Selected; }
//! returns true if the tree lines are visible
virtual bool getLinesVisible() const
virtual bool getLinesVisible() const _IRR_OVERRIDE_
{ return LinesVisible; }
//! sets if the tree lines are visible
virtual void setLinesVisible( bool visible )
virtual void setLinesVisible( bool visible ) _IRR_OVERRIDE_
{ LinesVisible = visible; }
//! called if an event happened.
......@@ -282,19 +282,19 @@ namespace gui
virtual void setImageList( IGUIImageList* imageList ) _IRR_OVERRIDE_;
//! Returns the image list which is used for the nodes.
virtual IGUIImageList* getImageList() const
virtual IGUIImageList* getImageList() const _IRR_OVERRIDE_
{ return ImageList; }
//! Sets if the image is left of the icon. Default is true.
virtual void setImageLeftOfIcon( bool bLeftOf )
virtual void setImageLeftOfIcon( bool bLeftOf ) _IRR_OVERRIDE_
{ ImageLeftOfIcon = bLeftOf; }
//! Returns if the Image is left of the icon. Default is true.
virtual bool getImageLeftOfIcon() const
virtual bool getImageLeftOfIcon() const _IRR_OVERRIDE_
{ return ImageLeftOfIcon; }
//! Returns the node which is associated to the last event.
virtual IGUITreeViewNode* getLastEventNode() const
virtual IGUITreeViewNode* getLastEventNode() const _IRR_OVERRIDE_
{ return LastEventNode; }
private:
......
source/Irrlicht/CImage.h
View file @ 37437196
......@@ -34,7 +34,7 @@ public:
virtual ~CImage();
//! Lock function.
virtual void* lock()
virtual void* lock() _IRR_OVERRIDE_
{
return Data;
}
......@@ -96,7 +96,7 @@ public:
//! copies this surface into another, using the alpha mask, an cliprect and a color to add with
virtual void copyToWithAlpha(IImage* target, const core::position2d<s32>& pos,
const core::rect<s32>& sourceRect, const SColor &color,
const core::rect<s32>* clipRect = 0);
const core::rect<s32>* clipRect = 0) _IRR_OVERRIDE_;
//! copies this surface into another, scaling it to fit, appyling a box filter
virtual void copyToScalingBoxFilter(IImage* target, s32 bias = 0, bool blend = false) _IRR_OVERRIDE_;
......
source/Irrlicht/CIrrDeviceConsole.h
View file @ 37437196
......@@ -69,7 +69,7 @@ namespace irr
virtual bool isWindowMinimized() const _IRR_OVERRIDE_;
//! returns current window position (not supported for this device)
virtual core::position2di getWindowPosition()
virtual core::position2di getWindowPosition() _IRR_OVERRIDE_
{
return core::position2di(-1, -1);
}
......@@ -93,7 +93,7 @@ namespace irr
virtual void restoreWindow() _IRR_OVERRIDE_;
//! Get the device type
virtual E_DEVICE_TYPE getType() const
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_
{
return EIDT_CONSOLE;
}
......@@ -116,7 +116,7 @@ namespace irr
}
//! Changes the visible state of the mouse cursor.
virtual void setVisible(bool visible)
virtual void setVisible(bool visible) _IRR_OVERRIDE_
{
if(visible != IsVisible)
{
......@@ -126,19 +126,19 @@ namespace irr
}
//! Returns if the cursor is currently visible.
virtual bool isVisible() const
virtual bool isVisible() const _IRR_OVERRIDE_
{
return IsVisible;
}
//! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<f32> &pos)
virtual void setPosition(const core::position2d<f32> &pos) _IRR_OVERRIDE_
{
setPosition(pos.X, pos.Y);
}
//! Sets the new position of the cursor.
virtual void setPosition(f32 x, f32 y)
virtual void setPosition(f32 x, f32 y) _IRR_OVERRIDE_
{
if (!UseReferenceRect)
setPosition((s32)(x*WindowSize.Width), (s32)(y*WindowSize.Height));
......@@ -147,25 +147,25 @@ namespace irr
}
//! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<s32> &pos)
virtual void setPosition(const core::position2d<s32> &pos) _IRR_OVERRIDE_
{
setPosition(pos.X, pos.Y);
}
//! Sets the new position of the cursor.
virtual void setPosition(s32 x, s32 y)
virtual void setPosition(s32 x, s32 y) _IRR_OVERRIDE_
{
setInternalCursorPosition(core::position2di(x,y));
}
//! Returns the current position of the mouse cursor.
virtual const core::position2d<s32>& getPosition()
virtual const core::position2d<s32>& getPosition() _IRR_OVERRIDE_
{
return CursorPos;
}
//! Returns the current position of the mouse cursor.
virtual core::position2d<f32> getRelativePosition()
virtual core::position2d<f32> getRelativePosition() _IRR_OVERRIDE_
{
if (!UseReferenceRect)
{
......@@ -178,7 +178,7 @@ namespace irr
}
//! Sets an absolute reference rect for calculating the cursor position.
virtual void setReferenceRect(core::rect<s32>* rect=0)
virtual void setReferenceRect(core::rect<s32>* rect=0) _IRR_OVERRIDE_
{
if (rect)
{
......@@ -256,7 +256,7 @@ namespace gui
//! Draws some text and clips it to the specified rectangle if wanted.
virtual void draw(const wchar_t* text, const core::rect<s32>& position,
video::SColor color, bool hcenter=false, bool vcenter=false,
const core::rect<s32>* clip=0)
const core::rect<s32>* clip=0) _IRR_OVERRIDE_
{
core::rect<s32> Area = clip ? *clip : position;
......@@ -304,7 +304,7 @@ namespace gui
}
//! Calculates the dimension of some text.
virtual core::dimension2d<u32> getDimension(const wchar_t* text) const
virtual core::dimension2d<u32> getDimension(const wchar_t* text) const _IRR_OVERRIDE_
{
return core::dimension2d<u32>(wcslen(text),1);
}
......
source/Irrlicht/CIrrDeviceFB.h
View file @ 37437196
......@@ -64,7 +64,7 @@ namespace irr
virtual void restoreWindow() _IRR_OVERRIDE_;
//! returns current window position (not supported for this device)
virtual core::position2di getWindowPosition()
virtual core::position2di getWindowPosition() _IRR_OVERRIDE_
{
return core::position2di(-1, -1);
}
......@@ -105,56 +105,56 @@ namespace irr
}
//! Changes the visible state of the mouse cursor.
virtual void setVisible(bool visible)
virtual void setVisible(bool visible) _IRR_OVERRIDE_
{
IsVisible = visible;
}
//! Returns if the cursor is currently visible.
virtual bool isVisible() const
virtual bool isVisible() const _IRR_OVERRIDE_
{
return IsVisible;
}
//! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<f32> &pos)
virtual void setPosition(const core::position2d<f32> &pos) _IRR_OVERRIDE_
{
setPosition(pos.X, pos.Y);
}
//! Sets the new position of the cursor.
virtual void setPosition(f32 x, f32 y)
virtual void setPosition(f32 x, f32 y) _IRR_OVERRIDE_
{
setPosition((s32)(x*Device->CreationParams.WindowSize.Width), (s32)(y*Device->CreationParams.WindowSize.Height));
}
//! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<s32> &pos)
virtual void setPosition(const core::position2d<s32> &pos) _IRR_OVERRIDE_
{
setPosition(pos.X, pos.Y);
}
//! Sets the new position of the cursor.
virtual void setPosition(s32 x, s32 y)
virtual void setPosition(s32 x, s32 y) _IRR_OVERRIDE_
{
}
//! Returns the current position of the mouse cursor.
virtual const core::position2d<s32>& getPosition()
virtual const core::position2d<s32>& getPosition() _IRR_OVERRIDE_
{
updateCursorPos();
return CursorPos;
}
//! Returns the current position of the mouse cursor.
virtual core::position2d<f32> getRelativePosition()
virtual core::position2d<f32> getRelativePosition() _IRR_OVERRIDE_
{
updateCursorPos();
return core::position2d<f32>(CursorPos.X / (f32)Device->CreationParams.WindowSize.Width,
CursorPos.Y / (f32)Device->CreationParams.WindowSize.Height);
}
virtual void setReferenceRect(core::rect<s32>* rect=0)
virtual void setReferenceRect(core::rect<s32>* rect=0) _IRR_OVERRIDE_
{
}
......
source/Irrlicht/CIrrDeviceLinux.h
View file @ 37437196
......@@ -87,7 +87,7 @@ namespace irr
//! \return Returns a pointer to a list with all video modes
//! supported by the gfx adapter.
video::IVideoModeList* getVideoModeList();
virtual video::IVideoModeList* getVideoModeList() _IRR_OVERRIDE_;
//! Sets if the window should be resizable in windowed mode.
virtual void setResizable(bool resize=false) _IRR_OVERRIDE_;
......@@ -125,7 +125,7 @@ namespace irr
virtual void clearSystemMessages() _IRR_OVERRIDE_;
//! Get the device type
virtual E_DEVICE_TYPE getType() const
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_
{
return EIDT_X11;
}
......@@ -164,7 +164,7 @@ namespace irr
~CCursorControl();
//! Changes the visible state of the mouse cursor.
virtual void setVisible(bool visible)
virtual void setVisible(bool visible) _IRR_OVERRIDE_
{
if (visible==IsVisible)
return;
......@@ -181,31 +181,31 @@ namespace irr
}
//! Returns if the cursor is currently visible.
virtual bool isVisible() const
virtual bool isVisible() const _IRR_OVERRIDE_
{
return IsVisible;
}
//! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<f32> &pos)
virtual void setPosition(const core::position2d<f32> &pos) _IRR_OVERRIDE_
{
setPosition(pos.X, pos.Y);
}
//! Sets the new position of the cursor.
virtual void setPosition(f32 x, f32 y)
virtual void setPosition(f32 x, f32 y) _IRR_OVERRIDE_
{
setPosition((s32)(x*Device->Width), (s32)(y*Device->Height));
}
//! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<s32> &pos)
virtual void setPosition(const core::position2d<s32> &pos) _IRR_OVERRIDE_
{
setPosition(pos.X, pos.Y);
}
//! Sets the new position of the cursor.
virtual void setPosition(s32 x, s32 y)
virtual void setPosition(s32 x, s32 y) _IRR_OVERRIDE_
{
#ifdef _IRR_COMPILE_WITH_X11_
......@@ -238,14 +238,14 @@ namespace irr
}
//! Returns the current position of the mouse cursor.
virtual const core::position2d<s32>& getPosition()
virtual const core::position2d<s32>& getPosition() _IRR_OVERRIDE_
{
updateCursorPos();
return CursorPos;
}
//! Returns the current position of the mouse cursor.
virtual core::position2d<f32> getRelativePosition()
virtual core::position2d<f32> getRelativePosition() _IRR_OVERRIDE_
{
updateCursorPos();
......@@ -259,7 +259,7 @@ namespace irr
CursorPos.Y / (f32)ReferenceRect.getHeight());
}
virtual void setReferenceRect(core::rect<s32>* rect=0)
virtual void setReferenceRect(core::rect<s32>* rect=0) _IRR_OVERRIDE_
{
if (rect)
{
......@@ -282,7 +282,7 @@ namespace irr
virtual void setActiveIcon(gui::ECURSOR_ICON iconId) _IRR_OVERRIDE_;
//! Gets the currently active icon
virtual gui::ECURSOR_ICON getActiveIcon() const
virtual gui::ECURSOR_ICON getActiveIcon() const _IRR_OVERRIDE_
{
return ActiveIcon;
}
......
source/Irrlicht/CIrrDeviceSDL.h
View file @ 37437196
......@@ -63,7 +63,7 @@ namespace irr
virtual void closeDevice() _IRR_OVERRIDE_;
//! \return Returns a pointer to a list with all video modes supported
video::IVideoModeList* getVideoModeList();
virtual video::IVideoModeList* getVideoModeList() _IRR_OVERRIDE_;
//! Sets if the window should be resizable in windowed mode.
virtual void setResizable(bool resize=false) _IRR_OVERRIDE_;
......@@ -90,7 +90,7 @@ namespace irr
virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ) _IRR_OVERRIDE_;
//! Get the device type
virtual E_DEVICE_TYPE getType() const
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_
{
return EIDT_SDL;
}
......@@ -106,7 +106,7 @@ namespace irr
}
//! Changes the visible state of the mouse cursor.
virtual void setVisible(bool visible)
virtual void setVisible(bool visible) _IRR_OVERRIDE_
{
IsVisible = visible;
if ( visible )
......@@ -116,51 +116,51 @@ namespace irr
}
//! Returns if the cursor is currently visible.
virtual bool isVisible() const
virtual bool isVisible() const _IRR_OVERRIDE_
{
return IsVisible;
}
//! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<f32> &pos)
virtual void setPosition(const core::position2d<f32> &pos) _IRR_OVERRIDE_
{
setPosition(pos.X, pos.Y);
}
//! Sets the new position of the cursor.
virtual void setPosition(f32 x, f32 y)
virtual void setPosition(f32 x, f32 y) _IRR_OVERRIDE_
{
setPosition((s32)(x*Device->Width), (s32)(y*Device->Height));
}
//! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<s32> &pos)
virtual void setPosition(const core::position2d<s32> &pos) _IRR_OVERRIDE_
{
setPosition(pos.X, pos.Y);
}
//! Sets the new position of the cursor.
virtual void setPosition(s32 x, s32 y)
virtual void setPosition(s32 x, s32 y) _IRR_OVERRIDE_
{
SDL_WarpMouse( x, y );
}
//! Returns the current position of the mouse cursor.
virtual const core::position2d<s32>& getPosition()
virtual const core::position2d<s32>& getPosition() _IRR_OVERRIDE_
{
updateCursorPos();
return CursorPos;
}
//! Returns the current position of the mouse cursor.
virtual core::position2d<f32> getRelativePosition()
virtual core::position2d<f32> getRelativePosition() _IRR_OVERRIDE_
{
updateCursorPos();
return core::position2d<f32>(CursorPos.X / (f32)Device->Width,
CursorPos.Y / (f32)Device->Height);
}
virtual void setReferenceRect(core::rect<s32>* rect=0)
virtual void setReferenceRect(core::rect<s32>* rect=0) _IRR_OVERRIDE_
{
}
......
source/Irrlicht/CIrrDeviceStub.h
View file @ 37437196
......@@ -144,8 +144,10 @@ namespace irr
bool checkVersion(const char* version);
//! Compares to the last call of this function to return double and triple clicks.
//! \return Returns only 1,2 or 3. A 4th click will start with 1 again.
virtual u32 checkSuccessiveClicks(s32 mouseX, s32 mouseY, EMOUSE_INPUT_EVENT inputEvent );
/** Needed for win32 device event handling
\return Returns only 1,2 or 3. A 4th click will start with 1 again.
*/
virtual u32 checkSuccessiveClicks(s32 mouseX, s32 mouseY, EMOUSE_INPUT_EVENT inputEvent);
void calculateGammaRamp ( u16 *ramp, f32 gamma, f32 relativebrightness, f32 relativecontrast );
void calculateGammaFromRamp ( f32 &gamma, const u16 *ramp );
......
source/Irrlicht/CIrrDeviceWin32.h
View file @ 37437196
......@@ -68,9 +68,10 @@ namespace irr
//! \return Returns a pointer to a list with all video modes
//! supported by the gfx adapter.
video::IVideoModeList* getVideoModeList();
virtual video::IVideoModeList* getVideoModeList() _IRR_OVERRIDE_;
//! Notifies the device, that it has been resized
/** Must be publis as it is called from free function (event handler) */
void OnResized();
//! Sets if the window should be resizable in windowed mode.
......@@ -101,7 +102,7 @@ namespace irr
virtual void clearSystemMessages() _IRR_OVERRIDE_;
//! Get the device type
virtual E_DEVICE_TYPE getType() const
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_
{
return EIDT_WIN32;
}
......@@ -133,7 +134,7 @@ namespace irr
~CCursorControl();
//! Changes the visible state of the mouse cursor.
virtual void setVisible(bool visible)
virtual void setVisible(bool visible) _IRR_OVERRIDE_
{
CURSORINFO info;
info.cbSize = sizeof(CURSORINFO);
......@@ -171,20 +172,20 @@ namespace irr
}
//! Returns if the cursor is currently visible.
virtual bool isVisible() const
virtual bool isVisible() const _IRR_OVERRIDE_
{
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return IsVisible;
}
//! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<f32> &pos)
virtual void setPosition(const core::position2d<f32> &pos) _IRR_OVERRIDE_
{
setPosition(pos.X, pos.Y);
}
//! Sets the new position of the cursor.
virtual void setPosition(f32 x, f32 y)
virtual void setPosition(f32 x, f32 y) _IRR_OVERRIDE_
{
if (!UseReferenceRect)
setPosition(core::round32(x*WindowSize.Width), core::round32(y*WindowSize.Height));
......@@ -193,13 +194,13 @@ namespace irr
}
//! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<s32> &pos)
virtual void setPosition(const core::position2d<s32> &pos) _IRR_OVERRIDE_
{
setPosition(pos.X, pos.Y);
}
//! Sets the new position of the cursor.
virtual void setPosition(s32 x, s32 y)
virtual void setPosition(s32 x, s32 y) _IRR_OVERRIDE_
{
if (UseReferenceRect)
{
......@@ -218,14 +219,14 @@ namespace irr
}
//! Returns the current position of the mouse cursor.
virtual const core::position2d<s32>& getPosition()
virtual const core::position2d<s32>& getPosition() _IRR_OVERRIDE_
{
updateInternalCursorPosition();
return CursorPos;
}
//! Returns the current position of the mouse cursor.
virtual core::position2d<f32> getRelativePosition()
virtual core::position2d<f32> getRelativePosition() _IRR_OVERRIDE_
{
updateInternalCursorPosition();
......@@ -240,7 +241,7 @@ namespace irr
}
//! Sets an absolute reference rect for calculating the cursor position.
virtual void setReferenceRect(core::rect<s32>* rect=0)
virtual void setReferenceRect(core::rect<s32>* rect=0) _IRR_OVERRIDE_
{
if (rect)
{
......@@ -260,7 +261,7 @@ namespace irr
}
/** Used to notify the cursor that the window was resized. */
virtual void OnResize(const core::dimension2d<u32>& size)
void OnResize(const core::dimension2d<u32>& size)
{
WindowSize = size;
if (size.Width!=0)
......@@ -301,7 +302,7 @@ namespace irr
virtual void setActiveIcon(gui::ECURSOR_ICON iconId) _IRR_OVERRIDE_;
//! Gets the currently active icon
virtual gui::ECURSOR_ICON getActiveIcon() const
virtual gui::ECURSOR_ICON getActiveIcon() const _IRR_OVERRIDE_
{
return ActiveIcon;
}
......
source/Irrlicht/CIrrDeviceWinCE.h
View file @ 37437196
......@@ -54,7 +54,7 @@ namespace irr
virtual bool isWindowMinimized() const _IRR_OVERRIDE_;
//! returns current window position (not supported for this device)
virtual core::position2di getWindowPosition()
virtual core::position2di getWindowPosition() _IRR_OVERRIDE_
{
return core::position2di(-1, -1);
}
......@@ -67,7 +67,7 @@ namespace irr
//! \return Returns a pointer to a list with all video modes
//! supported by the gfx adapter.
video::IVideoModeList* getVideoModeList();
virtual video::IVideoModeList* getVideoModeList() _IRR_OVERRIDE_;
//! Notifies the device, that it has been resized
void OnResized();
......@@ -85,7 +85,7 @@ namespace irr
virtual void restoreWindow() _IRR_OVERRIDE_;
//! Get the device type
virtual E_DEVICE_TYPE getType() const
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_
{
return EIDT_WINCE;
}
......@@ -114,26 +114,26 @@ namespace irr
}
//! Changes the visible state of the mouse cursor.
virtual void setVisible(bool visible)
virtual void setVisible(bool visible) _IRR_OVERRIDE_
{
IsVisible = visible;
}
//! Returns if the cursor is currently visible.
virtual bool isVisible() const
virtual bool isVisible() const _IRR_OVERRIDE_
{
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return IsVisible;
}
//! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<f32> &pos)
virtual void setPosition(const core::position2d<f32> &pos) _IRR_OVERRIDE_
{
setPosition(pos.X, pos.Y);
}
//! Sets the new position of the cursor.
virtual void setPosition(f32 x, f32 y)
virtual void setPosition(f32 x, f32 y) _IRR_OVERRIDE_
{
if (!UseReferenceRect)
setPosition(core::round32(x*WindowSize.Width), core::round32(y*WindowSize.Height));
......@@ -142,13 +142,13 @@ namespace irr
}
//! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<s32> &pos)
virtual void setPosition(const core::position2d<s32> &pos) _IRR_OVERRIDE_
{
setPosition(pos.X, pos.Y);
}
//! Sets the new position of the cursor.
virtual void setPosition(s32 x, s32 y)
virtual void setPosition(s32 x, s32 y) _IRR_OVERRIDE_
{
RECT rect;
......@@ -168,14 +168,14 @@ namespace irr
}
//! Returns the current position of the mouse cursor.
virtual const core::position2d<s32>& getPosition()
virtual const core::position2d<s32>& getPosition() _IRR_OVERRIDE_
{
updateInternalCursorPosition();
return CursorPos;
}
//! Returns the current position of the mouse cursor.
virtual core::position2d<f32> getRelativePosition()
virtual core::position2d<f32> getRelativePosition() _IRR_OVERRIDE_
{
updateInternalCursorPosition();
......@@ -190,7 +190,7 @@ namespace irr
}
//! Sets an absolute reference rect for calculating the cursor position.
virtual void setReferenceRect(core::rect<s32>* rect=0)
virtual void setReferenceRect(core::rect<s32>* rect=0) _IRR_OVERRIDE_
{
if (rect)
{
......@@ -210,7 +210,7 @@ namespace irr
}
/** Used to notify the cursor that the window was resized. */
virtual void OnResize(const core::dimension2d<u32>& size)
void OnResize(const core::dimension2d<u32>& size)
{
WindowSize = size;
if (size.Width!=0)
......
source/Irrlicht/CMeshSceneNode.h
View file @ 37437196
......@@ -63,7 +63,7 @@ namespace scene
//! Creates shadow volume scene node as child of this node
//! and returns a pointer to it.
virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh,
s32 id, bool zfailmethod=true, f32 infinity=10000.0f);
s32 id, bool zfailmethod=true, f32 infinity=10000.0f) _IRR_OVERRIDE_;
//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style.
/* In this way it is possible to change the materials a mesh causing all mesh scene nodes
......
source/Irrlicht/CMetaTriangleSelector.h
View file @ 37437196
......@@ -29,17 +29,17 @@ public:
//! Gets all triangles.
virtual void getTriangles(core::triangle3df* triangles, s32 arraySize,
s32& outTriangleCount, const core::matrix4* transform=0) const;
s32& outTriangleCount, const core::matrix4* transform=0) const _IRR_OVERRIDE_;
//! Gets all triangles which lie within a specific bounding box.
virtual void getTriangles(core::triangle3df* triangles, s32 arraySize,
s32& outTriangleCount, const core::aabbox3d<f32>& box,
const core::matrix4* transform=0) const;
const core::matrix4* transform=0) const _IRR_OVERRIDE_;
//! Gets all triangles which have or may have contact with a 3d line.
virtual void getTriangles(core::triangle3df* triangles, s32 arraySize,
s32& outTriangleCount, const core::line3d<f32>& line,
const core::matrix4* transform=0) const;
const core::matrix4* transform=0) const _IRR_OVERRIDE_;
//! Adds a triangle selector to the collection of triangle selectors
//! in this metaTriangleSelector.
......
source/Irrlicht/CNullDriver.h
View file @ 37437196
This diff is collapsed.
source/Irrlicht/COctreeSceneNode.h
View file @ 37437196
......@@ -69,7 +69,7 @@ namespace scene
//! Creates shadow volume scene node as child of this node
//! and returns a pointer to it.
virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh,
s32 id, bool zfailmethod=true, f32 infinity=10000.0f);
s32 id, bool zfailmethod=true, f32 infinity=10000.0f) _IRR_OVERRIDE_;
//! Removes a child from this scene node.
//! Implemented here, to be able to remove the shadow properly, if there is one,
......
source/Irrlicht/COctreeTriangleSelector.h
View file @ 37437196
......@@ -26,12 +26,12 @@ public:
//! Gets all triangles which lie within a specific bounding box.
virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount,
const core::aabbox3d<f32>& box, const core::matrix4* transform=0) const;
const core::aabbox3d<f32>& box, const core::matrix4* transform=0) const _IRR_OVERRIDE_;
//! Gets all triangles which have or may have contact with a 3d line.
virtual void getTriangles(core::triangle3df* triangles, s32 arraySize,
s32& outTriangleCount, const core::line3d<f32>& line,
const core::matrix4* transform=0) const;
const core::matrix4* transform=0) const _IRR_OVERRIDE_;
private:
......
source/Irrlicht/COpenGLDriver.h
View file @ 37437196
......@@ -74,7 +74,7 @@ namespace video
virtual bool beginScene(bool backBuffer=true, bool zBuffer=true,
SColor color=SColor(255,0,0,0),
const SExposedVideoData& videoData=SExposedVideoData(),
core::rect<s32>* sourceRect=0);
core::rect<s32>* sourceRect=0) _IRR_OVERRIDE_;
//! presents the rendered scene on the screen, returns false if failed
virtual bool endScene() _IRR_OVERRIDE_;
......@@ -109,7 +109,7 @@ namespace video
//! Create occlusion query.
/** Use node for identification and mesh for occlusion test. */
virtual void addOcclusionQuery(scene::ISceneNode* node,
const scene::IMesh* mesh=0);
const scene::IMesh* mesh=0) _IRR_OVERRIDE_;
//! Remove occlusion query.
virtual void removeOcclusionQuery(scene::ISceneNode* node) _IRR_OVERRIDE_;
......@@ -133,15 +133,15 @@ namespace video
//! draws a vertex primitive list
virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
const void* indexList, u32 primitiveCount,
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType);
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) _IRR_OVERRIDE_;
//! draws a vertex primitive list in 2d
virtual void draw2DVertexPrimitiveList(const void* vertices, u32 vertexCount,
const void* indexList, u32 primitiveCount,
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType);
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) _IRR_OVERRIDE_;
//! queries the features of the driver, returns true if feature is available
virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const _IRR_OVERRIDE_
{
return FeatureEnabled[feature] && COpenGLExtensionHandler::queryFeature(feature);
}
......@@ -158,12 +158,12 @@ namespace video
const core::array<core::rect<s32> >& sourceRects,
const core::rect<s32>* clipRect,
SColor color,
bool useAlphaChannelOfTexture);
bool useAlphaChannelOfTexture) _IRR_OVERRIDE_;
//! draws an 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
virtual void draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos,
const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false);
SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_;
//! draws a set of 2d images, using a color and the alpha
/** channel of the texture if desired. The images are drawn
......@@ -188,26 +188,26 @@ namespace video
s32 kerningWidth=0,
const core::rect<s32>* clipRect=0,
SColor color=SColor(255,255,255,255),
bool useAlphaChannelOfTexture=false);
bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_;
//! Draws a part of the texture into the rectangle.
virtual void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect,
const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
const video::SColor* const colors=0, bool useAlphaChannelOfTexture=false);
const video::SColor* const colors=0, bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_;
//! draw an 2d rectangle
virtual void draw2DRectangle(SColor color, const core::rect<s32>& pos,
const core::rect<s32>* clip = 0);
const core::rect<s32>* clip = 0) _IRR_OVERRIDE_;
//!Draws an 2d rectangle with a gradient.
virtual void draw2DRectangle(const core::rect<s32>& pos,
SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
const core::rect<s32>* clip = 0);
const core::rect<s32>* clip = 0) _IRR_OVERRIDE_;
//! Draws a 2d line.
virtual void draw2DLine(const core::position2d<s32>& start,
const core::position2d<s32>& end,
SColor color=SColor(255,255,255,255));
SColor color=SColor(255,255,255,255)) _IRR_OVERRIDE_;
//! Draws a single pixel
virtual void drawPixel(u32 x, u32 y, const SColor & color) _IRR_OVERRIDE_;
......@@ -215,7 +215,7 @@ namespace video
//! Draws a 3d line.
virtual void draw3DLine(const core::vector3df& start,
const core::vector3df& end,
SColor color = SColor(255,255,255,255));
SColor color = SColor(255,255,255,255)) _IRR_OVERRIDE_;
//! \return Returns the name of the video driver. Example: In case of the Direct3D8
//! driver, it would return "Direct3D8.1".
......@@ -254,14 +254,14 @@ namespace video
video::SColor leftUpEdge = video::SColor(0,0,0,0),
video::SColor rightUpEdge = video::SColor(0,0,0,0),
video::SColor leftDownEdge = video::SColor(0,0,0,0),
video::SColor rightDownEdge = video::SColor(0,0,0,0));
video::SColor rightDownEdge = video::SColor(0,0,0,0)) _IRR_OVERRIDE_;
//! sets a viewport
virtual void setViewPort(const core::rect<s32>& area) _IRR_OVERRIDE_;
//! Sets the fog mode.
virtual void setFog(SColor color, E_FOG_TYPE fogType, f32 start,
f32 end, f32 density, bool pixelFog, bool rangeFog);
f32 end, f32 density, bool pixelFog, bool rangeFog) _IRR_OVERRIDE_;
//! Only used by the internal engine. Used to notify the driver that
//! the window was resized.
......@@ -278,7 +278,7 @@ namespace video
//! Can be called by an IMaterialRenderer to make its work easier.
virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastmaterial,
bool resetAllRenderstates)
bool resetAllRenderstates) _IRR_OVERRIDE_
{
setBasicRenderStates(material, lastmaterial, resetAllRenderstates, true);
setTextureRenderStates(material, resetAllRenderstates, true);
......@@ -327,7 +327,7 @@ namespace video
//! extGLGetObjectParameteriv(shaderHandle, GL_OBJECT_COMPILE_STATUS_ARB, &status)
//! pixel and/or vertex shaders to render geometry.
virtual s32 addShaderMaterial(const c8* vertexShaderProgram, const c8* pixelShaderProgram,
IShaderConstantSetCallBack* callback, E_MATERIAL_TYPE baseMaterial, s32 userData);
IShaderConstantSetCallBack* callback, E_MATERIAL_TYPE baseMaterial, s32 userData) _IRR_OVERRIDE_;
//! Adds a new material renderer to the VideoDriver, using GLSL to render geometry.
virtual s32 addHighLevelShaderMaterial(
......@@ -346,7 +346,7 @@ namespace video
IShaderConstantSetCallBack* callback = 0,
E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
s32 userData = 0,
E_GPU_SHADING_LANGUAGE shadingLang = EGSL_DEFAULT);
E_GPU_SHADING_LANGUAGE shadingLang = EGSL_DEFAULT) _IRR_OVERRIDE_;
//! Returns a pointer to the IVideoDriver interface. (Implementation for
//! IMaterialRendererServices)
......@@ -358,19 +358,19 @@ namespace video
virtual u32 getMaximalPrimitiveCount() const _IRR_OVERRIDE_;
virtual ITexture* addRenderTargetTexture(const core::dimension2d<u32>& size,
const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN);
const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) _IRR_OVERRIDE_;
//! set or reset render target
virtual bool setRenderTarget(video::E_RENDER_TARGET target, bool clearTarget,
bool clearZBuffer, SColor color);
bool clearZBuffer, SColor color) _IRR_OVERRIDE_;
//! set or reset render target texture
virtual bool setRenderTarget(video::ITexture* texture, bool clearBackBuffer,
bool clearZBuffer, SColor color);
bool clearZBuffer, SColor color) _IRR_OVERRIDE_;
//! Sets multiple render targets
virtual bool setRenderTarget(const core::array<video::IRenderTarget>& texture,
bool clearBackBuffer=true, bool clearZBuffer=true, SColor color=SColor(0,0,0,0));
bool clearBackBuffer=true, bool clearZBuffer=true, SColor color=SColor(0,0,0,0)) _IRR_OVERRIDE_;
//! Clears the ZBuffer.
virtual void clearZBuffer() _IRR_OVERRIDE_;
......
source/Irrlicht/COpenGLMaterialRenderer.h
View file @ 37437196
This diff is collapsed.
source/Irrlicht/COpenGLParallaxMapRenderer.h
View file @ 37437196
......@@ -38,7 +38,7 @@ public:
virtual void OnSetMaterial(const SMaterial& material) _IRR_OVERRIDE_ { }
virtual void OnSetMaterial(const video::SMaterial& material,
const video::SMaterial& lastMaterial,
bool resetAllRenderstates, video::IMaterialRendererServices* services);
bool resetAllRenderstates, video::IMaterialRendererServices* services) _IRR_OVERRIDE_;
protected:
......
source/Irrlicht/COpenGLSLMaterialRenderer.h
View file @ 37437196
......@@ -76,7 +76,7 @@ public:
virtual ~COpenGLSLMaterialRenderer();
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services);
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_;
virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) _IRR_OVERRIDE_;
......
source/Irrlicht/COpenGLShaderMaterialRenderer.h
View file @ 37437196
......@@ -52,7 +52,7 @@ public:
virtual ~COpenGLShaderMaterialRenderer();
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services);
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_;
virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) _IRR_OVERRIDE_;
......
source/Irrlicht/CParticleSystemSceneNode.h
View file @ 37437196
......@@ -75,7 +75,7 @@ public:
u32 lifeTimeMin = 2000, u32 lifeTimeMax = 4000,
s32 maxAngleDegrees = 0,
const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) );
const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) _IRR_OVERRIDE_;
//! Creates a box particle emitter.
virtual IParticleBoxEmitter* createBoxEmitter(
......@@ -88,7 +88,7 @@ public:
u32 lifeTimeMin=2000, u32 lifeTimeMax=4000,
s32 maxAngleDegrees=0,
const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) );
const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) _IRR_OVERRIDE_;
//! Creates a particle emitter for emitting from a cylinder
virtual IParticleCylinderEmitter* createCylinderEmitter(
......@@ -101,7 +101,7 @@ public:
u32 lifeTimeMin = 2000, u32 lifeTimeMax = 4000,
s32 maxAngleDegrees = 0,
const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) );
const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) _IRR_OVERRIDE_;
//! Creates a mesh particle emitter.
virtual IParticleMeshEmitter* createMeshEmitter(
......@@ -116,7 +116,7 @@ public:
u32 lifeTimeMin = 2000, u32 lifeTimeMax = 4000,
s32 maxAngleDegrees = 0,
const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) );
const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) _IRR_OVERRIDE_;
//! Creates a point particle emitter.
virtual IParticlePointEmitter* createPointEmitter(
......@@ -128,7 +128,7 @@ public:
u32 lifeTimeMin=2000, u32 lifeTimeMax=4000,
s32 maxAngleDegrees=0,
const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) );
const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) _IRR_OVERRIDE_;
//! Creates a ring particle emitter.
virtual IParticleRingEmitter* createRingEmitter(
......@@ -141,7 +141,7 @@ public:
u32 lifeTimeMin=2000, u32 lifeTimeMax=4000,
s32 maxAngleDegrees=0,
const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) );
const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) _IRR_OVERRIDE_;
//! Creates a sphere particle emitter.
virtual IParticleSphereEmitter* createSphereEmitter(
......@@ -154,36 +154,37 @@ public:
u32 lifeTimeMin=2000, u32 lifeTimeMax=4000,
s32 maxAngleDegrees=0,
const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) );
const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) _IRR_OVERRIDE_;
//! Creates a point attraction affector. This affector modifies the positions of the
//! particles and attracts them to a specified point at a specified speed per second.
virtual IParticleAttractionAffector* createAttractionAffector(
const core::vector3df& point, f32 speed = 1.0f, bool attract = true,
bool affectX = true, bool affectY = true, bool affectZ = true);
bool affectX = true, bool affectY = true, bool affectZ = true) _IRR_OVERRIDE_;
//! Creates a scale particle affector.
virtual IParticleAffector* createScaleParticleAffector(const core::dimension2df& scaleTo = core::dimension2df(1.0f, 1.0f)) _IRR_OVERRIDE_;
virtual IParticleAffector* createScaleParticleAffector(
const core::dimension2df& scaleTo = core::dimension2df(1.0f, 1.0f)) _IRR_OVERRIDE_;
//! Creates a fade out particle affector.
virtual IParticleFadeOutAffector* createFadeOutParticleAffector(
const video::SColor& targetColor = video::SColor(0,0,0,0),
u32 timeNeededToFadeOut = 1000);
u32 timeNeededToFadeOut = 1000) _IRR_OVERRIDE_;
//! Creates a gravity affector.
virtual IParticleGravityAffector* createGravityAffector(
const core::vector3df& gravity = core::vector3df(0.0f,-0.03f,0.0f),
u32 timeForceLost = 1000);
u32 timeForceLost = 1000) _IRR_OVERRIDE_;
//! Creates a rotation affector. This affector rotates the particles
//! around a specified pivot point. The speed is in Degrees per second.
virtual IParticleRotationAffector* createRotationAffector(
const core::vector3df& speed = core::vector3df(5.0f,5.0f,5.0f),
const core::vector3df& pivotPoint = core::vector3df(0.0f,0.0f,0.0f) );
const core::vector3df& pivotPoint = core::vector3df(0.0f,0.0f,0.0f) ) _IRR_OVERRIDE_;
//! Sets the size of all particles.
virtual void setParticleSize(
const core::dimension2d<f32> &size = core::dimension2d<f32>(5.0f, 5.0f));
const core::dimension2d<f32> &size = core::dimension2d<f32>(5.0f, 5.0f)) _IRR_OVERRIDE_;
//! Sets if the particles should be global. If they are, the particles are affected by
//! the movement of the particle system scene node too, otherwise they completely
......
source/Irrlicht/CQ3LevelMesh.h
View file @ 37437196
......@@ -40,7 +40,7 @@ namespace scene
//! Gets the default animation speed of the animated mesh.
/** \return Amount of frames per second. If the amount is 0, it is a static, non animated mesh. */
virtual f32 getAnimationSpeed() const
virtual f32 getAnimationSpeed() const _IRR_OVERRIDE_
{
return FramesPerSecond;
}
......@@ -48,7 +48,7 @@ namespace scene
//! Gets the frame count of the animated mesh.
/** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated.
The actual speed is set in the scene node the mesh is instantiated in.*/
virtual void setAnimationSpeed(f32 fps)
virtual void setAnimationSpeed(f32 fps) _IRR_OVERRIDE_
{
FramesPerSecond=fps;
}
......@@ -57,7 +57,7 @@ namespace scene
//! lowest, 255 the highest detail. Note, that some Meshes will
//! ignore the detail level.
virtual IMesh* getMesh(s32 frameInMs, s32 detailLevel=255,
s32 startFrameLoop=-1, s32 endFrameLoop=-1);
s32 startFrameLoop=-1, s32 endFrameLoop=-1) _IRR_OVERRIDE_;
//! Returns an axis aligned bounding box of the mesh.
//! \return A bounding box of this mesh is returned.
......@@ -93,13 +93,13 @@ namespace scene
//! returns amount of mesh buffers.
virtual u32 getMeshBufferCount() const
virtual u32 getMeshBufferCount() const _IRR_OVERRIDE_
{
return 0;
}
//! returns pointer to a mesh buffer
virtual IMeshBuffer* getMeshBuffer(u32 nr) const
virtual IMeshBuffer* getMeshBuffer(u32 nr) const _IRR_OVERRIDE_
{
return 0;
}
......@@ -107,24 +107,24 @@ namespace scene
//! Returns pointer to a mesh buffer which fits a material
/** \param material: material to search for
\return Pointer to the mesh buffer or 0 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_
{
return 0;
}
virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue)
virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) _IRR_OVERRIDE_
{
return;
}
//! 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_
{
return;
}
//! 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_
{
return;
}
......
source/Irrlicht/CQuake3ShaderSceneNode.h
View file @ 37437196
......@@ -50,7 +50,7 @@ public:
//! Creates shadow volume scene node as child of this node
//! and returns a pointer to it.
virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh,
s32 id, bool zfailmethod=true, f32 infinity=10000.0f);
s32 id, bool zfailmethod=true, f32 infinity=10000.0f) _IRR_OVERRIDE_;
//! Removes a child from this scene node.
//! Implemented here, to be able to remove the shadow properly, if there is one,
......
source/Irrlicht/CReadFile.h
View file @ 37437196
......@@ -36,7 +36,7 @@ namespace io
virtual long getSize() const _IRR_OVERRIDE_;
//! returns if file is open
virtual bool isOpen() const
bool isOpen() const
{
return File != 0;
}
......
source/Irrlicht/CSceneCollisionManager.h
View file @ 37437196
......@@ -28,24 +28,24 @@ namespace scene
//! Returns the scene node, which is currently visible at the given
//! screen coordinates, viewed from the currently active camera.
virtual ISceneNode* getSceneNodeFromScreenCoordinatesBB(const core::position2d<s32>& pos,
s32 idBitMask=0, bool bNoDebugObjects=false, ISceneNode* root=0);
s32 idBitMask=0, bool bNoDebugObjects=false, ISceneNode* root=0) _IRR_OVERRIDE_;
//! Returns the nearest scene node which collides with a 3d ray and
//! whose id matches a bitmask.
virtual ISceneNode* getSceneNodeFromRayBB(const core::line3d<f32>& ray,
s32 idBitMask=0, bool bNoDebugObjects=false,
ISceneNode* root=0);
ISceneNode* root=0) _IRR_OVERRIDE_;
//! Returns the scene node, at which the overgiven camera is looking at and
//! which id matches the bitmask.
virtual ISceneNode* getSceneNodeFromCameraBB(ICameraSceneNode* camera,
s32 idBitMask=0, bool bNoDebugObjects = false);
s32 idBitMask=0, bool bNoDebugObjects = false) _IRR_OVERRIDE_;
//! Finds the collision point of a line and lots of triangles, if there is one.
virtual bool getCollisionPoint(const core::line3d<f32>& ray,
ITriangleSelector* selector, core::vector3df& outCollisionPoint,
core::triangle3df& outTriangle,
ISceneNode* & outNode);
ISceneNode* & outNode) _IRR_OVERRIDE_;
//! Collides a moving ellipsoid with a 3d world with gravity and returns
//! the resulting new position of the ellipsoid.
......@@ -59,15 +59,15 @@ namespace scene
bool& outFalling,
ISceneNode*& outNode,
f32 slidingSpeed,
const core::vector3df& gravityDirectionAndSpeed);
const core::vector3df& gravityDirectionAndSpeed) _IRR_OVERRIDE_;
//! Returns a 3d ray which would go through the 2d screen coodinates.
virtual core::line3d<f32> getRayFromScreenCoordinates(
const core::position2d<s32> & pos, ICameraSceneNode* camera = 0);
const core::position2d<s32> & pos, ICameraSceneNode* camera = 0) _IRR_OVERRIDE_;
//! Calculates 2d screen position from a 3d position.
virtual core::position2d<s32> getScreenCoordinatesFrom3DPosition(
const core::vector3df & pos, ICameraSceneNode* camera=0, bool useViewPort=false);
const core::vector3df & pos, ICameraSceneNode* camera=0, bool useViewPort=false) _IRR_OVERRIDE_;
//! Gets the scene node and nearest collision point for a ray based on
//! the nodes' id bitmasks, bounding boxes and triangle selectors.
......@@ -77,7 +77,7 @@ namespace scene
core::triangle3df & outTriangle,
s32 idBitMask = 0,
ISceneNode * collisionRootNode = 0,
bool noDebugObjects = false);
bool noDebugObjects = false) _IRR_OVERRIDE_;
private:
......
source/Irrlicht/CSceneLoaderIrr.h
View file @ 37437196
......@@ -42,7 +42,7 @@ public:
//! Loads the scene into the scene manager.
virtual bool loadScene(io::IReadFile* file,
ISceneUserDataSerializer* userDataSerializer=0,
ISceneNode* rootNode=0);
ISceneNode* rootNode=0) _IRR_OVERRIDE_;
private:
......
source/Irrlicht/CSceneManager.h
View file @ 37437196
This diff is collapsed.
source/Irrlicht/CSceneNodeAnimatorCameraFPS.h
View file @ 37437196
......@@ -74,13 +74,13 @@ namespace scene
virtual void setInvertMouse(bool invert) _IRR_OVERRIDE_;
//! This animator will receive events when attached to the active camera
virtual bool isEventReceiverEnabled() const
virtual bool isEventReceiverEnabled() const _IRR_OVERRIDE_
{
return true;
}
//! Returns the type of this animator
virtual ESCENE_NODE_ANIMATOR_TYPE getType() const
virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_
{
return ESNAT_CAMERA_FPS;
}
......
source/Irrlicht/CSceneNodeAnimatorCameraMaya.h
View file @ 37437196
......@@ -65,13 +65,13 @@ namespace scene
virtual void setDistance(f32 distance) _IRR_OVERRIDE_;
//! This animator will receive events when attached to the active camera
virtual bool isEventReceiverEnabled() const
virtual bool isEventReceiverEnabled() const _IRR_OVERRIDE_
{
return true;
}
//! Returns type of the scene node
virtual ESCENE_NODE_ANIMATOR_TYPE getType() const
virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_
{
return ESNAT_CAMERA_MAYA;
}
......
source/Irrlicht/CSceneNodeAnimatorDelete.h
View file @ 37437196
......@@ -22,7 +22,7 @@ namespace scene
virtual void animateNode(ISceneNode* node, u32 timeMs) _IRR_OVERRIDE_;
//! Returns type of the scene node animator
virtual ESCENE_NODE_ANIMATOR_TYPE getType() const
virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_
{
return ESNAT_DELETION;
}
......
source/Irrlicht/CSoftware2MaterialRenderer.h
View file @ 37437196
......@@ -39,7 +39,7 @@ public:
:CSoftware2MaterialRenderer ( driver ) {}
//! Returns if the material is transparent.
virtual bool isTransparent() const
virtual bool isTransparent() const _IRR_OVERRIDE_
{
return false;
}
......@@ -57,7 +57,7 @@ public:
//! Returns if the material is transparent.
virtual bool isTransparent() const
virtual bool isTransparent() const _IRR_OVERRIDE_
{
return true;
}
......@@ -83,26 +83,26 @@ public:
: CSoftware2MaterialRenderer ( driver ) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services)
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
{
}
virtual void OnUnsetMaterial()
virtual void OnUnsetMaterial() _IRR_OVERRIDE_
{
}
virtual bool isTransparent() const
virtual bool isTransparent() const _IRR_OVERRIDE_
{
return false;
}
virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype)
virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) _IRR_OVERRIDE_
{
return true;
};
virtual s32 getRenderCapability() const
virtual s32 getRenderCapability() const _IRR_OVERRIDE_
{
return 1;
}
......
source/Irrlicht/CSoftwareDriver.h
View file @ 37437196
......@@ -34,7 +34,7 @@ namespace video
virtual void setMaterial(const SMaterial& material) _IRR_OVERRIDE_;
virtual bool setRenderTarget(video::ITexture* texture, bool clearBackBuffer,
bool clearZBuffer, SColor color);
bool clearZBuffer, SColor color) _IRR_OVERRIDE_;
//! sets a viewport
virtual void setViewPort(const core::rect<s32>& area) _IRR_OVERRIDE_;
......@@ -43,7 +43,7 @@ namespace video
virtual bool beginScene(bool backBuffer=true, bool zBuffer=true,
SColor color=SColor(255,0,0,0),
const SExposedVideoData& videoData=SExposedVideoData(),
core::rect<s32>* sourceRect=0);
core::rect<s32>* sourceRect=0) _IRR_OVERRIDE_;
//! presents the rendered scene on the screen, returns false if failed
virtual bool endScene() _IRR_OVERRIDE_;
......@@ -56,32 +56,32 @@ namespace video
virtual const core::dimension2d<u32>& getCurrentRenderTargetSize() const _IRR_OVERRIDE_;
//! draws a vertex primitive list
void drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
const void* indexList, u32 primitiveCount,
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType);
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) _IRR_OVERRIDE_;
//! Draws a 3d line.
virtual void draw3DLine(const core::vector3df& start,
const core::vector3df& end, SColor color = SColor(255,255,255,255));
const core::vector3df& end, SColor color = SColor(255,255,255,255)) _IRR_OVERRIDE_;
//! draws an 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
virtual void draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos,
const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false);
SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_;
//! draw an 2d rectangle
virtual void draw2DRectangle(SColor color, const core::rect<s32>& pos,
const core::rect<s32>* clip = 0);
const core::rect<s32>* clip = 0) _IRR_OVERRIDE_;
//!Draws an 2d rectangle with a gradient.
virtual void draw2DRectangle(const core::rect<s32>& pos,
SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
const core::rect<s32>* clip = 0);
const core::rect<s32>* clip = 0) _IRR_OVERRIDE_;
//! Draws a 2d line.
virtual void draw2DLine(const core::position2d<s32>& start,
const core::position2d<s32>& end,
SColor color=SColor(255,255,255,255));
SColor color=SColor(255,255,255,255)) _IRR_OVERRIDE_;
//! Draws a single pixel
virtual void drawPixel(u32 x, u32 y, const SColor & color) _IRR_OVERRIDE_;
......@@ -105,7 +105,7 @@ namespace video
//! Creates a render target texture.
virtual ITexture* addRenderTargetTexture(const core::dimension2d<u32>& size,
const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN);
const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) _IRR_OVERRIDE_;
//! Clears the ZBuffer.
virtual void clearZBuffer() _IRR_OVERRIDE_;
......
source/Irrlicht/CSoftwareDriver2.h
View file @ 37437196
......@@ -37,7 +37,7 @@ namespace video
virtual void setMaterial(const SMaterial& material) _IRR_OVERRIDE_;
virtual bool setRenderTarget(video::ITexture* texture, bool clearBackBuffer,
bool clearZBuffer, SColor color);
bool clearZBuffer, SColor color) _IRR_OVERRIDE_;
//! sets a viewport
virtual void setViewPort(const core::rect<s32>& area) _IRR_OVERRIDE_;
......@@ -46,7 +46,7 @@ namespace video
virtual bool beginScene(bool backBuffer=true, bool zBuffer=true,
SColor color=SColor(255,0,0,0),
const SExposedVideoData& videoData=SExposedVideoData(),
core::rect<s32>* sourceRect=0);
core::rect<s32>* sourceRect=0) _IRR_OVERRIDE_;
//! presents the rendered scene on the screen, returns false if failed
virtual bool endScene() _IRR_OVERRIDE_;
......@@ -80,37 +80,37 @@ namespace video
virtual void setAmbientLight(const SColorf& color) _IRR_OVERRIDE_;
//! draws a vertex primitive list
void drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
const void* indexList, u32 primitiveCount,
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType);
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) _IRR_OVERRIDE_;
//! draws an 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
virtual void draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos,
const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false);
SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_;
//! Draws a part of the texture into the rectangle.
virtual void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect,
const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
const video::SColor* const colors=0, bool useAlphaChannelOfTexture=false);
const video::SColor* const colors=0, bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_;
//! Draws a 3d line.
virtual void draw3DLine(const core::vector3df& start,
const core::vector3df& end, SColor color = SColor(255,255,255,255));
const core::vector3df& end, SColor color = SColor(255,255,255,255)) _IRR_OVERRIDE_;
//! draw an 2d rectangle
virtual void draw2DRectangle(SColor color, const core::rect<s32>& pos,
const core::rect<s32>* clip = 0);
const core::rect<s32>* clip = 0) _IRR_OVERRIDE_;
//!Draws an 2d rectangle with a gradient.
virtual void draw2DRectangle(const core::rect<s32>& pos,
SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
const core::rect<s32>* clip = 0);
const core::rect<s32>* clip = 0) _IRR_OVERRIDE_;
//! Draws a 2d line.
virtual void draw2DLine(const core::position2d<s32>& start,
const core::position2d<s32>& end,
SColor color=SColor(255,255,255,255));
SColor color=SColor(255,255,255,255)) _IRR_OVERRIDE_;
//! Draws a single pixel
virtual void drawPixel(u32 x, u32 y, const SColor & color) _IRR_OVERRIDE_;
......@@ -130,7 +130,7 @@ namespace video
//! Creates a render target texture.
virtual ITexture* addRenderTargetTexture(const core::dimension2d<u32>& size,
const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN);
const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) _IRR_OVERRIDE_;
//! Clears the DepthBuffer.
virtual void clearZBuffer() _IRR_OVERRIDE_;
......@@ -155,7 +155,7 @@ namespace video
video::SColor leftUpEdge = video::SColor(0,0,0,0),
video::SColor rightUpEdge = video::SColor(0,0,0,0),
video::SColor leftDownEdge = video::SColor(0,0,0,0),
video::SColor rightDownEdge = video::SColor(0,0,0,0));
video::SColor rightDownEdge = video::SColor(0,0,0,0)) _IRR_OVERRIDE_;
//! Returns the graphics card vendor name.
virtual core::stringc getVendorInfo() _IRR_OVERRIDE_;
......@@ -255,7 +255,7 @@ namespace video
void lightVertex ( s4DVertex *dest, u32 vertexargb );
//! Sets the fog mode.
virtual void setFog(SColor color, E_FOG_TYPE fogType, f32 start,
f32 end, f32 density, bool pixelFog, bool rangeFog);
f32 end, f32 density, bool pixelFog, bool rangeFog) _IRR_OVERRIDE_;
#endif
......
source/Irrlicht/CSoftwareTexture2.h
View file @ 37437196
......@@ -36,7 +36,7 @@ public:
virtual ~CSoftwareTexture2();
//! lock function
virtual void* lock(E_TEXTURE_LOCK_MODE mode=ETLM_READ_WRITE, u32 mipmapLevel=0)
virtual void* lock(E_TEXTURE_LOCK_MODE mode=ETLM_READ_WRITE, u32 mipmapLevel=0) _IRR_OVERRIDE_
{
if (Flags & GEN_MIPMAP)
MipMapLOD=mipmapLevel;
......@@ -44,13 +44,13 @@ public:
}
//! unlock function
virtual void unlock()
virtual void unlock() _IRR_OVERRIDE_
{
MipMap[MipMapLOD]->unlock();
}
//! Returns original size of the texture.
virtual const core::dimension2d<u32>& getOriginalSize() const
virtual const core::dimension2d<u32>& getOriginalSize() const _IRR_OVERRIDE_
{
//return MipMap[0]->getDimension();
return OrigSize;
......@@ -64,7 +64,7 @@ public:
}
//! Returns (=size) of the texture.
virtual const core::dimension2d<u32>& getSize() const
virtual const core::dimension2d<u32>& getSize() const _IRR_OVERRIDE_
{
return MipMap[MipMapLOD]->getDimension();
}
......@@ -83,13 +83,13 @@ public:
//! returns driver type of texture (=the driver, who created the texture)
virtual E_DRIVER_TYPE getDriverType() const
virtual E_DRIVER_TYPE getDriverType() const _IRR_OVERRIDE_
{
return EDT_BURNINGSVIDEO;
}
//! returns color format of texture
virtual ECOLOR_FORMAT getColorFormat() const
virtual ECOLOR_FORMAT getColorFormat() const _IRR_OVERRIDE_
{
return BURNINGSHADER_COLOR_FORMAT;
}
......@@ -105,19 +105,19 @@ public:
virtual void regenerateMipMapLevels(void* mipmapData=0) _IRR_OVERRIDE_;
//! support mipmaps
virtual bool hasMipMaps() const
virtual bool hasMipMaps() const _IRR_OVERRIDE_
{
return (Flags & GEN_MIPMAP ) != 0;
}
//! Returns if the texture has an alpha channel
virtual bool hasAlpha() const
virtual bool hasAlpha() const _IRR_OVERRIDE_
{
return (Flags & HAS_ALPHA ) != 0;
}
//! is a render target
virtual bool isRenderTarget() const
virtual bool isRenderTarget() const _IRR_OVERRIDE_
{
return (Flags & IS_RENDERTARGET) != 0;
}
......
source/Irrlicht/CSphereSceneNode.h
View file @ 37437196
......@@ -72,7 +72,7 @@ namespace scene
//! Creates shadow volume scene node as child of this node
//! and returns a pointer to it.
virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh,
s32 id, bool zfailmethod=true, f32 infinity=10000.0f);
s32 id, bool zfailmethod=true, f32 infinity=10000.0f) _IRR_OVERRIDE_;
//! Removes a child from this scene node.
//! Implemented here, to be able to remove the shadow properly, if there is one,
......
source/Irrlicht/CTerrainSceneNode.h
View file @ 37437196
......@@ -52,11 +52,12 @@ namespace scene
//! Initializes the terrain data. Loads the vertices from the heightMapFile.
virtual bool loadHeightMap(io::IReadFile* file,
video::SColor vertexColor = video::SColor ( 255, 255, 255, 255 ), s32 smoothFactor = 0 );
video::SColor vertexColor = video::SColor ( 255, 255, 255, 255 ), s32 smoothFactor = 0 ) _IRR_OVERRIDE_;
//! Initializes the terrain data. Loads the vertices from the heightMapFile.
virtual bool loadHeightMapRAW(io::IReadFile* file, s32 bitsPerPixel = 16,
bool signedData=true, bool floatVals=false, s32 width=0, video::SColor vertexColor = video::SColor ( 255, 255, 255, 255 ), s32 smoothFactor = 0 );
bool signedData=true, bool floatVals=false, s32 width=0,
video::SColor vertexColor = video::SColor ( 255, 255, 255, 255 ), s32 smoothFactor = 0 ) _IRR_OVERRIDE_;
//! Returns the material based on the zero based index i. This scene node only uses
//! 1 material.
......@@ -75,7 +76,7 @@ namespace scene
//! core::vector3df ( 2.0f, 2.0f, 2.0f ), although the total scaling of the scene node is
//! core::vector3df ( 100.0f, 10.0f, 100.0f ).
//! \return Returns the last scaling factor passed to the scene node.
virtual const core::vector3df& getScale() const
virtual const core::vector3df& getScale() const _IRR_OVERRIDE_
{
return TerrainData.Scale;
}
......@@ -86,7 +87,7 @@ namespace scene
//! Gets the last rotation factor applied to the scene node.
//! \return Returns the last rotation factor applied to the scene node.
virtual const core::vector3df& getRotation() const
virtual const core::vector3df& getRotation() const _IRR_OVERRIDE_
{
return TerrainData.Rotation;
}
......@@ -149,7 +150,7 @@ namespace scene
//! then it will retrieve the triangles at the highest LOD (0).
//! \return: Number of indices put into the buffer.
virtual s32 getIndicesForPatch(core::array<u32>& indices,
s32 patchX, s32 patchZ, s32 LOD=0);
s32 patchX, s32 patchZ, s32 LOD=0) _IRR_OVERRIDE_;
//! Populates an array with the CurrentLOD of each patch.
//! \param LODs: A reference to a core::array<s32> to hold the values
......@@ -163,7 +164,7 @@ namespace scene
virtual void setLODOfPatch(s32 patchX, s32 patchZ, s32 LOD=0) _IRR_OVERRIDE_;
//! Returns center of terrain.
virtual const core::vector3df& getTerrainCenter() const
virtual const core::vector3df& getTerrainCenter() const _IRR_OVERRIDE_
{
return TerrainData.Center;
}
......@@ -173,14 +174,14 @@ namespace scene
//! Sets the movement camera threshold which is used to determine when to recalculate
//! indices for the scene node. The default value is 10.0f.
virtual void setCameraMovementDelta(f32 delta)
virtual void setCameraMovementDelta(f32 delta) _IRR_OVERRIDE_
{
CameraMovementDelta = delta;
}
//! Sets the rotation camera threshold which is used to determine when to recalculate
//! indices for the scene node. The default value is 1.0f.
virtual void setCameraRotationDelta(f32 delta)
virtual void setCameraRotationDelta(f32 delta) _IRR_OVERRIDE_
{
CameraRotationDelta = delta;
}
......@@ -206,15 +207,15 @@ namespace scene
//! Writes attributes of the scene node.
virtual void serializeAttributes(io::IAttributes* out,
io::SAttributeReadWriteOptions* options=0) const;
io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_;
//! Reads attributes of the scene node.
virtual void deserializeAttributes(io::IAttributes* in,
io::SAttributeReadWriteOptions* options=0);
io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_;
//! Creates a clone of this scene node and its children.
virtual ISceneNode* clone(ISceneNode* newParent,
ISceneManager* newManager);
ISceneManager* newManager) _IRR_OVERRIDE_;
private:
friend class CTerrainTriangleSelector;
......@@ -259,9 +260,9 @@ namespace scene
core::array<f64> LODDistanceThreshold;
};
virtual void preRenderCalculationsIfNeeded();
virtual void preRenderLODCalculations();
virtual void preRenderIndicesCalculations();
void preRenderCalculationsIfNeeded();
void preRenderLODCalculations();
void preRenderIndicesCalculations();
//! get indices when generating index data for patches at varying levels of detail.
u32 getIndex(const s32 PatchX, const s32 PatchZ, const s32 PatchIndex, u32 vX, u32 vZ) const;
......
source/Irrlicht/CTextSceneNode.h
View file @ 37437196
......@@ -17,7 +17,6 @@ namespace irr
namespace scene
{
class CTextSceneNode : public ITextSceneNode
{
public:
......@@ -115,12 +114,12 @@ namespace scene
//! \param bottomColor: stores the color of the bottom vertices
virtual void getColor(video::SColor & topColor, video::SColor & bottomColor) const _IRR_OVERRIDE_;
virtual void setSize(f32 height, f32 bottomEdgeWidth, f32 topEdgeWidth)
virtual void setSize(f32 height, f32 bottomEdgeWidth, f32 topEdgeWidth) _IRR_OVERRIDE_
{
setSize(core::dimension2df(bottomEdgeWidth, height));
}
virtual void getSize(f32& height, f32& bottomEdgeWidth, f32& topEdgeWidth) const
virtual void getSize(f32& height, f32& bottomEdgeWidth, f32& topEdgeWidth) const _IRR_OVERRIDE_
{
height = Size.Height;
bottomEdgeWidth = Size.Width;
......
source/Irrlicht/CTimer.h
View file @ 37437196
......@@ -24,13 +24,13 @@ namespace irr
/** This value does not start with 0 when the application starts.
For example in one implementation the value returned could be the
amount of milliseconds which have elapsed since the system was started. */
virtual u32 getRealTime() const
virtual u32 getRealTime() const _IRR_OVERRIDE_
{
return os::Timer::getRealTime();
}
//! Get current time and date in calendar form
virtual RealTimeDate getRealTimeAndDate() const
virtual RealTimeDate getRealTimeAndDate() const _IRR_OVERRIDE_
{
return os::Timer::getRealTimeAndDate();
}
......@@ -39,13 +39,13 @@ namespace irr
/** This value starts with 0 and can be manipulated using setTime(), stopTimer(),
startTimer(), etc. This value depends on the set speed of the timer if the timer
is stopped, etc. If you need the system time, use getRealTime() */
virtual u32 getTime() const
virtual u32 getTime() const _IRR_OVERRIDE_
{
return os::Timer::getTime();
}
//! sets current virtual time
virtual void setTime(u32 time)
virtual void setTime(u32 time) _IRR_OVERRIDE_
{
os::Timer::setTime(time);
}
......@@ -54,7 +54,7 @@ namespace irr
/** The timer is reference counted, which means everything which calls
stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop
corretly again. */
virtual void stop()
virtual void stop() _IRR_OVERRIDE_
{
os::Timer::stopTimer();
}
......@@ -63,7 +63,7 @@ namespace irr
/** The timer is reference counted, which means everything which calls
stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop
corretly again. */
virtual void start()
virtual void start() _IRR_OVERRIDE_
{
os::Timer::startTimer();
}
......@@ -71,7 +71,7 @@ namespace irr
//! Sets the speed of the timer
/** The speed is the factor with which the time is running faster or slower then the
real system time. */
virtual void setSpeed(f32 speed = 1.0f)
virtual void setSpeed(f32 speed = 1.0f) _IRR_OVERRIDE_
{
os::Timer::setSpeed(speed);
}
......@@ -79,13 +79,13 @@ namespace irr
//! Returns current speed of the timer
/** The speed is the factor with which the time is running faster or slower then the
real system time. */
virtual f32 getSpeed() const
virtual f32 getSpeed() const _IRR_OVERRIDE_
{
return os::Timer::getSpeed();
}
//! Returns if game timer is currently stopped
virtual bool isStopped() const
virtual bool isStopped() const _IRR_OVERRIDE_
{
bool ret = os::Timer::isStopped();
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
......@@ -96,7 +96,7 @@ namespace irr
/** Makes the virtual timer update the time value based on the real time. This is
called automaticly when calling IrrlichtDevice::run(), but you can call it manually
if you don't use this method. */
virtual void tick()
virtual void tick() _IRR_OVERRIDE_
{
os::Timer::tick();
}
......
source/Irrlicht/CTriangleBBSelector.h
View file @ 37437196
......@@ -22,16 +22,16 @@ public:
//! Gets all triangles.
virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount,
const core::matrix4* transform=0) const;
const core::matrix4* transform=0) const _IRR_OVERRIDE_;
//! Gets all triangles which lie within a specific bounding box.
void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount,
const core::aabbox3d<f32>& box, const core::matrix4* transform=0) const;
virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount,
const core::aabbox3d<f32>& box, const core::matrix4* transform=0) const _IRR_OVERRIDE_;
//! Gets all triangles which have or may have contact with a 3d line.
virtual void getTriangles(core::triangle3df* triangles, s32 arraySize,
s32& outTriangleCount, const core::line3d<f32>& line,
const core::matrix4* transform=0) const;
const core::matrix4* transform=0) const _IRR_OVERRIDE_;
};
......
source/Irrlicht/CTriangleSelector.h
View file @ 37437196
......@@ -37,17 +37,17 @@ public:
CTriangleSelector(const core::aabbox3d<f32>& box, ISceneNode* node);
//! Gets all triangles.
void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount,
const core::matrix4* transform=0) const;
virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount,
const core::matrix4* transform=0) const _IRR_OVERRIDE_;
//! Gets all triangles which lie within a specific bounding box.
void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount,
const core::aabbox3d<f32>& box, const core::matrix4* transform=0) const;
virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount,
const core::aabbox3d<f32>& box, const core::matrix4* transform=0) const _IRR_OVERRIDE_;
//! Gets all triangles which have or may have contact with a 3d line.
virtual void getTriangles(core::triangle3df* triangles, s32 arraySize,
s32& outTriangleCount, const core::line3d<f32>& line,
const core::matrix4* transform=0) const;
const core::matrix4* transform=0) const _IRR_OVERRIDE_;
//! Returns amount of all available triangles in this selector
virtual s32 getTriangleCount() const _IRR_OVERRIDE_;
......
source/Irrlicht/CXMLReaderImpl.h
View file @ 37437196
......@@ -66,7 +66,7 @@ public:
//! Reads forward to the next xml node.
//! \return Returns false, if there was no further node.
virtual bool read()
virtual bool read() _IRR_OVERRIDE_
{
// if not end reached, parse the node
if (P && ((unsigned int)(P - TextBegin) < TextSize - 1) && (*P != 0))
......@@ -80,21 +80,21 @@ public:
//! Returns the type of the current XML node.
virtual EXML_NODE getNodeType() const
virtual EXML_NODE getNodeType() const _IRR_OVERRIDE_
{
return CurrentNodeType;
}
//! Returns attribute count of the current XML node.
virtual unsigned int getAttributeCount() const
virtual unsigned int getAttributeCount() const _IRR_OVERRIDE_
{
return Attributes.size();
}
//! Returns name of an attribute.
virtual const char_type* getAttributeName(int idx) const
virtual const char_type* getAttributeName(int idx) const _IRR_OVERRIDE_
{
if ((u32)idx >= Attributes.size())
return 0;
......@@ -104,7 +104,7 @@ public:
//! Returns the value of an attribute.
virtual const char_type* getAttributeValue(int idx) const
virtual const char_type* getAttributeValue(int idx) const _IRR_OVERRIDE_
{
if ((unsigned int)idx >= Attributes.size())
return 0;
......@@ -114,7 +114,7 @@ public:
//! Returns the value of an attribute.
virtual const char_type* getAttributeValue(const char_type* name) const
virtual const char_type* getAttributeValue(const char_type* name) const _IRR_OVERRIDE_
{
const SAttribute* attr = getAttributeByName(name);
if (!attr)
......@@ -125,7 +125,7 @@ public:
//! Returns the value of an attribute
virtual const char_type* getAttributeValueSafe(const char_type* name) const
virtual const char_type* getAttributeValueSafe(const char_type* name) const _IRR_OVERRIDE_
{
const SAttribute* attr = getAttributeByName(name);
if (!attr)
......@@ -137,7 +137,7 @@ public:
//! Returns the value of an attribute as integer.
int getAttributeValueAsInt(const char_type* name) const
virtual int getAttributeValueAsInt(const char_type* name) const _IRR_OVERRIDE_
{
const SAttribute* attr = getAttributeByName(name);
if (!attr)
......@@ -149,7 +149,7 @@ public:
//! Returns the value of an attribute as integer.
int getAttributeValueAsInt(int idx) const
virtual int getAttributeValueAsInt(int idx) const _IRR_OVERRIDE_
{
const char_type* attrvalue = getAttributeValue(idx);
if (!attrvalue)
......@@ -161,7 +161,7 @@ public:
//! Returns the value of an attribute as float.
float getAttributeValueAsFloat(const char_type* name) const
virtual float getAttributeValueAsFloat(const char_type* name) const _IRR_OVERRIDE_
{
const SAttribute* attr = getAttributeByName(name);
if (!attr)
......@@ -173,7 +173,7 @@ public:
//! Returns the value of an attribute as float.
float getAttributeValueAsFloat(int idx) const
virtual float getAttributeValueAsFloat(int idx) const _IRR_OVERRIDE_
{
const char_type* attrvalue = getAttributeValue(idx);
if (!attrvalue)
......@@ -185,33 +185,33 @@ public:
//! Returns the name of the current node.
virtual const char_type* getNodeName() const
virtual const char_type* getNodeName() const _IRR_OVERRIDE_
{
return NodeName.c_str();
}
//! Returns data of the current node.
virtual const char_type* getNodeData() const
virtual const char_type* getNodeData() const _IRR_OVERRIDE_
{
return NodeName.c_str();
}
//! Returns if an element is an empty element, like <foo />
virtual bool isEmptyElement() const
virtual bool isEmptyElement() const _IRR_OVERRIDE_
{
return IsEmptyElement;
}
//! Returns format of the source xml file.
virtual ETEXT_FORMAT getSourceFormat() const
virtual ETEXT_FORMAT getSourceFormat() const _IRR_OVERRIDE_
{
return SourceFormat;
}
//! Returns format of the strings returned by the parser.
virtual ETEXT_FORMAT getParserFormat() const
virtual ETEXT_FORMAT getParserFormat() const _IRR_OVERRIDE_
{
return TargetFormat;
}
......
source/Irrlicht/CXMLWriter.h
View file @ 37437196
......@@ -37,11 +37,11 @@ namespace io
const wchar_t* attr2Name = 0, const wchar_t* attr2Value = 0,
const wchar_t* attr3Name = 0, const wchar_t* attr3Value = 0,
const wchar_t* attr4Name = 0, const wchar_t* attr4Value = 0,
const wchar_t* attr5Name = 0, const wchar_t* attr5Value = 0);
const wchar_t* attr5Name = 0, const wchar_t* attr5Value = 0) _IRR_OVERRIDE_;
//! Writes an xml element with any number of attributes
virtual void writeElement(const wchar_t* name, bool empty,
core::array<core::stringw> &names, core::array<core::stringw> &values);
core::array<core::stringw> &names, core::array<core::stringw> &values) _IRR_OVERRIDE_;
//! Writes a comment into the xml file
virtual void writeComment(const wchar_t* comment) _IRR_OVERRIDE_;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment