API BREAKER: Replacing defines in irrTypes.h which are conflicting with c++ reserved identifier rules.

C++ has undefined behavior for identifiers starting with __ or with _ followed by an uppercase letter.
We still have many more (in IrrCompileConfig.h and in all header-guards), will likely replace those later as well.
As a workaround for users which might use irrlicht defines in their code, I've added the header irrLegacyDefines.h
Including that allows to continue using old defines for a while - or make it easier to have code which compiles 
with old and new Irrlicht library versions.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6251 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 12:55:10 +00:00
parent ee180dbd24
commit ffd7b63af0
289 changed files with 3401 additions and 3379 deletions

View File

@ -49,99 +49,99 @@ namespace video
virtual ~CNullDriver();
virtual bool beginScene(u16 clearFlag, SColor clearColor = SColor(255,0,0,0), f32 clearDepth = 1.f, u8 clearStencil = 0,
const SExposedVideoData& videoData = SExposedVideoData(), core::rect<s32>* sourceRect = 0) _IRR_OVERRIDE_;
const SExposedVideoData& videoData = SExposedVideoData(), core::rect<s32>* sourceRect = 0) IRR_OVERRIDE;
virtual bool endScene() _IRR_OVERRIDE_;
virtual bool endScene() IRR_OVERRIDE;
//! Disable a feature of the driver.
virtual void disableFeature(E_VIDEO_DRIVER_FEATURE feature, bool flag=true) _IRR_OVERRIDE_;
virtual void disableFeature(E_VIDEO_DRIVER_FEATURE feature, bool flag=true) IRR_OVERRIDE;
//! queries the features of the driver, returns true if feature is available
virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const _IRR_OVERRIDE_;
virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const IRR_OVERRIDE;
//! Get attributes of the actual video driver
virtual const io::IAttributes& getDriverAttributes() const _IRR_OVERRIDE_;
virtual const io::IAttributes& getDriverAttributes() const IRR_OVERRIDE;
//! sets transformation
virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) _IRR_OVERRIDE_;
virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) IRR_OVERRIDE;
//! Retrieve the number of image loaders
virtual u32 getImageLoaderCount() const _IRR_OVERRIDE_;
virtual u32 getImageLoaderCount() const IRR_OVERRIDE;
//! Retrieve the given image loader
virtual IImageLoader* getImageLoader(u32 n) _IRR_OVERRIDE_;
virtual IImageLoader* getImageLoader(u32 n) IRR_OVERRIDE;
//! Retrieve the number of image writers
virtual u32 getImageWriterCount() const _IRR_OVERRIDE_;
virtual u32 getImageWriterCount() const IRR_OVERRIDE;
//! Retrieve the given image writer
virtual IImageWriter* getImageWriter(u32 n) _IRR_OVERRIDE_;
virtual IImageWriter* getImageWriter(u32 n) IRR_OVERRIDE;
//! sets a material
virtual void setMaterial(const SMaterial& material) _IRR_OVERRIDE_;
virtual void setMaterial(const SMaterial& material) IRR_OVERRIDE;
//! loads a Texture
virtual ITexture* getTexture(const io::path& filename) _IRR_OVERRIDE_;
virtual ITexture* getTexture(const io::path& filename) IRR_OVERRIDE;
//! loads a Texture
virtual ITexture* getTexture(io::IReadFile* file) _IRR_OVERRIDE_;
virtual ITexture* getTexture(io::IReadFile* file) IRR_OVERRIDE;
//! Returns a texture by index
virtual ITexture* getTextureByIndex(u32 index) _IRR_OVERRIDE_;
virtual ITexture* getTextureByIndex(u32 index) IRR_OVERRIDE;
//! Returns amount of textures currently loaded
virtual u32 getTextureCount() const _IRR_OVERRIDE_;
virtual u32 getTextureCount() const IRR_OVERRIDE;
//! Renames a texture
virtual void renameTexture(ITexture* texture, const io::path& newName) _IRR_OVERRIDE_;
virtual void renameTexture(ITexture* texture, const io::path& newName) IRR_OVERRIDE;
virtual ITexture* addTexture(const core::dimension2d<u32>& size, const io::path& name, ECOLOR_FORMAT format = ECF_A8R8G8B8) _IRR_OVERRIDE_;
virtual ITexture* addTexture(const core::dimension2d<u32>& size, const io::path& name, ECOLOR_FORMAT format = ECF_A8R8G8B8) IRR_OVERRIDE;
virtual ITexture* addTexture(const io::path& name, IImage* image) _IRR_OVERRIDE_;
virtual ITexture* addTexture(const io::path& name, IImage* image) IRR_OVERRIDE;
virtual ITexture* addTextureCubemap(const io::path& name, IImage* imagePosX, IImage* imageNegX, IImage* imagePosY,
IImage* imageNegY, IImage* imagePosZ, IImage* imageNegZ) _IRR_OVERRIDE_;
IImage* imageNegY, IImage* imagePosZ, IImage* imageNegZ) IRR_OVERRIDE;
virtual ITexture* addTextureCubemap(const irr::u32 sideLen, const io::path& name, ECOLOR_FORMAT format = ECF_A8R8G8B8) _IRR_OVERRIDE_;
virtual ITexture* addTextureCubemap(const irr::u32 sideLen, const io::path& name, ECOLOR_FORMAT format = ECF_A8R8G8B8) IRR_OVERRIDE;
virtual bool setRenderTargetEx(IRenderTarget* target, u16 clearFlag, SColor clearColor = SColor(255,0,0,0),
f32 clearDepth = 1.f, u8 clearStencil = 0) _IRR_OVERRIDE_;
f32 clearDepth = 1.f, u8 clearStencil = 0) IRR_OVERRIDE;
virtual bool setRenderTarget(ITexture* texture, u16 clearFlag, SColor clearColor = SColor(255,0,0,0),
f32 clearDepth = 1.f, u8 clearStencil = 0) _IRR_OVERRIDE_;
f32 clearDepth = 1.f, u8 clearStencil = 0) IRR_OVERRIDE;
//! sets a viewport
virtual void setViewPort(const core::rect<s32>& area) _IRR_OVERRIDE_;
virtual void setViewPort(const core::rect<s32>& area) IRR_OVERRIDE;
//! gets the area of the current viewport
virtual const core::rect<s32>& getViewPort() const _IRR_OVERRIDE_;
virtual const core::rect<s32>& getViewPort() const IRR_OVERRIDE;
//! draws a vertex primitive list
virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
const void* indexList, u32 primitiveCount,
E_VERTEX_TYPE vType=EVT_STANDARD, scene::E_PRIMITIVE_TYPE pType=scene::EPT_TRIANGLES,
E_INDEX_TYPE iType=EIT_16BIT) _IRR_OVERRIDE_;
E_INDEX_TYPE iType=EIT_16BIT) 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=EVT_STANDARD, scene::E_PRIMITIVE_TYPE pType=scene::EPT_TRIANGLES,
E_INDEX_TYPE iType=EIT_16BIT) _IRR_OVERRIDE_;
E_INDEX_TYPE iType=EIT_16BIT) IRR_OVERRIDE;
//! Draws a 3d line.
virtual void draw3DLine(const core::vector3df& start,
const core::vector3df& end, SColor color = SColor(255,255,255,255)) _IRR_OVERRIDE_;
const core::vector3df& end, SColor color = SColor(255,255,255,255)) IRR_OVERRIDE;
//! Draws a 3d triangle.
virtual void draw3DTriangle(const core::triangle3df& triangle,
SColor color = SColor(255,255,255,255)) _IRR_OVERRIDE_;
SColor color = SColor(255,255,255,255)) IRR_OVERRIDE;
//! Draws a 3d axis aligned box.
virtual void draw3DBox(const core::aabbox3d<f32>& box,
SColor color = SColor(255,255,255,255)) _IRR_OVERRIDE_;
SColor color = SColor(255,255,255,255)) IRR_OVERRIDE;
//! draws an 2d image
virtual void draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos, bool useAlphaChannelOfTexture) _IRR_OVERRIDE_;
virtual void draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos, bool useAlphaChannelOfTexture) IRR_OVERRIDE;
//! draws a set of 2d images, using a color and the alpha
/** channel of the texture if desired. The images are drawn
@ -167,7 +167,7 @@ namespace video
s32 kerningWidth = 0,
const core::rect<s32>* clipRect = 0,
SColor color=SColor(255,255,255,255),
bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_;
bool useAlphaChannelOfTexture=false) IRR_OVERRIDE;
//! Draws a set of 2d images, using a color and the alpha channel of the texture.
/** All drawings are clipped against clipRect (if != 0).
@ -190,105 +190,105 @@ 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) _IRR_OVERRIDE_;
bool useAlphaChannelOfTexture=false) IRR_OVERRIDE;
//! Draws a 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) _IRR_OVERRIDE_;
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) _IRR_OVERRIDE_;
const video::SColor* const colors=0, bool useAlphaChannelOfTexture=false) IRR_OVERRIDE;
//! Draws a 2d rectangle
virtual void draw2DRectangle(SColor color, const core::rect<s32>& pos, const core::rect<s32>* clip = 0) _IRR_OVERRIDE_;
virtual void draw2DRectangle(SColor color, const core::rect<s32>& pos, const core::rect<s32>* clip = 0) IRR_OVERRIDE;
//! Draws a 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) _IRR_OVERRIDE_;
const core::rect<s32>* clip = 0) IRR_OVERRIDE;
//! Draws the outline of a 2d rectangle
virtual void draw2DRectangleOutline(const core::recti& pos, SColor color=SColor(255,255,255,255)) _IRR_OVERRIDE_;
virtual void draw2DRectangleOutline(const core::recti& pos, SColor color=SColor(255,255,255,255)) 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)) _IRR_OVERRIDE_;
SColor color=SColor(255,255,255,255)) IRR_OVERRIDE;
//! Draws a pixel
virtual void drawPixel(u32 x, u32 y, const SColor & color) _IRR_OVERRIDE_;
virtual void drawPixel(u32 x, u32 y, const SColor & color) IRR_OVERRIDE;
//! Draws a non filled concyclic reqular 2d polygon.
virtual void draw2DPolygon(core::position2d<s32> center,
f32 radius, video::SColor Color, s32 vertexCount) _IRR_OVERRIDE_;
f32 radius, video::SColor Color, s32 vertexCount) IRR_OVERRIDE;
virtual void setFog(SColor color=SColor(0,255,255,255),
E_FOG_TYPE fogType=EFT_FOG_LINEAR,
f32 start=50.0f, f32 end=100.0f, f32 density=0.01f,
bool pixelFog=false, bool rangeFog=false) _IRR_OVERRIDE_;
bool pixelFog=false, bool rangeFog=false) IRR_OVERRIDE;
virtual void getFog(SColor& color, E_FOG_TYPE& fogType,
f32& start, f32& end, f32& density,
bool& pixelFog, bool& rangeFog) _IRR_OVERRIDE_;
bool& pixelFog, bool& rangeFog) IRR_OVERRIDE;
//! get color format of the current color buffer
virtual ECOLOR_FORMAT getColorFormat() const _IRR_OVERRIDE_;
virtual ECOLOR_FORMAT getColorFormat() const IRR_OVERRIDE;
//! get screen size
virtual const core::dimension2d<u32>& getScreenSize() const _IRR_OVERRIDE_;
virtual const core::dimension2d<u32>& getScreenSize() const IRR_OVERRIDE;
//! get current render target
IRenderTarget* getCurrentRenderTarget() const;
//! get render target size
virtual const core::dimension2d<u32>& getCurrentRenderTargetSize() const _IRR_OVERRIDE_;
virtual const core::dimension2d<u32>& getCurrentRenderTargetSize() const IRR_OVERRIDE;
// get current frames per second value
virtual s32 getFPS() const _IRR_OVERRIDE_;
virtual s32 getFPS() const IRR_OVERRIDE;
//! returns amount of primitives (mostly triangles) were drawn in the last frame.
//! very useful method for statistics.
virtual u32 getPrimitiveCountDrawn( u32 param = 0 ) const _IRR_OVERRIDE_;
virtual u32 getPrimitiveCountDrawn( u32 param = 0 ) const IRR_OVERRIDE;
//! deletes all dynamic lights there are
virtual void deleteAllDynamicLights() _IRR_OVERRIDE_;
virtual void deleteAllDynamicLights() IRR_OVERRIDE;
//! adds a dynamic light, returning an index to the light
//! \param light: the light data to use to create the light
//! \return An index to the light, or -1 if an error occurs
virtual s32 addDynamicLight(const SLight& light) _IRR_OVERRIDE_;
virtual s32 addDynamicLight(const SLight& light) IRR_OVERRIDE;
//! Turns a dynamic light on or off
//! \param lightIndex: the index returned by addDynamicLight
//! \param turnOn: true to turn the light on, false to turn it off
virtual void turnLightOn(s32 lightIndex, bool turnOn) _IRR_OVERRIDE_;
virtual void turnLightOn(s32 lightIndex, bool turnOn) IRR_OVERRIDE;
//! returns the maximal amount of dynamic lights the device can handle
virtual u32 getMaximalDynamicLightAmount() const _IRR_OVERRIDE_;
virtual u32 getMaximalDynamicLightAmount() const IRR_OVERRIDE;
//! \return Returns the name of the video driver. Example: In case of the DIRECT3D8
//! driver, it would return "Direct3D8.1".
virtual const wchar_t* getName() const _IRR_OVERRIDE_;
virtual const wchar_t* getName() const IRR_OVERRIDE;
//! Sets the dynamic ambient light color. The default color is
//! (0,0,0,0) which means it is dark.
//! \param color: New color of the ambient light.
virtual void setAmbientLight(const SColorf& color) _IRR_OVERRIDE_;
virtual void setAmbientLight(const SColorf& color) IRR_OVERRIDE;
//! Adds an external image loader to the engine.
virtual void addExternalImageLoader(IImageLoader* loader) _IRR_OVERRIDE_;
virtual void addExternalImageLoader(IImageLoader* loader) IRR_OVERRIDE;
//! Adds an external image writer to the engine.
virtual void addExternalImageWriter(IImageWriter* writer) _IRR_OVERRIDE_;
virtual void addExternalImageWriter(IImageWriter* writer) IRR_OVERRIDE;
//! Draws a shadow volume into the stencil buffer. To draw a stencil shadow, do
//! this: First, draw all geometry. Then use this method, to draw the shadow
//! volume. Then, use IVideoDriver::drawStencilShadow() to visualize the shadow.
virtual void drawStencilShadowVolume(const core::array<core::vector3df>& triangles,
bool zfail=true, u32 debugDataVisible=0) _IRR_OVERRIDE_;
bool zfail=true, u32 debugDataVisible=0) IRR_OVERRIDE;
//! Fills the stencil shadow with color. After the shadow volume has been drawn
//! into the stencil buffer using IVideoDriver::drawStencilShadowVolume(), use this
@ -297,59 +297,59 @@ 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)) _IRR_OVERRIDE_;
video::SColor rightDownEdge = video::SColor(0,0,0,0)) IRR_OVERRIDE;
//! Returns current amount of dynamic lights set
//! \return Current amount of dynamic lights set
virtual u32 getDynamicLightCount() const _IRR_OVERRIDE_;
virtual u32 getDynamicLightCount() const IRR_OVERRIDE;
//! Returns light data which was previously set with IVideDriver::addDynamicLight().
//! \param idx: Zero based index of the light. Must be greater than 0 and smaller
//! than IVideoDriver()::getDynamicLightCount.
//! \return Light data.
virtual const SLight& getDynamicLight(u32 idx) const _IRR_OVERRIDE_;
virtual const SLight& getDynamicLight(u32 idx) const IRR_OVERRIDE;
//! Removes a texture from the texture cache and deletes it, freeing lot of
//! memory.
virtual void removeTexture(ITexture* texture) _IRR_OVERRIDE_;
virtual void removeTexture(ITexture* texture) IRR_OVERRIDE;
//! Removes all texture from the texture cache and deletes them, freeing lot of
//! memory.
virtual void removeAllTextures() _IRR_OVERRIDE_;
virtual void removeAllTextures() IRR_OVERRIDE;
//! Creates a render target texture.
virtual ITexture* addRenderTargetTexture(const core::dimension2d<u32>& size,
const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) _IRR_OVERRIDE_;
const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) IRR_OVERRIDE;
//! Creates a render target texture for a cubemap
ITexture* addRenderTargetTextureCubemap(const irr::u32 sideLen,
const io::path& name, const ECOLOR_FORMAT format) _IRR_OVERRIDE_;
const io::path& name, const ECOLOR_FORMAT format) IRR_OVERRIDE;
//! Creates an 1bit alpha channel of the texture based of an color key.
virtual void makeColorKeyTexture(video::ITexture* texture, video::SColor color, bool zeroTexels) const _IRR_OVERRIDE_;
virtual void makeColorKeyTexture(video::ITexture* texture, video::SColor color, bool zeroTexels) const IRR_OVERRIDE;
//! Creates an 1bit alpha channel of the texture based of an color key position.
virtual void makeColorKeyTexture(video::ITexture* texture, core::position2d<s32> colorKeyPixelPos,
bool zeroTexels) const _IRR_OVERRIDE_;
bool zeroTexels) const IRR_OVERRIDE;
//! Creates a normal map from a height map texture.
//! \param amplitude: Constant value by which the height information is multiplied.
virtual void makeNormalMapTexture(video::ITexture* texture, f32 amplitude=1.0f) const _IRR_OVERRIDE_;
virtual void makeNormalMapTexture(video::ITexture* texture, f32 amplitude=1.0f) const IRR_OVERRIDE;
//! Returns the maximum amount of primitives (mostly vertices) which
//! the device is able to render with one drawIndexedTriangleList
//! call.
virtual u32 getMaximalPrimitiveCount() const _IRR_OVERRIDE_;
virtual u32 getMaximalPrimitiveCount() const IRR_OVERRIDE;
//! Enables or disables a texture creation flag.
virtual void setTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag, bool enabled) _IRR_OVERRIDE_;
virtual void setTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag, bool enabled) IRR_OVERRIDE;
//! Returns if a texture creation flag is enabled or disabled.
virtual bool getTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag) const _IRR_OVERRIDE_;
virtual bool getTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag) const IRR_OVERRIDE;
virtual core::array<IImage*> createImagesFromFile(const io::path& filename, E_TEXTURE_TYPE* type = 0) _IRR_OVERRIDE_;
virtual core::array<IImage*> createImagesFromFile(const io::path& filename, E_TEXTURE_TYPE* type = 0) IRR_OVERRIDE;
virtual core::array<IImage*> createImagesFromFile(io::IReadFile* file, E_TEXTURE_TYPE* type = 0) _IRR_OVERRIDE_;
virtual core::array<IImage*> createImagesFromFile(io::IReadFile* file, E_TEXTURE_TYPE* type = 0) IRR_OVERRIDE;
//! Creates a software image from a byte array.
/** \param useForeignMemory: If true, the image will use the data pointer
@ -357,33 +357,33 @@ namespace video
data when the image will be destructed. If false, the memory will by copied. */
virtual IImage* createImageFromData(ECOLOR_FORMAT format,
const core::dimension2d<u32>& size, void *data, bool ownForeignMemory = false,
bool deleteMemory = true) _IRR_OVERRIDE_;
bool deleteMemory = true) IRR_OVERRIDE;
//! Creates an empty software image.
virtual IImage* createImage(ECOLOR_FORMAT format, const core::dimension2d<u32>& size) _IRR_OVERRIDE_;
virtual IImage* createImage(ECOLOR_FORMAT format, const core::dimension2d<u32>& size) IRR_OVERRIDE;
//! Creates a software image from another image.
virtual IImage* createImage(ECOLOR_FORMAT format, IImage *imageToCopy) _IRR_OVERRIDE_;
virtual IImage* createImage(ECOLOR_FORMAT format, IImage *imageToCopy) IRR_OVERRIDE;
//! Creates a software image from part of another image.
virtual IImage* createImage(IImage* imageToCopy,
const core::position2d<s32>& pos,
const core::dimension2d<u32>& size) _IRR_OVERRIDE_;
const core::dimension2d<u32>& size) IRR_OVERRIDE;
//! Creates a software image from part of a texture.
virtual IImage* createImage(ITexture* texture,
const core::position2d<s32>& pos,
const core::dimension2d<u32>& size) _IRR_OVERRIDE_;
const core::dimension2d<u32>& size) IRR_OVERRIDE;
//! Draws a mesh buffer
virtual void drawMeshBuffer(const scene::IMeshBuffer* mb) _IRR_OVERRIDE_;
virtual void drawMeshBuffer(const scene::IMeshBuffer* mb) IRR_OVERRIDE;
//! Draws the normals of a mesh buffer
virtual void drawMeshBufferNormals(const scene::IMeshBuffer* mb, f32 length=10.f,
SColor color=0xffffffff) _IRR_OVERRIDE_;
SColor color=0xffffffff) IRR_OVERRIDE;
//! Check if the driver supports creating textures with the given color format
virtual bool queryTextureFormat(ECOLOR_FORMAT format) const _IRR_OVERRIDE_
virtual bool queryTextureFormat(ECOLOR_FORMAT format) const IRR_OVERRIDE
{
return false;
}
@ -431,10 +431,10 @@ namespace video
public:
//! Remove hardware buffer
virtual void removeHardwareBuffer(const scene::IMeshBuffer* mb) _IRR_OVERRIDE_;
virtual void removeHardwareBuffer(const scene::IMeshBuffer* mb) IRR_OVERRIDE;
//! Remove all hardware buffers
virtual void removeAllHardwareBuffers() _IRR_OVERRIDE_;
virtual void removeAllHardwareBuffers() IRR_OVERRIDE;
//! Update all hardware buffers, remove unused ones
virtual void updateAllHardwareBuffers();
@ -445,68 +445,68 @@ 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) _IRR_OVERRIDE_;
const scene::IMesh* mesh=0) IRR_OVERRIDE;
//! Remove occlusion query.
virtual void removeOcclusionQuery(scene::ISceneNode* node) _IRR_OVERRIDE_;
virtual void removeOcclusionQuery(scene::ISceneNode* node) IRR_OVERRIDE;
//! Remove all occlusion queries.
virtual void removeAllOcclusionQueries() _IRR_OVERRIDE_;
virtual void removeAllOcclusionQueries() IRR_OVERRIDE;
//! Run occlusion query. Draws mesh stored in query.
/** If the mesh shall not be rendered visible, use
overrideMaterial to disable the color and depth buffer. */
virtual void runOcclusionQuery(scene::ISceneNode* node, bool visible=false) _IRR_OVERRIDE_;
virtual void runOcclusionQuery(scene::ISceneNode* node, bool visible=false) IRR_OVERRIDE;
//! Run all occlusion queries. Draws all meshes stored in queries.
/** If the meshes shall not be rendered visible, use
overrideMaterial to disable the color and depth buffer. */
virtual void runAllOcclusionQueries(bool visible=false) _IRR_OVERRIDE_;
virtual void runAllOcclusionQueries(bool visible=false) IRR_OVERRIDE;
//! Update occlusion query. Retrieves results from GPU.
/** If the query shall not block, set the flag to false.
Update might not occur in this case, though */
virtual void updateOcclusionQuery(scene::ISceneNode* node, bool block=true) _IRR_OVERRIDE_;
virtual void updateOcclusionQuery(scene::ISceneNode* node, bool block=true) IRR_OVERRIDE;
//! Update all occlusion queries. Retrieves results from GPU.
/** If the query shall not block, set the flag to false.
Update might not occur in this case, though */
virtual void updateAllOcclusionQueries(bool block=true) _IRR_OVERRIDE_;
virtual void updateAllOcclusionQueries(bool block=true) IRR_OVERRIDE;
//! Return query result.
/** Return value is the number of visible pixels/fragments.
The value is a safe approximation, i.e. can be larger than the
actual value of pixels. */
virtual u32 getOcclusionQueryResult(scene::ISceneNode* node) const _IRR_OVERRIDE_;
virtual u32 getOcclusionQueryResult(scene::ISceneNode* node) const IRR_OVERRIDE;
//! Create render target.
virtual IRenderTarget* addRenderTarget() _IRR_OVERRIDE_;
virtual IRenderTarget* addRenderTarget() IRR_OVERRIDE;
//! Remove render target.
virtual void removeRenderTarget(IRenderTarget* renderTarget) _IRR_OVERRIDE_;
virtual void removeRenderTarget(IRenderTarget* renderTarget) IRR_OVERRIDE;
//! Remove all render targets.
virtual void removeAllRenderTargets() _IRR_OVERRIDE_;
virtual void removeAllRenderTargets() IRR_OVERRIDE;
//! Only used by the engine internally.
/** Used to notify the driver that the window was resized. */
virtual void OnResize(const core::dimension2d<u32>& size) _IRR_OVERRIDE_;
virtual void OnResize(const core::dimension2d<u32>& size) IRR_OVERRIDE;
//! Adds a new material renderer to the video device.
virtual s32 addMaterialRenderer(IMaterialRenderer* renderer,
const char* name = 0) _IRR_OVERRIDE_;
const char* name = 0) IRR_OVERRIDE;
//! Returns driver and operating system specific data about the IVideoDriver.
virtual const SExposedVideoData& getExposedVideoData() _IRR_OVERRIDE_;
virtual const SExposedVideoData& getExposedVideoData() IRR_OVERRIDE;
//! Returns type of video driver
virtual E_DRIVER_TYPE getDriverType() const _IRR_OVERRIDE_;
virtual E_DRIVER_TYPE getDriverType() const IRR_OVERRIDE;
//! Returns the transformation set by setTransform
virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const _IRR_OVERRIDE_;
virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const IRR_OVERRIDE;
//! Returns pointer to the IGPUProgrammingServices interface.
virtual IGPUProgrammingServices* getGPUProgrammingServices() _IRR_OVERRIDE_;
virtual IGPUProgrammingServices* getGPUProgrammingServices() IRR_OVERRIDE;
//! Adds a new material renderer to the VideoDriver, using pixel and/or
//! vertex shaders to render geometry.
@ -514,7 +514,7 @@ namespace video
const c8* pixelShaderProgram = 0,
IShaderConstantSetCallBack* callback = 0,
E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
s32 userData=0) _IRR_OVERRIDE_;
s32 userData=0) IRR_OVERRIDE;
//! Like IGPUProgrammingServices::addShaderMaterial(), but tries to load the
//! programs from files.
@ -522,7 +522,7 @@ namespace video
io::IReadFile* pixelShaderProgram = 0,
IShaderConstantSetCallBack* callback = 0,
E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
s32 userData=0) _IRR_OVERRIDE_;
s32 userData=0) IRR_OVERRIDE;
//! Like IGPUProgrammingServices::addShaderMaterial(), but tries to load the
//! programs from files.
@ -530,16 +530,16 @@ namespace video
const io::path& pixelShaderProgramFileName,
IShaderConstantSetCallBack* callback = 0,
E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
s32 userData=0) _IRR_OVERRIDE_;
s32 userData=0) IRR_OVERRIDE;
//! Returns pointer to material renderer or null
virtual IMaterialRenderer* getMaterialRenderer(u32 idx) const _IRR_OVERRIDE_;
virtual IMaterialRenderer* getMaterialRenderer(u32 idx) const IRR_OVERRIDE;
//! Returns amount of currently available material renderers.
virtual u32 getMaterialRendererCount() const _IRR_OVERRIDE_;
virtual u32 getMaterialRendererCount() const IRR_OVERRIDE;
//! Returns name of the material renderer
virtual const char* getMaterialRendererName(u32 idx) const _IRR_OVERRIDE_;
virtual const char* getMaterialRendererName(u32 idx) const IRR_OVERRIDE;
//! Adds a new material renderer to the VideoDriver, based on a high level shading
//! language. Currently only HLSL in D3D9 is supported.
@ -558,7 +558,7 @@ namespace video
u32 verticesOut = 0,
IShaderConstantSetCallBack* callback = 0,
E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
s32 userData = 0) _IRR_OVERRIDE_;
s32 userData = 0) IRR_OVERRIDE;
//! Like IGPUProgrammingServices::addShaderMaterial() (look there for a detailed description),
//! but tries to load the programs from files.
@ -577,7 +577,7 @@ namespace video
u32 verticesOut = 0,
IShaderConstantSetCallBack* callback = 0,
E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
s32 userData = 0) _IRR_OVERRIDE_;
s32 userData = 0) IRR_OVERRIDE;
//! Like IGPUProgrammingServices::addShaderMaterial() (look there for a detailed description),
//! but tries to load the programs from files.
@ -596,79 +596,79 @@ namespace video
u32 verticesOut = 0,
IShaderConstantSetCallBack* callback = 0,
E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
s32 userData = 0) _IRR_OVERRIDE_;
s32 userData = 0) IRR_OVERRIDE;
//! Returns a pointer to the mesh manipulator.
virtual scene::IMeshManipulator* getMeshManipulator() _IRR_OVERRIDE_;
virtual scene::IMeshManipulator* getMeshManipulator() IRR_OVERRIDE;
virtual void clearBuffers(u16 flag, SColor color = SColor(255,0,0,0), f32 depth = 1.f, u8 stencil = 0) _IRR_OVERRIDE_;
virtual void clearBuffers(u16 flag, SColor color = SColor(255,0,0,0), f32 depth = 1.f, u8 stencil = 0) IRR_OVERRIDE;
//! Returns an image created from the last rendered frame.
virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER) _IRR_OVERRIDE_;
virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER) IRR_OVERRIDE;
//! Writes the provided image to disk file
virtual bool writeImageToFile(IImage* image, const io::path& filename, u32 param = 0) _IRR_OVERRIDE_;
virtual bool writeImageToFile(IImage* image, const io::path& filename, u32 param = 0) IRR_OVERRIDE;
//! Writes the provided image to a file.
virtual bool writeImageToFile(IImage* image, io::IWriteFile * file, u32 param = 0) _IRR_OVERRIDE_;
virtual bool writeImageToFile(IImage* image, io::IWriteFile * file, u32 param = 0) IRR_OVERRIDE;
//! Sets the name of a material renderer.
virtual void setMaterialRendererName(s32 idx, const char* name) _IRR_OVERRIDE_;
virtual void setMaterialRendererName(s32 idx, const char* name) IRR_OVERRIDE;
//! Swap the material renderers used for certain id's
virtual void swapMaterialRenderers(u32 idx1, u32 idx2, bool swapNames) _IRR_OVERRIDE_;
virtual void swapMaterialRenderers(u32 idx1, u32 idx2, bool swapNames) IRR_OVERRIDE;
//! Creates material attributes list from a material, usable for serialization and more.
virtual io::IAttributes* createAttributesFromMaterial(const video::SMaterial& material,
io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_;
io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE;
//! Fills an SMaterial structure from attributes.
virtual void fillMaterialStructureFromAttributes(video::SMaterial& outMaterial, io::IAttributes* attributes) _IRR_OVERRIDE_;
virtual void fillMaterialStructureFromAttributes(video::SMaterial& outMaterial, io::IAttributes* attributes) IRR_OVERRIDE;
//! looks if the image is already loaded
virtual video::ITexture* findTexture(const io::path& filename) _IRR_OVERRIDE_;
virtual video::ITexture* findTexture(const io::path& filename) IRR_OVERRIDE;
//! Set/unset a clipping plane.
//! There are at least 6 clipping planes available for the user to set at will.
//! \param index: The plane index. Must be between 0 and MaxUserClipPlanes.
//! \param plane: The plane itself.
//! \param enable: If true, enable the clipping plane else disable it.
virtual bool setClipPlane(u32 index, const core::plane3df& plane, bool enable=false) _IRR_OVERRIDE_;
virtual bool setClipPlane(u32 index, const core::plane3df& plane, bool enable=false) IRR_OVERRIDE;
//! Enable/disable a clipping plane.
//! There are at least 6 clipping planes available for the user to set at will.
//! \param index: The plane index. Must be between 0 and MaxUserClipPlanes.
//! \param enable: If true, enable the clipping plane else disable it.
virtual void enableClipPlane(u32 index, bool enable) _IRR_OVERRIDE_;
virtual void enableClipPlane(u32 index, bool enable) IRR_OVERRIDE;
//! Returns the graphics card vendor name.
virtual core::stringc getVendorInfo() _IRR_OVERRIDE_ {return "Not available on this driver.";}
virtual core::stringc getVendorInfo() IRR_OVERRIDE {return "Not available on this driver.";}
//! Set the minimum number of vertices for which a hw buffer will be created
/** \param count Number of vertices to set as minimum. */
virtual void setMinHardwareBufferVertexCount(u32 count) _IRR_OVERRIDE_;
virtual void setMinHardwareBufferVertexCount(u32 count) IRR_OVERRIDE;
//! Get the global Material, which might override local materials.
/** Depending on the enable flags, values from this Material
are used to override those of local materials of some
meshbuffer being rendered. */
virtual SOverrideMaterial& getOverrideMaterial() _IRR_OVERRIDE_;
virtual SOverrideMaterial& getOverrideMaterial() IRR_OVERRIDE;
//! Get the 2d override material for altering its values
virtual SMaterial& getMaterial2D() _IRR_OVERRIDE_;
virtual SMaterial& getMaterial2D() IRR_OVERRIDE;
//! Enable the 2d override material
virtual void enableMaterial2D(bool enable=true) _IRR_OVERRIDE_;
virtual void enableMaterial2D(bool enable=true) IRR_OVERRIDE;
//! Only used by the engine internally.
virtual void setAllowZWriteOnTransparent(bool flag) _IRR_OVERRIDE_
virtual void setAllowZWriteOnTransparent(bool flag) IRR_OVERRIDE
{ AllowZWriteOnTransparent=flag; }
//! Returns the maximum texture size supported.
virtual core::dimension2du getMaxTextureSize() const _IRR_OVERRIDE_;
virtual core::dimension2du getMaxTextureSize() const IRR_OVERRIDE;
//! Used by some SceneNodes to check if a material should be rendered in the transparent render pass
virtual bool needsTransparentRenderPass(const irr::video::SMaterial& material) const _IRR_OVERRIDE_;
virtual bool needsTransparentRenderPass(const irr::video::SMaterial& material) const IRR_OVERRIDE;
//! Color conversion convenience function
/** Convert an image (as array of pixels) from source to destination
@ -681,13 +681,13 @@ namespace video
\param dF Color format of destination
*/
virtual void convertColor(const void* sP, ECOLOR_FORMAT sF, s32 sN,
void* dP, ECOLOR_FORMAT dF) const _IRR_OVERRIDE_;
void* dP, ECOLOR_FORMAT dF) const IRR_OVERRIDE;
//! deprecated method
virtual ITexture* createRenderTargetTexture(const core::dimension2d<u32>& size,
const c8* name=0);
virtual bool checkDriverReset() _IRR_OVERRIDE_ {return false;}
virtual bool checkDriverReset() IRR_OVERRIDE {return false;}
protected:
//! deletes all textures
@ -780,9 +780,9 @@ namespace video
{
SDummyTexture(const io::path& name, E_TEXTURE_TYPE type) : ITexture(name, type) {};
virtual void* lock(E_TEXTURE_LOCK_MODE mode = ETLM_READ_WRITE, u32 mipmapLevel=0, u32 layer = 0, E_TEXTURE_LOCK_FLAGS lockFlags = ETLF_FLIP_Y_UP_RTT) _IRR_OVERRIDE_ { return 0; }
virtual void unlock()_IRR_OVERRIDE_ {}
virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) _IRR_OVERRIDE_ {}
virtual void* lock(E_TEXTURE_LOCK_MODE mode = ETLM_READ_WRITE, u32 mipmapLevel=0, u32 layer = 0, E_TEXTURE_LOCK_FLAGS lockFlags = ETLF_FLIP_Y_UP_RTT) IRR_OVERRIDE { return 0; }
virtual void unlock()IRR_OVERRIDE {}
virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) IRR_OVERRIDE {}
};
core::array<SSurface> Textures;