BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/Irrlicht/C3DSMeshFileLoader.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_3DS_MESH_FILE_LOADER_H_INCLUDED__ #ifndef IRR_C_3DS_MESH_FILE_LOADER_H_INCLUDED
#define __C_3DS_MESH_FILE_LOADER_H_INCLUDED__ #define IRR_C_3DS_MESH_FILE_LOADER_H_INCLUDED
#include "IMeshLoader.h" #include "IMeshLoader.h"
#include "IFileSystem.h" #include "IFileSystem.h"
@ -30,13 +30,13 @@ public:
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".cob") //! based on the file extension (e.g. ".cob")
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! creates/loads an animated mesh from the file. //! creates/loads an animated mesh from the file.
//! \return Pointer to the created mesh. Returns 0 if loading failed. //! \return Pointer to the created mesh. Returns 0 if loading failed.
//! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! If you no longer need the mesh, you should call IAnimatedMesh::drop().
//! See IReferenceCounted::drop() for more information. //! See IReferenceCounted::drop() for more information.
virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE;
private: private:
@ -163,4 +163,3 @@ private:
} // end namespace irr } // end namespace irr
#endif #endif

35
source/Irrlicht/CAnimatedMeshHalfLife.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_ANIMATED_MESH_HALFLIFE_H_INCLUDED__ #ifndef IRR_C_ANIMATED_MESH_HALFLIFE_H_INCLUDED
#define __C_ANIMATED_MESH_HALFLIFE_H_INCLUDED__ #define IRR_C_ANIMATED_MESH_HALFLIFE_H_INCLUDED
#include "IAnimatedMesh.h" #include "IAnimatedMesh.h"
#include "ISceneManager.h" #include "ISceneManager.h"
@ -488,33 +488,33 @@ namespace scene
bool loadModelFile( io::IReadFile* file, ISceneManager * smgr ); bool loadModelFile( io::IReadFile* file, ISceneManager * smgr );
//IAnimatedMesh //IAnimatedMesh
virtual u32 getFrameCount() const _IRR_OVERRIDE_; virtual u32 getFrameCount() const IRR_OVERRIDE;
virtual IMesh* getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop, s32 endFrameLoop) _IRR_OVERRIDE_; virtual IMesh* getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop, s32 endFrameLoop) IRR_OVERRIDE;
virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_; virtual const core::aabbox3d<f32>& getBoundingBox() const IRR_OVERRIDE;
virtual E_ANIMATED_MESH_TYPE getMeshType() const _IRR_OVERRIDE_; virtual E_ANIMATED_MESH_TYPE getMeshType() const IRR_OVERRIDE;
void renderModel ( u32 param, video::IVideoDriver * driver, const core::matrix4 &absoluteTransformation); void renderModel ( u32 param, video::IVideoDriver * driver, const core::matrix4 &absoluteTransformation);
//! returns amount of mesh buffers. //! returns amount of mesh buffers.
virtual u32 getMeshBufferCount() const _IRR_OVERRIDE_; virtual u32 getMeshBufferCount() const IRR_OVERRIDE;
//! returns pointer to a mesh buffer //! returns pointer to a mesh buffer
virtual IMeshBuffer* getMeshBuffer(u32 nr) const _IRR_OVERRIDE_; virtual IMeshBuffer* getMeshBuffer(u32 nr) const IRR_OVERRIDE;
//! Returns pointer to a mesh buffer which fits a material //! Returns pointer to a mesh buffer which fits a material
virtual IMeshBuffer* getMeshBuffer( const video::SMaterial &material) const _IRR_OVERRIDE_; virtual IMeshBuffer* getMeshBuffer( const video::SMaterial &material) const IRR_OVERRIDE;
virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) _IRR_OVERRIDE_; virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) IRR_OVERRIDE;
//! set the hardware mapping hint, for driver //! set the hardware mapping hint, for driver
virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_; virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) IRR_OVERRIDE;
//! flags the meshbuffer as changed, reloads hardware buffers //! flags the meshbuffer as changed, reloads hardware buffers
virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_; virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) IRR_OVERRIDE;
//! set user axis aligned bounding box //! set user axis aligned bounding box
virtual void setBoundingBox(const core::aabbox3df& box) _IRR_OVERRIDE_; virtual void setBoundingBox(const core::aabbox3df& box) IRR_OVERRIDE;
//! Gets the default animation speed of the animated mesh. //! Gets the default animation speed of the animated mesh.
/** \return Amount of frames per second. If the amount is 0, it is a static, non animated mesh. */ /** \return Amount of frames per second. If the amount is 0, it is a static, non animated mesh. */
virtual f32 getAnimationSpeed() const _IRR_OVERRIDE_ virtual f32 getAnimationSpeed() const IRR_OVERRIDE
{ {
return FramesPerSecond; return FramesPerSecond;
} }
@ -522,7 +522,7 @@ namespace scene
//! Gets the frame count of the animated mesh. //! Gets the frame count of the animated mesh.
/** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated. /** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated.
The actual speed is set in the scene node the mesh is instantiated in.*/ The actual speed is set in the scene node the mesh is instantiated in.*/
virtual void setAnimationSpeed(f32 fps) _IRR_OVERRIDE_ virtual void setAnimationSpeed(f32 fps) IRR_OVERRIDE
{ {
FramesPerSecond=fps; FramesPerSecond=fps;
} }
@ -609,14 +609,14 @@ namespace scene
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
/** based on the file extension (e.g. ".bsp") */ /** based on the file extension (e.g. ".bsp") */
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! creates/loads an animated mesh from the file. //! creates/loads an animated mesh from the file.
/** \return Pointer to the created mesh. Returns 0 if loading failed. /** \return Pointer to the created mesh. Returns 0 if loading failed.
If you no longer need the mesh, you should call IAnimatedMesh::drop(). If you no longer need the mesh, you should call IAnimatedMesh::drop().
See IReferenceCounted::drop() for more information. See IReferenceCounted::drop() for more information.
*/ */
virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE;
private: private:
scene::ISceneManager* SceneManager; scene::ISceneManager* SceneManager;
@ -627,4 +627,3 @@ namespace scene
} // end namespace irr } // end namespace irr
#endif #endif

39
source/Irrlicht/CAnimatedMeshMD2.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_ANIMATED_MESH_MD2_H_INCLUDED__ #ifndef IRR_C_ANIMATED_MESH_MD2_H_INCLUDED
#define __C_ANIMATED_MESH_MD2_H_INCLUDED__ #define IRR_C_ANIMATED_MESH_MD2_H_INCLUDED
#include "IAnimatedMeshMD2.h" #include "IAnimatedMeshMD2.h"
#include "IMesh.h" #include "IMesh.h"
@ -29,11 +29,11 @@ namespace scene
virtual ~CAnimatedMeshMD2(); virtual ~CAnimatedMeshMD2();
//! returns the amount of frames. If the amount is 1, it is a static (=non animated) mesh. //! returns the amount of frames. If the amount is 1, it is a static (=non animated) mesh.
virtual u32 getFrameCount() const _IRR_OVERRIDE_; virtual u32 getFrameCount() const IRR_OVERRIDE;
//! Gets the default animation speed of the animated mesh. //! Gets the default animation speed of the animated mesh.
/** \return Amount of frames per second. If the amount is 0, it is a static, non animated mesh. */ /** \return Amount of frames per second. If the amount is 0, it is a static, non animated mesh. */
virtual f32 getAnimationSpeed() const _IRR_OVERRIDE_ virtual f32 getAnimationSpeed() const IRR_OVERRIDE
{ {
return FramesPerSecond; return FramesPerSecond;
} }
@ -41,58 +41,58 @@ namespace scene
//! Gets the frame count of the animated mesh. //! Gets the frame count of the animated mesh.
/** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated. /** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated.
The actual speed is set in the scene node the mesh is instantiated in.*/ The actual speed is set in the scene node the mesh is instantiated in.*/
virtual void setAnimationSpeed(f32 fps) _IRR_OVERRIDE_ virtual void setAnimationSpeed(f32 fps) IRR_OVERRIDE
{ {
FramesPerSecond=fps; FramesPerSecond=fps;
} }
//! returns the animated mesh based on a detail level. 0 is the lowest, 255 the highest detail. Note, that some Meshes will ignore the detail level. //! returns the animated mesh based on a detail level. 0 is the lowest, 255 the highest detail. Note, that some Meshes will ignore the detail level.
virtual IMesh* getMesh(s32 frame, s32 detailLevel=255, s32 startFrameLoop=-1, s32 endFrameLoop=-1) _IRR_OVERRIDE_; virtual IMesh* getMesh(s32 frame, s32 detailLevel=255, s32 startFrameLoop=-1, s32 endFrameLoop=-1) IRR_OVERRIDE;
//! returns amount of mesh buffers. //! returns amount of mesh buffers.
virtual u32 getMeshBufferCount() const _IRR_OVERRIDE_; virtual u32 getMeshBufferCount() const IRR_OVERRIDE;
//! returns pointer to a mesh buffer //! returns pointer to a mesh buffer
virtual IMeshBuffer* getMeshBuffer(u32 nr) const _IRR_OVERRIDE_; virtual IMeshBuffer* getMeshBuffer(u32 nr) const IRR_OVERRIDE;
//! Returns pointer to a mesh buffer which fits a material //! Returns pointer to a mesh buffer which fits a material
/** \param material: material to search for /** \param material: material to search for
\return Returns the pointer to the mesh buffer or \return Returns the pointer to the mesh buffer or
NULL if there is no such mesh buffer. */ NULL if there is no such mesh buffer. */
virtual IMeshBuffer* getMeshBuffer( const video::SMaterial &material) const _IRR_OVERRIDE_; virtual IMeshBuffer* getMeshBuffer( const video::SMaterial &material) const IRR_OVERRIDE;
//! returns an axis aligned bounding box //! returns an axis aligned bounding box
virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_; virtual const core::aabbox3d<f32>& getBoundingBox() const IRR_OVERRIDE;
//! set user axis aligned bounding box //! set user axis aligned bounding box
virtual void setBoundingBox( const core::aabbox3df& box) _IRR_OVERRIDE_; virtual void setBoundingBox( const core::aabbox3df& box) IRR_OVERRIDE;
//! sets a flag of all contained materials to a new value //! sets a flag of all contained materials to a new value
virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) _IRR_OVERRIDE_; virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) IRR_OVERRIDE;
//! set the hardware mapping hint, for driver //! set the hardware mapping hint, for driver
virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_; virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) IRR_OVERRIDE;
//! flags the meshbuffer as changed, reloads hardware buffers //! flags the meshbuffer as changed, reloads hardware buffers
virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_; virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) IRR_OVERRIDE;
//! Returns the type of the animated mesh. //! Returns the type of the animated mesh.
virtual E_ANIMATED_MESH_TYPE getMeshType() const _IRR_OVERRIDE_; virtual E_ANIMATED_MESH_TYPE getMeshType() const IRR_OVERRIDE;
//! Returns frame loop data for a special MD2 animation type. //! Returns frame loop data for a special MD2 animation type.
virtual void getFrameLoop(EMD2_ANIMATION_TYPE, virtual void getFrameLoop(EMD2_ANIMATION_TYPE,
s32& outBegin, s32& outEnd, s32& outFps) const _IRR_OVERRIDE_; s32& outBegin, s32& outEnd, s32& outFps) const IRR_OVERRIDE;
//! Returns frame loop data for a special MD2 animation type. //! Returns frame loop data for a special MD2 animation type.
virtual bool getFrameLoop(const c8* name, virtual bool getFrameLoop(const c8* name,
s32& outBegin, s32& outEnd, s32& outFps) const _IRR_OVERRIDE_; s32& outBegin, s32& outEnd, s32& outFps) const IRR_OVERRIDE;
//! Returns amount of md2 animations in this file. //! Returns amount of md2 animations in this file.
virtual s32 getAnimationCount() const _IRR_OVERRIDE_; virtual s32 getAnimationCount() const IRR_OVERRIDE;
//! Returns name of md2 animation. //! Returns name of md2 animation.
//! \param nr: Zero based index of animation. //! \param nr: Zero based index of animation.
virtual const c8* getAnimationName(s32 nr) const _IRR_OVERRIDE_; virtual const c8* getAnimationName(s32 nr) const IRR_OVERRIDE;
// //
@ -155,4 +155,3 @@ namespace scene
} // end namespace irr } // end namespace irr
#endif #endif

37
source/Irrlicht/CAnimatedMeshMD3.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_ANIMATED_MESH_MD3_H_INCLUDED__ #ifndef IRR_C_ANIMATED_MESH_MD3_H_INCLUDED
#define __C_ANIMATED_MESH_MD3_H_INCLUDED__ #define IRR_C_ANIMATED_MESH_MD3_H_INCLUDED
#include "IAnimatedMeshMD3.h" #include "IAnimatedMeshMD3.h"
#include "IReadFile.h" #include "IReadFile.h"
@ -34,16 +34,16 @@ namespace scene
io::IFileSystem* fs, video::IVideoDriver* driver); io::IFileSystem* fs, video::IVideoDriver* driver);
// IAnimatedMeshMD3 // IAnimatedMeshMD3
virtual void setInterpolationShift(u32 shift, u32 loopMode) _IRR_OVERRIDE_; virtual void setInterpolationShift(u32 shift, u32 loopMode) IRR_OVERRIDE;
virtual SMD3Mesh* getOriginalMesh() _IRR_OVERRIDE_; virtual SMD3Mesh* getOriginalMesh() IRR_OVERRIDE;
virtual SMD3QuaternionTagList* getTagList(s32 frame, s32 detailLevel, s32 startFrameLoop, s32 endFrameLoop) _IRR_OVERRIDE_; virtual SMD3QuaternionTagList* getTagList(s32 frame, s32 detailLevel, s32 startFrameLoop, s32 endFrameLoop) IRR_OVERRIDE;
//IAnimatedMesh //IAnimatedMesh
virtual u32 getFrameCount() const _IRR_OVERRIDE_; virtual u32 getFrameCount() const IRR_OVERRIDE;
//! Gets the default animation speed of the animated mesh. //! Gets the default animation speed of the animated mesh.
/** \return Amount of frames per second. If the amount is 0, it is a static, non animated mesh. */ /** \return Amount of frames per second. If the amount is 0, it is a static, non animated mesh. */
virtual f32 getAnimationSpeed() const _IRR_OVERRIDE_ virtual f32 getAnimationSpeed() const IRR_OVERRIDE
{ {
return FramesPerSecond; return FramesPerSecond;
} }
@ -51,35 +51,35 @@ namespace scene
//! Gets the frame count of the animated mesh. //! Gets the frame count of the animated mesh.
/** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated. /** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated.
The actual speed is set in the scene node the mesh is instantiated in.*/ The actual speed is set in the scene node the mesh is instantiated in.*/
virtual void setAnimationSpeed(f32 fps) _IRR_OVERRIDE_ virtual void setAnimationSpeed(f32 fps) IRR_OVERRIDE
{ {
FramesPerSecond=fps; FramesPerSecond=fps;
} }
virtual IMesh* getMesh(s32 frame, s32 detailLevel, virtual IMesh* getMesh(s32 frame, s32 detailLevel,
s32 startFrameLoop, s32 endFrameLoop) _IRR_OVERRIDE_; s32 startFrameLoop, s32 endFrameLoop) IRR_OVERRIDE;
virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_; virtual const core::aabbox3d<f32>& getBoundingBox() const IRR_OVERRIDE;
virtual E_ANIMATED_MESH_TYPE getMeshType() const _IRR_OVERRIDE_; virtual E_ANIMATED_MESH_TYPE getMeshType() const IRR_OVERRIDE;
//! returns amount of mesh buffers. //! returns amount of mesh buffers.
virtual u32 getMeshBufferCount() const _IRR_OVERRIDE_; virtual u32 getMeshBufferCount() const IRR_OVERRIDE;
//! returns pointer to a mesh buffer //! returns pointer to a mesh buffer
virtual IMeshBuffer* getMeshBuffer(u32 nr) const _IRR_OVERRIDE_; virtual IMeshBuffer* getMeshBuffer(u32 nr) const IRR_OVERRIDE;
//! Returns pointer to a mesh buffer which fits a material //! Returns pointer to a mesh buffer which fits a material
virtual IMeshBuffer* getMeshBuffer(const video::SMaterial &material) const _IRR_OVERRIDE_; virtual IMeshBuffer* getMeshBuffer(const video::SMaterial &material) const IRR_OVERRIDE;
virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) _IRR_OVERRIDE_; virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) IRR_OVERRIDE;
//! set user axis aligned bounding box //! set user axis aligned bounding box
virtual void setBoundingBox(const core::aabbox3df& box) _IRR_OVERRIDE_; virtual void setBoundingBox(const core::aabbox3df& box) IRR_OVERRIDE;
//! set the hardware mapping hint, for driver //! set the hardware mapping hint, for driver
virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_; virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) IRR_OVERRIDE;
//! flags the meshbuffer as changed, reloads hardware buffers //! flags the meshbuffer as changed, reloads hardware buffers
virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_; virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) IRR_OVERRIDE;
private: private:
//! animates one frame //! animates one frame
@ -132,4 +132,3 @@ namespace scene
} // end namespace irr } // end namespace irr
#endif #endif

79
source/Irrlicht/CAnimatedMeshSceneNode.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__ #ifndef IRR_C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED
#define __C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__ #define IRR_C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED
#include "IAnimatedMeshSceneNode.h" #include "IAnimatedMeshSceneNode.h"
#include "IAnimatedMesh.h" #include "IAnimatedMesh.h"
@ -31,135 +31,135 @@ namespace scene
virtual ~CAnimatedMeshSceneNode(); virtual ~CAnimatedMeshSceneNode();
//! sets the current frame. from now on the animation is played from this frame. //! sets the current frame. from now on the animation is played from this frame.
virtual void setCurrentFrame(f32 frame) _IRR_OVERRIDE_; virtual void setCurrentFrame(f32 frame) IRR_OVERRIDE;
//! frame //! frame
virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; virtual void OnRegisterSceneNode() IRR_OVERRIDE;
//! OnAnimate() is called just before rendering the whole scene. //! OnAnimate() is called just before rendering the whole scene.
virtual void OnAnimate(u32 timeMs) _IRR_OVERRIDE_; virtual void OnAnimate(u32 timeMs) IRR_OVERRIDE;
//! renders the node. //! renders the node.
virtual void render() _IRR_OVERRIDE_; virtual void render() IRR_OVERRIDE;
//! returns the axis aligned bounding box of this node //! returns the axis aligned bounding box of this node
virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_; virtual const core::aabbox3d<f32>& getBoundingBox() const IRR_OVERRIDE;
//! sets the frames between the animation is looped. //! sets the frames between the animation is looped.
//! the default is 0 - MaximalFrameCount of the mesh. //! the default is 0 - MaximalFrameCount of the mesh.
//! NOTE: setMesh will also change this value and set it to the full range of animations of the mesh //! NOTE: setMesh will also change this value and set it to the full range of animations of the mesh
virtual bool setFrameLoop(s32 begin, s32 end) _IRR_OVERRIDE_; virtual bool setFrameLoop(s32 begin, s32 end) IRR_OVERRIDE;
//! Sets looping mode which is on by default. If set to false, //! Sets looping mode which is on by default. If set to false,
//! animations will not be looped. //! animations will not be looped.
virtual void setLoopMode(bool playAnimationLooped) _IRR_OVERRIDE_; virtual void setLoopMode(bool playAnimationLooped) IRR_OVERRIDE;
//! returns the current loop mode //! returns the current loop mode
virtual bool getLoopMode() const _IRR_OVERRIDE_; virtual bool getLoopMode() const IRR_OVERRIDE;
//! Sets a callback interface which will be called if an animation //! Sets a callback interface which will be called if an animation
//! playback has ended. Set this to 0 to disable the callback again. //! playback has ended. Set this to 0 to disable the callback again.
virtual void setAnimationEndCallback(IAnimationEndCallBack* callback=0) _IRR_OVERRIDE_; virtual void setAnimationEndCallback(IAnimationEndCallBack* callback=0) IRR_OVERRIDE;
//! sets the speed with which the animation is played //! sets the speed with which the animation is played
//! NOTE: setMesh will also change this value and set it to the default speed of the mesh //! NOTE: setMesh will also change this value and set it to the default speed of the mesh
virtual void setAnimationSpeed(f32 framesPerSecond) _IRR_OVERRIDE_; virtual void setAnimationSpeed(f32 framesPerSecond) IRR_OVERRIDE;
//! gets the speed with which the animation is played //! gets the speed with which the animation is played
virtual f32 getAnimationSpeed() const _IRR_OVERRIDE_; virtual f32 getAnimationSpeed() const IRR_OVERRIDE;
//! returns the material based on the zero based index i. To get the amount //! returns the material based on the zero based index i. To get the amount
//! of materials used by this scene node, use getMaterialCount(). //! of materials used by this scene node, use getMaterialCount().
//! This function is needed for inserting the node into the scene hierarchy on a //! This function is needed for inserting the node into the scene hierarchy on a
//! optimal position for minimizing renderstate changes, but can also be used //! optimal position for minimizing renderstate changes, but can also be used
//! to directly modify the material of a scene node. //! to directly modify the material of a scene node.
virtual video::SMaterial& getMaterial(u32 i) _IRR_OVERRIDE_; virtual video::SMaterial& getMaterial(u32 i) IRR_OVERRIDE;
//! returns amount of materials used by this scene node. //! returns amount of materials used by this scene node.
virtual u32 getMaterialCount() const _IRR_OVERRIDE_; virtual u32 getMaterialCount() const IRR_OVERRIDE;
//! Creates shadow volume scene node as child of this node //! Creates shadow volume scene node as child of this node
//! and returns a pointer to it. //! and returns a pointer to it.
virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh, virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh,
s32 id, bool zfailmethod=true, f32 infinity=1000.0f) _IRR_OVERRIDE_; s32 id, bool zfailmethod=true, f32 infinity=1000.0f) IRR_OVERRIDE;
//! Returns a pointer to a child node, which has the same transformation as //! Returns a pointer to a child node, which has the same transformation as
//! the corresponding joint, if the mesh in this scene node is a skinned mesh. //! the corresponding joint, if the mesh in this scene node is a skinned mesh.
virtual IBoneSceneNode* getJointNode(const c8* jointName) _IRR_OVERRIDE_; virtual IBoneSceneNode* getJointNode(const c8* jointName) IRR_OVERRIDE;
//! same as getJointNode(const c8* jointName), but based on id //! same as getJointNode(const c8* jointName), but based on id
virtual IBoneSceneNode* getJointNode(u32 jointID) _IRR_OVERRIDE_; virtual IBoneSceneNode* getJointNode(u32 jointID) IRR_OVERRIDE;
//! Gets joint count. //! Gets joint count.
virtual u32 getJointCount() const _IRR_OVERRIDE_; virtual u32 getJointCount() const IRR_OVERRIDE;
//! Removes a child from this scene node. //! Removes a child from this scene node.
//! Implemented here, to be able to remove the shadow properly, if there is one, //! Implemented here, to be able to remove the shadow properly, if there is one,
//! or to remove attached child. //! or to remove attached child.
virtual bool removeChild(ISceneNode* child) _IRR_OVERRIDE_; virtual bool removeChild(ISceneNode* child) IRR_OVERRIDE;
//! Starts a MD2 animation. //! Starts a MD2 animation.
virtual bool setMD2Animation(EMD2_ANIMATION_TYPE anim) _IRR_OVERRIDE_; virtual bool setMD2Animation(EMD2_ANIMATION_TYPE anim) IRR_OVERRIDE;
//! Starts a special MD2 animation. //! Starts a special MD2 animation.
virtual bool setMD2Animation(const c8* animationName) _IRR_OVERRIDE_; virtual bool setMD2Animation(const c8* animationName) IRR_OVERRIDE;
//! Returns the current displayed frame number. //! Returns the current displayed frame number.
virtual f32 getFrameNr() const _IRR_OVERRIDE_; virtual f32 getFrameNr() const IRR_OVERRIDE;
//! Returns the current start frame number. //! Returns the current start frame number.
virtual s32 getStartFrame() const _IRR_OVERRIDE_; virtual s32 getStartFrame() const IRR_OVERRIDE;
//! Returns the current end frame number. //! Returns the current end frame number.
virtual s32 getEndFrame() const _IRR_OVERRIDE_; virtual s32 getEndFrame() const IRR_OVERRIDE;
//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style. //! 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 /* In this way it is possible to change the materials a mesh causing all mesh scene nodes
referencing this mesh to change too. */ referencing this mesh to change too. */
virtual void setReadOnlyMaterials(bool readonly) _IRR_OVERRIDE_; virtual void setReadOnlyMaterials(bool readonly) IRR_OVERRIDE;
//! Returns if the scene node should not copy the materials of the mesh but use them in a read only style //! Returns if the scene node should not copy the materials of the mesh but use them in a read only style
virtual bool isReadOnlyMaterials() const _IRR_OVERRIDE_; virtual bool isReadOnlyMaterials() const IRR_OVERRIDE;
//! Sets a new mesh //! Sets a new mesh
virtual void setMesh(IAnimatedMesh* mesh) _IRR_OVERRIDE_; virtual void setMesh(IAnimatedMesh* mesh) IRR_OVERRIDE;
//! Returns the current mesh //! Returns the current mesh
virtual IAnimatedMesh* getMesh(void) _IRR_OVERRIDE_ { return Mesh; } virtual IAnimatedMesh* getMesh(void) IRR_OVERRIDE { return Mesh; }
//! Writes attributes of the scene node. //! Writes attributes of the scene node.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE;
//! Reads attributes of the scene node. //! Reads attributes of the scene node.
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE;
//! Returns type of the scene node //! Returns type of the scene node
virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_ANIMATED_MESH; } virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_ANIMATED_MESH; }
// returns the absolute transformation for a special MD3 Tag if the mesh is a md3 mesh, // returns the absolute transformation for a special MD3 Tag if the mesh is a md3 mesh,
// or the absolutetransformation if it's a normal scenenode // or the absolutetransformation if it's a normal scenenode
const SMD3QuaternionTag* getMD3TagTransformation( const core::stringc & tagname) _IRR_OVERRIDE_; const SMD3QuaternionTag* getMD3TagTransformation( const core::stringc & tagname) IRR_OVERRIDE;
//! updates the absolute position based on the relative and the parents position //! updates the absolute position based on the relative and the parents position
virtual void updateAbsolutePosition() _IRR_OVERRIDE_; virtual void updateAbsolutePosition() IRR_OVERRIDE;
//! Set the joint update mode (0-unused, 1-get joints only, 2-set joints only, 3-move and set) //! Set the joint update mode (0-unused, 1-get joints only, 2-set joints only, 3-move and set)
virtual void setJointMode(E_JOINT_UPDATE_ON_RENDER mode) _IRR_OVERRIDE_; virtual void setJointMode(E_JOINT_UPDATE_ON_RENDER mode) IRR_OVERRIDE;
//! Sets the transition time in seconds (note: This needs to enable joints, and setJointmode maybe set to 2) //! Sets the transition time in seconds (note: This needs to enable joints, and setJointmode maybe set to 2)
//! you must call animateJoints(), or the mesh will not animate //! you must call animateJoints(), or the mesh will not animate
virtual void setTransitionTime(f32 Time) _IRR_OVERRIDE_; virtual void setTransitionTime(f32 Time) IRR_OVERRIDE;
//! updates the joint positions of this mesh //! updates the joint positions of this mesh
virtual void animateJoints(bool CalculateAbsolutePositions=true) _IRR_OVERRIDE_; virtual void animateJoints(bool CalculateAbsolutePositions=true) IRR_OVERRIDE;
//! render mesh ignoring its transformation. Used with ragdolls. (culling is unaffected) //! render mesh ignoring its transformation. Used with ragdolls. (culling is unaffected)
virtual void setRenderFromIdentity( bool On ) _IRR_OVERRIDE_; virtual void setRenderFromIdentity( bool On ) IRR_OVERRIDE;
//! Creates a clone of this scene node and its children. //! Creates a clone of this scene node and its children.
/** \param newParent An optional new parent. /** \param newParent An optional new parent.
\param newManager An optional new scene manager. \param newManager An optional new scene manager.
\return The newly created clone of this node. */ \return The newly created clone of this node. */
virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) _IRR_OVERRIDE_; virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) IRR_OVERRIDE;
private: private:
@ -220,4 +220,3 @@ namespace scene
} // end namespace irr } // end namespace irr
#endif #endif

312
source/Irrlicht/CAttributeImpl.h
View File

File diff suppressed because it is too large Load Diff

281
source/Irrlicht/CAttributes.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_ATTRIBUTES_H_INCLUDED__ #ifndef IRR_C_ATTRIBUTES_H_INCLUDED
#define __C_ATTRIBUTES_H_INCLUDED__ #define IRR_C_ATTRIBUTES_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
@ -30,46 +30,46 @@ public:
~CAttributes(); ~CAttributes();
//! Returns amount of attributes in this collection of attributes. //! Returns amount of attributes in this collection of attributes.
virtual u32 getAttributeCount() const _IRR_OVERRIDE_; virtual u32 getAttributeCount() const IRR_OVERRIDE;
//! Returns attribute name by index. //! Returns attribute name by index.
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual const c8* getAttributeName(s32 index) const _IRR_OVERRIDE_; virtual const c8* getAttributeName(s32 index) const IRR_OVERRIDE;
//! Returns the type of an attribute //! Returns the type of an attribute
//! \param attributeName: Name for the attribute //! \param attributeName: Name for the attribute
virtual E_ATTRIBUTE_TYPE getAttributeType(const c8* attributeName) const _IRR_OVERRIDE_; virtual E_ATTRIBUTE_TYPE getAttributeType(const c8* attributeName) const IRR_OVERRIDE;
//! Returns attribute type by index. //! Returns attribute type by index.
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual E_ATTRIBUTE_TYPE getAttributeType(s32 index) const _IRR_OVERRIDE_; virtual E_ATTRIBUTE_TYPE getAttributeType(s32 index) const IRR_OVERRIDE;
//! Returns the type string of the attribute //! Returns the type string of the attribute
//! \param attributeName: String for the attribute type //! \param attributeName: String for the attribute type
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
virtual const wchar_t* getAttributeTypeString(const c8* attributeName, const wchar_t* defaultNotFound = L"unknown") const _IRR_OVERRIDE_; virtual const wchar_t* getAttributeTypeString(const c8* attributeName, const wchar_t* defaultNotFound = L"unknown") const IRR_OVERRIDE;
//! Returns the type string of the attribute by index. //! Returns the type string of the attribute by index.
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual const wchar_t* getAttributeTypeString(s32 index, const wchar_t* defaultNotFound = L"unknown") const _IRR_OVERRIDE_; virtual const wchar_t* getAttributeTypeString(s32 index, const wchar_t* defaultNotFound = L"unknown") const IRR_OVERRIDE;
//! Returns if an attribute with a name exists //! Returns if an attribute with a name exists
virtual bool existsAttribute(const c8* attributeName) const _IRR_OVERRIDE_; virtual bool existsAttribute(const c8* attributeName) const IRR_OVERRIDE;
//! Returns attribute index from name, -1 if not found //! Returns attribute index from name, -1 if not found
virtual s32 findAttribute(const c8* attributeName) const _IRR_OVERRIDE_; virtual s32 findAttribute(const c8* attributeName) const IRR_OVERRIDE;
//! Removes all attributes //! Removes all attributes
virtual void clear() _IRR_OVERRIDE_; virtual void clear() IRR_OVERRIDE;
//! Reads attributes from a xml file. //! Reads attributes from a xml file.
//! \param readCurrentElementOnly: If set to true, reading only works if current element has the name 'attributes'. //! \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. //! IF set to false, the first appearing list attributes are read.
virtual bool read(io::IXMLReader* reader, bool readCurrentElementOnly=false, virtual bool read(io::IXMLReader* reader, bool readCurrentElementOnly=false,
const wchar_t* nonDefaultElementName = 0) _IRR_OVERRIDE_; const wchar_t* nonDefaultElementName = 0) IRR_OVERRIDE;
//! Write these attributes into a xml file //! Write these attributes into a xml file
virtual bool write(io::IXMLWriter* writer, bool writeXMLHeader=false, const wchar_t* nonDefaultElementName=0) _IRR_OVERRIDE_; virtual bool write(io::IXMLWriter* writer, bool writeXMLHeader=false, const wchar_t* nonDefaultElementName=0) IRR_OVERRIDE;
/* /*
@ -79,23 +79,23 @@ public:
*/ */
//! Adds an attribute as integer //! Adds an attribute as integer
virtual void addInt(const c8* attributeName, s32 value) _IRR_OVERRIDE_; virtual void addInt(const c8* attributeName, s32 value) IRR_OVERRIDE;
//! Sets an attribute as integer value //! Sets an attribute as integer value
virtual void setAttribute(const c8* attributeName, s32 value) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, s32 value) IRR_OVERRIDE;
//! Gets an attribute as integer value //! Gets an attribute as integer value
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual s32 getAttributeAsInt(const c8* attributeName, irr::s32 defaultNotFound=0) const _IRR_OVERRIDE_; virtual s32 getAttributeAsInt(const c8* attributeName, irr::s32 defaultNotFound=0) const IRR_OVERRIDE;
//! Gets an attribute as integer value //! Gets an attribute as integer value
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual s32 getAttributeAsInt(s32 index) const _IRR_OVERRIDE_; virtual s32 getAttributeAsInt(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as integer value //! Sets an attribute as integer value
virtual void setAttribute(s32 index, s32 value) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, s32 value) IRR_OVERRIDE;
/* /*
@ -104,23 +104,23 @@ public:
*/ */
//! Adds an attribute as float //! Adds an attribute as float
virtual void addFloat(const c8* attributeName, f32 value) _IRR_OVERRIDE_; virtual void addFloat(const c8* attributeName, f32 value) IRR_OVERRIDE;
//! Sets a attribute as float value //! Sets a attribute as float value
virtual void setAttribute(const c8* attributeName, f32 value) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, f32 value) IRR_OVERRIDE;
//! Gets an attribute as float value //! Gets an attribute as float value
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual f32 getAttributeAsFloat(const c8* attributeName, irr::f32 defaultNotFound=0.f) const _IRR_OVERRIDE_; virtual f32 getAttributeAsFloat(const c8* attributeName, irr::f32 defaultNotFound=0.f) const IRR_OVERRIDE;
//! Gets an attribute as float value //! Gets an attribute as float value
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual f32 getAttributeAsFloat(s32 index) const _IRR_OVERRIDE_; virtual f32 getAttributeAsFloat(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as float value //! Sets an attribute as float value
virtual void setAttribute(s32 index, f32 value) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, f32 value) IRR_OVERRIDE;
/* /*
@ -129,62 +129,62 @@ public:
*/ */
//! Adds an attribute as string //! Adds an attribute as string
virtual void addString(const c8* attributeName, const c8* value) _IRR_OVERRIDE_; virtual void addString(const c8* attributeName, const c8* value) IRR_OVERRIDE;
//! Sets an attribute value as string. //! Sets an attribute value as string.
//! \param attributeName: Name for the attribute //! \param attributeName: Name for the attribute
//! \param value: Value for the attribute. Set this to 0 to delete the attribute //! \param value: Value for the attribute. Set this to 0 to delete the attribute
virtual void setAttribute(const c8* attributeName, const c8* value) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, const c8* value) IRR_OVERRIDE;
//! Gets an attribute as string. //! Gets an attribute as string.
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
//! or defaultNotFound if attribute is not set. //! or defaultNotFound if attribute is not set.
virtual core::stringc getAttributeAsString(const c8* attributeName, const core::stringc& defaultNotFound=core::stringc()) const _IRR_OVERRIDE_; virtual core::stringc getAttributeAsString(const c8* attributeName, const core::stringc& defaultNotFound=core::stringc()) const IRR_OVERRIDE;
//! Gets an attribute as string. //! Gets an attribute as string.
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param target: Buffer where the string is copied to. //! \param target: Buffer where the string is copied to.
virtual void getAttributeAsString(const c8* attributeName, c8* target) const _IRR_OVERRIDE_; virtual void getAttributeAsString(const c8* attributeName, c8* target) const IRR_OVERRIDE;
//! Returns attribute value as string by index. //! Returns attribute value as string by index.
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual core::stringc getAttributeAsString(s32 index) const _IRR_OVERRIDE_; virtual core::stringc getAttributeAsString(s32 index) const IRR_OVERRIDE;
//! Sets an attribute value as string. //! Sets an attribute value as string.
//! \param attributeName: Name for the attribute //! \param attributeName: Name for the attribute
virtual void setAttribute(s32 index, const c8* value) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, const c8* value) IRR_OVERRIDE;
// wide strings // wide strings
//! Adds an attribute as string //! Adds an attribute as string
virtual void addString(const c8* attributeName, const wchar_t* value) _IRR_OVERRIDE_; virtual void addString(const c8* attributeName, const wchar_t* value) IRR_OVERRIDE;
//! Sets an attribute value as string. //! Sets an attribute value as string.
//! \param attributeName: Name for the attribute //! \param attributeName: Name for the attribute
//! \param value: Value for the attribute. Set this to 0 to delete the attribute //! \param value: Value for the attribute. Set this to 0 to delete the attribute
virtual void setAttribute(const c8* attributeName, const wchar_t* value) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, const wchar_t* value) IRR_OVERRIDE;
//! Gets an attribute as string. //! Gets an attribute as string.
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
//! or defaultNotFound if attribute is not set. //! or defaultNotFound if attribute is not set.
virtual core::stringw getAttributeAsStringW(const c8* attributeName, const core::stringw& defaultNotFound = core::stringw()) const _IRR_OVERRIDE_; virtual core::stringw getAttributeAsStringW(const c8* attributeName, const core::stringw& defaultNotFound = core::stringw()) const IRR_OVERRIDE;
//! Gets an attribute as string. //! Gets an attribute as string.
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param target: Buffer where the string is copied to. //! \param target: Buffer where the string is copied to.
virtual void getAttributeAsStringW(const c8* attributeName, wchar_t* target) const _IRR_OVERRIDE_; virtual void getAttributeAsStringW(const c8* attributeName, wchar_t* target) const IRR_OVERRIDE;
//! Returns attribute value as string by index. //! Returns attribute value as string by index.
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual core::stringw getAttributeAsStringW(s32 index) const _IRR_OVERRIDE_; virtual core::stringw getAttributeAsStringW(s32 index) const IRR_OVERRIDE;
//! Sets an attribute value as string. //! Sets an attribute value as string.
//! \param attributeName: Name for the attribute //! \param attributeName: Name for the attribute
virtual void setAttribute(s32 index, const wchar_t* value) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, const wchar_t* value) IRR_OVERRIDE;
/* /*
@ -193,21 +193,21 @@ public:
*/ */
//! Adds an attribute as binary data //! Adds an attribute as binary data
virtual void addBinary(const c8* attributeName, void* data, s32 dataSizeInBytes) _IRR_OVERRIDE_; virtual void addBinary(const c8* attributeName, void* data, s32 dataSizeInBytes) IRR_OVERRIDE;
//! Sets an attribute as binary data //! Sets an attribute as binary data
virtual void setAttribute(const c8* attributeName, void* data, s32 dataSizeInBytes) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, void* data, s32 dataSizeInBytes) IRR_OVERRIDE;
//! Gets an attribute as binary data //! Gets an attribute as binary data
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
virtual void getAttributeAsBinaryData(const c8* attributeName, void* outData, s32 maxSizeInBytes) const _IRR_OVERRIDE_; virtual void getAttributeAsBinaryData(const c8* attributeName, void* outData, s32 maxSizeInBytes) const IRR_OVERRIDE;
//! Gets an attribute as binary data //! Gets an attribute as binary data
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual void getAttributeAsBinaryData(s32 index, void* outData, s32 maxSizeInBytes) const _IRR_OVERRIDE_; virtual void getAttributeAsBinaryData(s32 index, void* outData, s32 maxSizeInBytes) const IRR_OVERRIDE;
//! Sets an attribute as binary data //! Sets an attribute as binary data
virtual void setAttribute(s32 index, void* data, s32 dataSizeInBytes) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, void* data, s32 dataSizeInBytes) IRR_OVERRIDE;
/* /*
@ -217,26 +217,26 @@ public:
*/ */
//! Adds an attribute as wide string array //! Adds an attribute as wide string array
virtual void addArray(const c8* attributeName, const core::array<core::stringw>& value) _IRR_OVERRIDE_; virtual void addArray(const c8* attributeName, const core::array<core::stringw>& value) IRR_OVERRIDE;
//! Sets an attribute value as a wide string array. //! Sets an attribute value as a wide string array.
//! \param attributeName: Name for the attribute //! \param attributeName: Name for the attribute
//! \param value: Value for the attribute. Set this to 0 to delete the attribute //! \param value: Value for the attribute. Set this to 0 to delete the attribute
virtual void setAttribute(const c8* attributeName, const core::array<core::stringw>& value) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, const core::array<core::stringw>& value) IRR_OVERRIDE;
//! Gets an attribute as an array of wide strings. //! Gets an attribute as an array of wide strings.
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
//! or defaultNotFound if attribute is not set. //! or defaultNotFound if attribute is not set.
virtual core::array<core::stringw> getAttributeAsArray(const c8* attributeName, const core::array<core::stringw>& defaultNotFound = core::array<core::stringw>()) const _IRR_OVERRIDE_; virtual core::array<core::stringw> getAttributeAsArray(const c8* attributeName, const core::array<core::stringw>& defaultNotFound = core::array<core::stringw>()) const IRR_OVERRIDE;
//! Returns attribute value as an array of wide strings by index. //! Returns attribute value as an array of wide strings by index.
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual core::array<core::stringw> getAttributeAsArray(s32 index) const _IRR_OVERRIDE_; virtual core::array<core::stringw> getAttributeAsArray(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as an array of wide strings //! Sets an attribute as an array of wide strings
virtual void setAttribute(s32 index, const core::array<core::stringw>& value) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, const core::array<core::stringw>& value) IRR_OVERRIDE;
/* /*
@ -245,23 +245,23 @@ public:
*/ */
//! Adds an attribute as bool //! Adds an attribute as bool
virtual void addBool(const c8* attributeName, bool value) _IRR_OVERRIDE_; virtual void addBool(const c8* attributeName, bool value) IRR_OVERRIDE;
//! Sets an attribute as boolean value //! Sets an attribute as boolean value
virtual void setAttribute(const c8* attributeName, bool value) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, bool value) IRR_OVERRIDE;
//! Gets an attribute as boolean value //! Gets an attribute as boolean value
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual bool getAttributeAsBool(const c8* attributeName, bool defaultNotFound=false) const _IRR_OVERRIDE_; virtual bool getAttributeAsBool(const c8* attributeName, bool defaultNotFound=false) const IRR_OVERRIDE;
//! Gets an attribute as boolean value //! Gets an attribute as boolean value
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual bool getAttributeAsBool(s32 index) const _IRR_OVERRIDE_; virtual bool getAttributeAsBool(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as boolean value //! Sets an attribute as boolean value
virtual void setAttribute(s32 index, bool value) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, bool value) IRR_OVERRIDE;
/* /*
@ -270,19 +270,19 @@ public:
*/ */
//! Adds an attribute as enum //! Adds an attribute as enum
virtual void addEnum(const c8* attributeName, const c8* enumValue, const c8* const* enumerationLiterals) _IRR_OVERRIDE_; virtual void addEnum(const c8* attributeName, const c8* enumValue, const c8* const* enumerationLiterals) IRR_OVERRIDE;
//! Adds an attribute as enum //! Adds an attribute as enum
virtual void addEnum(const c8* attributeName, s32 enumValue, const c8* const* enumerationLiterals) _IRR_OVERRIDE_; virtual void addEnum(const c8* attributeName, s32 enumValue, const c8* const* enumerationLiterals) IRR_OVERRIDE;
//! Sets an attribute as enumeration //! Sets an attribute as enumeration
virtual void setAttribute(const c8* attributeName, const c8* enumValue, const c8* const* enumerationLiterals) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, const c8* enumValue, const c8* const* enumerationLiterals) IRR_OVERRIDE;
//! Gets an attribute as enumeration //! Gets an attribute as enumeration
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual const c8* getAttributeAsEnumeration(const c8* attributeName, const c8* defaultNotFound = 0) const _IRR_OVERRIDE_; virtual const c8* getAttributeAsEnumeration(const c8* attributeName, const c8* defaultNotFound = 0) const IRR_OVERRIDE;
//! Gets an attribute as enumeration //! Gets an attribute as enumeration
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
@ -290,26 +290,26 @@ public:
//! This is useful when the attribute list maybe was read from an xml file, and only contains the enumeration string, but //! This is useful when the attribute list maybe was read from an xml file, and only contains the enumeration string, but
//! no information about its index. //! no information about its index.
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual s32 getAttributeAsEnumeration(const c8* attributeName, const c8* const* enumerationLiteralsToUse, s32 defaultNotFound ) const _IRR_OVERRIDE_; virtual s32 getAttributeAsEnumeration(const c8* attributeName, const c8* const* enumerationLiteralsToUse, s32 defaultNotFound ) const IRR_OVERRIDE;
//! Gets an attribute as enumeration //! Gets an attribute as enumeration
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual s32 getAttributeAsEnumeration(s32 index, const c8* const* enumerationLiteralsToUse, s32 defaultNotFound) const _IRR_OVERRIDE_; virtual s32 getAttributeAsEnumeration(s32 index, const c8* const* enumerationLiteralsToUse, s32 defaultNotFound) const IRR_OVERRIDE;
//! Gets an attribute as enumeration //! Gets an attribute as enumeration
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual const c8* getAttributeAsEnumeration(s32 index) const _IRR_OVERRIDE_; virtual const c8* getAttributeAsEnumeration(s32 index) const IRR_OVERRIDE;
//! Gets the list of enumeration literals of an enumeration attribute //! Gets the list of enumeration literals of an enumeration attribute
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
virtual void getAttributeEnumerationLiteralsOfEnumeration(const c8* attributeName, core::array<core::stringc>& outLiterals) const _IRR_OVERRIDE_; virtual void getAttributeEnumerationLiteralsOfEnumeration(const c8* attributeName, core::array<core::stringc>& outLiterals) const IRR_OVERRIDE;
//! Gets the list of enumeration literals of an enumeration attribute //! Gets the list of enumeration literals of an enumeration attribute
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual void getAttributeEnumerationLiteralsOfEnumeration(s32 index, core::array<core::stringc>& outLiterals) const _IRR_OVERRIDE_; virtual void getAttributeEnumerationLiteralsOfEnumeration(s32 index, core::array<core::stringc>& outLiterals) const IRR_OVERRIDE;
//! Sets an attribute as enumeration //! Sets an attribute as enumeration
virtual void setAttribute(s32 index, const c8* enumValue, const c8* const* enumerationLiterals) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, const c8* enumValue, const c8* const* enumerationLiterals) IRR_OVERRIDE;
/* /*
@ -319,23 +319,23 @@ public:
*/ */
//! Adds an attribute as color //! Adds an attribute as color
virtual void addColor(const c8* attributeName, video::SColor value) _IRR_OVERRIDE_; virtual void addColor(const c8* attributeName, video::SColor value) IRR_OVERRIDE;
//! Sets a attribute as color //! Sets a attribute as color
virtual void setAttribute(const c8* attributeName, video::SColor color) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, video::SColor color) IRR_OVERRIDE;
//! Gets an attribute as color //! Gets an attribute as color
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual video::SColor getAttributeAsColor(const c8* attributeName, const video::SColor& defaultNotFound = video::SColor(0)) const _IRR_OVERRIDE_; virtual video::SColor getAttributeAsColor(const c8* attributeName, const video::SColor& defaultNotFound = video::SColor(0)) const IRR_OVERRIDE;
//! Gets an attribute as color //! Gets an attribute as color
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual video::SColor getAttributeAsColor(s32 index) const _IRR_OVERRIDE_; virtual video::SColor getAttributeAsColor(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as color //! Sets an attribute as color
virtual void setAttribute(s32 index, video::SColor color) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, video::SColor color) IRR_OVERRIDE;
/* /*
@ -344,23 +344,23 @@ public:
*/ */
//! Adds an attribute as floating point color //! Adds an attribute as floating point color
virtual void addColorf(const c8* attributeName, video::SColorf value) _IRR_OVERRIDE_; virtual void addColorf(const c8* attributeName, video::SColorf value) IRR_OVERRIDE;
//! Sets a attribute as floating point color //! Sets a attribute as floating point color
virtual void setAttribute(const c8* attributeName, video::SColorf color) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, video::SColorf color) IRR_OVERRIDE;
//! Gets an attribute as floating point color //! Gets an attribute as floating point color
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual video::SColorf getAttributeAsColorf(const c8* attributeName, const video::SColorf& defaultNotFound = video::SColorf(0)) const _IRR_OVERRIDE_; virtual video::SColorf getAttributeAsColorf(const c8* attributeName, const video::SColorf& defaultNotFound = video::SColorf(0)) const IRR_OVERRIDE;
//! Gets an attribute as floating point color //! Gets an attribute as floating point color
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual video::SColorf getAttributeAsColorf(s32 index) const _IRR_OVERRIDE_; virtual video::SColorf getAttributeAsColorf(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as floating point color //! Sets an attribute as floating point color
virtual void setAttribute(s32 index, video::SColorf color) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, video::SColorf color) IRR_OVERRIDE;
/* /*
@ -370,23 +370,23 @@ public:
*/ */
//! Adds an attribute as 3d vector //! Adds an attribute as 3d vector
virtual void addVector3d(const c8* attributeName, const core::vector3df& value) _IRR_OVERRIDE_; virtual void addVector3d(const c8* attributeName, const core::vector3df& value) IRR_OVERRIDE;
//! Sets a attribute as 3d vector //! Sets a attribute as 3d vector
virtual void setAttribute(const c8* attributeName, const core::vector3df& v) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, const core::vector3df& v) IRR_OVERRIDE;
//! Gets an attribute as 3d vector //! Gets an attribute as 3d vector
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual core::vector3df getAttributeAsVector3d(const c8* attributeName, const core::vector3df& defaultNotFound=core::vector3df(0,0,0)) const _IRR_OVERRIDE_; virtual core::vector3df getAttributeAsVector3d(const c8* attributeName, const core::vector3df& defaultNotFound=core::vector3df(0,0,0)) const IRR_OVERRIDE;
//! Gets an attribute as 3d vector //! Gets an attribute as 3d vector
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual core::vector3df getAttributeAsVector3d(s32 index) const _IRR_OVERRIDE_; virtual core::vector3df getAttributeAsVector3d(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as vector //! Sets an attribute as vector
virtual void setAttribute(s32 index, const core::vector3df& v) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, const core::vector3df& v) IRR_OVERRIDE;
/* /*
@ -396,23 +396,23 @@ public:
*/ */
//! Adds an attribute as 2d vector //! Adds an attribute as 2d vector
virtual void addVector2d(const c8* attributeName, const core::vector2df& value) _IRR_OVERRIDE_; virtual void addVector2d(const c8* attributeName, const core::vector2df& value) IRR_OVERRIDE;
//! Sets a attribute as 2d vector //! Sets a attribute as 2d vector
virtual void setAttribute(const c8* attributeName, const core::vector2df& v) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, const core::vector2df& v) IRR_OVERRIDE;
//! Gets an attribute as 2d vector //! Gets an attribute as 2d vector
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual core::vector2df getAttributeAsVector2d(const c8* attributeName, const core::vector2df& defaultNotFound=core::vector2df(0,0)) const _IRR_OVERRIDE_; virtual core::vector2df getAttributeAsVector2d(const c8* attributeName, const core::vector2df& defaultNotFound=core::vector2df(0,0)) const IRR_OVERRIDE;
//! Gets an attribute as 3d vector //! Gets an attribute as 3d vector
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual core::vector2df getAttributeAsVector2d(s32 index) const _IRR_OVERRIDE_; virtual core::vector2df getAttributeAsVector2d(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as vector //! Sets an attribute as vector
virtual void setAttribute(s32 index, const core::vector2df& v) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, const core::vector2df& v) IRR_OVERRIDE;
/* /*
@ -422,23 +422,23 @@ public:
*/ */
//! Adds an attribute as 2d position //! Adds an attribute as 2d position
virtual void addPosition2d(const c8* attributeName, const core::position2di& value) _IRR_OVERRIDE_; virtual void addPosition2d(const c8* attributeName, const core::position2di& value) IRR_OVERRIDE;
//! Sets a attribute as 2d position //! Sets a attribute as 2d position
virtual void setAttribute(const c8* attributeName, const core::position2di& v) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, const core::position2di& v) IRR_OVERRIDE;
//! Gets an attribute as position //! Gets an attribute as position
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual core::position2di getAttributeAsPosition2d(const c8* attributeName, const core::position2di& defaultNotFound=core::position2di(0,0)) const _IRR_OVERRIDE_; virtual core::position2di getAttributeAsPosition2d(const c8* attributeName, const core::position2di& defaultNotFound=core::position2di(0,0)) const IRR_OVERRIDE;
//! Gets an attribute as position //! Gets an attribute as position
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual core::position2di getAttributeAsPosition2d(s32 index) const _IRR_OVERRIDE_; virtual core::position2di getAttributeAsPosition2d(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as 2d position //! Sets an attribute as 2d position
virtual void setAttribute(s32 index, const core::position2di& v) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, const core::position2di& v) IRR_OVERRIDE;
/* /*
@ -447,23 +447,23 @@ public:
*/ */
//! Adds an attribute as rectangle //! Adds an attribute as rectangle
virtual void addRect(const c8* attributeName, const core::rect<s32>& value) _IRR_OVERRIDE_; virtual void addRect(const c8* attributeName, const core::rect<s32>& value) IRR_OVERRIDE;
//! Sets an attribute as rectangle //! Sets an attribute as rectangle
virtual void setAttribute(const c8* attributeName, const core::rect<s32>& v) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, const core::rect<s32>& v) IRR_OVERRIDE;
//! Gets an attribute as rectangle //! Gets an attribute as rectangle
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual core::rect<s32> getAttributeAsRect(const c8* attributeName, const core::rect<s32>& defaultNotFound = core::rect<s32>()) const _IRR_OVERRIDE_; virtual core::rect<s32> getAttributeAsRect(const c8* attributeName, const core::rect<s32>& defaultNotFound = core::rect<s32>()) const IRR_OVERRIDE;
//! Gets an attribute as rectangle //! Gets an attribute as rectangle
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual core::rect<s32> getAttributeAsRect(s32 index) const _IRR_OVERRIDE_; virtual core::rect<s32> getAttributeAsRect(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as rectangle //! Sets an attribute as rectangle
virtual void setAttribute(s32 index, const core::rect<s32>& v) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, const core::rect<s32>& v) IRR_OVERRIDE;
/* /*
@ -473,23 +473,23 @@ public:
*/ */
//! Adds an attribute as dimension2d //! Adds an attribute as dimension2d
virtual void addDimension2d(const c8* attributeName, const core::dimension2d<u32>& value) _IRR_OVERRIDE_; virtual void addDimension2d(const c8* attributeName, const core::dimension2d<u32>& value) IRR_OVERRIDE;
//! Sets an attribute as dimension2d //! Sets an attribute as dimension2d
virtual void setAttribute(const c8* attributeName, const core::dimension2d<u32>& v) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, const core::dimension2d<u32>& v) IRR_OVERRIDE;
//! Gets an attribute as dimension2d //! Gets an attribute as dimension2d
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual core::dimension2d<u32> getAttributeAsDimension2d(const c8* attributeName, const core::dimension2d<u32>& defaultNotFound = core::dimension2d<u32>()) const _IRR_OVERRIDE_; virtual core::dimension2d<u32> getAttributeAsDimension2d(const c8* attributeName, const core::dimension2d<u32>& defaultNotFound = core::dimension2d<u32>()) const IRR_OVERRIDE;
//! Gets an attribute as dimension2d //! Gets an attribute as dimension2d
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual core::dimension2d<u32> getAttributeAsDimension2d(s32 index) const _IRR_OVERRIDE_; virtual core::dimension2d<u32> getAttributeAsDimension2d(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as dimension2d //! Sets an attribute as dimension2d
virtual void setAttribute(s32 index, const core::dimension2d<u32>& v) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, const core::dimension2d<u32>& v) IRR_OVERRIDE;
/* /*
@ -499,23 +499,23 @@ public:
*/ */
//! Adds an attribute as matrix //! Adds an attribute as matrix
virtual void addMatrix(const c8* attributeName, const core::matrix4& v) _IRR_OVERRIDE_; virtual void addMatrix(const c8* attributeName, const core::matrix4& v) IRR_OVERRIDE;
//! Sets an attribute as matrix //! Sets an attribute as matrix
virtual void setAttribute(const c8* attributeName, const core::matrix4& v) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, const core::matrix4& v) IRR_OVERRIDE;
//! Gets an attribute as a matrix4 //! Gets an attribute as a matrix4
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual core::matrix4 getAttributeAsMatrix(const c8* attributeName, const core::matrix4& defaultNotFound=core::matrix4()) const _IRR_OVERRIDE_; virtual core::matrix4 getAttributeAsMatrix(const c8* attributeName, const core::matrix4& defaultNotFound=core::matrix4()) const IRR_OVERRIDE;
//! Gets an attribute as matrix //! Gets an attribute as matrix
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual core::matrix4 getAttributeAsMatrix(s32 index) const _IRR_OVERRIDE_; virtual core::matrix4 getAttributeAsMatrix(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as matrix //! Sets an attribute as matrix
virtual void setAttribute(s32 index, const core::matrix4& v) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, const core::matrix4& v) IRR_OVERRIDE;
/* /*
quaternion attribute quaternion attribute
@ -523,23 +523,23 @@ public:
*/ */
//! Adds an attribute as quaternion //! Adds an attribute as quaternion
virtual void addQuaternion(const c8* attributeName, const core::quaternion& v) _IRR_OVERRIDE_; virtual void addQuaternion(const c8* attributeName, const core::quaternion& v) IRR_OVERRIDE;
//! Sets an attribute as quaternion //! Sets an attribute as quaternion
virtual void setAttribute(const c8* attributeName, const core::quaternion& v) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, const core::quaternion& v) IRR_OVERRIDE;
//! Gets an attribute as a quaternion //! Gets an attribute as a quaternion
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual core::quaternion getAttributeAsQuaternion(const c8* attributeName, const core::quaternion& defaultNotFound=core::quaternion(0,1,0, 0)) const _IRR_OVERRIDE_; virtual core::quaternion getAttributeAsQuaternion(const c8* attributeName, const core::quaternion& defaultNotFound=core::quaternion(0,1,0, 0)) const IRR_OVERRIDE;
//! Gets an attribute as quaternion //! Gets an attribute as quaternion
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual core::quaternion getAttributeAsQuaternion(s32 index) const _IRR_OVERRIDE_; virtual core::quaternion getAttributeAsQuaternion(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as quaternion //! Sets an attribute as quaternion
virtual void setAttribute(s32 index, const core::quaternion& v) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, const core::quaternion& v) IRR_OVERRIDE;
/* /*
@ -548,23 +548,23 @@ public:
*/ */
//! Adds an attribute as axis aligned bounding box //! Adds an attribute as axis aligned bounding box
virtual void addBox3d(const c8* attributeName, const core::aabbox3df& v) _IRR_OVERRIDE_; virtual void addBox3d(const c8* attributeName, const core::aabbox3df& v) IRR_OVERRIDE;
//! Sets an attribute as axis aligned bounding box //! Sets an attribute as axis aligned bounding box
virtual void setAttribute(const c8* attributeName, const core::aabbox3df& v) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, const core::aabbox3df& v) IRR_OVERRIDE;
//! Gets an attribute as a axis aligned bounding box //! Gets an attribute as a axis aligned bounding box
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual core::aabbox3df getAttributeAsBox3d(const c8* attributeName, const core::aabbox3df& defaultNotFound=core::aabbox3df(0,0,0, 0,0,0)) const _IRR_OVERRIDE_; virtual core::aabbox3df getAttributeAsBox3d(const c8* attributeName, const core::aabbox3df& defaultNotFound=core::aabbox3df(0,0,0, 0,0,0)) const IRR_OVERRIDE;
//! Gets an attribute as axis aligned bounding box //! Gets an attribute as axis aligned bounding box
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual core::aabbox3df getAttributeAsBox3d(s32 index) const _IRR_OVERRIDE_; virtual core::aabbox3df getAttributeAsBox3d(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as axis aligned bounding box //! Sets an attribute as axis aligned bounding box
virtual void setAttribute(s32 index, const core::aabbox3df& v) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, const core::aabbox3df& v) IRR_OVERRIDE;
/* /*
@ -573,23 +573,23 @@ public:
*/ */
//! Adds an attribute as 3d plane //! Adds an attribute as 3d plane
virtual void addPlane3d(const c8* attributeName, const core::plane3df& v) _IRR_OVERRIDE_; virtual void addPlane3d(const c8* attributeName, const core::plane3df& v) IRR_OVERRIDE;
//! Sets an attribute as 3d plane //! Sets an attribute as 3d plane
virtual void setAttribute(const c8* attributeName, const core::plane3df& v) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, const core::plane3df& v) IRR_OVERRIDE;
//! Gets an attribute as a 3d plane //! Gets an attribute as a 3d plane
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual core::plane3df getAttributeAsPlane3d(const c8* attributeName, const core::plane3df& defaultNotFound=core::plane3df(0,0,0, 0,1,0)) const _IRR_OVERRIDE_; virtual core::plane3df getAttributeAsPlane3d(const c8* attributeName, const core::plane3df& defaultNotFound=core::plane3df(0,0,0, 0,1,0)) const IRR_OVERRIDE;
//! Gets an attribute as 3d plane //! Gets an attribute as 3d plane
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual core::plane3df getAttributeAsPlane3d(s32 index) const _IRR_OVERRIDE_; virtual core::plane3df getAttributeAsPlane3d(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as 3d plane //! Sets an attribute as 3d plane
virtual void setAttribute(s32 index, const core::plane3df& v) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, const core::plane3df& v) IRR_OVERRIDE;
/* /*
@ -599,23 +599,23 @@ public:
*/ */
//! Adds an attribute as 3d triangle //! Adds an attribute as 3d triangle
virtual void addTriangle3d(const c8* attributeName, const core::triangle3df& v) _IRR_OVERRIDE_; virtual void addTriangle3d(const c8* attributeName, const core::triangle3df& v) IRR_OVERRIDE;
//! Sets an attribute as 3d triangle //! Sets an attribute as 3d triangle
virtual void setAttribute(const c8* attributeName, const core::triangle3df& v) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, const core::triangle3df& v) IRR_OVERRIDE;
//! Gets an attribute as a 3d triangle //! Gets an attribute as a 3d triangle
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual core::triangle3df getAttributeAsTriangle3d(const c8* attributeName, const core::triangle3df& defaultNotFound = core::triangle3df(core::vector3df(0,0,0), core::vector3df(0,0,0), core::vector3df(0,0,0))) const _IRR_OVERRIDE_; virtual core::triangle3df getAttributeAsTriangle3d(const c8* attributeName, const core::triangle3df& defaultNotFound = core::triangle3df(core::vector3df(0,0,0), core::vector3df(0,0,0), core::vector3df(0,0,0))) const IRR_OVERRIDE;
//! Gets an attribute as 3d triangle //! Gets an attribute as 3d triangle
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual core::triangle3df getAttributeAsTriangle3d(s32 index) const _IRR_OVERRIDE_; virtual core::triangle3df getAttributeAsTriangle3d(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as 3d triangle //! Sets an attribute as 3d triangle
virtual void setAttribute(s32 index, const core::triangle3df& v) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, const core::triangle3df& v) IRR_OVERRIDE;
/* /*
@ -625,23 +625,23 @@ public:
*/ */
//! Adds an attribute as a 2d line //! Adds an attribute as a 2d line
virtual void addLine2d(const c8* attributeName, const core::line2df& v) _IRR_OVERRIDE_; virtual void addLine2d(const c8* attributeName, const core::line2df& v) IRR_OVERRIDE;
//! Sets an attribute as a 2d line //! Sets an attribute as a 2d line
virtual void setAttribute(const c8* attributeName, const core::line2df& v) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, const core::line2df& v) IRR_OVERRIDE;
//! Gets an attribute as a 2d line //! Gets an attribute as a 2d line
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual core::line2df getAttributeAsLine2d(const c8* attributeName, const core::line2df& defaultNotFound = core::line2df(0,0, 0,0)) const _IRR_OVERRIDE_; virtual core::line2df getAttributeAsLine2d(const c8* attributeName, const core::line2df& defaultNotFound = core::line2df(0,0, 0,0)) const IRR_OVERRIDE;
//! Gets an attribute as a 2d line //! Gets an attribute as a 2d line
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual core::line2df getAttributeAsLine2d(s32 index) const _IRR_OVERRIDE_; virtual core::line2df getAttributeAsLine2d(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as a 2d line //! Sets an attribute as a 2d line
virtual void setAttribute(s32 index, const core::line2df& v) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, const core::line2df& v) IRR_OVERRIDE;
/* /*
@ -651,23 +651,23 @@ public:
*/ */
//! Adds an attribute as a 3d line //! Adds an attribute as a 3d line
virtual void addLine3d(const c8* attributeName, const core::line3df& v) _IRR_OVERRIDE_; virtual void addLine3d(const c8* attributeName, const core::line3df& v) IRR_OVERRIDE;
//! Sets an attribute as a 3d line //! Sets an attribute as a 3d line
virtual void setAttribute(const c8* attributeName, const core::line3df& v) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, const core::line3df& v) IRR_OVERRIDE;
//! Gets an attribute as a 3d line //! Gets an attribute as a 3d line
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
//! \return Returns value of the attribute previously set by setAttribute() //! \return Returns value of the attribute previously set by setAttribute()
virtual core::line3df getAttributeAsLine3d(const c8* attributeName, const core::line3df& defaultNotFound=core::line3df(0,0,0, 0,0,0)) const _IRR_OVERRIDE_; virtual core::line3df getAttributeAsLine3d(const c8* attributeName, const core::line3df& defaultNotFound=core::line3df(0,0,0, 0,0,0)) const IRR_OVERRIDE;
//! Gets an attribute as a 3d line //! Gets an attribute as a 3d line
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual core::line3df getAttributeAsLine3d(s32 index) const _IRR_OVERRIDE_; virtual core::line3df getAttributeAsLine3d(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as a 3d line //! Sets an attribute as a 3d line
virtual void setAttribute(s32 index, const core::line3df& v) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, const core::line3df& v) IRR_OVERRIDE;
/* /*
@ -677,22 +677,22 @@ public:
*/ */
//! Adds an attribute as texture reference //! Adds an attribute as texture reference
virtual void addTexture(const c8* attributeName, video::ITexture* texture, const io::path& filename = "") _IRR_OVERRIDE_; virtual void addTexture(const c8* attributeName, video::ITexture* texture, const io::path& filename = "") IRR_OVERRIDE;
//! Sets an attribute as texture reference //! Sets an attribute as texture reference
virtual void setAttribute(const c8* attributeName, video::ITexture* texture, const io::path& filename = "") _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, video::ITexture* texture, const io::path& filename = "") IRR_OVERRIDE;
//! Gets an attribute as texture reference //! Gets an attribute as texture reference
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
virtual video::ITexture* getAttributeAsTexture(const c8* attributeName, video::ITexture* defaultNotFound=0) const _IRR_OVERRIDE_; virtual video::ITexture* getAttributeAsTexture(const c8* attributeName, video::ITexture* defaultNotFound=0) const IRR_OVERRIDE;
//! Gets an attribute as texture reference //! Gets an attribute as texture reference
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual video::ITexture* getAttributeAsTexture(s32 index) const _IRR_OVERRIDE_; virtual video::ITexture* getAttributeAsTexture(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as texture reference //! Sets an attribute as texture reference
virtual void setAttribute(s32 index, video::ITexture* texture, const io::path& filename = "") _IRR_OVERRIDE_; virtual void setAttribute(s32 index, video::ITexture* texture, const io::path& filename = "") IRR_OVERRIDE;
@ -703,22 +703,22 @@ public:
*/ */
//! Adds an attribute as user pointer //! Adds an attribute as user pointer
virtual void addUserPointer(const c8* attributeName, void* userPointer) _IRR_OVERRIDE_; virtual void addUserPointer(const c8* attributeName, void* userPointer) IRR_OVERRIDE;
//! Sets an attribute as user pointer //! Sets an attribute as user pointer
virtual void setAttribute(const c8* attributeName, void* userPointer) _IRR_OVERRIDE_; virtual void setAttribute(const c8* attributeName, void* userPointer) IRR_OVERRIDE;
//! Gets an attribute as user pointer //! Gets an attribute as user pointer
//! \param attributeName: Name of the attribute to get. //! \param attributeName: Name of the attribute to get.
//! \param defaultNotFound Value returned when attributeName was not found //! \param defaultNotFound Value returned when attributeName was not found
virtual void* getAttributeAsUserPointer(const c8* attributeName, void* defaultNotFound = 0) const _IRR_OVERRIDE_; virtual void* getAttributeAsUserPointer(const c8* attributeName, void* defaultNotFound = 0) const IRR_OVERRIDE;
//! Gets an attribute as user pointer //! Gets an attribute as user pointer
//! \param index: Index value, must be between 0 and getAttributeCount()-1. //! \param index: Index value, must be between 0 and getAttributeCount()-1.
virtual void* getAttributeAsUserPointer(s32 index) const _IRR_OVERRIDE_; virtual void* getAttributeAsUserPointer(s32 index) const IRR_OVERRIDE;
//! Sets an attribute as user pointer //! Sets an attribute as user pointer
virtual void setAttribute(s32 index, void* userPointer) _IRR_OVERRIDE_; virtual void setAttribute(s32 index, void* userPointer) IRR_OVERRIDE;
protected: protected:
@ -735,4 +735,3 @@ protected:
} // end namespace irr } // end namespace irr
#endif #endif

11
source/Irrlicht/CB3DMeshFileLoader.h
View File

@ -8,8 +8,8 @@
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifndef __C_B3D_MESH_LOADER_H_INCLUDED__ #ifndef IRR_C_B3D_MESH_LOADER_H_INCLUDED
#define __C_B3D_MESH_LOADER_H_INCLUDED__ #define IRR_C_B3D_MESH_LOADER_H_INCLUDED
#include "IMeshLoader.h" #include "IMeshLoader.h"
#include "ISceneManager.h" #include "ISceneManager.h"
@ -33,13 +33,13 @@ public:
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".bsp") //! based on the file extension (e.g. ".bsp")
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! creates/loads an animated mesh from the file. //! creates/loads an animated mesh from the file.
//! \return Pointer to the created mesh. Returns 0 if loading failed. //! \return Pointer to the created mesh. Returns 0 if loading failed.
//! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! If you no longer need the mesh, you should call IAnimatedMesh::drop().
//! See IReferenceCounted::drop() for more information. //! See IReferenceCounted::drop() for more information.
virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE;
private: private:
@ -87,5 +87,4 @@ private:
} // end namespace scene } // end namespace scene
} // end namespace irr } // end namespace irr
#endif // __C_B3D_MESH_LOADER_H_INCLUDED__ #endif // IRR_C_B3D_MESH_LOADER_H_INCLUDED

8
source/Irrlicht/CB3DMeshWriter.h
View File

@ -4,8 +4,8 @@
// Modified version with rigging/skinning support // Modified version with rigging/skinning support
#ifndef __IRR_B3D_MESH_WRITER_H_INCLUDED__ #ifndef IRR_B3D_MESH_WRITER_H_INCLUDED
#define __IRR_B3D_MESH_WRITER_H_INCLUDED__ #define IRR_B3D_MESH_WRITER_H_INCLUDED
#include "IMeshWriter.h" #include "IMeshWriter.h"
#include "IWriteFile.h" #include "IWriteFile.h"
@ -27,10 +27,10 @@ public:
CB3DMeshWriter(); CB3DMeshWriter();
//! Returns the type of the mesh writer //! Returns the type of the mesh writer
virtual EMESH_WRITER_TYPE getType() const _IRR_OVERRIDE_; virtual EMESH_WRITER_TYPE getType() const IRR_OVERRIDE;
//! writes a mesh //! writes a mesh
virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE) _IRR_OVERRIDE_; virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE) IRR_OVERRIDE;
private: private:
void writeJointChunk(io::IWriteFile* file, ISkinnedMesh* mesh , ISkinnedMesh::SJoint* joint, f32 animationSpeedMultiplier); void writeJointChunk(io::IWriteFile* file, ISkinnedMesh* mesh , ISkinnedMesh::SJoint* joint, f32 animationSpeedMultiplier);

9
source/Irrlicht/CBSPMeshFileLoader.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_BSP_MESH_FILE_LOADER_H_INCLUDED__ #ifndef IRR_C_BSP_MESH_FILE_LOADER_H_INCLUDED
#define __C_BSP_MESH_FILE_LOADER_H_INCLUDED__ #define IRR_C_BSP_MESH_FILE_LOADER_H_INCLUDED
#include "IMeshLoader.h" #include "IMeshLoader.h"
#include "IFileSystem.h" #include "IFileSystem.h"
@ -29,13 +29,13 @@ public:
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".bsp") //! based on the file extension (e.g. ".bsp")
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! creates/loads an animated mesh from the file. //! creates/loads an animated mesh from the file.
//! \return Pointer to the created mesh. Returns 0 if loading failed. //! \return Pointer to the created mesh. Returns 0 if loading failed.
//! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! If you no longer need the mesh, you should call IAnimatedMesh::drop().
//! See IReferenceCounted::drop() for more information. //! See IReferenceCounted::drop() for more information.
virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE;
private: private:
@ -49,4 +49,3 @@ private:
} // end namespace irr } // end namespace irr
#endif #endif

39
source/Irrlicht/CBillboardSceneNode.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_BILLBOARD_SCENE_NODE_H_INCLUDED__ #ifndef IRR_C_BILLBOARD_SCENE_NODE_H_INCLUDED
#define __C_BILLBOARD_SCENE_NODE_H_INCLUDED__ #define IRR_C_BILLBOARD_SCENE_NODE_H_INCLUDED
#include "IBillboardSceneNode.h" #include "IBillboardSceneNode.h"
#include "SMeshBuffer.h" #include "SMeshBuffer.h"
@ -28,61 +28,61 @@ public:
virtual ~CBillboardSceneNode(); virtual ~CBillboardSceneNode();
//! pre render event //! pre render event
virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; virtual void OnRegisterSceneNode() IRR_OVERRIDE;
//! render //! render
virtual void render() _IRR_OVERRIDE_; virtual void render() IRR_OVERRIDE;
//! returns the axis aligned bounding box of this node //! returns the axis aligned bounding box of this node
virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_; virtual const core::aabbox3d<f32>& getBoundingBox() const IRR_OVERRIDE;
//! sets the size of the billboard //! sets the size of the billboard
virtual void setSize(const core::dimension2d<f32>& size) _IRR_OVERRIDE_; virtual void setSize(const core::dimension2d<f32>& size) IRR_OVERRIDE;
//! Sets the widths of the top and bottom edges of the billboard independently. //! Sets the widths of the top and bottom edges of the billboard independently.
virtual void setSize(f32 height, f32 bottomEdgeWidth, f32 topEdgeWidth) _IRR_OVERRIDE_; virtual void setSize(f32 height, f32 bottomEdgeWidth, f32 topEdgeWidth) IRR_OVERRIDE;
//! gets the size of the billboard //! gets the size of the billboard
virtual const core::dimension2d<f32>& getSize() const _IRR_OVERRIDE_; virtual const core::dimension2d<f32>& getSize() const IRR_OVERRIDE;
//! Gets the widths of the top and bottom edges of the billboard. //! Gets the widths of the top and bottom edges of the billboard.
virtual void getSize(f32& height, f32& bottomEdgeWidth, f32& topEdgeWidth) const _IRR_OVERRIDE_; virtual void getSize(f32& height, f32& bottomEdgeWidth, f32& topEdgeWidth) const IRR_OVERRIDE;
virtual video::SMaterial& getMaterial(u32 i) _IRR_OVERRIDE_; virtual video::SMaterial& getMaterial(u32 i) IRR_OVERRIDE;
//! returns amount of materials used by this scene node. //! returns amount of materials used by this scene node.
virtual u32 getMaterialCount() const _IRR_OVERRIDE_; virtual u32 getMaterialCount() const IRR_OVERRIDE;
//! Set the color of all vertices of the billboard //! Set the color of all vertices of the billboard
//! \param overallColor: the color to set //! \param overallColor: the color to set
virtual void setColor(const video::SColor& overallColor) _IRR_OVERRIDE_; virtual void setColor(const video::SColor& overallColor) IRR_OVERRIDE;
//! Set the color of the top and bottom vertices of the billboard //! Set the color of the top and bottom vertices of the billboard
//! \param topColor: the color to set the top vertices //! \param topColor: the color to set the top vertices
//! \param bottomColor: the color to set the bottom vertices //! \param bottomColor: the color to set the bottom vertices
virtual void setColor(const video::SColor& topColor, virtual void setColor(const video::SColor& topColor,
const video::SColor& bottomColor) _IRR_OVERRIDE_; const video::SColor& bottomColor) IRR_OVERRIDE;
//! Gets the color of the top and bottom vertices of the billboard //! Gets the color of the top and bottom vertices of the billboard
//! \param[out] topColor: stores the color of the top vertices //! \param[out] topColor: stores the color of the top vertices
//! \param[out] bottomColor: stores the color of the bottom vertices //! \param[out] bottomColor: stores the color of the bottom vertices
virtual void getColor(video::SColor& topColor, virtual void getColor(video::SColor& topColor,
video::SColor& bottomColor) const _IRR_OVERRIDE_; video::SColor& bottomColor) const IRR_OVERRIDE;
//! Get the real boundingbox used by the billboard (which depends on the active camera) //! Get the real boundingbox used by the billboard (which depends on the active camera)
virtual const core::aabbox3d<f32>& getTransformedBillboardBoundingBox(const irr::scene::ICameraSceneNode* camera) _IRR_OVERRIDE_; virtual const core::aabbox3d<f32>& getTransformedBillboardBoundingBox(const irr::scene::ICameraSceneNode* camera) IRR_OVERRIDE;
//! Writes attributes of the scene node. //! Writes attributes of the scene node.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE;
//! Reads attributes of the scene node. //! Reads attributes of the scene node.
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE;
//! Returns type of the scene node //! Returns type of the scene node
virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_BILLBOARD; } virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_BILLBOARD; }
//! Creates a clone of this scene node and its children. //! Creates a clone of this scene node and its children.
virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) _IRR_OVERRIDE_; virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) IRR_OVERRIDE;
protected: protected:
void updateMesh(const irr::scene::ICameraSceneNode* camera); void updateMesh(const irr::scene::ICameraSceneNode* camera);
@ -109,4 +109,3 @@ private:
} // end namespace irr } // end namespace irr
#endif #endif

27
source/Irrlicht/CBoneSceneNode.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_BONE_SCENE_NODE_H_INCLUDED__ #ifndef IRR_C_BONE_SCENE_NODE_H_INCLUDED
#define __C_BONE_SCENE_NODE_H_INCLUDED__ #define IRR_C_BONE_SCENE_NODE_H_INCLUDED
// Used with SkinnedMesh and IAnimatedMeshSceneNode, for boned meshes // Used with SkinnedMesh and IAnimatedMeshSceneNode, for boned meshes
@ -23,39 +23,39 @@ namespace scene
s32 id=-1, u32 boneIndex=0, const c8* boneName=0); s32 id=-1, u32 boneIndex=0, const c8* boneName=0);
//! Returns the index of the bone //! Returns the index of the bone
virtual u32 getBoneIndex() const _IRR_OVERRIDE_; virtual u32 getBoneIndex() const IRR_OVERRIDE;
//! Sets the animation mode of the bone. Returns true if successful. //! Sets the animation mode of the bone. Returns true if successful.
virtual bool setAnimationMode(E_BONE_ANIMATION_MODE mode) _IRR_OVERRIDE_; virtual bool setAnimationMode(E_BONE_ANIMATION_MODE mode) IRR_OVERRIDE;
//! Gets the current animation mode of the bone //! Gets the current animation mode of the bone
virtual E_BONE_ANIMATION_MODE getAnimationMode() const _IRR_OVERRIDE_; virtual E_BONE_ANIMATION_MODE getAnimationMode() const IRR_OVERRIDE;
//! returns the axis aligned bounding box of this node //! returns the axis aligned bounding box of this node
virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_; virtual const core::aabbox3d<f32>& getBoundingBox() const IRR_OVERRIDE;
/* /*
//! Returns the relative transformation of the scene node. //! Returns the relative transformation of the scene node.
//virtual core::matrix4 getRelativeTransformation() const _IRR_OVERRIDE_; //virtual core::matrix4 getRelativeTransformation() const IRR_OVERRIDE;
*/ */
virtual void OnAnimate(u32 timeMs) _IRR_OVERRIDE_; virtual void OnAnimate(u32 timeMs) IRR_OVERRIDE;
virtual void updateAbsolutePositionOfAllChildren() _IRR_OVERRIDE_; virtual void updateAbsolutePositionOfAllChildren() IRR_OVERRIDE;
//! Writes attributes of the scene node. //! Writes attributes of the scene node.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE;
//! Reads attributes of the scene node. //! Reads attributes of the scene node.
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE;
//! How the relative transformation of the bone is used //! How the relative transformation of the bone is used
virtual void setSkinningSpace(E_BONE_SKINNING_SPACE space) _IRR_OVERRIDE_ virtual void setSkinningSpace(E_BONE_SKINNING_SPACE space) IRR_OVERRIDE
{ {
SkinningSpace=space; SkinningSpace=space;
} }
virtual E_BONE_SKINNING_SPACE getSkinningSpace() const _IRR_OVERRIDE_ virtual E_BONE_SKINNING_SPACE getSkinningSpace() const IRR_OVERRIDE
{ {
return SkinningSpace; return SkinningSpace;
} }
@ -76,4 +76,3 @@ namespace scene
} // end namespace irr } // end namespace irr
#endif #endif

4
source/Irrlicht/CBurningShader_Raster_Reference.cpp
View File

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

4
source/Irrlicht/CCSMLoader.h
View File

@ -59,10 +59,10 @@ namespace scene
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".bsp") //! based on the file extension (e.g. ".bsp")
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! creates/loads an animated mesh from the file. //! creates/loads an animated mesh from the file.
virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE;
private: private:

69
source/Irrlicht/CCameraSceneNode.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_CAMERA_SCENE_NODE_H_INCLUDED__ #ifndef IRR_C_CAMERA_SCENE_NODE_H_INCLUDED
#define __C_CAMERA_SCENE_NODE_H_INCLUDED__ #define IRR_C_CAMERA_SCENE_NODE_H_INCLUDED
#include "ICameraSceneNode.h" #include "ICameraSceneNode.h"
#include "SViewFrustum.h" #include "SViewFrustum.h"
@ -30,123 +30,123 @@ namespace scene
\param projection The new projection matrix of the camera. \param projection The new projection matrix of the camera.
\param isOrthogonal Set this to true if the matrix is an orthogonal one (e.g. \param isOrthogonal Set this to true if the matrix is an orthogonal one (e.g.
from matrix4::buildProjectionMatrixOrthoLH(). */ from matrix4::buildProjectionMatrixOrthoLH(). */
virtual void setProjectionMatrix(const core::matrix4& projection, bool isOrthogonal = false) _IRR_OVERRIDE_; virtual void setProjectionMatrix(const core::matrix4& projection, bool isOrthogonal = false) IRR_OVERRIDE;
//! Gets the current projection matrix of the camera //! Gets the current projection matrix of the camera
//! \return Returns the current projection matrix of the camera. //! \return Returns the current projection matrix of the camera.
virtual const core::matrix4& getProjectionMatrix() const _IRR_OVERRIDE_; virtual const core::matrix4& getProjectionMatrix() const IRR_OVERRIDE;
//! Gets the current view matrix of the camera //! Gets the current view matrix of the camera
//! \return Returns the current view matrix of the camera. //! \return Returns the current view matrix of the camera.
virtual const core::matrix4& getViewMatrix() const _IRR_OVERRIDE_; virtual const core::matrix4& getViewMatrix() const IRR_OVERRIDE;
//! Sets a custom view matrix affector. //! Sets a custom view matrix affector.
/** \param affector: The affector matrix. */ /** \param affector: The affector matrix. */
virtual void setViewMatrixAffector(const core::matrix4& affector) _IRR_OVERRIDE_; virtual void setViewMatrixAffector(const core::matrix4& affector) IRR_OVERRIDE;
//! Gets the custom view matrix affector. //! Gets the custom view matrix affector.
virtual const core::matrix4& getViewMatrixAffector() const _IRR_OVERRIDE_; virtual const core::matrix4& getViewMatrixAffector() const IRR_OVERRIDE;
//! It is possible to send mouse and key events to the camera. Most cameras //! It is possible to send mouse and key events to the camera. Most cameras
//! may ignore this input, but camera scene nodes which are created for //! may ignore this input, but camera scene nodes which are created for
//! example with scene::ISceneManager::addMayaCameraSceneNode or //! example with scene::ISceneManager::addMayaCameraSceneNode or
//! scene::ISceneManager::addMeshViewerCameraSceneNode, may want to get this input //! scene::ISceneManager::addMeshViewerCameraSceneNode, may want to get this input
//! for changing their position, look at target or whatever. //! for changing their position, look at target or whatever.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! Sets the look at target of the camera //! Sets the look at target of the camera
/** If the camera's target and rotation are bound ( @see bindTargetAndRotation() ) /** If the camera's target and rotation are bound ( @see bindTargetAndRotation() )
then calling this will also change the camera's scene node rotation to match the target. then calling this will also change the camera's scene node rotation to match the target.
\param pos: Look at target of the camera. */ \param pos: Look at target of the camera. */
virtual void setTarget(const core::vector3df& pos) _IRR_OVERRIDE_; virtual void setTarget(const core::vector3df& pos) IRR_OVERRIDE;
//! Sets the rotation of the node. //! Sets the rotation of the node.
/** This only modifies the relative rotation of the node. /** This only modifies the relative rotation of the node.
If the camera's target and rotation are bound ( @see bindTargetAndRotation() ) If the camera's target and rotation are bound ( @see bindTargetAndRotation() )
then calling this will also change the camera's target to match the rotation. then calling this will also change the camera's target to match the rotation.
\param rotation New rotation of the node in degrees. */ \param rotation New rotation of the node in degrees. */
virtual void setRotation(const core::vector3df& rotation) _IRR_OVERRIDE_; virtual void setRotation(const core::vector3df& rotation) IRR_OVERRIDE;
//! Gets the current look at target of the camera //! Gets the current look at target of the camera
/** \return The current look at target of the camera */ /** \return The current look at target of the camera */
virtual const core::vector3df& getTarget() const _IRR_OVERRIDE_; virtual const core::vector3df& getTarget() const IRR_OVERRIDE;
//! Sets the up vector of the camera. //! Sets the up vector of the camera.
//! \param pos: New upvector of the camera. //! \param pos: New upvector of the camera.
virtual void setUpVector(const core::vector3df& pos) _IRR_OVERRIDE_; virtual void setUpVector(const core::vector3df& pos) IRR_OVERRIDE;
//! Gets the up vector of the camera. //! Gets the up vector of the camera.
//! \return Returns the up vector of the camera. //! \return Returns the up vector of the camera.
virtual const core::vector3df& getUpVector() const _IRR_OVERRIDE_; virtual const core::vector3df& getUpVector() const IRR_OVERRIDE;
//! Gets distance from the camera to the near plane. //! Gets distance from the camera to the near plane.
//! \return Value of the near plane of the camera. //! \return Value of the near plane of the camera.
virtual f32 getNearValue() const _IRR_OVERRIDE_; virtual f32 getNearValue() const IRR_OVERRIDE;
//! Gets the distance from the camera to the far plane. //! Gets the distance from the camera to the far plane.
//! \return Value of the far plane of the camera. //! \return Value of the far plane of the camera.
virtual f32 getFarValue() const _IRR_OVERRIDE_; virtual f32 getFarValue() const IRR_OVERRIDE;
//! Get the aspect ratio of the camera. //! Get the aspect ratio of the camera.
//! \return The aspect ratio of the camera. //! \return The aspect ratio of the camera.
virtual f32 getAspectRatio() const _IRR_OVERRIDE_; virtual f32 getAspectRatio() const IRR_OVERRIDE;
//! Gets the field of view of the camera. //! Gets the field of view of the camera.
//! \return Field of view of the camera //! \return Field of view of the camera
virtual f32 getFOV() const _IRR_OVERRIDE_; virtual f32 getFOV() const IRR_OVERRIDE;
//! Sets the value of the near clipping plane. (default: 1.0f) //! Sets the value of the near clipping plane. (default: 1.0f)
virtual void setNearValue(f32 zn) _IRR_OVERRIDE_; virtual void setNearValue(f32 zn) IRR_OVERRIDE;
//! Sets the value of the far clipping plane (default: 2000.0f) //! Sets the value of the far clipping plane (default: 2000.0f)
virtual void setFarValue(f32 zf) _IRR_OVERRIDE_; virtual void setFarValue(f32 zf) IRR_OVERRIDE;
//! Sets the aspect ratio (default: 4.0f / 3.0f) //! Sets the aspect ratio (default: 4.0f / 3.0f)
virtual void setAspectRatio(f32 aspect) _IRR_OVERRIDE_; virtual void setAspectRatio(f32 aspect) IRR_OVERRIDE;
//! Sets the field of view (Default: PI / 3.5f) //! Sets the field of view (Default: PI / 3.5f)
virtual void setFOV(f32 fovy) _IRR_OVERRIDE_; virtual void setFOV(f32 fovy) IRR_OVERRIDE;
//! PreRender event //! PreRender event
virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; virtual void OnRegisterSceneNode() IRR_OVERRIDE;
//! Render //! Render
virtual void render() _IRR_OVERRIDE_; virtual void render() IRR_OVERRIDE;
//! Update //! Update
virtual void updateMatrices() _IRR_OVERRIDE_; virtual void updateMatrices() IRR_OVERRIDE;
//! Returns the axis aligned bounding box of this node //! Returns the axis aligned bounding box of this node
virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_; virtual const core::aabbox3d<f32>& getBoundingBox() const IRR_OVERRIDE;
//! Returns the view area. //! Returns the view area.
virtual const SViewFrustum* getViewFrustum() const _IRR_OVERRIDE_; virtual const SViewFrustum* getViewFrustum() const IRR_OVERRIDE;
//! Disables or enables the camera to get key or mouse inputs. //! Disables or enables the camera to get key or mouse inputs.
//! If this is set to true, the camera will respond to key inputs //! If this is set to true, the camera will respond to key inputs
//! otherwise not. //! otherwise not.
virtual void setInputReceiverEnabled(bool enabled) _IRR_OVERRIDE_; virtual void setInputReceiverEnabled(bool enabled) IRR_OVERRIDE;
//! Returns if the input receiver of the camera is currently enabled. //! Returns if the input receiver of the camera is currently enabled.
virtual bool isInputReceiverEnabled() const _IRR_OVERRIDE_; virtual bool isInputReceiverEnabled() const IRR_OVERRIDE;
//! Writes attributes of the scene node. //! Writes attributes of the scene node.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE;
//! Reads attributes of the scene node. //! Reads attributes of the scene node.
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE;
//! Returns type of the scene node //! Returns type of the scene node
virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_CAMERA; } virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_CAMERA; }
//! Binds the camera scene node's rotation to its target position and vice versa, or unbinds them. //! Binds the camera scene node's rotation to its target position and vice versa, or unbinds them.
virtual void bindTargetAndRotation(bool bound) _IRR_OVERRIDE_; virtual void bindTargetAndRotation(bool bound) IRR_OVERRIDE;
//! Queries if the camera scene node's rotation and its target position are bound together. //! Queries if the camera scene node's rotation and its target position are bound together.
virtual bool getTargetAndRotationBinding(void) const _IRR_OVERRIDE_; virtual bool getTargetAndRotationBinding(void) const IRR_OVERRIDE;
//! Creates a clone of this scene node and its children. //! Creates a clone of this scene node and its children.
virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) _IRR_OVERRIDE_; virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) IRR_OVERRIDE;
protected: protected:
@ -176,4 +176,3 @@ namespace scene
} // end namespace } // end namespace
#endif #endif

12
source/Irrlicht/CColladaFileLoader.cpp
View File

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

9
source/Irrlicht/CColladaFileLoader.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_COLLADA_MESH_FILE_LOADER_H_INCLUDED__ #ifndef IRR_C_COLLADA_MESH_FILE_LOADER_H_INCLUDED
#define __C_COLLADA_MESH_FILE_LOADER_H_INCLUDED__ #define IRR_C_COLLADA_MESH_FILE_LOADER_H_INCLUDED
#include "IMeshLoader.h" #include "IMeshLoader.h"
#include "IFileSystem.h" #include "IFileSystem.h"
@ -188,13 +188,13 @@ public:
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".cob") //! based on the file extension (e.g. ".cob")
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! creates/loads an animated mesh from the file. //! creates/loads an animated mesh from the file.
//! \return Pointer to the created mesh. Returns 0 if loading failed. //! \return Pointer to the created mesh. Returns 0 if loading failed.
//! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! If you no longer need the mesh, you should call IAnimatedMesh::drop().
//! See IReferenceCounted::drop() for more information. //! See IReferenceCounted::drop() for more information.
virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE;
private: private:
@ -407,4 +407,3 @@ public:
} // end namespace irr } // end namespace irr
#endif #endif

10
source/Irrlicht/CColladaMeshWriter.cpp
View File

@ -1267,13 +1267,13 @@ irr::core::stringc CColladaMeshWriter::pathToURI(const irr::io::path& path) cons
// is this a relative path? // is this a relative path?
if ( path.size() > 1 if ( path.size() > 1
&& path[0] != _IRR_TEXT('/') && path[0] != IRR_TEXT('/')
&& path[0] != _IRR_TEXT('\\') && path[0] != IRR_TEXT('\\')
&& path[1] != _IRR_TEXT(':') ) && path[1] != IRR_TEXT(':') )
{ {
// not already starting with "./" ? // not already starting with "./" ?
if ( path[0] != _IRR_TEXT('.') if ( path[0] != IRR_TEXT('.')
|| path[1] != _IRR_TEXT('/') ) || path[1] != IRR_TEXT('/') )
{ {
result.append("./"); result.append("./");
} }

42
source/Irrlicht/CColladaMeshWriter.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_C_COLLADA_MESH_WRITER_H_INCLUDED__ #ifndef IRR_C_COLLADA_MESH_WRITER_H_INCLUDED
#define __IRR_C_COLLADA_MESH_WRITER_H_INCLUDED__ #define IRR_C_COLLADA_MESH_WRITER_H_INCLUDED
#include "IColladaMeshWriter.h" #include "IColladaMeshWriter.h"
#include "S3DVertex.h" #include "S3DVertex.h"
@ -26,46 +26,46 @@ namespace scene
{ {
public: public:
//! Which lighting model should be used in the technique (FX) section when exporting effects (materials) //! Which lighting model should be used in the technique (FX) section when exporting effects (materials)
virtual irr::scene::E_COLLADA_TECHNIQUE_FX getTechniqueFx(const irr::video::SMaterial& material) const _IRR_OVERRIDE_; virtual irr::scene::E_COLLADA_TECHNIQUE_FX getTechniqueFx(const irr::video::SMaterial& material) const IRR_OVERRIDE;
//! Which texture index should be used when writing the texture of the given sampler color. //! Which texture index should be used when writing the texture of the given sampler color.
virtual irr::s32 getTextureIdx(const irr::video::SMaterial & material, irr::scene::E_COLLADA_COLOR_SAMPLER cs) const _IRR_OVERRIDE_; virtual irr::s32 getTextureIdx(const irr::video::SMaterial & material, irr::scene::E_COLLADA_COLOR_SAMPLER cs) const IRR_OVERRIDE;
//! Return which color from Irrlicht should be used for the color requested by collada //! Return which color from Irrlicht should be used for the color requested by collada
virtual irr::scene::E_COLLADA_IRR_COLOR getColorMapping(const irr::video::SMaterial & material, irr::scene::E_COLLADA_COLOR_SAMPLER cs) const _IRR_OVERRIDE_; virtual irr::scene::E_COLLADA_IRR_COLOR getColorMapping(const irr::video::SMaterial & material, irr::scene::E_COLLADA_COLOR_SAMPLER cs) const IRR_OVERRIDE;
//! Return custom colors for certain color types requested by collada. //! Return custom colors for certain color types requested by collada.
virtual irr::video::SColor getCustomColor(const irr::video::SMaterial & material, irr::scene::E_COLLADA_COLOR_SAMPLER cs) const _IRR_OVERRIDE_; virtual irr::video::SColor getCustomColor(const irr::video::SMaterial & material, irr::scene::E_COLLADA_COLOR_SAMPLER cs) const IRR_OVERRIDE;
//! Return the settings for transparence //! Return the settings for transparence
virtual irr::scene::E_COLLADA_TRANSPARENT_FX getTransparentFx(const irr::video::SMaterial& material) const _IRR_OVERRIDE_; virtual irr::scene::E_COLLADA_TRANSPARENT_FX getTransparentFx(const irr::video::SMaterial& material) const IRR_OVERRIDE;
//! Transparency value for that material. //! Transparency value for that material.
virtual irr::f32 getTransparency(const irr::video::SMaterial& material) const _IRR_OVERRIDE_; virtual irr::f32 getTransparency(const irr::video::SMaterial& material) const IRR_OVERRIDE;
//! Reflectivity value for that material //! Reflectivity value for that material
virtual irr::f32 getReflectivity(const irr::video::SMaterial& material) const _IRR_OVERRIDE_; virtual irr::f32 getReflectivity(const irr::video::SMaterial& material) const IRR_OVERRIDE;
//! Return index of refraction for that material //! Return index of refraction for that material
virtual irr::f32 getIndexOfRefraction(const irr::video::SMaterial& material) const _IRR_OVERRIDE_; virtual irr::f32 getIndexOfRefraction(const irr::video::SMaterial& material) const IRR_OVERRIDE;
//! Should node be used in scene export? By default all visible nodes are exported. //! Should node be used in scene export? By default all visible nodes are exported.
virtual bool isExportable(const irr::scene::ISceneNode * node) const _IRR_OVERRIDE_; virtual bool isExportable(const irr::scene::ISceneNode * node) const IRR_OVERRIDE;
//! Return the mesh for the given nod. If it has no mesh or shouldn't export it's mesh return 0. //! Return the mesh for the given nod. If it has no mesh or shouldn't export it's mesh return 0.
virtual irr::scene::IMesh* getMesh(irr::scene::ISceneNode * node) _IRR_OVERRIDE_; virtual irr::scene::IMesh* getMesh(irr::scene::ISceneNode * node) IRR_OVERRIDE;
//! Return if the node has it's own material overwriting the mesh-materials //! Return if the node has it's own material overwriting the mesh-materials
virtual bool useNodeMaterial(const scene::ISceneNode* node) const _IRR_OVERRIDE_; virtual bool useNodeMaterial(const scene::ISceneNode* node) const IRR_OVERRIDE;
}; };
class CColladaMeshWriterNames : public virtual IColladaMeshWriterNames class CColladaMeshWriterNames : public virtual IColladaMeshWriterNames
{ {
public: public:
CColladaMeshWriterNames(IColladaMeshWriter * writer); CColladaMeshWriterNames(IColladaMeshWriter * writer);
virtual irr::core::stringc nameForMesh(const scene::IMesh* mesh, int instance) _IRR_OVERRIDE_; virtual irr::core::stringc nameForMesh(const scene::IMesh* mesh, int instance) IRR_OVERRIDE;
virtual irr::core::stringc nameForNode(const scene::ISceneNode* node) _IRR_OVERRIDE_; virtual irr::core::stringc nameForNode(const scene::ISceneNode* node) IRR_OVERRIDE;
virtual irr::core::stringc nameForMaterial(const video::SMaterial & material, int materialId, const scene::IMesh* mesh, const scene::ISceneNode* node) _IRR_OVERRIDE_; virtual irr::core::stringc nameForMaterial(const video::SMaterial & material, int materialId, const scene::IMesh* mesh, const scene::ISceneNode* node) IRR_OVERRIDE;
protected: protected:
irr::core::stringc nameForPtr(const void* ptr) const; irr::core::stringc nameForPtr(const void* ptr) const;
private: private:
@ -85,19 +85,19 @@ public:
virtual ~CColladaMeshWriter(); virtual ~CColladaMeshWriter();
//! Returns the type of the mesh writer //! Returns the type of the mesh writer
virtual EMESH_WRITER_TYPE getType() const _IRR_OVERRIDE_; virtual EMESH_WRITER_TYPE getType() const IRR_OVERRIDE;
//! writes a scene starting with the given node //! writes a scene starting with the given node
virtual bool writeScene(io::IWriteFile* file, scene::ISceneNode* root, int writeRoot) _IRR_OVERRIDE_; virtual bool writeScene(io::IWriteFile* file, scene::ISceneNode* root, int writeRoot) IRR_OVERRIDE;
//! writes a mesh //! writes a mesh
virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE) _IRR_OVERRIDE_; virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE) IRR_OVERRIDE;
// Restrict the characters of oldString a set of allowed characters in xs:NCName and add the prefix. // Restrict the characters of oldString a set of allowed characters in xs:NCName and add the prefix.
virtual irr::core::stringc toNCName(const irr::core::stringc& oldString, const irr::core::stringc& prefix=irr::core::stringc("_NC_")) const _IRR_OVERRIDE_; virtual irr::core::stringc toNCName(const irr::core::stringc& oldString, const irr::core::stringc& prefix=irr::core::stringc("_NC_")) const IRR_OVERRIDE;
//! After export you can find out which name had been used for writing the geometry for this node. //! After export you can find out which name had been used for writing the geometry for this node.
virtual const irr::core::stringc* findGeometryNameForNode(ISceneNode* node) _IRR_OVERRIDE_; virtual const irr::core::stringc* findGeometryNameForNode(ISceneNode* node) IRR_OVERRIDE;
protected: protected:

5
source/Irrlicht/CColorConverter.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_COLOR_CONVERTER_H_INCLUDED__ #ifndef IRR_C_COLOR_CONVERTER_H_INCLUDED
#define __C_COLOR_CONVERTER_H_INCLUDED__ #define IRR_C_COLOR_CONVERTER_H_INCLUDED
#include "irrTypes.h" #include "irrTypes.h"
#include "IImage.h" #include "IImage.h"
@ -98,4 +98,3 @@ public:
} // end namespace irr } // end namespace irr
#endif #endif

35
source/Irrlicht/CCubeSceneNode.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_CUBE_SCENE_NODE_H_INCLUDED__ #ifndef IRR_C_CUBE_SCENE_NODE_H_INCLUDED
#define __C_CUBE_SCENE_NODE_H_INCLUDED__ #define IRR_C_CUBE_SCENE_NODE_H_INCLUDED
#include "IMeshSceneNode.h" #include "IMeshSceneNode.h"
#include "SMesh.h" #include "SMesh.h"
@ -24,59 +24,59 @@ namespace scene
virtual ~CCubeSceneNode(); virtual ~CCubeSceneNode();
virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; virtual void OnRegisterSceneNode() IRR_OVERRIDE;
//! renders the node. //! renders the node.
virtual void render() _IRR_OVERRIDE_; virtual void render() IRR_OVERRIDE;
//! returns the axis aligned bounding box of this node //! returns the axis aligned bounding box of this node
virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_; virtual const core::aabbox3d<f32>& getBoundingBox() const IRR_OVERRIDE;
//! returns the material based on the zero based index i. To get the amount //! returns the material based on the zero based index i. To get the amount
//! of materials used by this scene node, use getMaterialCount(). //! of materials used by this scene node, use getMaterialCount().
//! This function is needed for inserting the node into the scene hierarchy on a //! This function is needed for inserting the node into the scene hierarchy on a
//! optimal position for minimizing renderstate changes, but can also be used //! optimal position for minimizing renderstate changes, but can also be used
//! to directly modify the material of a scene node. //! to directly modify the material of a scene node.
virtual video::SMaterial& getMaterial(u32 i) _IRR_OVERRIDE_; virtual video::SMaterial& getMaterial(u32 i) IRR_OVERRIDE;
//! returns amount of materials used by this scene node. //! returns amount of materials used by this scene node.
virtual u32 getMaterialCount() const _IRR_OVERRIDE_; virtual u32 getMaterialCount() const IRR_OVERRIDE;
//! Returns type of the scene node //! Returns type of the scene node
virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_CUBE; } virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_CUBE; }
//! Creates shadow volume scene node as child of this node //! Creates shadow volume scene node as child of this node
//! and returns a pointer to it. //! and returns a pointer to it.
virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh, virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh,
s32 id, bool zfailmethod=true, f32 infinity=10000.0f) _IRR_OVERRIDE_; s32 id, bool zfailmethod=true, f32 infinity=10000.0f) IRR_OVERRIDE;
//! Writes attributes of the scene node. //! Writes attributes of the scene node.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE;
//! Reads attributes of the scene node. //! Reads attributes of the scene node.
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE;
//! Creates a clone of this scene node and its children. //! Creates a clone of this scene node and its children.
virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) _IRR_OVERRIDE_; virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) IRR_OVERRIDE;
//! Sets a new mesh to display //! Sets a new mesh to display
virtual void setMesh(IMesh* mesh) _IRR_OVERRIDE_ {} virtual void setMesh(IMesh* mesh) IRR_OVERRIDE {}
//! Returns the current mesh //! Returns the current mesh
virtual IMesh* getMesh(void) _IRR_OVERRIDE_ { return Mesh; } virtual IMesh* getMesh(void) IRR_OVERRIDE { return Mesh; }
//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style. //! 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 /* In this way it is possible to change the materials a mesh causing all mesh scene nodes
referencing this mesh to change too. */ referencing this mesh to change too. */
virtual void setReadOnlyMaterials(bool readonly) _IRR_OVERRIDE_ {} virtual void setReadOnlyMaterials(bool readonly) IRR_OVERRIDE {}
//! Returns if the scene node should not copy the materials of the mesh but use them in a read only style //! Returns if the scene node should not copy the materials of the mesh but use them in a read only style
virtual bool isReadOnlyMaterials() const _IRR_OVERRIDE_ { return false; } virtual bool isReadOnlyMaterials() const IRR_OVERRIDE { return false; }
//! Removes a child from this scene node. //! Removes a child from this scene node.
//! Implemented here, to be able to remove the shadow properly, if there is one, //! Implemented here, to be able to remove the shadow properly, if there is one,
//! or to remove attached child. //! or to remove attached child.
virtual bool removeChild(ISceneNode* child) _IRR_OVERRIDE_; virtual bool removeChild(ISceneNode* child) IRR_OVERRIDE;
private: private:
void setSize(); void setSize();
@ -90,4 +90,3 @@ namespace scene
} // end namespace irr } // end namespace irr
#endif #endif

2
source/Irrlicht/CD3D9Driver.cpp
View File

@ -2,7 +2,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#define _IRR_DONT_DO_MEMORY_DEBUGGING_HERE #define IRR_DONT_DO_MEMORY_DEBUGGING_HERE
#include "CD3D9Driver.h" #include "CD3D9Driver.h"
#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_ #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_

146
source/Irrlicht/CD3D9Driver.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_VIDEO_DIRECTX_9_H_INCLUDED__ #ifndef IRR_C_VIDEO_DIRECTX_9_H_INCLUDED
#define __C_VIDEO_DIRECTX_9_H_INCLUDED__ #define IRR_C_VIDEO_DIRECTX_9_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
@ -45,24 +45,24 @@ namespace video
virtual ~CD3D9Driver(); virtual ~CD3D9Driver();
virtual bool beginScene(u16 clearFlag, SColor clearColor = SColor(255,0,0,0), f32 clearDepth = 1.f, u8 clearStencil = 0, 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;
//! queries the features of the driver, returns true if feature is available //! 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;
//! sets transformation //! 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;
//! sets a material //! sets a material
virtual void setMaterial(const SMaterial& material) _IRR_OVERRIDE_; virtual void setMaterial(const SMaterial& material) IRR_OVERRIDE;
virtual bool setRenderTargetEx(IRenderTarget* target, u16 clearFlag, SColor clearColor = SColor(255,0,0,0), 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;
//! sets a viewport //! sets a viewport
virtual void setViewPort(const core::rect<s32>& area) _IRR_OVERRIDE_; virtual void setViewPort(const core::rect<s32>& area) IRR_OVERRIDE;
struct SHWBufferLink_d3d9 : public SHWBufferLink struct SHWBufferLink_d3d9 : public SHWBufferLink
{ {
@ -82,65 +82,65 @@ namespace video
bool updateIndexHardwareBuffer(SHWBufferLink_d3d9 *HWBuffer); bool updateIndexHardwareBuffer(SHWBufferLink_d3d9 *HWBuffer);
//! updates hardware buffer if needed //! updates hardware buffer if needed
virtual bool updateHardwareBuffer(SHWBufferLink *HWBuffer) _IRR_OVERRIDE_; virtual bool updateHardwareBuffer(SHWBufferLink *HWBuffer) IRR_OVERRIDE;
//! Create hardware buffer from mesh //! Create hardware buffer from mesh
virtual SHWBufferLink *createHardwareBuffer(const scene::IMeshBuffer* mb) _IRR_OVERRIDE_; virtual SHWBufferLink *createHardwareBuffer(const scene::IMeshBuffer* mb) IRR_OVERRIDE;
//! Delete hardware buffer (only some drivers can) //! Delete hardware buffer (only some drivers can)
virtual void deleteHardwareBuffer(SHWBufferLink *HWBuffer) _IRR_OVERRIDE_; virtual void deleteHardwareBuffer(SHWBufferLink *HWBuffer) IRR_OVERRIDE;
//! Draw hardware buffer //! Draw hardware buffer
virtual void drawHardwareBuffer(SHWBufferLink *HWBuffer) _IRR_OVERRIDE_; virtual void drawHardwareBuffer(SHWBufferLink *HWBuffer) IRR_OVERRIDE;
//! Create occlusion query. //! Create occlusion query.
/** Use node for identification and mesh for occlusion test. */ /** Use node for identification and mesh for occlusion test. */
virtual void addOcclusionQuery(scene::ISceneNode* node, virtual void addOcclusionQuery(scene::ISceneNode* node,
const scene::IMesh* mesh=0) _IRR_OVERRIDE_; const scene::IMesh* mesh=0) IRR_OVERRIDE;
//! Remove occlusion query. //! Remove occlusion query.
virtual void removeOcclusionQuery(scene::ISceneNode* node) _IRR_OVERRIDE_; virtual void removeOcclusionQuery(scene::ISceneNode* node) IRR_OVERRIDE;
//! Run occlusion query. Draws mesh stored in query. //! Run occlusion query. Draws mesh stored in query.
/** If the mesh shall not be rendered visible, use /** If the mesh shall not be rendered visible, use
overrideMaterial to disable the color and depth buffer. */ 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;
//! Update occlusion query. Retrieves results from GPU. //! Update occlusion query. Retrieves results from GPU.
/** If the query shall not block, set the flag to false. /** If the query shall not block, set the flag to false.
Update might not occur in this case, though */ 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;
//! Return query result. //! Return query result.
/** Return value is the number of visible pixels/fragments. /** Return value is the number of visible pixels/fragments.
The value is a safe approximation, i.e. can be larger then the The value is a safe approximation, i.e. can be larger then the
actual value of pixels. */ 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. //! Create render target.
virtual IRenderTarget* addRenderTarget() _IRR_OVERRIDE_; virtual IRenderTarget* addRenderTarget() IRR_OVERRIDE;
//! draws a vertex primitive list //! draws a vertex primitive list
virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount, virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
const void* indexList, u32 primitiveCount, const void* indexList, u32 primitiveCount,
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType,
E_INDEX_TYPE iType) _IRR_OVERRIDE_; E_INDEX_TYPE iType) IRR_OVERRIDE;
//! draws a vertex primitive list in 2d //! draws a vertex primitive list in 2d
virtual void draw2DVertexPrimitiveList(const void* vertices, u32 vertexCount, virtual void draw2DVertexPrimitiveList(const void* vertices, u32 vertexCount,
const void* indexList, u32 primitiveCount, const void* indexList, u32 primitiveCount,
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType,
E_INDEX_TYPE iType) _IRR_OVERRIDE_; 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. //! 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, virtual void draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos,
const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0, 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. //! Draws a part of the texture into the rectangle.
virtual void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect, virtual void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect,
const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0, 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 set of 2d images, using a color and the alpha channel of the texture. //! Draws a set of 2d images, using a color and the alpha channel of the texture.
virtual void draw2DImageBatch(const video::ITexture* texture, virtual void draw2DImageBatch(const video::ITexture* texture,
@ -148,163 +148,163 @@ namespace video
const core::array<core::rect<s32> >& sourceRects, const core::array<core::rect<s32> >& sourceRects,
const core::rect<s32>* clipRect=0, const core::rect<s32>* clipRect=0,
SColor color=SColor(255,255,255,255), SColor color=SColor(255,255,255,255),
bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_; bool useAlphaChannelOfTexture=false) IRR_OVERRIDE;
//!Draws an 2d rectangle with a gradient. //!Draws an 2d rectangle with a gradient.
virtual void draw2DRectangle(const core::rect<s32>& pos, virtual void draw2DRectangle(const core::rect<s32>& pos,
SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown, SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
const core::rect<s32>* clip) _IRR_OVERRIDE_; const core::rect<s32>* clip) IRR_OVERRIDE;
//! Draws a 2d line. //! Draws a 2d line.
virtual void draw2DLine(const core::position2d<s32>& start, virtual void draw2DLine(const core::position2d<s32>& start,
const core::position2d<s32>& end, 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. //! 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 3d line. //! Draws a 3d line.
virtual void draw3DLine(const core::vector3df& start, 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 box. //! Draws a 3d box.
virtual void draw3DBox( const core::aabbox3d<f32>& box, SColor color = SColor(255,255,255,255 ) ) _IRR_OVERRIDE_; virtual void draw3DBox( const core::aabbox3d<f32>& box, SColor color = SColor(255,255,255,255 ) ) IRR_OVERRIDE;
//! initialises the Direct3D API //! initialises the Direct3D API
bool initDriver(HWND hwnd, bool pureSoftware); bool initDriver(HWND hwnd, bool pureSoftware);
//! \return Returns the name of the video driver. Example: In case of the DIRECT3D8 //! \return Returns the name of the video driver. Example: In case of the DIRECT3D8
//! driver, it would return "Direct3D8.1". //! driver, it would return "Direct3D8.1".
virtual const wchar_t* getName() const _IRR_OVERRIDE_; virtual const wchar_t* getName() const IRR_OVERRIDE;
//! deletes all dynamic lights there are //! 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 //! adds a dynamic light, returning an index to the light
//! \param light: the light data to use to create 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 //! \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 //! Turns a dynamic light on or off
//! \param lightIndex: the index returned by addDynamicLight //! \param lightIndex: the index returned by addDynamicLight
//! \param turnOn: true to turn the light on, false to turn it off //! \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 //! returns the maximal amount of dynamic lights the device can handle
virtual u32 getMaximalDynamicLightAmount() const _IRR_OVERRIDE_; virtual u32 getMaximalDynamicLightAmount() const IRR_OVERRIDE;
//! Sets the dynamic ambient light color. The default color is //! Sets the dynamic ambient light color. The default color is
//! (0,0,0,0) which means it is dark. //! (0,0,0,0) which means it is dark.
//! \param color: New color of the ambient light. //! \param color: New color of the ambient light.
virtual void setAmbientLight(const SColorf& color) _IRR_OVERRIDE_; virtual void setAmbientLight(const SColorf& color) IRR_OVERRIDE;
//! Draws a shadow volume into the stencil buffer. //! Draws a shadow volume into the stencil buffer.
virtual void drawStencilShadowVolume(const core::array<core::vector3df>& triangles, bool zfail=true, u32 debugDataVisible=0) _IRR_OVERRIDE_; virtual void drawStencilShadowVolume(const core::array<core::vector3df>& triangles, bool zfail=true, u32 debugDataVisible=0) IRR_OVERRIDE;
//! Fills the stencil shadow with color. //! Fills the stencil shadow with color.
virtual void drawStencilShadow(bool clearStencilBuffer=false, virtual void drawStencilShadow(bool clearStencilBuffer=false,
video::SColor leftUpEdge = video::SColor(0,0,0,0), video::SColor leftUpEdge = video::SColor(0,0,0,0),
video::SColor rightUpEdge = 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 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 the maximum amount of primitives (mostly vertices) which //! Returns the maximum amount of primitives (mostly vertices) which
//! the device is able to render with one drawIndexedTriangleList //! the device is able to render with one drawIndexedTriangleList
//! call. //! call.
virtual u32 getMaximalPrimitiveCount() const _IRR_OVERRIDE_; virtual u32 getMaximalPrimitiveCount() const IRR_OVERRIDE;
//! Sets the fog mode. //! Sets the fog mode.
virtual void setFog(SColor color, E_FOG_TYPE fogType, f32 start, virtual void setFog(SColor color, E_FOG_TYPE fogType, f32 start,
f32 end, f32 density, bool pixelFog, bool rangeFog) _IRR_OVERRIDE_; f32 end, f32 density, bool pixelFog, bool rangeFog) IRR_OVERRIDE;
//! Only used by the internal engine. Used to notify the driver that //! Only used by the internal engine. Used to notify the driver that
//! the window was resized. //! the window was resized.
virtual void OnResize(const core::dimension2d<u32>& size) _IRR_OVERRIDE_; virtual void OnResize(const core::dimension2d<u32>& size) IRR_OVERRIDE;
//! Can be called by an IMaterialRenderer to make its work easier. //! Can be called by an IMaterialRenderer to make its work easier.
virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates) _IRR_OVERRIDE_; bool resetAllRenderstates) IRR_OVERRIDE;
//! Returns type of video driver //! 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 //! 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;
//! Get a vertex shader constant index. //! Get a vertex shader constant index.
virtual s32 getVertexShaderConstantID(const c8* name) _IRR_OVERRIDE_; virtual s32 getVertexShaderConstantID(const c8* name) IRR_OVERRIDE;
//! Get a pixel shader constant index. //! Get a pixel shader constant index.
virtual s32 getPixelShaderConstantID(const c8* name) _IRR_OVERRIDE_; virtual s32 getPixelShaderConstantID(const c8* name) IRR_OVERRIDE;
//! Sets a vertex shader constant. //! Sets a vertex shader constant.
virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) _IRR_OVERRIDE_; virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) IRR_OVERRIDE;
//! Sets a pixel shader constant. //! Sets a pixel shader constant.
virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) _IRR_OVERRIDE_; virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) IRR_OVERRIDE;
//! Sets a constant for the vertex shader based on an index. //! Sets a constant for the vertex shader based on an index.
virtual bool setVertexShaderConstant(s32 index, const f32* floats, int count) _IRR_OVERRIDE_; virtual bool setVertexShaderConstant(s32 index, const f32* floats, int count) IRR_OVERRIDE;
//! Int interface for the above. //! Int interface for the above.
virtual bool setVertexShaderConstant(s32 index, const s32* ints, int count) _IRR_OVERRIDE_; virtual bool setVertexShaderConstant(s32 index, const s32* ints, int count) IRR_OVERRIDE;
//! Uint interface for the above. //! Uint interface for the above.
virtual bool setVertexShaderConstant(s32 index, const u32* ints, int count) _IRR_OVERRIDE_; virtual bool setVertexShaderConstant(s32 index, const u32* ints, int count) IRR_OVERRIDE;
//! Sets a constant for the pixel shader based on an index. //! Sets a constant for the pixel shader based on an index.
virtual bool setPixelShaderConstant(s32 index, const f32* floats, int count) _IRR_OVERRIDE_; virtual bool setPixelShaderConstant(s32 index, const f32* floats, int count) IRR_OVERRIDE;
//! Int interface for the above. //! Int interface for the above.
virtual bool setPixelShaderConstant(s32 index, const s32* ints, int count) _IRR_OVERRIDE_; virtual bool setPixelShaderConstant(s32 index, const s32* ints, int count) IRR_OVERRIDE;
//! Uint interface for the above. //! Uint interface for the above.
virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) _IRR_OVERRIDE_; virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) IRR_OVERRIDE;
//! Returns a pointer to the IVideoDriver interface. (Implementation for //! Returns a pointer to the IVideoDriver interface. (Implementation for
//! IMaterialRendererServices) //! IMaterialRendererServices)
virtual IVideoDriver* getVideoDriver() _IRR_OVERRIDE_; virtual IVideoDriver* getVideoDriver() IRR_OVERRIDE;
//! Creates a render target texture. //! Creates a render target texture.
virtual ITexture* addRenderTargetTexture(const core::dimension2d<u32>& size, 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 //! Creates a render target texture for a cubemap
ITexture* addRenderTargetTextureCubemap(const irr::u32 sideLen, 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;
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. //! 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;
//! Set/unset a clipping plane. //! Set/unset a clipping plane.
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. //! Enable/disable a clipping plane.
virtual void enableClipPlane(u32 index, bool enable) _IRR_OVERRIDE_; virtual void enableClipPlane(u32 index, bool enable) IRR_OVERRIDE;
//! Returns the graphics card vendor name. //! Returns the graphics card vendor name.
virtual core::stringc getVendorInfo() _IRR_OVERRIDE_ {return VendorName;} virtual core::stringc getVendorInfo() IRR_OVERRIDE {return VendorName;}
//! Enable the 2d override material //! Enable the 2d override material
virtual void enableMaterial2D(bool enable=true) _IRR_OVERRIDE_; virtual void enableMaterial2D(bool enable=true) IRR_OVERRIDE;
//! Check if the driver was recently reset. //! Check if the driver was recently reset.
virtual bool checkDriverReset() _IRR_OVERRIDE_ {return DriverWasReset;} virtual bool checkDriverReset() IRR_OVERRIDE {return DriverWasReset;}
//! Get the current color format of the color buffer //! Get the current color format of the color buffer
/** \return Color format of the color buffer. */ /** \return Color format of the color buffer. */
virtual ECOLOR_FORMAT getColorFormat() const _IRR_OVERRIDE_; virtual ECOLOR_FORMAT getColorFormat() const IRR_OVERRIDE;
//! Returns the maximum texture size supported. //! Returns the maximum texture size supported.
virtual core::dimension2du getMaxTextureSize() const _IRR_OVERRIDE_; virtual core::dimension2du getMaxTextureSize() const IRR_OVERRIDE;
//! Check if the driver supports creating textures with the given color format //! 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;
//! Used by some SceneNodes to check if a material should be rendered in the transparent render pass //! 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;
//! Get the current color format of the color buffer //! Get the current color format of the color buffer
/** \return Color format of the color buffer as D3D color value. */ /** \return Color format of the color buffer as D3D color value. */
@ -362,15 +362,15 @@ namespace video
//! Try to get back a lost device //! Try to get back a lost device
bool retrieveDevice(int numTries, int msSleepBetweenTries=100); bool retrieveDevice(int numTries, int msSleepBetweenTries=100);
virtual ITexture* createDeviceDependentTexture(const io::path& name, IImage* image) _IRR_OVERRIDE_; virtual ITexture* createDeviceDependentTexture(const io::path& name, IImage* image) IRR_OVERRIDE;
virtual ITexture* createDeviceDependentTextureCubemap(const io::path& name, const core::array<IImage*>& image) _IRR_OVERRIDE_; virtual ITexture* createDeviceDependentTextureCubemap(const io::path& name, const core::array<IImage*>& image) IRR_OVERRIDE;
//! Adds a new material renderer to the VideoDriver, using pixel and/or //! Adds a new material renderer to the VideoDriver, using pixel and/or
//! vertex shaders to render geometry. //! vertex shaders to render geometry.
s32 addShaderMaterial(const c8* vertexShaderProgram, const c8* pixelShaderProgram, s32 addShaderMaterial(const c8* vertexShaderProgram, const c8* pixelShaderProgram,
IShaderConstantSetCallBack* callback, IShaderConstantSetCallBack* callback,
E_MATERIAL_TYPE baseMaterial, s32 userData) _IRR_OVERRIDE_; E_MATERIAL_TYPE baseMaterial, s32 userData) IRR_OVERRIDE;
//! Adds a new material renderer to the VideoDriver, based on a high level shading //! Adds a new material renderer to the VideoDriver, based on a high level shading
//! language. //! language.
@ -389,7 +389,7 @@ namespace video
u32 verticesOut = 0, u32 verticesOut = 0,
IShaderConstantSetCallBack* callback = 0, IShaderConstantSetCallBack* callback = 0,
E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID, E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
s32 userData = 0) _IRR_OVERRIDE_; s32 userData = 0) IRR_OVERRIDE;
void createMaterialRenderers(); void createMaterialRenderers();
@ -504,7 +504,5 @@ namespace video
} // end namespace video } // end namespace video
} // end namespace irr } // end namespace irr
#endif // _IRR_COMPILE_WITH_DIRECT3D_9_ #endif // _IRR_COMPILE_WITH_DIRECT3D_9_
#endif // __C_VIDEO_DIRECTX_9_H_INCLUDED__ #endif // IRR_C_VIDEO_DIRECTX_9_H_INCLUDED

7
source/Irrlicht/CD3D9HLSLMaterialRenderer.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_D3D9_HLSL_MATERIAL_RENDERER_H_INCLUDED__ #ifndef IRR_C_D3D9_HLSL_MATERIAL_RENDERER_H_INCLUDED
#define __C_D3D9_HLSL_MATERIAL_RENDERER_H_INCLUDED__ #define IRR_C_D3D9_HLSL_MATERIAL_RENDERER_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_WINDOWS_ #ifdef _IRR_WINDOWS_
@ -59,7 +59,7 @@ public:
//! Uint interface for the above. //! Uint interface for the above.
virtual bool setVariable(bool vertexShader, s32 index, const u32* ints, int count); virtual bool setVariable(bool vertexShader, s32 index, const u32* ints, int count);
bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) _IRR_OVERRIDE_; bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) IRR_OVERRIDE;
protected: protected:
@ -84,4 +84,3 @@ protected:
#endif #endif
#endif #endif
#endif #endif

57
source/Irrlicht/CD3D9MaterialRenderer.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_D3D9_MATERIAL_RENDERER_H_INCLUDED__ #ifndef IRR_C_D3D9_MATERIAL_RENDERER_H_INCLUDED
#define __C_D3D9_MATERIAL_RENDERER_H_INCLUDED__ #define IRR_C_D3D9_MATERIAL_RENDERER_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_WINDOWS_ #ifdef _IRR_WINDOWS_
@ -112,7 +112,7 @@ public:
: CD3D9MaterialRenderer(p, d) {} : CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE
{ {
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
@ -135,7 +135,7 @@ public:
: CD3D9MaterialRenderer(p, d) {} : CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE
{ {
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
@ -178,7 +178,7 @@ public:
} }
} }
virtual void OnUnsetMaterial() _IRR_OVERRIDE_ virtual void OnUnsetMaterial() IRR_OVERRIDE
{ {
Driver->getBridgeCalls()->setBlend(false); Driver->getBridgeCalls()->setBlend(false);
} }
@ -188,7 +188,7 @@ public:
materials by opaque and transparent. materials by opaque and transparent.
The return value could be optimized, but we'd need to know the The return value could be optimized, but we'd need to know the
MaterialTypeParam for it. */ MaterialTypeParam for it. */
virtual bool isTransparent() const _IRR_OVERRIDE_ virtual bool isTransparent() const IRR_OVERRIDE
{ {
return true; return true;
} }
@ -205,7 +205,7 @@ public:
: CD3D9MaterialRenderer(p, d) {} : CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE
{ {
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
@ -229,7 +229,7 @@ public:
: CD3D9MaterialRenderer(p, d) {} : CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE
{ {
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
@ -245,14 +245,14 @@ public:
} }
} }
virtual void OnUnsetMaterial() _IRR_OVERRIDE_ virtual void OnUnsetMaterial() IRR_OVERRIDE
{ {
Driver->getBridgeCalls()->setBlend(false); Driver->getBridgeCalls()->setBlend(false);
} }
//! Returns if the material is transparent. The scene management needs to know this //! Returns if the material is transparent. The scene management needs to know this
//! for being able to sort the materials by opaque and transparent. //! for being able to sort the materials by opaque and transparent.
virtual bool isTransparent() const _IRR_OVERRIDE_ virtual bool isTransparent() const IRR_OVERRIDE
{ {
return true; return true;
} }
@ -268,7 +268,7 @@ public:
: CD3D9MaterialRenderer(p, d) {} : CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE
{ {
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
@ -285,14 +285,14 @@ public:
} }
} }
virtual void OnUnsetMaterial() _IRR_OVERRIDE_ virtual void OnUnsetMaterial() IRR_OVERRIDE
{ {
Driver->getBridgeCalls()->setBlend(false); Driver->getBridgeCalls()->setBlend(false);
} }
//! Returns if the material is transparent. The scene management needs to know this //! Returns if the material is transparent. The scene management needs to know this
//! for being able to sort the materials by opaque and transparent. //! for being able to sort the materials by opaque and transparent.
virtual bool isTransparent() const _IRR_OVERRIDE_ virtual bool isTransparent() const IRR_OVERRIDE
{ {
return true; return true;
} }
@ -308,7 +308,7 @@ public:
: CD3D9MaterialRenderer(p, d) {} : CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE
{ {
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
@ -330,7 +330,7 @@ public:
} }
} }
virtual void OnUnsetMaterial() _IRR_OVERRIDE_ virtual void OnUnsetMaterial() IRR_OVERRIDE
{ {
pID3DDevice->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE); pID3DDevice->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);
Driver->getBridgeCalls()->setBlend(false); Driver->getBridgeCalls()->setBlend(false);
@ -338,7 +338,7 @@ public:
//! Returns if the material is transparent. The scene management needs to know this //! Returns if the material is transparent. The scene management needs to know this
//! for being able to sort the materials by opaque and transparent. //! for being able to sort the materials by opaque and transparent.
virtual bool isTransparent() const _IRR_OVERRIDE_ virtual bool isTransparent() const IRR_OVERRIDE
{ {
return true; return true;
} }
@ -355,7 +355,7 @@ public:
: CD3D9MaterialRenderer(p, d) {} : CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE
{ {
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
@ -374,14 +374,14 @@ public:
} }
} }
virtual void OnUnsetMaterial() _IRR_OVERRIDE_ virtual void OnUnsetMaterial() IRR_OVERRIDE
{ {
pID3DDevice->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE); pID3DDevice->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);
} }
//! Returns if the material is transparent. The scene management needs to know this //! Returns if the material is transparent. The scene management needs to know this
//! for being able to sort the materials by opaque and transparent. //! for being able to sort the materials by opaque and transparent.
virtual bool isTransparent() const _IRR_OVERRIDE_ virtual bool isTransparent() const IRR_OVERRIDE
{ {
return false; // this material is not really transparent because it does no blending. return false; // this material is not really transparent because it does no blending.
} }
@ -397,7 +397,7 @@ public:
: CD3D9MaterialRenderer(p, d) {} : CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE
{ {
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
@ -441,7 +441,7 @@ public:
: CD3D9MaterialRenderer(p, d) {} : CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE
{ {
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
@ -466,7 +466,7 @@ public:
: CD3D9MaterialRenderer(p, d) {} : CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE
{ {
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
@ -483,7 +483,7 @@ public:
} }
} }
virtual void OnUnsetMaterial() _IRR_OVERRIDE_ virtual void OnUnsetMaterial() IRR_OVERRIDE
{ {
pID3DDevice->SetTextureStageState( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE ); pID3DDevice->SetTextureStageState( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE );
pID3DDevice->SetTextureStageState( 0, D3DTSS_TEXCOORDINDEX, 0); pID3DDevice->SetTextureStageState( 0, D3DTSS_TEXCOORDINDEX, 0);
@ -501,7 +501,7 @@ public:
: CD3D9MaterialRenderer(p, d) {} : CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE
{ {
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
@ -519,7 +519,7 @@ public:
} }
} }
virtual void OnUnsetMaterial() _IRR_OVERRIDE_ virtual void OnUnsetMaterial() IRR_OVERRIDE
{ {
pID3DDevice->SetTextureStageState( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE ); pID3DDevice->SetTextureStageState( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE );
pID3DDevice->SetTextureStageState( 1, D3DTSS_TEXCOORDINDEX, 1); pID3DDevice->SetTextureStageState( 1, D3DTSS_TEXCOORDINDEX, 1);
@ -537,7 +537,7 @@ public:
: CD3D9MaterialRenderer(p, d) {} : CD3D9MaterialRenderer(p, d) {}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE
{ {
services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
@ -559,7 +559,7 @@ public:
} }
} }
virtual void OnUnsetMaterial() _IRR_OVERRIDE_ virtual void OnUnsetMaterial() IRR_OVERRIDE
{ {
pID3DDevice->SetTextureStageState(1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE); pID3DDevice->SetTextureStageState(1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
pID3DDevice->SetTextureStageState(1, D3DTSS_TEXCOORDINDEX, 1); pID3DDevice->SetTextureStageState(1, D3DTSS_TEXCOORDINDEX, 1);
@ -569,7 +569,7 @@ public:
//! Returns if the material is transparent. The scene management needs to know this //! Returns if the material is transparent. The scene management needs to know this
//! for being able to sort the materials by opaque and transparent. //! for being able to sort the materials by opaque and transparent.
virtual bool isTransparent() const _IRR_OVERRIDE_ virtual bool isTransparent() const IRR_OVERRIDE
{ {
return true; return true;
} }
@ -581,4 +581,3 @@ public:
#endif #endif
#endif #endif
#endif #endif

11
source/Irrlicht/CD3D9NormalMapRenderer.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_D3D9_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED__ #ifndef IRR_C_D3D9_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED
#define __C_D3D9_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED__ #define IRR_C_D3D9_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_WINDOWS_ #ifdef _IRR_WINDOWS_
@ -36,12 +36,12 @@ public:
//! Called by the engine when the vertex and/or pixel shader constants for an //! Called by the engine when the vertex and/or pixel shader constants for an
//! material renderer should be set. //! material renderer should be set.
virtual void OnSetConstants(IMaterialRendererServices* services, s32 userData) _IRR_OVERRIDE_; virtual void OnSetConstants(IMaterialRendererServices* services, s32 userData) IRR_OVERRIDE;
virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) _IRR_OVERRIDE_; virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) IRR_OVERRIDE;
//! Returns the render capability of the material. //! Returns the render capability of the material.
virtual s32 getRenderCapability() const _IRR_OVERRIDE_; virtual s32 getRenderCapability() const IRR_OVERRIDE;
private: private:
@ -53,4 +53,3 @@ private:
#endif #endif
#endif #endif
#endif #endif

15
source/Irrlicht/CD3D9ParallaxMapRenderer.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_D3D9_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED__ #ifndef IRR_C_D3D9_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED
#define __C_D3D9_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED__ #define IRR_C_D3D9_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_WINDOWS_ #ifdef _IRR_WINDOWS_
@ -36,17 +36,17 @@ public:
//! Called by the engine when the vertex and/or pixel shader constants for an //! Called by the engine when the vertex and/or pixel shader constants for an
//! material renderer should be set. //! material renderer should be set.
virtual void OnSetConstants(IMaterialRendererServices* services, s32 userData) _IRR_OVERRIDE_; virtual void OnSetConstants(IMaterialRendererServices* services, s32 userData) IRR_OVERRIDE;
virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) _IRR_OVERRIDE_; virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) IRR_OVERRIDE;
//! Returns the render capability of the material. //! Returns the render capability of the material.
virtual s32 getRenderCapability() const _IRR_OVERRIDE_; virtual s32 getRenderCapability() const IRR_OVERRIDE;
virtual void OnSetMaterial(const SMaterial& material) _IRR_OVERRIDE_ { } virtual void OnSetMaterial(const SMaterial& material) IRR_OVERRIDE { }
virtual void OnSetMaterial(const video::SMaterial& material, virtual void OnSetMaterial(const video::SMaterial& material,
const video::SMaterial& lastMaterial, const video::SMaterial& lastMaterial,
bool resetAllRenderstates, video::IMaterialRendererServices* services) _IRR_OVERRIDE_; bool resetAllRenderstates, video::IMaterialRendererServices* services) IRR_OVERRIDE;
private: private:
@ -60,4 +60,3 @@ private:
#endif #endif
#endif #endif
#endif #endif

6
source/Irrlicht/CD3D9RenderTarget.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_OPEN_GL_RENDER_TARGET_H_INCLUDED__ #ifndef IRR_C_OPEN_GL_RENDER_TARGET_H_INCLUDED
#define __C_OPEN_GL_RENDER_TARGET_H_INCLUDED__ #define IRR_C_OPEN_GL_RENDER_TARGET_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
@ -29,7 +29,7 @@ namespace irr
CD3D9RenderTarget(CD3D9Driver* driver); CD3D9RenderTarget(CD3D9Driver* driver);
virtual ~CD3D9RenderTarget(); virtual ~CD3D9RenderTarget();
virtual void setTextures(ITexture* const * textures, u32 numTextures, ITexture* depthStencil, const E_CUBE_SURFACE* cubeSurfaces, u32 numCubeSurfaces) _IRR_OVERRIDE_; virtual void setTextures(ITexture* const * textures, u32 numTextures, ITexture* depthStencil, const E_CUBE_SURFACE* cubeSurfaces, u32 numCubeSurfaces) IRR_OVERRIDE;
const core::dimension2d<u32>& getSize() const; const core::dimension2d<u32>& getSize() const;

15
source/Irrlicht/CD3D9ShaderMaterialRenderer.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_D3D9_SHADER_MATERIAL_RENDERER_H_INCLUDED__ #ifndef IRR_C_D3D9_SHADER_MATERIAL_RENDERER_H_INCLUDED
#define __C_D3D9_SHADER_MATERIAL_RENDERER_H_INCLUDED__ #define IRR_C_D3D9_SHADER_MATERIAL_RENDERER_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_WINDOWS_ #ifdef _IRR_WINDOWS_
@ -39,17 +39,17 @@ public:
~CD3D9ShaderMaterialRenderer(); ~CD3D9ShaderMaterialRenderer();
virtual void OnSetMaterial(const video::SMaterial& material, const video::SMaterial& lastMaterial, virtual void OnSetMaterial(const video::SMaterial& material, const video::SMaterial& lastMaterial,
bool resetAllRenderstates, video::IMaterialRendererServices* services) _IRR_OVERRIDE_; bool resetAllRenderstates, video::IMaterialRendererServices* services) IRR_OVERRIDE;
virtual void OnUnsetMaterial() _IRR_OVERRIDE_; virtual void OnUnsetMaterial() IRR_OVERRIDE;
virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) _IRR_OVERRIDE_; virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) IRR_OVERRIDE;
//! Returns if the material is transparent. //! Returns if the material is transparent.
virtual bool isTransparent() const _IRR_OVERRIDE_; virtual bool isTransparent() const IRR_OVERRIDE;
//! Access the callback provided by the users when creating shader materials //! Access the callback provided by the users when creating shader materials
virtual IShaderConstantSetCallBack* getShaderConstantSetCallBack() const _IRR_OVERRIDE_ virtual IShaderConstantSetCallBack* getShaderConstantSetCallBack() const IRR_OVERRIDE
{ {
return CallBack; return CallBack;
} }
@ -105,4 +105,3 @@ protected:
#endif #endif
#endif #endif
#endif #endif

10
source/Irrlicht/CD3D9Texture.cpp
View File

@ -23,7 +23,7 @@ CD3D9Texture::CD3D9Texture(const io::path& name, const core::array<IImage*>& ima
setDebugName("CD3D9Texture"); setDebugName("CD3D9Texture");
#endif #endif
_IRR_DEBUG_BREAK_IF(image.size() == 0) IRR_DEBUG_BREAK_IF(image.size() == 0)
Device=driver->getExposedVideoData().D3D9.D3DDev9; Device=driver->getExposedVideoData().D3D9.D3DDev9;
@ -63,7 +63,7 @@ CD3D9Texture::CD3D9Texture(const io::path& name, const core::array<IImage*>& ima
hr = Device->CreateCubeTexture(Size.Width, HasMipMaps ? 0 : 1, flags, InternalFormat, D3DPOOL_MANAGED, &CubeTexture, NULL); hr = Device->CreateCubeTexture(Size.Width, HasMipMaps ? 0 : 1, flags, InternalFormat, D3DPOOL_MANAGED, &CubeTexture, NULL);
break; break;
default: default:
_IRR_DEBUG_BREAK_IF(true) IRR_DEBUG_BREAK_IF(true)
break; break;
} }
@ -225,7 +225,7 @@ void* CD3D9Texture::lock(E_TEXTURE_LOCK_MODE mode, u32 mipmapLevel, u32 layer, E
} }
else if (CubeTexture) else if (CubeTexture)
{ {
_IRR_DEBUG_BREAK_IF(layer > 5) IRR_DEBUG_BREAK_IF(layer > 5)
hr = CubeTexture->LockRect(static_cast<_D3DCUBEMAP_FACES>(layer), MipLevelLocked, &rect, 0, LockReadOnly ? D3DLOCK_READONLY : 0); hr = CubeTexture->LockRect(static_cast<_D3DCUBEMAP_FACES>(layer), MipLevelLocked, &rect, 0, LockReadOnly ? D3DLOCK_READONLY : 0);
} }
@ -591,7 +591,7 @@ void CD3D9Texture::generateRenderTarget()
hr = Device->CreateCubeTexture(Size.Width, 1, flags, InternalFormat, D3DPOOL_DEFAULT, &CubeTexture, NULL); hr = Device->CreateCubeTexture(Size.Width, 1, flags, InternalFormat, D3DPOOL_DEFAULT, &CubeTexture, NULL);
break; break;
default: default:
_IRR_DEBUG_BREAK_IF(true) IRR_DEBUG_BREAK_IF(true)
break; break;
} }
@ -726,7 +726,7 @@ void CD3D9Texture::uploadTexture(void* data, u32 mipmapLevel, u32 layer)
} }
else if (CubeTexture) else if (CubeTexture)
{ {
_IRR_DEBUG_BREAK_IF(layer > 5) IRR_DEBUG_BREAK_IF(layer > 5)
hr = CubeTexture->LockRect(static_cast<_D3DCUBEMAP_FACES>(layer), mipmapLevel, &lockRectangle, 0, 0); hr = CubeTexture->LockRect(static_cast<_D3DCUBEMAP_FACES>(layer), mipmapLevel, &lockRectangle, 0, 0);
} }

10
source/Irrlicht/CD3D9Texture.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_DIRECTX9_TEXTURE_H_INCLUDED__ #ifndef IRR_C_DIRECTX9_TEXTURE_H_INCLUDED
#define __C_DIRECTX9_TEXTURE_H_INCLUDED__ #define IRR_C_DIRECTX9_TEXTURE_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_ #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
@ -32,11 +32,11 @@ public:
virtual ~CD3D9Texture(); virtual ~CD3D9Texture();
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_; 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;
virtual void unlock() _IRR_OVERRIDE_; virtual void unlock() IRR_OVERRIDE;
virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) _IRR_OVERRIDE_; virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) IRR_OVERRIDE;
IDirect3DBaseTexture9* getDX9BaseTexture() const; IDirect3DBaseTexture9* getDX9BaseTexture() const;
IDirect3DTexture9* getDX9Texture() const; IDirect3DTexture9* getDX9Texture() const;

9
source/Irrlicht/CDMFLoader.h
View File

@ -27,8 +27,8 @@
credits to others for parts of this code. credits to others for parts of this code.
*/ */
#ifndef __C_DMF_LOADER_H_INCLUDED__ #ifndef IRR_C_DMF_LOADER_H_INCLUDED
#define __C_DMF_LOADER_H_INCLUDED__ #define IRR_C_DMF_LOADER_H_INCLUDED
#include "IMeshLoader.h" #include "IMeshLoader.h"
#include "IReadFile.h" #include "IReadFile.h"
@ -52,13 +52,13 @@ namespace scene
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".cob") //! based on the file extension (e.g. ".cob")
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
/** creates/loads an animated mesh from the file. /** creates/loads an animated mesh from the file.
\return Pointer to the created mesh. Returns 0 if loading failed. \return Pointer to the created mesh. Returns 0 if loading failed.
If you no longer need the mesh, you should call IAnimatedMesh::drop(). If you no longer need the mesh, you should call IAnimatedMesh::drop().
See IReferenceCounted::drop() for more information.*/ See IReferenceCounted::drop() for more information.*/
virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE;
/** loads dynamic lights present in this scene. /** loads dynamic lights present in this scene.
Note that loaded lights from DeleD must have the suffix \b dynamic_ and must be \b pointlight. Note that loaded lights from DeleD must have the suffix \b dynamic_ and must be \b pointlight.
@ -88,4 +88,3 @@ namespace scene
} // end namespace irr } // end namespace irr
#endif #endif

18
source/Irrlicht/CDefaultGUIElementFactory.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED__ #ifndef IRR_C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED
#define __C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED__ #define IRR_C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -28,31 +28,31 @@ namespace gui
/** \param type: Type of the element to add. /** \param type: Type of the element to add.
\param parent: Parent scene node of the new element. A value of 0 adds it to the root. \param parent: Parent scene node of the new element. A value of 0 adds it to the root.
\return Returns pointer to the new element or 0 if unsuccessful. */ \return Returns pointer to the new element or 0 if unsuccessful. */
virtual IGUIElement* addGUIElement(EGUI_ELEMENT_TYPE type, IGUIElement* parent=0) _IRR_OVERRIDE_; virtual IGUIElement* addGUIElement(EGUI_ELEMENT_TYPE type, IGUIElement* parent=0) IRR_OVERRIDE;
//! Adds a GUI element to the GUI Environment based on its type name. //! Adds a GUI element to the GUI Environment based on its type name.
/** \param typeName: Type name of the element to add. Taken from the GUIElementTypeNames c8* array. /** \param typeName: Type name of the element to add. Taken from the GUIElementTypeNames c8* array.
\param parent: Parent scene node of the new element. A value of 0 adds it to the root. \param parent: Parent scene node of the new element. A value of 0 adds it to the root.
\return Returns pointer to the new element or 0 if unsuccessful. */ \return Returns pointer to the new element or 0 if unsuccessful. */
virtual IGUIElement* addGUIElement(const c8* typeName, IGUIElement* parent=0) _IRR_OVERRIDE_; virtual IGUIElement* addGUIElement(const c8* typeName, IGUIElement* parent=0) IRR_OVERRIDE;
//! Returns the amount of GUI element types this factory is able to create. //! Returns the amount of GUI element types this factory is able to create.
virtual s32 getCreatableGUIElementTypeCount() const _IRR_OVERRIDE_; virtual s32 getCreatableGUIElementTypeCount() const IRR_OVERRIDE;
//! Returns the type of a createable GUI element type based on the index. //! Returns the type of a createable GUI element type based on the index.
/** \param idx: Index of the element type in this factory. The value must be equal or greater than 0 /** \param idx: Index of the element type in this factory. The value must be equal or greater than 0
and lower than getCreatableGUIElementTypeCount(). */ and lower than getCreatableGUIElementTypeCount(). */
virtual EGUI_ELEMENT_TYPE getCreateableGUIElementType(s32 idx) const _IRR_OVERRIDE_; virtual EGUI_ELEMENT_TYPE getCreateableGUIElementType(s32 idx) const IRR_OVERRIDE;
//! Returns the type name of a createable GUI element type based on the index. //! Returns the type name of a createable GUI element type based on the index.
/** \param idx: Index of the element type in this factory. The value must be equal or greater than 0 /** \param idx: Index of the element type in this factory. The value must be equal or greater than 0
and lower than getCreatableGUIElementTypeCount(). */ and lower than getCreatableGUIElementTypeCount(). */
virtual const c8* getCreateableGUIElementTypeName(s32 idx) const _IRR_OVERRIDE_; virtual const c8* getCreateableGUIElementTypeName(s32 idx) const IRR_OVERRIDE;
//! Returns the type name of a createable GUI element based on its type. //! Returns the type name of a createable GUI element based on its type.
/** \param type: Type of the GUI element. /** \param type: Type of the GUI element.
\return: Returns the name of the type if this factory can create it, otherwise it returns 0. */ \return: Returns the name of the type if this factory can create it, otherwise it returns 0. */
virtual const c8* getCreateableGUIElementTypeName(EGUI_ELEMENT_TYPE type) const _IRR_OVERRIDE_; virtual const c8* getCreateableGUIElementTypeName(EGUI_ELEMENT_TYPE type) const IRR_OVERRIDE;
private: private:
@ -67,4 +67,4 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // __C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED__ #endif // IRR_C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED

17
source/Irrlicht/CDefaultSceneNodeAnimatorFactory.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_DEFAULT_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED__ #ifndef IRR_C_DEFAULT_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED
#define __C_DEFAULT_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED__ #define IRR_C_DEFAULT_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED
#include "ISceneNodeAnimatorFactory.h" #include "ISceneNodeAnimatorFactory.h"
@ -32,32 +32,32 @@ namespace scene
\param target: Target scene node of the new animator. \param target: Target scene node of the new animator.
\return Returns pointer to the new scene node animator or null if not successful. You need to \return Returns pointer to the new scene node animator or null if not successful. You need to
drop this pointer after calling this, see IReferenceCounted::drop() for details. */ drop this pointer after calling this, see IReferenceCounted::drop() for details. */
virtual ISceneNodeAnimator* createSceneNodeAnimator(ESCENE_NODE_ANIMATOR_TYPE type, ISceneNode* target) _IRR_OVERRIDE_; virtual ISceneNodeAnimator* createSceneNodeAnimator(ESCENE_NODE_ANIMATOR_TYPE type, ISceneNode* target) IRR_OVERRIDE;
//! creates a scene node animator based on its type name //! creates a scene node animator based on its type name
/** \param typeName: Type of the scene node animator to add. /** \param typeName: Type of the scene node animator to add.
\param target: Target scene node of the new animator. \param target: Target scene node of the new animator.
\return Returns pointer to the new scene node animator or null if not successful. You need to \return Returns pointer to the new scene node animator or null if not successful. You need to
drop this pointer after calling this, see IReferenceCounted::drop() for details. */ drop this pointer after calling this, see IReferenceCounted::drop() for details. */
virtual ISceneNodeAnimator* createSceneNodeAnimator(const char* typeName, ISceneNode* target) _IRR_OVERRIDE_; virtual ISceneNodeAnimator* createSceneNodeAnimator(const char* typeName, ISceneNode* target) IRR_OVERRIDE;
//! returns amount of scene node animator types this factory is able to create //! returns amount of scene node animator types this factory is able to create
virtual u32 getCreatableSceneNodeAnimatorTypeCount() const _IRR_OVERRIDE_; virtual u32 getCreatableSceneNodeAnimatorTypeCount() const IRR_OVERRIDE;
//! returns type of a creatable scene node animator type //! returns type of a creatable scene node animator type
/** \param idx: Index of scene node animator type in this factory. Must be a value between 0 and /** \param idx: Index of scene node animator type in this factory. Must be a value between 0 and
getCreatableSceneNodeTypeCount() */ getCreatableSceneNodeTypeCount() */
virtual ESCENE_NODE_ANIMATOR_TYPE getCreateableSceneNodeAnimatorType(u32 idx) const _IRR_OVERRIDE_; virtual ESCENE_NODE_ANIMATOR_TYPE getCreateableSceneNodeAnimatorType(u32 idx) const IRR_OVERRIDE;
//! returns type name of a creatable scene node animator type //! returns type name of a creatable scene node animator type
/** \param idx: Index of scene node animator type in this factory. Must be a value between 0 and /** \param idx: Index of scene node animator type in this factory. Must be a value between 0 and
getCreatableSceneNodeAnimatorTypeCount() */ getCreatableSceneNodeAnimatorTypeCount() */
virtual const c8* getCreateableSceneNodeAnimatorTypeName(u32 idx) const _IRR_OVERRIDE_; virtual const c8* getCreateableSceneNodeAnimatorTypeName(u32 idx) const IRR_OVERRIDE;
//! returns type name of a creatable scene node animator type //! returns type name of a creatable scene node animator type
/** \param type: Type of scene node animator. /** \param type: Type of scene node animator.
\return: Returns name of scene node animator type if this factory can create the type, otherwise 0. */ \return: Returns name of scene node animator type if this factory can create the type, otherwise 0. */
virtual const c8* getCreateableSceneNodeAnimatorTypeName(ESCENE_NODE_ANIMATOR_TYPE type) const _IRR_OVERRIDE_; virtual const c8* getCreateableSceneNodeAnimatorTypeName(ESCENE_NODE_ANIMATOR_TYPE type) const IRR_OVERRIDE;
private: private:
@ -72,4 +72,3 @@ namespace scene
} // end namespace irr } // end namespace irr
#endif #endif

19
source/Irrlicht/CDefaultSceneNodeFactory.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_DEFAULT_SCENE_NODE_FACTORY_H_INCLUDED__ #ifndef IRR_C_DEFAULT_SCENE_NODE_FACTORY_H_INCLUDED
#define __C_DEFAULT_SCENE_NODE_FACTORY_H_INCLUDED__ #define IRR_C_DEFAULT_SCENE_NODE_FACTORY_H_INCLUDED
#include "ISceneNodeFactory.h" #include "ISceneNodeFactory.h"
#include "irrArray.h" #include "irrArray.h"
@ -16,7 +16,7 @@ namespace scene
class ISceneNode; class ISceneNode;
class ISceneManager; class ISceneManager;
//! Interface making it possible to dynamicly create scene nodes and animators //! Interface making it possible to dynamically create scene nodes and animators
class CDefaultSceneNodeFactory : public ISceneNodeFactory class CDefaultSceneNodeFactory : public ISceneNodeFactory
{ {
public: public:
@ -27,31 +27,31 @@ namespace scene
/** \param type: Type of the scene node to add. /** \param type: Type of the scene node to add.
\param parent: Parent scene node of the new node, can be null to add the scene node to the root. \param parent: Parent scene node of the new node, can be null to add the scene node to the root.
\return Returns pointer to the new scene node or null if not successful. */ \return Returns pointer to the new scene node or null if not successful. */
virtual ISceneNode* addSceneNode(ESCENE_NODE_TYPE type, ISceneNode* parent=0) _IRR_OVERRIDE_; virtual ISceneNode* addSceneNode(ESCENE_NODE_TYPE type, ISceneNode* parent=0) IRR_OVERRIDE;
//! adds a scene node to the scene graph based on its type name //! adds a scene node to the scene graph based on its type name
/** \param typeName: Type name of the scene node to add. /** \param typeName: Type name of the scene node to add.
\param parent: Parent scene node of the new node, can be null to add the scene node to the root. \param parent: Parent scene node of the new node, can be null to add the scene node to the root.
\return Returns pointer to the new scene node or null if not successful. */ \return Returns pointer to the new scene node or null if not successful. */
virtual ISceneNode* addSceneNode(const c8* typeName, ISceneNode* parent=0) _IRR_OVERRIDE_; virtual ISceneNode* addSceneNode(const c8* typeName, ISceneNode* parent=0) IRR_OVERRIDE;
//! returns amount of scene node types this factory is able to create //! returns amount of scene node types this factory is able to create
virtual u32 getCreatableSceneNodeTypeCount() const _IRR_OVERRIDE_; virtual u32 getCreatableSceneNodeTypeCount() const IRR_OVERRIDE;
//! returns type name of a creatable scene node type by index //! returns type name of a creatable scene node type by index
/** \param idx: Index of scene node type in this factory. Must be a value between 0 and /** \param idx: Index of scene node type in this factory. Must be a value between 0 and
uetCreatableSceneNodeTypeCount() */ uetCreatableSceneNodeTypeCount() */
virtual const c8* getCreateableSceneNodeTypeName(u32 idx) const _IRR_OVERRIDE_; virtual const c8* getCreateableSceneNodeTypeName(u32 idx) const IRR_OVERRIDE;
//! returns type of a creatable scene node type //! returns type of a creatable scene node type
/** \param idx: Index of scene node type in this factory. Must be a value between 0 and /** \param idx: Index of scene node type in this factory. Must be a value between 0 and
getCreatableSceneNodeTypeCount() */ getCreatableSceneNodeTypeCount() */
virtual ESCENE_NODE_TYPE getCreateableSceneNodeType(u32 idx) const _IRR_OVERRIDE_; virtual ESCENE_NODE_TYPE getCreateableSceneNodeType(u32 idx) const IRR_OVERRIDE;
//! returns type name of a creatable scene node type //! returns type name of a creatable scene node type
/** \param idx: Type of scene node. /** \param idx: Type of scene node.
\return: Returns name of scene node type if this factory can create the type, otherwise 0. */ \return: Returns name of scene node type if this factory can create the type, otherwise 0. */
virtual const c8* getCreateableSceneNodeTypeName(ESCENE_NODE_TYPE type) const _IRR_OVERRIDE_; virtual const c8* getCreateableSceneNodeTypeName(ESCENE_NODE_TYPE type) const IRR_OVERRIDE;
private: private:
@ -77,4 +77,3 @@ namespace scene
} // end namespace irr } // end namespace irr
#endif #endif

29
source/Irrlicht/CDepthBuffer.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_Z_BUFFER_H_INCLUDED__ #ifndef IRR_C_Z_BUFFER_H_INCLUDED
#define __C_Z_BUFFER_H_INCLUDED__ #define IRR_C_Z_BUFFER_H_INCLUDED
#include "IDepthBuffer.h" #include "IDepthBuffer.h"
@ -23,22 +23,22 @@ namespace video
virtual ~CDepthBuffer(); virtual ~CDepthBuffer();
//! clears the zbuffer //! clears the zbuffer
virtual void clear(f32 value, const interlaced_control interlaced) _IRR_OVERRIDE_; virtual void clear(f32 value, const interlaced_control interlaced) IRR_OVERRIDE;
//! sets the new size of the zbuffer //! sets the new size of the zbuffer
virtual void setSize(const core::dimension2d<u32>& size) _IRR_OVERRIDE_; virtual void setSize(const core::dimension2d<u32>& size) IRR_OVERRIDE;
//! returns the size of the zbuffer //! returns the size of the zbuffer
virtual const core::dimension2d<u32>& getSize() const _IRR_OVERRIDE_; virtual const core::dimension2d<u32>& getSize() const IRR_OVERRIDE;
//! locks the zbuffer //! locks the zbuffer
virtual void* lock() _IRR_OVERRIDE_ { return (void*) Buffer; } virtual void* lock() IRR_OVERRIDE { return (void*) Buffer; }
//! unlocks the zbuffer //! unlocks the zbuffer
virtual void unlock() _IRR_OVERRIDE_ {} virtual void unlock() IRR_OVERRIDE {}
//! returns pitch of depthbuffer (in bytes) //! returns pitch of depthbuffer (in bytes)
virtual u32 getPitch() const _IRR_OVERRIDE_ { return Pitch; } virtual u32 getPitch() const IRR_OVERRIDE { return Pitch; }
private: private:
@ -60,22 +60,22 @@ namespace video
virtual ~CStencilBuffer(); virtual ~CStencilBuffer();
//! clears the zbuffer //! clears the zbuffer
virtual void clear(u32 value, const interlaced_control interlaced) _IRR_OVERRIDE_; virtual void clear(u32 value, const interlaced_control interlaced) IRR_OVERRIDE;
//! sets the new size of the zbuffer //! sets the new size of the zbuffer
virtual void setSize(const core::dimension2d<u32>& size) _IRR_OVERRIDE_; virtual void setSize(const core::dimension2d<u32>& size) IRR_OVERRIDE;
//! returns the size of the zbuffer //! returns the size of the zbuffer
virtual const core::dimension2d<u32>& getSize() const _IRR_OVERRIDE_; virtual const core::dimension2d<u32>& getSize() const IRR_OVERRIDE;
//! locks the zbuffer //! locks the zbuffer
virtual void* lock() _IRR_OVERRIDE_ { return (void*) Buffer; } virtual void* lock() IRR_OVERRIDE { return (void*) Buffer; }
//! unlocks the zbuffer //! unlocks the zbuffer
virtual void unlock() _IRR_OVERRIDE_ {} virtual void unlock() IRR_OVERRIDE {}
//! returns pitch of depthbuffer (in bytes) //! returns pitch of depthbuffer (in bytes)
virtual u32 getPitch() const _IRR_OVERRIDE_ { return Pitch; } virtual u32 getPitch() const IRR_OVERRIDE { return Pitch; }
private: private:
@ -89,4 +89,3 @@ namespace video
} // end namespace irr } // end namespace irr
#endif #endif

29
source/Irrlicht/CDummyTransformationSceneNode.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__ #ifndef IRR_C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED
#define __C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__ #define IRR_C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED
#include "IDummyTransformationSceneNode.h" #include "IDummyTransformationSceneNode.h"
@ -20,36 +20,36 @@ namespace scene
CDummyTransformationSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id); CDummyTransformationSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id);
//! returns the axis aligned bounding box of this node //! returns the axis aligned bounding box of this node
virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_; virtual const core::aabbox3d<f32>& getBoundingBox() const IRR_OVERRIDE;
//! Returns a reference to the current relative transformation matrix. //! Returns a reference to the current relative transformation matrix.
//! This is the matrix, this scene node uses instead of scale, translation //! This is the matrix, this scene node uses instead of scale, translation
//! and rotation. //! and rotation.
virtual core::matrix4& getRelativeTransformationMatrix() _IRR_OVERRIDE_; virtual core::matrix4& getRelativeTransformationMatrix() IRR_OVERRIDE;
//! Returns the relative transformation of the scene node. //! Returns the relative transformation of the scene node.
virtual core::matrix4 getRelativeTransformation() const _IRR_OVERRIDE_; virtual core::matrix4 getRelativeTransformation() const IRR_OVERRIDE;
//! does nothing. //! does nothing.
virtual void render() _IRR_OVERRIDE_ {} virtual void render() IRR_OVERRIDE {}
//! Returns type of the scene node //! Returns type of the scene node
virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_DUMMY_TRANSFORMATION; } virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_DUMMY_TRANSFORMATION; }
//! Creates a clone of this scene node and its children. //! Creates a clone of this scene node and its children.
virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) _IRR_OVERRIDE_; virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) IRR_OVERRIDE;
private: private:
// TODO: We can add least add some warnings to find troubles faster until we have // TODO: We can add least add some warnings to find troubles faster until we have
// fixed bug id 2318691. // fixed bug id 2318691.
virtual const core::vector3df& getScale() const _IRR_OVERRIDE_; virtual const core::vector3df& getScale() const IRR_OVERRIDE;
virtual void setScale(const core::vector3df& scale) _IRR_OVERRIDE_; virtual void setScale(const core::vector3df& scale) IRR_OVERRIDE;
virtual const core::vector3df& getRotation() const _IRR_OVERRIDE_; virtual const core::vector3df& getRotation() const IRR_OVERRIDE;
virtual void setRotation(const core::vector3df& rotation) _IRR_OVERRIDE_; virtual void setRotation(const core::vector3df& rotation) IRR_OVERRIDE;
virtual const core::vector3df& getPosition() const _IRR_OVERRIDE_; virtual const core::vector3df& getPosition() const IRR_OVERRIDE;
virtual void setPosition(const core::vector3df& newpos) _IRR_OVERRIDE_; virtual void setPosition(const core::vector3df& newpos) IRR_OVERRIDE;
core::matrix4 RelativeTransformationMatrix; core::matrix4 RelativeTransformationMatrix;
core::aabbox3d<f32> Box; core::aabbox3d<f32> Box;
@ -59,4 +59,3 @@ namespace scene
} // end namespace irr } // end namespace irr
#endif #endif

18
source/Irrlicht/CEGLManager.h
View File

@ -36,39 +36,39 @@ namespace video
// Initialize EGL. // Initialize EGL.
/* This method initialize EGLand create EGL display, anyway surface and context /* This method initialize EGLand create EGL display, anyway surface and context
aren't create. */ aren't create. */
virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) _IRR_OVERRIDE_; virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) IRR_OVERRIDE;
// Terminate EGL. // Terminate EGL.
/* Terminate EGL context. This method break both existed surface and context. */ /* Terminate EGL context. This method break both existed surface and context. */
virtual void terminate() _IRR_OVERRIDE_; virtual void terminate() IRR_OVERRIDE;
// Create EGL surface. // Create EGL surface.
/* This method create EGL surface. On some platforms eg. Android, we must /* This method create EGL surface. On some platforms eg. Android, we must
recreate surface on each resume, because WindowID may change, so existed recreate surface on each resume, because WindowID may change, so existed
surface may not be valid. If EGL context already exist, this method surface may not be valid. If EGL context already exist, this method
automatically activates it. */ automatically activates it. */
virtual bool generateSurface() _IRR_OVERRIDE_; virtual bool generateSurface() IRR_OVERRIDE;
// Destroy EGL surface. // Destroy EGL surface.
/* This method destroy EGL. On some platforms eg. Android, we should call /* This method destroy EGL. On some platforms eg. Android, we should call
this method on each pause, because after resume this surface may not be valid. this method on each pause, because after resume this surface may not be valid.
Hovewer this method doesn'r break EGL context. */ Hovewer this method doesn'r break EGL context. */
virtual void destroySurface() _IRR_OVERRIDE_; virtual void destroySurface() IRR_OVERRIDE;
// Create EGL context. // Create EGL context.
/* This method create and activate EGL context. */ /* This method create and activate EGL context. */
virtual bool generateContext() _IRR_OVERRIDE_; virtual bool generateContext() IRR_OVERRIDE;
// Destroy EGL context. // Destroy EGL context.
/* This method destroy EGL context. */ /* This method destroy EGL context. */
virtual void destroyContext() _IRR_OVERRIDE_; virtual void destroyContext() IRR_OVERRIDE;
virtual const SExposedVideoData& getContext() const _IRR_OVERRIDE_; virtual const SExposedVideoData& getContext() const IRR_OVERRIDE;
virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) _IRR_OVERRIDE_; virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) IRR_OVERRIDE;
// Swap buffers. // Swap buffers.
virtual bool swapBuffers() _IRR_OVERRIDE_; virtual bool swapBuffers() IRR_OVERRIDE;
protected: protected:
enum EConfigStyle enum EConfigStyle

15
source/Irrlicht/CEmptySceneNode.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_EMPTY_SCENE_NODE_H_INCLUDED__ #ifndef IRR_C_EMPTY_SCENE_NODE_H_INCLUDED
#define __C_EMPTY_SCENE_NODE_H_INCLUDED__ #define IRR_C_EMPTY_SCENE_NODE_H_INCLUDED
#include "ISceneNode.h" #include "ISceneNode.h"
@ -20,19 +20,19 @@ namespace scene
CEmptySceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id); CEmptySceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id);
//! returns the axis aligned bounding box of this node //! returns the axis aligned bounding box of this node
virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_; virtual const core::aabbox3d<f32>& getBoundingBox() const IRR_OVERRIDE;
//! This method is called just before the rendering process of the whole scene. //! This method is called just before the rendering process of the whole scene.
virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; virtual void OnRegisterSceneNode() IRR_OVERRIDE;
//! does nothing. //! does nothing.
virtual void render() _IRR_OVERRIDE_; virtual void render() IRR_OVERRIDE;
//! Returns type of the scene node //! Returns type of the scene node
virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_EMPTY; } virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_EMPTY; }
//! Creates a clone of this scene node and its children. //! Creates a clone of this scene node and its children.
virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) _IRR_OVERRIDE_; virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) IRR_OVERRIDE;
private: private:
@ -43,4 +43,3 @@ namespace scene
} // end namespace irr } // end namespace irr
#endif #endif

6
source/Irrlicht/CFPSCounter.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_FPSCOUNTER_H_INCLUDED__ #ifndef IRR_C_FPSCOUNTER_H_INCLUDED
#define __C_FPSCOUNTER_H_INCLUDED__ #define IRR_C_FPSCOUNTER_H_INCLUDED
#include "irrTypes.h" #include "irrTypes.h"
@ -49,6 +49,4 @@ private:
} // end namespace video } // end namespace video
} // end namespace irr } // end namespace irr
#endif #endif

27
source/Irrlicht/CFileList.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_FILE_LIST_H_INCLUDED__ #ifndef IRR_C_FILE_LIST_H_INCLUDED
#define __C_FILE_LIST_H_INCLUDED__ #define IRR_C_FILE_LIST_H_INCLUDED
#include "IFileList.h" #include "IFileList.h"
#include "irrString.h" #include "irrString.h"
@ -82,37 +82,37 @@ public:
\param offset The offset where the file is stored in an archive \param offset The offset where the file is stored in an archive
\param size The size of the file in bytes. \param size The size of the file in bytes.
\param id The ID of the file in the archive which owns it */ \param id The ID of the file in the archive which owns it */
virtual u32 addItem(const io::path& fullPath, u32 offset, u32 size, bool isDirectory, u32 id=0) _IRR_OVERRIDE_; virtual u32 addItem(const io::path& fullPath, u32 offset, u32 size, bool isDirectory, u32 id=0) IRR_OVERRIDE;
//! Sorts the file list. You should call this after adding any items to the file list //! Sorts the file list. You should call this after adding any items to the file list
virtual void sort() _IRR_OVERRIDE_; virtual void sort() IRR_OVERRIDE;
//! Returns the amount of files in the filelist. //! Returns the amount of files in the filelist.
virtual u32 getFileCount() const _IRR_OVERRIDE_; virtual u32 getFileCount() const IRR_OVERRIDE;
//! Gets the name of a file in the list, based on an index. //! Gets the name of a file in the list, based on an index.
virtual const io::path& getFileName(u32 index) const _IRR_OVERRIDE_; virtual const io::path& getFileName(u32 index) const IRR_OVERRIDE;
//! Gets the full name of a file in the list, path included, based on an index. //! Gets the full name of a file in the list, path included, based on an index.
virtual const io::path& getFullFileName(u32 index) const _IRR_OVERRIDE_; virtual const io::path& getFullFileName(u32 index) const IRR_OVERRIDE;
//! Returns the ID of a file in the file list, based on an index. //! Returns the ID of a file in the file list, based on an index.
virtual u32 getID(u32 index) const _IRR_OVERRIDE_; virtual u32 getID(u32 index) const IRR_OVERRIDE;
//! Returns true if the file is a directory //! Returns true if the file is a directory
virtual bool isDirectory(u32 index) const _IRR_OVERRIDE_; virtual bool isDirectory(u32 index) const IRR_OVERRIDE;
//! Returns the size of a file //! Returns the size of a file
virtual u32 getFileSize(u32 index) const _IRR_OVERRIDE_; virtual u32 getFileSize(u32 index) const IRR_OVERRIDE;
//! Returns the offset of a file //! Returns the offset of a file
virtual u32 getFileOffset(u32 index) const _IRR_OVERRIDE_; virtual u32 getFileOffset(u32 index) const IRR_OVERRIDE;
//! Searches for a file or folder within the list, returns the index //! Searches for a file or folder within the list, returns the index
virtual s32 findFile(const io::path& filename, bool isFolder) const _IRR_OVERRIDE_; virtual s32 findFile(const io::path& filename, bool isFolder) const IRR_OVERRIDE;
//! Returns the base path of the file list //! Returns the base path of the file list
virtual const io::path& getPath() const _IRR_OVERRIDE_; virtual const io::path& getPath() const IRR_OVERRIDE;
protected: protected:
@ -135,4 +135,3 @@ protected:
#endif #endif

36
source/Irrlicht/CFileSystem.cpp
View File

@ -336,7 +336,7 @@ bool CFileSystem::changeArchivePassword(const path& filename,
// We need to check for directory names with trailing slash and without // We need to check for directory names with trailing slash and without
const path absPath = getAbsolutePath(filename); const path absPath = getAbsolutePath(filename);
const path arcPath = FileArchives[idx]->getFileList()->getPath(); const path arcPath = FileArchives[idx]->getFileList()->getPath();
if ((absPath == arcPath) || ((absPath+_IRR_TEXT("/")) == arcPath)) if ((absPath == arcPath) || ((absPath+IRR_TEXT("/")) == arcPath))
{ {
if (password.size()) if (password.size())
FileArchives[idx]->Password=password; FileArchives[idx]->Password=password;
@ -585,7 +585,7 @@ bool CFileSystem::changeWorkingDirectoryTo(const io::path& newDirectory)
{ {
WorkingDirectory[FILESYSTEM_VIRTUAL] = newDirectory; WorkingDirectory[FILESYSTEM_VIRTUAL] = newDirectory;
// is this empty string constant really intended? // is this empty string constant really intended?
flattenFilename(WorkingDirectory[FILESYSTEM_VIRTUAL], _IRR_TEXT("")); flattenFilename(WorkingDirectory[FILESYSTEM_VIRTUAL], IRR_TEXT(""));
success = true; success = true;
} }
else else
@ -645,7 +645,7 @@ io::path CFileSystem::getAbsolutePath(const io::path& filename) const
return io::path(fpath); return io::path(fpath);
} }
if (filename[filename.size()-1]=='/') if (filename[filename.size()-1]=='/')
return io::path(p)+_IRR_TEXT("/"); return io::path(p)+IRR_TEXT("/");
else else
return io::path(p); return io::path(p);
#else #else
@ -667,7 +667,7 @@ io::path CFileSystem::getFileDir(const io::path& filename) const
if ((u32)lastSlash < filename.size()) if ((u32)lastSlash < filename.size())
return filename.subString(0, lastSlash); return filename.subString(0, lastSlash);
else else
return _IRR_TEXT("."); return IRR_TEXT(".");
} }
@ -720,7 +720,7 @@ io::path& CFileSystem::flattenFilename(io::path& directory, const io::path& root
{ {
subdir = directory.subString(lastpos, pos - lastpos + 1); subdir = directory.subString(lastpos, pos - lastpos + 1);
if (subdir == _IRR_TEXT("../")) if (subdir == IRR_TEXT("../"))
{ {
if (lastWasRealDir) if (lastWasRealDir)
{ {
@ -733,11 +733,11 @@ io::path& CFileSystem::flattenFilename(io::path& directory, const io::path& root
lastWasRealDir=false; lastWasRealDir=false;
} }
} }
else if (subdir == _IRR_TEXT("/")) else if (subdir == IRR_TEXT("/"))
{ {
dir = root; dir = root;
} }
else if (subdir != _IRR_TEXT("./")) else if (subdir != IRR_TEXT("./"))
{ {
dir.append(subdir); dir.append(subdir);
lastWasRealDir=true; lastWasRealDir=true;
@ -760,8 +760,8 @@ path CFileSystem::getRelativeFilename(const path& filename, const path& director
core::splitFilename(getAbsolutePath(filename), &path1, &file, &ext); core::splitFilename(getAbsolutePath(filename), &path1, &file, &ext);
io::path path2(getAbsolutePath(directory)); io::path path2(getAbsolutePath(directory));
core::list<io::path> list1, list2; core::list<io::path> list1, list2;
path1.split(list1, _IRR_TEXT("/\\"), 2); path1.split(list1, IRR_TEXT("/\\"), 2);
path2.split(list2, _IRR_TEXT("/\\"), 2); path2.split(list2, IRR_TEXT("/\\"), 2);
u32 i=0; u32 i=0;
core::list<io::path>::ConstIterator it1,it2; core::list<io::path>::ConstIterator it1,it2;
it1=list1.begin(); it1=list1.begin();
@ -774,9 +774,9 @@ path CFileSystem::getRelativeFilename(const path& filename, const path& director
prefix1 = *it1; prefix1 = *it1;
if ( it2 != list2.end() ) if ( it2 != list2.end() )
prefix2 = *it2; prefix2 = *it2;
if ( prefix1.size() > 1 && prefix1[1] == _IRR_TEXT(':') ) if ( prefix1.size() > 1 && prefix1[1] == IRR_TEXT(':') )
partition1 = core::locale_lower(prefix1[0]); partition1 = core::locale_lower(prefix1[0]);
if ( prefix2.size() > 1 && prefix2[1] == _IRR_TEXT(':') ) if ( prefix2.size() > 1 && prefix2[1] == IRR_TEXT(':') )
partition2 = core::locale_lower(prefix2[0]); partition2 = core::locale_lower(prefix2[0]);
// must have the same prefix or we can't resolve it to a relative filename // must have the same prefix or we can't resolve it to a relative filename
@ -798,18 +798,18 @@ path CFileSystem::getRelativeFilename(const path& filename, const path& director
++it1; ++it1;
++it2; ++it2;
} }
path1=_IRR_TEXT(""); path1=IRR_TEXT("");
for (; i<list2.size(); ++i) for (; i<list2.size(); ++i)
path1 += _IRR_TEXT("../"); path1 += IRR_TEXT("../");
while (it1 != list1.end()) while (it1 != list1.end())
{ {
path1 += *it1++; path1 += *it1++;
path1 += _IRR_TEXT('/'); path1 += IRR_TEXT('/');
} }
path1 += file; path1 += file;
if (ext.size()) if (ext.size())
{ {
path1 += _IRR_TEXT('.'); path1 += IRR_TEXT('.');
path1 += ext; path1 += ext;
} }
return path1; return path1;
@ -877,7 +877,7 @@ IFileList* CFileSystem::createFileList()
r = new CFileList(Path, false, false); r = new CFileList(Path, false, false);
r->addItem(Path + _IRR_TEXT(".."), 0, 0, true, 0); r->addItem(Path + IRR_TEXT(".."), 0, 0, true, 0);
//! We use the POSIX compliant methods instead of scandir //! We use the POSIX compliant methods instead of scandir
DIR* dirHandle=opendir(Path.c_str()); DIR* dirHandle=opendir(Path.c_str());
@ -924,10 +924,10 @@ IFileList* CFileSystem::createFileList()
SFileListEntry e3; SFileListEntry e3;
//! PWD //! PWD
r->addItem(Path + _IRR_TEXT("."), 0, 0, true, 0); r->addItem(Path + IRR_TEXT("."), 0, 0, true, 0);
//! parent //! parent
r->addItem(Path + _IRR_TEXT(".."), 0, 0, true, 0); r->addItem(Path + IRR_TEXT(".."), 0, 0, true, 0);
//! merge archives //! merge archives
for (u32 i=0; i < FileArchives.size(); ++i) for (u32 i=0; i < FileArchives.size(); ++i)

79
source/Irrlicht/CFileSystem.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_FILE_SYSTEM_H_INCLUDED__ #ifndef IRR_C_FILE_SYSTEM_H_INCLUDED
#define __C_FILE_SYSTEM_H_INCLUDED__ #define IRR_C_FILE_SYSTEM_H_INCLUDED
#include "IFileSystem.h" #include "IFileSystem.h"
#include "irrArray.h" #include "irrArray.h"
@ -31,128 +31,128 @@ public:
virtual ~CFileSystem(); virtual ~CFileSystem();
//! opens a file for read access //! opens a file for read access
virtual IReadFile* createAndOpenFile(const io::path& filename) _IRR_OVERRIDE_; virtual IReadFile* createAndOpenFile(const io::path& filename) IRR_OVERRIDE;
//! Creates an IReadFile interface for accessing memory like a file. //! Creates an IReadFile interface for accessing memory like a file.
virtual IReadFile* createMemoryReadFile(const void* memory, s32 len, const io::path& fileName, bool deleteMemoryWhenDropped = false) _IRR_OVERRIDE_; virtual IReadFile* createMemoryReadFile(const void* memory, s32 len, const io::path& fileName, bool deleteMemoryWhenDropped = false) IRR_OVERRIDE;
//! Creates an IReadFile interface for accessing files inside files //! Creates an IReadFile interface for accessing files inside files
virtual IReadFile* createLimitReadFile(const io::path& fileName, IReadFile* alreadyOpenedFile, long pos, long areaSize) _IRR_OVERRIDE_; virtual IReadFile* createLimitReadFile(const io::path& fileName, IReadFile* alreadyOpenedFile, long pos, long areaSize) IRR_OVERRIDE;
//! Creates an IWriteFile interface for accessing memory like a file. //! Creates an IWriteFile interface for accessing memory like a file.
virtual IWriteFile* createMemoryWriteFile(void* memory, s32 len, const io::path& fileName, bool deleteMemoryWhenDropped=false) _IRR_OVERRIDE_; virtual IWriteFile* createMemoryWriteFile(void* memory, s32 len, const io::path& fileName, bool deleteMemoryWhenDropped=false) IRR_OVERRIDE;
//! Opens a file for write access. //! Opens a file for write access.
virtual IWriteFile* createAndWriteFile(const io::path& filename, bool append=false) _IRR_OVERRIDE_; virtual IWriteFile* createAndWriteFile(const io::path& filename, bool append=false) IRR_OVERRIDE;
//! Adds an archive to the file system. //! Adds an archive to the file system.
virtual bool addFileArchive(const io::path& filename, virtual bool addFileArchive(const io::path& filename,
bool ignoreCase = true, bool ignorePaths = true, bool ignoreCase = true, bool ignorePaths = true,
E_FILE_ARCHIVE_TYPE archiveType = EFAT_UNKNOWN, E_FILE_ARCHIVE_TYPE archiveType = EFAT_UNKNOWN,
const core::stringc& password="", const core::stringc& password="",
IFileArchive** retArchive = 0) _IRR_OVERRIDE_; IFileArchive** retArchive = 0) IRR_OVERRIDE;
//! Adds an archive to the file system. //! Adds an archive to the file system.
virtual bool addFileArchive(IReadFile* file, bool ignoreCase=true, virtual bool addFileArchive(IReadFile* file, bool ignoreCase=true,
bool ignorePaths=true, bool ignorePaths=true,
E_FILE_ARCHIVE_TYPE archiveType=EFAT_UNKNOWN, E_FILE_ARCHIVE_TYPE archiveType=EFAT_UNKNOWN,
const core::stringc& password="", const core::stringc& password="",
IFileArchive** retArchive = 0) _IRR_OVERRIDE_; IFileArchive** retArchive = 0) IRR_OVERRIDE;
//! Adds an archive to the file system. //! Adds an archive to the file system.
virtual bool addFileArchive(IFileArchive* archive) _IRR_OVERRIDE_; virtual bool addFileArchive(IFileArchive* archive) IRR_OVERRIDE;
//! move the hirarchy of the filesystem. moves sourceIndex relative up or down //! move the hirarchy of the filesystem. moves sourceIndex relative up or down
virtual bool moveFileArchive(u32 sourceIndex, s32 relative) _IRR_OVERRIDE_; virtual bool moveFileArchive(u32 sourceIndex, s32 relative) IRR_OVERRIDE;
//! Adds an external archive loader to the engine. //! Adds an external archive loader to the engine.
virtual void addArchiveLoader(IArchiveLoader* loader) _IRR_OVERRIDE_; virtual void addArchiveLoader(IArchiveLoader* loader) IRR_OVERRIDE;
//! Returns the total number of archive loaders added. //! Returns the total number of archive loaders added.
virtual u32 getArchiveLoaderCount() const _IRR_OVERRIDE_; virtual u32 getArchiveLoaderCount() const IRR_OVERRIDE;
//! Gets the archive loader by index. //! Gets the archive loader by index.
virtual IArchiveLoader* getArchiveLoader(u32 index) const _IRR_OVERRIDE_; virtual IArchiveLoader* getArchiveLoader(u32 index) const IRR_OVERRIDE;
//! gets the file archive count //! gets the file archive count
virtual u32 getFileArchiveCount() const _IRR_OVERRIDE_; virtual u32 getFileArchiveCount() const IRR_OVERRIDE;
//! gets an archive //! gets an archive
virtual IFileArchive* getFileArchive(u32 index) _IRR_OVERRIDE_; virtual IFileArchive* getFileArchive(u32 index) IRR_OVERRIDE;
//! removes an archive from the file system. //! removes an archive from the file system.
virtual bool removeFileArchive(u32 index) _IRR_OVERRIDE_; virtual bool removeFileArchive(u32 index) IRR_OVERRIDE;
//! removes an archive from the file system. //! removes an archive from the file system.
virtual bool removeFileArchive(const io::path& filename) _IRR_OVERRIDE_; virtual bool removeFileArchive(const io::path& filename) IRR_OVERRIDE;
//! Removes an archive from the file system. //! Removes an archive from the file system.
virtual bool removeFileArchive(const IFileArchive* archive) _IRR_OVERRIDE_; virtual bool removeFileArchive(const IFileArchive* archive) IRR_OVERRIDE;
//! Returns the string of the current working directory //! Returns the string of the current working directory
virtual const io::path& getWorkingDirectory() _IRR_OVERRIDE_; virtual const io::path& getWorkingDirectory() IRR_OVERRIDE;
//! Changes the current Working Directory to the string given. //! Changes the current Working Directory to the string given.
//! The string is operating system dependent. Under Windows it will look //! The string is operating system dependent. Under Windows it will look
//! like this: "drive:\directory\sudirectory\" //! like this: "drive:\directory\sudirectory\"
virtual bool changeWorkingDirectoryTo(const io::path& newDirectory) _IRR_OVERRIDE_; virtual bool changeWorkingDirectoryTo(const io::path& newDirectory) IRR_OVERRIDE;
//! Converts a relative path to an absolute (unique) path, resolving symbolic links //! Converts a relative path to an absolute (unique) path, resolving symbolic links
virtual io::path getAbsolutePath(const io::path& filename) const _IRR_OVERRIDE_; virtual io::path getAbsolutePath(const io::path& filename) const IRR_OVERRIDE;
//! Returns the directory a file is located in. //! Returns the directory a file is located in.
/** \param filename: The file to get the directory from */ /** \param filename: The file to get the directory from */
virtual io::path getFileDir(const io::path& filename) const _IRR_OVERRIDE_; virtual io::path getFileDir(const io::path& filename) const IRR_OVERRIDE;
//! Returns the base part of a filename, i.e. the name without the directory //! Returns the base part of a filename, i.e. the name without the directory
//! part. If no directory is prefixed, the full name is returned. //! part. If no directory is prefixed, the full name is returned.
/** \param filename: The file to get the basename from */ /** \param filename: The file to get the basename from */
virtual io::path getFileBasename(const io::path& filename, bool keepExtension=true) const _IRR_OVERRIDE_; virtual io::path getFileBasename(const io::path& filename, bool keepExtension=true) const IRR_OVERRIDE;
//! flatten a path and file name for example: "/you/me/../." becomes "/you" //! flatten a path and file name for example: "/you/me/../." becomes "/you"
virtual io::path& flattenFilename( io::path& directory, const io::path& root = "/" ) const _IRR_OVERRIDE_; virtual io::path& flattenFilename( io::path& directory, const io::path& root = "/" ) const IRR_OVERRIDE;
//! Get the relative filename, relative to the given directory //! Get the relative filename, relative to the given directory
virtual path getRelativeFilename(const path& filename, const path& directory) const _IRR_OVERRIDE_; virtual path getRelativeFilename(const path& filename, const path& directory) const IRR_OVERRIDE;
virtual EFileSystemType setFileListSystem(EFileSystemType listType) _IRR_OVERRIDE_; virtual EFileSystemType setFileListSystem(EFileSystemType listType) IRR_OVERRIDE;
//! Creates a list of files and directories in the current working directory //! Creates a list of files and directories in the current working directory
//! and returns it. //! and returns it.
virtual IFileList* createFileList() _IRR_OVERRIDE_; virtual IFileList* createFileList() IRR_OVERRIDE;
//! Creates an empty filelist //! Creates an empty filelist
virtual IFileList* createEmptyFileList(const io::path& path, bool ignoreCase, bool ignorePaths) _IRR_OVERRIDE_; virtual IFileList* createEmptyFileList(const io::path& path, bool ignoreCase, bool ignorePaths) IRR_OVERRIDE;
//! determines if a file exists and would be able to be opened. //! determines if a file exists and would be able to be opened.
virtual bool existFile(const io::path& filename) const _IRR_OVERRIDE_; virtual bool existFile(const io::path& filename) const IRR_OVERRIDE;
//! Creates a XML Reader from a file. //! Creates a XML Reader from a file.
virtual IXMLReader* createXMLReader(const io::path& filename) _IRR_OVERRIDE_; virtual IXMLReader* createXMLReader(const io::path& filename) IRR_OVERRIDE;
//! Creates a XML Reader from a file. //! Creates a XML Reader from a file.
virtual IXMLReader* createXMLReader(IReadFile* file) _IRR_OVERRIDE_; virtual IXMLReader* createXMLReader(IReadFile* file) IRR_OVERRIDE;
//! Creates a XML Reader from a file. //! Creates a XML Reader from a file.
virtual IXMLReaderUTF8* createXMLReaderUTF8(const io::path& filename) _IRR_OVERRIDE_; virtual IXMLReaderUTF8* createXMLReaderUTF8(const io::path& filename) IRR_OVERRIDE;
//! Creates a XML Reader from a file. //! Creates a XML Reader from a file.
virtual IXMLReaderUTF8* createXMLReaderUTF8(IReadFile* file) _IRR_OVERRIDE_; virtual IXMLReaderUTF8* createXMLReaderUTF8(IReadFile* file) IRR_OVERRIDE;
//! Creates a XML Writer from a file. //! Creates a XML Writer from a file.
virtual IXMLWriter* createXMLWriter(const io::path& filename) _IRR_OVERRIDE_; virtual IXMLWriter* createXMLWriter(const io::path& filename) IRR_OVERRIDE;
//! Creates a XML Writer from a file. //! Creates a XML Writer from a file.
virtual IXMLWriter* createXMLWriter(IWriteFile* file) _IRR_OVERRIDE_; virtual IXMLWriter* createXMLWriter(IWriteFile* file) IRR_OVERRIDE;
//! Creates a XML Writer from a file which will write ASCII/UTF-8 characters (char*). //! Creates a XML Writer from a file which will write ASCII/UTF-8 characters (char*).
virtual IXMLWriterUTF8* createXMLWriterUTF8(const path& filename) _IRR_OVERRIDE_; virtual IXMLWriterUTF8* createXMLWriterUTF8(const path& filename) IRR_OVERRIDE;
//! Creates a XML Writer from a file which will write ASCII/UTF-8 characters (char*). //! Creates a XML Writer from a file which will write ASCII/UTF-8 characters (char*).
virtual IXMLWriterUTF8* createXMLWriterUTF8(IWriteFile* file) _IRR_OVERRIDE_; virtual IXMLWriterUTF8* createXMLWriterUTF8(IWriteFile* file) IRR_OVERRIDE;
//! Creates a new empty collection of attributes, usable for serialization and more. //! Creates a new empty collection of attributes, usable for serialization and more.
virtual IAttributes* createEmptyAttributes(video::IVideoDriver* driver) _IRR_OVERRIDE_; virtual IAttributes* createEmptyAttributes(video::IVideoDriver* driver) IRR_OVERRIDE;
private: private:
@ -176,4 +176,3 @@ private:
} // end namespace io } // end namespace io
#endif #endif

23
source/Irrlicht/CGLXManager.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in Irrlicht.h // For conditions of distribution and use, see copyright notice in Irrlicht.h
#ifndef __C_GLX_MANAGER_H_INCLUDED__ #ifndef IRR_C_GLX_MANAGER_H_INCLUDED
#define __C_GLX_MANAGER_H_INCLUDED__ #define IRR_C_GLX_MANAGER_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
@ -34,31 +34,31 @@ namespace video
~CGLXManager(); ~CGLXManager();
// Initialize // Initialize
virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) _IRR_OVERRIDE_; virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) IRR_OVERRIDE;
// Terminate // Terminate
virtual void terminate() _IRR_OVERRIDE_; virtual void terminate() IRR_OVERRIDE;
// Create surface. // Create surface.
virtual bool generateSurface() _IRR_OVERRIDE_; virtual bool generateSurface() IRR_OVERRIDE;
// Destroy surface. // Destroy surface.
virtual void destroySurface() _IRR_OVERRIDE_; virtual void destroySurface() IRR_OVERRIDE;
// Create context. // Create context.
virtual bool generateContext() _IRR_OVERRIDE_; virtual bool generateContext() IRR_OVERRIDE;
// Destroy context. // Destroy context.
virtual void destroyContext() _IRR_OVERRIDE_; virtual void destroyContext() IRR_OVERRIDE;
//! Get current context //! Get current context
virtual const SExposedVideoData& getContext() const _IRR_OVERRIDE_; virtual const SExposedVideoData& getContext() const IRR_OVERRIDE;
//! Change render context, disable old and activate new defined by videoData //! Change render context, disable old and activate new defined by videoData
virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) _IRR_OVERRIDE_; virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) IRR_OVERRIDE;
// Swap buffers. // Swap buffers.
virtual bool swapBuffers() _IRR_OVERRIDE_; virtual bool swapBuffers() IRR_OVERRIDE;
XVisualInfo* getVisual() const {return VisualInfo;} // return XVisualInfo XVisualInfo* getVisual() const {return VisualInfo;} // return XVisualInfo
@ -76,4 +76,3 @@ namespace video
#endif #endif
#endif #endif

77
source/Irrlicht/CGUIButton.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_BUTTON_H_INCLUDED__ #ifndef IRR_C_GUI_BUTTON_H_INCLUDED
#define __C_GUI_BUTTON_H_INCLUDED__ #define IRR_C_GUI_BUTTON_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -30,64 +30,64 @@ namespace gui
virtual ~CGUIButton(); virtual ~CGUIButton();
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! sets another skin independent font. if this is set to zero, the button uses the font of the skin. //! sets another skin independent font. if this is set to zero, the button uses the font of the skin.
virtual void setOverrideFont(IGUIFont* font=0) _IRR_OVERRIDE_; virtual void setOverrideFont(IGUIFont* font=0) IRR_OVERRIDE;
//! Gets the override font (if any) //! Gets the override font (if any)
virtual IGUIFont* getOverrideFont() const _IRR_OVERRIDE_; virtual IGUIFont* getOverrideFont() const IRR_OVERRIDE;
//! Get the font which is used right now for drawing //! Get the font which is used right now for drawing
virtual IGUIFont* getActiveFont() const _IRR_OVERRIDE_; virtual IGUIFont* getActiveFont() const IRR_OVERRIDE;
//! Sets another color for the button text. //! Sets another color for the button text.
virtual void setOverrideColor(video::SColor color) _IRR_OVERRIDE_; virtual void setOverrideColor(video::SColor color) IRR_OVERRIDE;
//! Gets the override color //! Gets the override color
virtual video::SColor getOverrideColor(void) const _IRR_OVERRIDE_; virtual video::SColor getOverrideColor(void) const IRR_OVERRIDE;
//! Gets the currently used text color //! Gets the currently used text color
virtual video::SColor getActiveColor() const _IRR_OVERRIDE_; virtual video::SColor getActiveColor() const IRR_OVERRIDE;
//! Sets if the button text should use the override color or the color in the gui skin. //! Sets if the button text should use the override color or the color in the gui skin.
virtual void enableOverrideColor(bool enable) _IRR_OVERRIDE_; virtual void enableOverrideColor(bool enable) IRR_OVERRIDE;
//! Checks if an override color is enabled //! Checks if an override color is enabled
virtual bool isOverrideColorEnabled(void) const _IRR_OVERRIDE_; virtual bool isOverrideColorEnabled(void) const IRR_OVERRIDE;
//! Sets an image which should be displayed on the button when it is in the given state. //! Sets an image which should be displayed on the button when it is in the given state.
virtual void setImage(EGUI_BUTTON_IMAGE_STATE state, video::ITexture* image=0, const core::rect<s32>& sourceRect=core::rect<s32>(0,0,0,0)) _IRR_OVERRIDE_; virtual void setImage(EGUI_BUTTON_IMAGE_STATE state, video::ITexture* image=0, const core::rect<s32>& sourceRect=core::rect<s32>(0,0,0,0)) IRR_OVERRIDE;
//! Sets an image which should be displayed on the button when it is in normal state. //! Sets an image which should be displayed on the button when it is in normal state.
virtual void setImage(video::ITexture* image=0) _IRR_OVERRIDE_ virtual void setImage(video::ITexture* image=0) IRR_OVERRIDE
{ {
setImage(EGBIS_IMAGE_UP, image); setImage(EGBIS_IMAGE_UP, image);
} }
//! Sets an image which should be displayed on the button when it is in normal state. //! Sets an image which should be displayed on the button when it is in normal state.
virtual void setImage(video::ITexture* image, const core::rect<s32>& pos) _IRR_OVERRIDE_ virtual void setImage(video::ITexture* image, const core::rect<s32>& pos) IRR_OVERRIDE
{ {
setImage(EGBIS_IMAGE_UP, image, pos); setImage(EGBIS_IMAGE_UP, image, pos);
} }
//! Sets an image which should be displayed on the button when it is in pressed state. //! Sets an image which should be displayed on the button when it is in pressed state.
virtual void setPressedImage(video::ITexture* image=0) _IRR_OVERRIDE_ virtual void setPressedImage(video::ITexture* image=0) IRR_OVERRIDE
{ {
setImage(EGBIS_IMAGE_DOWN, image); setImage(EGBIS_IMAGE_DOWN, image);
} }
//! Sets an image which should be displayed on the button when it is in pressed state. //! Sets an image which should be displayed on the button when it is in pressed state.
virtual void setPressedImage(video::ITexture* image, const core::rect<s32>& pos) _IRR_OVERRIDE_ virtual void setPressedImage(video::ITexture* image, const core::rect<s32>& pos) IRR_OVERRIDE
{ {
setImage(EGBIS_IMAGE_DOWN, image, pos); setImage(EGBIS_IMAGE_DOWN, image, pos);
} }
//! Sets the sprite bank used by the button //! Sets the sprite bank used by the button
virtual void setSpriteBank(IGUISpriteBank* bank=0) _IRR_OVERRIDE_; virtual void setSpriteBank(IGUISpriteBank* bank=0) IRR_OVERRIDE;
//! Sets the animated sprite for a specific button state //! Sets the animated sprite for a specific button state
/** \param index: Number of the sprite within the sprite bank, use -1 for no sprite /** \param index: Number of the sprite within the sprite bank, use -1 for no sprite
@ -97,69 +97,69 @@ namespace gui
*/ */
virtual void setSprite(EGUI_BUTTON_STATE state, s32 index, virtual void setSprite(EGUI_BUTTON_STATE state, s32 index,
video::SColor color=video::SColor(255,255,255,255), video::SColor color=video::SColor(255,255,255,255),
bool loop=false, bool scale=false) _IRR_OVERRIDE_; bool loop=false, bool scale=false) IRR_OVERRIDE;
//! Get the sprite-index for the given state or -1 when no sprite is set //! Get the sprite-index for the given state or -1 when no sprite is set
virtual s32 getSpriteIndex(EGUI_BUTTON_STATE state) const _IRR_OVERRIDE_; virtual s32 getSpriteIndex(EGUI_BUTTON_STATE state) const IRR_OVERRIDE;
//! Get the sprite color for the given state. Color is only used when a sprite is set. //! Get the sprite color for the given state. Color is only used when a sprite is set.
virtual video::SColor getSpriteColor(EGUI_BUTTON_STATE state) const _IRR_OVERRIDE_; virtual video::SColor getSpriteColor(EGUI_BUTTON_STATE state) const IRR_OVERRIDE;
//! Returns if the sprite in the given state does loop //! Returns if the sprite in the given state does loop
virtual bool getSpriteLoop(EGUI_BUTTON_STATE state) const _IRR_OVERRIDE_; virtual bool getSpriteLoop(EGUI_BUTTON_STATE state) const IRR_OVERRIDE;
//! Returns if the sprite in the given state is scaled //! Returns if the sprite in the given state is scaled
virtual bool getSpriteScale(EGUI_BUTTON_STATE state) const _IRR_OVERRIDE_; virtual bool getSpriteScale(EGUI_BUTTON_STATE state) const IRR_OVERRIDE;
//! Sets if the button should behave like a push button. Which means it //! 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, //! can be in two states: Normal or Pressed. With a click on the button,
//! the user can change the state of the button. //! the user can change the state of the button.
virtual void setIsPushButton(bool isPushButton=true) _IRR_OVERRIDE_; virtual void setIsPushButton(bool isPushButton=true) IRR_OVERRIDE;
//! Checks whether the button is a push button //! Checks whether the button is a push button
virtual bool isPushButton() const _IRR_OVERRIDE_; virtual bool isPushButton() const IRR_OVERRIDE;
//! Sets the pressed state of the button if this is a pushbutton //! Sets the pressed state of the button if this is a pushbutton
virtual void setPressed(bool pressed=true) _IRR_OVERRIDE_; virtual void setPressed(bool pressed=true) IRR_OVERRIDE;
//! Returns if the button is currently pressed //! Returns if the button is currently pressed
virtual bool isPressed() const _IRR_OVERRIDE_; virtual bool isPressed() const IRR_OVERRIDE;
//! Sets if the button should use the skin to draw its border //! Sets if the button should use the skin to draw its border
virtual void setDrawBorder(bool border=true) _IRR_OVERRIDE_; virtual void setDrawBorder(bool border=true) IRR_OVERRIDE;
//! Checks if the button face and border are being drawn //! Checks if the button face and border are being drawn
virtual bool isDrawingBorder() const _IRR_OVERRIDE_; virtual bool isDrawingBorder() const IRR_OVERRIDE;
//! Sets if the alpha channel should be used for drawing images on the button (default is false) //! Sets if the alpha channel should be used for drawing images on the button (default is false)
virtual void setUseAlphaChannel(bool useAlphaChannel=true) _IRR_OVERRIDE_; virtual void setUseAlphaChannel(bool useAlphaChannel=true) IRR_OVERRIDE;
//! Checks if the alpha channel should be used for drawing images on the button //! Checks if the alpha channel should be used for drawing images on the button
virtual bool isAlphaChannelUsed() const _IRR_OVERRIDE_; virtual bool isAlphaChannelUsed() const IRR_OVERRIDE;
//! Sets if the button should scale the button images to fit //! Sets if the button should scale the button images to fit
virtual void setScaleImage(bool scaleImage=true) _IRR_OVERRIDE_; virtual void setScaleImage(bool scaleImage=true) IRR_OVERRIDE;
//! Checks whether the button scales the used images //! Checks whether the button scales the used images
virtual bool isScalingImage() const _IRR_OVERRIDE_; virtual bool isScalingImage() const IRR_OVERRIDE;
//! Get if the shift key was pressed in last EGET_BUTTON_CLICKED event //! Get if the shift key was pressed in last EGET_BUTTON_CLICKED event
virtual bool getClickShiftState() const _IRR_OVERRIDE_ virtual bool getClickShiftState() const IRR_OVERRIDE
{ {
return ClickShiftState; return ClickShiftState;
} }
//! Get if the control key was pressed in last EGET_BUTTON_CLICKED event //! Get if the control key was pressed in last EGET_BUTTON_CLICKED event
virtual bool getClickControlState() const _IRR_OVERRIDE_ virtual bool getClickControlState() const IRR_OVERRIDE
{ {
return ClickControlState; return ClickControlState;
} }
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the element //! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
protected: protected:
void drawSprite(EGUI_BUTTON_STATE state, u32 startTime, const core::position2di& center); void drawSprite(EGUI_BUTTON_STATE state, u32 startTime, const core::position2di& center);
@ -252,5 +252,4 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // __C_GUI_BUTTON_H_INCLUDED__ #endif // IRR_C_GUI_BUTTON_H_INCLUDED

28
source/Irrlicht/CGUICheckBox.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_CHECKBOX_H_INCLUDED__ #ifndef IRR_C_GUI_CHECKBOX_H_INCLUDED
#define __C_GUI_CHECKBOX_H_INCLUDED__ #define IRR_C_GUI_CHECKBOX_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -23,36 +23,36 @@ namespace gui
CGUICheckBox(bool checked, IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle); CGUICheckBox(bool checked, IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle);
//! set if box is checked //! set if box is checked
virtual void setChecked(bool checked) _IRR_OVERRIDE_; virtual void setChecked(bool checked) IRR_OVERRIDE;
//! returns if box is checked //! returns if box is checked
virtual bool isChecked() const _IRR_OVERRIDE_; virtual bool isChecked() const IRR_OVERRIDE;
//! Sets whether to draw the background //! Sets whether to draw the background
virtual void setDrawBackground(bool draw) _IRR_OVERRIDE_; virtual void setDrawBackground(bool draw) IRR_OVERRIDE;
//! Checks if background drawing is enabled //! Checks if background drawing is enabled
/** \return true if background drawing is enabled, false otherwise */ /** \return true if background drawing is enabled, false otherwise */
virtual bool isDrawBackgroundEnabled() const _IRR_OVERRIDE_; virtual bool isDrawBackgroundEnabled() const IRR_OVERRIDE;
//! Sets whether to draw the border //! Sets whether to draw the border
virtual void setDrawBorder(bool draw) _IRR_OVERRIDE_; virtual void setDrawBorder(bool draw) IRR_OVERRIDE;
//! Checks if border drawing is enabled //! Checks if border drawing is enabled
/** \return true if border drawing is enabled, false otherwise */ /** \return true if border drawing is enabled, false otherwise */
virtual bool isDrawBorderEnabled() const _IRR_OVERRIDE_; virtual bool isDrawBorderEnabled() const IRR_OVERRIDE;
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the element //! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
private: private:
@ -66,6 +66,6 @@ namespace gui
} // end namespace gui } // end namespace gui
} // end namespace irr } // end namespace irr
#endif // __C_GUI_CHECKBOX_H_INCLUDED__
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // IRR_C_GUI_CHECKBOX_H_INCLUDED

14
source/Irrlicht/CGUIColorSelectDialog.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__ #ifndef IRR_C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED
#define __C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__ #define IRR_C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -31,13 +31,13 @@ namespace gui
virtual ~CGUIColorSelectDialog(); virtual ~CGUIColorSelectDialog();
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
virtual video::SColor getColor() _IRR_OVERRIDE_; virtual video::SColor getColor() IRR_OVERRIDE;
virtual video::SColorHSL getColorHSL() _IRR_OVERRIDE_; virtual video::SColorHSL getColorHSL() IRR_OVERRIDE;
private: private:
@ -71,4 +71,4 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // __C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__ #endif // IRR_C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED

41
source/Irrlicht/CGUIComboBox.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_COMBO_BOX_H_INCLUDED__ #ifndef IRR_C_GUI_COMBO_BOX_H_INCLUDED
#define __C_GUI_COMBO_BOX_H_INCLUDED__ #define IRR_C_GUI_COMBO_BOX_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -30,55 +30,55 @@ namespace gui
s32 id, core::rect<s32> rectangle); s32 id, core::rect<s32> rectangle);
//! Returns amount of items in box //! Returns amount of items in box
virtual u32 getItemCount() const _IRR_OVERRIDE_; virtual u32 getItemCount() const IRR_OVERRIDE;
//! returns string of an item. the idx may be a value from 0 to itemCount-1 //! returns string of an item. the idx may be a value from 0 to itemCount-1
virtual const wchar_t* getItem(u32 idx) const _IRR_OVERRIDE_; virtual const wchar_t* getItem(u32 idx) const IRR_OVERRIDE;
//! Returns item data of an item. the idx may be a value from 0 to itemCount-1 //! Returns item data of an item. the idx may be a value from 0 to itemCount-1
virtual u32 getItemData(u32 idx) const _IRR_OVERRIDE_; virtual u32 getItemData(u32 idx) const IRR_OVERRIDE;
//! Returns index based on item data //! Returns index based on item data
virtual s32 getIndexForItemData( u32 data ) const _IRR_OVERRIDE_; virtual s32 getIndexForItemData( u32 data ) const IRR_OVERRIDE;
//! adds an item and returns the index of it //! adds an item and returns the index of it
virtual u32 addItem(const wchar_t* text, u32 data) _IRR_OVERRIDE_; virtual u32 addItem(const wchar_t* text, u32 data) IRR_OVERRIDE;
//! Removes an item from the combo box. //! Removes an item from the combo box.
virtual void removeItem(u32 id) _IRR_OVERRIDE_; virtual void removeItem(u32 id) IRR_OVERRIDE;
//! deletes all items in the combo box //! deletes all items in the combo box
virtual void clear() _IRR_OVERRIDE_; virtual void clear() IRR_OVERRIDE;
//! returns the text of the currently selected item //! returns the text of the currently selected item
virtual const wchar_t* getText() const _IRR_OVERRIDE_; virtual const wchar_t* getText() const IRR_OVERRIDE;
//! returns id of selected item. returns -1 if no item is selected. //! returns id of selected item. returns -1 if no item is selected.
virtual s32 getSelected() const _IRR_OVERRIDE_; virtual s32 getSelected() const IRR_OVERRIDE;
//! sets the selected item. Set this to -1 if no item should be selected //! sets the selected item. Set this to -1 if no item should be selected
virtual void setSelected(s32 idx) _IRR_OVERRIDE_; virtual void setSelected(s32 idx) IRR_OVERRIDE;
//! sets the text alignment of the text part //! sets the text alignment of the text part
virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) _IRR_OVERRIDE_; virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) IRR_OVERRIDE;
//! Set the maximal number of rows for the selection listbox //! Set the maximal number of rows for the selection listbox
virtual void setMaxSelectionRows(u32 max) _IRR_OVERRIDE_; virtual void setMaxSelectionRows(u32 max) IRR_OVERRIDE;
//! Get the maximal number of rows for the selection listbox //! Get the maximal number of rows for the selection listbox
virtual u32 getMaxSelectionRows() const _IRR_OVERRIDE_; virtual u32 getMaxSelectionRows() const IRR_OVERRIDE;
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the element //! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
private: private:
@ -115,5 +115,4 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // __C_GUI_COMBO_BOX_H_INCLUDED__ #endif // IRR_C_GUI_COMBO_BOX_H_INCLUDED

61
source/Irrlicht/CGUIContextMenu.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_CONTEXT_MENU_H_INCLUDED__ #ifndef IRR_C_GUI_CONTEXT_MENU_H_INCLUDED
#define __C_GUI_CONTEXT_MENU_H_INCLUDED__ #define IRR_C_GUI_CONTEXT_MENU_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -32,91 +32,91 @@ namespace gui
virtual ~CGUIContextMenu(); virtual ~CGUIContextMenu();
//! set behavior when menus are closed //! set behavior when menus are closed
virtual void setCloseHandling(ECONTEXT_MENU_CLOSE onClose) _IRR_OVERRIDE_; virtual void setCloseHandling(ECONTEXT_MENU_CLOSE onClose) IRR_OVERRIDE;
//! get current behavior when the menue will be closed //! get current behavior when the menue will be closed
virtual ECONTEXT_MENU_CLOSE getCloseHandling() const _IRR_OVERRIDE_; virtual ECONTEXT_MENU_CLOSE getCloseHandling() const IRR_OVERRIDE;
//! Returns amount of menu items //! Returns amount of menu items
virtual u32 getItemCount() const _IRR_OVERRIDE_; virtual u32 getItemCount() const IRR_OVERRIDE;
//! Adds a menu item. //! Adds a menu item.
virtual u32 addItem(const wchar_t* text, s32 commandid, virtual u32 addItem(const wchar_t* text, s32 commandid,
bool enabled, bool hasSubMenu, bool checked, bool autoChecking) _IRR_OVERRIDE_; bool enabled, bool hasSubMenu, bool checked, bool autoChecking) IRR_OVERRIDE;
//! Insert a menu item at specified position. //! Insert a menu item at specified position.
virtual u32 insertItem(u32 idx, const wchar_t* text, s32 commandId, bool enabled, virtual u32 insertItem(u32 idx, const wchar_t* text, s32 commandId, bool enabled,
bool hasSubMenu, bool checked, bool autoChecking) _IRR_OVERRIDE_; bool hasSubMenu, bool checked, bool autoChecking) IRR_OVERRIDE;
//! Find a item which has the given CommandId starting from given index //! Find a item which has the given CommandId starting from given index
virtual s32 findItemWithCommandId(s32 commandId, u32 idxStartSearch) const _IRR_OVERRIDE_; virtual s32 findItemWithCommandId(s32 commandId, u32 idxStartSearch) const IRR_OVERRIDE;
//! Adds a separator item to the menu //! Adds a separator item to the menu
virtual void addSeparator() _IRR_OVERRIDE_; virtual void addSeparator() IRR_OVERRIDE;
//! Returns text of the menu item. //! Returns text of the menu item.
virtual const wchar_t* getItemText(u32 idx) const _IRR_OVERRIDE_; virtual const wchar_t* getItemText(u32 idx) const IRR_OVERRIDE;
//! Sets text of the menu item. //! Sets text of the menu item.
virtual void setItemText(u32 idx, const wchar_t* text) _IRR_OVERRIDE_; virtual void setItemText(u32 idx, const wchar_t* text) IRR_OVERRIDE;
//! Returns if a menu item is enabled //! Returns if a menu item is enabled
virtual bool isItemEnabled(u32 idx) const _IRR_OVERRIDE_; virtual bool isItemEnabled(u32 idx) const IRR_OVERRIDE;
//! Sets if the menu item should be enabled. //! Sets if the menu item should be enabled.
virtual void setItemEnabled(u32 idx, bool enabled) _IRR_OVERRIDE_; virtual void setItemEnabled(u32 idx, bool enabled) IRR_OVERRIDE;
//! Returns if a menu item is checked //! Returns if a menu item is checked
virtual bool isItemChecked(u32 idx) const _IRR_OVERRIDE_; virtual bool isItemChecked(u32 idx) const IRR_OVERRIDE;
//! Sets if the menu item should be checked. //! Sets if the menu item should be checked.
virtual void setItemChecked(u32 idx, bool enabled) _IRR_OVERRIDE_; virtual void setItemChecked(u32 idx, bool enabled) IRR_OVERRIDE;
//! Removes a menu item //! Removes a menu item
virtual void removeItem(u32 idx) _IRR_OVERRIDE_; virtual void removeItem(u32 idx) IRR_OVERRIDE;
//! Removes all menu items //! Removes all menu items
virtual void removeAllItems() _IRR_OVERRIDE_; virtual void removeAllItems() IRR_OVERRIDE;
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! Returns the selected item in the menu //! Returns the selected item in the menu
virtual s32 getSelectedItem() const _IRR_OVERRIDE_; virtual s32 getSelectedItem() const IRR_OVERRIDE;
//! Returns a pointer to the submenu of an item. //! Returns a pointer to the submenu of an item.
//! \return Pointer to the submenu of an item. //! \return Pointer to the submenu of an item.
virtual IGUIContextMenu* getSubMenu(u32 idx) const _IRR_OVERRIDE_; virtual IGUIContextMenu* getSubMenu(u32 idx) const IRR_OVERRIDE;
//! Sets the visible state of this element. //! Sets the visible state of this element.
virtual void setVisible(bool visible) _IRR_OVERRIDE_; virtual void setVisible(bool visible) IRR_OVERRIDE;
//! should the element change the checked status on clicking //! should the element change the checked status on clicking
virtual void setItemAutoChecking(u32 idx, bool autoChecking) _IRR_OVERRIDE_; virtual void setItemAutoChecking(u32 idx, bool autoChecking) IRR_OVERRIDE;
//! does the element change the checked status on clicking //! does the element change the checked status on clicking
virtual bool getItemAutoChecking(u32 idx) const _IRR_OVERRIDE_; virtual bool getItemAutoChecking(u32 idx) const IRR_OVERRIDE;
//! Returns command id of a menu item //! Returns command id of a menu item
virtual s32 getItemCommandId(u32 idx) const _IRR_OVERRIDE_; virtual s32 getItemCommandId(u32 idx) const IRR_OVERRIDE;
//! Sets the command id of a menu item //! Sets the command id of a menu item
virtual void setItemCommandId(u32 idx, s32 id) _IRR_OVERRIDE_; virtual void setItemCommandId(u32 idx, s32 id) IRR_OVERRIDE;
//! Adds a sub menu from an element that already exists. //! Adds a sub menu from an element that already exists.
virtual void setSubMenu(u32 index, CGUIContextMenu* menu); virtual void setSubMenu(u32 index, CGUIContextMenu* menu);
//! When an eventparent is set it receives events instead of the usual parent element //! When an eventparent is set it receives events instead of the usual parent element
virtual void setEventParent(IGUIElement *parent) _IRR_OVERRIDE_; virtual void setEventParent(IGUIElement *parent) IRR_OVERRIDE;
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the element //! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
protected: protected:
@ -170,5 +170,4 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // __C_GUI_CONTEXT_MENU_H_INCLUDED__ #endif // IRR_C_GUI_CONTEXT_MENU_H_INCLUDED

73
source/Irrlicht/CGUIEditBox.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_EDIT_BOX_H_INCLUDED__ #ifndef IRR_C_GUI_EDIT_BOX_H_INCLUDED
#define __C_GUI_EDIT_BOX_H_INCLUDED__ #define IRR_C_GUI_EDIT_BOX_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -28,122 +28,122 @@ namespace gui
virtual ~CGUIEditBox(); virtual ~CGUIEditBox();
//! Sets another skin independent font. //! Sets another skin independent font.
virtual void setOverrideFont(IGUIFont* font=0) _IRR_OVERRIDE_; virtual void setOverrideFont(IGUIFont* font=0) IRR_OVERRIDE;
//! Gets the override font (if any) //! Gets the override font (if any)
/** \return The override font (may be 0) */ /** \return The override font (may be 0) */
virtual IGUIFont* getOverrideFont() const _IRR_OVERRIDE_; virtual IGUIFont* getOverrideFont() const IRR_OVERRIDE;
//! Get the font which is used right now for drawing //! Get the font which is used right now for drawing
/** Currently this is the override font when one is set and the /** Currently this is the override font when one is set and the
font of the active skin otherwise */ font of the active skin otherwise */
virtual IGUIFont* getActiveFont() const _IRR_OVERRIDE_; virtual IGUIFont* getActiveFont() const IRR_OVERRIDE;
//! Sets another color for the text. //! Sets another color for the text.
virtual void setOverrideColor(video::SColor color) _IRR_OVERRIDE_; virtual void setOverrideColor(video::SColor color) IRR_OVERRIDE;
//! Gets the override color //! Gets the override color
virtual video::SColor getOverrideColor() const _IRR_OVERRIDE_; virtual video::SColor getOverrideColor() const IRR_OVERRIDE;
//! Sets if the text should use the override color or the //! Sets if the text should use the override color or the
//! color in the gui skin. //! color in the gui skin.
virtual void enableOverrideColor(bool enable) _IRR_OVERRIDE_; virtual void enableOverrideColor(bool enable) IRR_OVERRIDE;
//! Checks if an override color is enabled //! Checks if an override color is enabled
/** \return true if the override color is enabled, false otherwise */ /** \return true if the override color is enabled, false otherwise */
virtual bool isOverrideColorEnabled(void) const _IRR_OVERRIDE_; virtual bool isOverrideColorEnabled(void) const IRR_OVERRIDE;
//! Sets whether to draw the background //! Sets whether to draw the background
virtual void setDrawBackground(bool draw) _IRR_OVERRIDE_; virtual void setDrawBackground(bool draw) IRR_OVERRIDE;
//! Checks if background drawing is enabled //! Checks if background drawing is enabled
virtual bool isDrawBackgroundEnabled() const _IRR_OVERRIDE_; virtual bool isDrawBackgroundEnabled() const IRR_OVERRIDE;
//! Turns the border on or off //! Turns the border on or off
virtual void setDrawBorder(bool border) _IRR_OVERRIDE_; virtual void setDrawBorder(bool border) IRR_OVERRIDE;
//! Checks if border drawing is enabled //! Checks if border drawing is enabled
virtual bool isDrawBorderEnabled() const _IRR_OVERRIDE_; virtual bool isDrawBorderEnabled() const IRR_OVERRIDE;
//! Enables or disables word wrap for using the edit box as multiline text editor. //! Enables or disables word wrap for using the edit box as multiline text editor.
virtual void setWordWrap(bool enable) _IRR_OVERRIDE_; virtual void setWordWrap(bool enable) IRR_OVERRIDE;
//! Checks if word wrap is enabled //! Checks if word wrap is enabled
//! \return true if word wrap is enabled, false otherwise //! \return true if word wrap is enabled, false otherwise
virtual bool isWordWrapEnabled() const _IRR_OVERRIDE_; virtual bool isWordWrapEnabled() const IRR_OVERRIDE;
//! Enables or disables newlines. //! Enables or disables newlines.
/** \param enable: If set to true, the EGET_EDITBOX_ENTER event will not be fired, /** \param enable: If set to true, the EGET_EDITBOX_ENTER event will not be fired,
instead a newline character will be inserted. */ instead a newline character will be inserted. */
virtual void setMultiLine(bool enable) _IRR_OVERRIDE_; virtual void setMultiLine(bool enable) IRR_OVERRIDE;
//! Checks if multi line editing is enabled //! Checks if multi line editing is enabled
//! \return true if mult-line is enabled, false otherwise //! \return true if mult-line is enabled, false otherwise
virtual bool isMultiLineEnabled() const _IRR_OVERRIDE_; virtual bool isMultiLineEnabled() const IRR_OVERRIDE;
//! Enables or disables automatic scrolling with cursor position //! Enables or disables automatic scrolling with cursor position
//! \param enable: If set to true, the text will move around with the cursor position //! \param enable: If set to true, the text will move around with the cursor position
virtual void setAutoScroll(bool enable) _IRR_OVERRIDE_; virtual void setAutoScroll(bool enable) IRR_OVERRIDE;
//! Checks to see if automatic scrolling is enabled //! Checks to see if automatic scrolling is enabled
//! \return true if automatic scrolling is enabled, false if not //! \return true if automatic scrolling is enabled, false if not
virtual bool isAutoScrollEnabled() const _IRR_OVERRIDE_; virtual bool isAutoScrollEnabled() const IRR_OVERRIDE;
//! Gets the size area of the text in the edit box //! Gets the size area of the text in the edit box
//! \return Returns the size in pixels of the text //! \return Returns the size in pixels of the text
virtual core::dimension2du getTextDimension() _IRR_OVERRIDE_; virtual core::dimension2du getTextDimension() IRR_OVERRIDE;
//! Sets text justification //! Sets text justification
virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) _IRR_OVERRIDE_; virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) IRR_OVERRIDE;
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! Sets the new caption of this element. //! Sets the new caption of this element.
virtual void setText(const wchar_t* text) _IRR_OVERRIDE_; virtual void setText(const wchar_t* text) IRR_OVERRIDE;
//! Sets the maximum amount of characters which may be entered in the box. //! Sets the maximum amount of characters which may be entered in the box.
//! \param max: Maximum amount of characters. If 0, the character amount is //! \param max: Maximum amount of characters. If 0, the character amount is
//! infinity. //! infinity.
virtual void setMax(u32 max) _IRR_OVERRIDE_; virtual void setMax(u32 max) IRR_OVERRIDE;
//! Returns maximum amount of characters, previously set by setMax(); //! Returns maximum amount of characters, previously set by setMax();
virtual u32 getMax() const _IRR_OVERRIDE_; virtual u32 getMax() const IRR_OVERRIDE;
//! Set the character used for the cursor. //! Set the character used for the cursor.
/** By default it's "_" */ /** By default it's "_" */
virtual void setCursorChar(const wchar_t cursorChar) _IRR_OVERRIDE_; virtual void setCursorChar(const wchar_t cursorChar) IRR_OVERRIDE;
//! Get the character used for the cursor. //! Get the character used for the cursor.
virtual wchar_t getCursorChar() const _IRR_OVERRIDE_; virtual wchar_t getCursorChar() const IRR_OVERRIDE;
//! Set the blinktime for the cursor. 2x blinktime is one full cycle. //! Set the blinktime for the cursor. 2x blinktime is one full cycle.
//** \param timeMs Blinktime in milliseconds. When set to 0 the cursor is constantly on without blinking */ //** \param timeMs Blinktime in milliseconds. When set to 0 the cursor is constantly on without blinking */
virtual void setCursorBlinkTime(irr::u32 timeMs) _IRR_OVERRIDE_; virtual void setCursorBlinkTime(irr::u32 timeMs) IRR_OVERRIDE;
//! Get the cursor blinktime //! Get the cursor blinktime
virtual irr::u32 getCursorBlinkTime() const _IRR_OVERRIDE_; virtual irr::u32 getCursorBlinkTime() const IRR_OVERRIDE;
//! Sets whether the edit box is a password box. Setting this to true will //! Sets whether the edit box is a password box. Setting this to true will
/** disable MultiLine, WordWrap and the ability to copy with ctrl+c or ctrl+x /** disable MultiLine, WordWrap and the ability to copy with ctrl+c or ctrl+x
\param passwordBox: true to enable password, false to disable \param passwordBox: true to enable password, false to disable
\param passwordChar: the character that is displayed instead of letters */ \param passwordChar: the character that is displayed instead of letters */
virtual void setPasswordBox(bool passwordBox, wchar_t passwordChar = L'*') _IRR_OVERRIDE_; virtual void setPasswordBox(bool passwordBox, wchar_t passwordChar = L'*') IRR_OVERRIDE;
//! Returns true if the edit box is currently a password box. //! Returns true if the edit box is currently a password box.
virtual bool isPasswordBox() const _IRR_OVERRIDE_; virtual bool isPasswordBox() const IRR_OVERRIDE;
//! Updates the absolute position, splits text if required //! Updates the absolute position, splits text if required
virtual void updateAbsolutePosition() _IRR_OVERRIDE_; virtual void updateAbsolutePosition() IRR_OVERRIDE;
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the element //! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
protected: protected:
//! Breaks the single text line. //! Breaks the single text line.
@ -203,5 +203,4 @@ namespace gui
} // end namespace irr } // end namespace irr
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // __C_GUI_EDIT_BOX_H_INCLUDED__ #endif // IRR_C_GUI_EDIT_BOX_H_INCLUDED

142
source/Irrlicht/CGUIEnvironment.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_ENVIRONMENT_H_INCLUDED__ #ifndef IRR_C_GUI_ENVIRONMENT_H_INCLUDED
#define __C_GUI_ENVIRONMENT_H_INCLUDED__ #define IRR_C_GUI_ENVIRONMENT_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -31,246 +31,246 @@ public:
virtual ~CGUIEnvironment(); virtual ~CGUIEnvironment();
//! draws all gui elements //! draws all gui elements
virtual void drawAll(bool useScreenSize) _IRR_OVERRIDE_; virtual void drawAll(bool useScreenSize) IRR_OVERRIDE;
//! returns the current video driver //! returns the current video driver
virtual video::IVideoDriver* getVideoDriver() const _IRR_OVERRIDE_; virtual video::IVideoDriver* getVideoDriver() const IRR_OVERRIDE;
//! returns pointer to the filesystem //! returns pointer to the filesystem
virtual io::IFileSystem* getFileSystem() const _IRR_OVERRIDE_; virtual io::IFileSystem* getFileSystem() const IRR_OVERRIDE;
//! returns a pointer to the OS operator //! returns a pointer to the OS operator
virtual IOSOperator* getOSOperator() const _IRR_OVERRIDE_; virtual IOSOperator* getOSOperator() const IRR_OVERRIDE;
//! posts an input event to the environment //! posts an input event to the environment
virtual bool postEventFromUser(const SEvent& event) _IRR_OVERRIDE_; virtual bool postEventFromUser(const SEvent& event) IRR_OVERRIDE;
//! This sets a new event receiver for gui events. Usually you do not have to //! This sets a new event receiver for gui events. Usually you do not have to
//! use this method, it is used by the internal engine. //! use this method, it is used by the internal engine.
virtual void setUserEventReceiver(IEventReceiver* evr) _IRR_OVERRIDE_; virtual void setUserEventReceiver(IEventReceiver* evr) IRR_OVERRIDE;
//! removes all elements from the environment //! removes all elements from the environment
virtual void clear() _IRR_OVERRIDE_; virtual void clear() IRR_OVERRIDE;
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! returns the current gui skin //! returns the current gui skin
virtual IGUISkin* getSkin() const _IRR_OVERRIDE_; virtual IGUISkin* getSkin() const IRR_OVERRIDE;
//! Sets a new GUI Skin //! Sets a new GUI Skin
virtual void setSkin(IGUISkin* skin) _IRR_OVERRIDE_; virtual void setSkin(IGUISkin* skin) IRR_OVERRIDE;
//! Creates a new GUI Skin based on a template. //! Creates a new GUI Skin based on a template.
/** \return Returns a pointer to the created skin. /** \return Returns a pointer to the created skin.
If you no longer need the skin, you should call IGUISkin::drop(). If you no longer need the skin, you should call IGUISkin::drop().
See IReferenceCounted::drop() for more information. */ See IReferenceCounted::drop() for more information. */
virtual IGUISkin* createSkin(EGUI_SKIN_TYPE type) _IRR_OVERRIDE_; virtual IGUISkin* createSkin(EGUI_SKIN_TYPE type) IRR_OVERRIDE;
//! Creates the image list from the given texture. //! Creates the image list from the given texture.
virtual IGUIImageList* createImageList(video::ITexture* texture, virtual IGUIImageList* createImageList(video::ITexture* texture,
core::dimension2d<s32> imageSize, bool useAlphaChannel) _IRR_OVERRIDE_; core::dimension2d<s32> imageSize, bool useAlphaChannel) IRR_OVERRIDE;
//! returns the font //! returns the font
virtual IGUIFont* getFont(const io::path& filename) _IRR_OVERRIDE_; virtual IGUIFont* getFont(const io::path& filename) IRR_OVERRIDE;
//! add an externally loaded font //! add an externally loaded font
virtual IGUIFont* addFont(const io::path& name, IGUIFont* font) _IRR_OVERRIDE_; virtual IGUIFont* addFont(const io::path& name, IGUIFont* font) IRR_OVERRIDE;
//! remove loaded font //! remove loaded font
virtual void removeFont(IGUIFont* font) _IRR_OVERRIDE_; virtual void removeFont(IGUIFont* font) IRR_OVERRIDE;
//! returns default font //! returns default font
virtual IGUIFont* getBuiltInFont() const _IRR_OVERRIDE_; virtual IGUIFont* getBuiltInFont() const IRR_OVERRIDE;
//! returns the sprite bank //! returns the sprite bank
virtual IGUISpriteBank* getSpriteBank(const io::path& filename) _IRR_OVERRIDE_; virtual IGUISpriteBank* getSpriteBank(const io::path& filename) IRR_OVERRIDE;
//! returns the sprite bank //! returns the sprite bank
virtual IGUISpriteBank* addEmptySpriteBank(const io::path& name) _IRR_OVERRIDE_; virtual IGUISpriteBank* addEmptySpriteBank(const io::path& name) IRR_OVERRIDE;
//! adds an button. The returned pointer must not be dropped. //! adds an button. The returned pointer must not be dropped.
virtual IGUIButton* addButton(const core::rect<s32>& rectangle, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0,const wchar_t* tooltiptext = 0) _IRR_OVERRIDE_; virtual IGUIButton* addButton(const core::rect<s32>& rectangle, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0,const wchar_t* tooltiptext = 0) IRR_OVERRIDE;
//! adds a window. The returned pointer must not be dropped. //! adds a window. The returned pointer must not be dropped.
virtual IGUIWindow* addWindow(const core::rect<s32>& rectangle, bool modal = false, virtual IGUIWindow* addWindow(const core::rect<s32>& rectangle, bool modal = false,
const wchar_t* text=0, IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; const wchar_t* text=0, IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE;
//! adds a modal screen. The returned pointer must not be dropped. //! adds a modal screen. The returned pointer must not be dropped.
virtual IGUIElement* addModalScreen(IGUIElement* parent, int blinkMode) _IRR_OVERRIDE_; virtual IGUIElement* addModalScreen(IGUIElement* parent, int blinkMode) IRR_OVERRIDE;
//! Adds a message box. //! Adds a message box.
virtual IGUIWindow* addMessageBox(const wchar_t* caption, const wchar_t* text=0, 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) _IRR_OVERRIDE_; 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. //! adds a scrollbar. The returned pointer must not be dropped.
virtual IGUIScrollBar* addScrollBar(bool horizontal, const core::rect<s32>& rectangle, virtual IGUIScrollBar* addScrollBar(bool horizontal, const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE;
//! Adds an image element. //! Adds an image element.
virtual IGUIImage* addImage(video::ITexture* image, core::position2d<s32> pos, virtual IGUIImage* addImage(video::ITexture* image, core::position2d<s32> pos,
bool useAlphaChannel=true, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) _IRR_OVERRIDE_; 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. //! adds an image. The returned pointer must not be dropped.
virtual IGUIImage* addImage(const core::rect<s32>& rectangle, virtual IGUIImage* addImage(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0, bool useAlphaChannel=true) _IRR_OVERRIDE_; IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0, bool useAlphaChannel=true) IRR_OVERRIDE;
//! adds a checkbox //! adds a checkbox
virtual IGUICheckBox* addCheckBox(bool checked, const core::rect<s32>& rectangle, virtual IGUICheckBox* addCheckBox(bool checked, const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) _IRR_OVERRIDE_; IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) IRR_OVERRIDE;
//! adds a list box //! adds a list box
virtual IGUIListBox* addListBox(const core::rect<s32>& rectangle, virtual IGUIListBox* addListBox(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1, bool drawBackground=false) _IRR_OVERRIDE_; IGUIElement* parent=0, s32 id=-1, bool drawBackground=false) IRR_OVERRIDE;
//! adds a tree view //! adds a tree view
virtual IGUITreeView* addTreeView(const core::rect<s32>& rectangle, virtual IGUITreeView* addTreeView(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1, bool drawBackground=false, IGUIElement* parent=0, s32 id=-1, bool drawBackground=false,
bool scrollBarVertical = true, bool scrollBarHorizontal = false) _IRR_OVERRIDE_; bool scrollBarVertical = true, bool scrollBarHorizontal = false) IRR_OVERRIDE;
//! adds an mesh viewer. The returned pointer must not be dropped. //! adds an mesh viewer. The returned pointer must not be dropped.
virtual IGUIMeshViewer* addMeshViewer(const core::rect<s32>& rectangle, virtual IGUIMeshViewer* addMeshViewer(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) _IRR_OVERRIDE_; IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) IRR_OVERRIDE;
//! Adds a file open dialog. //! Adds a file open dialog.
virtual IGUIFileOpenDialog* addFileOpenDialog(const wchar_t* title = 0, virtual IGUIFileOpenDialog* addFileOpenDialog(const wchar_t* title = 0,
bool modal=true, IGUIElement* parent=0, s32 id=-1, bool modal=true, IGUIElement* parent=0, s32 id=-1,
bool restoreCWD=false, io::path::char_type* startDir=0) _IRR_OVERRIDE_; bool restoreCWD=false, io::path::char_type* startDir=0) IRR_OVERRIDE;
//! Adds a color select dialog. //! Adds a color select dialog.
virtual IGUIColorSelectDialog* addColorSelectDialog(const wchar_t* title = 0, virtual IGUIColorSelectDialog* addColorSelectDialog(const wchar_t* title = 0,
bool modal=true, IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; bool modal=true, IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE;
//! adds a static text. The returned pointer must not be dropped. //! adds a static text. The returned pointer must not be dropped.
virtual IGUIStaticText* addStaticText(const wchar_t* text, const core::rect<s32>& rectangle, 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) _IRR_OVERRIDE_; 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. //! Adds an edit box. The returned pointer must not be dropped.
virtual IGUIEditBox* addEditBox(const wchar_t* text, const core::rect<s32>& rectangle, virtual IGUIEditBox* addEditBox(const wchar_t* text, const core::rect<s32>& rectangle,
bool border=false, IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; bool border=false, IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE;
//! Adds a spin box to the environment //! Adds a spin box to the environment
virtual IGUISpinBox* addSpinBox(const wchar_t* text, const core::rect<s32>& rectangle, virtual IGUISpinBox* addSpinBox(const wchar_t* text, const core::rect<s32>& rectangle,
bool border=false,IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; bool border=false,IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE;
//! Adds a tab control to the environment. //! Adds a tab control to the environment.
virtual IGUITabControl* addTabControl(const core::rect<s32>& rectangle, virtual IGUITabControl* addTabControl(const core::rect<s32>& rectangle,
IGUIElement* parent=0, bool fillbackground=false, bool border=true, s32 id=-1) _IRR_OVERRIDE_; IGUIElement* parent=0, bool fillbackground=false, bool border=true, s32 id=-1) IRR_OVERRIDE;
//! Adds tab to the environment. //! Adds tab to the environment.
virtual IGUITab* addTab(const core::rect<s32>& rectangle, virtual IGUITab* addTab(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE;
//! Adds a context menu to the environment. //! Adds a context menu to the environment.
virtual IGUIContextMenu* addContextMenu(const core::rect<s32>& rectangle, virtual IGUIContextMenu* addContextMenu(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE;
//! Adds a menu to the environment. //! Adds a menu to the environment.
virtual IGUIContextMenu* addMenu(IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; virtual IGUIContextMenu* addMenu(IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE;
//! Adds a toolbar to the environment. It is like a menu is always placed on top //! Adds a toolbar to the environment. It is like a menu is always placed on top
//! in its parent, and contains buttons. //! in its parent, and contains buttons.
virtual IGUIToolBar* addToolBar(IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; virtual IGUIToolBar* addToolBar(IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE;
//! Adds a combo box to the environment. //! Adds a combo box to the environment.
virtual IGUIComboBox* addComboBox(const core::rect<s32>& rectangle, virtual IGUIComboBox* addComboBox(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE;
//! Adds a table element. //! Adds a table element.
virtual IGUITable* addTable(const core::rect<s32>& rectangle, virtual IGUITable* addTable(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1, bool drawBackground=false) _IRR_OVERRIDE_; IGUIElement* parent=0, s32 id=-1, bool drawBackground=false) IRR_OVERRIDE;
//! Adds an element to display the information from the Irrlicht profiler //! Adds an element to display the information from the Irrlicht profiler
virtual IGUIProfiler* addProfilerDisplay(const core::rect<s32>& rectangle, virtual IGUIProfiler* addProfilerDisplay(const core::rect<s32>& rectangle,
IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE;
//! sets the focus to an element //! sets the focus to an element
virtual bool setFocus(IGUIElement* element) _IRR_OVERRIDE_; virtual bool setFocus(IGUIElement* element) IRR_OVERRIDE;
//! removes the focus from an element //! removes the focus from an element
virtual bool removeFocus(IGUIElement* element) _IRR_OVERRIDE_; virtual bool removeFocus(IGUIElement* element) IRR_OVERRIDE;
//! Returns if the element has focus //! Returns if the element has focus
virtual bool hasFocus(const IGUIElement* element, bool checkSubElements=false) const _IRR_OVERRIDE_; virtual bool hasFocus(const IGUIElement* element, bool checkSubElements=false) const IRR_OVERRIDE;
//! Returns the element with the focus //! Returns the element with the focus
virtual IGUIElement* getFocus() const _IRR_OVERRIDE_; virtual IGUIElement* getFocus() const IRR_OVERRIDE;
//! Returns the element last known to be under the mouse //! Returns the element last known to be under the mouse
virtual IGUIElement* getHovered() const _IRR_OVERRIDE_; virtual IGUIElement* getHovered() const IRR_OVERRIDE;
//! Adds an element for fading in or out. //! Adds an element for fading in or out.
virtual IGUIInOutFader* addInOutFader(const core::rect<s32>* rectangle=0, IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; virtual IGUIInOutFader* addInOutFader(const core::rect<s32>* rectangle=0, IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE;
//! Returns the root gui element. //! Returns the root gui element.
virtual IGUIElement* getRootGUIElement() _IRR_OVERRIDE_; virtual IGUIElement* getRootGUIElement() IRR_OVERRIDE;
virtual void OnPostRender( u32 time ) _IRR_OVERRIDE_; virtual void OnPostRender( u32 time ) IRR_OVERRIDE;
//! Returns the default element factory which can create all built in elements //! Returns the default element factory which can create all built in elements
virtual IGUIElementFactory* getDefaultGUIElementFactory() const _IRR_OVERRIDE_; virtual IGUIElementFactory* getDefaultGUIElementFactory() const IRR_OVERRIDE;
//! Adds an element factory to the gui environment. //! Adds an element factory to the gui environment.
/** Use this to extend the gui environment with new element types which it should be /** Use this to extend the gui environment with new element types which it should be
able to create automatically, for example when loading data from xml files. */ able to create automatically, for example when loading data from xml files. */
virtual void registerGUIElementFactory(IGUIElementFactory* factoryToAdd) _IRR_OVERRIDE_; virtual void registerGUIElementFactory(IGUIElementFactory* factoryToAdd) IRR_OVERRIDE;
//! Returns amount of registered scene node factories. //! Returns amount of registered scene node factories.
virtual u32 getRegisteredGUIElementFactoryCount() const _IRR_OVERRIDE_; virtual u32 getRegisteredGUIElementFactoryCount() const IRR_OVERRIDE;
//! Returns a scene node factory by index //! Returns a scene node factory by index
virtual IGUIElementFactory* getGUIElementFactory(u32 index) const _IRR_OVERRIDE_; virtual IGUIElementFactory* getGUIElementFactory(u32 index) const IRR_OVERRIDE;
//! Adds a GUI Element by its name //! Adds a GUI Element by its name
virtual IGUIElement* addGUIElement(const c8* elementName, IGUIElement* parent=0) _IRR_OVERRIDE_; virtual IGUIElement* addGUIElement(const c8* elementName, IGUIElement* parent=0) IRR_OVERRIDE;
//! Saves the current gui into a file. //! Saves the current gui into a file.
/** \param filename: Name of the file. /** \param filename: Name of the file.
\param start: The element to start saving from. \param start: The element to start saving from.
if not specified, the root element will be used */ if not specified, the root element will be used */
virtual bool saveGUI( const io::path& filename, IGUIElement* start=0) _IRR_OVERRIDE_; virtual bool saveGUI( const io::path& filename, IGUIElement* start=0) IRR_OVERRIDE;
//! Saves the current gui into a file. //! Saves the current gui into a file.
/** \param file: The file to save the GUI to. /** \param file: The file to save the GUI to.
\param start: The element to start saving from. \param start: The element to start saving from.
if not specified, the root element will be used */ if not specified, the root element will be used */
virtual bool saveGUI(io::IWriteFile* file, IGUIElement* start=0) _IRR_OVERRIDE_; virtual bool saveGUI(io::IWriteFile* file, IGUIElement* start=0) IRR_OVERRIDE;
//! Loads the gui. Note that the current gui is not cleared before. //! Loads the gui. Note that the current gui is not cleared before.
/** \param filename: Name of the file. /** \param filename: Name of the file.
\param parent: The parent of all loaded GUI elements, \param parent: The parent of all loaded GUI elements,
if not specified, the root element will be used */ if not specified, the root element will be used */
virtual bool loadGUI(const io::path& filename, IGUIElement* parent=0) _IRR_OVERRIDE_; virtual bool loadGUI(const io::path& filename, IGUIElement* parent=0) IRR_OVERRIDE;
//! Loads the gui. Note that the current gui is not cleared before. //! Loads the gui. Note that the current gui is not cleared before.
/** \param file: IReadFile to load the GUI from /** \param file: IReadFile to load the GUI from
\param parent: The parent of all loaded GUI elements, \param parent: The parent of all loaded GUI elements,
if not specified, the root element will be used */ if not specified, the root element will be used */
virtual bool loadGUI(io::IReadFile* file, IGUIElement* parent=0) _IRR_OVERRIDE_; virtual bool loadGUI(io::IReadFile* file, IGUIElement* parent=0) IRR_OVERRIDE;
//! Writes attributes of the environment //! Writes attributes of the environment
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE;
//! Reads attributes of the environment. //! Reads attributes of the environment.
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE;
//! writes an element //! writes an element
virtual void writeGUIElement(io::IXMLWriter* writer, IGUIElement* node) _IRR_OVERRIDE_; virtual void writeGUIElement(io::IXMLWriter* writer, IGUIElement* node) IRR_OVERRIDE;
//! reads an element //! reads an element
virtual void readGUIElement(io::IXMLReader* reader, IGUIElement* node) _IRR_OVERRIDE_; virtual void readGUIElement(io::IXMLReader* reader, IGUIElement* node) IRR_OVERRIDE;
//! Find the next element which would be selected when pressing the tab-key //! Find the next element which would be selected when pressing the tab-key
virtual IGUIElement* getNextElement(bool reverse=false, bool group=false) _IRR_OVERRIDE_; virtual IGUIElement* getNextElement(bool reverse=false, bool group=false) IRR_OVERRIDE;
//! Set the way the gui will handle focus changes //! Set the way the gui will handle focus changes
virtual void setFocusBehavior(u32 flags) _IRR_OVERRIDE_; virtual void setFocusBehavior(u32 flags) IRR_OVERRIDE;
//! Get the way the gui does handle focus changes //! Get the way the gui does handle focus changes
virtual u32 getFocusBehavior() const _IRR_OVERRIDE_; virtual u32 getFocusBehavior() const IRR_OVERRIDE;
//! Adds a IGUIElement to deletion queue. //! Adds a IGUIElement to deletion queue.
virtual void addToDeletionQueue(IGUIElement* element) _IRR_OVERRIDE_; virtual void addToDeletionQueue(IGUIElement* element) IRR_OVERRIDE;
private: private:
@ -338,6 +338,4 @@ private:
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // __C_GUI_ENVIRONMENT_H_INCLUDED__ #endif // IRR_C_GUI_ENVIRONMENT_H_INCLUDED

23
source/Irrlicht/CGUIFileOpenDialog.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__ #ifndef IRR_C_GUI_FILE_OPEN_DIALOG_H_INCLUDED
#define __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__ #define IRR_C_GUI_FILE_OPEN_DIALOG_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -32,25 +32,25 @@ namespace gui
virtual ~CGUIFileOpenDialog(); virtual ~CGUIFileOpenDialog();
//! returns the filename of the selected file. Returns NULL, if no file was selected. //! returns the filename of the selected file. Returns NULL, if no file was selected.
virtual const wchar_t* getFileName() const _IRR_OVERRIDE_; virtual const wchar_t* getFileName() const IRR_OVERRIDE;
//! Returns the filename of the selected file. Is empty if no file was selected. //! Returns the filename of the selected file. Is empty if no file was selected.
virtual const io::path& getFileNameP() const _IRR_OVERRIDE_; virtual const io::path& getFileNameP() const IRR_OVERRIDE;
//! Returns the directory of the selected file. Returns NULL, if no directory was selected. //! Returns the directory of the selected file. Returns NULL, if no directory was selected.
virtual const io::path& getDirectoryName() const _IRR_OVERRIDE_; virtual const io::path& getDirectoryName() const IRR_OVERRIDE;
//! Returns the directory of the selected file converted to wide characters. Returns NULL if no directory was selected. //! Returns the directory of the selected file converted to wide characters. Returns NULL if no directory was selected.
virtual const wchar_t* getDirectoryNameW() const _IRR_OVERRIDE_; virtual const wchar_t* getDirectoryNameW() const IRR_OVERRIDE;
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE;
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE;
protected: protected:
@ -95,5 +95,4 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__ #endif // IRR_C_GUI_FILE_OPEN_DIALOG_H_INCLUDED

29
source/Irrlicht/CGUIFont.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_FONT_H_INCLUDED__ #ifndef IRR_C_GUI_FONT_H_INCLUDED
#define __C_GUI_FONT_H_INCLUDED__ #define IRR_C_GUI_FONT_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -52,32 +52,32 @@ public:
//! draws an text and clips it to the specified rectangle if wanted //! draws an text and clips it to the specified rectangle if wanted
virtual void draw(const core::stringw& text, const core::rect<s32>& position, virtual void draw(const core::stringw& text, const core::rect<s32>& position,
video::SColor color, bool hcenter=false, video::SColor color, bool hcenter=false,
bool vcenter=false, const core::rect<s32>* clip=0) _IRR_OVERRIDE_; bool vcenter=false, const core::rect<s32>* clip=0) IRR_OVERRIDE;
//! returns the dimension of a text //! returns the dimension of a text
virtual core::dimension2d<u32> getDimension(const wchar_t* text) const _IRR_OVERRIDE_; virtual core::dimension2d<u32> getDimension(const wchar_t* text) const IRR_OVERRIDE;
//! Calculates the index of the character in the text which is on a specific position. //! Calculates the index of the character in the text which is on a specific position.
virtual s32 getCharacterFromPos(const wchar_t* text, s32 pixel_x) const _IRR_OVERRIDE_; virtual s32 getCharacterFromPos(const wchar_t* text, s32 pixel_x) const IRR_OVERRIDE;
//! Returns the type of this font //! Returns the type of this font
virtual EGUI_FONT_TYPE getType() const _IRR_OVERRIDE_ { return EGFT_BITMAP; } virtual EGUI_FONT_TYPE getType() const IRR_OVERRIDE { return EGFT_BITMAP; }
//! set an Pixel Offset on Drawing ( scale position on width ) //! set an Pixel Offset on Drawing ( scale position on width )
virtual void setKerningWidth (s32 kerning) _IRR_OVERRIDE_; virtual void setKerningWidth (s32 kerning) IRR_OVERRIDE;
virtual void setKerningHeight (s32 kerning) _IRR_OVERRIDE_; virtual void setKerningHeight (s32 kerning) IRR_OVERRIDE;
//! set an Pixel Offset on Drawing ( scale position on width ) //! set an Pixel Offset on Drawing ( scale position on width )
virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const _IRR_OVERRIDE_; virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const IRR_OVERRIDE;
virtual s32 getKerningHeight() const _IRR_OVERRIDE_; virtual s32 getKerningHeight() const IRR_OVERRIDE;
//! gets the sprite bank //! gets the sprite bank
virtual IGUISpriteBank* getSpriteBank() const _IRR_OVERRIDE_; virtual IGUISpriteBank* getSpriteBank() const IRR_OVERRIDE;
//! returns the sprite number from a given character //! returns the sprite number from a given character
virtual u32 getSpriteNoFromChar(const wchar_t *c) const _IRR_OVERRIDE_; virtual u32 getSpriteNoFromChar(const wchar_t *c) const IRR_OVERRIDE;
virtual void setInvisibleCharacters( const wchar_t *s ) _IRR_OVERRIDE_; virtual void setInvisibleCharacters( const wchar_t *s ) IRR_OVERRIDE;
private: private:
@ -118,5 +118,4 @@ private:
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // __C_GUI_FONT_H_INCLUDED__ #endif // IRR_C_GUI_FONT_H_INCLUDED

40
source/Irrlicht/CGUIImage.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_IMAGE_H_INCLUDED__ #ifndef IRR_C_GUI_IMAGE_H_INCLUDED
#define __C_GUI_IMAGE_H_INCLUDED__ #define IRR_C_GUI_IMAGE_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -26,61 +26,61 @@ namespace gui
virtual ~CGUIImage(); virtual ~CGUIImage();
//! sets an image //! sets an image
virtual void setImage(video::ITexture* image) _IRR_OVERRIDE_; virtual void setImage(video::ITexture* image) IRR_OVERRIDE;
//! Gets the image texture //! Gets the image texture
virtual video::ITexture* getImage() const _IRR_OVERRIDE_; virtual video::ITexture* getImage() const IRR_OVERRIDE;
//! sets the color of the image //! sets the color of the image
virtual void setColor(video::SColor color) _IRR_OVERRIDE_; virtual void setColor(video::SColor color) IRR_OVERRIDE;
//! sets if the image should scale to fit the element //! sets if the image should scale to fit the element
virtual void setScaleImage(bool scale) _IRR_OVERRIDE_; virtual void setScaleImage(bool scale) IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! sets if the image should use its alpha channel to draw itself //! sets if the image should use its alpha channel to draw itself
virtual void setUseAlphaChannel(bool use) _IRR_OVERRIDE_; virtual void setUseAlphaChannel(bool use) IRR_OVERRIDE;
//! Gets the color of the image //! Gets the color of the image
virtual video::SColor getColor() const _IRR_OVERRIDE_; virtual video::SColor getColor() const IRR_OVERRIDE;
//! Returns true if the image is scaled to fit, false if not //! Returns true if the image is scaled to fit, false if not
virtual bool isImageScaled() const _IRR_OVERRIDE_; virtual bool isImageScaled() const IRR_OVERRIDE;
//! Returns true if the image is using the alpha channel, false if not //! Returns true if the image is using the alpha channel, false if not
virtual bool isAlphaChannelUsed() const _IRR_OVERRIDE_; virtual bool isAlphaChannelUsed() const IRR_OVERRIDE;
//! Sets the source rectangle of the image. By default the full image is used. //! Sets the source rectangle of the image. By default the full image is used.
virtual void setSourceRect(const core::rect<s32>& sourceRect) _IRR_OVERRIDE_; virtual void setSourceRect(const core::rect<s32>& sourceRect) IRR_OVERRIDE;
//! Returns the customized source rectangle of the image to be used. //! Returns the customized source rectangle of the image to be used.
virtual core::rect<s32> getSourceRect() const _IRR_OVERRIDE_; virtual core::rect<s32> getSourceRect() const IRR_OVERRIDE;
//! Restrict drawing-area. //! Restrict drawing-area.
virtual void setDrawBounds(const core::rect<f32>& drawBoundUVs) _IRR_OVERRIDE_; virtual void setDrawBounds(const core::rect<f32>& drawBoundUVs) IRR_OVERRIDE;
//! Get drawing-area restrictions. //! Get drawing-area restrictions.
virtual core::rect<f32> getDrawBounds() const _IRR_OVERRIDE_; virtual core::rect<f32> getDrawBounds() const IRR_OVERRIDE;
//! Sets whether to draw a background color (EGDC_3D_DARK_SHADOW) when no texture is set //! Sets whether to draw a background color (EGDC_3D_DARK_SHADOW) when no texture is set
virtual void setDrawBackground(bool draw) _IRR_OVERRIDE_ virtual void setDrawBackground(bool draw) IRR_OVERRIDE
{ {
DrawBackground = draw; DrawBackground = draw;
} }
//! Checks if a background is drawn when no texture is set //! Checks if a background is drawn when no texture is set
virtual bool isDrawBackgroundEnabled() const _IRR_OVERRIDE_ virtual bool isDrawBackgroundEnabled() const IRR_OVERRIDE
{ {
return DrawBackground; return DrawBackground;
} }
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the element //! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
protected: protected:
void checkBounds(core::rect<s32>& rect) void checkBounds(core::rect<s32>& rect)
@ -110,4 +110,4 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // __C_GUI_IMAGE_H_INCLUDED__ #endif // IRR_C_GUI_IMAGE_H_INCLUDED

10
source/Irrlicht/CGUIImageList.h
View File

@ -1,8 +1,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de // written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de
#ifndef __C_GUI_IMAGE_LIST_H_INCLUDED__ #ifndef IRR_C_GUI_IMAGE_LIST_H_INCLUDED
#define __C_GUI_IMAGE_LIST_H_INCLUDED__ #define IRR_C_GUI_IMAGE_LIST_H_INCLUDED
#include "IGUIImageList.h" #include "IGUIImageList.h"
#include "IVideoDriver.h" #include "IVideoDriver.h"
@ -38,16 +38,16 @@ public:
//! \param clip: Optional pointer to a rectangle against which the text will be clipped. //! \param clip: Optional pointer to a rectangle against which the text will be clipped.
//! If the pointer is null, no clipping will be done. //! If the pointer is null, no clipping will be done.
virtual void draw( s32 index, const core::position2d<s32>& destPos, virtual void draw( s32 index, const core::position2d<s32>& destPos,
const core::rect<s32>* clip = 0 ) _IRR_OVERRIDE_; const core::rect<s32>* clip = 0 ) IRR_OVERRIDE;
//! Returns the count of Images in the list. //! Returns the count of Images in the list.
//! \return Returns the count of Images in the list. //! \return Returns the count of Images in the list.
virtual s32 getImageCount() const _IRR_OVERRIDE_ virtual s32 getImageCount() const IRR_OVERRIDE
{ return ImageCount; } { return ImageCount; }
//! Returns the size of the images in the list. //! Returns the size of the images in the list.
//! \return 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 _IRR_OVERRIDE_ virtual core::dimension2d<s32> getImageSize() const IRR_OVERRIDE
{ return ImageSize; } { return ImageSize; }
private: private:

25
source/Irrlicht/CGUIInOutFader.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_IN_OUT_FADER_H_INCLUDED__ #ifndef IRR_C_GUI_IN_OUT_FADER_H_INCLUDED
#define __C_GUI_IN_OUT_FADER_H_INCLUDED__ #define IRR_C_GUI_IN_OUT_FADER_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -24,29 +24,29 @@ namespace gui
s32 id, core::rect<s32> rectangle); s32 id, core::rect<s32> rectangle);
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! Gets the color to fade out to or to fade in from. //! Gets the color to fade out to or to fade in from.
virtual video::SColor getColor() const _IRR_OVERRIDE_; virtual video::SColor getColor() const IRR_OVERRIDE;
//! Sets the color to fade out to or to fade in from. //! Sets the color to fade out to or to fade in from.
virtual void setColor(video::SColor color ) _IRR_OVERRIDE_; virtual void setColor(video::SColor color ) IRR_OVERRIDE;
virtual void setColor(video::SColor source, video::SColor dest) _IRR_OVERRIDE_; virtual void setColor(video::SColor source, video::SColor dest) IRR_OVERRIDE;
//! Starts the fade in process. //! Starts the fade in process.
virtual void fadeIn(u32 time) _IRR_OVERRIDE_; virtual void fadeIn(u32 time) IRR_OVERRIDE;
//! Starts the fade out process. //! Starts the fade out process.
virtual void fadeOut(u32 time) _IRR_OVERRIDE_; virtual void fadeOut(u32 time) IRR_OVERRIDE;
//! Returns if the fade in or out process is done. //! Returns if the fade in or out process is done.
virtual bool isReady() const _IRR_OVERRIDE_; virtual bool isReady() const IRR_OVERRIDE;
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the element //! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
private: private:
@ -71,5 +71,4 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // __C_GUI_IN_OUT_FADER_H_INCLUDED__ #endif // IRR_C_GUI_IN_OUT_FADER_H_INCLUDED

68
source/Irrlicht/CGUIListBox.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_LIST_BOX_H_INCLUDED__ #ifndef IRR_C_GUI_LIST_BOX_H_INCLUDED
#define __C_GUI_LIST_BOX_H_INCLUDED__ #define IRR_C_GUI_LIST_BOX_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -31,108 +31,108 @@ namespace gui
virtual ~CGUIListBox(); virtual ~CGUIListBox();
//! returns amount of list items //! returns amount of list items
virtual u32 getItemCount() const _IRR_OVERRIDE_; virtual u32 getItemCount() const IRR_OVERRIDE;
//! returns string of a list item. the id may be a value from 0 to itemCount-1 //! returns string of a list item. the id may be a value from 0 to itemCount-1
virtual const wchar_t* getListItem(u32 id) const _IRR_OVERRIDE_; virtual const wchar_t* getListItem(u32 id) const IRR_OVERRIDE;
//! adds an list item, returns id of item //! adds an list item, returns id of item
virtual u32 addItem(const wchar_t* text) _IRR_OVERRIDE_; virtual u32 addItem(const wchar_t* text) IRR_OVERRIDE;
//! clears the list //! clears the list
virtual void clear() _IRR_OVERRIDE_; virtual void clear() IRR_OVERRIDE;
//! returns id of selected item. returns -1 if no item is selected. //! returns id of selected item. returns -1 if no item is selected.
virtual s32 getSelected() const _IRR_OVERRIDE_; virtual s32 getSelected() const IRR_OVERRIDE;
//! sets the selected item. Set this to -1 if no item should be selected //! sets the selected item. Set this to -1 if no item should be selected
virtual void setSelected(s32 id) _IRR_OVERRIDE_; virtual void setSelected(s32 id) IRR_OVERRIDE;
//! sets the selected item. Set this to -1 if no item should be selected //! sets the selected item. Set this to -1 if no item should be selected
virtual void setSelected(const wchar_t *item) _IRR_OVERRIDE_; virtual void setSelected(const wchar_t *item) IRR_OVERRIDE;
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! adds an list item with an icon //! adds an list item with an icon
//! \param text Text of list entry //! \param text Text of list entry
//! \param icon Sprite index of the Icon within the current sprite bank. Set it to -1 if you want no icon //! \param icon Sprite index of the Icon within the current sprite bank. Set it to -1 if you want no icon
//! \return //! \return
//! returns the id of the new created item //! returns the id of the new created item
virtual u32 addItem(const wchar_t* text, s32 icon) _IRR_OVERRIDE_; virtual u32 addItem(const wchar_t* text, s32 icon) IRR_OVERRIDE;
//! Returns the icon of an item //! Returns the icon of an item
virtual s32 getIcon(u32 id) const _IRR_OVERRIDE_; virtual s32 getIcon(u32 id) const IRR_OVERRIDE;
//! removes an item from the list //! removes an item from the list
virtual void removeItem(u32 id) _IRR_OVERRIDE_; virtual void removeItem(u32 id) IRR_OVERRIDE;
//! get the the id of the item at the given absolute coordinates //! get the the id of the item at the given absolute coordinates
virtual s32 getItemAt(s32 xpos, s32 ypos) const _IRR_OVERRIDE_; virtual s32 getItemAt(s32 xpos, s32 ypos) const IRR_OVERRIDE;
//! Sets the sprite bank which should be used to draw list icons. This font is set to the sprite bank of //! Sets the sprite bank which should be used to draw list icons. This font is set to the sprite bank of
//! the built-in-font by default. A sprite can be displayed in front of every list item. //! the built-in-font by default. A sprite can be displayed in front of every list item.
//! An icon is an index within the icon sprite bank. Several default icons are available in the //! An icon is an index within the icon sprite bank. Several default icons are available in the
//! skin through getIcon //! skin through getIcon
virtual void setSpriteBank(IGUISpriteBank* bank) _IRR_OVERRIDE_; virtual void setSpriteBank(IGUISpriteBank* bank) IRR_OVERRIDE;
//! set whether the listbox should scroll to newly selected items //! set whether the listbox should scroll to newly selected items
virtual void setAutoScrollEnabled(bool scroll) _IRR_OVERRIDE_; virtual void setAutoScrollEnabled(bool scroll) IRR_OVERRIDE;
//! returns true if automatic scrolling is enabled, false if not. //! returns true if automatic scrolling is enabled, false if not.
virtual bool isAutoScrollEnabled() const _IRR_OVERRIDE_; virtual bool isAutoScrollEnabled() const IRR_OVERRIDE;
//! Update the position and size of the listbox, and update the scrollbar //! Update the position and size of the listbox, and update the scrollbar
virtual void updateAbsolutePosition() _IRR_OVERRIDE_; virtual void updateAbsolutePosition() IRR_OVERRIDE;
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the element //! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
//! set all item colors at given index to color //! set all item colors at given index to color
virtual void setItemOverrideColor(u32 index, video::SColor color) _IRR_OVERRIDE_; virtual void setItemOverrideColor(u32 index, video::SColor color) IRR_OVERRIDE;
//! set all item colors of specified type at given index to color //! set all item colors of specified type at given index to color
virtual void setItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType, video::SColor color) _IRR_OVERRIDE_; virtual void setItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType, video::SColor color) IRR_OVERRIDE;
//! clear all item colors at index //! clear all item colors at index
virtual void clearItemOverrideColor(u32 index) _IRR_OVERRIDE_; virtual void clearItemOverrideColor(u32 index) IRR_OVERRIDE;
//! clear item color at index for given colortype //! clear item color at index for given colortype
virtual void clearItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) _IRR_OVERRIDE_; virtual void clearItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) IRR_OVERRIDE;
//! has the item at index its color overwritten? //! has the item at index its color overwritten?
virtual bool hasItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const _IRR_OVERRIDE_; virtual bool hasItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const IRR_OVERRIDE;
//! return the overwrite color at given item index. //! return the overwrite color at given item index.
virtual video::SColor getItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const _IRR_OVERRIDE_; virtual video::SColor getItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const IRR_OVERRIDE;
//! return the default color which is used for the given colorType //! return the default color which is used for the given colorType
virtual video::SColor getItemDefaultColor(EGUI_LISTBOX_COLOR colorType) const _IRR_OVERRIDE_; virtual video::SColor getItemDefaultColor(EGUI_LISTBOX_COLOR colorType) const IRR_OVERRIDE;
//! set the item at the given index //! set the item at the given index
virtual void setItem(u32 index, const wchar_t* text, s32 icon) _IRR_OVERRIDE_; virtual void setItem(u32 index, const wchar_t* text, s32 icon) IRR_OVERRIDE;
//! Insert the item at the given index //! Insert the item at the given index
//! Return the index on success or -1 on failure. //! Return the index on success or -1 on failure.
virtual s32 insertItem(u32 index, const wchar_t* text, s32 icon) _IRR_OVERRIDE_; virtual s32 insertItem(u32 index, const wchar_t* text, s32 icon) IRR_OVERRIDE;
//! Swap the items at the given indices //! Swap the items at the given indices
virtual void swapItems(u32 index1, u32 index2) _IRR_OVERRIDE_; virtual void swapItems(u32 index1, u32 index2) IRR_OVERRIDE;
//! set global itemHeight //! set global itemHeight
virtual void setItemHeight( s32 height ) _IRR_OVERRIDE_; virtual void setItemHeight( s32 height ) IRR_OVERRIDE;
//! Sets whether to draw the background //! Sets whether to draw the background
virtual void setDrawBackground(bool draw) _IRR_OVERRIDE_; virtual void setDrawBackground(bool draw) IRR_OVERRIDE;
//! Access the vertical scrollbar //! Access the vertical scrollbar
virtual IGUIScrollBar* getVerticalScrollBar() const _IRR_OVERRIDE_; virtual IGUIScrollBar* getVerticalScrollBar() const IRR_OVERRIDE;
private: private:

20
source/Irrlicht/CGUIMenu.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_MENU_H_INCLUDED__ #ifndef IRR_C_GUI_MENU_H_INCLUDED
#define __C_GUI_MENU_H_INCLUDED__ #define IRR_C_GUI_MENU_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -24,29 +24,27 @@ namespace gui
CGUIMenu(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle); CGUIMenu(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle);
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! Updates the absolute position. //! Updates the absolute position.
virtual void updateAbsolutePosition() _IRR_OVERRIDE_; virtual void updateAbsolutePosition() IRR_OVERRIDE;
protected: protected:
virtual void recalculateSize() _IRR_OVERRIDE_; virtual void recalculateSize() IRR_OVERRIDE;
//! returns the item highlight-area //! returns the item highlight-area
virtual core::rect<s32> getHRect(const SItem& i, const core::rect<s32>& absolute) const _IRR_OVERRIDE_; virtual core::rect<s32> getHRect(const SItem& i, const core::rect<s32>& absolute) const IRR_OVERRIDE;
//! Gets drawing rect of Item //! Gets drawing rect of Item
virtual core::rect<s32> getRect(const SItem& i, const core::rect<s32>& absolute) const _IRR_OVERRIDE_; virtual core::rect<s32> getRect(const SItem& i, const core::rect<s32>& absolute) const IRR_OVERRIDE;
}; };
} // end namespace gui } // end namespace gui
} // end namespace irr } // end namespace irr
#endif // __C_GUI_MENU_H_INCLUDED__
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // IRR_C_GUI_MENU_H_INCLUDED

19
source/Irrlicht/CGUIMeshViewer.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_MESH_VIEWER_H_INCLUDED__ #ifndef IRR_C_GUI_MESH_VIEWER_H_INCLUDED
#define __C_GUI_MESH_VIEWER_H_INCLUDED__ #define IRR_C_GUI_MESH_VIEWER_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -28,22 +28,22 @@ namespace gui
virtual ~CGUIMeshViewer(); virtual ~CGUIMeshViewer();
//! sets the mesh to be shown //! sets the mesh to be shown
virtual void setMesh(scene::IAnimatedMesh* mesh) _IRR_OVERRIDE_; virtual void setMesh(scene::IAnimatedMesh* mesh) IRR_OVERRIDE;
//! Gets the displayed mesh //! Gets the displayed mesh
virtual scene::IAnimatedMesh* getMesh() const _IRR_OVERRIDE_; virtual scene::IAnimatedMesh* getMesh() const IRR_OVERRIDE;
//! sets the material //! sets the material
virtual void setMaterial(const video::SMaterial& material) _IRR_OVERRIDE_; virtual void setMaterial(const video::SMaterial& material) IRR_OVERRIDE;
//! gets the material //! gets the material
virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_; virtual const video::SMaterial& getMaterial() const IRR_OVERRIDE;
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
private: private:
@ -57,5 +57,4 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // __C_GUI_MESH_VIEWER_H_INCLUDED__ #endif // IRR_C_GUI_MESH_VIEWER_H_INCLUDED

10
source/Irrlicht/CGUIMessageBox.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_MESSAGE_BOX_H_INCLUDED__ #ifndef IRR_C_GUI_MESSAGE_BOX_H_INCLUDED
#define __C_GUI_MESSAGE_BOX_H_INCLUDED__ #define IRR_C_GUI_MESSAGE_BOX_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -30,13 +30,13 @@ namespace gui
virtual ~CGUIMessageBox(); virtual ~CGUIMessageBox();
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the element //! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
private: private:

23
source/Irrlicht/CGUIModalScreen.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_MODAL_SCREEN_H_INCLUDED__ #ifndef IRR_C_GUI_MODAL_SCREEN_H_INCLUDED
#define __C_GUI_MODAL_SCREEN_H_INCLUDED__ #define IRR_C_GUI_MODAL_SCREEN_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -23,34 +23,34 @@ namespace gui
CGUIModalScreen(IGUIEnvironment* environment, IGUIElement* parent, s32 id); CGUIModalScreen(IGUIEnvironment* environment, IGUIElement* parent, s32 id);
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! Removes a child. //! Removes a child.
virtual void removeChild(IGUIElement* child) _IRR_OVERRIDE_; virtual void removeChild(IGUIElement* child) IRR_OVERRIDE;
//! Adds a child //! Adds a child
virtual void addChild(IGUIElement* child) _IRR_OVERRIDE_; virtual void addChild(IGUIElement* child) IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! Updates the absolute position. //! Updates the absolute position.
virtual void updateAbsolutePosition() _IRR_OVERRIDE_; virtual void updateAbsolutePosition() IRR_OVERRIDE;
//! Modalscreen is not a typical element, but rather acts like a state for it's children. //! Modalscreen is not a typical element, but rather acts like a state for it's children.
//! isVisible is overriden to give this a useful behavior, so that a modal will no longer //! isVisible is overriden to give this a useful behavior, so that a modal will no longer
//! be active when its parent is invisible or all its children are invisible. //! be active when its parent is invisible or all its children are invisible.
virtual bool isVisible() const _IRR_OVERRIDE_; virtual bool isVisible() const IRR_OVERRIDE;
//! Modals are infinite so every point is inside //! Modals are infinite so every point is inside
virtual bool isPointInside(const core::position2d<s32>& point) const _IRR_OVERRIDE_; virtual bool isPointInside(const core::position2d<s32>& point) const IRR_OVERRIDE;
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the element //! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
//! Set when to blink. //! Set when to blink.
//! Bitset of following values (can be combined) //! Bitset of following values (can be combined)
@ -83,4 +83,3 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif #endif

36
source/Irrlicht/CGUIProfiler.h
View File

@ -2,8 +2,8 @@
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
// Written by Michael Zeilfelder // Written by Michael Zeilfelder
#ifndef C_GUI_PROFILER_H_INCLUDED__ #ifndef IRR_C_GUI_PROFILER_H_INCLUDED
#define C_GUI_PROFILER_H_INCLUDED__ #define IRR_C_GUI_PROFILER_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -28,53 +28,53 @@ namespace gui
CGUIProfiler(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle, IProfiler* profiler); CGUIProfiler(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle, IProfiler* profiler);
//! Show first page of profile data //! Show first page of profile data
virtual void firstPage(bool includeOverview) _IRR_OVERRIDE_; virtual void firstPage(bool includeOverview) IRR_OVERRIDE;
//! Show next page of profile data //! Show next page of profile data
virtual void nextPage(bool includeOverview) _IRR_OVERRIDE_; virtual void nextPage(bool includeOverview) IRR_OVERRIDE;
//! Show previous page of profile data //! Show previous page of profile data
virtual void previousPage(bool includeOverview) _IRR_OVERRIDE_; virtual void previousPage(bool includeOverview) IRR_OVERRIDE;
//! Try to show as many group-pages together as possible instead of showing at most one group per page. //! Try to show as many group-pages together as possible instead of showing at most one group per page.
/** \param groupsTogether When true show several groups on one page, when false show max. one group per page. Default is false. */ /** \param groupsTogether When true show several groups on one page, when false show max. one group per page. Default is false. */
virtual void setShowGroupsTogether(bool groupsTogether) _IRR_OVERRIDE_; virtual void setShowGroupsTogether(bool groupsTogether) IRR_OVERRIDE;
//! Can several groups be displayed per page? //! Can several groups be displayed per page?
virtual bool getShowGroupsTogether() const _IRR_OVERRIDE_; virtual bool getShowGroupsTogether() const IRR_OVERRIDE;
//! Sets another skin independent font. //! Sets another skin independent font.
virtual void setOverrideFont(IGUIFont* font) _IRR_OVERRIDE_; virtual void setOverrideFont(IGUIFont* font) IRR_OVERRIDE;
//! Gets the override font (if any) //! Gets the override font (if any)
virtual IGUIFont* getOverrideFont() const _IRR_OVERRIDE_; virtual IGUIFont* getOverrideFont() const IRR_OVERRIDE;
//! Get the font which is used right now for drawing //! Get the font which is used right now for drawing
virtual IGUIFont* getActiveFont() const _IRR_OVERRIDE_; virtual IGUIFont* getActiveFont() const IRR_OVERRIDE;
//! Sets whether to draw the background. By default disabled, //! Sets whether to draw the background. By default disabled,
virtual void setDrawBackground(bool draw) _IRR_OVERRIDE_; virtual void setDrawBackground(bool draw) IRR_OVERRIDE;
//! Checks if background drawing is enabled //! Checks if background drawing is enabled
/** \return true if background drawing is enabled, false otherwise */ /** \return true if background drawing is enabled, false otherwise */
virtual bool isDrawBackgroundEnabled() const _IRR_OVERRIDE_; virtual bool isDrawBackgroundEnabled() const IRR_OVERRIDE;
//! Allows to freeze updates which makes it easier to read the numbers //! Allows to freeze updates which makes it easier to read the numbers
virtual void setFrozen(bool freeze) _IRR_OVERRIDE_; virtual void setFrozen(bool freeze) IRR_OVERRIDE;
//! Are updates currently frozen //! Are updates currently frozen
virtual bool getFrozen() const _IRR_OVERRIDE_; virtual bool getFrozen() const IRR_OVERRIDE;
//! Filters prevents data that doesn't achieve the conditions from being displayed //! Filters prevents data that doesn't achieve the conditions from being displayed
virtual void setFilters(irr::u32 minCalls, irr::u32 minTimeSum, irr::f32 minTimeAverage, irr::u32 minTimeMax) _IRR_OVERRIDE_; virtual void setFilters(irr::u32 minCalls, irr::u32 minTimeSum, irr::f32 minTimeAverage, irr::u32 minTimeMax) IRR_OVERRIDE;
virtual IGUIElement* getElementFromPoint(const core::position2d<s32>& point) _IRR_OVERRIDE_ virtual IGUIElement* getElementFromPoint(const core::position2d<s32>& point) IRR_OVERRIDE
{ {
// This element should never get focus from mouse-clicks // This element should never get focus from mouse-clicks
return 0; return 0;
} }
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
protected: protected:
@ -103,4 +103,4 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // __C_GUI_IMAGE_H_INCLUDED__ #endif

37
source/Irrlicht/CGUIScrollBar.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_SCROLL_BAR_H_INCLUDED__ #ifndef IRR_C_GUI_SCROLL_BAR_H_INCLUDED
#define __C_GUI_SCROLL_BAR_H_INCLUDED__ #define IRR_C_GUI_SCROLL_BAR_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -29,52 +29,52 @@ namespace gui
virtual ~CGUIScrollBar(); virtual ~CGUIScrollBar();
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
virtual void OnPostRender(u32 timeMs) _IRR_OVERRIDE_; virtual void OnPostRender(u32 timeMs) IRR_OVERRIDE;
//! gets the maximum value of the scrollbar. //! gets the maximum value of the scrollbar.
virtual s32 getMax() const _IRR_OVERRIDE_; virtual s32 getMax() const IRR_OVERRIDE;
//! sets the maximum value of the scrollbar. //! sets the maximum value of the scrollbar.
virtual void setMax(s32 max) _IRR_OVERRIDE_; virtual void setMax(s32 max) IRR_OVERRIDE;
//! gets the minimum value of the scrollbar. //! gets the minimum value of the scrollbar.
virtual s32 getMin() const _IRR_OVERRIDE_; virtual s32 getMin() const IRR_OVERRIDE;
//! sets the minimum value of the scrollbar. //! sets the minimum value of the scrollbar.
virtual void setMin(s32 min) _IRR_OVERRIDE_; virtual void setMin(s32 min) IRR_OVERRIDE;
//! gets the small step value //! gets the small step value
virtual s32 getSmallStep() const _IRR_OVERRIDE_; virtual s32 getSmallStep() const IRR_OVERRIDE;
//! sets the small step value //! sets the small step value
virtual void setSmallStep(s32 step) _IRR_OVERRIDE_; virtual void setSmallStep(s32 step) IRR_OVERRIDE;
//! gets the large step value //! gets the large step value
virtual s32 getLargeStep() const _IRR_OVERRIDE_; virtual s32 getLargeStep() const IRR_OVERRIDE;
//! sets the large step value //! sets the large step value
virtual void setLargeStep(s32 step) _IRR_OVERRIDE_; virtual void setLargeStep(s32 step) IRR_OVERRIDE;
//! gets the current position of the scrollbar //! gets the current position of the scrollbar
virtual s32 getPos() const _IRR_OVERRIDE_; virtual s32 getPos() const IRR_OVERRIDE;
//! sets the position of the scrollbar //! sets the position of the scrollbar
virtual void setPos(s32 pos) _IRR_OVERRIDE_; virtual void setPos(s32 pos) IRR_OVERRIDE;
//! updates the rectangle //! updates the rectangle
virtual void updateAbsolutePosition() _IRR_OVERRIDE_; virtual void updateAbsolutePosition() IRR_OVERRIDE;
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the element //! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
private: private:
@ -110,4 +110,3 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif #endif

56
source/Irrlicht/CGUISkin.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_SKIN_H_INCLUDED__ #ifndef IRR_C_GUI_SKIN_H_INCLUDED
#define __C_GUI_SKIN_H_INCLUDED__ #define IRR_C_GUI_SKIN_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -30,49 +30,49 @@ namespace gui
virtual ~CGUISkin(); virtual ~CGUISkin();
//! returns default color //! returns default color
virtual video::SColor getColor(EGUI_DEFAULT_COLOR color) const _IRR_OVERRIDE_; virtual video::SColor getColor(EGUI_DEFAULT_COLOR color) const IRR_OVERRIDE;
//! sets a default color //! sets a default color
virtual void setColor(EGUI_DEFAULT_COLOR which, video::SColor newColor) _IRR_OVERRIDE_; virtual void setColor(EGUI_DEFAULT_COLOR which, video::SColor newColor) IRR_OVERRIDE;
//! returns size for the given size type //! returns size for the given size type
virtual s32 getSize(EGUI_DEFAULT_SIZE size) const _IRR_OVERRIDE_; virtual s32 getSize(EGUI_DEFAULT_SIZE size) const IRR_OVERRIDE;
//! sets a default size //! sets a default size
virtual void setSize(EGUI_DEFAULT_SIZE which, s32 size) _IRR_OVERRIDE_; virtual void setSize(EGUI_DEFAULT_SIZE which, s32 size) IRR_OVERRIDE;
//! returns the default font //! returns the default font
virtual IGUIFont* getFont(EGUI_DEFAULT_FONT which=EGDF_DEFAULT) const _IRR_OVERRIDE_; virtual IGUIFont* getFont(EGUI_DEFAULT_FONT which=EGDF_DEFAULT) const IRR_OVERRIDE;
//! sets a default font //! sets a default font
virtual void setFont(IGUIFont* font, EGUI_DEFAULT_FONT which=EGDF_DEFAULT) _IRR_OVERRIDE_; virtual void setFont(IGUIFont* font, EGUI_DEFAULT_FONT which=EGDF_DEFAULT) IRR_OVERRIDE;
//! sets the sprite bank used for drawing icons //! sets the sprite bank used for drawing icons
virtual void setSpriteBank(IGUISpriteBank* bank) _IRR_OVERRIDE_; virtual void setSpriteBank(IGUISpriteBank* bank) IRR_OVERRIDE;
//! gets the sprite bank used for drawing icons //! gets the sprite bank used for drawing icons
virtual IGUISpriteBank* getSpriteBank() const _IRR_OVERRIDE_; virtual IGUISpriteBank* getSpriteBank() const IRR_OVERRIDE;
//! Returns a default icon //! Returns a default icon
/** Returns the sprite index within the sprite bank */ /** Returns the sprite index within the sprite bank */
virtual u32 getIcon(EGUI_DEFAULT_ICON icon) const _IRR_OVERRIDE_; virtual u32 getIcon(EGUI_DEFAULT_ICON icon) const IRR_OVERRIDE;
//! Sets a default icon //! Sets a default icon
/** Sets the sprite index used for drawing icons like arrows, /** Sets the sprite index used for drawing icons like arrows,
close buttons and ticks in checkboxes close buttons and ticks in checkboxes
\param icon: Enum specifying which icon to change \param icon: Enum specifying which icon to change
\param index: The sprite index used to draw this icon */ \param index: The sprite index used to draw this icon */
virtual void setIcon(EGUI_DEFAULT_ICON icon, u32 index) _IRR_OVERRIDE_; virtual void setIcon(EGUI_DEFAULT_ICON icon, u32 index) IRR_OVERRIDE;
//! Returns a default text. //! Returns a default text.
/** For example for Message box button captions: /** For example for Message box button captions:
"OK", "Cancel", "Yes", "No" and so on. */ "OK", "Cancel", "Yes", "No" and so on. */
virtual const wchar_t* getDefaultText(EGUI_DEFAULT_TEXT text) const _IRR_OVERRIDE_; virtual const wchar_t* getDefaultText(EGUI_DEFAULT_TEXT text) const IRR_OVERRIDE;
//! Sets a default text. //! Sets a default text.
/** For example for Message box button captions: /** For example for Message box button captions:
"OK", "Cancel", "Yes", "No" and so on. */ "OK", "Cancel", "Yes", "No" and so on. */
virtual void setDefaultText(EGUI_DEFAULT_TEXT which, const wchar_t* newText) _IRR_OVERRIDE_; virtual void setDefaultText(EGUI_DEFAULT_TEXT which, const wchar_t* newText) IRR_OVERRIDE;
//! draws a standard 3d button pane //! draws a standard 3d button pane
/** Used for drawing for example buttons in normal state. /** Used for drawing for example buttons in normal state.
@ -85,7 +85,7 @@ namespace gui
implementations to find out how to draw the part exactly. */ implementations to find out how to draw the part exactly. */
virtual void draw3DButtonPaneStandard(IGUIElement* element, virtual void draw3DButtonPaneStandard(IGUIElement* element,
const core::rect<s32>& rect, const core::rect<s32>& rect,
const core::rect<s32>* clip=0) _IRR_OVERRIDE_; const core::rect<s32>* clip=0) IRR_OVERRIDE;
//! draws a pressed 3d button pane //! draws a pressed 3d button pane
/** Used for drawing for example buttons in pressed state. /** 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. */ implementations to find out how to draw the part exactly. */
virtual void draw3DButtonPanePressed(IGUIElement* element, virtual void draw3DButtonPanePressed(IGUIElement* element,
const core::rect<s32>& rect, const core::rect<s32>& rect,
const core::rect<s32>* clip=0) _IRR_OVERRIDE_; const core::rect<s32>* clip=0) IRR_OVERRIDE;
//! draws a sunken 3d pane //! draws a sunken 3d pane
/** Used for drawing the background of edit, combo or check boxes. /** Used for drawing the background of edit, combo or check boxes.
@ -114,7 +114,7 @@ namespace gui
video::SColor bgcolor, bool flat, video::SColor bgcolor, bool flat,
bool fillBackGround, bool fillBackGround,
const core::rect<s32>& rect, const core::rect<s32>& rect,
const core::rect<s32>* clip=0) _IRR_OVERRIDE_; const core::rect<s32>* clip=0) IRR_OVERRIDE;
//! draws a window background //! draws a window background
/** Used for drawing the background of dialogs and windows. /** Used for drawing the background of dialogs and windows.
@ -134,7 +134,7 @@ namespace gui
bool drawTitleBar, video::SColor titleBarColor, bool drawTitleBar, video::SColor titleBarColor,
const core::rect<s32>& rect, const core::rect<s32>& rect,
const core::rect<s32>* clip, const core::rect<s32>* clip,
core::rect<s32>* checkClientArea) _IRR_OVERRIDE_; core::rect<s32>* checkClientArea) IRR_OVERRIDE;
//! draws a standard 3d menu pane //! draws a standard 3d menu pane
/** Used for drawing for menus and context menus. /** Used for drawing for menus and context menus.
@ -147,7 +147,7 @@ namespace gui
\param clip: Clip area. */ \param clip: Clip area. */
virtual void draw3DMenuPane(IGUIElement* element, virtual void draw3DMenuPane(IGUIElement* element,
const core::rect<s32>& rect, const core::rect<s32>& rect,
const core::rect<s32>* clip=0) _IRR_OVERRIDE_; const core::rect<s32>* clip=0) IRR_OVERRIDE;
//! draws a standard 3d tool bar //! draws a standard 3d tool bar
/** Used for drawing for toolbars and menus. /** Used for drawing for toolbars and menus.
@ -158,7 +158,7 @@ namespace gui
\param clip: Clip area. */ \param clip: Clip area. */
virtual void draw3DToolBar(IGUIElement* element, virtual void draw3DToolBar(IGUIElement* element,
const core::rect<s32>& rect, const core::rect<s32>& rect,
const core::rect<s32>* clip=0) _IRR_OVERRIDE_; const core::rect<s32>* clip=0) IRR_OVERRIDE;
//! draws a tab button //! draws a tab button
/** Used for drawing for tab buttons on top of tabs. /** Used for drawing for tab buttons on top of tabs.
@ -170,7 +170,7 @@ namespace gui
\param clip: Clip area. */ \param clip: Clip area. */
virtual void draw3DTabButton(IGUIElement* element, bool active, virtual void draw3DTabButton(IGUIElement* element, bool active,
const core::rect<s32>& rect, const core::rect<s32>* clip=0, const core::rect<s32>& rect, const core::rect<s32>* clip=0,
EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT) _IRR_OVERRIDE_; EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT) IRR_OVERRIDE;
//! draws a tab control body //! draws a tab control body
/** \param element: Pointer to the element which wishes to draw this. This parameter /** \param element: Pointer to the element which wishes to draw this. This parameter
@ -182,7 +182,7 @@ namespace gui
\param clip: Clip area. */ \param clip: Clip area. */
virtual void draw3DTabBody(IGUIElement* element, bool border, bool background, virtual void draw3DTabBody(IGUIElement* element, bool border, bool background,
const core::rect<s32>& rect, const core::rect<s32>* clip=0, s32 tabHeight=-1, const core::rect<s32>& rect, const core::rect<s32>* clip=0, s32 tabHeight=-1,
EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT) _IRR_OVERRIDE_; EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT) IRR_OVERRIDE;
//! draws an icon, usually from the skin's sprite bank //! draws an icon, usually from the skin's sprite bank
/** \param element: Pointer to the element which wishes to draw this icon. /** \param element: Pointer to the element which wishes to draw this icon.
@ -197,7 +197,7 @@ namespace gui
virtual void drawIcon(IGUIElement* element, EGUI_DEFAULT_ICON icon, virtual void drawIcon(IGUIElement* element, EGUI_DEFAULT_ICON icon,
const core::position2di position, const core::position2di position,
u32 starttime=0, u32 currenttime=0, u32 starttime=0, u32 currenttime=0,
bool loop=false, const core::rect<s32>* clip=0) _IRR_OVERRIDE_; bool loop=false, const core::rect<s32>* clip=0) IRR_OVERRIDE;
//! draws a 2d rectangle. //! draws a 2d rectangle.
@ -210,17 +210,17 @@ namespace gui
\param clip: Pointer to rectangle against which the rectangle will be clipped. \param clip: Pointer to rectangle against which the rectangle will be clipped.
If the pointer is null, no clipping will be performed. */ If the pointer is null, no clipping will be performed. */
virtual void draw2DRectangle(IGUIElement* element, const video::SColor &color, virtual void draw2DRectangle(IGUIElement* element, const video::SColor &color,
const core::rect<s32>& pos, const core::rect<s32>* clip = 0) _IRR_OVERRIDE_; const core::rect<s32>& pos, const core::rect<s32>* clip = 0) IRR_OVERRIDE;
//! get the type of this skin //! get the type of this skin
virtual EGUI_SKIN_TYPE getType() const _IRR_OVERRIDE_; virtual EGUI_SKIN_TYPE getType() const IRR_OVERRIDE;
//! Writes attributes of the skin //! Writes attributes of the skin
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE;
//! Reads attributes of the skin //! Reads attributes of the skin
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE;
private: private:
@ -243,5 +243,3 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif #endif

41
source/Irrlicht/CGUISpinBox.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_SPIN_BOX_H_INCLUDED__ #ifndef IRR_C_GUI_SPIN_BOX_H_INCLUDED
#define __C_GUI_SPIN_BOX_H_INCLUDED__ #define IRR_C_GUI_SPIN_BOX_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -32,62 +32,62 @@ namespace gui
/** \param enable: If set to true, the override color, which can be set /** \param enable: If set to true, the override color, which can be set
with IGUIEditBox::setOverrideColor is used, otherwise the with IGUIEditBox::setOverrideColor is used, otherwise the
EGDC_BUTTON_TEXT color of the skin. */ EGDC_BUTTON_TEXT color of the skin. */
virtual IGUIEditBox* getEditBox() const _IRR_OVERRIDE_; virtual IGUIEditBox* getEditBox() const IRR_OVERRIDE;
//! set the current value of the spinbox //! set the current value of the spinbox
/** \param val: value to be set in the spinbox */ /** \param val: value to be set in the spinbox */
virtual void setValue(f32 val) _IRR_OVERRIDE_; virtual void setValue(f32 val) IRR_OVERRIDE;
//! Get the current value of the spinbox //! Get the current value of the spinbox
virtual f32 getValue() const _IRR_OVERRIDE_; virtual f32 getValue() const IRR_OVERRIDE;
//! set the range of values which can be used in the spinbox //! set the range of values which can be used in the spinbox
/** \param min: minimum value /** \param min: minimum value
\param max: maximum value */ \param max: maximum value */
virtual void setRange(f32 min, f32 max) _IRR_OVERRIDE_; virtual void setRange(f32 min, f32 max) IRR_OVERRIDE;
//! get the minimum value which can be used in the spinbox //! get the minimum value which can be used in the spinbox
virtual f32 getMin() const _IRR_OVERRIDE_; virtual f32 getMin() const IRR_OVERRIDE;
//! get the maximum value which can be used in the spinbox //! get the maximum value which can be used in the spinbox
virtual f32 getMax() const _IRR_OVERRIDE_; virtual f32 getMax() const IRR_OVERRIDE;
//! step size by which values are changed when pressing the spin buttons //! step size by which values are changed when pressing the spin buttons
/** \param step: stepsize used for value changes when pressing spin buttons */ /** \param step: stepsize used for value changes when pressing spin buttons */
virtual void setStepSize(f32 step=1.f) _IRR_OVERRIDE_; virtual void setStepSize(f32 step=1.f) IRR_OVERRIDE;
//! returns the step size //! returns the step size
virtual f32 getStepSize() const _IRR_OVERRIDE_; virtual f32 getStepSize() const IRR_OVERRIDE;
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! Draws the element and its children. //! Draws the element and its children.
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! Sets the new caption of the element //! Sets the new caption of the element
virtual void setText(const wchar_t* text) _IRR_OVERRIDE_; virtual void setText(const wchar_t* text) IRR_OVERRIDE;
//! Returns caption of this element. //! Returns caption of this element.
virtual const wchar_t* getText() const _IRR_OVERRIDE_; virtual const wchar_t* getText() const IRR_OVERRIDE;
//! Sets the number of decimal places to display. //! Sets the number of decimal places to display.
//! Note that this also rounds the range to the same number of decimal places. //! Note that this also rounds the range to the same number of decimal places.
/** \param places: The number of decimal places to display, use -1 to reset */ /** \param places: The number of decimal places to display, use -1 to reset */
virtual void setDecimalPlaces(s32 places) _IRR_OVERRIDE_; virtual void setDecimalPlaces(s32 places) IRR_OVERRIDE;
//! Sets when the spinbox has to validate entered text. //! Sets when the spinbox has to validate entered text.
/** \param validateOn Can be any combination of EGUI_SPINBOX_VALIDATION bit flags */ /** \param validateOn Can be any combination of EGUI_SPINBOX_VALIDATION bit flags */
virtual void setValidateOn(u32 validateOn) _IRR_OVERRIDE_; virtual void setValidateOn(u32 validateOn) IRR_OVERRIDE;
//! Gets when the spinbox has to validate entered text. //! Gets when the spinbox has to validate entered text.
virtual u32 getValidateOn() const _IRR_OVERRIDE_; virtual u32 getValidateOn() const IRR_OVERRIDE;
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the element //! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
protected: protected:
virtual void verifyValueRange(); virtual void verifyValueRange();
@ -112,5 +112,4 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // __C_GUI_SPIN_BOX_H_INCLUDED__ #endif // IRR_C_GUI_SPIN_BOX_H_INCLUDED

29
source/Irrlicht/CGUISpriteBank.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_SPRITE_BANK_H_INCLUDED__ #ifndef IRR_C_GUI_SPRITE_BANK_H_INCLUDED
#define __C_GUI_SPRITE_BANK_H_INCLUDED__ #define IRR_C_GUI_SPRITE_BANK_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -32,38 +32,38 @@ public:
CGUISpriteBank(IGUIEnvironment* env); CGUISpriteBank(IGUIEnvironment* env);
virtual ~CGUISpriteBank(); virtual ~CGUISpriteBank();
virtual core::array< core::rect<s32> >& getPositions() _IRR_OVERRIDE_; virtual core::array< core::rect<s32> >& getPositions() IRR_OVERRIDE;
virtual core::array< SGUISprite >& getSprites() _IRR_OVERRIDE_; virtual core::array< SGUISprite >& getSprites() IRR_OVERRIDE;
virtual u32 getTextureCount() const _IRR_OVERRIDE_; virtual u32 getTextureCount() const IRR_OVERRIDE;
virtual video::ITexture* getTexture(u32 index) const _IRR_OVERRIDE_; virtual video::ITexture* getTexture(u32 index) const IRR_OVERRIDE;
virtual void addTexture(video::ITexture* texture) _IRR_OVERRIDE_; virtual void addTexture(video::ITexture* texture) IRR_OVERRIDE;
virtual void setTexture(u32 index, video::ITexture* texture) _IRR_OVERRIDE_; virtual void setTexture(u32 index, video::ITexture* texture) IRR_OVERRIDE;
//! Add the texture and use it for a single non-animated sprite. //! Add the texture and use it for a single non-animated sprite.
virtual s32 addTextureAsSprite(video::ITexture* texture) _IRR_OVERRIDE_; virtual s32 addTextureAsSprite(video::ITexture* texture) IRR_OVERRIDE;
//! clears sprites, rectangles and textures //! clears sprites, rectangles and textures
virtual void clear() _IRR_OVERRIDE_; virtual void clear() IRR_OVERRIDE;
//! Draws a sprite in 2d with position and color //! Draws a sprite in 2d with position and color
virtual void draw2DSprite(u32 index, const core::position2di& pos, const core::rect<s32>* clip=0, 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), const video::SColor& color= video::SColor(255,255,255,255),
u32 starttime=0, u32 currenttime=0, bool loop=true, bool center=false) _IRR_OVERRIDE_; u32 starttime=0, u32 currenttime=0, bool loop=true, bool center=false) IRR_OVERRIDE;
//! Draws a sprite in 2d with destination rectangle and colors //! Draws a sprite in 2d with destination rectangle and colors
virtual void draw2DSprite(u32 index, const core::rect<s32>& destRect, virtual void draw2DSprite(u32 index, const core::rect<s32>& destRect,
const core::rect<s32>* clip=0, const core::rect<s32>* clip=0,
const video::SColor * const colors=0, const video::SColor * const colors=0,
u32 timeTicks = 0, u32 timeTicks = 0,
bool loop=true) _IRR_OVERRIDE_; bool loop=true) IRR_OVERRIDE;
//! Draws a sprite batch in 2d using an array of positions and a color //! 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, virtual void draw2DSpriteBatch(const core::array<u32>& indices, const core::array<core::position2di>& pos,
const core::rect<s32>* clip=0, const core::rect<s32>* clip=0,
const video::SColor& color= video::SColor(255,255,255,255), const video::SColor& color= video::SColor(255,255,255,255),
u32 starttime=0, u32 currenttime=0, u32 starttime=0, u32 currenttime=0,
bool loop=true, bool center=false) _IRR_OVERRIDE_; bool loop=true, bool center=false) IRR_OVERRIDE;
protected: protected:
@ -101,5 +101,4 @@ protected:
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif // __C_GUI_SPRITE_BANK_H_INCLUDED__ #endif // IRR_C_GUI_SPRITE_BANK_H_INCLUDED

61
source/Irrlicht/CGUIStaticText.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_STATIC_TEXT_H_INCLUDED__ #ifndef IRR_C_GUI_STATIC_TEXT_H_INCLUDED
#define __C_GUI_STATIC_TEXT_H_INCLUDED__ #define IRR_C_GUI_STATIC_TEXT_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -28,78 +28,78 @@ namespace gui
virtual ~CGUIStaticText(); virtual ~CGUIStaticText();
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! Sets another skin independent font. //! Sets another skin independent font.
virtual void setOverrideFont(IGUIFont* font=0) _IRR_OVERRIDE_; virtual void setOverrideFont(IGUIFont* font=0) IRR_OVERRIDE;
//! Gets the override font (if any) //! Gets the override font (if any)
virtual IGUIFont* getOverrideFont() const _IRR_OVERRIDE_; virtual IGUIFont* getOverrideFont() const IRR_OVERRIDE;
//! Get the font which is used right now for drawing //! Get the font which is used right now for drawing
virtual IGUIFont* getActiveFont() const _IRR_OVERRIDE_; virtual IGUIFont* getActiveFont() const IRR_OVERRIDE;
//! Sets another color for the text. //! Sets another color for the text.
virtual void setOverrideColor(video::SColor color) _IRR_OVERRIDE_; virtual void setOverrideColor(video::SColor color) IRR_OVERRIDE;
//! Sets another color for the background. //! Sets another color for the background.
virtual void setBackgroundColor(video::SColor color) _IRR_OVERRIDE_; virtual void setBackgroundColor(video::SColor color) IRR_OVERRIDE;
//! Sets whether to draw the background //! Sets whether to draw the background
virtual void setDrawBackground(bool draw) _IRR_OVERRIDE_; virtual void setDrawBackground(bool draw) IRR_OVERRIDE;
//! Gets the background color //! Gets the background color
virtual video::SColor getBackgroundColor() const _IRR_OVERRIDE_; virtual video::SColor getBackgroundColor() const IRR_OVERRIDE;
//! Checks if background drawing is enabled //! Checks if background drawing is enabled
virtual bool isDrawBackgroundEnabled() const _IRR_OVERRIDE_; virtual bool isDrawBackgroundEnabled() const IRR_OVERRIDE;
//! Sets whether to draw the border //! Sets whether to draw the border
virtual void setDrawBorder(bool draw) _IRR_OVERRIDE_; virtual void setDrawBorder(bool draw) IRR_OVERRIDE;
//! Checks if border drawing is enabled //! Checks if border drawing is enabled
virtual bool isDrawBorderEnabled() const _IRR_OVERRIDE_; virtual bool isDrawBorderEnabled() const IRR_OVERRIDE;
//! Sets alignment mode for text //! Sets alignment mode for text
virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) _IRR_OVERRIDE_; virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) IRR_OVERRIDE;
//! Gets the override color //! Gets the override color
virtual video::SColor getOverrideColor() const _IRR_OVERRIDE_; virtual video::SColor getOverrideColor() const IRR_OVERRIDE;
//! Gets the currently used text color //! Gets the currently used text color
virtual video::SColor getActiveColor() const _IRR_OVERRIDE_; virtual video::SColor getActiveColor() const IRR_OVERRIDE;
//! Sets if the static text should use the override color or the //! Sets if the static text should use the override color or the
//! color in the gui skin. //! color in the gui skin.
virtual void enableOverrideColor(bool enable) _IRR_OVERRIDE_; virtual void enableOverrideColor(bool enable) IRR_OVERRIDE;
//! Checks if an override color is enabled //! Checks if an override color is enabled
virtual bool isOverrideColorEnabled() const _IRR_OVERRIDE_; virtual bool isOverrideColorEnabled() const IRR_OVERRIDE;
//! Set whether the text in this label should be clipped if it goes outside bounds //! Set whether the text in this label should be clipped if it goes outside bounds
virtual void setTextRestrainedInside(bool restrainedInside) _IRR_OVERRIDE_; virtual void setTextRestrainedInside(bool restrainedInside) IRR_OVERRIDE;
//! Checks if the text in this label should be clipped if it goes outside bounds //! Checks if the text in this label should be clipped if it goes outside bounds
virtual bool isTextRestrainedInside() const _IRR_OVERRIDE_; virtual bool isTextRestrainedInside() const IRR_OVERRIDE;
//! Enables or disables word wrap for using the static text as //! Enables or disables word wrap for using the static text as
//! multiline text control. //! multiline text control.
virtual void setWordWrap(bool enable) _IRR_OVERRIDE_; virtual void setWordWrap(bool enable) IRR_OVERRIDE;
//! Checks if word wrap is enabled //! Checks if word wrap is enabled
virtual bool isWordWrapEnabled() const _IRR_OVERRIDE_; virtual bool isWordWrapEnabled() const IRR_OVERRIDE;
//! Sets the new caption of this element. //! Sets the new caption of this element.
virtual void setText(const wchar_t* text) _IRR_OVERRIDE_; virtual void setText(const wchar_t* text) IRR_OVERRIDE;
//! Returns the height of the text in pixels when it is drawn. //! Returns the height of the text in pixels when it is drawn.
virtual s32 getTextHeight() const _IRR_OVERRIDE_; virtual s32 getTextHeight() const IRR_OVERRIDE;
//! Returns the width of the current text, in the current font //! Returns the width of the current text, in the current font
virtual s32 getTextWidth() const _IRR_OVERRIDE_; virtual s32 getTextWidth() const IRR_OVERRIDE;
//! Updates the absolute position, splits text if word wrap is enabled //! Updates the absolute position, splits text if word wrap is enabled
virtual void updateAbsolutePosition() _IRR_OVERRIDE_; virtual void updateAbsolutePosition() IRR_OVERRIDE;
//! Set whether the string should be interpreted as right-to-left (RTL) text //! Set whether the string should be interpreted as right-to-left (RTL) text
/** \note This component does not implement the Unicode bidi standard, the /** \note This component does not implement the Unicode bidi standard, the
@ -107,16 +107,16 @@ namespace gui
main difference when RTL is enabled is that the linebreaks for multiline main difference when RTL is enabled is that the linebreaks for multiline
elements are performed starting from the end. elements are performed starting from the end.
*/ */
virtual void setRightToLeft(bool rtl) _IRR_OVERRIDE_; virtual void setRightToLeft(bool rtl) IRR_OVERRIDE;
//! Checks if the text should be interpreted as right-to-left text //! Checks if the text should be interpreted as right-to-left text
virtual bool isRightToLeft() const _IRR_OVERRIDE_; virtual bool isRightToLeft() const IRR_OVERRIDE;
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the element //! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
private: private:
@ -145,4 +145,3 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif #endif

77
source/Irrlicht/CGUITabControl.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_TAB_CONTROL_H_INCLUDED__ #ifndef IRR_C_GUI_TAB_CONTROL_H_INCLUDED
#define __C_GUI_TAB_CONTROL_H_INCLUDED__ #define IRR_C_GUI_TAB_CONTROL_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -30,30 +30,30 @@ namespace gui
s32 id); s32 id);
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! sets if the tab should draw its background //! sets if the tab should draw its background
virtual void setDrawBackground(bool draw=true) _IRR_OVERRIDE_; virtual void setDrawBackground(bool draw=true) IRR_OVERRIDE;
//! sets the color of the background, if it should be drawn. //! sets the color of the background, if it should be drawn.
virtual void setBackgroundColor(video::SColor c) _IRR_OVERRIDE_; virtual void setBackgroundColor(video::SColor c) IRR_OVERRIDE;
//! sets the color of the text //! sets the color of the text
virtual void setTextColor(video::SColor c) _IRR_OVERRIDE_; virtual void setTextColor(video::SColor c) IRR_OVERRIDE;
//! returns true if the tab is drawing its background, false if not //! returns true if the tab is drawing its background, false if not
virtual bool isDrawingBackground() const _IRR_OVERRIDE_; virtual bool isDrawingBackground() const IRR_OVERRIDE;
//! returns the color of the background //! returns the color of the background
virtual video::SColor getBackgroundColor() const _IRR_OVERRIDE_; virtual video::SColor getBackgroundColor() const IRR_OVERRIDE;
virtual video::SColor getTextColor() const _IRR_OVERRIDE_; virtual video::SColor getTextColor() const IRR_OVERRIDE;
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the element //! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
private: private:
@ -78,87 +78,87 @@ namespace gui
virtual ~CGUITabControl(); virtual ~CGUITabControl();
//! Adds a tab //! Adds a tab
virtual IGUITab* addTab(const wchar_t* caption, s32 id=-1) _IRR_OVERRIDE_; virtual IGUITab* addTab(const wchar_t* caption, s32 id=-1) IRR_OVERRIDE;
//! Adds an existing tab //! Adds an existing tab
virtual s32 addTab(IGUITab* tab) _IRR_OVERRIDE_; virtual s32 addTab(IGUITab* tab) IRR_OVERRIDE;
//! Insert the tab at the given index //! Insert the tab at the given index
virtual IGUITab* insertTab(s32 idx, const wchar_t* caption, s32 id=-1) _IRR_OVERRIDE_; virtual IGUITab* insertTab(s32 idx, const wchar_t* caption, s32 id=-1) IRR_OVERRIDE;
//! Insert an existing tab //! Insert an existing tab
/** Note that it will also add the tab as a child of this TabControl. /** Note that it will also add the tab as a child of this TabControl.
\return Index of added tab (should be same as the one passed) or -1 for failure*/ \return Index of added tab (should be same as the one passed) or -1 for failure*/
virtual s32 insertTab(s32 idx, IGUITab* tab, bool serializationMode) _IRR_OVERRIDE_; virtual s32 insertTab(s32 idx, IGUITab* tab, bool serializationMode) IRR_OVERRIDE;
//! Removes a tab from the tabcontrol //! Removes a tab from the tabcontrol
virtual void removeTab(s32 idx) _IRR_OVERRIDE_; virtual void removeTab(s32 idx) IRR_OVERRIDE;
//! Clears the tabcontrol removing all tabs //! Clears the tabcontrol removing all tabs
virtual void clear() _IRR_OVERRIDE_; virtual void clear() IRR_OVERRIDE;
//! Returns amount of tabs in the tabcontrol //! Returns amount of tabs in the tabcontrol
virtual s32 getTabCount() const _IRR_OVERRIDE_; virtual s32 getTabCount() const IRR_OVERRIDE;
//! Returns a tab based on zero based index //! Returns a tab based on zero based index
virtual IGUITab* getTab(s32 idx) const _IRR_OVERRIDE_; virtual IGUITab* getTab(s32 idx) const IRR_OVERRIDE;
//! Brings a tab to front. //! Brings a tab to front.
virtual bool setActiveTab(s32 idx) _IRR_OVERRIDE_; virtual bool setActiveTab(s32 idx) IRR_OVERRIDE;
//! Brings a tab to front. //! Brings a tab to front.
virtual bool setActiveTab(IGUITab *tab) _IRR_OVERRIDE_; virtual bool setActiveTab(IGUITab *tab) IRR_OVERRIDE;
//! For given given tab find it's zero-based index (or -1 for not found) //! For given given tab find it's zero-based index (or -1 for not found)
virtual s32 getTabIndex(const IGUIElement *tab) const _IRR_OVERRIDE_; virtual s32 getTabIndex(const IGUIElement *tab) const IRR_OVERRIDE;
//! Returns which tab is currently active //! Returns which tab is currently active
virtual s32 getActiveTab() const _IRR_OVERRIDE_; virtual s32 getActiveTab() const IRR_OVERRIDE;
//! get the the id of the tab at the given absolute coordinates //! get the the id of the tab at the given absolute coordinates
virtual s32 getTabAt(s32 xpos, s32 ypos) const _IRR_OVERRIDE_; virtual s32 getTabAt(s32 xpos, s32 ypos) const IRR_OVERRIDE;
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! Removes a child. //! Removes a child.
virtual void removeChild(IGUIElement* child) _IRR_OVERRIDE_; virtual void removeChild(IGUIElement* child) IRR_OVERRIDE;
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Set the height of the tabs //! Set the height of the tabs
virtual void setTabHeight( s32 height ) _IRR_OVERRIDE_; virtual void setTabHeight( s32 height ) IRR_OVERRIDE;
//! Reads attributes of the element //! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
//! Get the height of the tabs //! Get the height of the tabs
virtual s32 getTabHeight() const _IRR_OVERRIDE_; virtual s32 getTabHeight() const IRR_OVERRIDE;
//! set the maximal width of a tab. Per default width is 0 which means "no width restriction". //! set the maximal width of a tab. Per default width is 0 which means "no width restriction".
virtual void setTabMaxWidth(s32 width ) _IRR_OVERRIDE_; virtual void setTabMaxWidth(s32 width ) IRR_OVERRIDE;
//! get the maximal width of a tab //! get the maximal width of a tab
virtual s32 getTabMaxWidth() const _IRR_OVERRIDE_; virtual s32 getTabMaxWidth() const IRR_OVERRIDE;
//! Set the alignment of the tabs //! Set the alignment of the tabs
//! note: EGUIA_CENTER is not an option //! note: EGUIA_CENTER is not an option
virtual void setTabVerticalAlignment( gui::EGUI_ALIGNMENT alignment ) _IRR_OVERRIDE_; virtual void setTabVerticalAlignment( gui::EGUI_ALIGNMENT alignment ) IRR_OVERRIDE;
//! Get the alignment of the tabs //! Get the alignment of the tabs
virtual gui::EGUI_ALIGNMENT getTabVerticalAlignment() const _IRR_OVERRIDE_; virtual gui::EGUI_ALIGNMENT getTabVerticalAlignment() const IRR_OVERRIDE;
//! Set the extra width added to tabs on each side of the text //! Set the extra width added to tabs on each side of the text
virtual void setTabExtraWidth( s32 extraWidth ) _IRR_OVERRIDE_; virtual void setTabExtraWidth( s32 extraWidth ) IRR_OVERRIDE;
//! Get the extra width added to tabs on each side of the text //! Get the extra width added to tabs on each side of the text
virtual s32 getTabExtraWidth() const _IRR_OVERRIDE_; virtual s32 getTabExtraWidth() const IRR_OVERRIDE;
//! Update the position of the element, decides scroll button status //! Update the position of the element, decides scroll button status
virtual void updateAbsolutePosition() _IRR_OVERRIDE_; virtual void updateAbsolutePosition() IRR_OVERRIDE;
private: private:
@ -195,4 +195,3 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif #endif

85
source/Irrlicht/CGUITable.h
View File

@ -5,8 +5,8 @@
// 07.10.2005 - Multicolor-Listbox addet by A. Buschhueter (Acki) // 07.10.2005 - Multicolor-Listbox addet by A. Buschhueter (Acki)
// A_Buschhueter@gmx.de // A_Buschhueter@gmx.de
#ifndef __C_GUI_TABLE_BAR_H_INCLUDED__ #ifndef IRR_C_GUI_TABLE_BAR_H_INCLUDED
#define __C_GUI_TABLE_BAR_H_INCLUDED__ #define IRR_C_GUI_TABLE_BAR_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -35,52 +35,52 @@ namespace gui
//! Adds a column //! Adds a column
//! If columnIndex is outside the current range, do push new column at the end //! If columnIndex is outside the current range, do push new column at the end
virtual void addColumn(const wchar_t* caption, s32 columnIndex=-1) _IRR_OVERRIDE_; virtual void addColumn(const wchar_t* caption, s32 columnIndex=-1) IRR_OVERRIDE;
//! remove a column from the table //! remove a column from the table
virtual void removeColumn(u32 columnIndex) _IRR_OVERRIDE_; virtual void removeColumn(u32 columnIndex) IRR_OVERRIDE;
//! Returns the number of columns in the table control //! Returns the number of columns in the table control
virtual s32 getColumnCount() const _IRR_OVERRIDE_; virtual s32 getColumnCount() const IRR_OVERRIDE;
//! Makes a column active. This will trigger an ordering process. //! Makes a column active. This will trigger an ordering process.
/** \param idx: The id of the column to make active. /** \param idx: The id of the column to make active.
\return True if successful. */ \return True if successful. */
virtual bool setActiveColumn(s32 columnIndex, bool doOrder=false) _IRR_OVERRIDE_; virtual bool setActiveColumn(s32 columnIndex, bool doOrder=false) IRR_OVERRIDE;
//! Returns which header is currently active //! Returns which header is currently active
virtual s32 getActiveColumn() const _IRR_OVERRIDE_; virtual s32 getActiveColumn() const IRR_OVERRIDE;
//! Returns the ordering used by the currently active column //! Returns the ordering used by the currently active column
virtual EGUI_ORDERING_MODE getActiveColumnOrdering() const _IRR_OVERRIDE_; virtual EGUI_ORDERING_MODE getActiveColumnOrdering() const IRR_OVERRIDE;
//! set a column width //! set a column width
virtual void setColumnWidth(u32 columnIndex, u32 width) _IRR_OVERRIDE_; virtual void setColumnWidth(u32 columnIndex, u32 width) IRR_OVERRIDE;
//! Get the width of a column //! Get the width of a column
virtual u32 getColumnWidth(u32 columnIndex) const _IRR_OVERRIDE_; virtual u32 getColumnWidth(u32 columnIndex) const IRR_OVERRIDE;
//! columns can be resized by drag 'n drop //! columns can be resized by drag 'n drop
virtual void setResizableColumns(bool resizable) _IRR_OVERRIDE_; virtual void setResizableColumns(bool resizable) IRR_OVERRIDE;
//! can columns be resized by drag 'n drop? //! can columns be resized by drag 'n drop?
virtual bool hasResizableColumns() const _IRR_OVERRIDE_; virtual bool hasResizableColumns() const IRR_OVERRIDE;
//! This tells the table control which ordering mode should be used when //! This tells the table control which ordering mode should be used when
//! a column header is clicked. //! a column header is clicked.
/** \param columnIndex: The index of the column header. /** \param columnIndex: The index of the column header.
\param state: If true, a EGET_TABLE_HEADER_CHANGED message will be sent and you can order the table data as you whish.*/ \param state: If true, a EGET_TABLE_HEADER_CHANGED message will be sent and you can order the table data as you whish.*/
//! \param mode: One of the modes defined in EGUI_COLUMN_ORDERING //! \param mode: One of the modes defined in EGUI_COLUMN_ORDERING
virtual void setColumnOrdering(u32 columnIndex, EGUI_COLUMN_ORDERING mode) _IRR_OVERRIDE_; virtual void setColumnOrdering(u32 columnIndex, EGUI_COLUMN_ORDERING mode) IRR_OVERRIDE;
//! Returns which row is currently selected //! Returns which row is currently selected
virtual s32 getSelected() const _IRR_OVERRIDE_; virtual s32 getSelected() const IRR_OVERRIDE;
//! set currently selected row //! set currently selected row
virtual void setSelected( s32 index ) _IRR_OVERRIDE_; virtual void setSelected( s32 index ) IRR_OVERRIDE;
//! Returns amount of rows in the tab control //! Returns amount of rows in the tab control
virtual s32 getRowCount() const _IRR_OVERRIDE_; virtual s32 getRowCount() const IRR_OVERRIDE;
//! adds a row to the table //! adds a row to the table
/** \param rowIndex: zero based index of rows. The row will be /** \param rowIndex: zero based index of rows. The row will be
@ -89,16 +89,16 @@ namespace gui
than the actual number of rows by more than one, it than the actual number of rows by more than one, it
won't be created. Note that if you create a row that is won't be created. Note that if you create a row that is
not at the end, there might be performance issues*/ not at the end, there might be performance issues*/
virtual u32 addRow(u32 rowIndex) _IRR_OVERRIDE_; virtual u32 addRow(u32 rowIndex) IRR_OVERRIDE;
//! Remove a row from the table //! Remove a row from the table
virtual void removeRow(u32 rowIndex) _IRR_OVERRIDE_; virtual void removeRow(u32 rowIndex) IRR_OVERRIDE;
//! clear the table rows, but keep the columns intact //! clear the table rows, but keep the columns intact
virtual void clearRows() _IRR_OVERRIDE_; virtual void clearRows() IRR_OVERRIDE;
//! Swap two row positions. This is useful for a custom ordering algo. //! Swap two row positions. This is useful for a custom ordering algo.
virtual void swapRows(u32 rowIndexA, u32 rowIndexB) _IRR_OVERRIDE_; virtual void swapRows(u32 rowIndexA, u32 rowIndexB) IRR_OVERRIDE;
//! This tells the table to start ordering all the rows. You //! This tells the table to start ordering all the rows. You
//! need to explicitly tell the table to reorder the rows when //! need to explicitly tell the table to reorder the rows when
@ -106,77 +106,77 @@ namespace gui
//! the system more flexible and doesn't make you pay the cost //! the system more flexible and doesn't make you pay the cost
//! of ordering when adding a lot of rows. //! of ordering when adding a lot of rows.
//! \param columnIndex: When set to -1 the active column is used. //! \param columnIndex: When set to -1 the active column is used.
virtual void orderRows(s32 columnIndex=-1, EGUI_ORDERING_MODE mode=EGOM_NONE) _IRR_OVERRIDE_; virtual void orderRows(s32 columnIndex=-1, EGUI_ORDERING_MODE mode=EGOM_NONE) IRR_OVERRIDE;
//! Set the text of a cell //! Set the text of a cell
virtual void setCellText(u32 rowIndex, u32 columnIndex, const core::stringw& text) _IRR_OVERRIDE_; virtual void setCellText(u32 rowIndex, u32 columnIndex, const core::stringw& text) IRR_OVERRIDE;
//! Set the text of a cell, and set a color of this cell. //! Set the text of a cell, and set a color of this cell.
virtual void setCellText(u32 rowIndex, u32 columnIndex, const core::stringw& text, video::SColor color) _IRR_OVERRIDE_; virtual void setCellText(u32 rowIndex, u32 columnIndex, const core::stringw& text, video::SColor color) IRR_OVERRIDE;
//! Set the data of a cell //! Set the data of a cell
//! data will not be serialized. //! data will not be serialized.
virtual void setCellData(u32 rowIndex, u32 columnIndex, void *data) _IRR_OVERRIDE_; virtual void setCellData(u32 rowIndex, u32 columnIndex, void *data) IRR_OVERRIDE;
//! Set the color of a cell text //! Set the color of a cell text
virtual void setCellColor(u32 rowIndex, u32 columnIndex, video::SColor color) _IRR_OVERRIDE_; virtual void setCellColor(u32 rowIndex, u32 columnIndex, video::SColor color) IRR_OVERRIDE;
//! Get the text of a cell //! Get the text of a cell
virtual const wchar_t* getCellText(u32 rowIndex, u32 columnIndex ) const _IRR_OVERRIDE_; virtual const wchar_t* getCellText(u32 rowIndex, u32 columnIndex ) const IRR_OVERRIDE;
//! Get the data of a cell //! Get the data of a cell
virtual void* getCellData(u32 rowIndex, u32 columnIndex ) const _IRR_OVERRIDE_; virtual void* getCellData(u32 rowIndex, u32 columnIndex ) const IRR_OVERRIDE;
//! clears the table, deletes all items in the table //! clears the table, deletes all items in the table
virtual void clear() _IRR_OVERRIDE_; virtual void clear() IRR_OVERRIDE;
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent &event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent &event) IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! Set flags, as defined in EGUI_TABLE_DRAW_FLAGS, which influence the layout //! Set flags, as defined in EGUI_TABLE_DRAW_FLAGS, which influence the layout
virtual void setDrawFlags(s32 flags) _IRR_OVERRIDE_; virtual void setDrawFlags(s32 flags) IRR_OVERRIDE;
//! Get the flags, as defined in EGUI_TABLE_DRAW_FLAGS, which influence the layout //! Get the flags, as defined in EGUI_TABLE_DRAW_FLAGS, which influence the layout
virtual s32 getDrawFlags() const _IRR_OVERRIDE_; virtual s32 getDrawFlags() const IRR_OVERRIDE;
//! Sets another skin independent font. //! Sets another skin independent font.
virtual void setOverrideFont(IGUIFont* font=0) _IRR_OVERRIDE_; virtual void setOverrideFont(IGUIFont* font=0) IRR_OVERRIDE;
//! Gets the override font (if any) //! Gets the override font (if any)
virtual IGUIFont* getOverrideFont() const _IRR_OVERRIDE_; virtual IGUIFont* getOverrideFont() const IRR_OVERRIDE;
//! Get the font which is used right now for drawing //! Get the font which is used right now for drawing
virtual IGUIFont* getActiveFont() const _IRR_OVERRIDE_; virtual IGUIFont* getActiveFont() const IRR_OVERRIDE;
//! Get the height of items/rows //! Get the height of items/rows
virtual s32 getItemHeight() const _IRR_OVERRIDE_; virtual s32 getItemHeight() const IRR_OVERRIDE;
//! Access the vertical scrollbar //! Access the vertical scrollbar
virtual IGUIScrollBar* getVerticalScrollBar() const _IRR_OVERRIDE_; virtual IGUIScrollBar* getVerticalScrollBar() const IRR_OVERRIDE;
//! Access the horizontal scrollbar //! Access the horizontal scrollbar
virtual IGUIScrollBar* getHorizontalScrollBar() const _IRR_OVERRIDE_; virtual IGUIScrollBar* getHorizontalScrollBar() const IRR_OVERRIDE;
//! Sets whether to draw the background. //! Sets whether to draw the background.
virtual void setDrawBackground(bool draw) _IRR_OVERRIDE_; virtual void setDrawBackground(bool draw) IRR_OVERRIDE;
//! Checks if background drawing is enabled //! Checks if background drawing is enabled
/** \return true if background drawing is enabled, false otherwise */ /** \return true if background drawing is enabled, false otherwise */
virtual bool isDrawBackgroundEnabled() const _IRR_OVERRIDE_; virtual bool isDrawBackgroundEnabled() const IRR_OVERRIDE;
//! Writes attributes of the object. //! Writes attributes of the object.
//! Implement this to expose the attributes of your scene node animator for //! Implement this to expose the attributes of your scene node animator for
//! scripting languages, editors, debuggers or xml serialization purposes. //! scripting languages, editors, debuggers or xml serialization purposes.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE;
//! Reads attributes of the object. //! Reads attributes of the object.
//! Implement this to set the attributes of your scene node animator for //! Implement this to set the attributes of your scene node animator for
//! scripting languages, editors, debuggers or xml deserialization purposes. //! scripting languages, editors, debuggers or xml deserialization purposes.
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE;
protected: protected:
void refreshControls(); void refreshControls();
@ -251,4 +251,3 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif #endif

13
source/Irrlicht/CGUIToolBar.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_TOOL_BAR_H_INCLUDED__ #ifndef IRR_C_GUI_TOOL_BAR_H_INCLUDED
#define __C_GUI_TOOL_BAR_H_INCLUDED__ #define IRR_C_GUI_TOOL_BAR_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -24,18 +24,18 @@ namespace gui
CGUIToolBar(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle); CGUIToolBar(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle);
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! Updates the absolute position. //! Updates the absolute position.
virtual void updateAbsolutePosition() _IRR_OVERRIDE_; virtual void updateAbsolutePosition() IRR_OVERRIDE;
//! Adds a button to the tool bar //! Adds a button to the tool bar
virtual IGUIButton* addButton(s32 id=-1, const wchar_t* text=0,const wchar_t* tooltiptext=0, virtual IGUIButton* addButton(s32 id=-1, const wchar_t* text=0,const wchar_t* tooltiptext=0,
video::ITexture* img=0, video::ITexture* pressed=0, video::ITexture* img=0, video::ITexture* pressed=0,
bool isPushButton=false, bool useAlphaChannel=false) _IRR_OVERRIDE_; bool isPushButton=false, bool useAlphaChannel=false) IRR_OVERRIDE;
private: private:
@ -49,4 +49,3 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif #endif

111
source/Irrlicht/CGUITreeView.h
View File

@ -1,8 +1,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de // written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de
#ifndef __C_GUI_TREE_VIEW_H_INCLUDED__ #ifndef IRR_C_GUI_TREE_VIEW_H_INCLUDED
#define __C_GUI_TREE_VIEW_H_INCLUDED__ #define IRR_C_GUI_TREE_VIEW_H_INCLUDED
#include "IGUITreeView.h" #include "IGUITreeView.h"
#include "irrList.h" #include "irrList.h"
@ -30,55 +30,55 @@ namespace gui
~CGUITreeViewNode(); ~CGUITreeViewNode();
//! returns the owner (tree view) of this node //! returns the owner (tree view) of this node
virtual IGUITreeView* getOwner() const _IRR_OVERRIDE_; virtual IGUITreeView* getOwner() const IRR_OVERRIDE;
//! Returns the parent node of this node. //! Returns the parent node of this node.
virtual IGUITreeViewNode* getParent() const _IRR_OVERRIDE_; virtual IGUITreeViewNode* getParent() const IRR_OVERRIDE;
//! returns the text of the node //! returns the text of the node
virtual const wchar_t* getText() const _IRR_OVERRIDE_ virtual const wchar_t* getText() const IRR_OVERRIDE
{ return Text.c_str(); } { return Text.c_str(); }
//! sets the text of the node //! sets the text of the node
virtual void setText( const wchar_t* text ) _IRR_OVERRIDE_; virtual void setText( const wchar_t* text ) IRR_OVERRIDE;
//! returns the icon text of the node //! returns the icon text of the node
virtual const wchar_t* getIcon() const _IRR_OVERRIDE_ virtual const wchar_t* getIcon() const IRR_OVERRIDE
{ return Icon.c_str(); } { return Icon.c_str(); }
//! sets the icon text of the node //! sets the icon text of the node
virtual void setIcon( const wchar_t* icon ) _IRR_OVERRIDE_; virtual void setIcon( const wchar_t* icon ) IRR_OVERRIDE;
//! returns the image index of the node //! returns the image index of the node
virtual u32 getImageIndex() const _IRR_OVERRIDE_ virtual u32 getImageIndex() const IRR_OVERRIDE
{ return ImageIndex; } { return ImageIndex; }
//! sets the image index of the node //! sets the image index of the node
virtual void setImageIndex( u32 imageIndex ) _IRR_OVERRIDE_ virtual void setImageIndex( u32 imageIndex ) IRR_OVERRIDE
{ ImageIndex = imageIndex; } { ImageIndex = imageIndex; }
//! returns the image index of the node //! returns the image index of the node
virtual u32 getSelectedImageIndex() const _IRR_OVERRIDE_ virtual u32 getSelectedImageIndex() const IRR_OVERRIDE
{ return SelectedImageIndex; } { return SelectedImageIndex; }
//! sets the image index of the node //! sets the image index of the node
virtual void setSelectedImageIndex( u32 imageIndex ) _IRR_OVERRIDE_ virtual void setSelectedImageIndex( u32 imageIndex ) IRR_OVERRIDE
{ SelectedImageIndex = imageIndex; } { SelectedImageIndex = imageIndex; }
//! returns the user data (void*) of this node //! returns the user data (void*) of this node
virtual void* getData() const _IRR_OVERRIDE_ virtual void* getData() const IRR_OVERRIDE
{ return Data; } { return Data; }
//! sets the user data (void*) of this node //! sets the user data (void*) of this node
virtual void setData( void* data ) _IRR_OVERRIDE_ virtual void setData( void* data ) IRR_OVERRIDE
{ Data = data; } { Data = data; }
//! returns the user data2 (IReferenceCounted) of this node //! returns the user data2 (IReferenceCounted) of this node
virtual IReferenceCounted* getData2() const _IRR_OVERRIDE_ virtual IReferenceCounted* getData2() const IRR_OVERRIDE
{ return Data2; } { return Data2; }
//! sets the user data2 (IReferenceCounted) of this node //! sets the user data2 (IReferenceCounted) of this node
virtual void setData2( IReferenceCounted* data ) _IRR_OVERRIDE_ virtual void setData2( IReferenceCounted* data ) IRR_OVERRIDE
{ {
if( Data2 ) if( Data2 )
{ {
@ -92,14 +92,14 @@ namespace gui
} }
//! returns the child item count //! returns the child item count
virtual u32 getChildCount() const _IRR_OVERRIDE_ virtual u32 getChildCount() const IRR_OVERRIDE
{ return Children.getSize(); } { return Children.getSize(); }
//! removes all children (recursive) from this node //! removes all children (recursive) from this node
virtual void clearChildren() _IRR_OVERRIDE_; virtual void clearChildren() IRR_OVERRIDE;
//! returns true if this node has child nodes //! returns true if this node has child nodes
virtual bool hasChildren() const _IRR_OVERRIDE_ virtual bool hasChildren() const IRR_OVERRIDE
{ return !Children.empty(); } { return !Children.empty(); }
//! Adds a new node behind the last child node. //! Adds a new node behind the last child node.
@ -117,7 +117,7 @@ namespace gui
s32 imageIndex = -1, s32 imageIndex = -1,
s32 selectedImageIndex = -1, s32 selectedImageIndex = -1,
void* data = 0, void* data = 0,
IReferenceCounted* data2 = 0) _IRR_OVERRIDE_; IReferenceCounted* data2 = 0) IRR_OVERRIDE;
//! Adds a new node before the first child node. //! Adds a new node before the first child node.
//! \param text text of the new node //! \param text text of the new node
@ -134,7 +134,7 @@ namespace gui
s32 imageIndex = -1, s32 imageIndex = -1,
s32 selectedImageIndex = -1, s32 selectedImageIndex = -1,
void* data = 0, void* data = 0,
IReferenceCounted* data2 = 0 ) _IRR_OVERRIDE_; IReferenceCounted* data2 = 0 ) IRR_OVERRIDE;
//! Adds a new node behind the other node. //! Adds a new node behind the other node.
//! The other node has also te be a child node from this node. //! The other node has also te be a child node from this node.
@ -153,7 +153,7 @@ namespace gui
s32 imageIndex = -1, s32 imageIndex = -1,
s32 selectedImageIndex = -1, s32 selectedImageIndex = -1,
void* data = 0, void* data = 0,
IReferenceCounted* data2 = 0 ) _IRR_OVERRIDE_; IReferenceCounted* data2 = 0 ) IRR_OVERRIDE;
//! Adds a new node before the other node. //! Adds a new node before the other node.
//! The other node has also te be a child node from this node. //! The other node has also te be a child node from this node.
@ -172,53 +172,53 @@ namespace gui
s32 imageIndex = -1, s32 imageIndex = -1,
s32 selectedImageIndex = -1, s32 selectedImageIndex = -1,
void* data = 0, void* data = 0,
IReferenceCounted* data2 = 0 ) _IRR_OVERRIDE_; IReferenceCounted* data2 = 0 ) IRR_OVERRIDE;
//! Return the first child note from this node. //! Return the first child note from this node.
virtual IGUITreeViewNode* getFirstChild() const _IRR_OVERRIDE_; virtual IGUITreeViewNode* getFirstChild() const IRR_OVERRIDE;
//! Return the last child note from this node. //! Return the last child note from this node.
virtual IGUITreeViewNode* getLastChild() const _IRR_OVERRIDE_; virtual IGUITreeViewNode* getLastChild() const IRR_OVERRIDE;
//! Returns the preverse sibling node from this node. //! Returns the preverse sibling node from this node.
virtual IGUITreeViewNode* getPrevSibling() const _IRR_OVERRIDE_; virtual IGUITreeViewNode* getPrevSibling() const IRR_OVERRIDE;
//! Returns the next sibling node from this node. //! Returns the next sibling node from this node.
virtual IGUITreeViewNode* getNextSibling() const _IRR_OVERRIDE_; virtual IGUITreeViewNode* getNextSibling() const IRR_OVERRIDE;
//! Returns the next visible (expanded, may be out of scrolling) node from this node. //! Returns the next visible (expanded, may be out of scrolling) node from this node.
virtual IGUITreeViewNode* getNextVisible() const _IRR_OVERRIDE_; virtual IGUITreeViewNode* getNextVisible() const IRR_OVERRIDE;
//! Deletes a child node. //! Deletes a child node.
virtual bool deleteChild( IGUITreeViewNode* child ) _IRR_OVERRIDE_; virtual bool deleteChild( IGUITreeViewNode* child ) IRR_OVERRIDE;
//! Moves a child node one position up. //! Moves a child node one position up.
virtual bool moveChildUp( IGUITreeViewNode* child ) _IRR_OVERRIDE_; virtual bool moveChildUp( IGUITreeViewNode* child ) IRR_OVERRIDE;
//! Moves a child node one position down. //! Moves a child node one position down.
virtual bool moveChildDown( IGUITreeViewNode* child ) _IRR_OVERRIDE_; virtual bool moveChildDown( IGUITreeViewNode* child ) IRR_OVERRIDE;
//! Returns true if the node is expanded (children are visible). //! Returns true if the node is expanded (children are visible).
virtual bool getExpanded() const _IRR_OVERRIDE_ virtual bool getExpanded() const IRR_OVERRIDE
{ return Expanded; } { return Expanded; }
//! Sets if the node is expanded. //! Sets if the node is expanded.
virtual void setExpanded( bool expanded ) _IRR_OVERRIDE_; virtual void setExpanded( bool expanded ) IRR_OVERRIDE;
//! Returns true if the node is currently selected. //! Returns true if the node is currently selected.
virtual bool getSelected() const _IRR_OVERRIDE_; virtual bool getSelected() const IRR_OVERRIDE;
//! Sets this node as selected. //! Sets this node as selected.
virtual void setSelected( bool selected ) _IRR_OVERRIDE_; virtual void setSelected( bool selected ) IRR_OVERRIDE;
//! Returns true if this node is the root node. //! Returns true if this node is the root node.
virtual bool isRoot() const _IRR_OVERRIDE_; virtual bool isRoot() const IRR_OVERRIDE;
//! Returns the level of this node. //! Returns the level of this node.
virtual s32 getLevel() const _IRR_OVERRIDE_; virtual s32 getLevel() const IRR_OVERRIDE;
//! Returns true if this node is visible (all parents are expanded). //! Returns true if this node is visible (all parents are expanded).
virtual bool isVisible() const _IRR_OVERRIDE_; virtual bool isVisible() const IRR_OVERRIDE;
private: private:
@ -250,71 +250,71 @@ namespace gui
virtual ~CGUITreeView(); virtual ~CGUITreeView();
//! returns the root node (not visible) from the tree. //! returns the root node (not visible) from the tree.
virtual IGUITreeViewNode* getRoot() const _IRR_OVERRIDE_ virtual IGUITreeViewNode* getRoot() const IRR_OVERRIDE
{ return Root; } { return Root; }
//! returns the selected node of the tree or 0 if none is selected //! returns the selected node of the tree or 0 if none is selected
virtual IGUITreeViewNode* getSelected() const _IRR_OVERRIDE_ virtual IGUITreeViewNode* getSelected() const IRR_OVERRIDE
{ return Selected; } { return Selected; }
//! returns true if the tree lines are visible //! returns true if the tree lines are visible
virtual bool getLinesVisible() const _IRR_OVERRIDE_ virtual bool getLinesVisible() const IRR_OVERRIDE
{ return LinesVisible; } { return LinesVisible; }
//! sets if the tree lines are visible //! sets if the tree lines are visible
virtual void setLinesVisible( bool visible ) _IRR_OVERRIDE_ virtual void setLinesVisible( bool visible ) IRR_OVERRIDE
{ LinesVisible = visible; } { LinesVisible = visible; }
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent( const SEvent &event ) _IRR_OVERRIDE_; virtual bool OnEvent( const SEvent &event ) IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! Sets the font which should be used as icon font. This font is set to the Irrlicht engine //! Sets the font which should be used as icon font. This font is set to the Irrlicht engine
//! built-in-font by default. Icons can be displayed in front of every list item. //! built-in-font by default. Icons can be displayed in front of every list item.
//! An icon is a string, displayed with the icon font. When using the build-in-font of the //! An icon is a string, displayed with the icon font. When using the build-in-font of the
//! Irrlicht engine as icon font, the icon strings defined in GUIIcons.h can be used. //! Irrlicht engine as icon font, the icon strings defined in GUIIcons.h can be used.
virtual void setIconFont( IGUIFont* font ) _IRR_OVERRIDE_; virtual void setIconFont( IGUIFont* font ) IRR_OVERRIDE;
//! Sets a skin independent font. //! Sets a skin independent font.
/** \param font: New font to set or 0 to use the skin-font. */ /** \param font: New font to set or 0 to use the skin-font. */
virtual void setOverrideFont(IGUIFont* font=0) _IRR_OVERRIDE_; virtual void setOverrideFont(IGUIFont* font=0) IRR_OVERRIDE;
//! Gets the override font (if any) //! Gets the override font (if any)
/** \return The override font (may be 0) */ /** \return The override font (may be 0) */
virtual IGUIFont* getOverrideFont(void) const _IRR_OVERRIDE_; virtual IGUIFont* getOverrideFont(void) const IRR_OVERRIDE;
//! Get the font which is used for drawing //! Get the font which is used for drawing
/** This is the override font when one is set and the /** This is the override font when one is set and the
font of the skin otherwise. */ font of the skin otherwise. */
virtual IGUIFont* getActiveFont() const _IRR_OVERRIDE_; virtual IGUIFont* getActiveFont() const IRR_OVERRIDE;
//! Sets the image list which should be used for the image and selected image of every node. //! Sets the image list which should be used for the image and selected image of every node.
//! The default is 0 (no images). //! The default is 0 (no images).
virtual void setImageList( IGUIImageList* imageList ) _IRR_OVERRIDE_; virtual void setImageList( IGUIImageList* imageList ) IRR_OVERRIDE;
//! Returns the image list which is used for the nodes. //! Returns the image list which is used for the nodes.
virtual IGUIImageList* getImageList() const _IRR_OVERRIDE_ virtual IGUIImageList* getImageList() const IRR_OVERRIDE
{ return ImageList; } { return ImageList; }
//! Sets if the image is left of the icon. Default is true. //! Sets if the image is left of the icon. Default is true.
virtual void setImageLeftOfIcon( bool bLeftOf ) _IRR_OVERRIDE_ virtual void setImageLeftOfIcon( bool bLeftOf ) IRR_OVERRIDE
{ ImageLeftOfIcon = bLeftOf; } { ImageLeftOfIcon = bLeftOf; }
//! Returns if the Image is left of the icon. Default is true. //! Returns if the Image is left of the icon. Default is true.
virtual bool getImageLeftOfIcon() const _IRR_OVERRIDE_ virtual bool getImageLeftOfIcon() const IRR_OVERRIDE
{ return ImageLeftOfIcon; } { return ImageLeftOfIcon; }
//! Returns the node which is associated to the last event. //! Returns the node which is associated to the last event.
virtual IGUITreeViewNode* getLastEventNode() const _IRR_OVERRIDE_ virtual IGUITreeViewNode* getLastEventNode() const IRR_OVERRIDE
{ return LastEventNode; } { return LastEventNode; }
//! Access the vertical scrollbar //! Access the vertical scrollbar
virtual IGUIScrollBar* getVerticalScrollBar() const _IRR_OVERRIDE_; virtual IGUIScrollBar* getVerticalScrollBar() const IRR_OVERRIDE;
//! Access the horizontal scrollbar //! Access the horizontal scrollbar
virtual IGUIScrollBar* getHorizontalScrollBar() const _IRR_OVERRIDE_; virtual IGUIScrollBar* getHorizontalScrollBar() const IRR_OVERRIDE;
private: private:
//! calculates the heigth of an node and of all visible nodes. //! calculates the heigth of an node and of all visible nodes.
@ -352,4 +352,3 @@ namespace gui
} // end namespace irr } // end namespace irr
#endif #endif

35
source/Irrlicht/CGUIWindow.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_WINDOW_H_INCLUDED__ #ifndef IRR_C_GUI_WINDOW_H_INCLUDED
#define __C_GUI_WINDOW_H_INCLUDED__ #define IRR_C_GUI_WINDOW_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_ #ifdef _IRR_COMPILE_WITH_GUI_
@ -27,50 +27,50 @@ namespace gui
virtual ~CGUIWindow(); virtual ~CGUIWindow();
//! called if an event happened. //! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! update absolute position //! update absolute position
virtual void updateAbsolutePosition() _IRR_OVERRIDE_; virtual void updateAbsolutePosition() IRR_OVERRIDE;
//! draws the element and its children //! draws the element and its children
virtual void draw() _IRR_OVERRIDE_; virtual void draw() IRR_OVERRIDE;
//! Returns pointer to the close button //! Returns pointer to the close button
virtual IGUIButton* getCloseButton() const _IRR_OVERRIDE_; virtual IGUIButton* getCloseButton() const IRR_OVERRIDE;
//! Returns pointer to the minimize button //! Returns pointer to the minimize button
virtual IGUIButton* getMinimizeButton() const _IRR_OVERRIDE_; virtual IGUIButton* getMinimizeButton() const IRR_OVERRIDE;
//! Returns pointer to the maximize button //! Returns pointer to the maximize button
virtual IGUIButton* getMaximizeButton() const _IRR_OVERRIDE_; virtual IGUIButton* getMaximizeButton() const IRR_OVERRIDE;
//! Returns true if the window is draggable, false if not //! Returns true if the window is draggable, false if not
virtual bool isDraggable() const _IRR_OVERRIDE_; virtual bool isDraggable() const IRR_OVERRIDE;
//! Sets whether the window is draggable //! Sets whether the window is draggable
virtual void setDraggable(bool draggable) _IRR_OVERRIDE_; virtual void setDraggable(bool draggable) IRR_OVERRIDE;
//! Set if the window background will be drawn //! Set if the window background will be drawn
virtual void setDrawBackground(bool draw) _IRR_OVERRIDE_; virtual void setDrawBackground(bool draw) IRR_OVERRIDE;
//! Get if the window background will be drawn //! Get if the window background will be drawn
virtual bool getDrawBackground() const _IRR_OVERRIDE_; virtual bool getDrawBackground() const IRR_OVERRIDE;
//! Set if the window titlebar will be drawn //! Set if the window titlebar will be drawn
//! Note: If the background is not drawn, then the titlebar is automatically also not drawn //! Note: If the background is not drawn, then the titlebar is automatically also not drawn
virtual void setDrawTitlebar(bool draw) _IRR_OVERRIDE_; virtual void setDrawTitlebar(bool draw) IRR_OVERRIDE;
//! Get if the window titlebar will be drawn //! Get if the window titlebar will be drawn
virtual bool getDrawTitlebar() const _IRR_OVERRIDE_; virtual bool getDrawTitlebar() const IRR_OVERRIDE;
//! Returns the rectangle of the drawable area (without border and without titlebar) //! Returns the rectangle of the drawable area (without border and without titlebar)
virtual core::rect<s32> getClientRect() const _IRR_OVERRIDE_; virtual core::rect<s32> getClientRect() const IRR_OVERRIDE;
//! Writes attributes of the element. //! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the element //! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
protected: protected:
@ -96,4 +96,3 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
#endif #endif

25
source/Irrlicht/CGeometryCreator.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GEOMETRY_CREATOR_H_INCLUDED__ #ifndef IRR_C_GEOMETRY_CREATOR_H_INCLUDED
#define __C_GEOMETRY_CREATOR_H_INCLUDED__ #define IRR_C_GEOMETRY_CREATOR_H_INCLUDED
#include "IGeometryCreator.h" #include "IGeometryCreator.h"
#include "SMeshBuffer.h" #include "SMeshBuffer.h"
@ -19,48 +19,48 @@ class CGeometryCreator : public IGeometryCreator
{ {
void addToBuffer(const video::S3DVertex& v, SMeshBuffer* Buffer) const; void addToBuffer(const video::S3DVertex& v, SMeshBuffer* Buffer) const;
public: public:
virtual IMesh* createCubeMesh(const core::vector3df& size, ECUBE_MESH_TYPE type) const _IRR_OVERRIDE_; virtual IMesh* createCubeMesh(const core::vector3df& size, ECUBE_MESH_TYPE type) const IRR_OVERRIDE;
virtual IMesh* createHillPlaneMesh( virtual IMesh* createHillPlaneMesh(
const core::dimension2d<f32>& tileSize, const core::dimension2d<u32>& tileCount, const core::dimension2d<f32>& tileSize, const core::dimension2d<u32>& tileCount,
video::SMaterial* material, f32 hillHeight, const core::dimension2d<f32>& countHills, video::SMaterial* material, f32 hillHeight, const core::dimension2d<f32>& countHills,
const core::dimension2d<f32>& textureRepeatCount) const _IRR_OVERRIDE_; const core::dimension2d<f32>& textureRepeatCount) const IRR_OVERRIDE;
virtual IMesh* createGeoplaneMesh(f32 radius, u32 rows, u32 columns) const _IRR_OVERRIDE_; virtual IMesh* createGeoplaneMesh(f32 radius, u32 rows, u32 columns) const IRR_OVERRIDE;
virtual IMesh* createTerrainMesh(video::IImage* texture, virtual IMesh* createTerrainMesh(video::IImage* texture,
video::IImage* heightmap, const core::dimension2d<f32>& stretchSize, video::IImage* heightmap, const core::dimension2d<f32>& stretchSize,
f32 maxHeight, video::IVideoDriver* driver, f32 maxHeight, video::IVideoDriver* driver,
const core::dimension2d<u32>& defaultVertexBlockSize, const core::dimension2d<u32>& defaultVertexBlockSize,
bool debugBorders=false) const _IRR_OVERRIDE_; bool debugBorders=false) const IRR_OVERRIDE;
virtual IMesh* createArrowMesh(const u32 tesselationCylinder, virtual IMesh* createArrowMesh(const u32 tesselationCylinder,
const u32 tesselationCone, const f32 height, const u32 tesselationCone, const f32 height,
const f32 cylinderHeight, const f32 width0, const f32 cylinderHeight, const f32 width0,
const f32 width1, const video::SColor vtxColor0, const f32 width1, const video::SColor vtxColor0,
const video::SColor vtxColor1) const _IRR_OVERRIDE_; const video::SColor vtxColor1) const IRR_OVERRIDE;
virtual IMesh* createSphereMesh(f32 radius, u32 polyCountX, u32 polyCountY) const _IRR_OVERRIDE_; virtual IMesh* createSphereMesh(f32 radius, u32 polyCountX, u32 polyCountY) const IRR_OVERRIDE;
virtual IMesh* createCylinderMesh(f32 radius, f32 length, u32 tesselation, virtual IMesh* createCylinderMesh(f32 radius, f32 length, u32 tesselation,
const video::SColor& color=0xffffffff, const video::SColor& color=0xffffffff,
bool closeTop=true, f32 oblique=0.f, u32 normalType=0) const _IRR_OVERRIDE_; bool closeTop=true, f32 oblique=0.f, u32 normalType=0) const IRR_OVERRIDE;
virtual IMesh* createConeMesh(f32 radius, f32 length, u32 tesselation, virtual IMesh* createConeMesh(f32 radius, f32 length, u32 tesselation,
const video::SColor& colorTop=0xffffffff, const video::SColor& colorTop=0xffffffff,
const video::SColor& colorBottom=0xffffffff, const video::SColor& colorBottom=0xffffffff,
f32 oblique=0.f) const _IRR_OVERRIDE_; f32 oblique=0.f) const IRR_OVERRIDE;
virtual IMesh* createTorusMesh(f32 majorRadius, f32 minorRadius, virtual IMesh* createTorusMesh(f32 majorRadius, f32 minorRadius,
u32 majorSegments, u32 minorSegments, u32 majorSegments, u32 minorSegments,
f32 angleStart, f32 angleEnd, int capEnds) const _IRR_OVERRIDE_; f32 angleStart, f32 angleEnd, int capEnds) const IRR_OVERRIDE;
virtual IMesh* createVolumeLightMesh( virtual IMesh* createVolumeLightMesh(
const u32 subdivideU=32, const u32 subdivideV=32, const u32 subdivideU=32, const u32 subdivideV=32,
const video::SColor footColor=0xffffffff, const video::SColor footColor=0xffffffff,
const video::SColor tailColor=0xffffffff, const video::SColor tailColor=0xffffffff,
const f32 lpDistance = 8.f, const f32 lpDistance = 8.f,
const core::vector3df& lightDim = core::vector3df(1.f,1.2f,1.f)) const _IRR_OVERRIDE_; const core::vector3df& lightDim = core::vector3df(1.f,1.2f,1.f)) const IRR_OVERRIDE;
}; };
@ -68,4 +68,3 @@ public:
} // end namespace irr } // end namespace irr
#endif #endif

24
source/Irrlicht/CImage.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IMAGE_H_INCLUDED__ #ifndef IRR_C_IMAGE_H_INCLUDED
#define __C_IMAGE_H_INCLUDED__ #define IRR_C_IMAGE_H_INCLUDED
#include "IImage.h" #include "IImage.h"
#include "rect.h" #include "rect.h"
@ -30,33 +30,33 @@ public:
CImage(ECOLOR_FORMAT format, const core::dimension2d<u32>& size); CImage(ECOLOR_FORMAT format, const core::dimension2d<u32>& size);
//! returns a pixel //! returns a pixel
virtual SColor getPixel(u32 x, u32 y) const _IRR_OVERRIDE_; virtual SColor getPixel(u32 x, u32 y) const IRR_OVERRIDE;
//! sets a pixel //! sets a pixel
virtual void setPixel(u32 x, u32 y, const SColor &color, bool blend = false ) _IRR_OVERRIDE_; virtual void setPixel(u32 x, u32 y, const SColor &color, bool blend = false ) IRR_OVERRIDE;
//! copies this surface into another, scaling it to fit. //! copies this surface into another, scaling it to fit.
virtual void copyToScaling(void* target, u32 width, u32 height, ECOLOR_FORMAT format, u32 pitch=0) _IRR_OVERRIDE_; virtual void copyToScaling(void* target, u32 width, u32 height, ECOLOR_FORMAT format, u32 pitch=0) IRR_OVERRIDE;
//! copies this surface into another, scaling it to fit. //! copies this surface into another, scaling it to fit.
virtual void copyToScaling(IImage* target) _IRR_OVERRIDE_; virtual void copyToScaling(IImage* target) IRR_OVERRIDE;
//! copies this surface into another //! copies this surface into another
virtual void copyTo(IImage* target, const core::position2d<s32>& pos=core::position2d<s32>(0,0)) _IRR_OVERRIDE_; virtual void copyTo(IImage* target, const core::position2d<s32>& pos=core::position2d<s32>(0,0)) IRR_OVERRIDE;
//! copies this surface into another //! copies this surface into another
virtual void copyTo(IImage* target, const core::position2d<s32>& pos, const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect=0) _IRR_OVERRIDE_; virtual void copyTo(IImage* target, const core::position2d<s32>& pos, const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect=0) IRR_OVERRIDE;
//! copies this surface into another, using the alpha mask, an cliprect and a color to add with //! 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, virtual void copyToWithAlpha(IImage* target, const core::position2d<s32>& pos,
const core::rect<s32>& sourceRect, const SColor &color, const core::rect<s32>& sourceRect, const SColor &color,
const core::rect<s32>* clipRect = 0, bool combineAlpha=false) _IRR_OVERRIDE_; const core::rect<s32>* clipRect = 0, bool combineAlpha=false) IRR_OVERRIDE;
//! copies this surface into another, scaling it to fit, applying a box filter //! copies this surface into another, scaling it to fit, applying a box filter
virtual void copyToScalingBoxFilter(IImage* target, s32 bias = 0, bool blend = false) _IRR_OVERRIDE_; virtual void copyToScalingBoxFilter(IImage* target, s32 bias = 0, bool blend = false) IRR_OVERRIDE;
//! fills the surface with given color //! fills the surface with given color
virtual void fill(const SColor &color) _IRR_OVERRIDE_; virtual void fill(const SColor &color) IRR_OVERRIDE;
private: private:
inline SColor getPixelBox ( s32 x, s32 y, s32 fx, s32 fy, s32 bias ) const; inline SColor getPixelBox ( s32 x, s32 y, s32 fx, s32 fy, s32 bias ) const;
@ -65,6 +65,4 @@ private:
} // end namespace video } // end namespace video
} // end namespace irr } // end namespace irr
#endif #endif

11
source/Irrlicht/CImageLoaderBMP.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IMAGE_LOADER_BMP_H_INCLUDED__ #ifndef IRR_C_IMAGE_LOADER_BMP_H_INCLUDED
#define __C_IMAGE_LOADER_BMP_H_INCLUDED__ #define IRR_C_IMAGE_LOADER_BMP_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
@ -75,13 +75,13 @@ public:
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".tga") //! based on the file extension (e.g. ".tga")
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE;
//! creates a surface from the file //! creates a surface from the file
virtual IImage* loadImage(io::IReadFile* file) const _IRR_OVERRIDE_; virtual IImage* loadImage(io::IReadFile* file) const IRR_OVERRIDE;
private: private:
@ -97,4 +97,3 @@ private:
} // end namespace irr } // end namespace irr
#endif #endif

11
source/Irrlicht/CImageLoaderDDS.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IMAGE_LOADER_DDS_H_INCLUDED__ #ifndef IRR_C_IMAGE_LOADER_DDS_H_INCLUDED
#define __C_IMAGE_LOADER_DDS_H_INCLUDED__ #define IRR_C_IMAGE_LOADER_DDS_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
@ -197,13 +197,13 @@ public:
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".tga") //! based on the file extension (e.g. ".tga")
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE;
//! creates a surface from the file //! creates a surface from the file
virtual IImage* loadImage(io::IReadFile* file) const _IRR_OVERRIDE_; virtual IImage* loadImage(io::IReadFile* file) const IRR_OVERRIDE;
}; };
@ -212,4 +212,3 @@ public:
#endif // compiled with DDS loader #endif // compiled with DDS loader
#endif #endif

11
source/Irrlicht/CImageLoaderJPG.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IMAGE_LOADER_JPG_H_INCLUDED__ #ifndef IRR_C_IMAGE_LOADER_JPG_H_INCLUDED
#define __C_IMAGE_LOADER_JPG_H_INCLUDED__ #define IRR_C_IMAGE_LOADER_JPG_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
@ -43,13 +43,13 @@ public:
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".tga") //! based on the file extension (e.g. ".tga")
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE;
//! creates a surface from the file //! creates a surface from the file
virtual IImage* loadImage(io::IReadFile* file) const _IRR_OVERRIDE_; virtual IImage* loadImage(io::IReadFile* file) const IRR_OVERRIDE;
private: private:
@ -110,4 +110,3 @@ private:
#endif #endif
#endif #endif

11
source/Irrlicht/CImageLoaderPCX.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IMAGE_LOADER_PCX_H_INCLUDED__ #ifndef IRR_C_IMAGE_LOADER_PCX_H_INCLUDED
#define __C_IMAGE_LOADER_PCX_H_INCLUDED__ #define IRR_C_IMAGE_LOADER_PCX_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
@ -63,13 +63,13 @@ public:
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".tga") //! based on the file extension (e.g. ".tga")
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE;
//! creates a surface from the file //! creates a surface from the file
virtual IImage* loadImage(io::IReadFile* file) const _IRR_OVERRIDE_; virtual IImage* loadImage(io::IReadFile* file) const IRR_OVERRIDE;
}; };
@ -79,4 +79,3 @@ public:
} // end namespace irr } // end namespace irr
#endif #endif

11
source/Irrlicht/CImageLoaderPNG.h
View File

@ -6,8 +6,8 @@
// i wanted to be able to read in PNG images with irrlicht :) // i wanted to be able to read in PNG images with irrlicht :)
// why? lossless compression with 8-bit alpha channel! // why? lossless compression with 8-bit alpha channel!
#ifndef __C_IMAGE_LOADER_PNG_H_INCLUDED__ #ifndef IRR_C_IMAGE_LOADER_PNG_H_INCLUDED
#define __C_IMAGE_LOADER_PNG_H_INCLUDED__ #define IRR_C_IMAGE_LOADER_PNG_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
@ -27,13 +27,13 @@ public:
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".png") //! based on the file extension (e.g. ".png")
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE;
//! creates a surface from the file //! creates a surface from the file
virtual IImage* loadImage(io::IReadFile* file) const _IRR_OVERRIDE_; virtual IImage* loadImage(io::IReadFile* file) const IRR_OVERRIDE;
}; };
@ -42,4 +42,3 @@ public:
#endif #endif
#endif #endif

12
source/Irrlicht/CImageLoaderPPM.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IMAGE_LOADER_PPM_H_INCLUDED__ #ifndef IRR_C_IMAGE_LOADER_PPM_H_INCLUDED
#define __C_IMAGE_LOADER_PPM_H_INCLUDED__ #define IRR_C_IMAGE_LOADER_PPM_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
@ -31,13 +31,13 @@ public:
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".tga") //! based on the file extension (e.g. ".tga")
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE;
//! creates a surface from the file //! creates a surface from the file
virtual IImage* loadImage(io::IReadFile* file) const _IRR_OVERRIDE_; virtual IImage* loadImage(io::IReadFile* file) const IRR_OVERRIDE;
private: private:
//! read the next token from file //! read the next token from file
@ -49,7 +49,5 @@ private:
} // end namespace video } // end namespace video
} // end namespace irr } // end namespace irr
#endif #endif
#endif #endif

11
source/Irrlicht/CImageLoaderPSD.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IMAGE_LOADER_PSD_H_INCLUDED__ #ifndef IRR_C_IMAGE_LOADER_PSD_H_INCLUDED
#define __C_IMAGE_LOADER_PSD_H_INCLUDED__ #define IRR_C_IMAGE_LOADER_PSD_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
@ -48,13 +48,13 @@ public:
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".tga") //! based on the file extension (e.g. ".tga")
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE;
//! creates a surface from the file //! creates a surface from the file
virtual IImage* loadImage(io::IReadFile* file) const _IRR_OVERRIDE_; virtual IImage* loadImage(io::IReadFile* file) const IRR_OVERRIDE;
private: private:
@ -69,4 +69,3 @@ private:
#endif #endif
#endif #endif

12
source/Irrlicht/CImageLoaderPVR.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IMAGE_LOADER_PVR_H_INCLUDED__ #ifndef IRR_C_IMAGE_LOADER_PVR_H_INCLUDED
#define __C_IMAGE_LOADER_PVR_H_INCLUDED__ #define IRR_C_IMAGE_LOADER_PVR_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
@ -39,13 +39,13 @@ struct SPVRHeader
class CImageLoaderPVR : public IImageLoader class CImageLoaderPVR : public IImageLoader
{ {
public: public:
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE;
virtual IImage* loadImage(io::IReadFile* file) const _IRR_OVERRIDE_; virtual IImage* loadImage(io::IReadFile* file) const IRR_OVERRIDE;
virtual core::array<IImage*> loadImages(io::IReadFile* file, E_TEXTURE_TYPE* type) const _IRR_OVERRIDE_; virtual core::array<IImage*> loadImages(io::IReadFile* file, E_TEXTURE_TYPE* type) const IRR_OVERRIDE;
}; };
} }

13
source/Irrlicht/CImageLoaderRGB.h
View File

@ -13,8 +13,8 @@
Updated: Updated:
*/ */
#ifndef __C_IMAGE_LOADER_RGB_H_INCLUDED__ #ifndef IRR_C_IMAGE_LOADER_RGB_H_INCLUDED
#define __C_IMAGE_LOADER_RGB_H_INCLUDED__ #define IRR_C_IMAGE_LOADER_RGB_H_INCLUDED
// define _IRR_RGB_FILE_INVERTED_IMAGE_ to preserve the inverted format of the RGB file // define _IRR_RGB_FILE_INVERTED_IMAGE_ to preserve the inverted format of the RGB file
// commenting this out will invert the inverted image,resulting in the image being upright // commenting this out will invert the inverted image,resulting in the image being upright
@ -138,13 +138,13 @@ public:
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".tga") //! based on the file extension (e.g. ".tga")
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE;
//! creates a surface from the file //! creates a surface from the file
virtual IImage* loadImage(io::IReadFile* file) const _IRR_OVERRIDE_; virtual IImage* loadImage(io::IReadFile* file) const IRR_OVERRIDE;
private: private:
@ -160,5 +160,4 @@ private:
} // end namespace irr } // end namespace irr
#endif // _IRR_COMPILE_WITH_RGB_LOADER_ #endif // _IRR_COMPILE_WITH_RGB_LOADER_
#endif // __C_IMAGE_LOADER_RGB_H_INCLUDED__ #endif // IRR_C_IMAGE_LOADER_RGB_H_INCLUDED

11
source/Irrlicht/CImageLoaderTGA.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IMAGE_LOADER_TGA_H_INCLUDED__ #ifndef IRR_C_IMAGE_LOADER_TGA_H_INCLUDED
#define __C_IMAGE_LOADER_TGA_H_INCLUDED__ #define IRR_C_IMAGE_LOADER_TGA_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
@ -59,13 +59,13 @@ public:
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".tga") //! based on the file extension (e.g. ".tga")
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE;
//! creates a surface from the file //! creates a surface from the file
virtual IImage* loadImage(io::IReadFile* file) const _IRR_OVERRIDE_; virtual IImage* loadImage(io::IReadFile* file) const IRR_OVERRIDE;
private: private:
@ -79,4 +79,3 @@ private:
} // end namespace irr } // end namespace irr
#endif #endif

23
source/Irrlicht/CImageLoaderWAL.h
View File

@ -8,8 +8,8 @@
Nikolaus Gebhardt for the Irrlicht 3D engine Nikolaus Gebhardt for the Irrlicht 3D engine
*/ */
#ifndef __C_IMAGE_LOADER_WAL_H_INCLUDED__ #ifndef IRR_C_IMAGE_LOADER_WAL_H_INCLUDED
#define __C_IMAGE_LOADER_WAL_H_INCLUDED__ #define IRR_C_IMAGE_LOADER_WAL_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#include "IImageLoader.h" #include "IImageLoader.h"
@ -37,9 +37,9 @@ namespace video
class CImageLoaderLMP : public irr::video::IImageLoader class CImageLoaderLMP : public irr::video::IImageLoader
{ {
public: public:
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const _IRR_OVERRIDE_; virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const IRR_OVERRIDE;
virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const _IRR_OVERRIDE_; virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const IRR_OVERRIDE;
}; };
#endif #endif
@ -50,18 +50,18 @@ public:
class CImageLoaderWAL : public irr::video::IImageLoader class CImageLoaderWAL : public irr::video::IImageLoader
{ {
public: public:
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const _IRR_OVERRIDE_; virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const IRR_OVERRIDE;
virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const _IRR_OVERRIDE_; virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const IRR_OVERRIDE;
}; };
//! An Irrlicht image loader for Halflife 1 engine textures //! An Irrlicht image loader for Halflife 1 engine textures
class CImageLoaderWAL2 : public irr::video::IImageLoader class CImageLoaderWAL2 : public irr::video::IImageLoader
{ {
public: public:
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const _IRR_OVERRIDE_; virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const IRR_OVERRIDE;
virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const _IRR_OVERRIDE_; virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const IRR_OVERRIDE;
}; };
// byte-align structures // byte-align structures
@ -97,4 +97,3 @@ public:
} }
#endif #endif

4
source/Irrlicht/CImageWriterBMP.h
View File

@ -23,10 +23,10 @@ public:
CImageWriterBMP(); CImageWriterBMP();
//! return true if this writer can write a file with the given extension //! return true if this writer can write a file with the given extension
virtual bool isAWriteableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isAWriteableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! write image to file //! write image to file
virtual bool writeImage(io::IWriteFile *file, IImage *image, u32 param) const _IRR_OVERRIDE_; virtual bool writeImage(io::IWriteFile *file, IImage *image, u32 param) const IRR_OVERRIDE;
}; };
} // namespace video } // namespace video

4
source/Irrlicht/CImageWriterJPG.h
View File

@ -23,10 +23,10 @@ public:
CImageWriterJPG(); CImageWriterJPG();
//! return true if this writer can write a file with the given extension //! return true if this writer can write a file with the given extension
virtual bool isAWriteableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isAWriteableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! write image to file //! write image to file
virtual bool writeImage(io::IWriteFile *file, IImage *image, u32 param) const _IRR_OVERRIDE_; virtual bool writeImage(io::IWriteFile *file, IImage *image, u32 param) const IRR_OVERRIDE;
}; };
} }

4
source/Irrlicht/CImageWriterPCX.h
View File

@ -23,10 +23,10 @@ public:
CImageWriterPCX(); CImageWriterPCX();
//! return true if this writer can write a file with the given extension //! return true if this writer can write a file with the given extension
virtual bool isAWriteableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isAWriteableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! write image to file //! write image to file
virtual bool writeImage(io::IWriteFile *file, IImage *image, u32 param) const _IRR_OVERRIDE_; virtual bool writeImage(io::IWriteFile *file, IImage *image, u32 param) const IRR_OVERRIDE;
}; };
} // namespace video } // namespace video

4
source/Irrlicht/CImageWriterPNG.h
View File

@ -23,10 +23,10 @@ public:
CImageWriterPNG(); CImageWriterPNG();
//! return true if this writer can write a file with the given extension //! return true if this writer can write a file with the given extension
virtual bool isAWriteableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isAWriteableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! write image to file //! write image to file
virtual bool writeImage(io::IWriteFile *file, IImage *image, u32 param) const _IRR_OVERRIDE_; virtual bool writeImage(io::IWriteFile *file, IImage *image, u32 param) const IRR_OVERRIDE;
}; };
} // namespace video } // namespace video

4
source/Irrlicht/CImageWriterPPM.h
View File

@ -23,10 +23,10 @@ public:
CImageWriterPPM(); CImageWriterPPM();
//! return true if this writer can write a file with the given extension //! return true if this writer can write a file with the given extension
virtual bool isAWriteableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isAWriteableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! write image to file //! write image to file
virtual bool writeImage(io::IWriteFile *file, IImage *image, u32 param) const _IRR_OVERRIDE_; virtual bool writeImage(io::IWriteFile *file, IImage *image, u32 param) const IRR_OVERRIDE;
}; };
} // namespace video } // namespace video

4
source/Irrlicht/CImageWriterPSD.h
View File

@ -23,10 +23,10 @@ public:
CImageWriterPSD(); CImageWriterPSD();
//! return true if this writer can write a file with the given extension //! return true if this writer can write a file with the given extension
virtual bool isAWriteableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isAWriteableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! write image to file //! write image to file
virtual bool writeImage(io::IWriteFile *file, IImage *image,u32 param) const _IRR_OVERRIDE_; virtual bool writeImage(io::IWriteFile *file, IImage *image,u32 param) const IRR_OVERRIDE;
}; };
} // namespace video } // namespace video

4
source/Irrlicht/CImageWriterTGA.h
View File

@ -23,10 +23,10 @@ public:
CImageWriterTGA(); CImageWriterTGA();
//! return true if this writer can write a file with the given extension //! return true if this writer can write a file with the given extension
virtual bool isAWriteableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isAWriteableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! write image to file //! write image to file
virtual bool writeImage(io::IWriteFile *file, IImage *image,u32 param) const _IRR_OVERRIDE_; virtual bool writeImage(io::IWriteFile *file, IImage *image,u32 param) const IRR_OVERRIDE;
}; };
} // namespace video } // namespace video

73
source/Irrlicht/CIrrDeviceConsole.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IRR_DEVICE_CONSOLE_H_INCLUDED__ #ifndef IRR_C_IRR_DEVICE_CONSOLE_H_INCLUDED
#define __C_IRR_DEVICE_CONSOLE_H_INCLUDED__ #define IRR_C_IRR_DEVICE_CONSOLE_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_CONSOLE_DEVICE_ #ifdef _IRR_COMPILE_WITH_CONSOLE_DEVICE_
@ -47,53 +47,53 @@ namespace irr
virtual ~CIrrDeviceConsole(); virtual ~CIrrDeviceConsole();
//! runs the device. Returns false if device wants to be deleted //! runs the device. Returns false if device wants to be deleted
virtual bool run() _IRR_OVERRIDE_; virtual bool run() IRR_OVERRIDE;
//! Cause the device to temporarily pause execution and let other processes to run //! Cause the device to temporarily pause execution and let other processes to run
// This should bring down processor usage without major performance loss for Irrlicht // This should bring down processor usage without major performance loss for Irrlicht
virtual void yield() _IRR_OVERRIDE_; virtual void yield() IRR_OVERRIDE;
//! Pause execution and let other processes to run for a specified amount of time. //! Pause execution and let other processes to run for a specified amount of time.
virtual void sleep(u32 timeMs, bool pauseTimer) _IRR_OVERRIDE_; virtual void sleep(u32 timeMs, bool pauseTimer) IRR_OVERRIDE;
//! sets the caption of the window //! sets the caption of the window
virtual void setWindowCaption(const wchar_t* text) _IRR_OVERRIDE_; virtual void setWindowCaption(const wchar_t* text) IRR_OVERRIDE;
//! returns if window is active. if not, nothing need to be drawn //! returns if window is active. if not, nothing need to be drawn
virtual bool isWindowActive() const _IRR_OVERRIDE_; virtual bool isWindowActive() const IRR_OVERRIDE;
//! returns if window has focus //! returns if window has focus
virtual bool isWindowFocused() const _IRR_OVERRIDE_; virtual bool isWindowFocused() const IRR_OVERRIDE;
//! returns if window is minimized //! returns if window is minimized
virtual bool isWindowMinimized() const _IRR_OVERRIDE_; virtual bool isWindowMinimized() const IRR_OVERRIDE;
//! returns current window position (not supported for this device) //! returns current window position (not supported for this device)
virtual core::position2di getWindowPosition() _IRR_OVERRIDE_ virtual core::position2di getWindowPosition() IRR_OVERRIDE
{ {
return core::position2di(-1, -1); return core::position2di(-1, -1);
} }
//! presents a surface in the client area //! presents a surface in the client area
virtual bool present(video::IImage* surface, void* windowId=0, core::rect<s32>* src=0) _IRR_OVERRIDE_; virtual bool present(video::IImage* surface, void* windowId=0, core::rect<s32>* src=0) IRR_OVERRIDE;
//! notifies the device that it should close itself //! notifies the device that it should close itself
virtual void closeDevice() _IRR_OVERRIDE_; virtual void closeDevice() IRR_OVERRIDE;
//! Sets if the window should be resizable in windowed mode. //! Sets if the window should be resizable in windowed mode.
virtual void setResizable(bool resize=false) _IRR_OVERRIDE_; virtual void setResizable(bool resize=false) IRR_OVERRIDE;
//! Minimizes the window. //! Minimizes the window.
virtual void minimizeWindow() _IRR_OVERRIDE_; virtual void minimizeWindow() IRR_OVERRIDE;
//! Maximizes the window. //! Maximizes the window.
virtual void maximizeWindow() _IRR_OVERRIDE_; virtual void maximizeWindow() IRR_OVERRIDE;
//! Restores the window size. //! Restores the window size.
virtual void restoreWindow() _IRR_OVERRIDE_; virtual void restoreWindow() IRR_OVERRIDE;
//! Get the device type //! Get the device type
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ virtual E_DEVICE_TYPE getType() const IRR_OVERRIDE
{ {
return EIDT_CONSOLE; return EIDT_CONSOLE;
} }
@ -116,7 +116,7 @@ namespace irr
} }
//! Changes the visible state of the mouse cursor. //! Changes the visible state of the mouse cursor.
virtual void setVisible(bool visible) _IRR_OVERRIDE_ virtual void setVisible(bool visible) IRR_OVERRIDE
{ {
if(visible != IsVisible) if(visible != IsVisible)
{ {
@ -126,19 +126,19 @@ namespace irr
} }
//! Returns if the cursor is currently visible. //! Returns if the cursor is currently visible.
virtual bool isVisible() const _IRR_OVERRIDE_ virtual bool isVisible() const IRR_OVERRIDE
{ {
return IsVisible; return IsVisible;
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<f32> &pos) _IRR_OVERRIDE_ virtual void setPosition(const core::position2d<f32> &pos) IRR_OVERRIDE
{ {
setPosition(pos.X, pos.Y); setPosition(pos.X, pos.Y);
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(f32 x, f32 y) _IRR_OVERRIDE_ virtual void setPosition(f32 x, f32 y) IRR_OVERRIDE
{ {
if (!UseReferenceRect) if (!UseReferenceRect)
setPosition((s32)(x*WindowSize.Width), (s32)(y*WindowSize.Height)); setPosition((s32)(x*WindowSize.Width), (s32)(y*WindowSize.Height));
@ -147,25 +147,25 @@ namespace irr
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<s32> &pos) _IRR_OVERRIDE_ virtual void setPosition(const core::position2d<s32> &pos) IRR_OVERRIDE
{ {
setPosition(pos.X, pos.Y); setPosition(pos.X, pos.Y);
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(s32 x, s32 y) _IRR_OVERRIDE_ virtual void setPosition(s32 x, s32 y) IRR_OVERRIDE
{ {
setInternalCursorPosition(core::position2di(x,y)); setInternalCursorPosition(core::position2di(x,y));
} }
//! Returns the current position of the mouse cursor. //! Returns the current position of the mouse cursor.
virtual const core::position2d<s32>& getPosition(bool updateCursor) _IRR_OVERRIDE_ virtual const core::position2d<s32>& getPosition(bool updateCursor) IRR_OVERRIDE
{ {
return CursorPos; return CursorPos;
} }
//! Returns the current position of the mouse cursor. //! Returns the current position of the mouse cursor.
virtual core::position2d<f32> getRelativePosition(bool updateCursor) _IRR_OVERRIDE_ virtual core::position2d<f32> getRelativePosition(bool updateCursor) IRR_OVERRIDE
{ {
if (!UseReferenceRect) if (!UseReferenceRect)
{ {
@ -178,7 +178,7 @@ namespace irr
} }
//! Sets an absolute reference rect for calculating the cursor position. //! Sets an absolute reference rect for calculating the cursor position.
virtual void setReferenceRect(core::rect<s32>* rect=0) _IRR_OVERRIDE_ virtual void setReferenceRect(core::rect<s32>* rect=0) IRR_OVERRIDE
{ {
if (rect) if (rect)
{ {
@ -256,7 +256,7 @@ namespace gui
//! Draws some text and clips it to the specified rectangle if wanted. //! Draws some text and clips it to the specified rectangle if wanted.
virtual void draw(const wchar_t* text, const core::rect<s32>& position, virtual void draw(const wchar_t* text, const core::rect<s32>& position,
video::SColor color, bool hcenter=false, bool vcenter=false, video::SColor color, bool hcenter=false, bool vcenter=false,
const core::rect<s32>* clip=0) _IRR_OVERRIDE_ const core::rect<s32>* clip=0) IRR_OVERRIDE
{ {
core::rect<s32> Area = clip ? *clip : position; core::rect<s32> Area = clip ? *clip : position;
@ -304,22 +304,22 @@ namespace gui
} }
//! Calculates the dimension of some text. //! Calculates the dimension of some text.
virtual core::dimension2d<u32> getDimension(const wchar_t* text) const _IRR_OVERRIDE_ virtual core::dimension2d<u32> getDimension(const wchar_t* text) const IRR_OVERRIDE
{ {
return core::dimension2d<u32>(wcslen(text),1); return core::dimension2d<u32>(wcslen(text),1);
} }
//! Calculates the index of the character in the text which is on a specific position. //! Calculates the index of the character in the text which is on a specific position.
virtual s32 getCharacterFromPos(const wchar_t* text, s32 pixel_x) const _IRR_OVERRIDE_ { return pixel_x; } _IRR_OVERRIDE_; virtual s32 getCharacterFromPos(const wchar_t* text, s32 pixel_x) const IRR_OVERRIDE { return pixel_x; } IRR_OVERRIDE;
//! No kerning //! No kerning
virtual void setKerningWidth (s32 kerning) _IRR_OVERRIDE_ { } virtual void setKerningWidth (s32 kerning) IRR_OVERRIDE { }
virtual void setKerningHeight (s32 kerning) _IRR_OVERRIDE_ { } virtual void setKerningHeight (s32 kerning) IRR_OVERRIDE { }
virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const _IRR_OVERRIDE_ {return 0;} virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const IRR_OVERRIDE {return 0;}
virtual s32 getKerningHeight() const _IRR_OVERRIDE_ { return 0;} virtual s32 getKerningHeight() const IRR_OVERRIDE { return 0;}
virtual void setInvisibleCharacters( const wchar_t *s ) _IRR_OVERRIDE_ { } virtual void setInvisibleCharacters( const wchar_t *s ) IRR_OVERRIDE { }
// I guess this is an OS specific font // I guess this is an OS specific font
virtual EGUI_FONT_TYPE getType() const _IRR_OVERRIDE_ { return EGFT_OS; } virtual EGUI_FONT_TYPE getType() const IRR_OVERRIDE { return EGFT_OS; }
private: private:
CIrrDeviceConsole* Device; CIrrDeviceConsole* Device;
core::stringw tempText; core::stringw tempText;
@ -332,5 +332,4 @@ namespace gui
} // end namespace irr } // end namespace irr
#endif // _IRR_COMPILE_WITH_CONSOLE_DEVICE_ #endif // _IRR_COMPILE_WITH_CONSOLE_DEVICE_
#endif // __C_IRR_DEVICE_CONSOLE_H_INCLUDED__ #endif // IRR_C_IRR_DEVICE_CONSOLE_H_INCLUDED

55
source/Irrlicht/CIrrDeviceFB.h
View File

@ -3,8 +3,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IRR_DEVICE_FB_H_INCLUDED__ #ifndef IRR_C_IRR_DEVICE_FB_H_INCLUDED
#define __C_IRR_DEVICE_FB_H_INCLUDED__ #define IRR_C_IRR_DEVICE_FB_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
@ -33,53 +33,53 @@ namespace irr
virtual ~CIrrDeviceFB(); virtual ~CIrrDeviceFB();
//! runs the device. Returns false if device wants to be deleted //! runs the device. Returns false if device wants to be deleted
virtual bool run() _IRR_OVERRIDE_; virtual bool run() IRR_OVERRIDE;
//! Cause the device to temporarily pause execution and let other processes to run //! Cause the device to temporarily pause execution and let other processes to run
// This should bring down processor usage without major performance loss for Irrlicht // This should bring down processor usage without major performance loss for Irrlicht
virtual void yield() _IRR_OVERRIDE_; virtual void yield() IRR_OVERRIDE;
//! Pause execution and let other processes to run for a specified amount of time. //! Pause execution and let other processes to run for a specified amount of time.
virtual void sleep(u32 timeMs, bool pauseTimer) _IRR_OVERRIDE_; virtual void sleep(u32 timeMs, bool pauseTimer) IRR_OVERRIDE;
//! sets the caption of the window //! sets the caption of the window
virtual void setWindowCaption(const wchar_t* text) _IRR_OVERRIDE_; virtual void setWindowCaption(const wchar_t* text) IRR_OVERRIDE;
//! returns if window is active. if not, nothing need to be drawn //! returns if window is active. if not, nothing need to be drawn
virtual bool isWindowActive() const _IRR_OVERRIDE_; virtual bool isWindowActive() const IRR_OVERRIDE;
//! returns if window has focus //! returns if window has focus
virtual bool isWindowFocused() const _IRR_OVERRIDE_; virtual bool isWindowFocused() const IRR_OVERRIDE;
//! returns if window is minimized //! returns if window is minimized
virtual bool isWindowMinimized() const _IRR_OVERRIDE_; virtual bool isWindowMinimized() const IRR_OVERRIDE;
//! Minimizes window //! Minimizes window
virtual void minimizeWindow() _IRR_OVERRIDE_; virtual void minimizeWindow() IRR_OVERRIDE;
//! Maximizes window //! Maximizes window
virtual void maximizeWindow() _IRR_OVERRIDE_; virtual void maximizeWindow() IRR_OVERRIDE;
//! Restores original window size //! Restores original window size
virtual void restoreWindow() _IRR_OVERRIDE_; virtual void restoreWindow() IRR_OVERRIDE;
//! returns current window position (not supported for this device) //! returns current window position (not supported for this device)
virtual core::position2di getWindowPosition() _IRR_OVERRIDE_ virtual core::position2di getWindowPosition() IRR_OVERRIDE
{ {
return core::position2di(-1, -1); return core::position2di(-1, -1);
} }
//! presents a surface in the client area //! presents a surface in the client area
virtual bool present(video::IImage* surface, void* windowId = 0, core::rect<s32>* src=0 ) _IRR_OVERRIDE_; virtual bool present(video::IImage* surface, void* windowId = 0, core::rect<s32>* src=0 ) IRR_OVERRIDE;
//! notifies the device that it should close itself //! notifies the device that it should close itself
virtual void closeDevice() _IRR_OVERRIDE_; virtual void closeDevice() IRR_OVERRIDE;
//! Sets if the window should be resizeable in windowed mode. //! Sets if the window should be resizeable in windowed mode.
virtual void setResizable(bool resize=false) _IRR_OVERRIDE_; virtual void setResizable(bool resize=false) IRR_OVERRIDE;
//! Returns the type of this device //! Returns the type of this device
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_; virtual E_DEVICE_TYPE getType() const IRR_OVERRIDE;
private: private:
@ -105,42 +105,42 @@ namespace irr
} }
//! Changes the visible state of the mouse cursor. //! Changes the visible state of the mouse cursor.
virtual void setVisible(bool visible) _IRR_OVERRIDE_ virtual void setVisible(bool visible) IRR_OVERRIDE
{ {
IsVisible = visible; IsVisible = visible;
} }
//! Returns if the cursor is currently visible. //! Returns if the cursor is currently visible.
virtual bool isVisible() const _IRR_OVERRIDE_ virtual bool isVisible() const IRR_OVERRIDE
{ {
return IsVisible; return IsVisible;
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<f32> &pos) _IRR_OVERRIDE_ virtual void setPosition(const core::position2d<f32> &pos) IRR_OVERRIDE
{ {
setPosition(pos.X, pos.Y); setPosition(pos.X, pos.Y);
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(f32 x, f32 y) _IRR_OVERRIDE_ virtual void setPosition(f32 x, f32 y) IRR_OVERRIDE
{ {
setPosition((s32)(x*Device->CreationParams.WindowSize.Width), (s32)(y*Device->CreationParams.WindowSize.Height)); setPosition((s32)(x*Device->CreationParams.WindowSize.Width), (s32)(y*Device->CreationParams.WindowSize.Height));
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<s32> &pos) _IRR_OVERRIDE_ virtual void setPosition(const core::position2d<s32> &pos) IRR_OVERRIDE
{ {
setPosition(pos.X, pos.Y); setPosition(pos.X, pos.Y);
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(s32 x, s32 y) _IRR_OVERRIDE_ virtual void setPosition(s32 x, s32 y) IRR_OVERRIDE
{ {
} }
//! Returns the current position of the mouse cursor. //! Returns the current position of the mouse cursor.
virtual const core::position2d<s32>& getPosition(bool updateCursor) _IRR_OVERRIDE_ virtual const core::position2d<s32>& getPosition(bool updateCursor) IRR_OVERRIDE
{ {
if ( updateCursor ) if ( updateCursor )
updateCursorPos(); updateCursorPos();
@ -148,7 +148,7 @@ namespace irr
} }
//! Returns the current position of the mouse cursor. //! Returns the current position of the mouse cursor.
virtual core::position2d<f32> getRelativePosition(bool updateCursor) _IRR_OVERRIDE_ virtual core::position2d<f32> getRelativePosition(bool updateCursor) IRR_OVERRIDE
{ {
if ( updateCursor) if ( updateCursor)
updateCursorPos(); updateCursorPos();
@ -156,7 +156,7 @@ namespace irr
CursorPos.Y / (f32)Device->CreationParams.WindowSize.Height); CursorPos.Y / (f32)Device->CreationParams.WindowSize.Height);
} }
virtual void setReferenceRect(core::rect<s32>* rect=0) _IRR_OVERRIDE_ virtual void setReferenceRect(core::rect<s32>* rect=0) IRR_OVERRIDE
{ {
} }
@ -211,5 +211,4 @@ namespace irr
} // end namespace irr } // end namespace irr
#endif // _IRR_USE_FB_DEVICE_ #endif // _IRR_USE_FB_DEVICE_
#endif // __C_IRR_DEVICE_FB_H_INCLUDED__ #endif // IRR_C_IRR_DEVICE_FB_H_INCLUDED

83
source/Irrlicht/CIrrDeviceLinux.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IRR_DEVICE_LINUX_H_INCLUDED__ #ifndef IRR_C_IRR_DEVICE_LINUX_H_INCLUDED
#define __C_IRR_DEVICE_LINUX_H_INCLUDED__ #define IRR_C_IRR_DEVICE_LINUX_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
@ -50,66 +50,66 @@ namespace irr
virtual ~CIrrDeviceLinux(); virtual ~CIrrDeviceLinux();
//! runs the device. Returns false if device wants to be deleted //! runs the device. Returns false if device wants to be deleted
virtual bool run() _IRR_OVERRIDE_; virtual bool run() IRR_OVERRIDE;
//! Cause the device to temporarily pause execution and let other processes to run //! Cause the device to temporarily pause execution and let other processes to run
// This should bring down processor usage without major performance loss for Irrlicht // This should bring down processor usage without major performance loss for Irrlicht
virtual void yield() _IRR_OVERRIDE_; virtual void yield() IRR_OVERRIDE;
//! Pause execution and let other processes to run for a specified amount of time. //! Pause execution and let other processes to run for a specified amount of time.
virtual void sleep(u32 timeMs, bool pauseTimer) _IRR_OVERRIDE_; virtual void sleep(u32 timeMs, bool pauseTimer) IRR_OVERRIDE;
//! sets the caption of the window //! sets the caption of the window
virtual void setWindowCaption(const wchar_t* text) _IRR_OVERRIDE_; virtual void setWindowCaption(const wchar_t* text) IRR_OVERRIDE;
//! returns if window is active. if not, nothing need to be drawn //! returns if window is active. if not, nothing need to be drawn
virtual bool isWindowActive() const _IRR_OVERRIDE_; virtual bool isWindowActive() const IRR_OVERRIDE;
//! returns if window has focus. //! returns if window has focus.
virtual bool isWindowFocused() const _IRR_OVERRIDE_; virtual bool isWindowFocused() const IRR_OVERRIDE;
//! returns if window is minimized. //! returns if window is minimized.
virtual bool isWindowMinimized() const _IRR_OVERRIDE_; virtual bool isWindowMinimized() const IRR_OVERRIDE;
//! returns color format of the window. //! returns color format of the window.
virtual video::ECOLOR_FORMAT getColorFormat() const _IRR_OVERRIDE_; virtual video::ECOLOR_FORMAT getColorFormat() const IRR_OVERRIDE;
//! presents a surface in the client area //! presents a surface in the client area
virtual bool present(video::IImage* surface, void* windowId=0, core::rect<s32>* src=0 ) _IRR_OVERRIDE_; virtual bool present(video::IImage* surface, void* windowId=0, core::rect<s32>* src=0 ) IRR_OVERRIDE;
//! notifies the device that it should close itself //! notifies the device that it should close itself
virtual void closeDevice() _IRR_OVERRIDE_; virtual void closeDevice() IRR_OVERRIDE;
//! \return Returns a pointer to a list with all video modes //! \return Returns a pointer to a list with all video modes
//! supported by the gfx adapter. //! supported by the gfx adapter.
virtual video::IVideoModeList* getVideoModeList() _IRR_OVERRIDE_; virtual video::IVideoModeList* getVideoModeList() IRR_OVERRIDE;
//! Sets if the window should be resizable in windowed mode. //! Sets if the window should be resizable in windowed mode.
virtual void setResizable(bool resize=false) _IRR_OVERRIDE_; virtual void setResizable(bool resize=false) IRR_OVERRIDE;
//! Resize the render window. //! Resize the render window.
virtual void setWindowSize(const irr::core::dimension2d<u32>& size) _IRR_OVERRIDE_; virtual void setWindowSize(const irr::core::dimension2d<u32>& size) IRR_OVERRIDE;
//! Minimizes the window. //! Minimizes the window.
virtual void minimizeWindow() _IRR_OVERRIDE_; virtual void minimizeWindow() IRR_OVERRIDE;
//! Maximizes the window. //! Maximizes the window.
virtual void maximizeWindow() _IRR_OVERRIDE_; virtual void maximizeWindow() IRR_OVERRIDE;
//! Restores the window size. //! Restores the window size.
virtual void restoreWindow() _IRR_OVERRIDE_; virtual void restoreWindow() IRR_OVERRIDE;
//! Get the position of this window on screen //! Get the position of this window on screen
virtual core::position2di getWindowPosition() _IRR_OVERRIDE_; virtual core::position2di getWindowPosition() IRR_OVERRIDE;
//! Activate any joysticks, and generate events for them. //! Activate any joysticks, and generate events for them.
virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) _IRR_OVERRIDE_; virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) IRR_OVERRIDE;
//! Set the current Gamma Value for the Display //! Set the current Gamma Value for the Display
virtual bool setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast ) _IRR_OVERRIDE_; virtual bool setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast ) IRR_OVERRIDE;
//! Get the current Gamma Value for the Display //! Get the current Gamma Value for the Display
virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ) _IRR_OVERRIDE_; virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ) IRR_OVERRIDE;
//! gets text from the clipboard //! gets text from the clipboard
//! \return Returns 0 if no string is in there. //! \return Returns 0 if no string is in there.
@ -120,10 +120,10 @@ namespace irr
virtual void copyToClipboard(const c8* text) const; virtual void copyToClipboard(const c8* text) const;
//! Remove all messages pending in the system message loop //! Remove all messages pending in the system message loop
virtual void clearSystemMessages() _IRR_OVERRIDE_; virtual void clearSystemMessages() IRR_OVERRIDE;
//! Get the device type //! Get the device type
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ virtual E_DEVICE_TYPE getType() const IRR_OVERRIDE
{ {
return EIDT_X11; return EIDT_X11;
} }
@ -170,7 +170,7 @@ namespace irr
~CCursorControl(); ~CCursorControl();
//! Changes the visible state of the mouse cursor. //! Changes the visible state of the mouse cursor.
virtual void setVisible(bool visible) _IRR_OVERRIDE_ virtual void setVisible(bool visible) IRR_OVERRIDE
{ {
if (visible==IsVisible) if (visible==IsVisible)
return; return;
@ -187,31 +187,31 @@ namespace irr
} }
//! Returns if the cursor is currently visible. //! Returns if the cursor is currently visible.
virtual bool isVisible() const _IRR_OVERRIDE_ virtual bool isVisible() const IRR_OVERRIDE
{ {
return IsVisible; return IsVisible;
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<f32> &pos) _IRR_OVERRIDE_ virtual void setPosition(const core::position2d<f32> &pos) IRR_OVERRIDE
{ {
setPosition(pos.X, pos.Y); setPosition(pos.X, pos.Y);
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(f32 x, f32 y) _IRR_OVERRIDE_ virtual void setPosition(f32 x, f32 y) IRR_OVERRIDE
{ {
setPosition((s32)(x*Device->Width), (s32)(y*Device->Height)); setPosition((s32)(x*Device->Width), (s32)(y*Device->Height));
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<s32> &pos) _IRR_OVERRIDE_ virtual void setPosition(const core::position2d<s32> &pos) IRR_OVERRIDE
{ {
setPosition(pos.X, pos.Y); setPosition(pos.X, pos.Y);
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(s32 x, s32 y) _IRR_OVERRIDE_ virtual void setPosition(s32 x, s32 y) IRR_OVERRIDE
{ {
#ifdef _IRR_COMPILE_WITH_X11_ #ifdef _IRR_COMPILE_WITH_X11_
@ -276,7 +276,7 @@ namespace irr
} }
//! Returns the current position of the mouse cursor. //! Returns the current position of the mouse cursor.
virtual const core::position2d<s32>& getPosition(bool updateCursor) _IRR_OVERRIDE_ virtual const core::position2d<s32>& getPosition(bool updateCursor) IRR_OVERRIDE
{ {
if ( updateCursor ) if ( updateCursor )
updateCursorPos(); updateCursorPos();
@ -284,7 +284,7 @@ namespace irr
} }
//! Returns the current position of the mouse cursor. //! Returns the current position of the mouse cursor.
virtual core::position2d<f32> getRelativePosition(bool updateCursor) _IRR_OVERRIDE_ virtual core::position2d<f32> getRelativePosition(bool updateCursor) IRR_OVERRIDE
{ {
if ( updateCursor ) if ( updateCursor )
updateCursorPos(); updateCursorPos();
@ -299,7 +299,7 @@ namespace irr
CursorPos.Y / (f32)ReferenceRect.getHeight()); CursorPos.Y / (f32)ReferenceRect.getHeight());
} }
virtual void setReferenceRect(core::rect<s32>* rect=0) _IRR_OVERRIDE_ virtual void setReferenceRect(core::rect<s32>* rect=0) IRR_OVERRIDE
{ {
if (rect) if (rect)
{ {
@ -319,29 +319,29 @@ namespace irr
} }
//! Sets the active cursor icon //! Sets the active cursor icon
virtual void setActiveIcon(gui::ECURSOR_ICON iconId) _IRR_OVERRIDE_; virtual void setActiveIcon(gui::ECURSOR_ICON iconId) IRR_OVERRIDE;
//! Gets the currently active icon //! Gets the currently active icon
virtual gui::ECURSOR_ICON getActiveIcon() const _IRR_OVERRIDE_ virtual gui::ECURSOR_ICON getActiveIcon() const IRR_OVERRIDE
{ {
return ActiveIcon; return ActiveIcon;
} }
//! Add a custom sprite as cursor icon. //! Add a custom sprite as cursor icon.
virtual gui::ECURSOR_ICON addIcon(const gui::SCursorSprite& icon) _IRR_OVERRIDE_; virtual gui::ECURSOR_ICON addIcon(const gui::SCursorSprite& icon) IRR_OVERRIDE;
//! replace the given cursor icon. //! replace the given cursor icon.
virtual void changeIcon(gui::ECURSOR_ICON iconId, const gui::SCursorSprite& icon) _IRR_OVERRIDE_; virtual void changeIcon(gui::ECURSOR_ICON iconId, const gui::SCursorSprite& icon) IRR_OVERRIDE;
//! Return a system-specific size which is supported for cursors. Larger icons will fail, smaller icons might work. //! Return a system-specific size which is supported for cursors. Larger icons will fail, smaller icons might work.
virtual core::dimension2di getSupportedIconSize() const _IRR_OVERRIDE_; virtual core::dimension2di getSupportedIconSize() const IRR_OVERRIDE;
#ifdef _IRR_COMPILE_WITH_X11_ #ifdef _IRR_COMPILE_WITH_X11_
//! Set platform specific behavior flags. //! Set platform specific behavior flags.
virtual void setPlatformBehavior(gui::ECURSOR_PLATFORM_BEHAVIOR behavior) _IRR_OVERRIDE_ {PlatformBehavior = behavior; } virtual void setPlatformBehavior(gui::ECURSOR_PLATFORM_BEHAVIOR behavior) IRR_OVERRIDE {PlatformBehavior = behavior; }
//! Return platform specific behavior. //! Return platform specific behavior.
virtual gui::ECURSOR_PLATFORM_BEHAVIOR getPlatformBehavior() const _IRR_OVERRIDE_ { return PlatformBehavior; } virtual gui::ECURSOR_PLATFORM_BEHAVIOR getPlatformBehavior() const IRR_OVERRIDE { return PlatformBehavior; }
void update(); void update();
void clearCursors(); void clearCursors();
@ -484,5 +484,4 @@ namespace irr
} // end namespace irr } // end namespace irr
#endif // _IRR_COMPILE_WITH_X11_DEVICE_ #endif // _IRR_COMPILE_WITH_X11_DEVICE_
#endif // __C_IRR_DEVICE_LINUX_H_INCLUDED__ #endif // IRR_C_IRR_DEVICE_LINUX_H_INCLUDED

67
source/Irrlicht/CIrrDeviceSDL.h
View File

@ -4,8 +4,8 @@
// This device code is based on the original SDL device implementation // This device code is based on the original SDL device implementation
// contributed by Shane Parker (sirshane). // contributed by Shane Parker (sirshane).
#ifndef __C_IRR_DEVICE_SDL_H_INCLUDED__ #ifndef IRR_C_IRR_DEVICE_SDL_H_INCLUDED
#define __C_IRR_DEVICE_SDL_H_INCLUDED__ #define IRR_C_IRR_DEVICE_SDL_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
@ -37,68 +37,68 @@ namespace irr
virtual ~CIrrDeviceSDL(); virtual ~CIrrDeviceSDL();
//! runs the device. Returns false if device wants to be deleted //! runs the device. Returns false if device wants to be deleted
virtual bool run() _IRR_OVERRIDE_; virtual bool run() IRR_OVERRIDE;
//! pause execution temporarily //! pause execution temporarily
virtual void yield() _IRR_OVERRIDE_; virtual void yield() IRR_OVERRIDE;
//! pause execution for a specified time //! pause execution for a specified time
virtual void sleep(u32 timeMs, bool pauseTimer) _IRR_OVERRIDE_; virtual void sleep(u32 timeMs, bool pauseTimer) IRR_OVERRIDE;
//! sets the caption of the window //! sets the caption of the window
virtual void setWindowCaption(const wchar_t* text) _IRR_OVERRIDE_; virtual void setWindowCaption(const wchar_t* text) IRR_OVERRIDE;
//! returns if window is active. if not, nothing need to be drawn //! returns if window is active. if not, nothing need to be drawn
virtual bool isWindowActive() const _IRR_OVERRIDE_; virtual bool isWindowActive() const IRR_OVERRIDE;
//! returns if window has focus. //! returns if window has focus.
bool isWindowFocused() const _IRR_OVERRIDE_; bool isWindowFocused() const IRR_OVERRIDE;
//! returns if window is minimized. //! returns if window is minimized.
bool isWindowMinimized() const _IRR_OVERRIDE_; bool isWindowMinimized() const IRR_OVERRIDE;
//! returns color format of the window. //! returns color format of the window.
video::ECOLOR_FORMAT getColorFormat() const _IRR_OVERRIDE_; video::ECOLOR_FORMAT getColorFormat() const IRR_OVERRIDE;
//! presents a surface in the client area //! presents a surface in the client area
virtual bool present(video::IImage* surface, void* windowId=0, core::rect<s32>* src=0) _IRR_OVERRIDE_; virtual bool present(video::IImage* surface, void* windowId=0, core::rect<s32>* src=0) IRR_OVERRIDE;
//! notifies the device that it should close itself //! notifies the device that it should close itself
virtual void closeDevice() _IRR_OVERRIDE_; virtual void closeDevice() IRR_OVERRIDE;
//! \return Returns a pointer to a list with all video modes supported //! \return Returns a pointer to a list with all video modes supported
virtual video::IVideoModeList* getVideoModeList() _IRR_OVERRIDE_; virtual video::IVideoModeList* getVideoModeList() IRR_OVERRIDE;
//! Sets if the window should be resizable in windowed mode. //! Sets if the window should be resizable in windowed mode.
virtual void setResizable(bool resize=false) _IRR_OVERRIDE_; virtual void setResizable(bool resize=false) IRR_OVERRIDE;
//! Minimizes the window. //! Minimizes the window.
virtual void minimizeWindow() _IRR_OVERRIDE_; virtual void minimizeWindow() IRR_OVERRIDE;
//! Maximizes the window. //! Maximizes the window.
virtual void maximizeWindow() _IRR_OVERRIDE_; virtual void maximizeWindow() IRR_OVERRIDE;
//! Restores the window size. //! Restores the window size.
virtual void restoreWindow() _IRR_OVERRIDE_; virtual void restoreWindow() IRR_OVERRIDE;
//! Checks if the Irrlicht window is running in fullscreen mode //! Checks if the Irrlicht window is running in fullscreen mode
/** \return True if window is fullscreen. */ /** \return True if window is fullscreen. */
virtual bool isFullscreen() const _IRR_OVERRIDE_; virtual bool isFullscreen() const IRR_OVERRIDE;
//! Get the position of this window on screen //! Get the position of this window on screen
virtual core::position2di getWindowPosition() _IRR_OVERRIDE_; virtual core::position2di getWindowPosition() IRR_OVERRIDE;
//! Activate any joysticks, and generate events for them. //! Activate any joysticks, and generate events for them.
virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) _IRR_OVERRIDE_; virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) IRR_OVERRIDE;
//! Set the current Gamma Value for the Display //! Set the current Gamma Value for the Display
virtual bool setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast ) _IRR_OVERRIDE_; virtual bool setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast ) IRR_OVERRIDE;
//! Get the current Gamma Value for the Display //! Get the current Gamma Value for the Display
virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ) _IRR_OVERRIDE_; virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ) IRR_OVERRIDE;
//! Get the device type //! Get the device type
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ virtual E_DEVICE_TYPE getType() const IRR_OVERRIDE
{ {
return EIDT_SDL; return EIDT_SDL;
} }
@ -114,7 +114,7 @@ namespace irr
} }
//! Changes the visible state of the mouse cursor. //! Changes the visible state of the mouse cursor.
virtual void setVisible(bool visible) _IRR_OVERRIDE_ virtual void setVisible(bool visible) IRR_OVERRIDE
{ {
IsVisible = visible; IsVisible = visible;
if ( visible ) if ( visible )
@ -126,37 +126,37 @@ namespace irr
} }
//! Returns if the cursor is currently visible. //! Returns if the cursor is currently visible.
virtual bool isVisible() const _IRR_OVERRIDE_ virtual bool isVisible() const IRR_OVERRIDE
{ {
return IsVisible; return IsVisible;
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<f32> &pos) _IRR_OVERRIDE_ virtual void setPosition(const core::position2d<f32> &pos) IRR_OVERRIDE
{ {
setPosition(pos.X, pos.Y); setPosition(pos.X, pos.Y);
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(f32 x, f32 y) _IRR_OVERRIDE_ virtual void setPosition(f32 x, f32 y) IRR_OVERRIDE
{ {
setPosition((s32)(x*Device->Width), (s32)(y*Device->Height)); setPosition((s32)(x*Device->Width), (s32)(y*Device->Height));
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<s32> &pos) _IRR_OVERRIDE_ virtual void setPosition(const core::position2d<s32> &pos) IRR_OVERRIDE
{ {
setPosition(pos.X, pos.Y); setPosition(pos.X, pos.Y);
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(s32 x, s32 y) _IRR_OVERRIDE_ virtual void setPosition(s32 x, s32 y) IRR_OVERRIDE
{ {
SDL_WarpMouse( x, y ); SDL_WarpMouse( x, y );
} }
//! Returns the current position of the mouse cursor. //! Returns the current position of the mouse cursor.
virtual const core::position2d<s32>& getPosition(bool updateCursor) _IRR_OVERRIDE_ virtual const core::position2d<s32>& getPosition(bool updateCursor) IRR_OVERRIDE
{ {
if ( updateCursor ) if ( updateCursor )
updateCursorPos(); updateCursorPos();
@ -164,7 +164,7 @@ namespace irr
} }
//! Returns the current position of the mouse cursor. //! Returns the current position of the mouse cursor.
virtual core::position2d<f32> getRelativePosition(bool updateCursor) _IRR_OVERRIDE_ virtual core::position2d<f32> getRelativePosition(bool updateCursor) IRR_OVERRIDE
{ {
if ( updateCursor ) if ( updateCursor )
updateCursorPos(); updateCursorPos();
@ -172,7 +172,7 @@ namespace irr
CursorPos.Y / (f32)Device->Height); CursorPos.Y / (f32)Device->Height);
} }
virtual void setReferenceRect(core::rect<s32>* rect=0) _IRR_OVERRIDE_ virtual void setReferenceRect(core::rect<s32>* rect=0) IRR_OVERRIDE
{ {
} }
@ -276,5 +276,4 @@ namespace irr
} // end namespace irr } // end namespace irr
#endif // _IRR_COMPILE_WITH_SDL_DEVICE_ #endif // _IRR_COMPILE_WITH_SDL_DEVICE_
#endif // __C_IRR_DEVICE_SDL_H_INCLUDED__ #endif // IRR_C_IRR_DEVICE_SDL_H_INCLUDED

8
source/Irrlicht/CIrrDeviceStub.cpp
View File

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

83
source/Irrlicht/CIrrDeviceStub.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IRR_DEVICE_STUB_H_INCLUDED__ #ifndef IRR_C_IRR_DEVICE_STUB_H_INCLUDED
#define __C_IRR_DEVICE_STUB_H_INCLUDED__ #define IRR_C_IRR_DEVICE_STUB_H_INCLUDED
#include "IrrlichtDevice.h" #include "IrrlichtDevice.h"
#include "IImagePresenter.h" #include "IImagePresenter.h"
@ -60,123 +60,123 @@ namespace irr
virtual ~CIrrDeviceStub(); virtual ~CIrrDeviceStub();
//! returns the video driver //! returns the video driver
virtual video::IVideoDriver* getVideoDriver() _IRR_OVERRIDE_; virtual video::IVideoDriver* getVideoDriver() IRR_OVERRIDE;
//! return file system //! return file system
virtual io::IFileSystem* getFileSystem() _IRR_OVERRIDE_; virtual io::IFileSystem* getFileSystem() IRR_OVERRIDE;
//! returns the gui environment //! returns the gui environment
virtual gui::IGUIEnvironment* getGUIEnvironment() _IRR_OVERRIDE_; virtual gui::IGUIEnvironment* getGUIEnvironment() IRR_OVERRIDE;
//! returns the scene manager //! returns the scene manager
virtual scene::ISceneManager* getSceneManager() _IRR_OVERRIDE_; virtual scene::ISceneManager* getSceneManager() IRR_OVERRIDE;
//! \return Returns a pointer to the mouse cursor control interface. //! \return Returns a pointer to the mouse cursor control interface.
virtual gui::ICursorControl* getCursorControl() _IRR_OVERRIDE_; virtual gui::ICursorControl* getCursorControl() IRR_OVERRIDE;
//! Returns a pointer to a list with all video modes supported by the gfx adapter. //! Returns a pointer to a list with all video modes supported by the gfx adapter.
virtual video::IVideoModeList* getVideoModeList() _IRR_OVERRIDE_; virtual video::IVideoModeList* getVideoModeList() IRR_OVERRIDE;
//! return the context manager //! return the context manager
virtual video::IContextManager* getContextManager() _IRR_OVERRIDE_; virtual video::IContextManager* getContextManager() IRR_OVERRIDE;
//! Returns a pointer to the ITimer object. With it the current Time can be received. //! Returns a pointer to the ITimer object. With it the current Time can be received.
virtual ITimer* getTimer() _IRR_OVERRIDE_; virtual ITimer* getTimer() IRR_OVERRIDE;
//! Returns the version of the engine. //! Returns the version of the engine.
virtual const char* getVersion() const _IRR_OVERRIDE_; virtual const char* getVersion() const IRR_OVERRIDE;
//! send the event to the right receiver //! send the event to the right receiver
virtual bool postEventFromUser(const SEvent& event) _IRR_OVERRIDE_; virtual bool postEventFromUser(const SEvent& event) IRR_OVERRIDE;
//! Sets a new event receiver to receive events //! Sets a new event receiver to receive events
virtual void setEventReceiver(IEventReceiver* receiver) _IRR_OVERRIDE_; virtual void setEventReceiver(IEventReceiver* receiver) IRR_OVERRIDE;
//! Returns pointer to the current event receiver. Returns 0 if there is none. //! Returns pointer to the current event receiver. Returns 0 if there is none.
virtual IEventReceiver* getEventReceiver() _IRR_OVERRIDE_; virtual IEventReceiver* getEventReceiver() IRR_OVERRIDE;
//! Sets the input receiving scene manager. //! Sets the input receiving scene manager.
/** If set to null, the main scene manager (returned by GetSceneManager()) will receive the input */ /** If set to null, the main scene manager (returned by GetSceneManager()) will receive the input */
virtual void setInputReceivingSceneManager(scene::ISceneManager* sceneManager) _IRR_OVERRIDE_; virtual void setInputReceivingSceneManager(scene::ISceneManager* sceneManager) IRR_OVERRIDE;
//! Returns a pointer to the logger. //! Returns a pointer to the logger.
virtual ILogger* getLogger() _IRR_OVERRIDE_; virtual ILogger* getLogger() IRR_OVERRIDE;
//! Provides access to the engine's currently set randomizer. //! Provides access to the engine's currently set randomizer.
virtual IRandomizer* getRandomizer() const _IRR_OVERRIDE_; virtual IRandomizer* getRandomizer() const IRR_OVERRIDE;
//! Sets a new randomizer. //! Sets a new randomizer.
virtual void setRandomizer(IRandomizer* r) _IRR_OVERRIDE_; virtual void setRandomizer(IRandomizer* r) IRR_OVERRIDE;
//! Creates a new default randomizer. //! Creates a new default randomizer.
virtual IRandomizer* createDefaultRandomizer() const _IRR_OVERRIDE_; virtual IRandomizer* createDefaultRandomizer() const IRR_OVERRIDE;
//! Returns the operation system opertator object. //! Returns the operation system opertator object.
virtual IOSOperator* getOSOperator() _IRR_OVERRIDE_; virtual IOSOperator* getOSOperator() IRR_OVERRIDE;
//! Checks if the window is running in fullscreen mode. //! Checks if the window is running in fullscreen mode.
virtual bool isFullscreen() const _IRR_OVERRIDE_; virtual bool isFullscreen() const IRR_OVERRIDE;
//! get color format of the current window //! get color format of the current window
virtual video::ECOLOR_FORMAT getColorFormat() const _IRR_OVERRIDE_; virtual video::ECOLOR_FORMAT getColorFormat() const IRR_OVERRIDE;
//! Activate any joysticks, and generate events for them. //! Activate any joysticks, and generate events for them.
virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) _IRR_OVERRIDE_; virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) IRR_OVERRIDE;
//! Activate accelerometer. //! Activate accelerometer.
virtual bool activateAccelerometer(float updateInterval = 0.016666f) _IRR_OVERRIDE_; virtual bool activateAccelerometer(float updateInterval = 0.016666f) IRR_OVERRIDE;
//! Deactivate accelerometer. //! Deactivate accelerometer.
virtual bool deactivateAccelerometer() _IRR_OVERRIDE_; virtual bool deactivateAccelerometer() IRR_OVERRIDE;
//! Is accelerometer active. //! Is accelerometer active.
virtual bool isAccelerometerActive() _IRR_OVERRIDE_; virtual bool isAccelerometerActive() IRR_OVERRIDE;
//! Is accelerometer available. //! Is accelerometer available.
virtual bool isAccelerometerAvailable() _IRR_OVERRIDE_; virtual bool isAccelerometerAvailable() IRR_OVERRIDE;
//! Activate gyroscope. //! Activate gyroscope.
virtual bool activateGyroscope(float updateInterval = 0.016666f) _IRR_OVERRIDE_; virtual bool activateGyroscope(float updateInterval = 0.016666f) IRR_OVERRIDE;
//! Deactivate gyroscope. //! Deactivate gyroscope.
virtual bool deactivateGyroscope() _IRR_OVERRIDE_; virtual bool deactivateGyroscope() IRR_OVERRIDE;
//! Is gyroscope active. //! Is gyroscope active.
virtual bool isGyroscopeActive() _IRR_OVERRIDE_; virtual bool isGyroscopeActive() IRR_OVERRIDE;
//! Is gyroscope available. //! Is gyroscope available.
virtual bool isGyroscopeAvailable() _IRR_OVERRIDE_; virtual bool isGyroscopeAvailable() IRR_OVERRIDE;
//! Activate device motion. //! Activate device motion.
virtual bool activateDeviceMotion(float updateInterval = 0.016666f) _IRR_OVERRIDE_; virtual bool activateDeviceMotion(float updateInterval = 0.016666f) IRR_OVERRIDE;
//! Deactivate device motion. //! Deactivate device motion.
virtual bool deactivateDeviceMotion() _IRR_OVERRIDE_; virtual bool deactivateDeviceMotion() IRR_OVERRIDE;
//! Is device motion active. //! Is device motion active.
virtual bool isDeviceMotionActive() _IRR_OVERRIDE_; virtual bool isDeviceMotionActive() IRR_OVERRIDE;
//! Is device motion available. //! Is device motion available.
virtual bool isDeviceMotionAvailable() _IRR_OVERRIDE_; virtual bool isDeviceMotionAvailable() IRR_OVERRIDE;
//! Set the current Gamma Value for the Display //! Set the current Gamma Value for the Display
virtual bool setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast ) _IRR_OVERRIDE_; virtual bool setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast ) IRR_OVERRIDE;
//! Get the current Gamma Value for the Display //! Get the current Gamma Value for the Display
virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ) _IRR_OVERRIDE_; virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ) IRR_OVERRIDE;
//! Set the maximal elapsed time between 2 clicks to generate doubleclicks for the mouse. It also affects tripleclick behavior. //! Set the maximal elapsed time between 2 clicks to generate doubleclicks for the mouse. It also affects tripleclick behavior.
//! When set to 0 no double- and tripleclicks will be generated. //! When set to 0 no double- and tripleclicks will be generated.
virtual void setDoubleClickTime( u32 timeMs ) _IRR_OVERRIDE_; virtual void setDoubleClickTime( u32 timeMs ) IRR_OVERRIDE;
//! Get the maximal elapsed time between 2 clicks to generate double- and tripleclicks for the mouse. //! Get the maximal elapsed time between 2 clicks to generate double- and tripleclicks for the mouse.
virtual u32 getDoubleClickTime() const _IRR_OVERRIDE_; virtual u32 getDoubleClickTime() const IRR_OVERRIDE;
//! Remove all messages pending in the system message loop //! Remove all messages pending in the system message loop
virtual void clearSystemMessages() _IRR_OVERRIDE_; virtual void clearSystemMessages() IRR_OVERRIDE;
//! Resize the render window. //! Resize the render window.
virtual void setWindowSize(const irr::core::dimension2d<u32>& size) _IRR_OVERRIDE_ {} virtual void setWindowSize(const irr::core::dimension2d<u32>& size) IRR_OVERRIDE {}
protected: protected:
@ -228,4 +228,3 @@ namespace irr
} // end namespace irr } // end namespace irr
#endif #endif

78
source/Irrlicht/CIrrDeviceWin32.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IRR_DEVICE_WIN32_H_INCLUDED__ #ifndef IRR_C_IRR_DEVICE_WIN32_H_INCLUDED
#define __C_IRR_DEVICE_WIN32_H_INCLUDED__ #define IRR_C_IRR_DEVICE_WIN32_H_INCLUDED
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_ #ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
@ -39,80 +39,80 @@ namespace irr
virtual ~CIrrDeviceWin32(); virtual ~CIrrDeviceWin32();
//! runs the device. Returns false if device wants to be deleted //! runs the device. Returns false if device wants to be deleted
virtual bool run() _IRR_OVERRIDE_; virtual bool run() IRR_OVERRIDE;
//! Cause the device to temporarily pause execution and let other processes to run //! Cause the device to temporarily pause execution and let other processes to run
// This should bring down processor usage without major performance loss for Irrlicht // This should bring down processor usage without major performance loss for Irrlicht
virtual void yield() _IRR_OVERRIDE_; virtual void yield() IRR_OVERRIDE;
//! Pause execution and let other processes to run for a specified amount of time. //! Pause execution and let other processes to run for a specified amount of time.
virtual void sleep(u32 timeMs, bool pauseTimer) _IRR_OVERRIDE_; virtual void sleep(u32 timeMs, bool pauseTimer) IRR_OVERRIDE;
//! sets the caption of the window //! sets the caption of the window
virtual void setWindowCaption(const wchar_t* text) _IRR_OVERRIDE_; virtual void setWindowCaption(const wchar_t* text) IRR_OVERRIDE;
//! returns if window is active. if not, nothing need to be drawn //! returns if window is active. if not, nothing need to be drawn
virtual bool isWindowActive() const _IRR_OVERRIDE_; virtual bool isWindowActive() const IRR_OVERRIDE;
//! returns if window has focus //! returns if window has focus
virtual bool isWindowFocused() const _IRR_OVERRIDE_; virtual bool isWindowFocused() const IRR_OVERRIDE;
//! returns if window is minimized //! returns if window is minimized
virtual bool isWindowMinimized() const _IRR_OVERRIDE_; virtual bool isWindowMinimized() const IRR_OVERRIDE;
//! presents a surface in the client area //! presents a surface in the client area
virtual bool present(video::IImage* surface, void* windowId=0, core::rect<s32>* src=0) _IRR_OVERRIDE_; virtual bool present(video::IImage* surface, void* windowId=0, core::rect<s32>* src=0) IRR_OVERRIDE;
//! notifies the device that it should close itself //! notifies the device that it should close itself
virtual void closeDevice() _IRR_OVERRIDE_; virtual void closeDevice() IRR_OVERRIDE;
//! \return Returns a pointer to a list with all video modes //! \return Returns a pointer to a list with all video modes
//! supported by the gfx adapter. //! supported by the gfx adapter.
virtual video::IVideoModeList* getVideoModeList() _IRR_OVERRIDE_; virtual video::IVideoModeList* getVideoModeList() IRR_OVERRIDE;
//! Notifies the device, that it has been resized //! Notifies the device, that it has been resized
/** Must be publis as it is called from free function (event handler) */ /** Must be publis as it is called from free function (event handler) */
void OnResized(); void OnResized();
//! Sets if the window should be resizable in windowed mode. //! Sets if the window should be resizable in windowed mode.
virtual void setResizable(bool resize=false) _IRR_OVERRIDE_; virtual void setResizable(bool resize=false) IRR_OVERRIDE;
//! Resize the render window. //! Resize the render window.
virtual void setWindowSize(const irr::core::dimension2d<u32>& size) _IRR_OVERRIDE_; virtual void setWindowSize(const irr::core::dimension2d<u32>& size) IRR_OVERRIDE;
//! Minimizes the window. //! Minimizes the window.
virtual void minimizeWindow() _IRR_OVERRIDE_; virtual void minimizeWindow() IRR_OVERRIDE;
//! Maximizes the window. //! Maximizes the window.
virtual void maximizeWindow() _IRR_OVERRIDE_; virtual void maximizeWindow() IRR_OVERRIDE;
//! Restores the window size. //! Restores the window size.
virtual void restoreWindow() _IRR_OVERRIDE_; virtual void restoreWindow() IRR_OVERRIDE;
//! Get the position of the window on screen //! Get the position of the window on screen
virtual core::position2di getWindowPosition() _IRR_OVERRIDE_; virtual core::position2di getWindowPosition() IRR_OVERRIDE;
//! Activate any joysticks, and generate events for them. //! Activate any joysticks, and generate events for them.
virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) _IRR_OVERRIDE_; virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) IRR_OVERRIDE;
//! Set the current Gamma Value for the Display //! Set the current Gamma Value for the Display
virtual bool setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast ) _IRR_OVERRIDE_; virtual bool setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast ) IRR_OVERRIDE;
//! Get the current Gamma Value for the Display //! Get the current Gamma Value for the Display
virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ) _IRR_OVERRIDE_; virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ) IRR_OVERRIDE;
//! Remove all messages pending in the system message loop //! Remove all messages pending in the system message loop
virtual void clearSystemMessages() _IRR_OVERRIDE_; virtual void clearSystemMessages() IRR_OVERRIDE;
//! Get the device type //! Get the device type
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ virtual E_DEVICE_TYPE getType() const IRR_OVERRIDE
{ {
return EIDT_WIN32; return EIDT_WIN32;
} }
//! Compares to the last call of this function to return double and triple clicks. //! 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. //! \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 ) _IRR_OVERRIDE_ virtual u32 checkSuccessiveClicks(s32 mouseX, s32 mouseY, EMOUSE_INPUT_EVENT inputEvent ) IRR_OVERRIDE
{ {
// we just have to make it public // we just have to make it public
return CIrrDeviceStub::checkSuccessiveClicks(mouseX, mouseY, inputEvent ); return CIrrDeviceStub::checkSuccessiveClicks(mouseX, mouseY, inputEvent );
@ -140,7 +140,7 @@ namespace irr
~CCursorControl(); ~CCursorControl();
//! Changes the visible state of the mouse cursor. //! Changes the visible state of the mouse cursor.
virtual void setVisible(bool visible) _IRR_OVERRIDE_ virtual void setVisible(bool visible) IRR_OVERRIDE
{ {
CURSORINFO info; CURSORINFO info;
info.cbSize = sizeof(CURSORINFO); info.cbSize = sizeof(CURSORINFO);
@ -186,19 +186,19 @@ namespace irr
} }
//! Returns if the cursor is currently visible. //! Returns if the cursor is currently visible.
virtual bool isVisible() const _IRR_OVERRIDE_ virtual bool isVisible() const IRR_OVERRIDE
{ {
return IsVisible; return IsVisible;
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<f32> &pos) _IRR_OVERRIDE_ virtual void setPosition(const core::position2d<f32> &pos) IRR_OVERRIDE
{ {
setPosition(pos.X, pos.Y); setPosition(pos.X, pos.Y);
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(f32 x, f32 y) _IRR_OVERRIDE_ virtual void setPosition(f32 x, f32 y) IRR_OVERRIDE
{ {
if (!UseReferenceRect) if (!UseReferenceRect)
setPosition(core::round32(x*WindowSize.Width), core::round32(y*WindowSize.Height)); setPosition(core::round32(x*WindowSize.Width), core::round32(y*WindowSize.Height));
@ -207,13 +207,13 @@ namespace irr
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(const core::position2d<s32> &pos) _IRR_OVERRIDE_ virtual void setPosition(const core::position2d<s32> &pos) IRR_OVERRIDE
{ {
setPosition(pos.X, pos.Y); setPosition(pos.X, pos.Y);
} }
//! Sets the new position of the cursor. //! Sets the new position of the cursor.
virtual void setPosition(s32 x, s32 y) _IRR_OVERRIDE_ virtual void setPosition(s32 x, s32 y) IRR_OVERRIDE
{ {
if (UseReferenceRect) if (UseReferenceRect)
{ {
@ -232,7 +232,7 @@ namespace irr
} }
//! Returns the current position of the mouse cursor. //! Returns the current position of the mouse cursor.
virtual const core::position2d<s32>& getPosition(bool updateCursor) _IRR_OVERRIDE_ virtual const core::position2d<s32>& getPosition(bool updateCursor) IRR_OVERRIDE
{ {
if ( updateCursor ) if ( updateCursor )
updateInternalCursorPosition(); updateInternalCursorPosition();
@ -240,7 +240,7 @@ namespace irr
} }
//! Returns the current position of the mouse cursor. //! Returns the current position of the mouse cursor.
virtual core::position2d<f32> getRelativePosition(bool updateCursor) _IRR_OVERRIDE_ virtual core::position2d<f32> getRelativePosition(bool updateCursor) IRR_OVERRIDE
{ {
if ( updateCursor ) if ( updateCursor )
updateInternalCursorPosition(); updateInternalCursorPosition();
@ -256,7 +256,7 @@ namespace irr
} }
//! Sets an absolute reference rect for calculating the cursor position. //! Sets an absolute reference rect for calculating the cursor position.
virtual void setReferenceRect(core::rect<s32>* rect=0) _IRR_OVERRIDE_ virtual void setReferenceRect(core::rect<s32>* rect=0) IRR_OVERRIDE
{ {
if (rect) if (rect)
{ {
@ -320,22 +320,22 @@ namespace irr
//! Sets the active cursor icon //! Sets the active cursor icon
virtual void setActiveIcon(gui::ECURSOR_ICON iconId) _IRR_OVERRIDE_; virtual void setActiveIcon(gui::ECURSOR_ICON iconId) IRR_OVERRIDE;
//! Gets the currently active icon //! Gets the currently active icon
virtual gui::ECURSOR_ICON getActiveIcon() const _IRR_OVERRIDE_ virtual gui::ECURSOR_ICON getActiveIcon() const IRR_OVERRIDE
{ {
return ActiveIcon; return ActiveIcon;
} }
//! Add a custom sprite as cursor icon. //! Add a custom sprite as cursor icon.
virtual gui::ECURSOR_ICON addIcon(const gui::SCursorSprite& icon) _IRR_OVERRIDE_; virtual gui::ECURSOR_ICON addIcon(const gui::SCursorSprite& icon) IRR_OVERRIDE;
//! replace the given cursor icon. //! replace the given cursor icon.
virtual void changeIcon(gui::ECURSOR_ICON iconId, const gui::SCursorSprite& icon) _IRR_OVERRIDE_; virtual void changeIcon(gui::ECURSOR_ICON iconId, const gui::SCursorSprite& icon) IRR_OVERRIDE;
//! Return a system-specific size which is supported for cursors. Larger icons will fail, smaller icons might work. //! Return a system-specific size which is supported for cursors. Larger icons will fail, smaller icons might work.
virtual core::dimension2di getSupportedIconSize() const _IRR_OVERRIDE_; virtual core::dimension2di getSupportedIconSize() const IRR_OVERRIDE;
void update(); void update();
@ -444,4 +444,4 @@ namespace irr
} // end namespace irr } // end namespace irr
#endif // _IRR_COMPILE_WITH_WINDOWS_DEVICE_ #endif // _IRR_COMPILE_WITH_WINDOWS_DEVICE_
#endif // __C_IRR_DEVICE_WIN32_H_INCLUDED__ #endif // IRR_C_IRR_DEVICE_WIN32_H_INCLUDED

9
source/Irrlicht/CIrrMeshFileLoader.h
View File

@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IRR_MESH_FILE_LOADER_H_INCLUDED__ #ifndef IRR_C_IRR_MESH_FILE_LOADER_H_INCLUDED
#define __C_IRR_MESH_FILE_LOADER_H_INCLUDED__ #define IRR_C_IRR_MESH_FILE_LOADER_H_INCLUDED
#include "IMeshLoader.h" #include "IMeshLoader.h"
#include "IFileSystem.h" #include "IFileSystem.h"
@ -30,13 +30,13 @@ public:
//! returns true if the file maybe is able to be loaded by this class //! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".cob") //! based on the file extension (e.g. ".cob")
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! creates/loads an animated mesh from the file. //! creates/loads an animated mesh from the file.
//! \return Pointer to the created mesh. Returns 0 if loading failed. //! \return Pointer to the created mesh. Returns 0 if loading failed.
//! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! If you no longer need the mesh, you should call IAnimatedMesh::drop().
//! See IReferenceCounted::drop() for more information. //! See IReferenceCounted::drop() for more information.
virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE;
private: private:
@ -87,4 +87,3 @@ private:
} // end namespace irr } // end namespace irr
#endif #endif

Some files were not shown because too many files have changed in this diff Show More