From cbe0894397590c14dd3891a977f526403dffd267 Mon Sep 17 00:00:00 2001 From: cutealien Date: Fri, 27 Aug 2021 19:14:39 +0000 Subject: [PATCH] Merging r6250 through r6254 from trunk to ogl-es branch git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/C3DSMeshFileLoader.h | 9 +- source/Irrlicht/CAnimatedMeshHalfLife.h | 35 +- source/Irrlicht/CAnimatedMeshMD2.h | 39 ++- source/Irrlicht/CAnimatedMeshMD3.h | 37 +-- source/Irrlicht/CAnimatedMeshSceneNode.h | 79 +++-- source/Irrlicht/CAttributeImpl.h | 312 +++++++++--------- source/Irrlicht/CAttributes.h | 281 ++++++++-------- source/Irrlicht/CB3DMeshFileLoader.h | 11 +- source/Irrlicht/CB3DMeshWriter.h | 8 +- source/Irrlicht/CBSPMeshFileLoader.h | 9 +- source/Irrlicht/CBillboardSceneNode.h | 39 ++- source/Irrlicht/CBoneSceneNode.h | 27 +- .../CBurningShader_Raster_Reference.cpp | 4 +- source/Irrlicht/CCSMLoader.h | 4 +- source/Irrlicht/CCameraSceneNode.h | 69 ++-- source/Irrlicht/CColladaFileLoader.cpp | 12 +- source/Irrlicht/CColladaFileLoader.h | 9 +- source/Irrlicht/CColladaMeshWriter.cpp | 10 +- source/Irrlicht/CColladaMeshWriter.h | 42 +-- source/Irrlicht/CColorConverter.h | 5 +- source/Irrlicht/CCubeSceneNode.h | 35 +- source/Irrlicht/CD3D9Driver.cpp | 2 +- source/Irrlicht/CD3D9Driver.h | 146 ++++---- source/Irrlicht/CD3D9HLSLMaterialRenderer.h | 7 +- source/Irrlicht/CD3D9MaterialRenderer.h | 57 ++-- source/Irrlicht/CD3D9NormalMapRenderer.h | 11 +- source/Irrlicht/CD3D9ParallaxMapRenderer.h | 15 +- source/Irrlicht/CD3D9RenderTarget.h | 6 +- source/Irrlicht/CD3D9ShaderMaterialRenderer.h | 15 +- source/Irrlicht/CD3D9Texture.cpp | 10 +- source/Irrlicht/CD3D9Texture.h | 10 +- source/Irrlicht/CDMFLoader.h | 9 +- source/Irrlicht/CDefaultGUIElementFactory.h | 18 +- .../CDefaultSceneNodeAnimatorFactory.h | 17 +- source/Irrlicht/CDefaultSceneNodeFactory.h | 19 +- source/Irrlicht/CDepthBuffer.h | 29 +- .../Irrlicht/CDummyTransformationSceneNode.h | 29 +- source/Irrlicht/CEGLManager.h | 18 +- source/Irrlicht/CEmptySceneNode.h | 15 +- source/Irrlicht/CFPSCounter.h | 6 +- source/Irrlicht/CFileList.h | 27 +- source/Irrlicht/CFileSystem.cpp | 36 +- source/Irrlicht/CFileSystem.h | 79 +++-- source/Irrlicht/CGLXManager.h | 23 +- source/Irrlicht/CGUIButton.h | 77 +++-- source/Irrlicht/CGUICheckBox.h | 28 +- source/Irrlicht/CGUIColorSelectDialog.h | 14 +- source/Irrlicht/CGUIComboBox.h | 41 ++- source/Irrlicht/CGUIContextMenu.h | 61 ++-- source/Irrlicht/CGUIEditBox.h | 73 ++-- source/Irrlicht/CGUIEnvironment.h | 142 ++++---- source/Irrlicht/CGUIFileOpenDialog.h | 23 +- source/Irrlicht/CGUIFont.h | 29 +- source/Irrlicht/CGUIImage.h | 40 +-- source/Irrlicht/CGUIImageList.h | 10 +- source/Irrlicht/CGUIInOutFader.h | 25 +- source/Irrlicht/CGUIListBox.h | 68 ++-- source/Irrlicht/CGUIMenu.h | 20 +- source/Irrlicht/CGUIMeshViewer.h | 19 +- source/Irrlicht/CGUIMessageBox.h | 10 +- source/Irrlicht/CGUIModalScreen.h | 23 +- source/Irrlicht/CGUIProfiler.h | 36 +- source/Irrlicht/CGUIScrollBar.h | 37 +-- source/Irrlicht/CGUISkin.h | 56 ++-- source/Irrlicht/CGUISpinBox.h | 41 ++- source/Irrlicht/CGUISpriteBank.h | 29 +- source/Irrlicht/CGUIStaticText.h | 61 ++-- source/Irrlicht/CGUITabControl.h | 77 +++-- source/Irrlicht/CGUITable.h | 85 +++-- source/Irrlicht/CGUIToolBar.h | 13 +- source/Irrlicht/CGUITreeView.h | 111 +++---- source/Irrlicht/CGUIWindow.h | 35 +- source/Irrlicht/CGeometryCreator.h | 25 +- source/Irrlicht/CImage.h | 24 +- source/Irrlicht/CImageLoaderBMP.h | 11 +- source/Irrlicht/CImageLoaderDDS.h | 11 +- source/Irrlicht/CImageLoaderJPG.h | 11 +- source/Irrlicht/CImageLoaderPCX.h | 11 +- source/Irrlicht/CImageLoaderPNG.h | 11 +- source/Irrlicht/CImageLoaderPPM.h | 12 +- source/Irrlicht/CImageLoaderPSD.h | 11 +- source/Irrlicht/CImageLoaderPVR.h | 12 +- source/Irrlicht/CImageLoaderRGB.h | 13 +- source/Irrlicht/CImageLoaderTGA.h | 11 +- source/Irrlicht/CImageLoaderWAL.h | 23 +- source/Irrlicht/CImageWriterBMP.h | 4 +- source/Irrlicht/CImageWriterJPG.h | 4 +- source/Irrlicht/CImageWriterPCX.h | 4 +- source/Irrlicht/CImageWriterPNG.h | 4 +- source/Irrlicht/CImageWriterPPM.h | 4 +- source/Irrlicht/CImageWriterPSD.h | 4 +- source/Irrlicht/CImageWriterTGA.h | 4 +- source/Irrlicht/CIrrDeviceConsole.h | 73 ++-- source/Irrlicht/CIrrDeviceFB.h | 55 ++- source/Irrlicht/CIrrDeviceLinux.h | 83 +++-- source/Irrlicht/CIrrDeviceSDL.h | 67 ++-- source/Irrlicht/CIrrDeviceStub.cpp | 8 +- source/Irrlicht/CIrrDeviceStub.h | 105 +++--- source/Irrlicht/CIrrDeviceWin32.h | 78 ++--- source/Irrlicht/CIrrMeshFileLoader.h | 9 +- source/Irrlicht/CIrrMeshWriter.h | 9 +- source/Irrlicht/CLMTSMeshFileLoader.h | 10 +- source/Irrlicht/CLWOMeshFileLoader.h | 8 +- source/Irrlicht/CLightSceneNode.h | 41 ++- source/Irrlicht/CLimitReadFile.h | 17 +- source/Irrlicht/CLogger.h | 21 +- source/Irrlicht/CMD2MeshFileLoader.h | 11 +- source/Irrlicht/CMD3MeshFileLoader.h | 9 +- source/Irrlicht/CMS3DMeshFileLoader.h | 10 +- source/Irrlicht/CMY3DHelper.h | 7 +- source/Irrlicht/CMY3DMeshFileLoader.h | 4 +- source/Irrlicht/CMemoryFile.h | 29 +- source/Irrlicht/CMeshCache.h | 31 +- source/Irrlicht/CMeshManipulator.h | 47 ++- source/Irrlicht/CMeshSceneNode.h | 35 +- source/Irrlicht/CMeshTextureLoader.cpp | 8 +- source/Irrlicht/CMeshTextureLoader.h | 20 +- source/Irrlicht/CMetaTriangleSelector.h | 27 +- source/Irrlicht/CMountPointReader.h | 26 +- source/Irrlicht/CNPKReader.h | 27 +- source/Irrlicht/CNullDriver.cpp | 4 +- source/Irrlicht/CNullDriver.h | 273 ++++++++------- source/Irrlicht/COBJMeshFileLoader.h | 9 +- source/Irrlicht/COBJMeshWriter.h | 9 +- source/Irrlicht/COCTLoader.h | 9 +- source/Irrlicht/COGLES2Driver.cpp | 2 +- source/Irrlicht/COGLES2Driver.h | 124 +++---- source/Irrlicht/COGLES2MaterialRenderer.h | 24 +- source/Irrlicht/COGLESDriver.cpp | 2 +- source/Irrlicht/COGLESDriver.h | 128 +++---- source/Irrlicht/COGLESMaterialRenderer.h | 4 +- source/Irrlicht/COSOperator.h | 15 +- source/Irrlicht/COctreeSceneNode.h | 39 ++- source/Irrlicht/COctreeTriangleSelector.h | 10 +- source/Irrlicht/COgreMeshFileLoader.h | 9 +- source/Irrlicht/COpenGLCacheHandler.h | 4 +- source/Irrlicht/COpenGLCommon.h | 4 +- source/Irrlicht/COpenGLCoreCacheHandler.h | 4 +- source/Irrlicht/COpenGLCoreFeature.h | 4 +- source/Irrlicht/COpenGLCoreRenderTarget.h | 6 +- source/Irrlicht/COpenGLCoreTexture.h | 18 +- source/Irrlicht/COpenGLDriver.cpp | 26 +- source/Irrlicht/COpenGLDriver.h | 149 +++++---- source/Irrlicht/COpenGLExtensionHandler.h | 5 +- source/Irrlicht/COpenGLMaterialRenderer.h | 63 ++-- source/Irrlicht/COpenGLNormalMapRenderer.h | 9 +- source/Irrlicht/COpenGLParallaxMapRenderer.h | 13 +- source/Irrlicht/COpenGLSLMaterialRenderer.h | 39 ++- .../Irrlicht/COpenGLShaderMaterialRenderer.h | 15 +- source/Irrlicht/CPLYMeshFileLoader.h | 9 +- source/Irrlicht/CPLYMeshWriter.h | 8 +- source/Irrlicht/CPakReader.h | 27 +- .../CParticleAnimatedMeshSceneNodeEmitter.h | 66 ++-- source/Irrlicht/CParticleAttractionAffector.h | 37 +-- source/Irrlicht/CParticleBoxEmitter.h | 55 ++- source/Irrlicht/CParticleCylinderEmitter.h | 71 ++-- source/Irrlicht/CParticleFadeOutAffector.h | 19 +- source/Irrlicht/CParticleGravityAffector.h | 19 +- source/Irrlicht/CParticleMeshEmitter.h | 65 ++-- source/Irrlicht/CParticlePointEmitter.h | 50 +-- source/Irrlicht/CParticleRingEmitter.h | 63 ++-- source/Irrlicht/CParticleRotationAffector.h | 20 +- source/Irrlicht/CParticleScaleAffector.h | 8 +- source/Irrlicht/CParticleSphereEmitter.h | 59 ++-- source/Irrlicht/CParticleSystemSceneNode.h | 65 ++-- source/Irrlicht/CProfiler.h | 10 +- source/Irrlicht/CQ3LevelMesh.h | 41 ++- source/Irrlicht/CQuake3ShaderSceneNode.h | 32 +- source/Irrlicht/CReadFile.h | 17 +- source/Irrlicht/CSMFMeshFileLoader.h | 11 +- source/Irrlicht/CSTLMeshFileLoader.h | 9 +- source/Irrlicht/CSTLMeshWriter.h | 9 +- source/Irrlicht/CSceneCollisionManager.h | 21 +- source/Irrlicht/CSceneLoaderIrr.h | 11 +- source/Irrlicht/CSceneManager.cpp | 2 +- source/Irrlicht/CSceneManager.h | 221 ++++++------- source/Irrlicht/CSceneNodeAnimatorCameraFPS.h | 43 ++- .../Irrlicht/CSceneNodeAnimatorCameraMaya.h | 39 ++- .../CSceneNodeAnimatorCollisionResponse.h | 55 ++- source/Irrlicht/CSceneNodeAnimatorDelete.h | 11 +- source/Irrlicht/CSceneNodeAnimatorFlyCircle.h | 15 +- .../Irrlicht/CSceneNodeAnimatorFlyStraight.h | 14 +- .../Irrlicht/CSceneNodeAnimatorFollowSpline.h | 15 +- source/Irrlicht/CSceneNodeAnimatorRotation.h | 15 +- source/Irrlicht/CSceneNodeAnimatorTexture.h | 15 +- source/Irrlicht/CShadowVolumeSceneNode.h | 20 +- source/Irrlicht/CSkinnedMesh.h | 73 ++-- source/Irrlicht/CSkyBoxSceneNode.h | 19 +- source/Irrlicht/CSkyDomeSceneNode.h | 23 +- source/Irrlicht/CSoftware2MaterialRenderer.h | 13 +- source/Irrlicht/CSoftwareDriver.h | 62 ++-- source/Irrlicht/CSoftwareDriver2.cpp | 6 +- source/Irrlicht/CSoftwareDriver2.h | 119 ++++--- source/Irrlicht/CSoftwareTexture.h | 13 +- source/Irrlicht/CSoftwareTexture2.h | 16 +- source/Irrlicht/CSphereSceneNode.h | 35 +- source/Irrlicht/CTRFlat.cpp | 2 +- source/Irrlicht/CTRFlatWire.cpp | 2 +- source/Irrlicht/CTRGouraud.cpp | 2 +- source/Irrlicht/CTRGouraud2.cpp | 2 +- source/Irrlicht/CTRGouraudAlpha2.cpp | 2 +- source/Irrlicht/CTRGouraudAlphaNoZ2.cpp | 2 +- source/Irrlicht/CTRGouraudNoZ2.cpp | 4 +- source/Irrlicht/CTRGouraudWire.cpp | 2 +- source/Irrlicht/CTRNormalMap.cpp | 4 +- source/Irrlicht/CTRStencilShadow.cpp | 2 +- source/Irrlicht/CTRTextureBlend.cpp | 4 +- source/Irrlicht/CTRTextureDetailMap2.cpp | 4 +- source/Irrlicht/CTRTextureFlat.cpp | 2 +- source/Irrlicht/CTRTextureFlatWire.cpp | 2 +- source/Irrlicht/CTRTextureGouraud.h | 13 +- source/Irrlicht/CTRTextureGouraud2.cpp | 4 +- source/Irrlicht/CTRTextureGouraudAdd.cpp | 2 +- source/Irrlicht/CTRTextureGouraudAdd2.cpp | 2 +- source/Irrlicht/CTRTextureGouraudAddNoZ2.cpp | 2 +- source/Irrlicht/CTRTextureGouraudAlpha.cpp | 4 +- source/Irrlicht/CTRTextureGouraudAlphaNoZ.cpp | 4 +- source/Irrlicht/CTRTextureGouraudNoZ.cpp | 2 +- source/Irrlicht/CTRTextureGouraudNoZ2.cpp | 4 +- .../CTRTextureGouraudVertexAlpha2.cpp | 2 +- source/Irrlicht/CTRTextureGouraudWire.cpp | 2 +- source/Irrlicht/CTRTextureLightMap2_Add.cpp | 2 +- source/Irrlicht/CTRTextureLightMap2_M1.cpp | 2 +- source/Irrlicht/CTRTextureLightMap2_M2.cpp | 2 +- source/Irrlicht/CTRTextureLightMap2_M4.cpp | 2 +- .../CTRTextureLightMapGouraud2_M4.cpp | 2 +- source/Irrlicht/CTRTextureWire2.cpp | 10 +- .../CTR_transparent_reflection_2_layer.cpp | 4 +- source/Irrlicht/CTarReader.h | 26 +- source/Irrlicht/CTerrainSceneNode.h | 76 +++-- source/Irrlicht/CTerrainTriangleSelector.h | 25 +- source/Irrlicht/CTextSceneNode.h | 61 ++-- source/Irrlicht/CTimer.h | 25 +- source/Irrlicht/CTriangleBBSelector.h | 12 +- source/Irrlicht/CTriangleSelector.h | 20 +- source/Irrlicht/CVideoModeList.h | 18 +- source/Irrlicht/CVolumeLightSceneNode.h | 34 +- source/Irrlicht/CWADReader.h | 30 +- source/Irrlicht/CWGLManager.h | 22 +- source/Irrlicht/CWaterSurfaceSceneNode.h | 17 +- source/Irrlicht/CWebGL1Driver.h | 38 +-- source/Irrlicht/CWriteFile.h | 15 +- source/Irrlicht/CXMLReader.cpp | 4 +- source/Irrlicht/CXMLReader.h | 5 +- source/Irrlicht/CXMLReaderImpl.h | 36 +- source/Irrlicht/CXMLWriter.h | 33 +- source/Irrlicht/CXMeshFileLoader.h | 8 +- source/Irrlicht/CZBuffer.h | 15 +- source/Irrlicht/CZipReader.h | 27 +- source/Irrlicht/IAttribute.h | 4 +- source/Irrlicht/IBurningShader.cpp | 2 +- source/Irrlicht/IBurningShader.h | 39 ++- source/Irrlicht/IDepthBuffer.h | 5 +- source/Irrlicht/IImagePresenter.h | 5 +- source/Irrlicht/ISceneNodeAnimatorFinishing.h | 7 +- source/Irrlicht/ITriangleRenderer.h | 5 +- source/Irrlicht/IZBuffer.h | 5 +- source/Irrlicht/Irrlicht10.0.vcxproj | 29 +- source/Irrlicht/Irrlicht10.0.vcxproj.filters | 83 ++++- source/Irrlicht/Irrlicht11.0.vcxproj | 24 ++ source/Irrlicht/Irrlicht11.0.vcxproj.filters | 72 ++++ source/Irrlicht/Irrlicht12.0.vcxproj | 32 ++ source/Irrlicht/Irrlicht12.0.vcxproj.filters | 96 ++++++ source/Irrlicht/Irrlicht14.0.vcxproj | 23 ++ source/Irrlicht/Irrlicht14.0.vcxproj.filters | 69 ++++ source/Irrlicht/Irrlicht15.0.vcxproj | 25 ++ source/Irrlicht/Irrlicht15.0.vcxproj.filters | 75 +++++ source/Irrlicht/Octree.h | 5 +- source/Irrlicht/S2DVertex.h | 5 +- source/Irrlicht/S4DVertex.h | 8 +- .../Irrlicht/SoftwareDriver2_compile_config.h | 6 +- source/Irrlicht/SoftwareDriver2_helper.h | 5 +- .../burning_shader_compile_fragment_default.h | 6 +- source/Irrlicht/irrXML.cpp | 4 +- source/Irrlicht/os.h | 6 +- 275 files changed, 4166 insertions(+), 3846 deletions(-) diff --git a/source/Irrlicht/C3DSMeshFileLoader.h b/source/Irrlicht/C3DSMeshFileLoader.h index 93bc437c..a6ab1c8c 100644 --- a/source/Irrlicht/C3DSMeshFileLoader.h +++ b/source/Irrlicht/C3DSMeshFileLoader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_3DS_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_3DS_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_3DS_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_3DS_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IFileSystem.h" @@ -30,13 +30,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! See IReferenceCounted::drop() for more information. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: @@ -163,4 +163,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CAnimatedMeshHalfLife.h b/source/Irrlicht/CAnimatedMeshHalfLife.h index 19c14c00..99e88ce0 100644 --- a/source/Irrlicht/CAnimatedMeshHalfLife.h +++ b/source/Irrlicht/CAnimatedMeshHalfLife.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_ANIMATED_MESH_HALFLIFE_H_INCLUDED__ -#define __C_ANIMATED_MESH_HALFLIFE_H_INCLUDED__ +#ifndef IRR_C_ANIMATED_MESH_HALFLIFE_H_INCLUDED +#define IRR_C_ANIMATED_MESH_HALFLIFE_H_INCLUDED #include "IAnimatedMesh.h" #include "ISceneManager.h" @@ -488,33 +488,33 @@ namespace scene bool loadModelFile( io::IReadFile* file, ISceneManager * smgr ); //IAnimatedMesh - virtual u32 getFrameCount() const _IRR_OVERRIDE_; - virtual IMesh* getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop, s32 endFrameLoop) _IRR_OVERRIDE_; - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; - virtual E_ANIMATED_MESH_TYPE getMeshType() const _IRR_OVERRIDE_; + virtual u32 getFrameCount() const IRR_OVERRIDE; + virtual IMesh* getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop, s32 endFrameLoop) IRR_OVERRIDE; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; + virtual E_ANIMATED_MESH_TYPE getMeshType() const IRR_OVERRIDE; void renderModel ( u32 param, video::IVideoDriver * driver, const core::matrix4 &absoluteTransformation); //! returns amount of mesh buffers. - virtual u32 getMeshBufferCount() const _IRR_OVERRIDE_; + virtual u32 getMeshBufferCount() const IRR_OVERRIDE; //! 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 - 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 - 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 - 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 - 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. /** \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; } @@ -522,7 +522,7 @@ namespace scene //! Gets the frame count of the animated mesh. /** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated. The actual speed is set in the scene node the mesh is instantiated in.*/ - virtual void setAnimationSpeed(f32 fps) _IRR_OVERRIDE_ + virtual void setAnimationSpeed(f32 fps) IRR_OVERRIDE { FramesPerSecond=fps; } @@ -609,14 +609,14 @@ namespace scene //! returns true if the file maybe is able to be loaded by this class /** 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. /** \return Pointer to the created mesh. Returns 0 if loading failed. If you no longer need the mesh, you should call IAnimatedMesh::drop(). See IReferenceCounted::drop() for more information. */ - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: scene::ISceneManager* SceneManager; @@ -627,4 +627,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CAnimatedMeshMD2.h b/source/Irrlicht/CAnimatedMeshMD2.h index a614f18a..04e0fa5d 100644 --- a/source/Irrlicht/CAnimatedMeshMD2.h +++ b/source/Irrlicht/CAnimatedMeshMD2.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_ANIMATED_MESH_MD2_H_INCLUDED__ -#define __C_ANIMATED_MESH_MD2_H_INCLUDED__ +#ifndef IRR_C_ANIMATED_MESH_MD2_H_INCLUDED +#define IRR_C_ANIMATED_MESH_MD2_H_INCLUDED #include "IAnimatedMeshMD2.h" #include "IMesh.h" @@ -29,11 +29,11 @@ namespace scene virtual ~CAnimatedMeshMD2(); //! 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. /** \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; } @@ -41,58 +41,58 @@ namespace scene //! Gets the frame count of the animated mesh. /** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated. The actual speed is set in the scene node the mesh is instantiated in.*/ - virtual void setAnimationSpeed(f32 fps) _IRR_OVERRIDE_ + virtual void setAnimationSpeed(f32 fps) IRR_OVERRIDE { 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. - 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. - virtual u32 getMeshBufferCount() const _IRR_OVERRIDE_; + virtual u32 getMeshBufferCount() const IRR_OVERRIDE; //! 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 /** \param material: material to search for \return Returns the pointer to the mesh buffer or 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 - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! 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 - 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 - 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 - 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. - 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. 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. 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. - virtual s32 getAnimationCount() const _IRR_OVERRIDE_; + virtual s32 getAnimationCount() const IRR_OVERRIDE; //! Returns name of md2 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 #endif - diff --git a/source/Irrlicht/CAnimatedMeshMD3.h b/source/Irrlicht/CAnimatedMeshMD3.h index cc96b58c..c3f2f925 100644 --- a/source/Irrlicht/CAnimatedMeshMD3.h +++ b/source/Irrlicht/CAnimatedMeshMD3.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_ANIMATED_MESH_MD3_H_INCLUDED__ -#define __C_ANIMATED_MESH_MD3_H_INCLUDED__ +#ifndef IRR_C_ANIMATED_MESH_MD3_H_INCLUDED +#define IRR_C_ANIMATED_MESH_MD3_H_INCLUDED #include "IAnimatedMeshMD3.h" #include "IReadFile.h" @@ -34,16 +34,16 @@ namespace scene io::IFileSystem* fs, video::IVideoDriver* driver); // IAnimatedMeshMD3 - virtual void setInterpolationShift(u32 shift, u32 loopMode) _IRR_OVERRIDE_; - virtual SMD3Mesh* getOriginalMesh() _IRR_OVERRIDE_; - virtual SMD3QuaternionTagList* getTagList(s32 frame, s32 detailLevel, s32 startFrameLoop, s32 endFrameLoop) _IRR_OVERRIDE_; + virtual void setInterpolationShift(u32 shift, u32 loopMode) IRR_OVERRIDE; + virtual SMD3Mesh* getOriginalMesh() IRR_OVERRIDE; + virtual SMD3QuaternionTagList* getTagList(s32 frame, s32 detailLevel, s32 startFrameLoop, s32 endFrameLoop) IRR_OVERRIDE; //IAnimatedMesh - virtual u32 getFrameCount() const _IRR_OVERRIDE_; + virtual u32 getFrameCount() const IRR_OVERRIDE; //! Gets the default animation speed of the animated mesh. /** \return Amount of frames per second. If the amount is 0, it is a static, non animated mesh. */ - virtual f32 getAnimationSpeed() const _IRR_OVERRIDE_ + virtual f32 getAnimationSpeed() const IRR_OVERRIDE { return FramesPerSecond; } @@ -51,35 +51,35 @@ namespace scene //! Gets the frame count of the animated mesh. /** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated. The actual speed is set in the scene node the mesh is instantiated in.*/ - virtual void setAnimationSpeed(f32 fps) _IRR_OVERRIDE_ + virtual void setAnimationSpeed(f32 fps) IRR_OVERRIDE { FramesPerSecond=fps; } virtual IMesh* getMesh(s32 frame, s32 detailLevel, - s32 startFrameLoop, s32 endFrameLoop) _IRR_OVERRIDE_; - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; - virtual E_ANIMATED_MESH_TYPE getMeshType() const _IRR_OVERRIDE_; + s32 startFrameLoop, s32 endFrameLoop) IRR_OVERRIDE; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; + virtual E_ANIMATED_MESH_TYPE getMeshType() const IRR_OVERRIDE; //! returns amount of mesh buffers. - virtual u32 getMeshBufferCount() const _IRR_OVERRIDE_; + virtual u32 getMeshBufferCount() const IRR_OVERRIDE; //! 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 - 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 - 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 - 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 - 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: //! animates one frame @@ -132,4 +132,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CAnimatedMeshSceneNode.h b/source/Irrlicht/CAnimatedMeshSceneNode.h index 6a5914e9..92121985 100644 --- a/source/Irrlicht/CAnimatedMeshSceneNode.h +++ b/source/Irrlicht/CAnimatedMeshSceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__ -#define __C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED +#define IRR_C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED #include "IAnimatedMeshSceneNode.h" #include "IAnimatedMesh.h" @@ -31,135 +31,135 @@ namespace scene virtual ~CAnimatedMeshSceneNode(); //! 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 - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; //! 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. - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! sets the frames between the animation is looped. //! 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 - 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, //! animations will not be looped. - virtual void setLoopMode(bool playAnimationLooped) _IRR_OVERRIDE_; + virtual void setLoopMode(bool playAnimationLooped) IRR_OVERRIDE; //! 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 //! 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 //! 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 - 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 //! of materials used by this scene node, use getMaterialCount(). //! 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 //! 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. - virtual u32 getMaterialCount() const _IRR_OVERRIDE_; + virtual u32 getMaterialCount() const IRR_OVERRIDE; //! Creates shadow volume scene node as child of this node //! and returns a pointer to it. virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh, - s32 id, bool zfailmethod=true, f32 infinity=1000.0f) _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 //! 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 - virtual IBoneSceneNode* getJointNode(u32 jointID) _IRR_OVERRIDE_; + virtual IBoneSceneNode* getJointNode(u32 jointID) IRR_OVERRIDE; //! Gets joint count. - virtual u32 getJointCount() const _IRR_OVERRIDE_; + virtual u32 getJointCount() const IRR_OVERRIDE; //! Removes a child from this scene node. //! Implemented here, to be able to remove the shadow properly, if there is one, //! or to remove attached child. - virtual bool removeChild(ISceneNode* child) _IRR_OVERRIDE_; + virtual bool removeChild(ISceneNode* child) IRR_OVERRIDE; //! 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. - virtual bool setMD2Animation(const c8* animationName) _IRR_OVERRIDE_; + virtual bool setMD2Animation(const c8* animationName) IRR_OVERRIDE; //! Returns the current displayed frame number. - virtual f32 getFrameNr() const _IRR_OVERRIDE_; + virtual f32 getFrameNr() const IRR_OVERRIDE; //! Returns the current start frame number. - virtual s32 getStartFrame() const _IRR_OVERRIDE_; + virtual s32 getStartFrame() const IRR_OVERRIDE; //! 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. /* In this way it is possible to change the materials a mesh causing all mesh scene nodes 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 - virtual bool isReadOnlyMaterials() const _IRR_OVERRIDE_; + virtual bool isReadOnlyMaterials() const IRR_OVERRIDE; //! Sets a new mesh - virtual void setMesh(IAnimatedMesh* mesh) _IRR_OVERRIDE_; + virtual void setMesh(IAnimatedMesh* mesh) IRR_OVERRIDE; //! 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. - 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. - 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 - 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, // 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 - 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) - 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) //! 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 - 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) - virtual void setRenderFromIdentity( bool On ) _IRR_OVERRIDE_; + virtual void setRenderFromIdentity( bool On ) IRR_OVERRIDE; //! Creates a clone of this scene node and its children. /** \param newParent An optional new parent. \param newManager An optional new scene manager. \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: @@ -220,4 +220,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CAttributeImpl.h b/source/Irrlicht/CAttributeImpl.h index 3796fed9..6317a634 100644 --- a/source/Irrlicht/CAttributeImpl.h +++ b/source/Irrlicht/CAttributeImpl.h @@ -27,52 +27,52 @@ public: setBool(value); } - virtual s32 getInt() const _IRR_OVERRIDE_ + virtual s32 getInt() const IRR_OVERRIDE { return BoolValue ? 1 : 0; } - virtual f32 getFloat() const _IRR_OVERRIDE_ + virtual f32 getFloat() const IRR_OVERRIDE { return BoolValue ? 1.0f : 0.0f; } - virtual bool getBool() const _IRR_OVERRIDE_ + virtual bool getBool() const IRR_OVERRIDE { return BoolValue; } - virtual core::stringw getStringW() const _IRR_OVERRIDE_ + virtual core::stringw getStringW() const IRR_OVERRIDE { return core::stringw( BoolValue ? L"true" : L"false" ); } - virtual void setInt(s32 intValue) _IRR_OVERRIDE_ + virtual void setInt(s32 intValue) IRR_OVERRIDE { BoolValue = (intValue != 0); } - virtual void setFloat(f32 floatValue) _IRR_OVERRIDE_ + virtual void setFloat(f32 floatValue) IRR_OVERRIDE { BoolValue = (floatValue != 0); } - virtual void setBool(bool boolValue) _IRR_OVERRIDE_ + virtual void setBool(bool boolValue) IRR_OVERRIDE { BoolValue = boolValue; } - virtual void setString(const char* string) _IRR_OVERRIDE_ + virtual void setString(const char* string) IRR_OVERRIDE { BoolValue = strcmp(string, "true") == 0; } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_BOOL; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"bool"; } @@ -91,48 +91,48 @@ public: setInt(value); } - virtual s32 getInt() const _IRR_OVERRIDE_ + virtual s32 getInt() const IRR_OVERRIDE { return Value; } - virtual f32 getFloat() const _IRR_OVERRIDE_ + virtual f32 getFloat() const IRR_OVERRIDE { return (f32)Value; } - virtual bool getBool() const _IRR_OVERRIDE_ + virtual bool getBool() const IRR_OVERRIDE { return (Value != 0); } - virtual core::stringw getStringW() const _IRR_OVERRIDE_ + virtual core::stringw getStringW() const IRR_OVERRIDE { return core::stringw(Value); } - virtual void setInt(s32 intValue) _IRR_OVERRIDE_ + virtual void setInt(s32 intValue) IRR_OVERRIDE { Value = intValue; } - virtual void setFloat(f32 floatValue) _IRR_OVERRIDE_ + virtual void setFloat(f32 floatValue) IRR_OVERRIDE { Value = (s32)floatValue; }; - virtual void setString(const char* text) _IRR_OVERRIDE_ + virtual void setString(const char* text) IRR_OVERRIDE { Value = atoi(text); } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_INT; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"int"; } @@ -151,48 +151,48 @@ public: setFloat(value); } - virtual s32 getInt() const _IRR_OVERRIDE_ + virtual s32 getInt() const IRR_OVERRIDE { return (s32)Value; } - virtual f32 getFloat() const _IRR_OVERRIDE_ + virtual f32 getFloat() const IRR_OVERRIDE { return Value; } - virtual bool getBool() const _IRR_OVERRIDE_ + virtual bool getBool() const IRR_OVERRIDE { return (Value != 0); } - virtual core::stringw getStringW() const _IRR_OVERRIDE_ + virtual core::stringw getStringW() const IRR_OVERRIDE { return core::stringw((double)Value); } - virtual void setInt(s32 intValue) _IRR_OVERRIDE_ + virtual void setInt(s32 intValue) IRR_OVERRIDE { Value = (f32)intValue; } - virtual void setFloat(f32 floatValue) _IRR_OVERRIDE_ + virtual void setFloat(f32 floatValue) IRR_OVERRIDE { Value = floatValue; } - virtual void setString(const char* text) _IRR_OVERRIDE_ + virtual void setString(const char* text) IRR_OVERRIDE { Value = core::fast_atof(text); } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_FLOAT; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"float"; } @@ -384,7 +384,7 @@ public: } // getting values - virtual s32 getInt() const _IRR_OVERRIDE_ + virtual s32 getInt() const IRR_OVERRIDE { if (Count==0) return 0; @@ -395,7 +395,7 @@ public: return ValueI[0]; } - virtual f32 getFloat() const _IRR_OVERRIDE_ + virtual f32 getFloat() const IRR_OVERRIDE { if (Count==0) return 0.0f; @@ -406,7 +406,7 @@ public: return (f32)ValueI[0]; } - virtual bool getBool() const _IRR_OVERRIDE_ + virtual bool getBool() const IRR_OVERRIDE { // return true if any number is nonzero bool ret=false; @@ -422,7 +422,7 @@ public: } - virtual core::stringc getString() const _IRR_OVERRIDE_ + virtual core::stringc getString() const IRR_OVERRIDE { core::stringc outstr; @@ -439,7 +439,7 @@ public: return outstr; } - virtual core::stringw getStringW() const _IRR_OVERRIDE_ + virtual core::stringw getStringW() const IRR_OVERRIDE { core::stringw outstr; @@ -456,7 +456,7 @@ public: return outstr; } - virtual core::position2di getPosition() const _IRR_OVERRIDE_ + virtual core::position2di getPosition() const IRR_OVERRIDE { core::position2di p; @@ -474,7 +474,7 @@ public: return p; } - virtual core::vector3df getVector() const _IRR_OVERRIDE_ + virtual core::vector3df getVector() const IRR_OVERRIDE { core::vector3df v; @@ -494,7 +494,7 @@ public: return v; } - virtual core::vector2df getVector2d() const _IRR_OVERRIDE_ + virtual core::vector2df getVector2d() const IRR_OVERRIDE { core::vector2df v; @@ -512,7 +512,7 @@ public: return v; } - virtual video::SColorf getColorf() const _IRR_OVERRIDE_ + virtual video::SColorf getColorf() const IRR_OVERRIDE { video::SColorf c; if (IsFloat) @@ -533,13 +533,13 @@ public: return c; } - virtual video::SColor getColor() const _IRR_OVERRIDE_ + virtual video::SColor getColor() const IRR_OVERRIDE { return getColorf().toSColor(); } - virtual core::rect getRect() const _IRR_OVERRIDE_ + virtual core::rect getRect() const IRR_OVERRIDE { core::rect r; @@ -560,7 +560,7 @@ public: return r; } - virtual core::dimension2du getDimension2d() const _IRR_OVERRIDE_ + virtual core::dimension2du getDimension2d() const IRR_OVERRIDE { core::dimension2d dim; @@ -577,7 +577,7 @@ public: return dim; } - virtual core::matrix4 getMatrix() const _IRR_OVERRIDE_ + virtual core::matrix4 getMatrix() const IRR_OVERRIDE { core::matrix4 ret; if (IsFloat) @@ -597,7 +597,7 @@ public: return ret; } - virtual core::quaternion getQuaternion() const _IRR_OVERRIDE_ + virtual core::quaternion getQuaternion() const IRR_OVERRIDE { core::quaternion ret; if (IsFloat) @@ -617,7 +617,7 @@ public: return ret; } - virtual core::triangle3df getTriangle() const _IRR_OVERRIDE_ + virtual core::triangle3df getTriangle() const IRR_OVERRIDE { core::triangle3df ret; @@ -649,7 +649,7 @@ public: return ret; } - virtual core::plane3df getPlane() const _IRR_OVERRIDE_ + virtual core::plane3df getPlane() const IRR_OVERRIDE { core::plane3df ret; @@ -671,7 +671,7 @@ public: return ret; } - virtual core::aabbox3df getBBox() const _IRR_OVERRIDE_ + virtual core::aabbox3df getBBox() const IRR_OVERRIDE { core::aabbox3df ret; if (IsFloat) @@ -696,7 +696,7 @@ public: } - virtual core::line2df getLine2d() const _IRR_OVERRIDE_ + virtual core::line2df getLine2d() const IRR_OVERRIDE { core::line2df ret; if (IsFloat) @@ -716,7 +716,7 @@ public: return ret; } - virtual core::line3df getLine3d() const _IRR_OVERRIDE_ + virtual core::line3df getLine3d() const IRR_OVERRIDE { core::line3df ret; if (IsFloat) @@ -766,7 +766,7 @@ public: // setting values - virtual void setInt(s32 intValue) _IRR_OVERRIDE_ + virtual void setInt(s32 intValue) IRR_OVERRIDE { // set all values for (u32 i=0; i < Count; ++i) @@ -776,7 +776,7 @@ public: ValueI[i] = intValue; } - virtual void setFloat(f32 floatValue) _IRR_OVERRIDE_ + virtual void setFloat(f32 floatValue) IRR_OVERRIDE { // set all values for (u32 i=0; i < Count; ++i) @@ -786,12 +786,12 @@ public: ValueI[i] = (s32)floatValue; } - virtual void setBool(bool boolValue) _IRR_OVERRIDE_ + virtual void setBool(bool boolValue) IRR_OVERRIDE { setInt( boolValue ? 1 : 0); } - virtual void setString(const char* text) _IRR_OVERRIDE_ + virtual void setString(const char* text) IRR_OVERRIDE { // parse text @@ -832,7 +832,7 @@ public: //} } - virtual void setPosition(const core::position2di& v) _IRR_OVERRIDE_ + virtual void setPosition(const core::position2di& v) IRR_OVERRIDE { reset(); if (IsFloat) @@ -847,7 +847,7 @@ public: } } - virtual void setVector(const core::vector3df& v) _IRR_OVERRIDE_ + virtual void setVector(const core::vector3df& v) IRR_OVERRIDE { reset(); if (IsFloat) @@ -864,7 +864,7 @@ public: } } - virtual void setColor(video::SColorf color) _IRR_OVERRIDE_ + virtual void setColor(video::SColorf color) IRR_OVERRIDE { reset(); if (IsFloat) @@ -884,7 +884,7 @@ public: } - virtual void setColor(video::SColor color) _IRR_OVERRIDE_ + virtual void setColor(video::SColor color) IRR_OVERRIDE { reset(); if (IsFloat) @@ -903,7 +903,7 @@ public: } } - virtual void setRect(const core::rect& value) _IRR_OVERRIDE_ + virtual void setRect(const core::rect& value) IRR_OVERRIDE { reset(); if (IsFloat) @@ -922,7 +922,7 @@ public: } } - virtual void setMatrix(const core::matrix4& value) _IRR_OVERRIDE_ + virtual void setMatrix(const core::matrix4& value) IRR_OVERRIDE { reset(); if (IsFloat) @@ -941,7 +941,7 @@ public: } } - virtual void setQuaternion(const core::quaternion& value) _IRR_OVERRIDE_ + virtual void setQuaternion(const core::quaternion& value) IRR_OVERRIDE { reset(); if (IsFloat) @@ -983,7 +983,7 @@ public: } } - virtual void setPlane(const core::plane3df& value) _IRR_OVERRIDE_ + virtual void setPlane(const core::plane3df& value) IRR_OVERRIDE { reset(); if (IsFloat) @@ -1031,7 +1031,7 @@ public: } } - virtual void setVector2d(const core::vector2df& v) _IRR_OVERRIDE_ + virtual void setVector2d(const core::vector2df& v) IRR_OVERRIDE { reset(); if (IsFloat) @@ -1046,7 +1046,7 @@ public: } } - virtual void setVector2d(const core::vector2di& v) _IRR_OVERRIDE_ + virtual void setVector2d(const core::vector2di& v) IRR_OVERRIDE { reset(); if (IsFloat) @@ -1061,7 +1061,7 @@ public: } } - virtual void setLine2d(const core::line2di& v) _IRR_OVERRIDE_ + virtual void setLine2d(const core::line2di& v) IRR_OVERRIDE { reset(); if (IsFloat) @@ -1080,7 +1080,7 @@ public: } } - virtual void setLine2d(const core::line2df& v) _IRR_OVERRIDE_ + virtual void setLine2d(const core::line2df& v) IRR_OVERRIDE { reset(); if (IsFloat) @@ -1099,7 +1099,7 @@ public: } } - virtual void setDimension2d(const core::dimension2du& v) _IRR_OVERRIDE_ + virtual void setDimension2d(const core::dimension2du& v) IRR_OVERRIDE { reset(); if (IsFloat) @@ -1142,7 +1142,7 @@ public: } } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { if (IsFloat) return EAT_FLOATARRAY; @@ -1150,7 +1150,7 @@ public: return EAT_INTARRAY; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { if (IsFloat) return L"floatlist"; @@ -1185,17 +1185,17 @@ public: CColorfAttribute(const char* name, video::SColorf value) : CNumbersAttribute(name, value) {} - virtual s32 getInt() const _IRR_OVERRIDE_ + virtual s32 getInt() const IRR_OVERRIDE { return getColor().color; } - virtual f32 getFloat() const _IRR_OVERRIDE_ + virtual f32 getFloat() const IRR_OVERRIDE { return (f32)getColor().color; } - virtual void setInt(s32 intValue) _IRR_OVERRIDE_ + virtual void setInt(s32 intValue) IRR_OVERRIDE { video::SColorf c = video::SColor(intValue); ValueF[0] = c.r; @@ -1204,17 +1204,17 @@ public: ValueF[3] = c.a; } - virtual void setFloat(f32 floatValue) _IRR_OVERRIDE_ + virtual void setFloat(f32 floatValue) IRR_OVERRIDE { setInt((s32)floatValue); } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_COLORF; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"colorf"; } @@ -1231,17 +1231,17 @@ public: CColorAttribute(const char* name, const video::SColor& value) : CNumbersAttribute(name, value) {} - virtual s32 getInt() const _IRR_OVERRIDE_ + virtual s32 getInt() const IRR_OVERRIDE { return getColor().color; } - virtual f32 getFloat() const _IRR_OVERRIDE_ + virtual f32 getFloat() const IRR_OVERRIDE { return (f32)getColor().color; } - virtual void setInt(s32 intValue) _IRR_OVERRIDE_ + virtual void setInt(s32 intValue) IRR_OVERRIDE { video::SColorf c = video::SColor(intValue); ValueF[0] = c.r; @@ -1250,12 +1250,12 @@ public: ValueF[3] = c.a; } - virtual void setFloat(f32 floatValue) _IRR_OVERRIDE_ + virtual void setFloat(f32 floatValue) IRR_OVERRIDE { setInt((s32)floatValue); } - virtual core::stringc getString() const _IRR_OVERRIDE_ + virtual core::stringc getString() const IRR_OVERRIDE { char tmp[10]; const video::SColor c = getColor(); @@ -1263,7 +1263,7 @@ public: return core::stringc(tmp); } - virtual core::stringw getStringW() const _IRR_OVERRIDE_ + virtual core::stringw getStringW() const IRR_OVERRIDE { char tmp[10]; const video::SColor c = getColor(); @@ -1271,7 +1271,7 @@ public: return core::stringw(tmp); } - virtual void setString(const char* text) _IRR_OVERRIDE_ + virtual void setString(const char* text) IRR_OVERRIDE { u32 c; int characters; @@ -1284,13 +1284,13 @@ public: setColor(c); } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_COLOR; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"color"; } @@ -1305,12 +1305,12 @@ public: CVector3DAttribute(const char* name, const core::vector3df& value) : CNumbersAttribute(name, value) {} - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_VECTOR3D; } - virtual core::matrix4 getMatrix() const _IRR_OVERRIDE_ + virtual core::matrix4 getMatrix() const IRR_OVERRIDE { core::matrix4 ret; ret.makeIdentity(); @@ -1318,7 +1318,7 @@ public: return ret; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"vector3d"; } @@ -1331,12 +1331,12 @@ public: CVector2DAttribute(const char* name, const core::vector2df& value) : CNumbersAttribute(name, value) {} - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_VECTOR2D; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"vector2d"; } @@ -1349,12 +1349,12 @@ public: CPosition2DAttribute(const char* name, const core::position2di& value) : CNumbersAttribute(name, value) {} - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_POSITION2D; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"position"; } @@ -1369,12 +1369,12 @@ public: CRectAttribute(const char* name, const core::rect& value) : CNumbersAttribute(name, value) { } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_RECT; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"rect"; } @@ -1388,12 +1388,12 @@ public: CDimension2dAttribute (const char* name, const core::dimension2d& value) : CNumbersAttribute(name, value) { } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_DIMENSION2D; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"dimension2d"; } @@ -1406,17 +1406,17 @@ public: CMatrixAttribute(const char* name, const core::matrix4& value) : CNumbersAttribute(name, value) { } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_MATRIX; } - virtual core::quaternion getQuaternion() const _IRR_OVERRIDE_ + virtual core::quaternion getQuaternion() const IRR_OVERRIDE { return core::quaternion(getMatrix()); } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"matrix"; } @@ -1429,17 +1429,17 @@ public: CQuaternionAttribute(const char* name, const core::quaternion& value) : CNumbersAttribute(name, value) { } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_QUATERNION; } - virtual core::matrix4 getMatrix() const _IRR_OVERRIDE_ + virtual core::matrix4 getMatrix() const IRR_OVERRIDE { return getQuaternion().getMatrix(); } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"quaternion"; } @@ -1453,12 +1453,12 @@ public: CBBoxAttribute(const char* name, const core::aabbox3df& value) : CNumbersAttribute(name, value) { } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_BBOX; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"box3d"; } @@ -1471,12 +1471,12 @@ public: CPlaneAttribute(const char* name, const core::plane3df& value) : CNumbersAttribute(name, value) { } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_PLANE; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"plane"; } @@ -1489,17 +1489,17 @@ public: CTriangleAttribute(const char* name, const core::triangle3df& value) : CNumbersAttribute(name, value) { } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_TRIANGLE3D; } - virtual core::plane3df getPlane() const _IRR_OVERRIDE_ + virtual core::plane3df getPlane() const IRR_OVERRIDE { return getTriangle().getPlane(); } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"triangle"; } @@ -1513,12 +1513,12 @@ public: CLine2dAttribute(const char* name, const core::line2df& value) : CNumbersAttribute(name, value) { } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_LINE2D; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"line2d"; } @@ -1531,12 +1531,12 @@ public: CLine3dAttribute(const char* name, const core::line3df& value) : CNumbersAttribute(name, value) { } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_LINE3D; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"line3d"; } @@ -1561,7 +1561,7 @@ public: setEnum(value, literals); } - virtual void setEnum(const char* enumValue, const char* const* enumerationLiterals) _IRR_OVERRIDE_ + virtual void setEnum(const char* enumValue, const char* const* enumerationLiterals) IRR_OVERRIDE { u32 literalCount = 0; @@ -1579,7 +1579,7 @@ public: setString(enumValue); } - virtual s32 getInt() const _IRR_OVERRIDE_ + virtual s32 getInt() const IRR_OVERRIDE { for (u32 i=0; i < EnumLiterals.size(); ++i) { @@ -1592,27 +1592,27 @@ public: return -1; } - virtual f32 getFloat() const _IRR_OVERRIDE_ + virtual f32 getFloat() const IRR_OVERRIDE { return (f32)getInt(); } - virtual bool getBool() const _IRR_OVERRIDE_ + virtual bool getBool() const IRR_OVERRIDE { return (getInt() != 0); // does not make a lot of sense, I know } - virtual core::stringc getString() const _IRR_OVERRIDE_ + virtual core::stringc getString() const IRR_OVERRIDE { return Value; } - virtual core::stringw getStringW() const _IRR_OVERRIDE_ + virtual core::stringw getStringW() const IRR_OVERRIDE { return core::stringw(Value.c_str()); } - virtual void setInt(s32 intValue) _IRR_OVERRIDE_ + virtual void setInt(s32 intValue) IRR_OVERRIDE { if (intValue>=0 && intValue<(s32)EnumLiterals.size()) Value = EnumLiterals[intValue]; @@ -1620,28 +1620,28 @@ public: Value = ""; } - virtual void setFloat(f32 floatValue) _IRR_OVERRIDE_ + virtual void setFloat(f32 floatValue) IRR_OVERRIDE { setInt((s32)floatValue); }; - virtual void setString(const char* text) _IRR_OVERRIDE_ + virtual void setString(const char* text) IRR_OVERRIDE { Value = text; } - virtual const char* getEnum() const _IRR_OVERRIDE_ + virtual const char* getEnum() const IRR_OVERRIDE { return Value.c_str(); } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_ENUM; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"enum"; } @@ -1680,7 +1680,7 @@ public: setBinary(binaryData, lengthInBytes); } - virtual s32 getInt() const _IRR_OVERRIDE_ + virtual s32 getInt() const IRR_OVERRIDE { if (IsStringW) return atoi(core::stringc(ValueW.c_str()).c_str()); @@ -1688,7 +1688,7 @@ public: return atoi(Value.c_str()); } - virtual f32 getFloat() const _IRR_OVERRIDE_ + virtual f32 getFloat() const IRR_OVERRIDE { if (IsStringW) return core::fast_atof(core::stringc(ValueW.c_str()).c_str()); @@ -1696,7 +1696,7 @@ public: return core::fast_atof(Value.c_str()); } - virtual bool getBool() const _IRR_OVERRIDE_ + virtual bool getBool() const IRR_OVERRIDE { if (IsStringW) return ValueW.equals_ignore_case(L"true"); @@ -1704,14 +1704,14 @@ public: return Value.equals_ignore_case("true"); } - virtual core::stringc getString() const _IRR_OVERRIDE_ + virtual core::stringc getString() const IRR_OVERRIDE { if (IsStringW) return core::stringc(ValueW.c_str()); else return Value; } - virtual core::stringw getStringW() const _IRR_OVERRIDE_ + virtual core::stringw getStringW() const IRR_OVERRIDE { if (IsStringW) return ValueW; @@ -1719,7 +1719,7 @@ public: return core::stringw(Value.c_str()); } - virtual void setInt(s32 intValue) _IRR_OVERRIDE_ + virtual void setInt(s32 intValue) IRR_OVERRIDE { if (IsStringW) ValueW = core::stringw(intValue); @@ -1727,7 +1727,7 @@ public: Value = core::stringc(intValue); } - virtual void setFloat(f32 floatValue) _IRR_OVERRIDE_ + virtual void setFloat(f32 floatValue) IRR_OVERRIDE { if (IsStringW) { @@ -1739,7 +1739,7 @@ public: } }; - virtual void setString(const char* text) _IRR_OVERRIDE_ + virtual void setString(const char* text) IRR_OVERRIDE { if (IsStringW) ValueW = core::stringw(text); @@ -1747,7 +1747,7 @@ public: Value = text; } - virtual void setString(const wchar_t* text) _IRR_OVERRIDE_ + virtual void setString(const wchar_t* text) IRR_OVERRIDE { if (IsStringW) ValueW = text; @@ -1755,18 +1755,18 @@ public: Value = core::stringc(text); } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_STRING; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"string"; } - virtual void getBinary(void* outdata, s32 maxLength) const _IRR_OVERRIDE_ + virtual void getBinary(void* outdata, s32 maxLength) const IRR_OVERRIDE { const s32 dataSize = maxLength; c8* datac8 = (c8*)(outdata); @@ -1788,7 +1788,7 @@ public: } }; - virtual void setBinary(void* data, s32 maxLength) _IRR_OVERRIDE_ + virtual void setBinary(void* data, s32 maxLength) IRR_OVERRIDE { const s32 dataSize = maxLength; const c8* datac8 = (c8*)(data); @@ -1847,13 +1847,13 @@ public: } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_BINARY; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"binary"; } @@ -1885,17 +1885,17 @@ public: Value->drop(); } - virtual video::ITexture* getTexture() const _IRR_OVERRIDE_ + virtual video::ITexture* getTexture() const IRR_OVERRIDE { return Value; } - virtual bool getBool() const _IRR_OVERRIDE_ + virtual bool getBool() const IRR_OVERRIDE { return (Value != 0); } - virtual core::stringw getStringW() const _IRR_OVERRIDE_ + virtual core::stringw getStringW() const IRR_OVERRIDE { // (note: don't try to put all this in some ?: operators, or c++ builder will choke) if ( OverrideName.size() ) @@ -1907,7 +1907,7 @@ public: return core::stringw(); } - virtual core::stringc getString() const _IRR_OVERRIDE_ + virtual core::stringc getString() const IRR_OVERRIDE { // since texture names can be stringw we are careful with the types if ( OverrideName.size() ) @@ -1919,7 +1919,7 @@ public: return core::stringc(); } - virtual void setString(const char* text) _IRR_OVERRIDE_ + virtual void setString(const char* text) IRR_OVERRIDE { if (Driver) { @@ -1933,7 +1933,7 @@ public: } } - virtual void setTexture(video::ITexture* texture, const path& filename) _IRR_OVERRIDE_ + virtual void setTexture(video::ITexture* texture, const path& filename) IRR_OVERRIDE { OverrideName = filename; setTexture(texture); @@ -1953,13 +1953,13 @@ public: Value->grab(); } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_TEXTURE; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"texture"; } @@ -1982,22 +1982,22 @@ public: setArray(value); } - virtual core::array getArray() const _IRR_OVERRIDE_ + virtual core::array getArray() const IRR_OVERRIDE { return Value; } - virtual void setArray(const core::array& value) _IRR_OVERRIDE_ + virtual void setArray(const core::array& value) IRR_OVERRIDE { Value = value; } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_STRINGWARRAY; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"stringwarray"; } @@ -2017,17 +2017,17 @@ public: Value = value; } - virtual s32 getInt() const _IRR_OVERRIDE_ + virtual s32 getInt() const IRR_OVERRIDE { return *static_cast(Value); } - virtual bool getBool() const _IRR_OVERRIDE_ + virtual bool getBool() const IRR_OVERRIDE { return (Value != 0); } - virtual core::stringw getStringW() const _IRR_OVERRIDE_ + virtual core::stringw getStringW() const IRR_OVERRIDE { wchar_t buf[32]; swprintf_irr(buf, 32, L"%p", Value); @@ -2035,7 +2035,7 @@ public: return core::stringw(buf); } - virtual void setString(const char* text) _IRR_OVERRIDE_ + virtual void setString(const char* text) IRR_OVERRIDE { size_t val = 0; switch ( sizeof(void*) ) @@ -2061,23 +2061,23 @@ public: Value = (void *)val; } - virtual E_ATTRIBUTE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_ATTRIBUTE_TYPE getType() const IRR_OVERRIDE { return EAT_USER_POINTER; } - virtual void setUserPointer(void* v) _IRR_OVERRIDE_ + virtual void setUserPointer(void* v) IRR_OVERRIDE { Value = v; } - virtual void* getUserPointer() const _IRR_OVERRIDE_ + virtual void* getUserPointer() const IRR_OVERRIDE { return Value; } - virtual const wchar_t* getTypeString() const _IRR_OVERRIDE_ + virtual const wchar_t* getTypeString() const IRR_OVERRIDE { return L"userPointer"; } diff --git a/source/Irrlicht/CAttributes.h b/source/Irrlicht/CAttributes.h index 466e9044..652a91d3 100644 --- a/source/Irrlicht/CAttributes.h +++ b/source/Irrlicht/CAttributes.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_ATTRIBUTES_H_INCLUDED__ -#define __C_ATTRIBUTES_H_INCLUDED__ +#ifndef IRR_C_ATTRIBUTES_H_INCLUDED +#define IRR_C_ATTRIBUTES_H_INCLUDED #include "IrrCompileConfig.h" @@ -30,46 +30,46 @@ public: ~CAttributes(); //! 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. //! \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 //! \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. //! \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 //! \param attributeName: String for the attribute type //! \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. //! \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 - 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 - virtual s32 findAttribute(const c8* attributeName) const _IRR_OVERRIDE_; + virtual s32 findAttribute(const c8* attributeName) const IRR_OVERRIDE; //! Removes all attributes - virtual void clear() _IRR_OVERRIDE_; + virtual void clear() IRR_OVERRIDE; //! Reads attributes from a xml file. //! \param readCurrentElementOnly: If set to true, reading only works if current element has the name 'attributes'. //! IF set to false, the first appearing list attributes are read. virtual bool read(io::IXMLReader* reader, bool readCurrentElementOnly=false, - const wchar_t* nonDefaultElementName = 0) _IRR_OVERRIDE_; + const wchar_t* nonDefaultElementName = 0) IRR_OVERRIDE; //! Write these attributes into a xml file - virtual bool write(io::IXMLWriter* writer, bool writeXMLHeader=false, const wchar_t* nonDefaultElementName=0) _IRR_OVERRIDE_; + 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 - 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 - 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 //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \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 //! \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 - 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 - 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 - 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 //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \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 //! \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 - 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 - 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. //! \param attributeName: Name for 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. //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \return Returns value of the attribute previously set by setAttribute() //! 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. //! \param attributeName: Name of the attribute to get. //! \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. //! \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. //! \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 //! 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. //! \param attributeName: Name for 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. //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \return Returns value of the attribute previously set by setAttribute() //! 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. //! \param attributeName: Name of the attribute to get. //! \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. //! \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. //! \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 - 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 - 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 //! \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 //! \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 - 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 - virtual void addArray(const c8* attributeName, const core::array& value) _IRR_OVERRIDE_; + virtual void addArray(const c8* attributeName, const core::array& value) IRR_OVERRIDE; //! Sets an attribute value as a wide string array. //! \param attributeName: Name for 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& value) _IRR_OVERRIDE_; + virtual void setAttribute(const c8* attributeName, const core::array& value) IRR_OVERRIDE; //! Gets an attribute as an array of wide strings. //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \return Returns value of the attribute previously set by setAttribute() //! or defaultNotFound if attribute is not set. - virtual core::array getAttributeAsArray(const c8* attributeName, const core::array& defaultNotFound = core::array()) const _IRR_OVERRIDE_; + virtual core::array getAttributeAsArray(const c8* attributeName, const core::array& defaultNotFound = core::array()) const IRR_OVERRIDE; //! Returns attribute value as an array of wide strings by index. //! \param index: Index value, must be between 0 and getAttributeCount()-1. - virtual core::array getAttributeAsArray(s32 index) const _IRR_OVERRIDE_; + virtual core::array getAttributeAsArray(s32 index) const IRR_OVERRIDE; //! Sets an attribute as an array of wide strings - virtual void setAttribute(s32 index, const core::array& value) _IRR_OVERRIDE_; + virtual void setAttribute(s32 index, const core::array& value) IRR_OVERRIDE; /* @@ -245,23 +245,23 @@ public: */ //! 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 - 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 //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \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 //! \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 - 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 - 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 - 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 - 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 //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \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 //! \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 //! no information about its index. //! \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 //! \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 //! \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 //! \param attributeName: Name of the attribute to get. - virtual void getAttributeEnumerationLiteralsOfEnumeration(const c8* attributeName, core::array& outLiterals) const _IRR_OVERRIDE_; + virtual void getAttributeEnumerationLiteralsOfEnumeration(const c8* attributeName, core::array& outLiterals) const IRR_OVERRIDE; //! Gets the list of enumeration literals of an enumeration attribute //! \param index: Index value, must be between 0 and getAttributeCount()-1. - virtual void getAttributeEnumerationLiteralsOfEnumeration(s32 index, core::array& outLiterals) const _IRR_OVERRIDE_; + virtual void getAttributeEnumerationLiteralsOfEnumeration(s32 index, core::array& outLiterals) const IRR_OVERRIDE; //! 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 - 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 - 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 //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \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 //! \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 - 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 - 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 - 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 //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \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 //! \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 - 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 - 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 - 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 //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \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 //! \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 - 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 - 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 - 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 //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \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 //! \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 - 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 - 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 - 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 //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \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 //! \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 - 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 - virtual void addRect(const c8* attributeName, const core::rect& value) _IRR_OVERRIDE_; + virtual void addRect(const c8* attributeName, const core::rect& value) IRR_OVERRIDE; //! Sets an attribute as rectangle - virtual void setAttribute(const c8* attributeName, const core::rect& v) _IRR_OVERRIDE_; + virtual void setAttribute(const c8* attributeName, const core::rect& v) IRR_OVERRIDE; //! Gets an attribute as rectangle //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \return Returns value of the attribute previously set by setAttribute() - virtual core::rect getAttributeAsRect(const c8* attributeName, const core::rect& defaultNotFound = core::rect()) const _IRR_OVERRIDE_; + virtual core::rect getAttributeAsRect(const c8* attributeName, const core::rect& defaultNotFound = core::rect()) const IRR_OVERRIDE; //! Gets an attribute as rectangle //! \param index: Index value, must be between 0 and getAttributeCount()-1. - virtual core::rect getAttributeAsRect(s32 index) const _IRR_OVERRIDE_; + virtual core::rect getAttributeAsRect(s32 index) const IRR_OVERRIDE; //! Sets an attribute as rectangle - virtual void setAttribute(s32 index, const core::rect& v) _IRR_OVERRIDE_; + virtual void setAttribute(s32 index, const core::rect& v) IRR_OVERRIDE; /* @@ -473,23 +473,23 @@ public: */ //! Adds an attribute as dimension2d - virtual void addDimension2d(const c8* attributeName, const core::dimension2d& value) _IRR_OVERRIDE_; + virtual void addDimension2d(const c8* attributeName, const core::dimension2d& value) IRR_OVERRIDE; //! Sets an attribute as dimension2d - virtual void setAttribute(const c8* attributeName, const core::dimension2d& v) _IRR_OVERRIDE_; + virtual void setAttribute(const c8* attributeName, const core::dimension2d& v) IRR_OVERRIDE; //! Gets an attribute as dimension2d //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \return Returns value of the attribute previously set by setAttribute() - virtual core::dimension2d getAttributeAsDimension2d(const c8* attributeName, const core::dimension2d& defaultNotFound = core::dimension2d()) const _IRR_OVERRIDE_; + virtual core::dimension2d getAttributeAsDimension2d(const c8* attributeName, const core::dimension2d& defaultNotFound = core::dimension2d()) const IRR_OVERRIDE; //! Gets an attribute as dimension2d //! \param index: Index value, must be between 0 and getAttributeCount()-1. - virtual core::dimension2d getAttributeAsDimension2d(s32 index) const _IRR_OVERRIDE_; + virtual core::dimension2d getAttributeAsDimension2d(s32 index) const IRR_OVERRIDE; //! Sets an attribute as dimension2d - virtual void setAttribute(s32 index, const core::dimension2d& v) _IRR_OVERRIDE_; + virtual void setAttribute(s32 index, const core::dimension2d& v) IRR_OVERRIDE; /* @@ -499,23 +499,23 @@ public: */ //! 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 - 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 //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \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 //! \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 - virtual void setAttribute(s32 index, const core::matrix4& v) _IRR_OVERRIDE_; + virtual void setAttribute(s32 index, const core::matrix4& v) IRR_OVERRIDE; /* quaternion attribute @@ -523,23 +523,23 @@ public: */ //! 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 - 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 //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \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 //! \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 - 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 - 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 - 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 //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \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 //! \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 - 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 - 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 - 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 //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \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 //! \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 - 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 - 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 - 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 //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \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 //! \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 - 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 - 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 - 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 //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \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 //! \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 - 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 - 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 - 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 //! \param attributeName: Name of the attribute to get. //! \param defaultNotFound Value returned when attributeName was not found //! \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 //! \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 - 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 - 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 - 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 //! \param attributeName: Name of the attribute to get. //! \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 //! \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 - 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 - 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 - 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 //! \param attributeName: Name of the attribute to get. //! \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 //! \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 - virtual void setAttribute(s32 index, void* userPointer) _IRR_OVERRIDE_; + virtual void setAttribute(s32 index, void* userPointer) IRR_OVERRIDE; protected: @@ -735,4 +735,3 @@ protected: } // end namespace irr #endif - diff --git a/source/Irrlicht/CB3DMeshFileLoader.h b/source/Irrlicht/CB3DMeshFileLoader.h index ea78e532..afced1c6 100644 --- a/source/Irrlicht/CB3DMeshFileLoader.h +++ b/source/Irrlicht/CB3DMeshFileLoader.h @@ -8,8 +8,8 @@ #include "IrrCompileConfig.h" -#ifndef __C_B3D_MESH_LOADER_H_INCLUDED__ -#define __C_B3D_MESH_LOADER_H_INCLUDED__ +#ifndef IRR_C_B3D_MESH_LOADER_H_INCLUDED +#define IRR_C_B3D_MESH_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "ISceneManager.h" @@ -33,13 +33,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! See IReferenceCounted::drop() for more information. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: @@ -87,5 +87,4 @@ private: } // end namespace scene } // end namespace irr -#endif // __C_B3D_MESH_LOADER_H_INCLUDED__ - +#endif // IRR_C_B3D_MESH_LOADER_H_INCLUDED diff --git a/source/Irrlicht/CB3DMeshWriter.h b/source/Irrlicht/CB3DMeshWriter.h index 21dfeeba..12c7324f 100644 --- a/source/Irrlicht/CB3DMeshWriter.h +++ b/source/Irrlicht/CB3DMeshWriter.h @@ -4,8 +4,8 @@ // Modified version with rigging/skinning support -#ifndef __IRR_B3D_MESH_WRITER_H_INCLUDED__ -#define __IRR_B3D_MESH_WRITER_H_INCLUDED__ +#ifndef IRR_B3D_MESH_WRITER_H_INCLUDED +#define IRR_B3D_MESH_WRITER_H_INCLUDED #include "IMeshWriter.h" #include "IWriteFile.h" @@ -27,10 +27,10 @@ public: CB3DMeshWriter(); //! 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 - 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: void writeJointChunk(io::IWriteFile* file, ISkinnedMesh* mesh , ISkinnedMesh::SJoint* joint, f32 animationSpeedMultiplier); diff --git a/source/Irrlicht/CBSPMeshFileLoader.h b/source/Irrlicht/CBSPMeshFileLoader.h index e636f989..f9adab72 100644 --- a/source/Irrlicht/CBSPMeshFileLoader.h +++ b/source/Irrlicht/CBSPMeshFileLoader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_BSP_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_BSP_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_BSP_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_BSP_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IFileSystem.h" @@ -29,13 +29,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! See IReferenceCounted::drop() for more information. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: @@ -49,4 +49,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CBillboardSceneNode.h b/source/Irrlicht/CBillboardSceneNode.h index 73ae6d07..2bb6cbec 100644 --- a/source/Irrlicht/CBillboardSceneNode.h +++ b/source/Irrlicht/CBillboardSceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_BILLBOARD_SCENE_NODE_H_INCLUDED__ -#define __C_BILLBOARD_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_BILLBOARD_SCENE_NODE_H_INCLUDED +#define IRR_C_BILLBOARD_SCENE_NODE_H_INCLUDED #include "IBillboardSceneNode.h" #include "SMeshBuffer.h" @@ -28,61 +28,61 @@ public: virtual ~CBillboardSceneNode(); //! pre render event - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; //! render - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! sets the size of the billboard - virtual void setSize(const core::dimension2d& size) _IRR_OVERRIDE_; + virtual void setSize(const core::dimension2d& size) IRR_OVERRIDE; //! 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 - virtual const core::dimension2d& getSize() const _IRR_OVERRIDE_; + virtual const core::dimension2d& getSize() const IRR_OVERRIDE; //! 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. - virtual u32 getMaterialCount() const _IRR_OVERRIDE_; + virtual u32 getMaterialCount() const IRR_OVERRIDE; //! Set the color of all vertices of the billboard //! \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 //! \param topColor: the color to set the top vertices //! \param bottomColor: the color to set the bottom vertices virtual void setColor(const video::SColor& topColor, - const video::SColor& bottomColor) _IRR_OVERRIDE_; + const video::SColor& bottomColor) IRR_OVERRIDE; //! Gets the color of the top and bottom vertices of the billboard //! \param[out] topColor: stores the color of the top vertices //! \param[out] bottomColor: stores the color of the bottom vertices virtual void getColor(video::SColor& topColor, - video::SColor& bottomColor) const _IRR_OVERRIDE_; + video::SColor& bottomColor) const IRR_OVERRIDE; //! Get the real boundingbox used by the billboard (which depends on the active camera) - virtual const core::aabbox3d& getTransformedBillboardBoundingBox(const irr::scene::ICameraSceneNode* camera) _IRR_OVERRIDE_; + virtual const core::aabbox3d& getTransformedBillboardBoundingBox(const irr::scene::ICameraSceneNode* camera) IRR_OVERRIDE; //! 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. - 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 - 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. - virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) _IRR_OVERRIDE_; + virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) IRR_OVERRIDE; protected: void updateMesh(const irr::scene::ICameraSceneNode* camera); @@ -109,4 +109,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CBoneSceneNode.h b/source/Irrlicht/CBoneSceneNode.h index 711849ba..adf47ba2 100644 --- a/source/Irrlicht/CBoneSceneNode.h +++ b/source/Irrlicht/CBoneSceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_BONE_SCENE_NODE_H_INCLUDED__ -#define __C_BONE_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_BONE_SCENE_NODE_H_INCLUDED +#define IRR_C_BONE_SCENE_NODE_H_INCLUDED // Used with SkinnedMesh and IAnimatedMeshSceneNode, for boned meshes @@ -23,39 +23,39 @@ namespace scene s32 id=-1, u32 boneIndex=0, const c8* boneName=0); //! 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. - 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 - 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 - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; /* //! 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. - 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. - 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 - virtual void setSkinningSpace(E_BONE_SKINNING_SPACE space) _IRR_OVERRIDE_ + virtual void setSkinningSpace(E_BONE_SKINNING_SPACE space) IRR_OVERRIDE { SkinningSpace=space; } - virtual E_BONE_SKINNING_SPACE getSkinningSpace() const _IRR_OVERRIDE_ + virtual E_BONE_SKINNING_SPACE getSkinningSpace() const IRR_OVERRIDE { return SkinningSpace; } @@ -76,4 +76,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CBurningShader_Raster_Reference.cpp b/source/Irrlicht/CBurningShader_Raster_Reference.cpp index 45858a07..0a6ca950 100644 --- a/source/Irrlicht/CBurningShader_Raster_Reference.cpp +++ b/source/Irrlicht/CBurningShader_Raster_Reference.cpp @@ -512,9 +512,9 @@ public: CBurningShader_Raster_Reference(CBurningVideoDriver* driver); //! 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: diff --git a/source/Irrlicht/CCSMLoader.h b/source/Irrlicht/CCSMLoader.h index ed5fbda2..50ee9748 100644 --- a/source/Irrlicht/CCSMLoader.h +++ b/source/Irrlicht/CCSMLoader.h @@ -59,10 +59,10 @@ namespace scene //! returns true if the file maybe is able to be loaded by this class //! 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. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CCameraSceneNode.h b/source/Irrlicht/CCameraSceneNode.h index 4916a472..2f6d4e49 100644 --- a/source/Irrlicht/CCameraSceneNode.h +++ b/source/Irrlicht/CCameraSceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_CAMERA_SCENE_NODE_H_INCLUDED__ -#define __C_CAMERA_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_CAMERA_SCENE_NODE_H_INCLUDED +#define IRR_C_CAMERA_SCENE_NODE_H_INCLUDED #include "ICameraSceneNode.h" #include "SViewFrustum.h" @@ -30,123 +30,123 @@ namespace scene \param projection The new projection matrix of the camera. \param isOrthogonal Set this to true if the matrix is an orthogonal one (e.g. 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 //! \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 //! \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. /** \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. - 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 //! may ignore this input, but camera scene nodes which are created for //! example with scene::ISceneManager::addMayaCameraSceneNode or //! scene::ISceneManager::addMeshViewerCameraSceneNode, may want to get this input //! 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 /** 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. \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. /** This only modifies the relative rotation of the node. 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. \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 /** \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. //! \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. //! \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. //! \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. //! \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. //! \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. //! \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) - 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) - virtual void setFarValue(f32 zf) _IRR_OVERRIDE_; + virtual void setFarValue(f32 zf) IRR_OVERRIDE; //! 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) - virtual void setFOV(f32 fovy) _IRR_OVERRIDE_; + virtual void setFOV(f32 fovy) IRR_OVERRIDE; //! PreRender event - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; //! Render - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! Update - virtual void updateMatrices() _IRR_OVERRIDE_; + virtual void updateMatrices() IRR_OVERRIDE; //! Returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! 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. //! If this is set to true, the camera will respond to key inputs //! 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. - virtual bool isInputReceiverEnabled() const _IRR_OVERRIDE_; + virtual bool isInputReceiverEnabled() const IRR_OVERRIDE; //! 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. - 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 - 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. - 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. - virtual bool getTargetAndRotationBinding(void) const _IRR_OVERRIDE_; + virtual bool getTargetAndRotationBinding(void) const IRR_OVERRIDE; //! 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: @@ -176,4 +176,3 @@ namespace scene } // end namespace #endif - diff --git a/source/Irrlicht/CColladaFileLoader.cpp b/source/Irrlicht/CColladaFileLoader.cpp index 7645254d..4d74f48d 100644 --- a/source/Irrlicht/CColladaFileLoader.cpp +++ b/source/Irrlicht/CColladaFileLoader.cpp @@ -143,14 +143,14 @@ namespace //! creates an instance of this prefab virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent, - scene::ISceneManager* mgr) _IRR_OVERRIDE_ + scene::ISceneManager* mgr) IRR_OVERRIDE { // empty implementation return 0; } //! returns id of this prefab - virtual const core::stringc& getId() _IRR_OVERRIDE_ + virtual const core::stringc& getId() IRR_OVERRIDE { return Id; } @@ -177,7 +177,7 @@ namespace //! creates an instance of this prefab virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent, - scene::ISceneManager* mgr) _IRR_OVERRIDE_ + scene::ISceneManager* mgr) IRR_OVERRIDE { #ifdef COLLADA_READER_DEBUG os::Printer::log("COLLADA: Constructing light instance", Id.c_str(), ELL_DEBUG); @@ -213,7 +213,7 @@ namespace //! creates an instance of this prefab virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent, - scene::ISceneManager* mgr) _IRR_OVERRIDE_ + scene::ISceneManager* mgr) IRR_OVERRIDE { #ifdef COLLADA_READER_DEBUG os::Printer::log("COLLADA: Constructing mesh instance", Id.c_str(), ELL_DEBUG); @@ -251,7 +251,7 @@ namespace //! creates an instance of this prefab virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent, - scene::ISceneManager* mgr) _IRR_OVERRIDE_ + scene::ISceneManager* mgr) IRR_OVERRIDE { #ifdef COLLADA_READER_DEBUG os::Printer::log("COLLADA: Constructing camera instance", Id.c_str(), ELL_DEBUG); @@ -285,7 +285,7 @@ namespace //! creates an instance of this prefab virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent, - scene::ISceneManager* mgr) _IRR_OVERRIDE_ + scene::ISceneManager* mgr) IRR_OVERRIDE { #ifdef COLLADA_READER_DEBUG os::Printer::log("COLLADA: Constructing scene instance", Id.c_str(), ELL_DEBUG); diff --git a/source/Irrlicht/CColladaFileLoader.h b/source/Irrlicht/CColladaFileLoader.h index f5e707c5..b8b661ce 100644 --- a/source/Irrlicht/CColladaFileLoader.h +++ b/source/Irrlicht/CColladaFileLoader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_COLLADA_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_COLLADA_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_COLLADA_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_COLLADA_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IFileSystem.h" @@ -188,13 +188,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! See IReferenceCounted::drop() for more information. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: @@ -407,4 +407,3 @@ public: } // end namespace irr #endif - diff --git a/source/Irrlicht/CColladaMeshWriter.cpp b/source/Irrlicht/CColladaMeshWriter.cpp index 52653a04..c9805d5a 100644 --- a/source/Irrlicht/CColladaMeshWriter.cpp +++ b/source/Irrlicht/CColladaMeshWriter.cpp @@ -1267,13 +1267,13 @@ irr::core::stringc CColladaMeshWriter::pathToURI(const irr::io::path& path) cons // is this a relative path? if ( path.size() > 1 - && path[0] != _IRR_TEXT('/') - && path[0] != _IRR_TEXT('\\') - && path[1] != _IRR_TEXT(':') ) + && path[0] != IRR_TEXT('/') + && path[0] != IRR_TEXT('\\') + && path[1] != IRR_TEXT(':') ) { // not already starting with "./" ? - if ( path[0] != _IRR_TEXT('.') - || path[1] != _IRR_TEXT('/') ) + if ( path[0] != IRR_TEXT('.') + || path[1] != IRR_TEXT('/') ) { result.append("./"); } diff --git a/source/Irrlicht/CColladaMeshWriter.h b/source/Irrlicht/CColladaMeshWriter.h index 6c07d49c..0fa5630c 100644 --- a/source/Irrlicht/CColladaMeshWriter.h +++ b/source/Irrlicht/CColladaMeshWriter.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __IRR_C_COLLADA_MESH_WRITER_H_INCLUDED__ -#define __IRR_C_COLLADA_MESH_WRITER_H_INCLUDED__ +#ifndef IRR_C_COLLADA_MESH_WRITER_H_INCLUDED +#define IRR_C_COLLADA_MESH_WRITER_H_INCLUDED #include "IColladaMeshWriter.h" #include "S3DVertex.h" @@ -26,46 +26,46 @@ namespace scene { public: //! 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. - 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 - 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. - 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 - 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. - 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 - 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 - 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. - 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. - 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 - 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 { public: CColladaMeshWriterNames(IColladaMeshWriter * writer); - 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 nameForMaterial(const video::SMaterial & material, int materialId, const scene::IMesh* mesh, const scene::ISceneNode* node) _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 nameForMaterial(const video::SMaterial & material, int materialId, const scene::IMesh* mesh, const scene::ISceneNode* node) IRR_OVERRIDE; protected: irr::core::stringc nameForPtr(const void* ptr) const; private: @@ -85,19 +85,19 @@ public: virtual ~CColladaMeshWriter(); //! 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 - 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 - 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. - 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. - virtual const irr::core::stringc* findGeometryNameForNode(ISceneNode* node) _IRR_OVERRIDE_; + virtual const irr::core::stringc* findGeometryNameForNode(ISceneNode* node) IRR_OVERRIDE; protected: diff --git a/source/Irrlicht/CColorConverter.h b/source/Irrlicht/CColorConverter.h index 7a8f4a38..55662d3b 100644 --- a/source/Irrlicht/CColorConverter.h +++ b/source/Irrlicht/CColorConverter.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_COLOR_CONVERTER_H_INCLUDED__ -#define __C_COLOR_CONVERTER_H_INCLUDED__ +#ifndef IRR_C_COLOR_CONVERTER_H_INCLUDED +#define IRR_C_COLOR_CONVERTER_H_INCLUDED #include "irrTypes.h" #include "IImage.h" @@ -98,4 +98,3 @@ public: } // end namespace irr #endif - diff --git a/source/Irrlicht/CCubeSceneNode.h b/source/Irrlicht/CCubeSceneNode.h index f8ad068f..d1719e23 100644 --- a/source/Irrlicht/CCubeSceneNode.h +++ b/source/Irrlicht/CCubeSceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_CUBE_SCENE_NODE_H_INCLUDED__ -#define __C_CUBE_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_CUBE_SCENE_NODE_H_INCLUDED +#define IRR_C_CUBE_SCENE_NODE_H_INCLUDED #include "IMeshSceneNode.h" #include "SMesh.h" @@ -24,59 +24,59 @@ namespace scene virtual ~CCubeSceneNode(); - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; //! renders the node. - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! returns the material based on the zero based index i. To get the amount //! of materials used by this scene node, use getMaterialCount(). //! 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 //! 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. - virtual u32 getMaterialCount() const _IRR_OVERRIDE_; + virtual u32 getMaterialCount() const IRR_OVERRIDE; //! 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 //! and returns a pointer to it. 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. - 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. - 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. - 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 - virtual void setMesh(IMesh* mesh) _IRR_OVERRIDE_ {} + virtual void setMesh(IMesh* mesh) IRR_OVERRIDE {} //! 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. /* In this way it is possible to change the materials a mesh causing all mesh scene nodes 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 - virtual bool isReadOnlyMaterials() const _IRR_OVERRIDE_ { return false; } + virtual bool isReadOnlyMaterials() const IRR_OVERRIDE { return false; } //! Removes a child from this scene node. //! Implemented here, to be able to remove the shadow properly, if there is one, //! or to remove attached child. - virtual bool removeChild(ISceneNode* child) _IRR_OVERRIDE_; + virtual bool removeChild(ISceneNode* child) IRR_OVERRIDE; private: void setSize(); @@ -90,4 +90,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CD3D9Driver.cpp b/source/Irrlicht/CD3D9Driver.cpp index e48ef286..d606bc2d 100644 --- a/source/Irrlicht/CD3D9Driver.cpp +++ b/source/Irrlicht/CD3D9Driver.cpp @@ -2,7 +2,7 @@ // This file is part of the "Irrlicht Engine". // 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" #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_ diff --git a/source/Irrlicht/CD3D9Driver.h b/source/Irrlicht/CD3D9Driver.h index 73761d78..67dc2d89 100644 --- a/source/Irrlicht/CD3D9Driver.h +++ b/source/Irrlicht/CD3D9Driver.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_VIDEO_DIRECTX_9_H_INCLUDED__ -#define __C_VIDEO_DIRECTX_9_H_INCLUDED__ +#ifndef IRR_C_VIDEO_DIRECTX_9_H_INCLUDED +#define IRR_C_VIDEO_DIRECTX_9_H_INCLUDED #include "IrrCompileConfig.h" @@ -45,24 +45,24 @@ namespace video virtual ~CD3D9Driver(); 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* sourceRect = 0) _IRR_OVERRIDE_; + const SExposedVideoData& videoData = SExposedVideoData(), core::rect* 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 - virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const _IRR_OVERRIDE_; + virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const IRR_OVERRIDE; //! sets transformation - virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) _IRR_OVERRIDE_; + virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) IRR_OVERRIDE; //! 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), - f32 clearDepth = 1.f, u8 clearStencil = 0) _IRR_OVERRIDE_; + f32 clearDepth = 1.f, u8 clearStencil = 0) IRR_OVERRIDE; //! sets a viewport - virtual void setViewPort(const core::rect& area) _IRR_OVERRIDE_; + virtual void setViewPort(const core::rect& area) IRR_OVERRIDE; struct SHWBufferLink_d3d9 : public SHWBufferLink { @@ -82,65 +82,65 @@ namespace video bool updateIndexHardwareBuffer(SHWBufferLink_d3d9 *HWBuffer); //! updates hardware buffer if needed - virtual bool updateHardwareBuffer(SHWBufferLink *HWBuffer) _IRR_OVERRIDE_; + virtual bool updateHardwareBuffer(SHWBufferLink *HWBuffer) IRR_OVERRIDE; //! 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) - virtual void deleteHardwareBuffer(SHWBufferLink *HWBuffer) _IRR_OVERRIDE_; + virtual void deleteHardwareBuffer(SHWBufferLink *HWBuffer) IRR_OVERRIDE; //! Draw hardware buffer - virtual void drawHardwareBuffer(SHWBufferLink *HWBuffer) _IRR_OVERRIDE_; + virtual void drawHardwareBuffer(SHWBufferLink *HWBuffer) IRR_OVERRIDE; //! Create occlusion query. /** Use node for identification and mesh for occlusion test. */ virtual void addOcclusionQuery(scene::ISceneNode* node, - const scene::IMesh* mesh=0) _IRR_OVERRIDE_; + const scene::IMesh* mesh=0) IRR_OVERRIDE; //! Remove occlusion query. - virtual void removeOcclusionQuery(scene::ISceneNode* node) _IRR_OVERRIDE_; + virtual void removeOcclusionQuery(scene::ISceneNode* node) IRR_OVERRIDE; //! Run occlusion query. Draws mesh stored in query. /** If the mesh shall not be rendered visible, use overrideMaterial to disable the color and depth buffer. */ - virtual void runOcclusionQuery(scene::ISceneNode* node, bool visible=false) _IRR_OVERRIDE_; + virtual void runOcclusionQuery(scene::ISceneNode* node, bool visible=false) IRR_OVERRIDE; //! Update occlusion query. Retrieves results from GPU. /** If the query shall not block, set the flag to false. Update might not occur in this case, though */ - virtual void updateOcclusionQuery(scene::ISceneNode* node, bool block=true) _IRR_OVERRIDE_; + virtual void updateOcclusionQuery(scene::ISceneNode* node, bool block=true) IRR_OVERRIDE; //! Return query result. /** Return value is the number of visible pixels/fragments. The value is a safe approximation, i.e. can be larger then the actual value of pixels. */ - virtual u32 getOcclusionQueryResult(scene::ISceneNode* node) const _IRR_OVERRIDE_; + virtual u32 getOcclusionQueryResult(scene::ISceneNode* node) const IRR_OVERRIDE; //! Create render target. - virtual IRenderTarget* addRenderTarget() _IRR_OVERRIDE_; + virtual IRenderTarget* addRenderTarget() IRR_OVERRIDE; //! draws a vertex primitive list virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const void* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, - E_INDEX_TYPE iType) _IRR_OVERRIDE_; + E_INDEX_TYPE iType) IRR_OVERRIDE; //! draws a vertex primitive list in 2d virtual void draw2DVertexPrimitiveList(const void* vertices, u32 vertexCount, const void* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, - E_INDEX_TYPE iType) _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. virtual void draw2DImage(const video::ITexture* texture, const core::position2d& destPos, const core::rect& sourceRect, const core::rect* clipRect = 0, - SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_; + SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false) IRR_OVERRIDE; //! Draws a part of the texture into the rectangle. virtual void draw2DImage(const video::ITexture* texture, const core::rect& destRect, const core::rect& sourceRect, const core::rect* 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. virtual void draw2DImageBatch(const video::ITexture* texture, @@ -148,163 +148,163 @@ namespace video const core::array >& sourceRects, const core::rect* clipRect=0, SColor color=SColor(255,255,255,255), - bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_; + bool useAlphaChannelOfTexture=false) IRR_OVERRIDE; //!Draws an 2d rectangle with a gradient. virtual void draw2DRectangle(const core::rect& pos, SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown, - const core::rect* clip) _IRR_OVERRIDE_; + const core::rect* clip) IRR_OVERRIDE; //! Draws a 2d line. virtual void draw2DLine(const core::position2d& start, const core::position2d& end, - SColor color=SColor(255,255,255,255)) _IRR_OVERRIDE_; + SColor color=SColor(255,255,255,255)) IRR_OVERRIDE; //! Draws a pixel. - virtual void drawPixel(u32 x, u32 y, const SColor & color) _IRR_OVERRIDE_; + virtual void drawPixel(u32 x, u32 y, const SColor & color) IRR_OVERRIDE; //! Draws a 3d line. virtual void draw3DLine(const core::vector3df& start, - const core::vector3df& end, SColor color = SColor(255,255,255,255)) _IRR_OVERRIDE_; + const core::vector3df& end, SColor color = SColor(255,255,255,255)) IRR_OVERRIDE; //! Draws a 3d box. - virtual void draw3DBox( const core::aabbox3d& box, SColor color = SColor(255,255,255,255 ) ) _IRR_OVERRIDE_; + virtual void draw3DBox( const core::aabbox3d& box, SColor color = SColor(255,255,255,255 ) ) IRR_OVERRIDE; //! initialises the Direct3D API bool initDriver(HWND hwnd, bool pureSoftware); //! \return Returns the name of the video driver. Example: In case of the DIRECT3D8 //! driver, it would return "Direct3D8.1". - virtual const wchar_t* getName() const _IRR_OVERRIDE_; + virtual const wchar_t* getName() const IRR_OVERRIDE; //! deletes all dynamic lights there are - virtual void deleteAllDynamicLights() _IRR_OVERRIDE_; + virtual void deleteAllDynamicLights() IRR_OVERRIDE; //! adds a dynamic light, returning an index to the light //! \param light: the light data to use to create the light //! \return An index to the light, or -1 if an error occurs - virtual s32 addDynamicLight(const SLight& light) _IRR_OVERRIDE_; + virtual s32 addDynamicLight(const SLight& light) IRR_OVERRIDE; //! Turns a dynamic light on or off //! \param lightIndex: the index returned by addDynamicLight //! \param turnOn: true to turn the light on, false to turn it off - virtual void turnLightOn(s32 lightIndex, bool turnOn) _IRR_OVERRIDE_; + virtual void turnLightOn(s32 lightIndex, bool turnOn) IRR_OVERRIDE; //! returns the maximal amount of dynamic lights the device can handle - virtual u32 getMaximalDynamicLightAmount() const _IRR_OVERRIDE_; + virtual u32 getMaximalDynamicLightAmount() const IRR_OVERRIDE; //! Sets the dynamic ambient light color. The default color is //! (0,0,0,0) which means it is dark. //! \param color: New color of the ambient light. - virtual void setAmbientLight(const SColorf& color) _IRR_OVERRIDE_; + virtual void setAmbientLight(const SColorf& color) IRR_OVERRIDE; //! Draws a shadow volume into the stencil buffer. - virtual void drawStencilShadowVolume(const core::array& triangles, bool zfail=true, u32 debugDataVisible=0) _IRR_OVERRIDE_; + virtual void drawStencilShadowVolume(const core::array& triangles, bool zfail=true, u32 debugDataVisible=0) IRR_OVERRIDE; //! Fills the stencil shadow with color. virtual void drawStencilShadow(bool clearStencilBuffer=false, video::SColor leftUpEdge = video::SColor(0,0,0,0), video::SColor rightUpEdge = video::SColor(0,0,0,0), video::SColor leftDownEdge = video::SColor(0,0,0,0), - video::SColor rightDownEdge = video::SColor(0,0,0,0)) _IRR_OVERRIDE_; + video::SColor rightDownEdge = video::SColor(0,0,0,0)) IRR_OVERRIDE; //! Returns the maximum amount of primitives (mostly vertices) which //! the device is able to render with one drawIndexedTriangleList //! call. - virtual u32 getMaximalPrimitiveCount() const _IRR_OVERRIDE_; + virtual u32 getMaximalPrimitiveCount() const IRR_OVERRIDE; //! Sets the fog mode. 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 //! the window was resized. - virtual void OnResize(const core::dimension2d& size) _IRR_OVERRIDE_; + virtual void OnResize(const core::dimension2d& size) IRR_OVERRIDE; //! Can be called by an IMaterialRenderer to make its work easier. virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates) _IRR_OVERRIDE_; + bool resetAllRenderstates) IRR_OVERRIDE; //! Returns type of video driver - virtual E_DRIVER_TYPE getDriverType() const _IRR_OVERRIDE_; + virtual E_DRIVER_TYPE getDriverType() const IRR_OVERRIDE; //! Returns the transformation set by setTransform - virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const _IRR_OVERRIDE_; + virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const IRR_OVERRIDE; //! 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. - virtual s32 getPixelShaderConstantID(const c8* name) _IRR_OVERRIDE_; + virtual s32 getPixelShaderConstantID(const c8* name) IRR_OVERRIDE; //! 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. - 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. - 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. - 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. - 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. - 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. - 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. - 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 //! IMaterialRendererServices) - virtual IVideoDriver* getVideoDriver() _IRR_OVERRIDE_; + virtual IVideoDriver* getVideoDriver() IRR_OVERRIDE; //! Creates a render target texture. virtual ITexture* addRenderTargetTexture(const core::dimension2d& size, - const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) _IRR_OVERRIDE_; + const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) IRR_OVERRIDE; //! Creates a render target texture for a cubemap ITexture* addRenderTargetTextureCubemap(const irr::u32 sideLen, - const io::path& name, const ECOLOR_FORMAT format) _IRR_OVERRIDE_; + const io::path& name, const ECOLOR_FORMAT format) IRR_OVERRIDE; - virtual void clearBuffers(u16 flag, SColor color = SColor(255,0,0,0), f32 depth = 1.f, u8 stencil = 0) _IRR_OVERRIDE_; + virtual void clearBuffers(u16 flag, SColor color = SColor(255,0,0,0), f32 depth = 1.f, u8 stencil = 0) IRR_OVERRIDE; //! Returns an image created from the last rendered frame. - virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER) _IRR_OVERRIDE_; + virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER) IRR_OVERRIDE; //! 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. - virtual void enableClipPlane(u32 index, bool enable) _IRR_OVERRIDE_; + virtual void enableClipPlane(u32 index, bool enable) IRR_OVERRIDE; //! Returns the graphics card vendor name. - virtual core::stringc getVendorInfo() _IRR_OVERRIDE_ {return VendorName;} + virtual core::stringc getVendorInfo() IRR_OVERRIDE {return VendorName;} //! 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. - virtual bool checkDriverReset() _IRR_OVERRIDE_ {return DriverWasReset;} + virtual bool checkDriverReset() IRR_OVERRIDE {return DriverWasReset;} //! Get the current 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. - 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 - 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 - 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 /** \return Color format of the color buffer as D3D color value. */ @@ -362,15 +362,15 @@ namespace video //! Try to get back a lost device 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& image) _IRR_OVERRIDE_; + virtual ITexture* createDeviceDependentTextureCubemap(const io::path& name, const core::array& image) IRR_OVERRIDE; //! Adds a new material renderer to the VideoDriver, using pixel and/or //! vertex shaders to render geometry. s32 addShaderMaterial(const c8* vertexShaderProgram, const c8* pixelShaderProgram, 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 //! language. @@ -389,7 +389,7 @@ namespace video u32 verticesOut = 0, IShaderConstantSetCallBack* callback = 0, E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID, - s32 userData = 0) _IRR_OVERRIDE_; + s32 userData = 0) IRR_OVERRIDE; void createMaterialRenderers(); @@ -504,7 +504,5 @@ namespace video } // end namespace video } // end namespace irr - #endif // _IRR_COMPILE_WITH_DIRECT3D_9_ -#endif // __C_VIDEO_DIRECTX_9_H_INCLUDED__ - +#endif // IRR_C_VIDEO_DIRECTX_9_H_INCLUDED diff --git a/source/Irrlicht/CD3D9HLSLMaterialRenderer.h b/source/Irrlicht/CD3D9HLSLMaterialRenderer.h index f02c8032..a9156b67 100644 --- a/source/Irrlicht/CD3D9HLSLMaterialRenderer.h +++ b/source/Irrlicht/CD3D9HLSLMaterialRenderer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_D3D9_HLSL_MATERIAL_RENDERER_H_INCLUDED__ -#define __C_D3D9_HLSL_MATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_D3D9_HLSL_MATERIAL_RENDERER_H_INCLUDED +#define IRR_C_D3D9_HLSL_MATERIAL_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_WINDOWS_ @@ -59,7 +59,7 @@ public: //! Uint interface for the above. 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: @@ -84,4 +84,3 @@ protected: #endif #endif #endif - diff --git a/source/Irrlicht/CD3D9MaterialRenderer.h b/source/Irrlicht/CD3D9MaterialRenderer.h index fca6bed4..d67e81c0 100644 --- a/source/Irrlicht/CD3D9MaterialRenderer.h +++ b/source/Irrlicht/CD3D9MaterialRenderer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_D3D9_MATERIAL_RENDERER_H_INCLUDED__ -#define __C_D3D9_MATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_D3D9_MATERIAL_RENDERER_H_INCLUDED +#define IRR_C_D3D9_MATERIAL_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_WINDOWS_ @@ -112,7 +112,7 @@ public: : CD3D9MaterialRenderer(p, d) {} 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); @@ -135,7 +135,7 @@ public: : CD3D9MaterialRenderer(p, d) {} 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); @@ -178,7 +178,7 @@ public: } } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { Driver->getBridgeCalls()->setBlend(false); } @@ -188,7 +188,7 @@ public: materials by opaque and transparent. The return value could be optimized, but we'd need to know the MaterialTypeParam for it. */ - virtual bool isTransparent() const _IRR_OVERRIDE_ + virtual bool isTransparent() const IRR_OVERRIDE { return true; } @@ -205,7 +205,7 @@ public: : CD3D9MaterialRenderer(p, d) {} 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); @@ -229,7 +229,7 @@ public: : CD3D9MaterialRenderer(p, d) {} 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); @@ -245,14 +245,14 @@ public: } } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { Driver->getBridgeCalls()->setBlend(false); } //! Returns if the material is transparent. The scene management needs to know this //! for being able to sort the materials by opaque and transparent. - virtual bool isTransparent() const _IRR_OVERRIDE_ + virtual bool isTransparent() const IRR_OVERRIDE { return true; } @@ -268,7 +268,7 @@ public: : CD3D9MaterialRenderer(p, d) {} 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); @@ -285,14 +285,14 @@ public: } } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { Driver->getBridgeCalls()->setBlend(false); } //! Returns if the material is transparent. The scene management needs to know this //! for being able to sort the materials by opaque and transparent. - virtual bool isTransparent() const _IRR_OVERRIDE_ + virtual bool isTransparent() const IRR_OVERRIDE { return true; } @@ -308,7 +308,7 @@ public: : CD3D9MaterialRenderer(p, d) {} 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); @@ -330,7 +330,7 @@ public: } } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { pID3DDevice->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE); Driver->getBridgeCalls()->setBlend(false); @@ -338,7 +338,7 @@ public: //! Returns if the material is transparent. The scene management needs to know this //! for being able to sort the materials by opaque and transparent. - virtual bool isTransparent() const _IRR_OVERRIDE_ + virtual bool isTransparent() const IRR_OVERRIDE { return true; } @@ -355,7 +355,7 @@ public: : CD3D9MaterialRenderer(p, d) {} 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); @@ -374,14 +374,14 @@ public: } } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { pID3DDevice->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE); } //! Returns if the material is transparent. The scene management needs to know this //! for being able to sort the materials by opaque and transparent. - virtual bool isTransparent() const _IRR_OVERRIDE_ + virtual bool isTransparent() const IRR_OVERRIDE { return false; // this material is not really transparent because it does no blending. } @@ -397,7 +397,7 @@ public: : CD3D9MaterialRenderer(p, d) {} 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); @@ -441,7 +441,7 @@ public: : CD3D9MaterialRenderer(p, d) {} 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); @@ -466,7 +466,7 @@ public: : CD3D9MaterialRenderer(p, d) {} 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); @@ -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_TEXCOORDINDEX, 0); @@ -501,7 +501,7 @@ public: : CD3D9MaterialRenderer(p, d) {} 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); @@ -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_TEXCOORDINDEX, 1); @@ -537,7 +537,7 @@ public: : CD3D9MaterialRenderer(p, d) {} 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); @@ -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_TEXCOORDINDEX, 1); @@ -569,7 +569,7 @@ public: //! Returns if the material is transparent. The scene management needs to know this //! for being able to sort the materials by opaque and transparent. - virtual bool isTransparent() const _IRR_OVERRIDE_ + virtual bool isTransparent() const IRR_OVERRIDE { return true; } @@ -581,4 +581,3 @@ public: #endif #endif #endif - diff --git a/source/Irrlicht/CD3D9NormalMapRenderer.h b/source/Irrlicht/CD3D9NormalMapRenderer.h index 56cbde92..ff0f333b 100644 --- a/source/Irrlicht/CD3D9NormalMapRenderer.h +++ b/source/Irrlicht/CD3D9NormalMapRenderer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_D3D9_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED__ -#define __C_D3D9_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_D3D9_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED +#define IRR_C_D3D9_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_WINDOWS_ @@ -36,12 +36,12 @@ public: //! Called by the engine when the vertex and/or pixel shader constants for an //! 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. - virtual s32 getRenderCapability() const _IRR_OVERRIDE_; + virtual s32 getRenderCapability() const IRR_OVERRIDE; private: @@ -53,4 +53,3 @@ private: #endif #endif #endif - diff --git a/source/Irrlicht/CD3D9ParallaxMapRenderer.h b/source/Irrlicht/CD3D9ParallaxMapRenderer.h index 187b6f9d..17dbdac3 100644 --- a/source/Irrlicht/CD3D9ParallaxMapRenderer.h +++ b/source/Irrlicht/CD3D9ParallaxMapRenderer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_D3D9_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED__ -#define __C_D3D9_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_D3D9_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED +#define IRR_C_D3D9_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_WINDOWS_ @@ -36,17 +36,17 @@ public: //! Called by the engine when the vertex and/or pixel shader constants for an //! 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. - 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, const video::SMaterial& lastMaterial, - bool resetAllRenderstates, video::IMaterialRendererServices* services) _IRR_OVERRIDE_; + bool resetAllRenderstates, video::IMaterialRendererServices* services) IRR_OVERRIDE; private: @@ -60,4 +60,3 @@ private: #endif #endif #endif - diff --git a/source/Irrlicht/CD3D9RenderTarget.h b/source/Irrlicht/CD3D9RenderTarget.h index 680f2b54..040db001 100644 --- a/source/Irrlicht/CD3D9RenderTarget.h +++ b/source/Irrlicht/CD3D9RenderTarget.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_OPEN_GL_RENDER_TARGET_H_INCLUDED__ -#define __C_OPEN_GL_RENDER_TARGET_H_INCLUDED__ +#ifndef IRR_C_OPEN_GL_RENDER_TARGET_H_INCLUDED +#define IRR_C_OPEN_GL_RENDER_TARGET_H_INCLUDED #include "IrrCompileConfig.h" @@ -29,7 +29,7 @@ namespace irr CD3D9RenderTarget(CD3D9Driver* driver); 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& getSize() const; diff --git a/source/Irrlicht/CD3D9ShaderMaterialRenderer.h b/source/Irrlicht/CD3D9ShaderMaterialRenderer.h index e7517906..88d61e43 100644 --- a/source/Irrlicht/CD3D9ShaderMaterialRenderer.h +++ b/source/Irrlicht/CD3D9ShaderMaterialRenderer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_D3D9_SHADER_MATERIAL_RENDERER_H_INCLUDED__ -#define __C_D3D9_SHADER_MATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_D3D9_SHADER_MATERIAL_RENDERER_H_INCLUDED +#define IRR_C_D3D9_SHADER_MATERIAL_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_WINDOWS_ @@ -39,17 +39,17 @@ public: ~CD3D9ShaderMaterialRenderer(); 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. - virtual bool isTransparent() const _IRR_OVERRIDE_; + virtual bool isTransparent() const IRR_OVERRIDE; //! 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; } @@ -105,4 +105,3 @@ protected: #endif #endif #endif - diff --git a/source/Irrlicht/CD3D9Texture.cpp b/source/Irrlicht/CD3D9Texture.cpp index a04b5f9e..7b31fcc7 100644 --- a/source/Irrlicht/CD3D9Texture.cpp +++ b/source/Irrlicht/CD3D9Texture.cpp @@ -23,7 +23,7 @@ CD3D9Texture::CD3D9Texture(const io::path& name, const core::array& ima setDebugName("CD3D9Texture"); #endif - _IRR_DEBUG_BREAK_IF(image.size() == 0) + IRR_DEBUG_BREAK_IF(image.size() == 0) Device=driver->getExposedVideoData().D3D9.D3DDev9; @@ -63,7 +63,7 @@ CD3D9Texture::CD3D9Texture(const io::path& name, const core::array& ima hr = Device->CreateCubeTexture(Size.Width, HasMipMaps ? 0 : 1, flags, InternalFormat, D3DPOOL_MANAGED, &CubeTexture, NULL); break; default: - _IRR_DEBUG_BREAK_IF(true) + IRR_DEBUG_BREAK_IF(true) break; } @@ -225,7 +225,7 @@ void* CD3D9Texture::lock(E_TEXTURE_LOCK_MODE mode, u32 mipmapLevel, u32 layer, E } 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); } @@ -591,7 +591,7 @@ void CD3D9Texture::generateRenderTarget() hr = Device->CreateCubeTexture(Size.Width, 1, flags, InternalFormat, D3DPOOL_DEFAULT, &CubeTexture, NULL); break; default: - _IRR_DEBUG_BREAK_IF(true) + IRR_DEBUG_BREAK_IF(true) break; } @@ -726,7 +726,7 @@ void CD3D9Texture::uploadTexture(void* data, u32 mipmapLevel, u32 layer) } 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); } diff --git a/source/Irrlicht/CD3D9Texture.h b/source/Irrlicht/CD3D9Texture.h index 40ddb235..3dd1bd10 100644 --- a/source/Irrlicht/CD3D9Texture.h +++ b/source/Irrlicht/CD3D9Texture.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_DIRECTX9_TEXTURE_H_INCLUDED__ -#define __C_DIRECTX9_TEXTURE_H_INCLUDED__ +#ifndef IRR_C_DIRECTX9_TEXTURE_H_INCLUDED +#define IRR_C_DIRECTX9_TEXTURE_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_ @@ -32,11 +32,11 @@ public: 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; IDirect3DTexture9* getDX9Texture() const; diff --git a/source/Irrlicht/CDMFLoader.h b/source/Irrlicht/CDMFLoader.h index c2d70911..bf82b392 100644 --- a/source/Irrlicht/CDMFLoader.h +++ b/source/Irrlicht/CDMFLoader.h @@ -27,8 +27,8 @@ credits to others for parts of this code. */ -#ifndef __C_DMF_LOADER_H_INCLUDED__ -#define __C_DMF_LOADER_H_INCLUDED__ +#ifndef IRR_C_DMF_LOADER_H_INCLUDED +#define IRR_C_DMF_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IReadFile.h" @@ -52,13 +52,13 @@ namespace scene //! returns true if the file maybe is able to be loaded by this class //! 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. \return Pointer to the created mesh. Returns 0 if loading failed. If you no longer need the mesh, you should call IAnimatedMesh::drop(). 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. 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 #endif - diff --git a/source/Irrlicht/CDefaultGUIElementFactory.h b/source/Irrlicht/CDefaultGUIElementFactory.h index bc5cbe85..cea60bca 100644 --- a/source/Irrlicht/CDefaultGUIElementFactory.h +++ b/source/Irrlicht/CDefaultGUIElementFactory.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED__ -#define __C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED__ +#ifndef IRR_C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED +#define IRR_C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -28,31 +28,31 @@ namespace gui /** \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. \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. /** \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. \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. - 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. /** \param idx: Index of the element type in this factory. The value must be equal or greater than 0 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. /** \param idx: Index of the element type in this factory. The value must be equal or greater than 0 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. /** \param type: Type of the GUI element. \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: @@ -67,4 +67,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED__ +#endif // IRR_C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED diff --git a/source/Irrlicht/CDefaultSceneNodeAnimatorFactory.h b/source/Irrlicht/CDefaultSceneNodeAnimatorFactory.h index e6cf292b..deb16bf8 100644 --- a/source/Irrlicht/CDefaultSceneNodeAnimatorFactory.h +++ b/source/Irrlicht/CDefaultSceneNodeAnimatorFactory.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_DEFAULT_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED__ -#define __C_DEFAULT_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED__ +#ifndef IRR_C_DEFAULT_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED +#define IRR_C_DEFAULT_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED #include "ISceneNodeAnimatorFactory.h" @@ -32,32 +32,32 @@ namespace scene \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 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 /** \param typeName: Type of the scene node animator to add. \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 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 - virtual u32 getCreatableSceneNodeAnimatorTypeCount() const _IRR_OVERRIDE_; + virtual u32 getCreatableSceneNodeAnimatorTypeCount() const IRR_OVERRIDE; //! 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 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 /** \param idx: Index of scene node animator type in this factory. Must be a value between 0 and 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 /** \param type: Type of scene node animator. \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: @@ -72,4 +72,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CDefaultSceneNodeFactory.h b/source/Irrlicht/CDefaultSceneNodeFactory.h index cc9c78c9..922c972f 100644 --- a/source/Irrlicht/CDefaultSceneNodeFactory.h +++ b/source/Irrlicht/CDefaultSceneNodeFactory.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_DEFAULT_SCENE_NODE_FACTORY_H_INCLUDED__ -#define __C_DEFAULT_SCENE_NODE_FACTORY_H_INCLUDED__ +#ifndef IRR_C_DEFAULT_SCENE_NODE_FACTORY_H_INCLUDED +#define IRR_C_DEFAULT_SCENE_NODE_FACTORY_H_INCLUDED #include "ISceneNodeFactory.h" #include "irrArray.h" @@ -16,7 +16,7 @@ namespace scene class ISceneNode; 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 { public: @@ -27,31 +27,31 @@ namespace scene /** \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. \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 /** \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. \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 - virtual u32 getCreatableSceneNodeTypeCount() const _IRR_OVERRIDE_; + virtual u32 getCreatableSceneNodeTypeCount() const IRR_OVERRIDE; //! 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 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 /** \param idx: Index of scene node type in this factory. Must be a value between 0 and 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 /** \param idx: Type of scene node. \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: @@ -77,4 +77,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CDepthBuffer.h b/source/Irrlicht/CDepthBuffer.h index 609f7a73..f8873da2 100644 --- a/source/Irrlicht/CDepthBuffer.h +++ b/source/Irrlicht/CDepthBuffer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_Z_BUFFER_H_INCLUDED__ -#define __C_Z_BUFFER_H_INCLUDED__ +#ifndef IRR_C_Z_BUFFER_H_INCLUDED +#define IRR_C_Z_BUFFER_H_INCLUDED #include "IDepthBuffer.h" @@ -23,22 +23,22 @@ namespace video virtual ~CDepthBuffer(); //! 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 - virtual void setSize(const core::dimension2d& size) _IRR_OVERRIDE_; + virtual void setSize(const core::dimension2d& size) IRR_OVERRIDE; //! returns the size of the zbuffer - virtual const core::dimension2d& getSize() const _IRR_OVERRIDE_; + virtual const core::dimension2d& getSize() const IRR_OVERRIDE; //! locks the zbuffer - virtual void* lock() _IRR_OVERRIDE_ { return (void*) Buffer; } + virtual void* lock() IRR_OVERRIDE { return (void*) Buffer; } //! unlocks the zbuffer - virtual void unlock() _IRR_OVERRIDE_ {} + virtual void unlock() IRR_OVERRIDE {} //! returns pitch of depthbuffer (in bytes) - virtual u32 getPitch() const _IRR_OVERRIDE_ { return Pitch; } + virtual u32 getPitch() const IRR_OVERRIDE { return Pitch; } private: @@ -60,22 +60,22 @@ namespace video virtual ~CStencilBuffer(); //! 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 - virtual void setSize(const core::dimension2d& size) _IRR_OVERRIDE_; + virtual void setSize(const core::dimension2d& size) IRR_OVERRIDE; //! returns the size of the zbuffer - virtual const core::dimension2d& getSize() const _IRR_OVERRIDE_; + virtual const core::dimension2d& getSize() const IRR_OVERRIDE; //! locks the zbuffer - virtual void* lock() _IRR_OVERRIDE_ { return (void*) Buffer; } + virtual void* lock() IRR_OVERRIDE { return (void*) Buffer; } //! unlocks the zbuffer - virtual void unlock() _IRR_OVERRIDE_ {} + virtual void unlock() IRR_OVERRIDE {} //! returns pitch of depthbuffer (in bytes) - virtual u32 getPitch() const _IRR_OVERRIDE_ { return Pitch; } + virtual u32 getPitch() const IRR_OVERRIDE { return Pitch; } private: @@ -89,4 +89,3 @@ namespace video } // end namespace irr #endif - diff --git a/source/Irrlicht/CDummyTransformationSceneNode.h b/source/Irrlicht/CDummyTransformationSceneNode.h index ac95b148..095131f2 100644 --- a/source/Irrlicht/CDummyTransformationSceneNode.h +++ b/source/Irrlicht/CDummyTransformationSceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__ -#define __C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED +#define IRR_C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED #include "IDummyTransformationSceneNode.h" @@ -20,36 +20,36 @@ namespace scene CDummyTransformationSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id); //! returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! Returns a reference to the current relative transformation matrix. //! This is the matrix, this scene node uses instead of scale, translation //! and rotation. - virtual core::matrix4& getRelativeTransformationMatrix() _IRR_OVERRIDE_; + virtual core::matrix4& getRelativeTransformationMatrix() IRR_OVERRIDE; //! Returns the relative transformation of the scene node. - virtual core::matrix4 getRelativeTransformation() const _IRR_OVERRIDE_; + virtual core::matrix4 getRelativeTransformation() const IRR_OVERRIDE; //! does nothing. - virtual void render() _IRR_OVERRIDE_ {} + virtual void render() IRR_OVERRIDE {} //! 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. - virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) _IRR_OVERRIDE_; + virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) IRR_OVERRIDE; private: // TODO: We can add least add some warnings to find troubles faster until we have // fixed bug id 2318691. - virtual const core::vector3df& getScale() const _IRR_OVERRIDE_; - virtual void setScale(const core::vector3df& scale) _IRR_OVERRIDE_; - virtual const core::vector3df& getRotation() const _IRR_OVERRIDE_; - virtual void setRotation(const core::vector3df& rotation) _IRR_OVERRIDE_; - virtual const core::vector3df& getPosition() const _IRR_OVERRIDE_; - virtual void setPosition(const core::vector3df& newpos) _IRR_OVERRIDE_; + virtual const core::vector3df& getScale() const IRR_OVERRIDE; + virtual void setScale(const core::vector3df& scale) IRR_OVERRIDE; + virtual const core::vector3df& getRotation() const IRR_OVERRIDE; + virtual void setRotation(const core::vector3df& rotation) IRR_OVERRIDE; + virtual const core::vector3df& getPosition() const IRR_OVERRIDE; + virtual void setPosition(const core::vector3df& newpos) IRR_OVERRIDE; core::matrix4 RelativeTransformationMatrix; core::aabbox3d Box; @@ -59,4 +59,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CEGLManager.h b/source/Irrlicht/CEGLManager.h index c82d48c6..8b9f072a 100755 --- a/source/Irrlicht/CEGLManager.h +++ b/source/Irrlicht/CEGLManager.h @@ -36,39 +36,39 @@ namespace video // Initialize EGL. /* This method initialize EGLand create EGL display, anyway surface and context 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 context. This method break both existed surface and context. */ - virtual void terminate() _IRR_OVERRIDE_; + virtual void terminate() IRR_OVERRIDE; // Create EGL surface. /* This method create EGL surface. On some platforms eg. Android, we must recreate surface on each resume, because WindowID may change, so existed surface may not be valid. If EGL context already exist, this method automatically activates it. */ - virtual bool generateSurface() _IRR_OVERRIDE_; + virtual bool generateSurface() IRR_OVERRIDE; // Destroy EGL surface. /* 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. Hovewer this method doesn'r break EGL context. */ - virtual void destroySurface() _IRR_OVERRIDE_; + virtual void destroySurface() IRR_OVERRIDE; // Create EGL context. /* This method create and activate EGL context. */ - virtual bool generateContext() _IRR_OVERRIDE_; + virtual bool generateContext() IRR_OVERRIDE; // 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. - virtual bool swapBuffers() _IRR_OVERRIDE_; + virtual bool swapBuffers() IRR_OVERRIDE; protected: enum EConfigStyle diff --git a/source/Irrlicht/CEmptySceneNode.h b/source/Irrlicht/CEmptySceneNode.h index 2832595c..fc0b2491 100644 --- a/source/Irrlicht/CEmptySceneNode.h +++ b/source/Irrlicht/CEmptySceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_EMPTY_SCENE_NODE_H_INCLUDED__ -#define __C_EMPTY_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_EMPTY_SCENE_NODE_H_INCLUDED +#define IRR_C_EMPTY_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" @@ -20,19 +20,19 @@ namespace scene CEmptySceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id); //! returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! 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. - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! 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. - virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) _IRR_OVERRIDE_; + virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) IRR_OVERRIDE; private: @@ -43,4 +43,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CFPSCounter.h b/source/Irrlicht/CFPSCounter.h index 12e0d4e8..f0d853b0 100644 --- a/source/Irrlicht/CFPSCounter.h +++ b/source/Irrlicht/CFPSCounter.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_FPSCOUNTER_H_INCLUDED__ -#define __C_FPSCOUNTER_H_INCLUDED__ +#ifndef IRR_C_FPSCOUNTER_H_INCLUDED +#define IRR_C_FPSCOUNTER_H_INCLUDED #include "irrTypes.h" @@ -49,6 +49,4 @@ private: } // end namespace video } // end namespace irr - #endif - diff --git a/source/Irrlicht/CFileList.h b/source/Irrlicht/CFileList.h index 228f231b..2056a794 100644 --- a/source/Irrlicht/CFileList.h +++ b/source/Irrlicht/CFileList.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_FILE_LIST_H_INCLUDED__ -#define __C_FILE_LIST_H_INCLUDED__ +#ifndef IRR_C_FILE_LIST_H_INCLUDED +#define IRR_C_FILE_LIST_H_INCLUDED #include "IFileList.h" #include "irrString.h" @@ -82,37 +82,37 @@ public: \param offset The offset where the file is stored in an archive \param size The size of the file in bytes. \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 - virtual void sort() _IRR_OVERRIDE_; + virtual void sort() IRR_OVERRIDE; //! 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. - 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. - 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. - virtual u32 getID(u32 index) const _IRR_OVERRIDE_; + virtual u32 getID(u32 index) const IRR_OVERRIDE; //! 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 - virtual u32 getFileSize(u32 index) const _IRR_OVERRIDE_; + virtual u32 getFileSize(u32 index) const IRR_OVERRIDE; //! 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 - 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 - virtual const io::path& getPath() const _IRR_OVERRIDE_; + virtual const io::path& getPath() const IRR_OVERRIDE; protected: @@ -135,4 +135,3 @@ protected: #endif - diff --git a/source/Irrlicht/CFileSystem.cpp b/source/Irrlicht/CFileSystem.cpp index 6e336b91..199c8981 100644 --- a/source/Irrlicht/CFileSystem.cpp +++ b/source/Irrlicht/CFileSystem.cpp @@ -336,7 +336,7 @@ bool CFileSystem::changeArchivePassword(const path& filename, // We need to check for directory names with trailing slash and without const path absPath = getAbsolutePath(filename); const path arcPath = FileArchives[idx]->getFileList()->getPath(); - if ((absPath == arcPath) || ((absPath+_IRR_TEXT("/")) == arcPath)) + if ((absPath == arcPath) || ((absPath+IRR_TEXT("/")) == arcPath)) { if (password.size()) FileArchives[idx]->Password=password; @@ -585,7 +585,7 @@ bool CFileSystem::changeWorkingDirectoryTo(const io::path& newDirectory) { WorkingDirectory[FILESYSTEM_VIRTUAL] = newDirectory; // is this empty string constant really intended? - flattenFilename(WorkingDirectory[FILESYSTEM_VIRTUAL], _IRR_TEXT("")); + flattenFilename(WorkingDirectory[FILESYSTEM_VIRTUAL], IRR_TEXT("")); success = true; } else @@ -645,7 +645,7 @@ io::path CFileSystem::getAbsolutePath(const io::path& filename) const return io::path(fpath); } if (filename[filename.size()-1]=='/') - return io::path(p)+_IRR_TEXT("/"); + return io::path(p)+IRR_TEXT("/"); else return io::path(p); #else @@ -667,7 +667,7 @@ io::path CFileSystem::getFileDir(const io::path& filename) const if ((u32)lastSlash < filename.size()) return filename.subString(0, lastSlash); 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); - if (subdir == _IRR_TEXT("../")) + if (subdir == IRR_TEXT("../")) { if (lastWasRealDir) { @@ -733,11 +733,11 @@ io::path& CFileSystem::flattenFilename(io::path& directory, const io::path& root lastWasRealDir=false; } } - else if (subdir == _IRR_TEXT("/")) + else if (subdir == IRR_TEXT("/")) { dir = root; } - else if (subdir != _IRR_TEXT("./")) + else if (subdir != IRR_TEXT("./")) { dir.append(subdir); lastWasRealDir=true; @@ -760,8 +760,8 @@ path CFileSystem::getRelativeFilename(const path& filename, const path& director core::splitFilename(getAbsolutePath(filename), &path1, &file, &ext); io::path path2(getAbsolutePath(directory)); core::list list1, list2; - path1.split(list1, _IRR_TEXT("/\\"), 2); - path2.split(list2, _IRR_TEXT("/\\"), 2); + path1.split(list1, IRR_TEXT("/\\"), 2); + path2.split(list2, IRR_TEXT("/\\"), 2); u32 i=0; core::list::ConstIterator it1,it2; it1=list1.begin(); @@ -774,9 +774,9 @@ path CFileSystem::getRelativeFilename(const path& filename, const path& director prefix1 = *it1; if ( it2 != list2.end() ) prefix2 = *it2; - if ( prefix1.size() > 1 && prefix1[1] == _IRR_TEXT(':') ) + if ( prefix1.size() > 1 && prefix1[1] == IRR_TEXT(':') ) 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]); // 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; ++it2; } - path1=_IRR_TEXT(""); + path1=IRR_TEXT(""); for (; iaddItem(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 DIR* dirHandle=opendir(Path.c_str()); @@ -924,10 +924,10 @@ IFileList* CFileSystem::createFileList() SFileListEntry e3; //! PWD - r->addItem(Path + _IRR_TEXT("."), 0, 0, true, 0); + r->addItem(Path + IRR_TEXT("."), 0, 0, true, 0); //! parent - r->addItem(Path + _IRR_TEXT(".."), 0, 0, true, 0); + r->addItem(Path + IRR_TEXT(".."), 0, 0, true, 0); //! merge archives for (u32 i=0; i < FileArchives.size(); ++i) diff --git a/source/Irrlicht/CFileSystem.h b/source/Irrlicht/CFileSystem.h index 87c51340..ba11cd11 100644 --- a/source/Irrlicht/CFileSystem.h +++ b/source/Irrlicht/CFileSystem.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_FILE_SYSTEM_H_INCLUDED__ -#define __C_FILE_SYSTEM_H_INCLUDED__ +#ifndef IRR_C_FILE_SYSTEM_H_INCLUDED +#define IRR_C_FILE_SYSTEM_H_INCLUDED #include "IFileSystem.h" #include "irrArray.h" @@ -31,128 +31,128 @@ public: virtual ~CFileSystem(); //! 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. - 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 - 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. - 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. - 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. virtual bool addFileArchive(const io::path& filename, bool ignoreCase = true, bool ignorePaths = true, E_FILE_ARCHIVE_TYPE archiveType = EFAT_UNKNOWN, const core::stringc& password="", - IFileArchive** retArchive = 0) _IRR_OVERRIDE_; + IFileArchive** retArchive = 0) IRR_OVERRIDE; //! Adds an archive to the file system. virtual bool addFileArchive(IReadFile* file, bool ignoreCase=true, bool ignorePaths=true, E_FILE_ARCHIVE_TYPE archiveType=EFAT_UNKNOWN, const core::stringc& password="", - IFileArchive** retArchive = 0) _IRR_OVERRIDE_; + IFileArchive** retArchive = 0) IRR_OVERRIDE; //! 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 - 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. - virtual void addArchiveLoader(IArchiveLoader* loader) _IRR_OVERRIDE_; + virtual void addArchiveLoader(IArchiveLoader* loader) IRR_OVERRIDE; //! 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. - virtual IArchiveLoader* getArchiveLoader(u32 index) const _IRR_OVERRIDE_; + virtual IArchiveLoader* getArchiveLoader(u32 index) const IRR_OVERRIDE; //! gets the file archive count - virtual u32 getFileArchiveCount() const _IRR_OVERRIDE_; + virtual u32 getFileArchiveCount() const IRR_OVERRIDE; //! gets an archive - virtual IFileArchive* getFileArchive(u32 index) _IRR_OVERRIDE_; + virtual IFileArchive* getFileArchive(u32 index) IRR_OVERRIDE; //! 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. - 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. - virtual bool removeFileArchive(const IFileArchive* archive) _IRR_OVERRIDE_; + virtual bool removeFileArchive(const IFileArchive* archive) IRR_OVERRIDE; //! 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. //! The string is operating system dependent. Under Windows it will look //! 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 - 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. /** \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 //! part. If no directory is prefixed, the full name is returned. /** \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" - 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 - 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 //! and returns it. - virtual IFileList* createFileList() _IRR_OVERRIDE_; + virtual IFileList* createFileList() IRR_OVERRIDE; //! 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. - 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. - 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. - virtual IXMLReader* createXMLReader(IReadFile* file) _IRR_OVERRIDE_; + virtual IXMLReader* createXMLReader(IReadFile* file) IRR_OVERRIDE; //! 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. - virtual IXMLReaderUTF8* createXMLReaderUTF8(IReadFile* file) _IRR_OVERRIDE_; + virtual IXMLReaderUTF8* createXMLReaderUTF8(IReadFile* file) IRR_OVERRIDE; //! 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. - 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*). - 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*). - 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. - virtual IAttributes* createEmptyAttributes(video::IVideoDriver* driver) _IRR_OVERRIDE_; + virtual IAttributes* createEmptyAttributes(video::IVideoDriver* driver) IRR_OVERRIDE; private: @@ -176,4 +176,3 @@ private: } // end namespace io #endif - diff --git a/source/Irrlicht/CGLXManager.h b/source/Irrlicht/CGLXManager.h index ef2566ee..085d4184 100644 --- a/source/Irrlicht/CGLXManager.h +++ b/source/Irrlicht/CGLXManager.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in Irrlicht.h -#ifndef __C_GLX_MANAGER_H_INCLUDED__ -#define __C_GLX_MANAGER_H_INCLUDED__ +#ifndef IRR_C_GLX_MANAGER_H_INCLUDED +#define IRR_C_GLX_MANAGER_H_INCLUDED #include "IrrCompileConfig.h" @@ -34,31 +34,31 @@ namespace video ~CGLXManager(); // Initialize - virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) _IRR_OVERRIDE_; + virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) IRR_OVERRIDE; // Terminate - virtual void terminate() _IRR_OVERRIDE_; + virtual void terminate() IRR_OVERRIDE; // Create surface. - virtual bool generateSurface() _IRR_OVERRIDE_; + virtual bool generateSurface() IRR_OVERRIDE; // Destroy surface. - virtual void destroySurface() _IRR_OVERRIDE_; + virtual void destroySurface() IRR_OVERRIDE; // Create context. - virtual bool generateContext() _IRR_OVERRIDE_; + virtual bool generateContext() IRR_OVERRIDE; // Destroy context. - virtual void destroyContext() _IRR_OVERRIDE_; + virtual void destroyContext() IRR_OVERRIDE; //! 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 - virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) _IRR_OVERRIDE_; + virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) IRR_OVERRIDE; // Swap buffers. - virtual bool swapBuffers() _IRR_OVERRIDE_; + virtual bool swapBuffers() IRR_OVERRIDE; XVisualInfo* getVisual() const {return VisualInfo;} // return XVisualInfo @@ -76,4 +76,3 @@ namespace video #endif #endif - diff --git a/source/Irrlicht/CGUIButton.h b/source/Irrlicht/CGUIButton.h index 88ca8f44..1fc82dff 100644 --- a/source/Irrlicht/CGUIButton.h +++ b/source/Irrlicht/CGUIButton.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_BUTTON_H_INCLUDED__ -#define __C_GUI_BUTTON_H_INCLUDED__ +#ifndef IRR_C_GUI_BUTTON_H_INCLUDED +#define IRR_C_GUI_BUTTON_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -30,64 +30,64 @@ namespace gui virtual ~CGUIButton(); //! 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 - 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. - virtual void setOverrideFont(IGUIFont* font=0) _IRR_OVERRIDE_; + virtual void setOverrideFont(IGUIFont* font=0) IRR_OVERRIDE; //! 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 - virtual IGUIFont* getActiveFont() const _IRR_OVERRIDE_; + virtual IGUIFont* getActiveFont() const IRR_OVERRIDE; //! 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 - virtual video::SColor getOverrideColor(void) const _IRR_OVERRIDE_; + virtual video::SColor getOverrideColor(void) const IRR_OVERRIDE; //! 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. - virtual void enableOverrideColor(bool enable) _IRR_OVERRIDE_; + virtual void enableOverrideColor(bool enable) IRR_OVERRIDE; //! 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. - virtual void setImage(EGUI_BUTTON_IMAGE_STATE state, video::ITexture* image=0, const core::rect& sourceRect=core::rect(0,0,0,0)) _IRR_OVERRIDE_; + virtual void setImage(EGUI_BUTTON_IMAGE_STATE state, video::ITexture* image=0, const core::rect& sourceRect=core::rect(0,0,0,0)) IRR_OVERRIDE; //! 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); } //! 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& pos) _IRR_OVERRIDE_ + virtual void setImage(video::ITexture* image, const core::rect& pos) IRR_OVERRIDE { setImage(EGBIS_IMAGE_UP, image, pos); } //! 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); } //! 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& pos) _IRR_OVERRIDE_ + virtual void setPressedImage(video::ITexture* image, const core::rect& pos) IRR_OVERRIDE { setImage(EGBIS_IMAGE_DOWN, image, pos); } //! 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 /** \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, 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 - 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. - 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 - 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 - 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 //! can be in two states: Normal or Pressed. With a click on 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 - virtual bool isPushButton() const _IRR_OVERRIDE_; + virtual bool isPushButton() const IRR_OVERRIDE; //! 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 - virtual bool isPressed() const _IRR_OVERRIDE_; + virtual bool isPressed() const IRR_OVERRIDE; //! 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 - 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) - 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 - virtual bool isAlphaChannelUsed() const _IRR_OVERRIDE_; + virtual bool isAlphaChannelUsed() const IRR_OVERRIDE; //! 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 - 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 - virtual bool getClickShiftState() const _IRR_OVERRIDE_ + virtual bool getClickShiftState() const IRR_OVERRIDE { return ClickShiftState; } //! 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; } //! 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 - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; protected: void drawSprite(EGUI_BUTTON_STATE state, u32 startTime, const core::position2di& center); @@ -252,5 +252,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_BUTTON_H_INCLUDED__ - +#endif // IRR_C_GUI_BUTTON_H_INCLUDED diff --git a/source/Irrlicht/CGUICheckBox.h b/source/Irrlicht/CGUICheckBox.h index 47260a92..5e154e6a 100644 --- a/source/Irrlicht/CGUICheckBox.h +++ b/source/Irrlicht/CGUICheckBox.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_CHECKBOX_H_INCLUDED__ -#define __C_GUI_CHECKBOX_H_INCLUDED__ +#ifndef IRR_C_GUI_CHECKBOX_H_INCLUDED +#define IRR_C_GUI_CHECKBOX_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -23,36 +23,36 @@ namespace gui CGUICheckBox(bool checked, IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect rectangle); //! set if box is checked - virtual void setChecked(bool checked) _IRR_OVERRIDE_; + virtual void setChecked(bool checked) IRR_OVERRIDE; //! returns if box is checked - virtual bool isChecked() const _IRR_OVERRIDE_; + virtual bool isChecked() const IRR_OVERRIDE; //! 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 /** \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 - virtual void setDrawBorder(bool draw) _IRR_OVERRIDE_; + virtual void setDrawBorder(bool draw) IRR_OVERRIDE; //! Checks if border drawing is enabled /** \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. - virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; + virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE; //! draws the element and its children - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; //! 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 - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: @@ -66,6 +66,6 @@ namespace gui } // end namespace gui } // end namespace irr -#endif // __C_GUI_CHECKBOX_H_INCLUDED__ - #endif // _IRR_COMPILE_WITH_GUI_ + +#endif // IRR_C_GUI_CHECKBOX_H_INCLUDED diff --git a/source/Irrlicht/CGUIColorSelectDialog.h b/source/Irrlicht/CGUIColorSelectDialog.h index 8dbad50e..111219a3 100644 --- a/source/Irrlicht/CGUIColorSelectDialog.h +++ b/source/Irrlicht/CGUIColorSelectDialog.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__ -#define __C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__ +#ifndef IRR_C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED +#define IRR_C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -31,13 +31,13 @@ namespace gui virtual ~CGUIColorSelectDialog(); //! 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 - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; - virtual video::SColor getColor() _IRR_OVERRIDE_; - virtual video::SColorHSL getColorHSL() _IRR_OVERRIDE_; + virtual video::SColor getColor() IRR_OVERRIDE; + virtual video::SColorHSL getColorHSL() IRR_OVERRIDE; private: @@ -71,4 +71,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__ +#endif // IRR_C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED diff --git a/source/Irrlicht/CGUIComboBox.h b/source/Irrlicht/CGUIComboBox.h index 5aa5de6d..ae4ad604 100644 --- a/source/Irrlicht/CGUIComboBox.h +++ b/source/Irrlicht/CGUIComboBox.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_COMBO_BOX_H_INCLUDED__ -#define __C_GUI_COMBO_BOX_H_INCLUDED__ +#ifndef IRR_C_GUI_COMBO_BOX_H_INCLUDED +#define IRR_C_GUI_COMBO_BOX_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -30,55 +30,55 @@ namespace gui s32 id, core::rect rectangle); //! 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 - 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 - virtual u32 getItemData(u32 idx) const _IRR_OVERRIDE_; + virtual u32 getItemData(u32 idx) const IRR_OVERRIDE; //! 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 - 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. - virtual void removeItem(u32 id) _IRR_OVERRIDE_; + virtual void removeItem(u32 id) IRR_OVERRIDE; //! 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 - 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. - 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 - virtual void setSelected(s32 idx) _IRR_OVERRIDE_; + virtual void setSelected(s32 idx) IRR_OVERRIDE; //! 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 - virtual void setMaxSelectionRows(u32 max) _IRR_OVERRIDE_; + virtual void setMaxSelectionRows(u32 max) IRR_OVERRIDE; //! 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. - virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; + virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE; //! draws the element and its children - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; //! 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 - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: @@ -115,5 +115,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_COMBO_BOX_H_INCLUDED__ - +#endif // IRR_C_GUI_COMBO_BOX_H_INCLUDED diff --git a/source/Irrlicht/CGUIContextMenu.h b/source/Irrlicht/CGUIContextMenu.h index 80ddf325..f877d59d 100644 --- a/source/Irrlicht/CGUIContextMenu.h +++ b/source/Irrlicht/CGUIContextMenu.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_CONTEXT_MENU_H_INCLUDED__ -#define __C_GUI_CONTEXT_MENU_H_INCLUDED__ +#ifndef IRR_C_GUI_CONTEXT_MENU_H_INCLUDED +#define IRR_C_GUI_CONTEXT_MENU_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -32,91 +32,91 @@ namespace gui virtual ~CGUIContextMenu(); //! 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 - virtual ECONTEXT_MENU_CLOSE getCloseHandling() const _IRR_OVERRIDE_; + virtual ECONTEXT_MENU_CLOSE getCloseHandling() const IRR_OVERRIDE; //! Returns amount of menu items - virtual u32 getItemCount() const _IRR_OVERRIDE_; + virtual u32 getItemCount() const IRR_OVERRIDE; //! Adds a menu item. 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. 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 - 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 - virtual void addSeparator() _IRR_OVERRIDE_; + virtual void addSeparator() IRR_OVERRIDE; //! 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. - 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 - virtual bool isItemEnabled(u32 idx) const _IRR_OVERRIDE_; + virtual bool isItemEnabled(u32 idx) const IRR_OVERRIDE; //! 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 - virtual bool isItemChecked(u32 idx) const _IRR_OVERRIDE_; + virtual bool isItemChecked(u32 idx) const IRR_OVERRIDE; //! 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 - virtual void removeItem(u32 idx) _IRR_OVERRIDE_; + virtual void removeItem(u32 idx) IRR_OVERRIDE; //! Removes all menu items - virtual void removeAllItems() _IRR_OVERRIDE_; + virtual void removeAllItems() IRR_OVERRIDE; //! 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 - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; //! 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. //! \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. - virtual void setVisible(bool visible) _IRR_OVERRIDE_; + virtual void setVisible(bool visible) IRR_OVERRIDE; //! 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 - virtual bool getItemAutoChecking(u32 idx) const _IRR_OVERRIDE_; + virtual bool getItemAutoChecking(u32 idx) const IRR_OVERRIDE; //! 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 - 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. virtual void setSubMenu(u32 index, CGUIContextMenu* menu); //! 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. - 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 - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; protected: @@ -170,5 +170,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_CONTEXT_MENU_H_INCLUDED__ - +#endif // IRR_C_GUI_CONTEXT_MENU_H_INCLUDED diff --git a/source/Irrlicht/CGUIEditBox.h b/source/Irrlicht/CGUIEditBox.h index f251e5ec..18d866cc 100644 --- a/source/Irrlicht/CGUIEditBox.h +++ b/source/Irrlicht/CGUIEditBox.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_EDIT_BOX_H_INCLUDED__ -#define __C_GUI_EDIT_BOX_H_INCLUDED__ +#ifndef IRR_C_GUI_EDIT_BOX_H_INCLUDED +#define IRR_C_GUI_EDIT_BOX_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -28,122 +28,122 @@ namespace gui virtual ~CGUIEditBox(); //! 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) /** \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 /** Currently this is the override font when one is set and the font of the active skin otherwise */ - virtual IGUIFont* getActiveFont() const _IRR_OVERRIDE_; + virtual IGUIFont* getActiveFont() const IRR_OVERRIDE; //! 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 - 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 //! 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 /** \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 - virtual void setDrawBackground(bool draw) _IRR_OVERRIDE_; + virtual void setDrawBackground(bool draw) IRR_OVERRIDE; //! Checks if background drawing is enabled - virtual bool isDrawBackgroundEnabled() const _IRR_OVERRIDE_; + virtual bool isDrawBackgroundEnabled() const IRR_OVERRIDE; //! 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 - 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. - virtual void setWordWrap(bool enable) _IRR_OVERRIDE_; + virtual void setWordWrap(bool enable) IRR_OVERRIDE; //! Checks if word wrap is enabled //! \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. /** \param enable: If set to true, the EGET_EDITBOX_ENTER event will not be fired, 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 //! \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 //! \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 //! \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 //! \return Returns the size in pixels of the text - virtual core::dimension2du getTextDimension() _IRR_OVERRIDE_; + virtual core::dimension2du getTextDimension() IRR_OVERRIDE; //! 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. - virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; + virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE; //! draws the element and its children - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; //! 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. //! \param max: Maximum amount of characters. If 0, the character amount is //! infinity. - virtual void setMax(u32 max) _IRR_OVERRIDE_; + virtual void setMax(u32 max) IRR_OVERRIDE; //! 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. /** 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. - 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. //** \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 - 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 /** disable MultiLine, WordWrap and the ability to copy with ctrl+c or ctrl+x \param passwordBox: true to enable password, false to disable \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. - virtual bool isPasswordBox() const _IRR_OVERRIDE_; + virtual bool isPasswordBox() const IRR_OVERRIDE; //! Updates the absolute position, splits text if required - virtual void updateAbsolutePosition() _IRR_OVERRIDE_; + virtual void updateAbsolutePosition() IRR_OVERRIDE; //! 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 - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; protected: //! Breaks the single text line. @@ -203,5 +203,4 @@ namespace gui } // end namespace irr #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_EDIT_BOX_H_INCLUDED__ - +#endif // IRR_C_GUI_EDIT_BOX_H_INCLUDED diff --git a/source/Irrlicht/CGUIEnvironment.h b/source/Irrlicht/CGUIEnvironment.h index 6730e6d6..e03852b1 100644 --- a/source/Irrlicht/CGUIEnvironment.h +++ b/source/Irrlicht/CGUIEnvironment.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_ENVIRONMENT_H_INCLUDED__ -#define __C_GUI_ENVIRONMENT_H_INCLUDED__ +#ifndef IRR_C_GUI_ENVIRONMENT_H_INCLUDED +#define IRR_C_GUI_ENVIRONMENT_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -31,246 +31,246 @@ public: virtual ~CGUIEnvironment(); //! draws all gui elements - virtual void drawAll(bool useScreenSize) _IRR_OVERRIDE_; + virtual void drawAll(bool useScreenSize) IRR_OVERRIDE; //! returns the current video driver - virtual video::IVideoDriver* getVideoDriver() const _IRR_OVERRIDE_; + virtual video::IVideoDriver* getVideoDriver() const IRR_OVERRIDE; //! 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 - virtual IOSOperator* getOSOperator() const _IRR_OVERRIDE_; + virtual IOSOperator* getOSOperator() const IRR_OVERRIDE; //! 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 //! 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 - virtual void clear() _IRR_OVERRIDE_; + virtual void clear() IRR_OVERRIDE; //! 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 - virtual IGUISkin* getSkin() const _IRR_OVERRIDE_; + virtual IGUISkin* getSkin() const IRR_OVERRIDE; //! 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. /** \return Returns a pointer to the created skin. If you no longer need the skin, you should call IGUISkin::drop(). 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. virtual IGUIImageList* createImageList(video::ITexture* texture, - core::dimension2d imageSize, bool useAlphaChannel) _IRR_OVERRIDE_; + core::dimension2d imageSize, bool useAlphaChannel) IRR_OVERRIDE; //! 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 - 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 - virtual void removeFont(IGUIFont* font) _IRR_OVERRIDE_; + virtual void removeFont(IGUIFont* font) IRR_OVERRIDE; //! returns default font - virtual IGUIFont* getBuiltInFont() const _IRR_OVERRIDE_; + virtual IGUIFont* getBuiltInFont() const IRR_OVERRIDE; //! 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 - 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. - virtual IGUIButton* addButton(const core::rect& 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& 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. virtual IGUIWindow* addWindow(const core::rect& 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. - virtual IGUIElement* addModalScreen(IGUIElement* parent, int blinkMode) _IRR_OVERRIDE_; + virtual IGUIElement* addModalScreen(IGUIElement* parent, int blinkMode) IRR_OVERRIDE; //! Adds a message box. virtual IGUIWindow* addMessageBox(const wchar_t* caption, const wchar_t* text=0, - bool modal = true, s32 flag = EMBF_OK, IGUIElement* parent=0, s32 id=-1, video::ITexture* image=0) _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. virtual IGUIScrollBar* addScrollBar(bool horizontal, const core::rect& rectangle, - IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; + IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE; //! Adds an image element. virtual IGUIImage* addImage(video::ITexture* image, core::position2d 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. virtual IGUIImage* addImage(const core::rect& 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 virtual IGUICheckBox* addCheckBox(bool checked, const core::rect& 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 virtual IGUIListBox* addListBox(const core::rect& 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 virtual IGUITreeView* addTreeView(const core::rect& rectangle, 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. virtual IGUIMeshViewer* addMeshViewer(const core::rect& 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. virtual IGUIFileOpenDialog* addFileOpenDialog(const wchar_t* title = 0, bool modal=true, IGUIElement* parent=0, s32 id=-1, - bool restoreCWD=false, io::path::char_type* startDir=0) _IRR_OVERRIDE_; + bool restoreCWD=false, io::path::char_type* startDir=0) IRR_OVERRIDE; //! Adds a color select dialog. virtual IGUIColorSelectDialog* addColorSelectDialog(const wchar_t* title = 0, - bool modal=true, IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; + bool modal=true, IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE; //! adds a static text. The returned pointer must not be dropped. virtual IGUIStaticText* addStaticText(const wchar_t* text, const core::rect& 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. virtual IGUIEditBox* addEditBox(const wchar_t* text, const core::rect& 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 virtual IGUISpinBox* addSpinBox(const wchar_t* text, const core::rect& 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. virtual IGUITabControl* addTabControl(const core::rect& 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. virtual IGUITab* addTab(const core::rect& rectangle, - IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; + IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE; //! Adds a context menu to the environment. virtual IGUIContextMenu* addContextMenu(const core::rect& rectangle, - IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; + IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE; //! Adds a menu to the environment. - virtual IGUIContextMenu* addMenu(IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; + 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 //! 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. virtual IGUIComboBox* addComboBox(const core::rect& rectangle, - IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; + IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE; //! Adds a table element. virtual IGUITable* addTable(const core::rect& 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 virtual IGUIProfiler* addProfilerDisplay(const core::rect& rectangle, - IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; + IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE; //! 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 - virtual bool removeFocus(IGUIElement* element) _IRR_OVERRIDE_; + virtual bool removeFocus(IGUIElement* element) IRR_OVERRIDE; //! 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 - virtual IGUIElement* getFocus() const _IRR_OVERRIDE_; + virtual IGUIElement* getFocus() const IRR_OVERRIDE; //! 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. - virtual IGUIInOutFader* addInOutFader(const core::rect* rectangle=0, IGUIElement* parent=0, s32 id=-1) _IRR_OVERRIDE_; + virtual IGUIInOutFader* addInOutFader(const core::rect* rectangle=0, IGUIElement* parent=0, s32 id=-1) IRR_OVERRIDE; //! 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 - virtual IGUIElementFactory* getDefaultGUIElementFactory() const _IRR_OVERRIDE_; + virtual IGUIElementFactory* getDefaultGUIElementFactory() const IRR_OVERRIDE; //! Adds an element factory to the gui environment. /** 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. */ - virtual void registerGUIElementFactory(IGUIElementFactory* factoryToAdd) _IRR_OVERRIDE_; + virtual void registerGUIElementFactory(IGUIElementFactory* factoryToAdd) IRR_OVERRIDE; //! 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 - virtual IGUIElementFactory* getGUIElementFactory(u32 index) const _IRR_OVERRIDE_; + virtual IGUIElementFactory* getGUIElementFactory(u32 index) const IRR_OVERRIDE; //! 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. /** \param filename: Name of the file. \param start: The element to start saving from. 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. /** \param file: The file to save the GUI to. \param start: The element to start saving from. 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. /** \param filename: Name of the file. \param parent: The parent of all loaded GUI elements, 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. /** \param file: IReadFile to load the GUI from \param parent: The parent of all loaded GUI elements, 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 - 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. - 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 - virtual void writeGUIElement(io::IXMLWriter* writer, IGUIElement* node) _IRR_OVERRIDE_; + virtual void writeGUIElement(io::IXMLWriter* writer, IGUIElement* node) IRR_OVERRIDE; //! 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 - 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 - virtual void setFocusBehavior(u32 flags) _IRR_OVERRIDE_; + virtual void setFocusBehavior(u32 flags) IRR_OVERRIDE; //! 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. - virtual void addToDeletionQueue(IGUIElement* element) _IRR_OVERRIDE_; + virtual void addToDeletionQueue(IGUIElement* element) IRR_OVERRIDE; private: @@ -338,6 +338,4 @@ private: #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_ENVIRONMENT_H_INCLUDED__ - - +#endif // IRR_C_GUI_ENVIRONMENT_H_INCLUDED diff --git a/source/Irrlicht/CGUIFileOpenDialog.h b/source/Irrlicht/CGUIFileOpenDialog.h index aec04898..0b4ab076 100644 --- a/source/Irrlicht/CGUIFileOpenDialog.h +++ b/source/Irrlicht/CGUIFileOpenDialog.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__ -#define __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__ +#ifndef IRR_C_GUI_FILE_OPEN_DIALOG_H_INCLUDED +#define IRR_C_GUI_FILE_OPEN_DIALOG_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -32,25 +32,25 @@ namespace gui virtual ~CGUIFileOpenDialog(); //! 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. - 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. - 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. - virtual const wchar_t* getDirectoryNameW() const _IRR_OVERRIDE_; + virtual const wchar_t* getDirectoryNameW() const IRR_OVERRIDE; //! 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 - 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 deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _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; protected: @@ -95,5 +95,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__ - +#endif // IRR_C_GUI_FILE_OPEN_DIALOG_H_INCLUDED diff --git a/source/Irrlicht/CGUIFont.h b/source/Irrlicht/CGUIFont.h index c88441e3..c4fece7d 100644 --- a/source/Irrlicht/CGUIFont.h +++ b/source/Irrlicht/CGUIFont.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_FONT_H_INCLUDED__ -#define __C_GUI_FONT_H_INCLUDED__ +#ifndef IRR_C_GUI_FONT_H_INCLUDED +#define IRR_C_GUI_FONT_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -52,32 +52,32 @@ public: //! draws an text and clips it to the specified rectangle if wanted virtual void draw(const core::stringw& text, const core::rect& position, video::SColor color, bool hcenter=false, - bool vcenter=false, const core::rect* clip=0) _IRR_OVERRIDE_; + bool vcenter=false, const core::rect* clip=0) IRR_OVERRIDE; //! returns the dimension of a text - virtual core::dimension2d getDimension(const wchar_t* text) const _IRR_OVERRIDE_; + virtual core::dimension2d getDimension(const wchar_t* text) const IRR_OVERRIDE; //! 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 - 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 ) - virtual void setKerningWidth (s32 kerning) _IRR_OVERRIDE_; - virtual void setKerningHeight (s32 kerning) _IRR_OVERRIDE_; + virtual void setKerningWidth (s32 kerning) IRR_OVERRIDE; + virtual void setKerningHeight (s32 kerning) IRR_OVERRIDE; //! 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 getKerningHeight() 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; //! gets the sprite bank - virtual IGUISpriteBank* getSpriteBank() const _IRR_OVERRIDE_; + virtual IGUISpriteBank* getSpriteBank() const IRR_OVERRIDE; //! 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: @@ -118,5 +118,4 @@ private: #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_FONT_H_INCLUDED__ - +#endif // IRR_C_GUI_FONT_H_INCLUDED diff --git a/source/Irrlicht/CGUIImage.h b/source/Irrlicht/CGUIImage.h index 034a8903..fde4f9a6 100644 --- a/source/Irrlicht/CGUIImage.h +++ b/source/Irrlicht/CGUIImage.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_IMAGE_H_INCLUDED__ -#define __C_GUI_IMAGE_H_INCLUDED__ +#ifndef IRR_C_GUI_IMAGE_H_INCLUDED +#define IRR_C_GUI_IMAGE_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -26,61 +26,61 @@ namespace gui virtual ~CGUIImage(); //! sets an image - virtual void setImage(video::ITexture* image) _IRR_OVERRIDE_; + virtual void setImage(video::ITexture* image) IRR_OVERRIDE; //! Gets the image texture - virtual video::ITexture* getImage() const _IRR_OVERRIDE_; + virtual video::ITexture* getImage() const IRR_OVERRIDE; //! 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 - virtual void setScaleImage(bool scale) _IRR_OVERRIDE_; + virtual void setScaleImage(bool scale) IRR_OVERRIDE; //! 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 - virtual void setUseAlphaChannel(bool use) _IRR_OVERRIDE_; + virtual void setUseAlphaChannel(bool use) IRR_OVERRIDE; //! 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 - 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 - 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. - virtual void setSourceRect(const core::rect& sourceRect) _IRR_OVERRIDE_; + virtual void setSourceRect(const core::rect& sourceRect) IRR_OVERRIDE; //! Returns the customized source rectangle of the image to be used. - virtual core::rect getSourceRect() const _IRR_OVERRIDE_; + virtual core::rect getSourceRect() const IRR_OVERRIDE; //! Restrict drawing-area. - virtual void setDrawBounds(const core::rect& drawBoundUVs) _IRR_OVERRIDE_; + virtual void setDrawBounds(const core::rect& drawBoundUVs) IRR_OVERRIDE; //! Get drawing-area restrictions. - virtual core::rect getDrawBounds() const _IRR_OVERRIDE_; + virtual core::rect getDrawBounds() const IRR_OVERRIDE; //! 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; } //! 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; } //! 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 - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; protected: void checkBounds(core::rect& rect) @@ -110,4 +110,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_IMAGE_H_INCLUDED__ +#endif // IRR_C_GUI_IMAGE_H_INCLUDED diff --git a/source/Irrlicht/CGUIImageList.h b/source/Irrlicht/CGUIImageList.h index 5ca4c992..11d13078 100644 --- a/source/Irrlicht/CGUIImageList.h +++ b/source/Irrlicht/CGUIImageList.h @@ -1,8 +1,8 @@ // This file is part of the "Irrlicht Engine". // written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de -#ifndef __C_GUI_IMAGE_LIST_H_INCLUDED__ -#define __C_GUI_IMAGE_LIST_H_INCLUDED__ +#ifndef IRR_C_GUI_IMAGE_LIST_H_INCLUDED +#define IRR_C_GUI_IMAGE_LIST_H_INCLUDED #include "IGUIImageList.h" #include "IVideoDriver.h" @@ -38,16 +38,16 @@ public: //! \param clip: Optional pointer to a rectangle against which the text will be clipped. //! If the pointer is null, no clipping will be done. virtual void draw( s32 index, const core::position2d& destPos, - const core::rect* clip = 0 ) _IRR_OVERRIDE_; + const core::rect* clip = 0 ) IRR_OVERRIDE; //! Returns the count of Images in the list. //! \return Returns the count of Images in the list. - virtual s32 getImageCount() const _IRR_OVERRIDE_ + virtual s32 getImageCount() const IRR_OVERRIDE { return ImageCount; } //! Returns the size of the images in the list. //! \return Returns the size of the images in the list. - virtual core::dimension2d getImageSize() const _IRR_OVERRIDE_ + virtual core::dimension2d getImageSize() const IRR_OVERRIDE { return ImageSize; } private: diff --git a/source/Irrlicht/CGUIInOutFader.h b/source/Irrlicht/CGUIInOutFader.h index 1fdb6bb3..3488f4da 100644 --- a/source/Irrlicht/CGUIInOutFader.h +++ b/source/Irrlicht/CGUIInOutFader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_IN_OUT_FADER_H_INCLUDED__ -#define __C_GUI_IN_OUT_FADER_H_INCLUDED__ +#ifndef IRR_C_GUI_IN_OUT_FADER_H_INCLUDED +#define IRR_C_GUI_IN_OUT_FADER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -24,29 +24,29 @@ namespace gui s32 id, core::rect rectangle); //! 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. - 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. - virtual void setColor(video::SColor color ) _IRR_OVERRIDE_; - virtual void setColor(video::SColor source, video::SColor dest) _IRR_OVERRIDE_; + virtual void setColor(video::SColor color ) IRR_OVERRIDE; + virtual void setColor(video::SColor source, video::SColor dest) IRR_OVERRIDE; //! Starts the fade in process. - virtual void fadeIn(u32 time) _IRR_OVERRIDE_; + virtual void fadeIn(u32 time) IRR_OVERRIDE; //! 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. - virtual bool isReady() const _IRR_OVERRIDE_; + virtual bool isReady() const IRR_OVERRIDE; //! 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 - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: @@ -71,5 +71,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_IN_OUT_FADER_H_INCLUDED__ - +#endif // IRR_C_GUI_IN_OUT_FADER_H_INCLUDED diff --git a/source/Irrlicht/CGUIListBox.h b/source/Irrlicht/CGUIListBox.h index 4fc61220..0afe81d4 100644 --- a/source/Irrlicht/CGUIListBox.h +++ b/source/Irrlicht/CGUIListBox.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_LIST_BOX_H_INCLUDED__ -#define __C_GUI_LIST_BOX_H_INCLUDED__ +#ifndef IRR_C_GUI_LIST_BOX_H_INCLUDED +#define IRR_C_GUI_LIST_BOX_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -31,108 +31,108 @@ namespace gui virtual ~CGUIListBox(); //! 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 - 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 - virtual u32 addItem(const wchar_t* text) _IRR_OVERRIDE_; + virtual u32 addItem(const wchar_t* text) IRR_OVERRIDE; //! 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. - 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 - 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 - virtual void setSelected(const wchar_t *item) _IRR_OVERRIDE_; + virtual void setSelected(const wchar_t *item) IRR_OVERRIDE; //! 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 - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; //! adds an list item with an icon //! \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 //! \return //! 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 - virtual s32 getIcon(u32 id) const _IRR_OVERRIDE_; + virtual s32 getIcon(u32 id) const IRR_OVERRIDE; //! 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 - 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 //! 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 //! 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 - virtual void setAutoScrollEnabled(bool scroll) _IRR_OVERRIDE_; + virtual void setAutoScrollEnabled(bool scroll) IRR_OVERRIDE; //! 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 - virtual void updateAbsolutePosition() _IRR_OVERRIDE_; + virtual void updateAbsolutePosition() IRR_OVERRIDE; //! 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 - 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 - 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 - 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 - virtual void clearItemOverrideColor(u32 index) _IRR_OVERRIDE_; + virtual void clearItemOverrideColor(u32 index) IRR_OVERRIDE; //! 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? - 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. - 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 - 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 - 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 //! 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 - virtual void swapItems(u32 index1, u32 index2) _IRR_OVERRIDE_; + virtual void swapItems(u32 index1, u32 index2) IRR_OVERRIDE; //! set global itemHeight - virtual void setItemHeight( s32 height ) _IRR_OVERRIDE_; + virtual void setItemHeight( s32 height ) IRR_OVERRIDE; //! Sets whether to draw the background - virtual void setDrawBackground(bool draw) _IRR_OVERRIDE_; + virtual void setDrawBackground(bool draw) IRR_OVERRIDE; //! Access the vertical scrollbar - virtual IGUIScrollBar* getVerticalScrollBar() const _IRR_OVERRIDE_; + virtual IGUIScrollBar* getVerticalScrollBar() const IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CGUIMenu.h b/source/Irrlicht/CGUIMenu.h index 7e5f9fcd..954dac64 100644 --- a/source/Irrlicht/CGUIMenu.h +++ b/source/Irrlicht/CGUIMenu.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_MENU_H_INCLUDED__ -#define __C_GUI_MENU_H_INCLUDED__ +#ifndef IRR_C_GUI_MENU_H_INCLUDED +#define IRR_C_GUI_MENU_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -24,29 +24,27 @@ namespace gui CGUIMenu(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect rectangle); //! draws the element and its children - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; //! 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. - virtual void updateAbsolutePosition() _IRR_OVERRIDE_; + virtual void updateAbsolutePosition() IRR_OVERRIDE; protected: - virtual void recalculateSize() _IRR_OVERRIDE_; + virtual void recalculateSize() IRR_OVERRIDE; //! returns the item highlight-area - virtual core::rect getHRect(const SItem& i, const core::rect& absolute) const _IRR_OVERRIDE_; + virtual core::rect getHRect(const SItem& i, const core::rect& absolute) const IRR_OVERRIDE; //! Gets drawing rect of Item - virtual core::rect getRect(const SItem& i, const core::rect& absolute) const _IRR_OVERRIDE_; + virtual core::rect getRect(const SItem& i, const core::rect& absolute) const IRR_OVERRIDE; }; } // end namespace gui } // end namespace irr - -#endif // __C_GUI_MENU_H_INCLUDED__ #endif // _IRR_COMPILE_WITH_GUI_ - +#endif // IRR_C_GUI_MENU_H_INCLUDED diff --git a/source/Irrlicht/CGUIMeshViewer.h b/source/Irrlicht/CGUIMeshViewer.h index 431a9dc9..be2343ab 100644 --- a/source/Irrlicht/CGUIMeshViewer.h +++ b/source/Irrlicht/CGUIMeshViewer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_MESH_VIEWER_H_INCLUDED__ -#define __C_GUI_MESH_VIEWER_H_INCLUDED__ +#ifndef IRR_C_GUI_MESH_VIEWER_H_INCLUDED +#define IRR_C_GUI_MESH_VIEWER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -28,22 +28,22 @@ namespace gui virtual ~CGUIMeshViewer(); //! 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 - virtual scene::IAnimatedMesh* getMesh() const _IRR_OVERRIDE_; + virtual scene::IAnimatedMesh* getMesh() const IRR_OVERRIDE; //! sets the material - virtual void setMaterial(const video::SMaterial& material) _IRR_OVERRIDE_; + virtual void setMaterial(const video::SMaterial& material) IRR_OVERRIDE; //! gets the material - virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_; + virtual const video::SMaterial& getMaterial() const IRR_OVERRIDE; //! 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 - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; private: @@ -57,5 +57,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_MESH_VIEWER_H_INCLUDED__ - +#endif // IRR_C_GUI_MESH_VIEWER_H_INCLUDED diff --git a/source/Irrlicht/CGUIMessageBox.h b/source/Irrlicht/CGUIMessageBox.h index 91d98860..0d17d50a 100644 --- a/source/Irrlicht/CGUIMessageBox.h +++ b/source/Irrlicht/CGUIMessageBox.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_MESSAGE_BOX_H_INCLUDED__ -#define __C_GUI_MESSAGE_BOX_H_INCLUDED__ +#ifndef IRR_C_GUI_MESSAGE_BOX_H_INCLUDED +#define IRR_C_GUI_MESSAGE_BOX_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -30,13 +30,13 @@ namespace gui virtual ~CGUIMessageBox(); //! 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. - 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 - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CGUIModalScreen.h b/source/Irrlicht/CGUIModalScreen.h index c9ab8921..b57e4fc9 100644 --- a/source/Irrlicht/CGUIModalScreen.h +++ b/source/Irrlicht/CGUIModalScreen.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_MODAL_SCREEN_H_INCLUDED__ -#define __C_GUI_MODAL_SCREEN_H_INCLUDED__ +#ifndef IRR_C_GUI_MODAL_SCREEN_H_INCLUDED +#define IRR_C_GUI_MODAL_SCREEN_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -23,34 +23,34 @@ namespace gui CGUIModalScreen(IGUIEnvironment* environment, IGUIElement* parent, s32 id); //! called if an event happened. - virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; + virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE; //! Removes a child. - virtual void removeChild(IGUIElement* child) _IRR_OVERRIDE_; + virtual void removeChild(IGUIElement* child) IRR_OVERRIDE; //! Adds a child - virtual void addChild(IGUIElement* child) _IRR_OVERRIDE_; + virtual void addChild(IGUIElement* child) IRR_OVERRIDE; //! draws the element and its children - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; //! 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. //! 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. - virtual bool isVisible() const _IRR_OVERRIDE_; + virtual bool isVisible() const IRR_OVERRIDE; //! Modals are infinite so every point is inside - virtual bool isPointInside(const core::position2d& point) const _IRR_OVERRIDE_; + virtual bool isPointInside(const core::position2d& point) const IRR_OVERRIDE; //! 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 - 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. //! Bitset of following values (can be combined) @@ -83,4 +83,3 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ #endif - diff --git a/source/Irrlicht/CGUIProfiler.h b/source/Irrlicht/CGUIProfiler.h index a3c5399a..81a10414 100644 --- a/source/Irrlicht/CGUIProfiler.h +++ b/source/Irrlicht/CGUIProfiler.h @@ -2,8 +2,8 @@ // For conditions of distribution and use, see copyright notice in irrlicht.h // Written by Michael Zeilfelder -#ifndef C_GUI_PROFILER_H_INCLUDED__ -#define C_GUI_PROFILER_H_INCLUDED__ +#ifndef IRR_C_GUI_PROFILER_H_INCLUDED +#define IRR_C_GUI_PROFILER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -28,53 +28,53 @@ namespace gui CGUIProfiler(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect rectangle, IProfiler* profiler); //! 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 - virtual void nextPage(bool includeOverview) _IRR_OVERRIDE_; + virtual void nextPage(bool includeOverview) IRR_OVERRIDE; //! 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. /** \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? - virtual bool getShowGroupsTogether() const _IRR_OVERRIDE_; + virtual bool getShowGroupsTogether() const IRR_OVERRIDE; //! 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) - virtual IGUIFont* getOverrideFont() const _IRR_OVERRIDE_; + virtual IGUIFont* getOverrideFont() const IRR_OVERRIDE; //! 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, - virtual void setDrawBackground(bool draw) _IRR_OVERRIDE_; + virtual void setDrawBackground(bool draw) IRR_OVERRIDE; //! Checks if background drawing is enabled /** \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 - virtual void setFrozen(bool freeze) _IRR_OVERRIDE_; + virtual void setFrozen(bool freeze) IRR_OVERRIDE; //! 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 - 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& point) _IRR_OVERRIDE_ + virtual IGUIElement* getElementFromPoint(const core::position2d& point) IRR_OVERRIDE { // This element should never get focus from mouse-clicks return 0; } - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; protected: @@ -103,4 +103,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_IMAGE_H_INCLUDED__ +#endif diff --git a/source/Irrlicht/CGUIScrollBar.h b/source/Irrlicht/CGUIScrollBar.h index 2bbe50ac..53abbc0f 100644 --- a/source/Irrlicht/CGUIScrollBar.h +++ b/source/Irrlicht/CGUIScrollBar.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_SCROLL_BAR_H_INCLUDED__ -#define __C_GUI_SCROLL_BAR_H_INCLUDED__ +#ifndef IRR_C_GUI_SCROLL_BAR_H_INCLUDED +#define IRR_C_GUI_SCROLL_BAR_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -29,52 +29,52 @@ namespace gui virtual ~CGUIScrollBar(); //! 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 - 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. - virtual s32 getMax() const _IRR_OVERRIDE_; + virtual s32 getMax() const IRR_OVERRIDE; //! 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. - virtual s32 getMin() const _IRR_OVERRIDE_; + virtual s32 getMin() const IRR_OVERRIDE; //! 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 - virtual s32 getSmallStep() const _IRR_OVERRIDE_; + virtual s32 getSmallStep() const IRR_OVERRIDE; //! sets the small step value - virtual void setSmallStep(s32 step) _IRR_OVERRIDE_; + virtual void setSmallStep(s32 step) IRR_OVERRIDE; //! gets the large step value - virtual s32 getLargeStep() const _IRR_OVERRIDE_; + virtual s32 getLargeStep() const IRR_OVERRIDE; //! 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 - virtual s32 getPos() const _IRR_OVERRIDE_; + virtual s32 getPos() const IRR_OVERRIDE; //! sets the position of the scrollbar - virtual void setPos(s32 pos) _IRR_OVERRIDE_; + virtual void setPos(s32 pos) IRR_OVERRIDE; //! updates the rectangle - virtual void updateAbsolutePosition() _IRR_OVERRIDE_; + virtual void updateAbsolutePosition() IRR_OVERRIDE; //! 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 - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: @@ -110,4 +110,3 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ #endif - diff --git a/source/Irrlicht/CGUISkin.h b/source/Irrlicht/CGUISkin.h index eb58e6be..0cf682ef 100644 --- a/source/Irrlicht/CGUISkin.h +++ b/source/Irrlicht/CGUISkin.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_SKIN_H_INCLUDED__ -#define __C_GUI_SKIN_H_INCLUDED__ +#ifndef IRR_C_GUI_SKIN_H_INCLUDED +#define IRR_C_GUI_SKIN_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -30,49 +30,49 @@ namespace gui virtual ~CGUISkin(); //! 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 - 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 - virtual s32 getSize(EGUI_DEFAULT_SIZE size) const _IRR_OVERRIDE_; + virtual s32 getSize(EGUI_DEFAULT_SIZE size) const IRR_OVERRIDE; //! 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 - 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 - 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 - virtual void setSpriteBank(IGUISpriteBank* bank) _IRR_OVERRIDE_; + virtual void setSpriteBank(IGUISpriteBank* bank) IRR_OVERRIDE; //! 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 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 the sprite index used for drawing icons like arrows, close buttons and ticks in checkboxes \param icon: Enum specifying which icon to change \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. /** For example for Message box button captions: "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. /** For example for Message box button captions: "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 /** 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. */ virtual void draw3DButtonPaneStandard(IGUIElement* element, const core::rect& rect, - const core::rect* clip=0) _IRR_OVERRIDE_; + const core::rect* clip=0) IRR_OVERRIDE; //! draws a pressed 3d button pane /** Used for drawing for example buttons in pressed state. @@ -98,7 +98,7 @@ namespace gui implementations to find out how to draw the part exactly. */ virtual void draw3DButtonPanePressed(IGUIElement* element, const core::rect& rect, - const core::rect* clip=0) _IRR_OVERRIDE_; + const core::rect* clip=0) IRR_OVERRIDE; //! draws a sunken 3d pane /** Used for drawing the background of edit, combo or check boxes. @@ -114,7 +114,7 @@ namespace gui video::SColor bgcolor, bool flat, bool fillBackGround, const core::rect& rect, - const core::rect* clip=0) _IRR_OVERRIDE_; + const core::rect* clip=0) IRR_OVERRIDE; //! draws a window background /** Used for drawing the background of dialogs and windows. @@ -134,7 +134,7 @@ namespace gui bool drawTitleBar, video::SColor titleBarColor, const core::rect& rect, const core::rect* clip, - core::rect* checkClientArea) _IRR_OVERRIDE_; + core::rect* checkClientArea) IRR_OVERRIDE; //! draws a standard 3d menu pane /** Used for drawing for menus and context menus. @@ -147,7 +147,7 @@ namespace gui \param clip: Clip area. */ virtual void draw3DMenuPane(IGUIElement* element, const core::rect& rect, - const core::rect* clip=0) _IRR_OVERRIDE_; + const core::rect* clip=0) IRR_OVERRIDE; //! draws a standard 3d tool bar /** Used for drawing for toolbars and menus. @@ -158,7 +158,7 @@ namespace gui \param clip: Clip area. */ virtual void draw3DToolBar(IGUIElement* element, const core::rect& rect, - const core::rect* clip=0) _IRR_OVERRIDE_; + const core::rect* clip=0) IRR_OVERRIDE; //! draws a tab button /** Used for drawing for tab buttons on top of tabs. @@ -170,7 +170,7 @@ namespace gui \param clip: Clip area. */ virtual void draw3DTabButton(IGUIElement* element, bool active, const core::rect& rect, const core::rect* clip=0, - EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT) _IRR_OVERRIDE_; + EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT) IRR_OVERRIDE; //! draws a tab control body /** \param element: Pointer to the element which wishes to draw this. This parameter @@ -182,7 +182,7 @@ namespace gui \param clip: Clip area. */ virtual void draw3DTabBody(IGUIElement* element, bool border, bool background, const core::rect& rect, const core::rect* 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 /** \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, const core::position2di position, u32 starttime=0, u32 currenttime=0, - bool loop=false, const core::rect* clip=0) _IRR_OVERRIDE_; + bool loop=false, const core::rect* clip=0) IRR_OVERRIDE; //! draws a 2d rectangle. @@ -210,17 +210,17 @@ namespace gui \param clip: Pointer to rectangle against which the rectangle will be clipped. If the pointer is null, no clipping will be performed. */ virtual void draw2DRectangle(IGUIElement* element, const video::SColor &color, - const core::rect& pos, const core::rect* clip = 0) _IRR_OVERRIDE_; + const core::rect& pos, const core::rect* clip = 0) IRR_OVERRIDE; //! 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 - 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 - 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: @@ -243,5 +243,3 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ #endif - - diff --git a/source/Irrlicht/CGUISpinBox.h b/source/Irrlicht/CGUISpinBox.h index 1a84359a..b412577e 100644 --- a/source/Irrlicht/CGUISpinBox.h +++ b/source/Irrlicht/CGUISpinBox.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_SPIN_BOX_H_INCLUDED__ -#define __C_GUI_SPIN_BOX_H_INCLUDED__ +#ifndef IRR_C_GUI_SPIN_BOX_H_INCLUDED +#define IRR_C_GUI_SPIN_BOX_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -32,62 +32,62 @@ namespace gui /** \param enable: If set to true, the override color, which can be set with IGUIEditBox::setOverrideColor is used, otherwise the 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 /** \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 - virtual f32 getValue() const _IRR_OVERRIDE_; + virtual f32 getValue() const IRR_OVERRIDE; //! set the range of values which can be used in the spinbox /** \param min: minimum 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 - virtual f32 getMin() const _IRR_OVERRIDE_; + virtual f32 getMin() const IRR_OVERRIDE; //! 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 /** \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 - virtual f32 getStepSize() const _IRR_OVERRIDE_; + virtual f32 getStepSize() const IRR_OVERRIDE; //! 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. - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; //! 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. - virtual const wchar_t* getText() const _IRR_OVERRIDE_; + virtual const wchar_t* getText() const IRR_OVERRIDE; //! Sets the number of decimal places to display. //! 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 */ - virtual void setDecimalPlaces(s32 places) _IRR_OVERRIDE_; + virtual void setDecimalPlaces(s32 places) IRR_OVERRIDE; //! Sets when the spinbox has to validate entered text. /** \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. - virtual u32 getValidateOn() const _IRR_OVERRIDE_; + virtual u32 getValidateOn() const IRR_OVERRIDE; //! 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 - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; protected: virtual void verifyValueRange(); @@ -112,5 +112,4 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_SPIN_BOX_H_INCLUDED__ - +#endif // IRR_C_GUI_SPIN_BOX_H_INCLUDED diff --git a/source/Irrlicht/CGUISpriteBank.h b/source/Irrlicht/CGUISpriteBank.h index 06c154d6..1d63c531 100644 --- a/source/Irrlicht/CGUISpriteBank.h +++ b/source/Irrlicht/CGUISpriteBank.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_SPRITE_BANK_H_INCLUDED__ -#define __C_GUI_SPRITE_BANK_H_INCLUDED__ +#ifndef IRR_C_GUI_SPRITE_BANK_H_INCLUDED +#define IRR_C_GUI_SPRITE_BANK_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -32,38 +32,38 @@ public: CGUISpriteBank(IGUIEnvironment* env); virtual ~CGUISpriteBank(); - virtual core::array< core::rect >& getPositions() _IRR_OVERRIDE_; - virtual core::array< SGUISprite >& getSprites() _IRR_OVERRIDE_; + virtual core::array< core::rect >& getPositions() IRR_OVERRIDE; + virtual core::array< SGUISprite >& getSprites() IRR_OVERRIDE; - virtual u32 getTextureCount() const _IRR_OVERRIDE_; - virtual video::ITexture* getTexture(u32 index) const _IRR_OVERRIDE_; - virtual void addTexture(video::ITexture* texture) _IRR_OVERRIDE_; - virtual void setTexture(u32 index, video::ITexture* texture) _IRR_OVERRIDE_; + virtual u32 getTextureCount() const IRR_OVERRIDE; + virtual video::ITexture* getTexture(u32 index) const IRR_OVERRIDE; + virtual void addTexture(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. - virtual s32 addTextureAsSprite(video::ITexture* texture) _IRR_OVERRIDE_; + virtual s32 addTextureAsSprite(video::ITexture* texture) IRR_OVERRIDE; //! clears sprites, rectangles and textures - virtual void clear() _IRR_OVERRIDE_; + virtual void clear() IRR_OVERRIDE; //! Draws a sprite in 2d with position and color virtual void draw2DSprite(u32 index, const core::position2di& pos, const core::rect* clip=0, 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 virtual void draw2DSprite(u32 index, const core::rect& destRect, const core::rect* clip=0, const video::SColor * const colors=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 virtual void draw2DSpriteBatch(const core::array& indices, const core::array& pos, const core::rect* clip=0, const video::SColor& color= video::SColor(255,255,255,255), u32 starttime=0, u32 currenttime=0, - bool loop=true, bool center=false) _IRR_OVERRIDE_; + bool loop=true, bool center=false) IRR_OVERRIDE; protected: @@ -101,5 +101,4 @@ protected: #endif // _IRR_COMPILE_WITH_GUI_ -#endif // __C_GUI_SPRITE_BANK_H_INCLUDED__ - +#endif // IRR_C_GUI_SPRITE_BANK_H_INCLUDED diff --git a/source/Irrlicht/CGUIStaticText.h b/source/Irrlicht/CGUIStaticText.h index b7fbf738..d80d0fe1 100644 --- a/source/Irrlicht/CGUIStaticText.h +++ b/source/Irrlicht/CGUIStaticText.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_STATIC_TEXT_H_INCLUDED__ -#define __C_GUI_STATIC_TEXT_H_INCLUDED__ +#ifndef IRR_C_GUI_STATIC_TEXT_H_INCLUDED +#define IRR_C_GUI_STATIC_TEXT_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -28,78 +28,78 @@ namespace gui virtual ~CGUIStaticText(); //! draws the element and its children - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; //! 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) - virtual IGUIFont* getOverrideFont() const _IRR_OVERRIDE_; + virtual IGUIFont* getOverrideFont() const IRR_OVERRIDE; //! 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. - virtual void setOverrideColor(video::SColor color) _IRR_OVERRIDE_; + virtual void setOverrideColor(video::SColor color) IRR_OVERRIDE; //! 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 - virtual void setDrawBackground(bool draw) _IRR_OVERRIDE_; + virtual void setDrawBackground(bool draw) IRR_OVERRIDE; //! Gets the background color - virtual video::SColor getBackgroundColor() const _IRR_OVERRIDE_; + virtual video::SColor getBackgroundColor() const IRR_OVERRIDE; //! Checks if background drawing is enabled - virtual bool isDrawBackgroundEnabled() const _IRR_OVERRIDE_; + virtual bool isDrawBackgroundEnabled() const IRR_OVERRIDE; //! 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 - virtual bool isDrawBorderEnabled() const _IRR_OVERRIDE_; + virtual bool isDrawBorderEnabled() const IRR_OVERRIDE; //! 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 - virtual video::SColor getOverrideColor() const _IRR_OVERRIDE_; + virtual video::SColor getOverrideColor() const IRR_OVERRIDE; //! 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 //! 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 - 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 - 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 - virtual bool isTextRestrainedInside() const _IRR_OVERRIDE_; + virtual bool isTextRestrainedInside() const IRR_OVERRIDE; //! Enables or disables word wrap for using the static text as //! multiline text control. - virtual void setWordWrap(bool enable) _IRR_OVERRIDE_; + virtual void setWordWrap(bool enable) IRR_OVERRIDE; //! 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. - 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. - virtual s32 getTextHeight() const _IRR_OVERRIDE_; + virtual s32 getTextHeight() const IRR_OVERRIDE; //! 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 - virtual void updateAbsolutePosition() _IRR_OVERRIDE_; + virtual void updateAbsolutePosition() IRR_OVERRIDE; //! Set whether the string should be interpreted as right-to-left (RTL) text /** \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 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 - virtual bool isRightToLeft() const _IRR_OVERRIDE_; + virtual bool isRightToLeft() const IRR_OVERRIDE; //! 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 - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: @@ -145,4 +145,3 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ #endif - diff --git a/source/Irrlicht/CGUITabControl.h b/source/Irrlicht/CGUITabControl.h index 3752a10f..3c34a156 100644 --- a/source/Irrlicht/CGUITabControl.h +++ b/source/Irrlicht/CGUITabControl.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_TAB_CONTROL_H_INCLUDED__ -#define __C_GUI_TAB_CONTROL_H_INCLUDED__ +#ifndef IRR_C_GUI_TAB_CONTROL_H_INCLUDED +#define IRR_C_GUI_TAB_CONTROL_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -30,30 +30,30 @@ namespace gui s32 id); //! draws the element and its children - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; //! 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. - virtual void setBackgroundColor(video::SColor c) _IRR_OVERRIDE_; + virtual void setBackgroundColor(video::SColor c) IRR_OVERRIDE; //! 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 - virtual bool isDrawingBackground() const _IRR_OVERRIDE_; + virtual bool isDrawingBackground() const IRR_OVERRIDE; //! 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. - 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 - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: @@ -78,87 +78,87 @@ namespace gui virtual ~CGUITabControl(); //! 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 - virtual s32 addTab(IGUITab* tab) _IRR_OVERRIDE_; + virtual s32 addTab(IGUITab* tab) IRR_OVERRIDE; //! 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 /** 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*/ - 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 - virtual void removeTab(s32 idx) _IRR_OVERRIDE_; + virtual void removeTab(s32 idx) IRR_OVERRIDE; //! Clears the tabcontrol removing all tabs - virtual void clear() _IRR_OVERRIDE_; + virtual void clear() IRR_OVERRIDE; //! 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 - virtual IGUITab* getTab(s32 idx) const _IRR_OVERRIDE_; + virtual IGUITab* getTab(s32 idx) const IRR_OVERRIDE; //! Brings a tab to front. - virtual bool setActiveTab(s32 idx) _IRR_OVERRIDE_; + virtual bool setActiveTab(s32 idx) IRR_OVERRIDE; //! 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) - virtual s32 getTabIndex(const IGUIElement *tab) const _IRR_OVERRIDE_; + virtual s32 getTabIndex(const IGUIElement *tab) const IRR_OVERRIDE; //! 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 - 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. - virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; + virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE; //! draws the element and its children - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; //! Removes a child. - virtual void removeChild(IGUIElement* child) _IRR_OVERRIDE_; + virtual void removeChild(IGUIElement* child) IRR_OVERRIDE; //! 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 - virtual void setTabHeight( s32 height ) _IRR_OVERRIDE_; + virtual void setTabHeight( s32 height ) IRR_OVERRIDE; //! 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 - 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". - virtual void setTabMaxWidth(s32 width ) _IRR_OVERRIDE_; + virtual void setTabMaxWidth(s32 width ) IRR_OVERRIDE; //! 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 //! 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 - 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 - 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 - virtual s32 getTabExtraWidth() const _IRR_OVERRIDE_; + virtual s32 getTabExtraWidth() const IRR_OVERRIDE; //! Update the position of the element, decides scroll button status - virtual void updateAbsolutePosition() _IRR_OVERRIDE_; + virtual void updateAbsolutePosition() IRR_OVERRIDE; private: @@ -195,4 +195,3 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ #endif - diff --git a/source/Irrlicht/CGUITable.h b/source/Irrlicht/CGUITable.h index f325f49f..fcc499e4 100644 --- a/source/Irrlicht/CGUITable.h +++ b/source/Irrlicht/CGUITable.h @@ -5,8 +5,8 @@ // 07.10.2005 - Multicolor-Listbox addet by A. Buschhueter (Acki) // A_Buschhueter@gmx.de -#ifndef __C_GUI_TABLE_BAR_H_INCLUDED__ -#define __C_GUI_TABLE_BAR_H_INCLUDED__ +#ifndef IRR_C_GUI_TABLE_BAR_H_INCLUDED +#define IRR_C_GUI_TABLE_BAR_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -35,52 +35,52 @@ namespace gui //! Adds a column //! 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 - virtual void removeColumn(u32 columnIndex) _IRR_OVERRIDE_; + virtual void removeColumn(u32 columnIndex) IRR_OVERRIDE; //! 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. /** \param idx: The id of the column to make active. \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 - virtual s32 getActiveColumn() const _IRR_OVERRIDE_; + virtual s32 getActiveColumn() const IRR_OVERRIDE; //! 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 - virtual void setColumnWidth(u32 columnIndex, u32 width) _IRR_OVERRIDE_; + virtual void setColumnWidth(u32 columnIndex, u32 width) IRR_OVERRIDE; //! 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 - virtual void setResizableColumns(bool resizable) _IRR_OVERRIDE_; + virtual void setResizableColumns(bool resizable) IRR_OVERRIDE; //! 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 //! a column header is clicked. /** \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 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 - virtual s32 getSelected() const _IRR_OVERRIDE_; + virtual s32 getSelected() const IRR_OVERRIDE; //! 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 - virtual s32 getRowCount() const _IRR_OVERRIDE_; + virtual s32 getRowCount() const IRR_OVERRIDE; //! adds a row to the table /** \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 won't be created. Note that if you create a row that is 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 - virtual void removeRow(u32 rowIndex) _IRR_OVERRIDE_; + virtual void removeRow(u32 rowIndex) IRR_OVERRIDE; //! 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. - 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 //! 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 //! of ordering when adding a lot of rows. //! \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 - 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. - 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 //! 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 - 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 - 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 - 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 - virtual void clear() _IRR_OVERRIDE_; + virtual void clear() IRR_OVERRIDE; //! 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 - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; //! 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 - virtual s32 getDrawFlags() const _IRR_OVERRIDE_; + virtual s32 getDrawFlags() const IRR_OVERRIDE; //! 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) - virtual IGUIFont* getOverrideFont() const _IRR_OVERRIDE_; + virtual IGUIFont* getOverrideFont() const IRR_OVERRIDE; //! 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 - virtual s32 getItemHeight() const _IRR_OVERRIDE_; + virtual s32 getItemHeight() const IRR_OVERRIDE; //! Access the vertical scrollbar - virtual IGUIScrollBar* getVerticalScrollBar() const _IRR_OVERRIDE_; + virtual IGUIScrollBar* getVerticalScrollBar() const IRR_OVERRIDE; //! Access the horizontal scrollbar - virtual IGUIScrollBar* getHorizontalScrollBar() const _IRR_OVERRIDE_; + virtual IGUIScrollBar* getHorizontalScrollBar() const IRR_OVERRIDE; //! 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 /** \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. //! Implement this to expose the attributes of your scene node animator for //! 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. //! Implement this to set the attributes of your scene node animator for //! 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: void refreshControls(); @@ -251,4 +251,3 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ #endif - diff --git a/source/Irrlicht/CGUIToolBar.h b/source/Irrlicht/CGUIToolBar.h index 316a926b..c9847dad 100644 --- a/source/Irrlicht/CGUIToolBar.h +++ b/source/Irrlicht/CGUIToolBar.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_TOOL_BAR_H_INCLUDED__ -#define __C_GUI_TOOL_BAR_H_INCLUDED__ +#ifndef IRR_C_GUI_TOOL_BAR_H_INCLUDED +#define IRR_C_GUI_TOOL_BAR_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -24,18 +24,18 @@ namespace gui CGUIToolBar(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect rectangle); //! 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 - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; //! Updates the absolute position. - virtual void updateAbsolutePosition() _IRR_OVERRIDE_; + virtual void updateAbsolutePosition() IRR_OVERRIDE; //! Adds a button to the tool bar virtual IGUIButton* addButton(s32 id=-1, const wchar_t* text=0,const wchar_t* tooltiptext=0, video::ITexture* img=0, video::ITexture* pressed=0, - bool isPushButton=false, bool useAlphaChannel=false) _IRR_OVERRIDE_; + bool isPushButton=false, bool useAlphaChannel=false) IRR_OVERRIDE; private: @@ -49,4 +49,3 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ #endif - diff --git a/source/Irrlicht/CGUITreeView.h b/source/Irrlicht/CGUITreeView.h index bdcf035e..42e9b7dd 100644 --- a/source/Irrlicht/CGUITreeView.h +++ b/source/Irrlicht/CGUITreeView.h @@ -1,8 +1,8 @@ // This file is part of the "Irrlicht Engine". // written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de -#ifndef __C_GUI_TREE_VIEW_H_INCLUDED__ -#define __C_GUI_TREE_VIEW_H_INCLUDED__ +#ifndef IRR_C_GUI_TREE_VIEW_H_INCLUDED +#define IRR_C_GUI_TREE_VIEW_H_INCLUDED #include "IGUITreeView.h" #include "irrList.h" @@ -30,55 +30,55 @@ namespace gui ~CGUITreeViewNode(); //! 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. - virtual IGUITreeViewNode* getParent() const _IRR_OVERRIDE_; + virtual IGUITreeViewNode* getParent() const IRR_OVERRIDE; //! 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(); } //! 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 - virtual const wchar_t* getIcon() const _IRR_OVERRIDE_ + virtual const wchar_t* getIcon() const IRR_OVERRIDE { return Icon.c_str(); } //! sets the icon text of the node - virtual void setIcon( const wchar_t* icon ) _IRR_OVERRIDE_; + virtual void setIcon( const wchar_t* icon ) IRR_OVERRIDE; //! returns the image index of the node - virtual u32 getImageIndex() const _IRR_OVERRIDE_ + virtual u32 getImageIndex() const IRR_OVERRIDE { return ImageIndex; } //! sets the image index of the node - virtual void setImageIndex( u32 imageIndex ) _IRR_OVERRIDE_ + virtual void setImageIndex( u32 imageIndex ) IRR_OVERRIDE { ImageIndex = imageIndex; } //! returns the image index of the node - virtual u32 getSelectedImageIndex() const _IRR_OVERRIDE_ + virtual u32 getSelectedImageIndex() const IRR_OVERRIDE { return SelectedImageIndex; } //! sets the image index of the node - virtual void setSelectedImageIndex( u32 imageIndex ) _IRR_OVERRIDE_ + virtual void setSelectedImageIndex( u32 imageIndex ) IRR_OVERRIDE { SelectedImageIndex = imageIndex; } //! returns the user data (void*) of this node - virtual void* getData() const _IRR_OVERRIDE_ + virtual void* getData() const IRR_OVERRIDE { return Data; } //! sets the user data (void*) of this node - virtual void setData( void* data ) _IRR_OVERRIDE_ + virtual void setData( void* data ) IRR_OVERRIDE { Data = data; } //! returns the user data2 (IReferenceCounted) of this node - virtual IReferenceCounted* getData2() const _IRR_OVERRIDE_ + virtual IReferenceCounted* getData2() const IRR_OVERRIDE { return Data2; } //! sets the user data2 (IReferenceCounted) of this node - virtual void setData2( IReferenceCounted* data ) _IRR_OVERRIDE_ + virtual void setData2( IReferenceCounted* data ) IRR_OVERRIDE { if( Data2 ) { @@ -92,14 +92,14 @@ namespace gui } //! returns the child item count - virtual u32 getChildCount() const _IRR_OVERRIDE_ + virtual u32 getChildCount() const IRR_OVERRIDE { return Children.getSize(); } //! 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 - virtual bool hasChildren() const _IRR_OVERRIDE_ + virtual bool hasChildren() const IRR_OVERRIDE { return !Children.empty(); } //! Adds a new node behind the last child node. @@ -117,7 +117,7 @@ namespace gui s32 imageIndex = -1, s32 selectedImageIndex = -1, void* data = 0, - IReferenceCounted* data2 = 0) _IRR_OVERRIDE_; + IReferenceCounted* data2 = 0) IRR_OVERRIDE; //! Adds a new node before the first child node. //! \param text text of the new node @@ -134,7 +134,7 @@ namespace gui s32 imageIndex = -1, s32 selectedImageIndex = -1, void* data = 0, - IReferenceCounted* data2 = 0 ) _IRR_OVERRIDE_; + IReferenceCounted* data2 = 0 ) IRR_OVERRIDE; //! Adds a new node behind the other node. //! The other node has also te be a child node from this node. @@ -153,7 +153,7 @@ namespace gui s32 imageIndex = -1, s32 selectedImageIndex = -1, void* data = 0, - IReferenceCounted* data2 = 0 ) _IRR_OVERRIDE_; + IReferenceCounted* data2 = 0 ) IRR_OVERRIDE; //! Adds a new node before the other node. //! The other node has also te be a child node from this node. @@ -172,53 +172,53 @@ namespace gui s32 imageIndex = -1, s32 selectedImageIndex = -1, void* data = 0, - IReferenceCounted* data2 = 0 ) _IRR_OVERRIDE_; + IReferenceCounted* data2 = 0 ) IRR_OVERRIDE; //! 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. - virtual IGUITreeViewNode* getLastChild() const _IRR_OVERRIDE_; + virtual IGUITreeViewNode* getLastChild() const IRR_OVERRIDE; //! 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. - 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. - virtual IGUITreeViewNode* getNextVisible() const _IRR_OVERRIDE_; + virtual IGUITreeViewNode* getNextVisible() const IRR_OVERRIDE; //! 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. - virtual bool moveChildUp( IGUITreeViewNode* child ) _IRR_OVERRIDE_; + virtual bool moveChildUp( IGUITreeViewNode* child ) IRR_OVERRIDE; //! 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). - virtual bool getExpanded() const _IRR_OVERRIDE_ + virtual bool getExpanded() const IRR_OVERRIDE { return 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. - virtual bool getSelected() const _IRR_OVERRIDE_; + virtual bool getSelected() const IRR_OVERRIDE; //! 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. - virtual bool isRoot() const _IRR_OVERRIDE_; + virtual bool isRoot() const IRR_OVERRIDE; //! 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). - virtual bool isVisible() const _IRR_OVERRIDE_; + virtual bool isVisible() const IRR_OVERRIDE; private: @@ -250,71 +250,71 @@ namespace gui virtual ~CGUITreeView(); //! returns the root node (not visible) from the tree. - virtual IGUITreeViewNode* getRoot() const _IRR_OVERRIDE_ + virtual IGUITreeViewNode* getRoot() const IRR_OVERRIDE { return Root; } //! returns the selected node of the tree or 0 if none is selected - virtual IGUITreeViewNode* getSelected() const _IRR_OVERRIDE_ + virtual IGUITreeViewNode* getSelected() const IRR_OVERRIDE { return Selected; } //! returns true if the tree lines are visible - virtual bool getLinesVisible() const _IRR_OVERRIDE_ + virtual bool getLinesVisible() const IRR_OVERRIDE { return LinesVisible; } //! sets if the tree lines are visible - virtual void setLinesVisible( bool visible ) _IRR_OVERRIDE_ + virtual void setLinesVisible( bool visible ) IRR_OVERRIDE { LinesVisible = visible; } //! 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 - 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 //! 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 //! 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. /** \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) /** \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 /** This is the override font when one is set and the 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. //! 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. - virtual IGUIImageList* getImageList() const _IRR_OVERRIDE_ + virtual IGUIImageList* getImageList() const IRR_OVERRIDE { return ImageList; } //! Sets if the image is left of the icon. Default is true. - virtual void setImageLeftOfIcon( bool bLeftOf ) _IRR_OVERRIDE_ + virtual void setImageLeftOfIcon( bool bLeftOf ) IRR_OVERRIDE { ImageLeftOfIcon = bLeftOf; } //! Returns if the Image is left of the icon. Default is true. - virtual bool getImageLeftOfIcon() const _IRR_OVERRIDE_ + virtual bool getImageLeftOfIcon() const IRR_OVERRIDE { return ImageLeftOfIcon; } //! Returns the node which is associated to the last event. - virtual IGUITreeViewNode* getLastEventNode() const _IRR_OVERRIDE_ + virtual IGUITreeViewNode* getLastEventNode() const IRR_OVERRIDE { return LastEventNode; } //! Access the vertical scrollbar - virtual IGUIScrollBar* getVerticalScrollBar() const _IRR_OVERRIDE_; + virtual IGUIScrollBar* getVerticalScrollBar() const IRR_OVERRIDE; //! Access the horizontal scrollbar - virtual IGUIScrollBar* getHorizontalScrollBar() const _IRR_OVERRIDE_; + virtual IGUIScrollBar* getHorizontalScrollBar() const IRR_OVERRIDE; private: //! calculates the heigth of an node and of all visible nodes. @@ -352,4 +352,3 @@ namespace gui } // end namespace irr #endif - diff --git a/source/Irrlicht/CGUIWindow.h b/source/Irrlicht/CGUIWindow.h index 8fb4bb24..7497064c 100644 --- a/source/Irrlicht/CGUIWindow.h +++ b/source/Irrlicht/CGUIWindow.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GUI_WINDOW_H_INCLUDED__ -#define __C_GUI_WINDOW_H_INCLUDED__ +#ifndef IRR_C_GUI_WINDOW_H_INCLUDED +#define IRR_C_GUI_WINDOW_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_GUI_ @@ -27,50 +27,50 @@ namespace gui virtual ~CGUIWindow(); //! called if an event happened. - virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; + virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE; //! update absolute position - virtual void updateAbsolutePosition() _IRR_OVERRIDE_; + virtual void updateAbsolutePosition() IRR_OVERRIDE; //! draws the element and its children - virtual void draw() _IRR_OVERRIDE_; + virtual void draw() IRR_OVERRIDE; //! Returns pointer to the close button - virtual IGUIButton* getCloseButton() const _IRR_OVERRIDE_; + virtual IGUIButton* getCloseButton() const IRR_OVERRIDE; //! Returns pointer to the minimize button - virtual IGUIButton* getMinimizeButton() const _IRR_OVERRIDE_; + virtual IGUIButton* getMinimizeButton() const IRR_OVERRIDE; //! 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 - virtual bool isDraggable() const _IRR_OVERRIDE_; + virtual bool isDraggable() const IRR_OVERRIDE; //! 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 - virtual void setDrawBackground(bool draw) _IRR_OVERRIDE_; + virtual void setDrawBackground(bool draw) IRR_OVERRIDE; //! 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 //! 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 - virtual bool getDrawTitlebar() const _IRR_OVERRIDE_; + virtual bool getDrawTitlebar() const IRR_OVERRIDE; //! Returns the rectangle of the drawable area (without border and without titlebar) - virtual core::rect getClientRect() const _IRR_OVERRIDE_; + virtual core::rect getClientRect() const IRR_OVERRIDE; //! 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 - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; protected: @@ -96,4 +96,3 @@ namespace gui #endif // _IRR_COMPILE_WITH_GUI_ #endif - diff --git a/source/Irrlicht/CGeometryCreator.h b/source/Irrlicht/CGeometryCreator.h index e2214a67..d7646c15 100644 --- a/source/Irrlicht/CGeometryCreator.h +++ b/source/Irrlicht/CGeometryCreator.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_GEOMETRY_CREATOR_H_INCLUDED__ -#define __C_GEOMETRY_CREATOR_H_INCLUDED__ +#ifndef IRR_C_GEOMETRY_CREATOR_H_INCLUDED +#define IRR_C_GEOMETRY_CREATOR_H_INCLUDED #include "IGeometryCreator.h" #include "SMeshBuffer.h" @@ -19,48 +19,48 @@ class CGeometryCreator : public IGeometryCreator { void addToBuffer(const video::S3DVertex& v, SMeshBuffer* Buffer) const; 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( const core::dimension2d& tileSize, const core::dimension2d& tileCount, video::SMaterial* material, f32 hillHeight, const core::dimension2d& countHills, - const core::dimension2d& textureRepeatCount) const _IRR_OVERRIDE_; + const core::dimension2d& 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, video::IImage* heightmap, const core::dimension2d& stretchSize, f32 maxHeight, video::IVideoDriver* driver, const core::dimension2d& defaultVertexBlockSize, - bool debugBorders=false) const _IRR_OVERRIDE_; + bool debugBorders=false) const IRR_OVERRIDE; virtual IMesh* createArrowMesh(const u32 tesselationCylinder, const u32 tesselationCone, const f32 height, const f32 cylinderHeight, const f32 width0, 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, 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, const video::SColor& colorTop=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, 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( const u32 subdivideU=32, const u32 subdivideV=32, const video::SColor footColor=0xffffffff, const video::SColor tailColor=0xffffffff, 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 #endif - diff --git a/source/Irrlicht/CImage.h b/source/Irrlicht/CImage.h index 0662ff5f..523935bb 100644 --- a/source/Irrlicht/CImage.h +++ b/source/Irrlicht/CImage.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_IMAGE_H_INCLUDED__ -#define __C_IMAGE_H_INCLUDED__ +#ifndef IRR_C_IMAGE_H_INCLUDED +#define IRR_C_IMAGE_H_INCLUDED #include "IImage.h" #include "rect.h" @@ -30,33 +30,33 @@ public: CImage(ECOLOR_FORMAT format, const core::dimension2d& size); //! 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 - 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. - 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. - virtual void copyToScaling(IImage* target) _IRR_OVERRIDE_; + virtual void copyToScaling(IImage* target) IRR_OVERRIDE; //! copies this surface into another - virtual void copyTo(IImage* target, const core::position2d& pos=core::position2d(0,0)) _IRR_OVERRIDE_; + virtual void copyTo(IImage* target, const core::position2d& pos=core::position2d(0,0)) IRR_OVERRIDE; //! copies this surface into another - virtual void copyTo(IImage* target, const core::position2d& pos, const core::rect& sourceRect, const core::rect* clipRect=0) _IRR_OVERRIDE_; + virtual void copyTo(IImage* target, const core::position2d& pos, const core::rect& sourceRect, const core::rect* clipRect=0) IRR_OVERRIDE; //! 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& pos, const core::rect& sourceRect, const SColor &color, - const core::rect* clipRect = 0, bool combineAlpha=false) _IRR_OVERRIDE_; + const core::rect* clipRect = 0, bool combineAlpha=false) IRR_OVERRIDE; //! 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 - virtual void fill(const SColor &color) _IRR_OVERRIDE_; + virtual void fill(const SColor &color) IRR_OVERRIDE; private: inline SColor getPixelBox ( s32 x, s32 y, s32 fx, s32 fy, s32 bias ) const; @@ -65,6 +65,4 @@ private: } // end namespace video } // end namespace irr - #endif - diff --git a/source/Irrlicht/CImageLoaderBMP.h b/source/Irrlicht/CImageLoaderBMP.h index f345e1ea..46980c25 100644 --- a/source/Irrlicht/CImageLoaderBMP.h +++ b/source/Irrlicht/CImageLoaderBMP.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_IMAGE_LOADER_BMP_H_INCLUDED__ -#define __C_IMAGE_LOADER_BMP_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_BMP_H_INCLUDED +#define IRR_C_IMAGE_LOADER_BMP_H_INCLUDED #include "IrrCompileConfig.h" @@ -75,13 +75,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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 - virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE; //! 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: @@ -97,4 +97,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CImageLoaderDDS.h b/source/Irrlicht/CImageLoaderDDS.h index 4f825397..13b1500b 100644 --- a/source/Irrlicht/CImageLoaderDDS.h +++ b/source/Irrlicht/CImageLoaderDDS.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_IMAGE_LOADER_DDS_H_INCLUDED__ -#define __C_IMAGE_LOADER_DDS_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_DDS_H_INCLUDED +#define IRR_C_IMAGE_LOADER_DDS_H_INCLUDED #include "IrrCompileConfig.h" @@ -197,13 +197,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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 - virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE; //! 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 - diff --git a/source/Irrlicht/CImageLoaderJPG.h b/source/Irrlicht/CImageLoaderJPG.h index 23604091..f3ffa95e 100644 --- a/source/Irrlicht/CImageLoaderJPG.h +++ b/source/Irrlicht/CImageLoaderJPG.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_IMAGE_LOADER_JPG_H_INCLUDED__ -#define __C_IMAGE_LOADER_JPG_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_JPG_H_INCLUDED +#define IRR_C_IMAGE_LOADER_JPG_H_INCLUDED #include "IrrCompileConfig.h" @@ -43,13 +43,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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 - virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE; //! 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: @@ -110,4 +110,3 @@ private: #endif #endif - diff --git a/source/Irrlicht/CImageLoaderPCX.h b/source/Irrlicht/CImageLoaderPCX.h index 4809d7b7..6fd8a782 100644 --- a/source/Irrlicht/CImageLoaderPCX.h +++ b/source/Irrlicht/CImageLoaderPCX.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_IMAGE_LOADER_PCX_H_INCLUDED__ -#define __C_IMAGE_LOADER_PCX_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_PCX_H_INCLUDED +#define IRR_C_IMAGE_LOADER_PCX_H_INCLUDED #include "IrrCompileConfig.h" @@ -63,13 +63,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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 - virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE; //! 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 #endif - diff --git a/source/Irrlicht/CImageLoaderPNG.h b/source/Irrlicht/CImageLoaderPNG.h index fbe448ad..a727d8bf 100644 --- a/source/Irrlicht/CImageLoaderPNG.h +++ b/source/Irrlicht/CImageLoaderPNG.h @@ -6,8 +6,8 @@ // i wanted to be able to read in PNG images with irrlicht :) // why? lossless compression with 8-bit alpha channel! -#ifndef __C_IMAGE_LOADER_PNG_H_INCLUDED__ -#define __C_IMAGE_LOADER_PNG_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_PNG_H_INCLUDED +#define IRR_C_IMAGE_LOADER_PNG_H_INCLUDED #include "IrrCompileConfig.h" @@ -27,13 +27,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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 - virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE; //! 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 - diff --git a/source/Irrlicht/CImageLoaderPPM.h b/source/Irrlicht/CImageLoaderPPM.h index 8fe1c603..a7a58e8e 100644 --- a/source/Irrlicht/CImageLoaderPPM.h +++ b/source/Irrlicht/CImageLoaderPPM.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_IMAGE_LOADER_PPM_H_INCLUDED__ -#define __C_IMAGE_LOADER_PPM_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_PPM_H_INCLUDED +#define IRR_C_IMAGE_LOADER_PPM_H_INCLUDED #include "IrrCompileConfig.h" @@ -31,13 +31,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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 - virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE; //! 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: //! read the next token from file @@ -49,7 +49,5 @@ private: } // end namespace video } // end namespace irr - #endif #endif - diff --git a/source/Irrlicht/CImageLoaderPSD.h b/source/Irrlicht/CImageLoaderPSD.h index 7e2c0c90..56a44152 100644 --- a/source/Irrlicht/CImageLoaderPSD.h +++ b/source/Irrlicht/CImageLoaderPSD.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_IMAGE_LOADER_PSD_H_INCLUDED__ -#define __C_IMAGE_LOADER_PSD_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_PSD_H_INCLUDED +#define IRR_C_IMAGE_LOADER_PSD_H_INCLUDED #include "IrrCompileConfig.h" @@ -48,13 +48,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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 - virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE; //! 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: @@ -69,4 +69,3 @@ private: #endif #endif - diff --git a/source/Irrlicht/CImageLoaderPVR.h b/source/Irrlicht/CImageLoaderPVR.h index 4a4cfee3..906c9cef 100644 --- a/source/Irrlicht/CImageLoaderPVR.h +++ b/source/Irrlicht/CImageLoaderPVR.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_IMAGE_LOADER_PVR_H_INCLUDED__ -#define __C_IMAGE_LOADER_PVR_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_PVR_H_INCLUDED +#define IRR_C_IMAGE_LOADER_PVR_H_INCLUDED #include "IrrCompileConfig.h" @@ -39,13 +39,13 @@ struct SPVRHeader class CImageLoaderPVR : public IImageLoader { 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 loadImages(io::IReadFile* file, E_TEXTURE_TYPE* type) const _IRR_OVERRIDE_; + virtual core::array loadImages(io::IReadFile* file, E_TEXTURE_TYPE* type) const IRR_OVERRIDE; }; } diff --git a/source/Irrlicht/CImageLoaderRGB.h b/source/Irrlicht/CImageLoaderRGB.h index 4360cffb..3a959ab0 100644 --- a/source/Irrlicht/CImageLoaderRGB.h +++ b/source/Irrlicht/CImageLoaderRGB.h @@ -13,8 +13,8 @@ Updated: */ -#ifndef __C_IMAGE_LOADER_RGB_H_INCLUDED__ -#define __C_IMAGE_LOADER_RGB_H_INCLUDED__ +#ifndef IRR_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 // 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 //! 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 - virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE; //! 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: @@ -160,5 +160,4 @@ private: } // end namespace irr #endif // _IRR_COMPILE_WITH_RGB_LOADER_ -#endif // __C_IMAGE_LOADER_RGB_H_INCLUDED__ - +#endif // IRR_C_IMAGE_LOADER_RGB_H_INCLUDED diff --git a/source/Irrlicht/CImageLoaderTGA.h b/source/Irrlicht/CImageLoaderTGA.h index 8ea0246f..9a83e615 100644 --- a/source/Irrlicht/CImageLoaderTGA.h +++ b/source/Irrlicht/CImageLoaderTGA.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_IMAGE_LOADER_TGA_H_INCLUDED__ -#define __C_IMAGE_LOADER_TGA_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_TGA_H_INCLUDED +#define IRR_C_IMAGE_LOADER_TGA_H_INCLUDED #include "IrrCompileConfig.h" @@ -59,13 +59,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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 - virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE; //! 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: @@ -79,4 +79,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CImageLoaderWAL.h b/source/Irrlicht/CImageLoaderWAL.h index 7c8ab6ec..ea04735f 100644 --- a/source/Irrlicht/CImageLoaderWAL.h +++ b/source/Irrlicht/CImageLoaderWAL.h @@ -8,8 +8,8 @@ Nikolaus Gebhardt for the Irrlicht 3D engine */ -#ifndef __C_IMAGE_LOADER_WAL_H_INCLUDED__ -#define __C_IMAGE_LOADER_WAL_H_INCLUDED__ +#ifndef IRR_C_IMAGE_LOADER_WAL_H_INCLUDED +#define IRR_C_IMAGE_LOADER_WAL_H_INCLUDED #include "IrrCompileConfig.h" #include "IImageLoader.h" @@ -37,9 +37,9 @@ namespace video class CImageLoaderLMP : public irr::video::IImageLoader { public: - virtual bool isALoadableFileExtension(const io::path& filename) 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 bool isALoadableFileExtension(const io::path& filename) 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; }; #endif @@ -50,18 +50,18 @@ public: class CImageLoaderWAL : public irr::video::IImageLoader { public: - virtual bool isALoadableFileExtension(const io::path& filename) 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 bool isALoadableFileExtension(const io::path& filename) 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; }; //! An Irrlicht image loader for Halflife 1 engine textures class CImageLoaderWAL2 : public irr::video::IImageLoader { public: - virtual bool isALoadableFileExtension(const io::path& filename) 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 bool isALoadableFileExtension(const io::path& filename) 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; }; // byte-align structures @@ -97,4 +97,3 @@ public: } #endif - diff --git a/source/Irrlicht/CImageWriterBMP.h b/source/Irrlicht/CImageWriterBMP.h index 3d9584c0..5912e859 100644 --- a/source/Irrlicht/CImageWriterBMP.h +++ b/source/Irrlicht/CImageWriterBMP.h @@ -23,10 +23,10 @@ public: CImageWriterBMP(); //! 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 - 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 diff --git a/source/Irrlicht/CImageWriterJPG.h b/source/Irrlicht/CImageWriterJPG.h index e9d01385..af82b4c5 100644 --- a/source/Irrlicht/CImageWriterJPG.h +++ b/source/Irrlicht/CImageWriterJPG.h @@ -23,10 +23,10 @@ public: CImageWriterJPG(); //! 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 - 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; }; } diff --git a/source/Irrlicht/CImageWriterPCX.h b/source/Irrlicht/CImageWriterPCX.h index b819d119..18c637e1 100644 --- a/source/Irrlicht/CImageWriterPCX.h +++ b/source/Irrlicht/CImageWriterPCX.h @@ -23,10 +23,10 @@ public: CImageWriterPCX(); //! 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 - 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 diff --git a/source/Irrlicht/CImageWriterPNG.h b/source/Irrlicht/CImageWriterPNG.h index 37e4953d..c8ea8398 100644 --- a/source/Irrlicht/CImageWriterPNG.h +++ b/source/Irrlicht/CImageWriterPNG.h @@ -23,10 +23,10 @@ public: CImageWriterPNG(); //! 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 - 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 diff --git a/source/Irrlicht/CImageWriterPPM.h b/source/Irrlicht/CImageWriterPPM.h index c7df272d..0959f3db 100644 --- a/source/Irrlicht/CImageWriterPPM.h +++ b/source/Irrlicht/CImageWriterPPM.h @@ -23,10 +23,10 @@ public: CImageWriterPPM(); //! 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 - 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 diff --git a/source/Irrlicht/CImageWriterPSD.h b/source/Irrlicht/CImageWriterPSD.h index 2ca92ded..c37a9cba 100644 --- a/source/Irrlicht/CImageWriterPSD.h +++ b/source/Irrlicht/CImageWriterPSD.h @@ -23,10 +23,10 @@ public: CImageWriterPSD(); //! 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 - 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 diff --git a/source/Irrlicht/CImageWriterTGA.h b/source/Irrlicht/CImageWriterTGA.h index 0d3fd3d7..6c269215 100644 --- a/source/Irrlicht/CImageWriterTGA.h +++ b/source/Irrlicht/CImageWriterTGA.h @@ -23,10 +23,10 @@ public: CImageWriterTGA(); //! 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 - 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 diff --git a/source/Irrlicht/CIrrDeviceConsole.h b/source/Irrlicht/CIrrDeviceConsole.h index 350e4b54..fb4a1e69 100644 --- a/source/Irrlicht/CIrrDeviceConsole.h +++ b/source/Irrlicht/CIrrDeviceConsole.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_IRR_DEVICE_CONSOLE_H_INCLUDED__ -#define __C_IRR_DEVICE_CONSOLE_H_INCLUDED__ +#ifndef IRR_C_IRR_DEVICE_CONSOLE_H_INCLUDED +#define IRR_C_IRR_DEVICE_CONSOLE_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_CONSOLE_DEVICE_ @@ -47,53 +47,53 @@ namespace irr virtual ~CIrrDeviceConsole(); //! 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 // 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. - virtual void sleep(u32 timeMs, bool pauseTimer) _IRR_OVERRIDE_; + virtual void sleep(u32 timeMs, bool pauseTimer) IRR_OVERRIDE; //! 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 - virtual bool isWindowActive() const _IRR_OVERRIDE_; + virtual bool isWindowActive() const IRR_OVERRIDE; //! returns if window has focus - virtual bool isWindowFocused() const _IRR_OVERRIDE_; + virtual bool isWindowFocused() const IRR_OVERRIDE; //! 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) - virtual core::position2di getWindowPosition() _IRR_OVERRIDE_ + virtual core::position2di getWindowPosition() IRR_OVERRIDE { return core::position2di(-1, -1); } //! presents a surface in the client area - virtual bool present(video::IImage* surface, void* windowId=0, core::rect* src=0) _IRR_OVERRIDE_; + virtual bool present(video::IImage* surface, void* windowId=0, core::rect* src=0) IRR_OVERRIDE; //! 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. - virtual void setResizable(bool resize=false) _IRR_OVERRIDE_; + virtual void setResizable(bool resize=false) IRR_OVERRIDE; //! Minimizes the window. - virtual void minimizeWindow() _IRR_OVERRIDE_; + virtual void minimizeWindow() IRR_OVERRIDE; //! Maximizes the window. - virtual void maximizeWindow() _IRR_OVERRIDE_; + virtual void maximizeWindow() IRR_OVERRIDE; //! Restores the window size. - virtual void restoreWindow() _IRR_OVERRIDE_; + virtual void restoreWindow() IRR_OVERRIDE; //! Get the device type - virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_DEVICE_TYPE getType() const IRR_OVERRIDE { return EIDT_CONSOLE; } @@ -116,7 +116,7 @@ namespace irr } //! Changes the visible state of the mouse cursor. - virtual void setVisible(bool visible) _IRR_OVERRIDE_ + virtual void setVisible(bool visible) IRR_OVERRIDE { if(visible != IsVisible) { @@ -126,19 +126,19 @@ namespace irr } //! Returns if the cursor is currently visible. - virtual bool isVisible() const _IRR_OVERRIDE_ + virtual bool isVisible() const IRR_OVERRIDE { return IsVisible; } //! Sets the new position of the cursor. - virtual void setPosition(const core::position2d &pos) _IRR_OVERRIDE_ + virtual void setPosition(const core::position2d &pos) IRR_OVERRIDE { setPosition(pos.X, pos.Y); } //! 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) setPosition((s32)(x*WindowSize.Width), (s32)(y*WindowSize.Height)); @@ -147,25 +147,25 @@ namespace irr } //! Sets the new position of the cursor. - virtual void setPosition(const core::position2d &pos) _IRR_OVERRIDE_ + virtual void setPosition(const core::position2d &pos) IRR_OVERRIDE { setPosition(pos.X, pos.Y); } //! 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)); } //! Returns the current position of the mouse cursor. - virtual const core::position2d& getPosition(bool updateCursor) _IRR_OVERRIDE_ + virtual const core::position2d& getPosition(bool updateCursor) IRR_OVERRIDE { return CursorPos; } //! Returns the current position of the mouse cursor. - virtual core::position2d getRelativePosition(bool updateCursor) _IRR_OVERRIDE_ + virtual core::position2d getRelativePosition(bool updateCursor) IRR_OVERRIDE { if (!UseReferenceRect) { @@ -178,7 +178,7 @@ namespace irr } //! Sets an absolute reference rect for calculating the cursor position. - virtual void setReferenceRect(core::rect* rect=0) _IRR_OVERRIDE_ + virtual void setReferenceRect(core::rect* rect=0) IRR_OVERRIDE { if (rect) { @@ -256,7 +256,7 @@ namespace gui //! Draws some text and clips it to the specified rectangle if wanted. virtual void draw(const wchar_t* text, const core::rect& position, video::SColor color, bool hcenter=false, bool vcenter=false, - const core::rect* clip=0) _IRR_OVERRIDE_ + const core::rect* clip=0) IRR_OVERRIDE { core::rect Area = clip ? *clip : position; @@ -304,22 +304,22 @@ namespace gui } //! Calculates the dimension of some text. - virtual core::dimension2d getDimension(const wchar_t* text) const _IRR_OVERRIDE_ + virtual core::dimension2d getDimension(const wchar_t* text) const IRR_OVERRIDE { return core::dimension2d(wcslen(text),1); } //! 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 - virtual void setKerningWidth (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 getKerningHeight() const _IRR_OVERRIDE_ { return 0;} - virtual void setInvisibleCharacters( const wchar_t *s ) _IRR_OVERRIDE_ { } + virtual void setKerningWidth (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 getKerningHeight() const IRR_OVERRIDE { return 0;} + virtual void setInvisibleCharacters( const wchar_t *s ) IRR_OVERRIDE { } // 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: CIrrDeviceConsole* Device; core::stringw tempText; @@ -332,5 +332,4 @@ namespace gui } // end namespace irr #endif // _IRR_COMPILE_WITH_CONSOLE_DEVICE_ -#endif // __C_IRR_DEVICE_CONSOLE_H_INCLUDED__ - +#endif // IRR_C_IRR_DEVICE_CONSOLE_H_INCLUDED diff --git a/source/Irrlicht/CIrrDeviceFB.h b/source/Irrlicht/CIrrDeviceFB.h index 62286583..e782c580 100644 --- a/source/Irrlicht/CIrrDeviceFB.h +++ b/source/Irrlicht/CIrrDeviceFB.h @@ -3,8 +3,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_IRR_DEVICE_FB_H_INCLUDED__ -#define __C_IRR_DEVICE_FB_H_INCLUDED__ +#ifndef IRR_C_IRR_DEVICE_FB_H_INCLUDED +#define IRR_C_IRR_DEVICE_FB_H_INCLUDED #include "IrrCompileConfig.h" @@ -33,53 +33,53 @@ namespace irr virtual ~CIrrDeviceFB(); //! 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 // 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. - virtual void sleep(u32 timeMs, bool pauseTimer) _IRR_OVERRIDE_; + virtual void sleep(u32 timeMs, bool pauseTimer) IRR_OVERRIDE; //! 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 - virtual bool isWindowActive() const _IRR_OVERRIDE_; + virtual bool isWindowActive() const IRR_OVERRIDE; //! returns if window has focus - virtual bool isWindowFocused() const _IRR_OVERRIDE_; + virtual bool isWindowFocused() const IRR_OVERRIDE; //! returns if window is minimized - virtual bool isWindowMinimized() const _IRR_OVERRIDE_; + virtual bool isWindowMinimized() const IRR_OVERRIDE; //! Minimizes window - virtual void minimizeWindow() _IRR_OVERRIDE_; + virtual void minimizeWindow() IRR_OVERRIDE; //! Maximizes window - virtual void maximizeWindow() _IRR_OVERRIDE_; + virtual void maximizeWindow() IRR_OVERRIDE; //! Restores original window size - virtual void restoreWindow() _IRR_OVERRIDE_; + virtual void restoreWindow() IRR_OVERRIDE; //! 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); } //! presents a surface in the client area - virtual bool present(video::IImage* surface, void* windowId = 0, core::rect* src=0 ) _IRR_OVERRIDE_; + virtual bool present(video::IImage* surface, void* windowId = 0, core::rect* src=0 ) IRR_OVERRIDE; //! 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. - virtual void setResizable(bool resize=false) _IRR_OVERRIDE_; + virtual void setResizable(bool resize=false) IRR_OVERRIDE; //! Returns the type of this device - virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_; + virtual E_DEVICE_TYPE getType() const IRR_OVERRIDE; private: @@ -105,42 +105,42 @@ namespace irr } //! Changes the visible state of the mouse cursor. - virtual void setVisible(bool visible) _IRR_OVERRIDE_ + virtual void setVisible(bool visible) IRR_OVERRIDE { IsVisible = visible; } //! Returns if the cursor is currently visible. - virtual bool isVisible() const _IRR_OVERRIDE_ + virtual bool isVisible() const IRR_OVERRIDE { return IsVisible; } //! Sets the new position of the cursor. - virtual void setPosition(const core::position2d &pos) _IRR_OVERRIDE_ + virtual void setPosition(const core::position2d &pos) IRR_OVERRIDE { setPosition(pos.X, pos.Y); } //! 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)); } //! Sets the new position of the cursor. - virtual void setPosition(const core::position2d &pos) _IRR_OVERRIDE_ + virtual void setPosition(const core::position2d &pos) IRR_OVERRIDE { setPosition(pos.X, pos.Y); } //! 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. - virtual const core::position2d& getPosition(bool updateCursor) _IRR_OVERRIDE_ + virtual const core::position2d& getPosition(bool updateCursor) IRR_OVERRIDE { if ( updateCursor ) updateCursorPos(); @@ -148,7 +148,7 @@ namespace irr } //! Returns the current position of the mouse cursor. - virtual core::position2d getRelativePosition(bool updateCursor) _IRR_OVERRIDE_ + virtual core::position2d getRelativePosition(bool updateCursor) IRR_OVERRIDE { if ( updateCursor) updateCursorPos(); @@ -156,7 +156,7 @@ namespace irr CursorPos.Y / (f32)Device->CreationParams.WindowSize.Height); } - virtual void setReferenceRect(core::rect* rect=0) _IRR_OVERRIDE_ + virtual void setReferenceRect(core::rect* rect=0) IRR_OVERRIDE { } @@ -211,5 +211,4 @@ namespace irr } // end namespace irr #endif // _IRR_USE_FB_DEVICE_ -#endif // __C_IRR_DEVICE_FB_H_INCLUDED__ - +#endif // IRR_C_IRR_DEVICE_FB_H_INCLUDED diff --git a/source/Irrlicht/CIrrDeviceLinux.h b/source/Irrlicht/CIrrDeviceLinux.h index 0f91403e..acc5cb71 100644 --- a/source/Irrlicht/CIrrDeviceLinux.h +++ b/source/Irrlicht/CIrrDeviceLinux.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_IRR_DEVICE_LINUX_H_INCLUDED__ -#define __C_IRR_DEVICE_LINUX_H_INCLUDED__ +#ifndef IRR_C_IRR_DEVICE_LINUX_H_INCLUDED +#define IRR_C_IRR_DEVICE_LINUX_H_INCLUDED #include "IrrCompileConfig.h" @@ -50,66 +50,66 @@ namespace irr virtual ~CIrrDeviceLinux(); //! 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 // 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. - virtual void sleep(u32 timeMs, bool pauseTimer) _IRR_OVERRIDE_; + virtual void sleep(u32 timeMs, bool pauseTimer) IRR_OVERRIDE; //! 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 - virtual bool isWindowActive() const _IRR_OVERRIDE_; + virtual bool isWindowActive() const IRR_OVERRIDE; //! returns if window has focus. - virtual bool isWindowFocused() const _IRR_OVERRIDE_; + virtual bool isWindowFocused() const IRR_OVERRIDE; //! returns if window is minimized. - virtual bool isWindowMinimized() const _IRR_OVERRIDE_; + virtual bool isWindowMinimized() const IRR_OVERRIDE; //! 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 - virtual bool present(video::IImage* surface, void* windowId=0, core::rect* src=0 ) _IRR_OVERRIDE_; + virtual bool present(video::IImage* surface, void* windowId=0, core::rect* src=0 ) IRR_OVERRIDE; //! 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 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. - virtual void setResizable(bool resize=false) _IRR_OVERRIDE_; + virtual void setResizable(bool resize=false) IRR_OVERRIDE; //! Resize the render window. - virtual void setWindowSize(const irr::core::dimension2d& size) _IRR_OVERRIDE_; + virtual void setWindowSize(const irr::core::dimension2d& size) IRR_OVERRIDE; //! Minimizes the window. - virtual void minimizeWindow() _IRR_OVERRIDE_; + virtual void minimizeWindow() IRR_OVERRIDE; //! Maximizes the window. - virtual void maximizeWindow() _IRR_OVERRIDE_; + virtual void maximizeWindow() IRR_OVERRIDE; //! Restores the window size. - virtual void restoreWindow() _IRR_OVERRIDE_; + virtual void restoreWindow() IRR_OVERRIDE; //! 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. - virtual bool activateJoysticks(core::array & joystickInfo) _IRR_OVERRIDE_; + virtual bool activateJoysticks(core::array & joystickInfo) IRR_OVERRIDE; //! 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 - 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 //! \return Returns 0 if no string is in there. @@ -120,10 +120,10 @@ namespace irr virtual void copyToClipboard(const c8* text) const; //! Remove all messages pending in the system message loop - virtual void clearSystemMessages() _IRR_OVERRIDE_; + virtual void clearSystemMessages() IRR_OVERRIDE; //! Get the device type - virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_DEVICE_TYPE getType() const IRR_OVERRIDE { return EIDT_X11; } @@ -170,7 +170,7 @@ namespace irr ~CCursorControl(); //! 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) return; @@ -187,31 +187,31 @@ namespace irr } //! Returns if the cursor is currently visible. - virtual bool isVisible() const _IRR_OVERRIDE_ + virtual bool isVisible() const IRR_OVERRIDE { return IsVisible; } //! Sets the new position of the cursor. - virtual void setPosition(const core::position2d &pos) _IRR_OVERRIDE_ + virtual void setPosition(const core::position2d &pos) IRR_OVERRIDE { setPosition(pos.X, pos.Y); } //! 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)); } //! Sets the new position of the cursor. - virtual void setPosition(const core::position2d &pos) _IRR_OVERRIDE_ + virtual void setPosition(const core::position2d &pos) IRR_OVERRIDE { setPosition(pos.X, pos.Y); } //! 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_ @@ -276,7 +276,7 @@ namespace irr } //! Returns the current position of the mouse cursor. - virtual const core::position2d& getPosition(bool updateCursor) _IRR_OVERRIDE_ + virtual const core::position2d& getPosition(bool updateCursor) IRR_OVERRIDE { if ( updateCursor ) updateCursorPos(); @@ -284,7 +284,7 @@ namespace irr } //! Returns the current position of the mouse cursor. - virtual core::position2d getRelativePosition(bool updateCursor) _IRR_OVERRIDE_ + virtual core::position2d getRelativePosition(bool updateCursor) IRR_OVERRIDE { if ( updateCursor ) updateCursorPos(); @@ -299,7 +299,7 @@ namespace irr CursorPos.Y / (f32)ReferenceRect.getHeight()); } - virtual void setReferenceRect(core::rect* rect=0) _IRR_OVERRIDE_ + virtual void setReferenceRect(core::rect* rect=0) IRR_OVERRIDE { if (rect) { @@ -319,29 +319,29 @@ namespace irr } //! 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 - virtual gui::ECURSOR_ICON getActiveIcon() const _IRR_OVERRIDE_ + virtual gui::ECURSOR_ICON getActiveIcon() const IRR_OVERRIDE { return ActiveIcon; } //! 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. - 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. - virtual core::dimension2di getSupportedIconSize() const _IRR_OVERRIDE_; + virtual core::dimension2di getSupportedIconSize() const IRR_OVERRIDE; #ifdef _IRR_COMPILE_WITH_X11_ //! 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. - 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 clearCursors(); @@ -484,5 +484,4 @@ namespace irr } // end namespace irr #endif // _IRR_COMPILE_WITH_X11_DEVICE_ -#endif // __C_IRR_DEVICE_LINUX_H_INCLUDED__ - +#endif // IRR_C_IRR_DEVICE_LINUX_H_INCLUDED diff --git a/source/Irrlicht/CIrrDeviceSDL.h b/source/Irrlicht/CIrrDeviceSDL.h index 0cf863a3..3ba4ebf3 100644 --- a/source/Irrlicht/CIrrDeviceSDL.h +++ b/source/Irrlicht/CIrrDeviceSDL.h @@ -4,8 +4,8 @@ // This device code is based on the original SDL device implementation // contributed by Shane Parker (sirshane). -#ifndef __C_IRR_DEVICE_SDL_H_INCLUDED__ -#define __C_IRR_DEVICE_SDL_H_INCLUDED__ +#ifndef IRR_C_IRR_DEVICE_SDL_H_INCLUDED +#define IRR_C_IRR_DEVICE_SDL_H_INCLUDED #include "IrrCompileConfig.h" @@ -37,68 +37,68 @@ namespace irr virtual ~CIrrDeviceSDL(); //! runs the device. Returns false if device wants to be deleted - virtual bool run() _IRR_OVERRIDE_; + virtual bool run() IRR_OVERRIDE; //! pause execution temporarily - virtual void yield() _IRR_OVERRIDE_; + virtual void yield() IRR_OVERRIDE; //! 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 - 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 - virtual bool isWindowActive() const _IRR_OVERRIDE_; + virtual bool isWindowActive() const IRR_OVERRIDE; //! returns if window has focus. - bool isWindowFocused() const _IRR_OVERRIDE_; + bool isWindowFocused() const IRR_OVERRIDE; //! returns if window is minimized. - bool isWindowMinimized() const _IRR_OVERRIDE_; + bool isWindowMinimized() const IRR_OVERRIDE; //! 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 - virtual bool present(video::IImage* surface, void* windowId=0, core::rect* src=0) _IRR_OVERRIDE_; + virtual bool present(video::IImage* surface, void* windowId=0, core::rect* src=0) IRR_OVERRIDE; //! 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 - virtual video::IVideoModeList* getVideoModeList() _IRR_OVERRIDE_; + virtual video::IVideoModeList* getVideoModeList() IRR_OVERRIDE; //! 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. - virtual void minimizeWindow() _IRR_OVERRIDE_; + virtual void minimizeWindow() IRR_OVERRIDE; //! Maximizes the window. - virtual void maximizeWindow() _IRR_OVERRIDE_; + virtual void maximizeWindow() IRR_OVERRIDE; //! Restores the window size. - virtual void restoreWindow() _IRR_OVERRIDE_; + virtual void restoreWindow() IRR_OVERRIDE; //! Checks if the Irrlicht window is running in fullscreen mode /** \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 - virtual core::position2di getWindowPosition() _IRR_OVERRIDE_; + virtual core::position2di getWindowPosition() IRR_OVERRIDE; //! Activate any joysticks, and generate events for them. - virtual bool activateJoysticks(core::array & joystickInfo) _IRR_OVERRIDE_; + virtual bool activateJoysticks(core::array & joystickInfo) IRR_OVERRIDE; //! 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 - 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 - virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_DEVICE_TYPE getType() const IRR_OVERRIDE { return EIDT_SDL; } @@ -114,7 +114,7 @@ namespace irr } //! Changes the visible state of the mouse cursor. - virtual void setVisible(bool visible) _IRR_OVERRIDE_ + virtual void setVisible(bool visible) IRR_OVERRIDE { IsVisible = visible; if ( visible ) @@ -126,37 +126,37 @@ namespace irr } //! Returns if the cursor is currently visible. - virtual bool isVisible() const _IRR_OVERRIDE_ + virtual bool isVisible() const IRR_OVERRIDE { return IsVisible; } //! Sets the new position of the cursor. - virtual void setPosition(const core::position2d &pos) _IRR_OVERRIDE_ + virtual void setPosition(const core::position2d &pos) IRR_OVERRIDE { setPosition(pos.X, pos.Y); } //! 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)); } //! Sets the new position of the cursor. - virtual void setPosition(const core::position2d &pos) _IRR_OVERRIDE_ + virtual void setPosition(const core::position2d &pos) IRR_OVERRIDE { setPosition(pos.X, pos.Y); } //! 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 ); } //! Returns the current position of the mouse cursor. - virtual const core::position2d& getPosition(bool updateCursor) _IRR_OVERRIDE_ + virtual const core::position2d& getPosition(bool updateCursor) IRR_OVERRIDE { if ( updateCursor ) updateCursorPos(); @@ -164,7 +164,7 @@ namespace irr } //! Returns the current position of the mouse cursor. - virtual core::position2d getRelativePosition(bool updateCursor) _IRR_OVERRIDE_ + virtual core::position2d getRelativePosition(bool updateCursor) IRR_OVERRIDE { if ( updateCursor ) updateCursorPos(); @@ -172,7 +172,7 @@ namespace irr CursorPos.Y / (f32)Device->Height); } - virtual void setReferenceRect(core::rect* rect=0) _IRR_OVERRIDE_ + virtual void setReferenceRect(core::rect* rect=0) IRR_OVERRIDE { } @@ -276,5 +276,4 @@ namespace irr } // end namespace irr #endif // _IRR_COMPILE_WITH_SDL_DEVICE_ -#endif // __C_IRR_DEVICE_SDL_H_INCLUDED__ - +#endif // IRR_C_IRR_DEVICE_SDL_H_INCLUDED diff --git a/source/Irrlicht/CIrrDeviceStub.cpp b/source/Irrlicht/CIrrDeviceStub.cpp index 0ecf128e..bea4b274 100644 --- a/source/Irrlicht/CIrrDeviceStub.cpp +++ b/source/Irrlicht/CIrrDeviceStub.cpp @@ -297,22 +297,22 @@ namespace { struct SDefaultRandomizer : public IRandomizer { - virtual void reset(s32 value=0x0f0f0f0f) _IRR_OVERRIDE_ + virtual void reset(s32 value=0x0f0f0f0f) IRR_OVERRIDE { os::Randomizer::reset(value); } - virtual s32 rand() const _IRR_OVERRIDE_ + virtual s32 rand() const IRR_OVERRIDE { return os::Randomizer::rand(); } - virtual f32 frand() const _IRR_OVERRIDE_ + virtual f32 frand() const IRR_OVERRIDE { return os::Randomizer::frand(); } - virtual s32 randMax() const _IRR_OVERRIDE_ + virtual s32 randMax() const IRR_OVERRIDE { return os::Randomizer::randMax(); } diff --git a/source/Irrlicht/CIrrDeviceStub.h b/source/Irrlicht/CIrrDeviceStub.h index 367faf13..114ad219 100644 --- a/source/Irrlicht/CIrrDeviceStub.h +++ b/source/Irrlicht/CIrrDeviceStub.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_IRR_DEVICE_STUB_H_INCLUDED__ -#define __C_IRR_DEVICE_STUB_H_INCLUDED__ +#ifndef IRR_C_IRR_DEVICE_STUB_H_INCLUDED +#define IRR_C_IRR_DEVICE_STUB_H_INCLUDED #include "IrrlichtDevice.h" #include "IImagePresenter.h" @@ -60,123 +60,123 @@ namespace irr virtual ~CIrrDeviceStub(); //! returns the video driver - virtual video::IVideoDriver* getVideoDriver() _IRR_OVERRIDE_; + virtual video::IVideoDriver* getVideoDriver() IRR_OVERRIDE; //! return file system - virtual io::IFileSystem* getFileSystem() _IRR_OVERRIDE_; + virtual io::IFileSystem* getFileSystem() IRR_OVERRIDE; //! returns the gui environment - virtual gui::IGUIEnvironment* getGUIEnvironment() _IRR_OVERRIDE_; + virtual gui::IGUIEnvironment* getGUIEnvironment() IRR_OVERRIDE; //! 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. - 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. - virtual video::IVideoModeList* getVideoModeList() _IRR_OVERRIDE_; + virtual video::IVideoModeList* getVideoModeList() IRR_OVERRIDE; //! 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. - virtual ITimer* getTimer() _IRR_OVERRIDE_; + virtual ITimer* getTimer() IRR_OVERRIDE; //! 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 - virtual bool postEventFromUser(const SEvent& event) _IRR_OVERRIDE_; + virtual bool postEventFromUser(const SEvent& event) IRR_OVERRIDE; //! 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. - virtual IEventReceiver* getEventReceiver() _IRR_OVERRIDE_; + virtual IEventReceiver* getEventReceiver() IRR_OVERRIDE; //! Sets the input receiving scene manager. /** 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. - virtual ILogger* getLogger() _IRR_OVERRIDE_; + virtual ILogger* getLogger() IRR_OVERRIDE; //! 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. - virtual void setRandomizer(IRandomizer* r) _IRR_OVERRIDE_; + virtual void setRandomizer(IRandomizer* r) IRR_OVERRIDE; //! Creates a new default randomizer. - virtual IRandomizer* createDefaultRandomizer() const _IRR_OVERRIDE_; + virtual IRandomizer* createDefaultRandomizer() const IRR_OVERRIDE; //! 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. - virtual bool isFullscreen() const _IRR_OVERRIDE_; + virtual bool isFullscreen() const IRR_OVERRIDE; //! 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. - virtual bool activateJoysticks(core::array & joystickInfo) _IRR_OVERRIDE_; + virtual bool activateJoysticks(core::array & joystickInfo) IRR_OVERRIDE; //! Activate accelerometer. - virtual bool activateAccelerometer(float updateInterval = 0.016666f) _IRR_OVERRIDE_; - + virtual bool activateAccelerometer(float updateInterval = 0.016666f) IRR_OVERRIDE; + //! Deactivate accelerometer. - virtual bool deactivateAccelerometer() _IRR_OVERRIDE_; - + virtual bool deactivateAccelerometer() IRR_OVERRIDE; + //! Is accelerometer active. - virtual bool isAccelerometerActive() _IRR_OVERRIDE_; - + virtual bool isAccelerometerActive() IRR_OVERRIDE; + //! Is accelerometer available. - virtual bool isAccelerometerAvailable() _IRR_OVERRIDE_; - + virtual bool isAccelerometerAvailable() IRR_OVERRIDE; + //! Activate gyroscope. - virtual bool activateGyroscope(float updateInterval = 0.016666f) _IRR_OVERRIDE_; - + virtual bool activateGyroscope(float updateInterval = 0.016666f) IRR_OVERRIDE; + //! Deactivate gyroscope. - virtual bool deactivateGyroscope() _IRR_OVERRIDE_; - + virtual bool deactivateGyroscope() IRR_OVERRIDE; + //! Is gyroscope active. - virtual bool isGyroscopeActive() _IRR_OVERRIDE_; - + virtual bool isGyroscopeActive() IRR_OVERRIDE; + //! Is gyroscope available. - virtual bool isGyroscopeAvailable() _IRR_OVERRIDE_; - + virtual bool isGyroscopeAvailable() IRR_OVERRIDE; + //! Activate device motion. - virtual bool activateDeviceMotion(float updateInterval = 0.016666f) _IRR_OVERRIDE_; - + virtual bool activateDeviceMotion(float updateInterval = 0.016666f) IRR_OVERRIDE; + //! Deactivate device motion. - virtual bool deactivateDeviceMotion() _IRR_OVERRIDE_; - + virtual bool deactivateDeviceMotion() IRR_OVERRIDE; + //! Is device motion active. - virtual bool isDeviceMotionActive() _IRR_OVERRIDE_; - + virtual bool isDeviceMotionActive() IRR_OVERRIDE; + //! Is device motion available. - virtual bool isDeviceMotionAvailable() _IRR_OVERRIDE_; + virtual bool isDeviceMotionAvailable() IRR_OVERRIDE; //! 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 - 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. //! 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. - virtual u32 getDoubleClickTime() const _IRR_OVERRIDE_; + virtual u32 getDoubleClickTime() const IRR_OVERRIDE; //! Remove all messages pending in the system message loop - virtual void clearSystemMessages() _IRR_OVERRIDE_; + virtual void clearSystemMessages() IRR_OVERRIDE; //! Resize the render window. - virtual void setWindowSize(const irr::core::dimension2d& size) _IRR_OVERRIDE_ {} + virtual void setWindowSize(const irr::core::dimension2d& size) IRR_OVERRIDE {} protected: @@ -228,4 +228,3 @@ namespace irr } // end namespace irr #endif - diff --git a/source/Irrlicht/CIrrDeviceWin32.h b/source/Irrlicht/CIrrDeviceWin32.h index 47f3cf2d..0acea073 100644 --- a/source/Irrlicht/CIrrDeviceWin32.h +++ b/source/Irrlicht/CIrrDeviceWin32.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_IRR_DEVICE_WIN32_H_INCLUDED__ -#define __C_IRR_DEVICE_WIN32_H_INCLUDED__ +#ifndef IRR_C_IRR_DEVICE_WIN32_H_INCLUDED +#define IRR_C_IRR_DEVICE_WIN32_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_ @@ -39,80 +39,80 @@ namespace irr virtual ~CIrrDeviceWin32(); //! 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 // 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. - virtual void sleep(u32 timeMs, bool pauseTimer) _IRR_OVERRIDE_; + virtual void sleep(u32 timeMs, bool pauseTimer) IRR_OVERRIDE; //! 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 - virtual bool isWindowActive() const _IRR_OVERRIDE_; + virtual bool isWindowActive() const IRR_OVERRIDE; //! returns if window has focus - virtual bool isWindowFocused() const _IRR_OVERRIDE_; + virtual bool isWindowFocused() const IRR_OVERRIDE; //! returns if window is minimized - virtual bool isWindowMinimized() const _IRR_OVERRIDE_; + virtual bool isWindowMinimized() const IRR_OVERRIDE; //! presents a surface in the client area - virtual bool present(video::IImage* surface, void* windowId=0, core::rect* src=0) _IRR_OVERRIDE_; + virtual bool present(video::IImage* surface, void* windowId=0, core::rect* src=0) IRR_OVERRIDE; //! 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 by the gfx adapter. - virtual video::IVideoModeList* getVideoModeList() _IRR_OVERRIDE_; + virtual video::IVideoModeList* getVideoModeList() IRR_OVERRIDE; //! Notifies the device, that it has been resized /** Must be publis as it is called from free function (event handler) */ void OnResized(); //! Sets if the window should be resizable in windowed mode. - virtual void setResizable(bool resize=false) _IRR_OVERRIDE_; + virtual void setResizable(bool resize=false) IRR_OVERRIDE; //! Resize the render window. - virtual void setWindowSize(const irr::core::dimension2d& size) _IRR_OVERRIDE_; + virtual void setWindowSize(const irr::core::dimension2d& size) IRR_OVERRIDE; //! Minimizes the window. - virtual void minimizeWindow() _IRR_OVERRIDE_; + virtual void minimizeWindow() IRR_OVERRIDE; //! Maximizes the window. - virtual void maximizeWindow() _IRR_OVERRIDE_; + virtual void maximizeWindow() IRR_OVERRIDE; //! Restores the window size. - virtual void restoreWindow() _IRR_OVERRIDE_; + virtual void restoreWindow() IRR_OVERRIDE; //! 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. - virtual bool activateJoysticks(core::array & joystickInfo) _IRR_OVERRIDE_; + virtual bool activateJoysticks(core::array & joystickInfo) IRR_OVERRIDE; //! 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 - 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 - virtual void clearSystemMessages() _IRR_OVERRIDE_; + virtual void clearSystemMessages() IRR_OVERRIDE; //! Get the device type - virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ + virtual E_DEVICE_TYPE getType() const IRR_OVERRIDE { return EIDT_WIN32; } //! Compares to the last call of this function to return double and triple clicks. //! \return Returns only 1,2 or 3. A 4th click will start with 1 again. - virtual u32 checkSuccessiveClicks(s32 mouseX, s32 mouseY, EMOUSE_INPUT_EVENT inputEvent ) _IRR_OVERRIDE_ + virtual u32 checkSuccessiveClicks(s32 mouseX, s32 mouseY, EMOUSE_INPUT_EVENT inputEvent ) IRR_OVERRIDE { // we just have to make it public return CIrrDeviceStub::checkSuccessiveClicks(mouseX, mouseY, inputEvent ); @@ -140,7 +140,7 @@ namespace irr ~CCursorControl(); //! Changes the visible state of the mouse cursor. - virtual void setVisible(bool visible) _IRR_OVERRIDE_ + virtual void setVisible(bool visible) IRR_OVERRIDE { CURSORINFO info; info.cbSize = sizeof(CURSORINFO); @@ -186,19 +186,19 @@ namespace irr } //! Returns if the cursor is currently visible. - virtual bool isVisible() const _IRR_OVERRIDE_ + virtual bool isVisible() const IRR_OVERRIDE { return IsVisible; } //! Sets the new position of the cursor. - virtual void setPosition(const core::position2d &pos) _IRR_OVERRIDE_ + virtual void setPosition(const core::position2d &pos) IRR_OVERRIDE { setPosition(pos.X, pos.Y); } //! 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) setPosition(core::round32(x*WindowSize.Width), core::round32(y*WindowSize.Height)); @@ -207,13 +207,13 @@ namespace irr } //! Sets the new position of the cursor. - virtual void setPosition(const core::position2d &pos) _IRR_OVERRIDE_ + virtual void setPosition(const core::position2d &pos) IRR_OVERRIDE { setPosition(pos.X, pos.Y); } //! 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) { @@ -232,7 +232,7 @@ namespace irr } //! Returns the current position of the mouse cursor. - virtual const core::position2d& getPosition(bool updateCursor) _IRR_OVERRIDE_ + virtual const core::position2d& getPosition(bool updateCursor) IRR_OVERRIDE { if ( updateCursor ) updateInternalCursorPosition(); @@ -240,7 +240,7 @@ namespace irr } //! Returns the current position of the mouse cursor. - virtual core::position2d getRelativePosition(bool updateCursor) _IRR_OVERRIDE_ + virtual core::position2d getRelativePosition(bool updateCursor) IRR_OVERRIDE { if ( updateCursor ) updateInternalCursorPosition(); @@ -256,7 +256,7 @@ namespace irr } //! Sets an absolute reference rect for calculating the cursor position. - virtual void setReferenceRect(core::rect* rect=0) _IRR_OVERRIDE_ + virtual void setReferenceRect(core::rect* rect=0) IRR_OVERRIDE { if (rect) { @@ -320,22 +320,22 @@ namespace irr //! 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 - virtual gui::ECURSOR_ICON getActiveIcon() const _IRR_OVERRIDE_ + virtual gui::ECURSOR_ICON getActiveIcon() const IRR_OVERRIDE { return ActiveIcon; } //! 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. - 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. - virtual core::dimension2di getSupportedIconSize() const _IRR_OVERRIDE_; + virtual core::dimension2di getSupportedIconSize() const IRR_OVERRIDE; void update(); @@ -444,4 +444,4 @@ namespace irr } // end namespace irr #endif // _IRR_COMPILE_WITH_WINDOWS_DEVICE_ -#endif // __C_IRR_DEVICE_WIN32_H_INCLUDED__ +#endif // IRR_C_IRR_DEVICE_WIN32_H_INCLUDED diff --git a/source/Irrlicht/CIrrMeshFileLoader.h b/source/Irrlicht/CIrrMeshFileLoader.h index c190844a..90ace996 100644 --- a/source/Irrlicht/CIrrMeshFileLoader.h +++ b/source/Irrlicht/CIrrMeshFileLoader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_IRR_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_IRR_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_IRR_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_IRR_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IFileSystem.h" @@ -30,13 +30,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! See IReferenceCounted::drop() for more information. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: @@ -87,4 +87,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CIrrMeshWriter.h b/source/Irrlicht/CIrrMeshWriter.h index c69d8bfd..4b21bb64 100644 --- a/source/Irrlicht/CIrrMeshWriter.h +++ b/source/Irrlicht/CIrrMeshWriter.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __IRR_IRR_MESH_WRITER_H_INCLUDED__ -#define __IRR_IRR_MESH_WRITER_H_INCLUDED__ +#ifndef IRR_IRR_MESH_WRITER_H_INCLUDED +#define IRR_IRR_MESH_WRITER_H_INCLUDED #include "IMeshWriter.h" #include "S3DVertex.h" @@ -30,10 +30,10 @@ namespace scene virtual ~CIrrMeshWriter(); //! 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 - 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; protected: @@ -58,4 +58,3 @@ namespace scene } // end namespace #endif - diff --git a/source/Irrlicht/CLMTSMeshFileLoader.h b/source/Irrlicht/CLMTSMeshFileLoader.h index b607f910..7ba4a20d 100644 --- a/source/Irrlicht/CLMTSMeshFileLoader.h +++ b/source/Irrlicht/CLMTSMeshFileLoader.h @@ -18,8 +18,8 @@ Version 1.5 - 15 March 2005 */ -#if !defined(__C_LMTS_MESH_FILE_LOADER_H_INCLUDED__) -#define __C_LMTS_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_LMTS_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_LMTS_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "SMesh.h" @@ -40,9 +40,9 @@ public: virtual ~CLMTSMeshFileLoader(); - virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; + virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE; - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: void constructMesh(SMesh* mesh); @@ -106,4 +106,4 @@ private: } // end namespace scene } // end namespace irr -#endif // !defined(__C_LMTS_MESH_FILE_LOADER_H_INCLUDED__) +#endif // IRR_C_LMTS_MESH_FILE_LOADER_H_INCLUDED diff --git a/source/Irrlicht/CLWOMeshFileLoader.h b/source/Irrlicht/CLWOMeshFileLoader.h index 5f77ed0e..edcd7e88 100644 --- a/source/Irrlicht/CLWOMeshFileLoader.h +++ b/source/Irrlicht/CLWOMeshFileLoader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_LWO_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_LWO_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_LWO_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_LWO_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "SMeshBuffer.h" @@ -35,13 +35,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! See IUnknown::drop() for more information. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CLightSceneNode.h b/source/Irrlicht/CLightSceneNode.h index a3c96c88..be6e47e2 100644 --- a/source/Irrlicht/CLightSceneNode.h +++ b/source/Irrlicht/CLightSceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_LIGHT_SCENE_NODE_H_INCLUDED__ -#define __C_LIGHT_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_LIGHT_SCENE_NODE_H_INCLUDED +#define IRR_C_LIGHT_SCENE_NODE_H_INCLUDED #include "ILightSceneNode.h" @@ -23,40 +23,40 @@ public: const core::vector3df& position, video::SColorf color, f32 range); //! pre render event - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; //! render - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! set node light data from light info - virtual void setLightData(const video::SLight& light) _IRR_OVERRIDE_; + virtual void setLightData(const video::SLight& light) IRR_OVERRIDE; //! \return Returns the light data. - virtual const video::SLight& getLightData() const _IRR_OVERRIDE_; + virtual const video::SLight& getLightData() const IRR_OVERRIDE; //! \return Returns the light data. - virtual video::SLight& getLightData() _IRR_OVERRIDE_; + virtual video::SLight& getLightData() IRR_OVERRIDE; //! Sets if the node should be visible or not. /** All children of this node won't be visible either, when set to true. \param isVisible If the node shall be visible. */ - virtual void setVisible(bool isVisible) _IRR_OVERRIDE_; + virtual void setVisible(bool isVisible) IRR_OVERRIDE; //! returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! Returns type of the scene node - virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_LIGHT; } + virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_LIGHT; } //! 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. - 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. - virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) _IRR_OVERRIDE_; + virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) IRR_OVERRIDE; //! Sets the light's radius of influence. /** Outside this radius the light won't lighten geometry and cast no @@ -64,33 +64,33 @@ public: it to (0,1/radius,0). If you want to override this behavior, set the attenuation after the radius. \param radius The new radius. */ - virtual void setRadius(f32 radius) _IRR_OVERRIDE_; + virtual void setRadius(f32 radius) IRR_OVERRIDE; //! Gets the light's radius of influence. /** \return The current radius. */ - virtual f32 getRadius() const _IRR_OVERRIDE_; + virtual f32 getRadius() const IRR_OVERRIDE; //! Sets the light type. /** \param type The new type. */ - virtual void setLightType(video::E_LIGHT_TYPE type) _IRR_OVERRIDE_; + virtual void setLightType(video::E_LIGHT_TYPE type) IRR_OVERRIDE; //! Gets the light type. /** \return The current light type. */ - virtual video::E_LIGHT_TYPE getLightType() const _IRR_OVERRIDE_; + virtual video::E_LIGHT_TYPE getLightType() const IRR_OVERRIDE; //! Sets whether this light casts shadows. /** Enabling this flag won't automatically cast shadows, the meshes will still need shadow scene nodes attached. But one can enable or disable distinct lights for shadow casting for performance reasons. \param shadow True if this light shall cast shadows. */ - virtual void enableCastShadow(bool shadow=true) _IRR_OVERRIDE_; + virtual void enableCastShadow(bool shadow=true) IRR_OVERRIDE; //! Check whether this light casts shadows. /** \return True if light would cast shadows, else false. */ - virtual bool getCastShadow() const _IRR_OVERRIDE_; + virtual bool getCastShadow() const IRR_OVERRIDE; //! Updates the absolute position based on the relative and the parents position - virtual void updateAbsolutePosition() _IRR_OVERRIDE_; + virtual void updateAbsolutePosition() IRR_OVERRIDE; private: @@ -106,4 +106,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CLimitReadFile.h b/source/Irrlicht/CLimitReadFile.h index d95511fe..817ab2de 100644 --- a/source/Irrlicht/CLimitReadFile.h +++ b/source/Irrlicht/CLimitReadFile.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_LIMIT_READ_FILE_H_INCLUDED__ -#define __C_LIMIT_READ_FILE_H_INCLUDED__ +#ifndef IRR_C_LIMIT_READ_FILE_H_INCLUDED +#define IRR_C_LIMIT_READ_FILE_H_INCLUDED #include "IReadFile.h" #include "irrString.h" @@ -30,24 +30,24 @@ namespace io virtual ~CLimitReadFile(); //! returns how much was read - virtual size_t read(void* buffer, size_t sizeToRead) _IRR_OVERRIDE_; + virtual size_t read(void* buffer, size_t sizeToRead) IRR_OVERRIDE; //! changes position in file, returns true if successful //! if relativeMovement==true, the pos is changed relative to current pos, //! otherwise from begin of file - virtual bool seek(long finalPos, bool relativeMovement = false) _IRR_OVERRIDE_; + virtual bool seek(long finalPos, bool relativeMovement = false) IRR_OVERRIDE; //! returns size of file - virtual long getSize() const _IRR_OVERRIDE_; + virtual long getSize() const IRR_OVERRIDE; //! returns where in the file we are. - virtual long getPos() const _IRR_OVERRIDE_; + virtual long getPos() const IRR_OVERRIDE; //! returns name of file - virtual const io::path& getFileName() const _IRR_OVERRIDE_; + virtual const io::path& getFileName() const IRR_OVERRIDE; //! Get the type of the class implementing this interface - virtual EREAD_FILE_TYPE getType() const _IRR_OVERRIDE_ + virtual EREAD_FILE_TYPE getType() const IRR_OVERRIDE { return ERFT_LIMIT_READ_FILE; } @@ -65,4 +65,3 @@ namespace io } // end namespace irr #endif - diff --git a/source/Irrlicht/CLogger.h b/source/Irrlicht/CLogger.h index 2f58da66..c6357874 100644 --- a/source/Irrlicht/CLogger.h +++ b/source/Irrlicht/CLogger.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_LOGGER_H_INCLUDED__ -#define __C_LOGGER_H_INCLUDED__ +#ifndef IRR_C_LOGGER_H_INCLUDED +#define IRR_C_LOGGER_H_INCLUDED #include "ILogger.h" #include "os.h" @@ -21,25 +21,25 @@ public: CLogger(IEventReceiver* r); //! Returns the current set log level. - virtual ELOG_LEVEL getLogLevel() const _IRR_OVERRIDE_; + virtual ELOG_LEVEL getLogLevel() const IRR_OVERRIDE; - //! Sets a new log level. virtual void setLogLevel(ELOG_LEVEL ll) _IRR_OVERRIDE_; - virtual void setLogLevel(ELOG_LEVEL ll) _IRR_OVERRIDE_; + //! Sets a new log level. virtual void setLogLevel(ELOG_LEVEL ll) IRR_OVERRIDE; + virtual void setLogLevel(ELOG_LEVEL ll) IRR_OVERRIDE; //! Prints out a text into the log - virtual void log(const c8* text, ELOG_LEVEL ll=ELL_INFORMATION) _IRR_OVERRIDE_; + virtual void log(const c8* text, ELOG_LEVEL ll=ELL_INFORMATION) IRR_OVERRIDE; //! Prints out a text into the log - virtual void log(const wchar_t* text, ELOG_LEVEL ll=ELL_INFORMATION) _IRR_OVERRIDE_; + virtual void log(const wchar_t* text, ELOG_LEVEL ll=ELL_INFORMATION) IRR_OVERRIDE; //! Prints out a text into the log - virtual void log(const c8* text, const c8* hint, ELOG_LEVEL ll=ELL_INFORMATION) _IRR_OVERRIDE_; + virtual void log(const c8* text, const c8* hint, ELOG_LEVEL ll=ELL_INFORMATION) IRR_OVERRIDE; //! Prints out a text into the log - virtual void log(const c8* text, const wchar_t* hint, ELOG_LEVEL ll=ELL_INFORMATION) _IRR_OVERRIDE_; + virtual void log(const c8* text, const wchar_t* hint, ELOG_LEVEL ll=ELL_INFORMATION) IRR_OVERRIDE; //! Prints out a text into the log - virtual void log(const wchar_t* text, const wchar_t* hint, ELOG_LEVEL ll=ELL_INFORMATION) _IRR_OVERRIDE_; + virtual void log(const wchar_t* text, const wchar_t* hint, ELOG_LEVEL ll=ELL_INFORMATION) IRR_OVERRIDE; //! Sets a new event receiver void setReceiver(IEventReceiver* r); @@ -53,4 +53,3 @@ private: } // end namespace #endif - diff --git a/source/Irrlicht/CMD2MeshFileLoader.h b/source/Irrlicht/CMD2MeshFileLoader.h index 73711a52..b2e9b159 100644 --- a/source/Irrlicht/CMD2MeshFileLoader.h +++ b/source/Irrlicht/CMD2MeshFileLoader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_MD2_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_MD2_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_MD2_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_MD2_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" @@ -24,13 +24,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! See IReferenceCounted::drop() for more information. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: //! Loads the file data into the mesh @@ -41,5 +41,4 @@ private: } // end namespace scene } // end namespace irr -#endif // __C_MD2_MESH_LOADER_H_INCLUDED__ - +#endif // IRR_C_MD2_MESH_LOADER_H_INCLUDED diff --git a/source/Irrlicht/CMD3MeshFileLoader.h b/source/Irrlicht/CMD3MeshFileLoader.h index c2684502..d6778577 100644 --- a/source/Irrlicht/CMD3MeshFileLoader.h +++ b/source/Irrlicht/CMD3MeshFileLoader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_MD3_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_MD3_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_MD3_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_MD3_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IFileSystem.h" @@ -29,13 +29,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! See IReferenceCounted::drop() for more information. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: scene::ISceneManager* SceneManager; @@ -46,4 +46,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CMS3DMeshFileLoader.h b/source/Irrlicht/CMS3DMeshFileLoader.h index 5bcefb41..ed5b72d2 100644 --- a/source/Irrlicht/CMS3DMeshFileLoader.h +++ b/source/Irrlicht/CMS3DMeshFileLoader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_MS3D_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_MS3D_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_MS3D_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_MS3D_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IVideoDriver.h" @@ -24,13 +24,13 @@ public: //! returns true if the file might be loadable by this class //! 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. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! See IReferenceCounted::drop() for more information. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: @@ -45,5 +45,3 @@ private: } // end namespace irr #endif - - diff --git a/source/Irrlicht/CMY3DHelper.h b/source/Irrlicht/CMY3DHelper.h index c1566d11..ab9cf7f4 100644 --- a/source/Irrlicht/CMY3DHelper.h +++ b/source/Irrlicht/CMY3DHelper.h @@ -15,8 +15,8 @@ // some useful functions //********************************************************************** -#ifndef __C_MY3D_HELPER_H_INCLUDED__ -#define __C_MY3D_HELPER_H_INCLUDED__ +#ifndef IRR_C_MY3D_HELPER_H_INCLUDED +#define IRR_C_MY3D_HELPER_H_INCLUDED #include "irrTypes.h" @@ -441,5 +441,4 @@ int rle_decode ( } //end namespace irr -#endif // __C_MY3D_HELPER_H_INCLUDED__ - +#endif // IRR_C_MY3D_HELPER_H_INCLUDED diff --git a/source/Irrlicht/CMY3DMeshFileLoader.h b/source/Irrlicht/CMY3DMeshFileLoader.h index c0369d49..b2160e83 100644 --- a/source/Irrlicht/CMY3DMeshFileLoader.h +++ b/source/Irrlicht/CMY3DMeshFileLoader.h @@ -73,9 +73,9 @@ public: CMY3DMeshFileLoader(ISceneManager *scmgr, io::IFileSystem* fs); virtual ~CMY3DMeshFileLoader(); - virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; + virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE; - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; //! getting access to the nodes (with transparent material), creating //! while loading .my3d file diff --git a/source/Irrlicht/CMemoryFile.h b/source/Irrlicht/CMemoryFile.h index b86c175e..fb59170c 100644 --- a/source/Irrlicht/CMemoryFile.h +++ b/source/Irrlicht/CMemoryFile.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_MEMORY_READ_FILE_H_INCLUDED__ -#define __C_MEMORY_READ_FILE_H_INCLUDED__ +#ifndef IRR_C_MEMORY_READ_FILE_H_INCLUDED +#define IRR_C_MEMORY_READ_FILE_H_INCLUDED #include "IMemoryReadFile.h" #include "IWriteFile.h" @@ -29,28 +29,28 @@ namespace io virtual ~CMemoryReadFile(); //! returns how much was read - virtual size_t read(void* buffer, size_t sizeToRead) _IRR_OVERRIDE_; + virtual size_t read(void* buffer, size_t sizeToRead) IRR_OVERRIDE; //! changes position in file, returns true if successful - virtual bool seek(long finalPos, bool relativeMovement = false) _IRR_OVERRIDE_; + virtual bool seek(long finalPos, bool relativeMovement = false) IRR_OVERRIDE; //! returns size of file - virtual long getSize() const _IRR_OVERRIDE_; + virtual long getSize() const IRR_OVERRIDE; //! returns where in the file we are. - virtual long getPos() const _IRR_OVERRIDE_; + virtual long getPos() const IRR_OVERRIDE; //! returns name of file - virtual const io::path& getFileName() const _IRR_OVERRIDE_; + virtual const io::path& getFileName() const IRR_OVERRIDE; //! Get the type of the class implementing this interface - virtual EREAD_FILE_TYPE getType() const _IRR_OVERRIDE_ + virtual EREAD_FILE_TYPE getType() const IRR_OVERRIDE { return ERFT_MEMORY_READ_FILE; } //! Get direct access to internal buffer - virtual const void *getBuffer() const _IRR_OVERRIDE_ + virtual const void *getBuffer() const IRR_OVERRIDE { return Buffer; } @@ -78,18 +78,18 @@ namespace io virtual ~CMemoryWriteFile(); //! returns how much was written - virtual size_t write(const void* buffer, size_t sizeToWrite) _IRR_OVERRIDE_; + virtual size_t write(const void* buffer, size_t sizeToWrite) IRR_OVERRIDE; //! changes position in file, returns true if successful - virtual bool seek(long finalPos, bool relativeMovement = false) _IRR_OVERRIDE_; + virtual bool seek(long finalPos, bool relativeMovement = false) IRR_OVERRIDE; //! returns where in the file we are. - virtual long getPos() const _IRR_OVERRIDE_; + virtual long getPos() const IRR_OVERRIDE; //! returns name of file - virtual const io::path& getFileName() const _IRR_OVERRIDE_; + virtual const io::path& getFileName() const IRR_OVERRIDE; - virtual bool flush() _IRR_OVERRIDE_; + virtual bool flush() IRR_OVERRIDE; private: @@ -104,4 +104,3 @@ namespace io } // end namespace irr #endif - diff --git a/source/Irrlicht/CMeshCache.h b/source/Irrlicht/CMeshCache.h index 839a4ab7..4bc52f72 100644 --- a/source/Irrlicht/CMeshCache.h +++ b/source/Irrlicht/CMeshCache.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_MESH_CACHE_H_INCLUDED__ -#define __C_MESH_CACHE_H_INCLUDED__ +#ifndef IRR_C_MESH_CACHE_H_INCLUDED +#define IRR_C_MESH_CACHE_H_INCLUDED #include "IMeshCache.h" #include "irrArray.h" @@ -30,42 +30,42 @@ namespace scene \param filename: Filename of the mesh. When called ISceneManager::getMesh() with this parameter, the method will return the mesh parameter given with this method. \param mesh: Pointer to a mesh which will now be referenced by this name. */ - virtual void addMesh(const io::path& filename, IAnimatedMesh* mesh) _IRR_OVERRIDE_; + virtual void addMesh(const io::path& filename, IAnimatedMesh* mesh) IRR_OVERRIDE; //! Removes a mesh from the cache. /** After loading a mesh with getMesh(), the mesh can be removed from the cache using this method, freeing a lot of memory. */ - virtual void removeMesh(const IMesh* const mesh) _IRR_OVERRIDE_; + virtual void removeMesh(const IMesh* const mesh) IRR_OVERRIDE; //! Returns amount of loaded meshes in the cache. /** You can load new meshes into the cache using getMesh() and addMesh(). If you ever need to access the internal mesh cache, you can do this using removeMesh(), getMeshNumber(), getMeshByIndex() and getMeshFilename() */ - virtual u32 getMeshCount() const _IRR_OVERRIDE_; + virtual u32 getMeshCount() const IRR_OVERRIDE; //! Returns current index number of the mesh, and -1 if it is not in the cache. - virtual s32 getMeshIndex(const IMesh* const mesh) const _IRR_OVERRIDE_; + virtual s32 getMeshIndex(const IMesh* const mesh) const IRR_OVERRIDE; //! Returns a mesh based on its index number. /** \param index: Index of the mesh, number between 0 and getMeshCount()-1. Note that this number is only valid until a new mesh is loaded or removed * \return Returns pointer to the mesh or 0 if there is none with this number. */ - virtual IAnimatedMesh* getMeshByIndex(u32 index) _IRR_OVERRIDE_; + virtual IAnimatedMesh* getMeshByIndex(u32 index) IRR_OVERRIDE; //! Returns a mesh based on its name. /** \param name Name of the mesh. Usually a filename. \return Pointer to the mesh or 0 if there is none with this number. */ - virtual IAnimatedMesh* getMeshByName(const io::path& name) _IRR_OVERRIDE_; + virtual IAnimatedMesh* getMeshByName(const io::path& name) IRR_OVERRIDE; //! Get the name of a loaded mesh, based on its index. /** \param index: Index of the mesh, number between 0 and getMeshCount()-1. \return The name if mesh was found and has a name, else the path is empty. */ - virtual const io::SNamedPath& getMeshName(u32 index) const _IRR_OVERRIDE_; + virtual const io::SNamedPath& getMeshName(u32 index) const IRR_OVERRIDE; //! Get the name of a loaded mesh, if there is any. /** \param mesh Pointer to mesh to query. \return The name if mesh was found and has a name, else the path is empty. */ - virtual const io::SNamedPath& getMeshName(const IMesh* const mesh) const _IRR_OVERRIDE_; + virtual const io::SNamedPath& getMeshName(const IMesh* const mesh) const IRR_OVERRIDE; //! Renames a loaded mesh. /** Note that renaming meshes might change the ordering of the @@ -74,7 +74,7 @@ namespace scene \param index The index of the mesh in the cache. \param name New name for the mesh. \return True if mesh was renamed. */ - virtual bool renameMesh(u32 index, const io::path& name) _IRR_OVERRIDE_; + virtual bool renameMesh(u32 index, const io::path& name) IRR_OVERRIDE; //! Renames a loaded mesh. /** Note that renaming meshes might change the ordering of the @@ -83,16 +83,16 @@ namespace scene \param mesh Mesh to be renamed. \param name New name for the mesh. \return True if mesh was renamed. */ - virtual bool renameMesh(const IMesh* const mesh, const io::path& name) _IRR_OVERRIDE_; + virtual bool renameMesh(const IMesh* const mesh, const io::path& name) IRR_OVERRIDE; //! returns if a mesh already was loaded - virtual bool isMeshLoaded(const io::path& name) _IRR_OVERRIDE_; + virtual bool isMeshLoaded(const io::path& name) IRR_OVERRIDE; //! Clears the whole mesh cache, removing all meshes. - virtual void clear() _IRR_OVERRIDE_; + virtual void clear() IRR_OVERRIDE; //! Clears all meshes that are held in the mesh cache but not used anywhere else. - virtual void clearUnusedMeshes() _IRR_OVERRIDE_; + virtual void clearUnusedMeshes() IRR_OVERRIDE; protected: @@ -120,4 +120,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CMeshManipulator.h b/source/Irrlicht/CMeshManipulator.h index c7518a67..68eecbe5 100644 --- a/source/Irrlicht/CMeshManipulator.h +++ b/source/Irrlicht/CMeshManipulator.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_MESH_MANIPULATOR_H_INCLUDED__ -#define __C_MESH_MANIPULATOR_H_INCLUDED__ +#ifndef IRR_C_MESH_MANIPULATOR_H_INCLUDED +#define IRR_C_MESH_MANIPULATOR_H_INCLUDED #include "IMeshManipulator.h" @@ -23,79 +23,78 @@ public: //! Flips the direction of surfaces. /** Changes backfacing triangles to frontfacing triangles and vice versa. \param mesh: Mesh on which the operation is performed. */ - virtual void flipSurfaces(scene::IMesh* mesh) const _IRR_OVERRIDE_; + virtual void flipSurfaces(scene::IMesh* mesh) const IRR_OVERRIDE; //! Recalculates all normals of the mesh. /** \param mesh: Mesh on which the operation is performed. \param smooth: Whether to use smoothed normals. */ - virtual void recalculateNormals(scene::IMesh* mesh, bool smooth = false, bool angleWeighted = false) const _IRR_OVERRIDE_; + virtual void recalculateNormals(scene::IMesh* mesh, bool smooth = false, bool angleWeighted = false) const IRR_OVERRIDE; //! Recalculates all normals of the mesh buffer. /** \param buffer: Mesh buffer on which the operation is performed. \param smooth: Whether to use smoothed normals. */ - virtual void recalculateNormals(IMeshBuffer* buffer, bool smooth = false, bool angleWeighted = false) const _IRR_OVERRIDE_; + virtual void recalculateNormals(IMeshBuffer* buffer, bool smooth = false, bool angleWeighted = false) const IRR_OVERRIDE; //! Clones a static IMesh into a modifiable SMesh. - virtual SMesh* createMeshCopy(scene::IMesh* mesh) const _IRR_OVERRIDE_; + virtual SMesh* createMeshCopy(scene::IMesh* mesh) const IRR_OVERRIDE; //! Creates a planar texture mapping on the mesh /** \param mesh: Mesh on which the operation is performed. \param resolution: resolution of the planar mapping. This is the value specifying which is the relation between world space and texture coordinate space. */ - virtual void makePlanarTextureMapping(scene::IMesh* mesh, f32 resolution=0.001f) const _IRR_OVERRIDE_; + virtual void makePlanarTextureMapping(scene::IMesh* mesh, f32 resolution=0.001f) const IRR_OVERRIDE; //! Creates a planar texture mapping on the meshbuffer - virtual void makePlanarTextureMapping(scene::IMeshBuffer* meshbuffer, f32 resolution=0.001f) const _IRR_OVERRIDE_; + virtual void makePlanarTextureMapping(scene::IMeshBuffer* meshbuffer, f32 resolution=0.001f) const IRR_OVERRIDE; //! Creates a planar texture mapping on the meshbuffer - void makePlanarTextureMapping(scene::IMeshBuffer* buffer, f32 resolutionS, f32 resolutionT, u8 axis, const core::vector3df& offset) const _IRR_OVERRIDE_; + void makePlanarTextureMapping(scene::IMeshBuffer* buffer, f32 resolutionS, f32 resolutionT, u8 axis, const core::vector3df& offset) const IRR_OVERRIDE; //! Creates a planar texture mapping on the mesh - void makePlanarTextureMapping(scene::IMesh* mesh, f32 resolutionS, f32 resolutionT, u8 axis, const core::vector3df& offset) const _IRR_OVERRIDE_; + void makePlanarTextureMapping(scene::IMesh* mesh, f32 resolutionS, f32 resolutionT, u8 axis, const core::vector3df& offset) const IRR_OVERRIDE; //! Recalculates tangents, requires a tangent mesh buffer - virtual void recalculateTangents(IMeshBuffer* buffer, bool recalculateNormals=false, bool smooth=false, bool angleWeighted=false) const _IRR_OVERRIDE_; + virtual void recalculateTangents(IMeshBuffer* buffer, bool recalculateNormals=false, bool smooth=false, bool angleWeighted=false) const IRR_OVERRIDE; //! Recalculates tangents, requires a tangent mesh - virtual void recalculateTangents(IMesh* mesh, bool recalculateNormals=false, bool smooth=false, bool angleWeighted=false) const _IRR_OVERRIDE_; + virtual void recalculateTangents(IMesh* mesh, bool recalculateNormals=false, bool smooth=false, bool angleWeighted=false) const IRR_OVERRIDE; //! Creates a copy of the mesh, which will only consist of S3DVertexTangents vertices. - virtual IMesh* createMeshWithTangents(IMesh* mesh, bool recalculateNormals=false, bool smooth=false, bool angleWeighted=false, bool recalculateTangents=true) const _IRR_OVERRIDE_; + virtual IMesh* createMeshWithTangents(IMesh* mesh, bool recalculateNormals=false, bool smooth=false, bool angleWeighted=false, bool recalculateTangents=true) const IRR_OVERRIDE; //! Creates a copy of the mesh, which will only consist of S3D2TCoords vertices. - virtual IMesh* createMeshWith2TCoords(IMesh* mesh) const _IRR_OVERRIDE_; + virtual IMesh* createMeshWith2TCoords(IMesh* mesh) const IRR_OVERRIDE; //! Creates a copy of the mesh, which will only consist of S3DVertex vertices. - virtual IMesh* createMeshWith1TCoords(IMesh* mesh) const _IRR_OVERRIDE_; + virtual IMesh* createMeshWith1TCoords(IMesh* mesh) const IRR_OVERRIDE; //! Creates a copy of the mesh, which will only consist of unique triangles, i.e. no vertices are shared. - virtual IMesh* createMeshUniquePrimitives(IMesh* mesh) const _IRR_OVERRIDE_; + virtual IMesh* createMeshUniquePrimitives(IMesh* mesh) const IRR_OVERRIDE; //! Creates a copy of the mesh, which will have all duplicated vertices removed, i.e. maximal amount of vertices are shared via indexing. - virtual IMesh* createMeshWelded(IMesh *mesh, f32 tolerance=core::ROUNDING_ERROR_f32) const _IRR_OVERRIDE_; + virtual IMesh* createMeshWelded(IMesh *mesh, f32 tolerance=core::ROUNDING_ERROR_f32) const IRR_OVERRIDE; //! Returns amount of polygons in mesh. - virtual s32 getPolyCount(scene::IMesh* mesh) const _IRR_OVERRIDE_; + virtual s32 getPolyCount(scene::IMesh* mesh) const IRR_OVERRIDE; //! Returns amount of polygons in mesh. - virtual s32 getPolyCount(scene::IAnimatedMesh* mesh) const _IRR_OVERRIDE_; + virtual s32 getPolyCount(scene::IAnimatedMesh* mesh) const IRR_OVERRIDE; //! create a new AnimatedMesh and adds the mesh to it - virtual IAnimatedMesh * createAnimatedMesh(scene::IMesh* mesh,scene::E_ANIMATED_MESH_TYPE type) const _IRR_OVERRIDE_; + virtual IAnimatedMesh * createAnimatedMesh(scene::IMesh* mesh,scene::E_ANIMATED_MESH_TYPE type) const IRR_OVERRIDE; //! create a mesh optimized for the vertex cache - virtual IMesh* createForsythOptimizedMesh(const scene::IMesh *mesh) const _IRR_OVERRIDE_; + virtual IMesh* createForsythOptimizedMesh(const scene::IMesh *mesh) const IRR_OVERRIDE; //! Optimizes the mesh using an algorithm tuned for heightmaps - virtual void heightmapOptimizeMesh(IMesh * const m, const f32 tolerance = core::ROUNDING_ERROR_f32) const _IRR_OVERRIDE_; + virtual void heightmapOptimizeMesh(IMesh * const m, const f32 tolerance = core::ROUNDING_ERROR_f32) const IRR_OVERRIDE; //! Optimizes the mesh using an algorithm tuned for heightmaps - virtual void heightmapOptimizeMesh(IMeshBuffer * const m, const f32 tolerance = core::ROUNDING_ERROR_f32) const _IRR_OVERRIDE_; + virtual void heightmapOptimizeMesh(IMeshBuffer * const m, const f32 tolerance = core::ROUNDING_ERROR_f32) const IRR_OVERRIDE; }; } // end namespace scene } // end namespace irr - #endif diff --git a/source/Irrlicht/CMeshSceneNode.h b/source/Irrlicht/CMeshSceneNode.h index b7b10be3..3b1c1b1c 100644 --- a/source/Irrlicht/CMeshSceneNode.h +++ b/source/Irrlicht/CMeshSceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_MESH_SCENE_NODE_H_INCLUDED__ -#define __C_MESH_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_MESH_SCENE_NODE_H_INCLUDED +#define IRR_C_MESH_SCENE_NODE_H_INCLUDED #include "IMeshSceneNode.h" #include "IMesh.h" @@ -27,59 +27,59 @@ namespace scene virtual ~CMeshSceneNode(); //! frame - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; //! renders the node. - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! returns the material based on the zero based index i. To get the amount //! of materials used by this scene node, use getMaterialCount(). //! 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 //! 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. - virtual u32 getMaterialCount() const _IRR_OVERRIDE_; + virtual u32 getMaterialCount() const IRR_OVERRIDE; //! 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. - 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 - virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_MESH; } + virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_MESH; } //! Sets a new mesh - virtual void setMesh(IMesh* mesh) _IRR_OVERRIDE_; + virtual void setMesh(IMesh* mesh) IRR_OVERRIDE; //! Returns the current mesh - virtual IMesh* getMesh(void) _IRR_OVERRIDE_ { return Mesh; } + virtual IMesh* getMesh(void) IRR_OVERRIDE { return Mesh; } //! Creates shadow volume scene node as child of this node //! and returns a pointer to it. virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh, - s32 id, bool zfailmethod=true, f32 infinity=10000.0f) _IRR_OVERRIDE_; + s32 id, bool zfailmethod=true, f32 infinity=10000.0f) IRR_OVERRIDE; //! Sets if the scene node should not copy the materials of the mesh but use them in a read only style. /* In this way it is possible to change the materials a mesh causing all mesh scene nodes 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 - virtual bool isReadOnlyMaterials() const _IRR_OVERRIDE_; + virtual bool isReadOnlyMaterials() const IRR_OVERRIDE; //! 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; //! Removes a child from this scene node. //! Implemented here, to be able to remove the shadow properly, if there is one, //! or to remove attached child. - virtual bool removeChild(ISceneNode* child) _IRR_OVERRIDE_; + virtual bool removeChild(ISceneNode* child) IRR_OVERRIDE; protected: @@ -100,4 +100,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CMeshTextureLoader.cpp b/source/Irrlicht/CMeshTextureLoader.cpp index 08f4678a..6f903232 100644 --- a/source/Irrlicht/CMeshTextureLoader.cpp +++ b/source/Irrlicht/CMeshTextureLoader.cpp @@ -50,7 +50,7 @@ irr::video::ITexture* CMeshTextureLoader::getTexture(const irr::io::path& textur // Pre-process texture filename. irr::io::path simplifiedTexName(textureName); - simplifiedTexName.replace(_IRR_TEXT('\\'),_IRR_TEXT('/')); + simplifiedTexName.replace(IRR_TEXT('\\'),IRR_TEXT('/')); // user defined texture path if ( !TexturePath.empty() ) @@ -106,7 +106,7 @@ irr::video::ITexture* CMeshTextureLoader::getTexture(const irr::io::path& textur if ( checkTextureName(FileSystem->getFileBasename(simplifiedTexName)) ) return VideoDriver->getTexture(TextureName); - TextureName = _IRR_TEXT(""); + TextureName = IRR_TEXT(""); return NULL; } @@ -115,7 +115,7 @@ void CMeshTextureLoader::setMeshFile(const irr::io::IReadFile* meshFile) { // no grab (would need a weak_ptr) MeshFile = meshFile; - MeshPath = _IRR_TEXT(""); // do a lazy evaluation later + MeshPath = IRR_TEXT(""); // do a lazy evaluation later } //! Meshloaders will try to look relative to the path of the materialFile @@ -123,7 +123,7 @@ void CMeshTextureLoader::setMaterialFile(const irr::io::IReadFile* materialFile) { // no grab (would need a weak_ptr) MaterialFile = materialFile; - MaterialPath = _IRR_TEXT(""); // do a lazy evaluation later + MaterialPath = IRR_TEXT(""); // do a lazy evaluation later } } // end namespace scnene diff --git a/source/Irrlicht/CMeshTextureLoader.h b/source/Irrlicht/CMeshTextureLoader.h index dac4929e..7467f3c1 100644 --- a/source/Irrlicht/CMeshTextureLoader.h +++ b/source/Irrlicht/CMeshTextureLoader.h @@ -24,26 +24,26 @@ public: //! Set a custom texture path. /** This is the first path the texture-loader should search. */ - virtual void setTexturePath(const irr::io::path& path) _IRR_OVERRIDE_; + virtual void setTexturePath(const irr::io::path& path) IRR_OVERRIDE; //! Get the current custom texture path. - virtual const irr::io::path& getTexturePath() const _IRR_OVERRIDE_; + virtual const irr::io::path& getTexturePath() const IRR_OVERRIDE; //! Get the texture by searching for it in all paths that makes sense for the given textureName. /** Usually you do not have to use this method, it is used internally by IMeshLoader's. \param textureName Texturename as used in the mesh-format \return Pointer to the texture. Returns 0 if loading failed.*/ - virtual irr::video::ITexture* getTexture(const irr::io::path& textureName) _IRR_OVERRIDE_; + virtual irr::video::ITexture* getTexture(const irr::io::path& textureName) IRR_OVERRIDE; //! Meshloaders will search paths relative to the meshFile. /** Usually you do not have to use this method, it is used internally by IMeshLoader's. Any values you set here will likely be overwritten internally. */ - virtual void setMeshFile(const irr::io::IReadFile* meshFile) _IRR_OVERRIDE_; + virtual void setMeshFile(const irr::io::IReadFile* meshFile) IRR_OVERRIDE; //! Meshloaders will try to look relative to the path of the materialFile /** Usually you do not have to use this method, it is used internally by IMeshLoader's. Any values you set here will likely be overwritten internally. */ - virtual void setMaterialFile(const irr::io::IReadFile* materialFile) _IRR_OVERRIDE_; + virtual void setMaterialFile(const irr::io::IReadFile* materialFile) IRR_OVERRIDE; protected: // make certain path's have a certain internal format @@ -51,12 +51,12 @@ protected: { if (!directory.empty()) { - if (directory == _IRR_TEXT(".")) - directory = _IRR_TEXT(""); + if (directory == IRR_TEXT(".")) + directory = IRR_TEXT(""); - directory.replace(_IRR_TEXT('\\'),_IRR_TEXT('/')); - if (directory.lastChar() != _IRR_TEXT('/')) - directory.append(_IRR_TEXT('/')); + directory.replace(IRR_TEXT('\\'),IRR_TEXT('/')); + if (directory.lastChar() != IRR_TEXT('/')) + directory.append(IRR_TEXT('/')); } } diff --git a/source/Irrlicht/CMetaTriangleSelector.h b/source/Irrlicht/CMetaTriangleSelector.h index b5202621..ba11aa8c 100644 --- a/source/Irrlicht/CMetaTriangleSelector.h +++ b/source/Irrlicht/CMetaTriangleSelector.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_META_TRIANGLE_SELECTOR_H_INCLUDED__ -#define __C_META_TRIANGLE_SELECTOR_H_INCLUDED__ +#ifndef IRR_C_META_TRIANGLE_SELECTOR_H_INCLUDED +#define IRR_C_META_TRIANGLE_SELECTOR_H_INCLUDED #include "IMetaTriangleSelector.h" #include "irrArray.h" @@ -25,46 +25,46 @@ public: virtual ~CMetaTriangleSelector(); //! Get amount of all available triangles in this selector - virtual s32 getTriangleCount() const _IRR_OVERRIDE_; + virtual s32 getTriangleCount() const IRR_OVERRIDE; //! Gets all triangles. virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, const core::matrix4* transform, bool useNodeTransform, - irr::core::array* outTriangleInfo) const _IRR_OVERRIDE_; + irr::core::array* outTriangleInfo) const IRR_OVERRIDE; //! Gets all triangles which lie within a specific bounding box. virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, const core::aabbox3d& box, const core::matrix4* transform, bool useNodeTransform, - irr::core::array* outTriangleInfo) const _IRR_OVERRIDE_; + irr::core::array* outTriangleInfo) const IRR_OVERRIDE; //! Gets all triangles which have or may have contact with a 3d line. virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, const core::line3d& line, const core::matrix4* transform, bool useNodeTransform, - irr::core::array* outTriangleInfo) const _IRR_OVERRIDE_; + irr::core::array* outTriangleInfo) const IRR_OVERRIDE; //! Adds a triangle selector to the collection of triangle selectors //! in this metaTriangleSelector. - virtual void addTriangleSelector(ITriangleSelector* toAdd) _IRR_OVERRIDE_; + virtual void addTriangleSelector(ITriangleSelector* toAdd) IRR_OVERRIDE; //! Removes a specific triangle selector which was added before from the collection. - virtual bool removeTriangleSelector(ITriangleSelector* toRemove) _IRR_OVERRIDE_; + virtual bool removeTriangleSelector(ITriangleSelector* toRemove) IRR_OVERRIDE; //! Removes all triangle selectors from the collection. - virtual void removeAllTriangleSelectors() _IRR_OVERRIDE_; + virtual void removeAllTriangleSelectors() IRR_OVERRIDE; //! Get the scene node associated with a given triangle. - virtual ISceneNode* getSceneNodeForTriangle(u32 triangleIndex) const _IRR_OVERRIDE_; + virtual ISceneNode* getSceneNodeForTriangle(u32 triangleIndex) const IRR_OVERRIDE; // Get the number of TriangleSelectors that are part of this one - virtual u32 getSelectorCount() const _IRR_OVERRIDE_; + virtual u32 getSelectorCount() const IRR_OVERRIDE; // Get the TriangleSelector based on index based on getSelectorCount - virtual ITriangleSelector* getSelector(u32 index) _IRR_OVERRIDE_; + virtual ITriangleSelector* getSelector(u32 index) IRR_OVERRIDE; // Get the TriangleSelector based on index based on getSelectorCount - virtual const ITriangleSelector* getSelector(u32 index) const _IRR_OVERRIDE_; + virtual const ITriangleSelector* getSelector(u32 index) const IRR_OVERRIDE; private: @@ -76,4 +76,3 @@ private: #endif - diff --git a/source/Irrlicht/CMountPointReader.h b/source/Irrlicht/CMountPointReader.h index 24f49720..043add79 100644 --- a/source/Irrlicht/CMountPointReader.h +++ b/source/Irrlicht/CMountPointReader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_MOUNT_READER_H_INCLUDED__ -#define __C_MOUNT_READER_H_INCLUDED__ +#ifndef IRR_C_MOUNT_READER_H_INCLUDED +#define IRR_C_MOUNT_READER_H_INCLUDED #include "IrrCompileConfig.h" @@ -27,28 +27,28 @@ namespace io //! returns true if the file maybe is able to be loaded by this class //! based on the file extension (e.g. ".zip") - virtual bool isALoadableFileFormat(const io::path& filename) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(const io::path& filename) const IRR_OVERRIDE; //! Check if the file might be loaded by this class /** Check might look into the file. \param file File handle to check. \return True if file seems to be loadable. */ - virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE; //! Check to see if the loader can create archives of this type. /** Check based on the archive type. \param fileType The archive type to check. \return True if the archile loader supports this type, false if not */ - virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const IRR_OVERRIDE; //! Creates an archive from the filename /** \param file File handle to check. \return Pointer to newly created archive, or 0 upon error. */ - virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const _IRR_OVERRIDE_; + virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const IRR_OVERRIDE; //! creates/loads an archive from the file. //! \return Pointer to the created archive. Returns 0 if loading failed. - virtual IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const _IRR_OVERRIDE_; + virtual IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const IRR_OVERRIDE; private: io::IFileSystem* FileSystem; @@ -64,19 +64,19 @@ namespace io bool ignoreCase, bool ignorePaths); //! opens a file by index - virtual IReadFile* createAndOpenFile(u32 index) _IRR_OVERRIDE_; + virtual IReadFile* createAndOpenFile(u32 index) IRR_OVERRIDE; //! opens a file by file name - virtual IReadFile* createAndOpenFile(const io::path& filename) _IRR_OVERRIDE_; + virtual IReadFile* createAndOpenFile(const io::path& filename) IRR_OVERRIDE; //! returns the list of files - virtual const IFileList* getFileList() const _IRR_OVERRIDE_; + virtual const IFileList* getFileList() const IRR_OVERRIDE; //! get the class Type - virtual E_FILE_ARCHIVE_TYPE getType() const _IRR_OVERRIDE_ { return EFAT_FOLDER; } + virtual E_FILE_ARCHIVE_TYPE getType() const IRR_OVERRIDE { return EFAT_FOLDER; } //! return the name (id) of the file Archive - virtual const io::path& getArchiveName() const _IRR_OVERRIDE_ {return Path;} + virtual const io::path& getArchiveName() const IRR_OVERRIDE {return Path;} private: @@ -89,4 +89,4 @@ namespace io } // irr #endif // __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_ -#endif // __C_MOUNT_READER_H_INCLUDED__ +#endif // IRR_C_MOUNT_READER_H_INCLUDED diff --git a/source/Irrlicht/CNPKReader.h b/source/Irrlicht/CNPKReader.h index 204a34c3..ca6c2e20 100644 --- a/source/Irrlicht/CNPKReader.h +++ b/source/Irrlicht/CNPKReader.h @@ -3,8 +3,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_NPK_READER_H_INCLUDED__ -#define __C_NPK_READER_H_INCLUDED__ +#ifndef IRR_C_NPK_READER_H_INCLUDED +#define IRR_C_NPK_READER_H_INCLUDED #include "IrrCompileConfig.h" @@ -51,28 +51,28 @@ namespace io //! returns true if the file maybe is able to be loaded by this class //! based on the file extension (e.g. ".zip") - virtual bool isALoadableFileFormat(const io::path& filename) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(const io::path& filename) const IRR_OVERRIDE; //! Check if the file might be loaded by this class /** Check might look into the file. \param file File handle to check. \return True if file seems to be loadable. */ - virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE; //! Check to see if the loader can create archives of this type. /** Check based on the archive type. \param fileType The archive type to check. \return True if the archile loader supports this type, false if not */ - virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const IRR_OVERRIDE; //! Creates an archive from the filename /** \param file File handle to check. \return Pointer to newly created archive, or 0 upon error. */ - virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const _IRR_OVERRIDE_; + virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const IRR_OVERRIDE; //! creates/loads an archive from the file. //! \return Pointer to the created archive. Returns 0 if loading failed. - virtual io::IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const _IRR_OVERRIDE_; + virtual io::IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const IRR_OVERRIDE; private: io::IFileSystem* FileSystem; @@ -90,22 +90,22 @@ namespace io // file archive methods //! return the id of the file Archive - virtual const io::path& getArchiveName() const _IRR_OVERRIDE_ + virtual const io::path& getArchiveName() const IRR_OVERRIDE { return File->getFileName(); } //! opens a file by file name - virtual IReadFile* createAndOpenFile(const io::path& filename) _IRR_OVERRIDE_; + virtual IReadFile* createAndOpenFile(const io::path& filename) IRR_OVERRIDE; //! opens a file by index - virtual IReadFile* createAndOpenFile(u32 index) _IRR_OVERRIDE_; + virtual IReadFile* createAndOpenFile(u32 index) IRR_OVERRIDE; //! returns the list of files - virtual const IFileList* getFileList() const _IRR_OVERRIDE_; + virtual const IFileList* getFileList() const IRR_OVERRIDE; //! get the class Type - virtual E_FILE_ARCHIVE_TYPE getType() const _IRR_OVERRIDE_ { return EFAT_NPK; } + virtual E_FILE_ARCHIVE_TYPE getType() const IRR_OVERRIDE { return EFAT_NPK; } private: @@ -121,5 +121,4 @@ namespace io #endif // __IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_ -#endif // __C_NPK_READER_H_INCLUDED__ - +#endif // IRR_C_NPK_READER_H_INCLUDED diff --git a/source/Irrlicht/CNullDriver.cpp b/source/Irrlicht/CNullDriver.cpp index 741db99a..b679ebee 100644 --- a/source/Irrlicht/CNullDriver.cpp +++ b/source/Irrlicht/CNullDriver.cpp @@ -670,7 +670,7 @@ video::ITexture* CNullDriver::loadTextureFromFile(io::IReadFile* file, const io: } break; default: - _IRR_DEBUG_BREAK_IF(true); + IRR_DEBUG_BREAK_IF(true); break; } @@ -1141,7 +1141,7 @@ const SLight& CNullDriver::getDynamicLight(u32 idx) const return Lights[idx]; else { - _IRR_DEBUG_BREAK_IF(true) + IRR_DEBUG_BREAK_IF(true) static const SLight dummy; return dummy; } diff --git a/source/Irrlicht/CNullDriver.h b/source/Irrlicht/CNullDriver.h index 11191661..a03b2170 100644 --- a/source/Irrlicht/CNullDriver.h +++ b/source/Irrlicht/CNullDriver.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_VIDEO_NULL_H_INCLUDED__ -#define __C_VIDEO_NULL_H_INCLUDED__ +#ifndef IRR_C_VIDEO_NULL_H_INCLUDED +#define IRR_C_VIDEO_NULL_H_INCLUDED #include "IVideoDriver.h" #include "IFileSystem.h" @@ -49,99 +49,99 @@ namespace video virtual ~CNullDriver(); virtual bool beginScene(u16 clearFlag, SColor clearColor = SColor(255,0,0,0), f32 clearDepth = 1.f, u8 clearStencil = 0, - const SExposedVideoData& videoData = SExposedVideoData(), core::rect* sourceRect = 0) _IRR_OVERRIDE_; + const SExposedVideoData& videoData = SExposedVideoData(), core::rect* sourceRect = 0) IRR_OVERRIDE; - virtual bool endScene() _IRR_OVERRIDE_; + virtual bool endScene() IRR_OVERRIDE; //! Disable a feature of the driver. - virtual void disableFeature(E_VIDEO_DRIVER_FEATURE feature, bool flag=true) _IRR_OVERRIDE_; + virtual void disableFeature(E_VIDEO_DRIVER_FEATURE feature, bool flag=true) IRR_OVERRIDE; //! queries the features of the driver, returns true if feature is available - virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const _IRR_OVERRIDE_; + virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const IRR_OVERRIDE; //! Get attributes of the actual video driver - virtual const io::IAttributes& getDriverAttributes() const _IRR_OVERRIDE_; + virtual const io::IAttributes& getDriverAttributes() const IRR_OVERRIDE; //! sets transformation - virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) _IRR_OVERRIDE_; + virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) IRR_OVERRIDE; //! Retrieve the number of image loaders - virtual u32 getImageLoaderCount() const _IRR_OVERRIDE_; + virtual u32 getImageLoaderCount() const IRR_OVERRIDE; //! Retrieve the given image loader - virtual IImageLoader* getImageLoader(u32 n) _IRR_OVERRIDE_; + virtual IImageLoader* getImageLoader(u32 n) IRR_OVERRIDE; //! Retrieve the number of image writers - virtual u32 getImageWriterCount() const _IRR_OVERRIDE_; + virtual u32 getImageWriterCount() const IRR_OVERRIDE; //! Retrieve the given image writer - virtual IImageWriter* getImageWriter(u32 n) _IRR_OVERRIDE_; + virtual IImageWriter* getImageWriter(u32 n) IRR_OVERRIDE; //! sets a material - virtual void setMaterial(const SMaterial& material) _IRR_OVERRIDE_; + virtual void setMaterial(const SMaterial& material) IRR_OVERRIDE; //! loads a Texture - virtual ITexture* getTexture(const io::path& filename) _IRR_OVERRIDE_; + virtual ITexture* getTexture(const io::path& filename) IRR_OVERRIDE; //! loads a Texture - virtual ITexture* getTexture(io::IReadFile* file) _IRR_OVERRIDE_; + virtual ITexture* getTexture(io::IReadFile* file) IRR_OVERRIDE; //! Returns a texture by index - virtual ITexture* getTextureByIndex(u32 index) _IRR_OVERRIDE_; + virtual ITexture* getTextureByIndex(u32 index) IRR_OVERRIDE; //! Returns amount of textures currently loaded - virtual u32 getTextureCount() const _IRR_OVERRIDE_; + virtual u32 getTextureCount() const IRR_OVERRIDE; //! Renames a texture - virtual void renameTexture(ITexture* texture, const io::path& newName) _IRR_OVERRIDE_; + virtual void renameTexture(ITexture* texture, const io::path& newName) IRR_OVERRIDE; - virtual ITexture* addTexture(const core::dimension2d& size, const io::path& name, ECOLOR_FORMAT format = ECF_A8R8G8B8) _IRR_OVERRIDE_; + virtual ITexture* addTexture(const core::dimension2d& size, const io::path& name, ECOLOR_FORMAT format = ECF_A8R8G8B8) IRR_OVERRIDE; - virtual ITexture* addTexture(const io::path& name, IImage* image) _IRR_OVERRIDE_; + virtual ITexture* addTexture(const io::path& name, IImage* image) IRR_OVERRIDE; virtual ITexture* addTextureCubemap(const io::path& name, IImage* imagePosX, IImage* imageNegX, IImage* imagePosY, - IImage* imageNegY, IImage* imagePosZ, IImage* imageNegZ) _IRR_OVERRIDE_; + IImage* imageNegY, IImage* imagePosZ, IImage* imageNegZ) IRR_OVERRIDE; - virtual ITexture* addTextureCubemap(const irr::u32 sideLen, const io::path& name, ECOLOR_FORMAT format = ECF_A8R8G8B8) _IRR_OVERRIDE_; + virtual ITexture* addTextureCubemap(const irr::u32 sideLen, const io::path& name, ECOLOR_FORMAT format = ECF_A8R8G8B8) IRR_OVERRIDE; virtual bool setRenderTargetEx(IRenderTarget* target, u16 clearFlag, SColor clearColor = SColor(255,0,0,0), - f32 clearDepth = 1.f, u8 clearStencil = 0) _IRR_OVERRIDE_; + f32 clearDepth = 1.f, u8 clearStencil = 0) IRR_OVERRIDE; virtual bool setRenderTarget(ITexture* texture, u16 clearFlag, SColor clearColor = SColor(255,0,0,0), - f32 clearDepth = 1.f, u8 clearStencil = 0) _IRR_OVERRIDE_; + f32 clearDepth = 1.f, u8 clearStencil = 0) IRR_OVERRIDE; //! sets a viewport - virtual void setViewPort(const core::rect& area) _IRR_OVERRIDE_; + virtual void setViewPort(const core::rect& area) IRR_OVERRIDE; //! gets the area of the current viewport - virtual const core::rect& getViewPort() const _IRR_OVERRIDE_; + virtual const core::rect& getViewPort() const IRR_OVERRIDE; //! draws a vertex primitive list virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const void* indexList, u32 primitiveCount, E_VERTEX_TYPE vType=EVT_STANDARD, scene::E_PRIMITIVE_TYPE pType=scene::EPT_TRIANGLES, - E_INDEX_TYPE iType=EIT_16BIT) _IRR_OVERRIDE_; + E_INDEX_TYPE iType=EIT_16BIT) IRR_OVERRIDE; //! draws a vertex primitive list in 2d virtual void draw2DVertexPrimitiveList(const void* vertices, u32 vertexCount, const void* indexList, u32 primitiveCount, E_VERTEX_TYPE vType=EVT_STANDARD, scene::E_PRIMITIVE_TYPE pType=scene::EPT_TRIANGLES, - E_INDEX_TYPE iType=EIT_16BIT) _IRR_OVERRIDE_; + E_INDEX_TYPE iType=EIT_16BIT) IRR_OVERRIDE; //! Draws a 3d line. virtual void draw3DLine(const core::vector3df& start, - const core::vector3df& end, SColor color = SColor(255,255,255,255)) _IRR_OVERRIDE_; + const core::vector3df& end, SColor color = SColor(255,255,255,255)) IRR_OVERRIDE; //! Draws a 3d triangle. virtual void draw3DTriangle(const core::triangle3df& triangle, - SColor color = SColor(255,255,255,255)) _IRR_OVERRIDE_; + SColor color = SColor(255,255,255,255)) IRR_OVERRIDE; //! Draws a 3d axis aligned box. virtual void draw3DBox(const core::aabbox3d& box, - SColor color = SColor(255,255,255,255)) _IRR_OVERRIDE_; + SColor color = SColor(255,255,255,255)) IRR_OVERRIDE; //! draws an 2d image - virtual void draw2DImage(const video::ITexture* texture, const core::position2d& destPos, bool useAlphaChannelOfTexture) _IRR_OVERRIDE_; + virtual void draw2DImage(const video::ITexture* texture, const core::position2d& destPos, bool useAlphaChannelOfTexture) IRR_OVERRIDE; //! draws a set of 2d images, using a color and the alpha /** channel of the texture if desired. The images are drawn @@ -167,7 +167,7 @@ namespace video s32 kerningWidth = 0, const core::rect* clipRect = 0, SColor color=SColor(255,255,255,255), - bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_; + bool useAlphaChannelOfTexture=false) IRR_OVERRIDE; //! Draws a set of 2d images, using a color and the alpha channel of the texture. /** All drawings are clipped against clipRect (if != 0). @@ -190,108 +190,108 @@ namespace video const core::array >& sourceRects, const core::rect* clipRect=0, SColor color=SColor(255,255,255,255), - bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_; + bool useAlphaChannelOfTexture=false) IRR_OVERRIDE; //! Draws a 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted. virtual void draw2DImage(const video::ITexture* texture, const core::position2d& destPos, const core::rect& sourceRect, const core::rect* clipRect = 0, - SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_; + SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false) IRR_OVERRIDE; //! Draws a part of the texture into the rectangle. virtual void draw2DImage(const video::ITexture* texture, const core::rect& destRect, const core::rect& sourceRect, const core::rect* clipRect = 0, - const video::SColor* const colors=0, bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_; + const video::SColor* const colors=0, bool useAlphaChannelOfTexture=false) IRR_OVERRIDE; //! Draws a 2d rectangle - virtual void draw2DRectangle(SColor color, const core::rect& pos, const core::rect* clip = 0) _IRR_OVERRIDE_; + virtual void draw2DRectangle(SColor color, const core::rect& pos, const core::rect* clip = 0) IRR_OVERRIDE; //! Draws a 2d rectangle with a gradient. virtual void draw2DRectangle(const core::rect& pos, SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown, - const core::rect* clip = 0) _IRR_OVERRIDE_; + const core::rect* clip = 0) IRR_OVERRIDE; //! Draws the outline of a 2d rectangle - virtual void draw2DRectangleOutline(const core::recti& pos, SColor color=SColor(255,255,255,255)) _IRR_OVERRIDE_; + virtual void draw2DRectangleOutline(const core::recti& pos, SColor color=SColor(255,255,255,255)) IRR_OVERRIDE; //! Draws a 2d line. virtual void draw2DLine(const core::position2d& start, const core::position2d& end, - SColor color=SColor(255,255,255,255)) _IRR_OVERRIDE_; + SColor color=SColor(255,255,255,255)) IRR_OVERRIDE; //! Draws a pixel - virtual void drawPixel(u32 x, u32 y, const SColor & color) _IRR_OVERRIDE_; + virtual void drawPixel(u32 x, u32 y, const SColor & color) IRR_OVERRIDE; //! Draws a non filled concyclic reqular 2d polygon. virtual void draw2DPolygon(core::position2d center, - f32 radius, video::SColor Color, s32 vertexCount) _IRR_OVERRIDE_; + f32 radius, video::SColor Color, s32 vertexCount) IRR_OVERRIDE; virtual void setFog(SColor color=SColor(0,255,255,255), E_FOG_TYPE fogType=EFT_FOG_LINEAR, f32 start=50.0f, f32 end=100.0f, f32 density=0.01f, - bool pixelFog=false, bool rangeFog=false) _IRR_OVERRIDE_; + bool pixelFog=false, bool rangeFog=false) IRR_OVERRIDE; virtual void getFog(SColor& color, E_FOG_TYPE& fogType, f32& start, f32& end, f32& density, - bool& pixelFog, bool& rangeFog) _IRR_OVERRIDE_; + bool& pixelFog, bool& rangeFog) IRR_OVERRIDE; //! get color format of the current color buffer - virtual ECOLOR_FORMAT getColorFormat() const _IRR_OVERRIDE_; + virtual ECOLOR_FORMAT getColorFormat() const IRR_OVERRIDE; //! get screen size - virtual const core::dimension2d& getScreenSize() const _IRR_OVERRIDE_; + virtual const core::dimension2d& getScreenSize() const IRR_OVERRIDE; //! get current render target IRenderTarget* getCurrentRenderTarget() const; //! get render target size - virtual const core::dimension2d& getCurrentRenderTargetSize() const _IRR_OVERRIDE_; + virtual const core::dimension2d& getCurrentRenderTargetSize() const IRR_OVERRIDE; // get current frames per second value - virtual s32 getFPS() const _IRR_OVERRIDE_; + virtual s32 getFPS() const IRR_OVERRIDE; //! returns amount of primitives (mostly triangles) were drawn in the last frame. //! very useful method for statistics. - virtual u32 getPrimitiveCountDrawn( u32 param = 0 ) const _IRR_OVERRIDE_; + virtual u32 getPrimitiveCountDrawn( u32 param = 0 ) const IRR_OVERRIDE; //! deletes all dynamic lights there are - virtual void deleteAllDynamicLights() _IRR_OVERRIDE_; + virtual void deleteAllDynamicLights() IRR_OVERRIDE; //! adds a dynamic light, returning an index to the light //! \param light: the light data to use to create the light //! \return An index to the light, or -1 if an error occurs - virtual s32 addDynamicLight(const SLight& light) _IRR_OVERRIDE_; + virtual s32 addDynamicLight(const SLight& light) IRR_OVERRIDE; //! Turns a dynamic light on or off //! \param lightIndex: the index returned by addDynamicLight //! \param turnOn: true to turn the light on, false to turn it off - virtual void turnLightOn(s32 lightIndex, bool turnOn) _IRR_OVERRIDE_; + virtual void turnLightOn(s32 lightIndex, bool turnOn) IRR_OVERRIDE; //! returns the maximal amount of dynamic lights the device can handle - virtual u32 getMaximalDynamicLightAmount() const _IRR_OVERRIDE_; + virtual u32 getMaximalDynamicLightAmount() const IRR_OVERRIDE; //! \return Returns the name of the video driver. Example: In case of the DIRECT3D8 //! driver, it would return "Direct3D8.1". - virtual const wchar_t* getName() const _IRR_OVERRIDE_; + virtual const wchar_t* getName() const IRR_OVERRIDE; //! Sets the dynamic ambient light color. The default color is //! (0,0,0,0) which means it is dark. //! \param color: New color of the ambient light. - virtual void setAmbientLight(const SColorf& color) _IRR_OVERRIDE_; + virtual void setAmbientLight(const SColorf& color) IRR_OVERRIDE; //! Get the global ambient light currently used by the driver - virtual const SColorf& getAmbientLight() const _IRR_OVERRIDE_; + virtual const SColorf& getAmbientLight() const IRR_OVERRIDE; //! Adds an external image loader to the engine. - virtual void addExternalImageLoader(IImageLoader* loader) _IRR_OVERRIDE_; + virtual void addExternalImageLoader(IImageLoader* loader) IRR_OVERRIDE; //! Adds an external image writer to the engine. - virtual void addExternalImageWriter(IImageWriter* writer) _IRR_OVERRIDE_; + virtual void addExternalImageWriter(IImageWriter* writer) IRR_OVERRIDE; //! Draws a shadow volume into the stencil buffer. To draw a stencil shadow, do //! this: First, draw all geometry. Then use this method, to draw the shadow //! volume. Then, use IVideoDriver::drawStencilShadow() to visualize the shadow. virtual void drawStencilShadowVolume(const core::array& triangles, - bool zfail=true, u32 debugDataVisible=0) _IRR_OVERRIDE_; + bool zfail=true, u32 debugDataVisible=0) IRR_OVERRIDE; //! Fills the stencil shadow with color. After the shadow volume has been drawn //! into the stencil buffer using IVideoDriver::drawStencilShadowVolume(), use this @@ -300,59 +300,59 @@ namespace video video::SColor leftUpEdge = video::SColor(0,0,0,0), video::SColor rightUpEdge = video::SColor(0,0,0,0), video::SColor leftDownEdge = video::SColor(0,0,0,0), - video::SColor rightDownEdge = video::SColor(0,0,0,0)) _IRR_OVERRIDE_; + video::SColor rightDownEdge = video::SColor(0,0,0,0)) IRR_OVERRIDE; //! Returns current amount of dynamic lights set //! \return Current amount of dynamic lights set - virtual u32 getDynamicLightCount() const _IRR_OVERRIDE_; + virtual u32 getDynamicLightCount() const IRR_OVERRIDE; //! Returns light data which was previously set with IVideDriver::addDynamicLight(). //! \param idx: Zero based index of the light. Must be greater than 0 and smaller //! than IVideoDriver()::getDynamicLightCount. //! \return Light data. - virtual const SLight& getDynamicLight(u32 idx) const _IRR_OVERRIDE_; + virtual const SLight& getDynamicLight(u32 idx) const IRR_OVERRIDE; //! Removes a texture from the texture cache and deletes it, freeing lot of //! memory. - virtual void removeTexture(ITexture* texture) _IRR_OVERRIDE_; + virtual void removeTexture(ITexture* texture) IRR_OVERRIDE; //! Removes all texture from the texture cache and deletes them, freeing lot of //! memory. - virtual void removeAllTextures() _IRR_OVERRIDE_; + virtual void removeAllTextures() IRR_OVERRIDE; //! Creates a render target texture. virtual ITexture* addRenderTargetTexture(const core::dimension2d& size, - const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) _IRR_OVERRIDE_; + const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) IRR_OVERRIDE; //! Creates a render target texture for a cubemap ITexture* addRenderTargetTextureCubemap(const irr::u32 sideLen, - const io::path& name, const ECOLOR_FORMAT format) _IRR_OVERRIDE_; + const io::path& name, const ECOLOR_FORMAT format) IRR_OVERRIDE; //! Creates an 1bit alpha channel of the texture based of an color key. - virtual void makeColorKeyTexture(video::ITexture* texture, video::SColor color, bool zeroTexels) const _IRR_OVERRIDE_; + virtual void makeColorKeyTexture(video::ITexture* texture, video::SColor color, bool zeroTexels) const IRR_OVERRIDE; //! Creates an 1bit alpha channel of the texture based of an color key position. virtual void makeColorKeyTexture(video::ITexture* texture, core::position2d colorKeyPixelPos, - bool zeroTexels) const _IRR_OVERRIDE_; + bool zeroTexels) const IRR_OVERRIDE; //! Creates a normal map from a height map texture. //! \param amplitude: Constant value by which the height information is multiplied. - virtual void makeNormalMapTexture(video::ITexture* texture, f32 amplitude=1.0f) const _IRR_OVERRIDE_; + virtual void makeNormalMapTexture(video::ITexture* texture, f32 amplitude=1.0f) const IRR_OVERRIDE; //! Returns the maximum amount of primitives (mostly vertices) which //! the device is able to render with one drawIndexedTriangleList //! call. - virtual u32 getMaximalPrimitiveCount() const _IRR_OVERRIDE_; + virtual u32 getMaximalPrimitiveCount() const IRR_OVERRIDE; //! Enables or disables a texture creation flag. - virtual void setTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag, bool enabled) _IRR_OVERRIDE_; + virtual void setTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag, bool enabled) IRR_OVERRIDE; //! Returns if a texture creation flag is enabled or disabled. - virtual bool getTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag) const _IRR_OVERRIDE_; + virtual bool getTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag) const IRR_OVERRIDE; - virtual core::array createImagesFromFile(const io::path& filename, E_TEXTURE_TYPE* type = 0) _IRR_OVERRIDE_; + virtual core::array createImagesFromFile(const io::path& filename, E_TEXTURE_TYPE* type = 0) IRR_OVERRIDE; - virtual core::array createImagesFromFile(io::IReadFile* file, E_TEXTURE_TYPE* type = 0) _IRR_OVERRIDE_; + virtual core::array createImagesFromFile(io::IReadFile* file, E_TEXTURE_TYPE* type = 0) IRR_OVERRIDE; //! Creates a software image from a byte array. /** \param useForeignMemory: If true, the image will use the data pointer @@ -360,33 +360,33 @@ namespace video data when the image will be destructed. If false, the memory will by copied. */ virtual IImage* createImageFromData(ECOLOR_FORMAT format, const core::dimension2d& size, void *data, bool ownForeignMemory = false, - bool deleteMemory = true) _IRR_OVERRIDE_; + bool deleteMemory = true) IRR_OVERRIDE; //! Creates an empty software image. - virtual IImage* createImage(ECOLOR_FORMAT format, const core::dimension2d& size) _IRR_OVERRIDE_; + virtual IImage* createImage(ECOLOR_FORMAT format, const core::dimension2d& size) IRR_OVERRIDE; //! Creates a software image from another image. - virtual IImage* createImage(ECOLOR_FORMAT format, IImage *imageToCopy) _IRR_OVERRIDE_; + virtual IImage* createImage(ECOLOR_FORMAT format, IImage *imageToCopy) IRR_OVERRIDE; //! Creates a software image from part of another image. virtual IImage* createImage(IImage* imageToCopy, const core::position2d& pos, - const core::dimension2d& size) _IRR_OVERRIDE_; + const core::dimension2d& size) IRR_OVERRIDE; //! Creates a software image from part of a texture. virtual IImage* createImage(ITexture* texture, const core::position2d& pos, - const core::dimension2d& size) _IRR_OVERRIDE_; + const core::dimension2d& size) IRR_OVERRIDE; //! Draws a mesh buffer - virtual void drawMeshBuffer(const scene::IMeshBuffer* mb) _IRR_OVERRIDE_; + virtual void drawMeshBuffer(const scene::IMeshBuffer* mb) IRR_OVERRIDE; //! Draws the normals of a mesh buffer virtual void drawMeshBufferNormals(const scene::IMeshBuffer* mb, f32 length=10.f, - SColor color=0xffffffff) _IRR_OVERRIDE_; + SColor color=0xffffffff) IRR_OVERRIDE; //! Check if the driver supports creating textures with the given color format - virtual bool queryTextureFormat(ECOLOR_FORMAT format) const _IRR_OVERRIDE_ + virtual bool queryTextureFormat(ECOLOR_FORMAT format) const IRR_OVERRIDE { return false; } @@ -434,10 +434,10 @@ namespace video public: //! Remove hardware buffer - virtual void removeHardwareBuffer(const scene::IMeshBuffer* mb) _IRR_OVERRIDE_; + virtual void removeHardwareBuffer(const scene::IMeshBuffer* mb) IRR_OVERRIDE; //! Remove all hardware buffers - virtual void removeAllHardwareBuffers() _IRR_OVERRIDE_; + virtual void removeAllHardwareBuffers() IRR_OVERRIDE; //! Update all hardware buffers, remove unused ones virtual void updateAllHardwareBuffers(); @@ -448,68 +448,68 @@ namespace video //! Create occlusion query. /** Use node for identification and mesh for occlusion test. */ virtual void addOcclusionQuery(scene::ISceneNode* node, - const scene::IMesh* mesh=0) _IRR_OVERRIDE_; + const scene::IMesh* mesh=0) IRR_OVERRIDE; //! Remove occlusion query. - virtual void removeOcclusionQuery(scene::ISceneNode* node) _IRR_OVERRIDE_; + virtual void removeOcclusionQuery(scene::ISceneNode* node) IRR_OVERRIDE; //! Remove all occlusion queries. - virtual void removeAllOcclusionQueries() _IRR_OVERRIDE_; + virtual void removeAllOcclusionQueries() IRR_OVERRIDE; //! Run occlusion query. Draws mesh stored in query. /** If the mesh shall not be rendered visible, use overrideMaterial to disable the color and depth buffer. */ - virtual void runOcclusionQuery(scene::ISceneNode* node, bool visible=false) _IRR_OVERRIDE_; + virtual void runOcclusionQuery(scene::ISceneNode* node, bool visible=false) IRR_OVERRIDE; //! Run all occlusion queries. Draws all meshes stored in queries. /** If the meshes shall not be rendered visible, use overrideMaterial to disable the color and depth buffer. */ - virtual void runAllOcclusionQueries(bool visible=false) _IRR_OVERRIDE_; + virtual void runAllOcclusionQueries(bool visible=false) IRR_OVERRIDE; //! Update occlusion query. Retrieves results from GPU. /** If the query shall not block, set the flag to false. Update might not occur in this case, though */ - virtual void updateOcclusionQuery(scene::ISceneNode* node, bool block=true) _IRR_OVERRIDE_; + virtual void updateOcclusionQuery(scene::ISceneNode* node, bool block=true) IRR_OVERRIDE; //! Update all occlusion queries. Retrieves results from GPU. /** If the query shall not block, set the flag to false. Update might not occur in this case, though */ - virtual void updateAllOcclusionQueries(bool block=true) _IRR_OVERRIDE_; + virtual void updateAllOcclusionQueries(bool block=true) IRR_OVERRIDE; //! Return query result. /** Return value is the number of visible pixels/fragments. The value is a safe approximation, i.e. can be larger than the actual value of pixels. */ - virtual u32 getOcclusionQueryResult(scene::ISceneNode* node) const _IRR_OVERRIDE_; + virtual u32 getOcclusionQueryResult(scene::ISceneNode* node) const IRR_OVERRIDE; //! Create render target. - virtual IRenderTarget* addRenderTarget() _IRR_OVERRIDE_; + virtual IRenderTarget* addRenderTarget() IRR_OVERRIDE; //! Remove render target. - virtual void removeRenderTarget(IRenderTarget* renderTarget) _IRR_OVERRIDE_; + virtual void removeRenderTarget(IRenderTarget* renderTarget) IRR_OVERRIDE; //! Remove all render targets. - virtual void removeAllRenderTargets() _IRR_OVERRIDE_; + virtual void removeAllRenderTargets() IRR_OVERRIDE; //! Only used by the engine internally. /** Used to notify the driver that the window was resized. */ - virtual void OnResize(const core::dimension2d& size) _IRR_OVERRIDE_; + virtual void OnResize(const core::dimension2d& size) IRR_OVERRIDE; //! Adds a new material renderer to the video device. virtual s32 addMaterialRenderer(IMaterialRenderer* renderer, - const char* name = 0) _IRR_OVERRIDE_; + const char* name = 0) IRR_OVERRIDE; //! Returns driver and operating system specific data about the IVideoDriver. - virtual const SExposedVideoData& getExposedVideoData() _IRR_OVERRIDE_; + virtual const SExposedVideoData& getExposedVideoData() IRR_OVERRIDE; //! Returns type of video driver - virtual E_DRIVER_TYPE getDriverType() const _IRR_OVERRIDE_; + virtual E_DRIVER_TYPE getDriverType() const IRR_OVERRIDE; //! Returns the transformation set by setTransform - virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const _IRR_OVERRIDE_; + virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const IRR_OVERRIDE; //! Returns pointer to the IGPUProgrammingServices interface. - virtual IGPUProgrammingServices* getGPUProgrammingServices() _IRR_OVERRIDE_; + virtual IGPUProgrammingServices* getGPUProgrammingServices() IRR_OVERRIDE; //! Adds a new material renderer to the VideoDriver, using pixel and/or //! vertex shaders to render geometry. @@ -517,7 +517,7 @@ namespace video const c8* pixelShaderProgram = 0, IShaderConstantSetCallBack* callback = 0, E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID, - s32 userData=0) _IRR_OVERRIDE_; + s32 userData=0) IRR_OVERRIDE; //! Like IGPUProgrammingServices::addShaderMaterial(), but tries to load the //! programs from files. @@ -525,7 +525,7 @@ namespace video io::IReadFile* pixelShaderProgram = 0, IShaderConstantSetCallBack* callback = 0, E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID, - s32 userData=0) _IRR_OVERRIDE_; + s32 userData=0) IRR_OVERRIDE; //! Like IGPUProgrammingServices::addShaderMaterial(), but tries to load the //! programs from files. @@ -533,16 +533,16 @@ namespace video const io::path& pixelShaderProgramFileName, IShaderConstantSetCallBack* callback = 0, E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID, - s32 userData=0) _IRR_OVERRIDE_; + s32 userData=0) IRR_OVERRIDE; //! Returns pointer to material renderer or null - virtual IMaterialRenderer* getMaterialRenderer(u32 idx) const _IRR_OVERRIDE_; + virtual IMaterialRenderer* getMaterialRenderer(u32 idx) const IRR_OVERRIDE; //! Returns amount of currently available material renderers. - virtual u32 getMaterialRendererCount() const _IRR_OVERRIDE_; + virtual u32 getMaterialRendererCount() const IRR_OVERRIDE; //! Returns name of the material renderer - virtual const char* getMaterialRendererName(u32 idx) const _IRR_OVERRIDE_; + virtual const char* getMaterialRendererName(u32 idx) const IRR_OVERRIDE; //! Adds a new material renderer to the VideoDriver, based on a high level shading //! language. Currently only HLSL in D3D9 is supported. @@ -561,7 +561,7 @@ namespace video u32 verticesOut = 0, IShaderConstantSetCallBack* callback = 0, E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID, - s32 userData = 0) _IRR_OVERRIDE_; + s32 userData = 0) IRR_OVERRIDE; //! Like IGPUProgrammingServices::addShaderMaterial() (look there for a detailed description), //! but tries to load the programs from files. @@ -580,7 +580,7 @@ namespace video u32 verticesOut = 0, IShaderConstantSetCallBack* callback = 0, E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID, - s32 userData = 0) _IRR_OVERRIDE_; + s32 userData = 0) IRR_OVERRIDE; //! Like IGPUProgrammingServices::addShaderMaterial() (look there for a detailed description), //! but tries to load the programs from files. @@ -599,79 +599,79 @@ namespace video u32 verticesOut = 0, IShaderConstantSetCallBack* callback = 0, E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID, - s32 userData = 0) _IRR_OVERRIDE_; + s32 userData = 0) IRR_OVERRIDE; //! Returns a pointer to the mesh manipulator. - virtual scene::IMeshManipulator* getMeshManipulator() _IRR_OVERRIDE_; + virtual scene::IMeshManipulator* getMeshManipulator() IRR_OVERRIDE; - virtual void clearBuffers(u16 flag, SColor color = SColor(255,0,0,0), f32 depth = 1.f, u8 stencil = 0) _IRR_OVERRIDE_; + virtual void clearBuffers(u16 flag, SColor color = SColor(255,0,0,0), f32 depth = 1.f, u8 stencil = 0) IRR_OVERRIDE; //! Returns an image created from the last rendered frame. - virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER) _IRR_OVERRIDE_; + virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER) IRR_OVERRIDE; //! Writes the provided image to disk file - virtual bool writeImageToFile(IImage* image, const io::path& filename, u32 param = 0) _IRR_OVERRIDE_; + virtual bool writeImageToFile(IImage* image, const io::path& filename, u32 param = 0) IRR_OVERRIDE; //! Writes the provided image to a file. - virtual bool writeImageToFile(IImage* image, io::IWriteFile * file, u32 param = 0) _IRR_OVERRIDE_; + virtual bool writeImageToFile(IImage* image, io::IWriteFile * file, u32 param = 0) IRR_OVERRIDE; //! Sets the name of a material renderer. - virtual void setMaterialRendererName(s32 idx, const char* name) _IRR_OVERRIDE_; + virtual void setMaterialRendererName(s32 idx, const char* name) IRR_OVERRIDE; //! Swap the material renderers used for certain id's - virtual void swapMaterialRenderers(u32 idx1, u32 idx2, bool swapNames) _IRR_OVERRIDE_; + virtual void swapMaterialRenderers(u32 idx1, u32 idx2, bool swapNames) IRR_OVERRIDE; //! Creates material attributes list from a material, usable for serialization and more. virtual io::IAttributes* createAttributesFromMaterial(const video::SMaterial& material, - io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_; + io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE; //! Fills an SMaterial structure from attributes. - virtual void fillMaterialStructureFromAttributes(video::SMaterial& outMaterial, io::IAttributes* attributes) _IRR_OVERRIDE_; + virtual void fillMaterialStructureFromAttributes(video::SMaterial& outMaterial, io::IAttributes* attributes) IRR_OVERRIDE; //! looks if the image is already loaded - virtual video::ITexture* findTexture(const io::path& filename) _IRR_OVERRIDE_; + virtual video::ITexture* findTexture(const io::path& filename) IRR_OVERRIDE; //! Set/unset a clipping plane. //! There are at least 6 clipping planes available for the user to set at will. //! \param index: The plane index. Must be between 0 and MaxUserClipPlanes. //! \param plane: The plane itself. //! \param enable: If true, enable the clipping plane else disable it. - virtual bool setClipPlane(u32 index, const core::plane3df& plane, bool enable=false) _IRR_OVERRIDE_; + virtual bool setClipPlane(u32 index, const core::plane3df& plane, bool enable=false) IRR_OVERRIDE; //! Enable/disable a clipping plane. //! There are at least 6 clipping planes available for the user to set at will. //! \param index: The plane index. Must be between 0 and MaxUserClipPlanes. //! \param enable: If true, enable the clipping plane else disable it. - virtual void enableClipPlane(u32 index, bool enable) _IRR_OVERRIDE_; + virtual void enableClipPlane(u32 index, bool enable) IRR_OVERRIDE; //! Returns the graphics card vendor name. - virtual core::stringc getVendorInfo() _IRR_OVERRIDE_ {return "Not available on this driver.";} + virtual core::stringc getVendorInfo() IRR_OVERRIDE {return "Not available on this driver.";} //! Set the minimum number of vertices for which a hw buffer will be created /** \param count Number of vertices to set as minimum. */ - virtual void setMinHardwareBufferVertexCount(u32 count) _IRR_OVERRIDE_; + virtual void setMinHardwareBufferVertexCount(u32 count) IRR_OVERRIDE; //! Get the global Material, which might override local materials. /** Depending on the enable flags, values from this Material are used to override those of local materials of some meshbuffer being rendered. */ - virtual SOverrideMaterial& getOverrideMaterial() _IRR_OVERRIDE_; + virtual SOverrideMaterial& getOverrideMaterial() IRR_OVERRIDE; //! Get the 2d override material for altering its values - virtual SMaterial& getMaterial2D() _IRR_OVERRIDE_; + virtual SMaterial& getMaterial2D() IRR_OVERRIDE; //! Enable the 2d override material - virtual void enableMaterial2D(bool enable=true) _IRR_OVERRIDE_; + virtual void enableMaterial2D(bool enable=true) IRR_OVERRIDE; //! Only used by the engine internally. - virtual void setAllowZWriteOnTransparent(bool flag) _IRR_OVERRIDE_ + virtual void setAllowZWriteOnTransparent(bool flag) IRR_OVERRIDE { AllowZWriteOnTransparent=flag; } //! Returns the maximum texture size supported. - virtual core::dimension2du getMaxTextureSize() const _IRR_OVERRIDE_; + virtual core::dimension2du getMaxTextureSize() const IRR_OVERRIDE; //! Used by some SceneNodes to check if a material should be rendered in the transparent render pass - virtual bool needsTransparentRenderPass(const irr::video::SMaterial& material) const _IRR_OVERRIDE_; + virtual bool needsTransparentRenderPass(const irr::video::SMaterial& material) const IRR_OVERRIDE; //! Color conversion convenience function /** Convert an image (as array of pixels) from source to destination @@ -684,13 +684,13 @@ namespace video \param dF Color format of destination */ virtual void convertColor(const void* sP, ECOLOR_FORMAT sF, s32 sN, - void* dP, ECOLOR_FORMAT dF) const _IRR_OVERRIDE_; + void* dP, ECOLOR_FORMAT dF) const IRR_OVERRIDE; //! deprecated method virtual ITexture* createRenderTargetTexture(const core::dimension2d& size, const c8* name=0); - virtual bool checkDriverReset() _IRR_OVERRIDE_ {return false;} + virtual bool checkDriverReset() IRR_OVERRIDE {return false;} protected: //! deletes all textures @@ -701,7 +701,7 @@ namespace video //! adds a surface, not loaded or created by the Irrlicht Engine void addTexture(ITexture* surface); - + virtual ITexture* createDeviceDependentTexture(const io::path& name, IImage* image); virtual ITexture* createDeviceDependentTextureCubemap(const io::path& name, const core::array& image); @@ -783,9 +783,9 @@ namespace video { SDummyTexture(const io::path& name, E_TEXTURE_TYPE type) : ITexture(name, type) {}; - virtual void* lock(E_TEXTURE_LOCK_MODE mode = ETLM_READ_WRITE, u32 mipmapLevel=0, u32 layer = 0, E_TEXTURE_LOCK_FLAGS lockFlags = ETLF_FLIP_Y_UP_RTT) _IRR_OVERRIDE_ { return 0; } - virtual void unlock()_IRR_OVERRIDE_ {} - virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) _IRR_OVERRIDE_ {} + virtual void* lock(E_TEXTURE_LOCK_MODE mode = ETLM_READ_WRITE, u32 mipmapLevel=0, u32 layer = 0, E_TEXTURE_LOCK_FLAGS lockFlags = ETLF_FLIP_Y_UP_RTT) IRR_OVERRIDE { return 0; } + virtual void unlock()IRR_OVERRIDE {} + virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) IRR_OVERRIDE {} }; core::array Textures; @@ -905,5 +905,4 @@ namespace video } // end namespace video } // end namespace irr - #endif diff --git a/source/Irrlicht/COBJMeshFileLoader.h b/source/Irrlicht/COBJMeshFileLoader.h index 22183eb6..e7c9fbf2 100644 --- a/source/Irrlicht/COBJMeshFileLoader.h +++ b/source/Irrlicht/COBJMeshFileLoader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_OBJ_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_OBJ_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_OBJ_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_OBJ_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IFileSystem.h" @@ -30,13 +30,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! based on the file extension (e.g. ".obj") - 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. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! See IReferenceCounted::drop() for more information. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: @@ -119,4 +119,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/COBJMeshWriter.h b/source/Irrlicht/COBJMeshWriter.h index 962b1795..9c9ff37c 100644 --- a/source/Irrlicht/COBJMeshWriter.h +++ b/source/Irrlicht/COBJMeshWriter.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __IRR_OBJ_MESH_WRITER_H_INCLUDED__ -#define __IRR_OBJ_MESH_WRITER_H_INCLUDED__ +#ifndef IRR_OBJ_MESH_WRITER_H_INCLUDED +#define IRR_OBJ_MESH_WRITER_H_INCLUDED #include "IMeshWriter.h" #include "S3DVertex.h" @@ -29,10 +29,10 @@ namespace scene virtual ~COBJMeshWriter(); //! 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 - 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; protected: // create vector output with line end into string @@ -55,4 +55,3 @@ namespace scene } // end namespace #endif - diff --git a/source/Irrlicht/COCTLoader.h b/source/Irrlicht/COCTLoader.h index 560d1190..75c6ff1d 100644 --- a/source/Irrlicht/COCTLoader.h +++ b/source/Irrlicht/COCTLoader.h @@ -40,8 +40,8 @@ // 4. You may not use this software to directly or indirectly cause harm to others. -#ifndef __C_OCT_LOADER_H_INCLUDED__ -#define __C_OCT_LOADER_H_INCLUDED__ +#ifndef IRR_C_OCT_LOADER_H_INCLUDED +#define IRR_C_OCT_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IReadFile.h" @@ -70,13 +70,13 @@ namespace scene //! returns true if the file maybe is able to be loaded by this class //! 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. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! See IReferenceCounted::drop() for more information. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; void OCTLoadLights(io::IReadFile* file, ISceneNode * parent = 0, f32 radius = 500.0f, @@ -138,4 +138,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/COGLES2Driver.cpp b/source/Irrlicht/COGLES2Driver.cpp index fe960f3d..8417e1bb 100644 --- a/source/Irrlicht/COGLES2Driver.cpp +++ b/source/Irrlicht/COGLES2Driver.cpp @@ -2635,7 +2635,7 @@ COGLES2Driver::~COGLES2Driver() return UserClipPlane[index].Plane; else { - _IRR_DEBUG_BREAK_IF(true) // invalid index + IRR_DEBUG_BREAK_IF(true) // invalid index static const core::plane3df dummy; return dummy; } diff --git a/source/Irrlicht/COGLES2Driver.h b/source/Irrlicht/COGLES2Driver.h index 06e80a6d..24fc9e4a 100644 --- a/source/Irrlicht/COGLES2Driver.h +++ b/source/Irrlicht/COGLES2Driver.h @@ -56,12 +56,12 @@ namespace video virtual ~COGLES2Driver(); 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* sourceRect = 0) _IRR_OVERRIDE_; + const SExposedVideoData& videoData = SExposedVideoData(), core::rect* sourceRect = 0) IRR_OVERRIDE; - virtual bool endScene() _IRR_OVERRIDE_; + virtual bool endScene() IRR_OVERRIDE; //! sets transformation - virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) _IRR_OVERRIDE_; + virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) IRR_OVERRIDE; struct SHWBufferLink_opengl : public SHWBufferLink { @@ -81,41 +81,41 @@ namespace video bool updateIndexHardwareBuffer(SHWBufferLink_opengl *HWBuffer); //! updates hardware buffer if needed - virtual bool updateHardwareBuffer(SHWBufferLink *HWBuffer) _IRR_OVERRIDE_; + virtual bool updateHardwareBuffer(SHWBufferLink *HWBuffer) IRR_OVERRIDE; //! 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) - virtual void deleteHardwareBuffer(SHWBufferLink *HWBuffer) _IRR_OVERRIDE_; + virtual void deleteHardwareBuffer(SHWBufferLink *HWBuffer) IRR_OVERRIDE; //! Draw hardware buffer - virtual void drawHardwareBuffer(SHWBufferLink *HWBuffer) _IRR_OVERRIDE_; + virtual void drawHardwareBuffer(SHWBufferLink *HWBuffer) IRR_OVERRIDE; - virtual IRenderTarget* addRenderTarget() _IRR_OVERRIDE_; + virtual IRenderTarget* addRenderTarget() IRR_OVERRIDE; //! draws a vertex primitive list virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const void* indexList, u32 primitiveCount, - E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) _IRR_OVERRIDE_; + E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) IRR_OVERRIDE; //! queries the features of the driver, returns true if feature is available - virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const _IRR_OVERRIDE_ + virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const IRR_OVERRIDE { return FeatureEnabled[feature] && COGLES2ExtensionHandler::queryFeature(feature); } //! Sets a material. - virtual void setMaterial(const SMaterial& material) _IRR_OVERRIDE_; + virtual void setMaterial(const SMaterial& material) IRR_OVERRIDE; virtual void draw2DImage(const video::ITexture* texture, const core::position2d& destPos, const core::rect& sourceRect, const core::rect* 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; virtual void draw2DImage(const video::ITexture* texture, const core::rect& destRect, const core::rect& sourceRect, const core::rect* clipRect = 0, - const video::SColor* const colors = 0, bool useAlphaChannelOfTexture = false) _IRR_OVERRIDE_; + const video::SColor* const colors = 0, bool useAlphaChannelOfTexture = false) IRR_OVERRIDE; // internally used virtual void draw2DImage(const video::ITexture* texture, u32 layer, bool flip); @@ -127,124 +127,124 @@ namespace video const core::array& indices, s32 kerningWidth = 0, const core::rect* clipRect = 0, SColor color = SColor(255, 255, 255, 255), - bool useAlphaChannelOfTexture = false) _IRR_OVERRIDE_; + bool useAlphaChannelOfTexture = false) IRR_OVERRIDE; void draw2DImageBatch(const video::ITexture* texture, const core::array >& positions, const core::array >& sourceRects, const core::rect* clipRect, SColor color, - bool useAlphaChannelOfTexture) _IRR_OVERRIDE_; + bool useAlphaChannelOfTexture) IRR_OVERRIDE; //! draw an 2d rectangle virtual void draw2DRectangle(SColor color, const core::rect& pos, - const core::rect* clip = 0) _IRR_OVERRIDE_; + const core::rect* clip = 0) IRR_OVERRIDE; //!Draws an 2d rectangle with a gradient. virtual void draw2DRectangle(const core::rect& pos, SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown, - const core::rect* clip = 0) _IRR_OVERRIDE_; + const core::rect* clip = 0) IRR_OVERRIDE; //! Draws a 2d line. virtual void draw2DLine(const core::position2d& start, const core::position2d& end, - SColor color = SColor(255, 255, 255, 255)) _IRR_OVERRIDE_; + SColor color = SColor(255, 255, 255, 255)) IRR_OVERRIDE; //! Draws a single pixel - virtual void drawPixel(u32 x, u32 y, const SColor & color) _IRR_OVERRIDE_; + virtual void drawPixel(u32 x, u32 y, const SColor & color) IRR_OVERRIDE; //! Draws a 3d line. virtual void draw3DLine(const core::vector3df& start, const core::vector3df& end, - SColor color = SColor(255, 255, 255, 255)) _IRR_OVERRIDE_; + SColor color = SColor(255, 255, 255, 255)) IRR_OVERRIDE; //! Draws a pixel // virtual void drawPixel(u32 x, u32 y, const SColor & color); //! Returns the name of the video driver. - virtual const wchar_t* getName() const _IRR_OVERRIDE_; + virtual const wchar_t* getName() const IRR_OVERRIDE; //! deletes all dynamic lights there are - virtual void deleteAllDynamicLights() _IRR_OVERRIDE_; + virtual void deleteAllDynamicLights() IRR_OVERRIDE; //! adds a dynamic light - virtual s32 addDynamicLight(const SLight& light) _IRR_OVERRIDE_; + virtual s32 addDynamicLight(const SLight& light) IRR_OVERRIDE; //! Turns a dynamic light on or off /** \param lightIndex: the index returned by addDynamicLight \param turnOn: true to turn the light on, false to turn it off */ - virtual void turnLightOn(s32 lightIndex, bool turnOn) _IRR_OVERRIDE_; + virtual void turnLightOn(s32 lightIndex, bool turnOn) IRR_OVERRIDE; //! returns the maximal amount of dynamic lights the device can handle - virtual u32 getMaximalDynamicLightAmount() const _IRR_OVERRIDE_; + virtual u32 getMaximalDynamicLightAmount() const IRR_OVERRIDE; //! Returns the maximum texture size supported. - virtual core::dimension2du getMaxTextureSize() const _IRR_OVERRIDE_; + virtual core::dimension2du getMaxTextureSize() const IRR_OVERRIDE; //! Draws a shadow volume into the stencil buffer. - virtual void drawStencilShadowVolume(const core::array& triangles, bool zfail, u32 debugDataVisible=0) _IRR_OVERRIDE_; + virtual void drawStencilShadowVolume(const core::array& triangles, bool zfail, u32 debugDataVisible=0) IRR_OVERRIDE; //! Fills the stencil shadow with color. virtual void drawStencilShadow(bool clearStencilBuffer=false, video::SColor leftUpEdge = video::SColor(0,0,0,0), video::SColor rightUpEdge = video::SColor(0,0,0,0), video::SColor leftDownEdge = video::SColor(0,0,0,0), - video::SColor rightDownEdge = video::SColor(0,0,0,0)) _IRR_OVERRIDE_; + video::SColor rightDownEdge = video::SColor(0,0,0,0)) IRR_OVERRIDE; //! sets a viewport - virtual void setViewPort(const core::rect& area) _IRR_OVERRIDE_; + virtual void setViewPort(const core::rect& area) IRR_OVERRIDE; //! Only used internally by the engine - virtual void OnResize(const core::dimension2d& size) _IRR_OVERRIDE_; + virtual void OnResize(const core::dimension2d& size) IRR_OVERRIDE; //! Returns type of video driver - virtual E_DRIVER_TYPE getDriverType() const _IRR_OVERRIDE_; + virtual E_DRIVER_TYPE getDriverType() const IRR_OVERRIDE; //! get color format of the current color buffer - virtual ECOLOR_FORMAT getColorFormat() const _IRR_OVERRIDE_; + virtual ECOLOR_FORMAT getColorFormat() const IRR_OVERRIDE; //! Returns the transformation set by setTransform - virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const _IRR_OVERRIDE_; + virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const IRR_OVERRIDE; //! Can be called by an IMaterialRenderer to make its work easier. - virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastmaterial, bool resetAllRenderstates) _IRR_OVERRIDE_; + virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastmaterial, bool resetAllRenderstates) IRR_OVERRIDE; //! Compare in SMaterial doesn't check texture parameters, so we should call this on each OnRender call. void setTextureRenderStates(const SMaterial& material, bool resetAllRenderstates); //! 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. - virtual s32 getPixelShaderConstantID(const c8* name) _IRR_OVERRIDE_; + virtual s32 getPixelShaderConstantID(const c8* name) IRR_OVERRIDE; //! 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. - 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. - 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. - 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. - 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. - 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. - 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. - virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) _IRR_OVERRIDE_; + virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) IRR_OVERRIDE; //! Adds a new material renderer to the VideoDriver virtual s32 addShaderMaterial(const c8* vertexShaderProgram, const c8* pixelShaderProgram, - IShaderConstantSetCallBack* callback, E_MATERIAL_TYPE baseMaterial, s32 userData) _IRR_OVERRIDE_; + IShaderConstantSetCallBack* callback, E_MATERIAL_TYPE baseMaterial, s32 userData) IRR_OVERRIDE; //! Adds a new material renderer to the VideoDriver virtual s32 addHighLevelShaderMaterial( @@ -262,31 +262,31 @@ namespace video u32 verticesOut = 0, IShaderConstantSetCallBack* callback = 0, E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID, - s32 userData=0) _IRR_OVERRIDE_; + s32 userData=0) IRR_OVERRIDE; //! Returns pointer to the IGPUProgrammingServices interface. - virtual IGPUProgrammingServices* getGPUProgrammingServices() _IRR_OVERRIDE_; + virtual IGPUProgrammingServices* getGPUProgrammingServices() IRR_OVERRIDE; //! Returns a pointer to the IVideoDriver interface. - virtual IVideoDriver* getVideoDriver() _IRR_OVERRIDE_; + virtual IVideoDriver* getVideoDriver() IRR_OVERRIDE; //! Returns the maximum amount of primitives - virtual u32 getMaximalPrimitiveCount() const _IRR_OVERRIDE_; + virtual u32 getMaximalPrimitiveCount() const IRR_OVERRIDE; virtual ITexture* addRenderTargetTexture(const core::dimension2d& size, - const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) _IRR_OVERRIDE_; + const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) IRR_OVERRIDE; //! Creates a render target texture for a cubemap ITexture* addRenderTargetTextureCubemap(const irr::u32 sideLen, - const io::path& name, const ECOLOR_FORMAT format) _IRR_OVERRIDE_; + const io::path& name, const ECOLOR_FORMAT format) IRR_OVERRIDE; virtual bool setRenderTargetEx(IRenderTarget* target, u16 clearFlag, SColor clearColor = SColor(255, 0, 0, 0), - f32 clearDepth = 1.f, u8 clearStencil = 0) _IRR_OVERRIDE_; + f32 clearDepth = 1.f, u8 clearStencil = 0) IRR_OVERRIDE; - virtual void clearBuffers(u16 flag, SColor color = SColor(255, 0, 0, 0), f32 depth = 1.f, u8 stencil = 0) _IRR_OVERRIDE_; + virtual void clearBuffers(u16 flag, SColor color = SColor(255, 0, 0, 0), f32 depth = 1.f, u8 stencil = 0) IRR_OVERRIDE; //! Returns an image created from the last rendered frame. - virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER) _IRR_OVERRIDE_; + virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER) IRR_OVERRIDE; //! checks if an OpenGL error has happened and prints it (+ some internal code which is usually the line number) bool testGLError(int code=0); @@ -295,7 +295,7 @@ namespace video bool testEGLError(); //! 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; //! returns the current amount of user clip planes set. u32 getClipPlaneCount() const; @@ -304,21 +304,21 @@ namespace video const core::plane3df& getClipPlane(u32 index) const; //! 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. - virtual core::stringc getVendorInfo() _IRR_OVERRIDE_ + virtual core::stringc getVendorInfo() IRR_OVERRIDE { return VendorName; }; - virtual void removeTexture(ITexture* texture) _IRR_OVERRIDE_; + virtual void removeTexture(ITexture* texture) IRR_OVERRIDE; //! Check if the driver supports creating textures with the given color format - virtual bool queryTextureFormat(ECOLOR_FORMAT format) const _IRR_OVERRIDE_; + virtual bool queryTextureFormat(ECOLOR_FORMAT format) const IRR_OVERRIDE; //! 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; //! Convert E_BLEND_FACTOR to OpenGL equivalent GLenum getGLBlend(E_BLEND_FACTOR factor) const; @@ -340,9 +340,9 @@ namespace video void chooseMaterial2D(); - 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& image) _IRR_OVERRIDE_; + virtual ITexture* createDeviceDependentTextureCubemap(const io::path& name, const core::array& image) IRR_OVERRIDE; //! Map Irrlicht wrap mode to OpenGL enum GLint getTextureWrapMode(u8 clamp) const; diff --git a/source/Irrlicht/COGLES2MaterialRenderer.h b/source/Irrlicht/COGLES2MaterialRenderer.h index 118cf5d7..c911d51e 100644 --- a/source/Irrlicht/COGLES2MaterialRenderer.h +++ b/source/Irrlicht/COGLES2MaterialRenderer.h @@ -53,20 +53,20 @@ public: virtual s32 getRenderCapability() const; - virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates) _IRR_OVERRIDE_; + virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates) IRR_OVERRIDE; - virtual s32 getVertexShaderConstantID(const c8* name) _IRR_OVERRIDE_; - virtual s32 getPixelShaderConstantID(const c8* name) _IRR_OVERRIDE_; - virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) _IRR_OVERRIDE_; - virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) _IRR_OVERRIDE_; - virtual bool setVertexShaderConstant(s32 index, const f32* floats, int count) _IRR_OVERRIDE_; - virtual bool setVertexShaderConstant(s32 index, const s32* ints, int count) _IRR_OVERRIDE_; - virtual bool setVertexShaderConstant(s32 index, const u32* ints, int count) _IRR_OVERRIDE_; - virtual bool setPixelShaderConstant(s32 index, const f32* floats, int count) _IRR_OVERRIDE_; - virtual bool setPixelShaderConstant(s32 index, const s32* ints, int count) _IRR_OVERRIDE_; - virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) _IRR_OVERRIDE_; + virtual s32 getVertexShaderConstantID(const c8* name) IRR_OVERRIDE; + virtual s32 getPixelShaderConstantID(const c8* name) IRR_OVERRIDE; + virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) IRR_OVERRIDE; + virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) IRR_OVERRIDE; + virtual bool setVertexShaderConstant(s32 index, const f32* floats, int count) IRR_OVERRIDE; + virtual bool setVertexShaderConstant(s32 index, const s32* ints, int count) IRR_OVERRIDE; + virtual bool setVertexShaderConstant(s32 index, const u32* ints, int count) IRR_OVERRIDE; + virtual bool setPixelShaderConstant(s32 index, const f32* floats, int count) IRR_OVERRIDE; + virtual bool setPixelShaderConstant(s32 index, const s32* ints, int count) IRR_OVERRIDE; + virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) IRR_OVERRIDE; - virtual IVideoDriver* getVideoDriver() _IRR_OVERRIDE_; + virtual IVideoDriver* getVideoDriver() IRR_OVERRIDE; protected: diff --git a/source/Irrlicht/COGLESDriver.cpp b/source/Irrlicht/COGLESDriver.cpp index cca937cc..ef4edb4d 100644 --- a/source/Irrlicht/COGLESDriver.cpp +++ b/source/Irrlicht/COGLESDriver.cpp @@ -1458,7 +1458,7 @@ bool COGLES1Driver::testGLError(int code) case GL_OUT_OF_MEMORY: os::Printer::log("GL_OUT_OF_MEMORY", core::stringc(code).c_str(), ELL_ERROR); break; }; -// _IRR_DEBUG_BREAK_IF(true); +// IRR_DEBUG_BREAK_IF(true); return true; #else return false; diff --git a/source/Irrlicht/COGLESDriver.h b/source/Irrlicht/COGLESDriver.h index 6ffaaaf4..4d21ff0a 100644 --- a/source/Irrlicht/COGLESDriver.h +++ b/source/Irrlicht/COGLESDriver.h @@ -47,12 +47,12 @@ namespace video virtual ~COGLES1Driver(); 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* sourceRect = 0) _IRR_OVERRIDE_; + const SExposedVideoData& videoData = SExposedVideoData(), core::rect* sourceRect = 0) IRR_OVERRIDE; - virtual bool endScene() _IRR_OVERRIDE_; + virtual bool endScene() IRR_OVERRIDE; //! sets transformation - virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) _IRR_OVERRIDE_; + virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) IRR_OVERRIDE; struct SHWBufferLink_opengl : public SHWBufferLink @@ -71,43 +71,43 @@ namespace video bool updateIndexHardwareBuffer(SHWBufferLink_opengl *HWBuffer); //! updates hardware buffer if needed - virtual bool updateHardwareBuffer(SHWBufferLink *HWBuffer) _IRR_OVERRIDE_; + virtual bool updateHardwareBuffer(SHWBufferLink *HWBuffer) IRR_OVERRIDE; //! 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) - virtual void deleteHardwareBuffer(SHWBufferLink *HWBuffer) _IRR_OVERRIDE_; + virtual void deleteHardwareBuffer(SHWBufferLink *HWBuffer) IRR_OVERRIDE; //! Draw hardware buffer - virtual void drawHardwareBuffer(SHWBufferLink *HWBuffer) _IRR_OVERRIDE_; + virtual void drawHardwareBuffer(SHWBufferLink *HWBuffer) IRR_OVERRIDE; - virtual IRenderTarget* addRenderTarget() _IRR_OVERRIDE_; + virtual IRenderTarget* addRenderTarget() IRR_OVERRIDE; //! draws a vertex primitive list virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const void* indexList, u32 primitiveCount, - E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) _IRR_OVERRIDE_; + E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) IRR_OVERRIDE; void drawVertexPrimitiveList2d3d(const void* vertices, u32 vertexCount, const void* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType=EIT_16BIT, bool threed=true); //! 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 { // return FeatureEnabled[feature] && COGLES1ExtensionHandler::queryFeature(feature); return COGLES1ExtensionHandler::queryFeature(feature); } //! Sets a material. - virtual void setMaterial(const SMaterial& material) _IRR_OVERRIDE_; + virtual void setMaterial(const SMaterial& material) IRR_OVERRIDE; virtual void draw2DImage(const video::ITexture* texture, const core::position2d& destPos, const core::rect& sourceRect, const core::rect* 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; virtual void draw2DImage(const video::ITexture* texture, const core::rect& destRect, const core::rect& sourceRect, const core::rect* clipRect = 0, - const video::SColor* const colors = 0, bool useAlphaChannelOfTexture = false) _IRR_OVERRIDE_; + const video::SColor* const colors = 0, bool useAlphaChannelOfTexture = false) IRR_OVERRIDE; virtual void draw2DImage(const video::ITexture* texture, u32 layer, bool flip); @@ -118,7 +118,7 @@ namespace video const core::array& indices, s32 kerningWidth = 0, const core::rect* clipRect=0, SColor color=SColor(255,255,255,255), - bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_; + bool useAlphaChannelOfTexture=false) IRR_OVERRIDE; //! draws a set of 2d images, using a color and the alpha channel of the texture if desired. virtual void draw2DImageBatch(const video::ITexture* texture, @@ -126,119 +126,119 @@ namespace video const core::array >& sourceRects, const core::rect* clipRect=0, SColor color=SColor(255,255,255,255), - bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_; + bool useAlphaChannelOfTexture=false) IRR_OVERRIDE; //! draw an 2d rectangle virtual void draw2DRectangle(SColor color, const core::rect& pos, - const core::rect* clip = 0) _IRR_OVERRIDE_; + const core::rect* clip = 0) IRR_OVERRIDE; //!Draws an 2d rectangle with a gradient. virtual void draw2DRectangle(const core::rect& pos, SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown, - const core::rect* clip = 0) _IRR_OVERRIDE_; + const core::rect* clip = 0) IRR_OVERRIDE; //! Draws a 2d line. virtual void draw2DLine(const core::position2d& start, const core::position2d& end, - SColor color=SColor(255,255,255,255)) _IRR_OVERRIDE_; + SColor color=SColor(255,255,255,255)) IRR_OVERRIDE; //! Draws a single pixel - virtual void drawPixel(u32 x, u32 y, const SColor & color) _IRR_OVERRIDE_; + virtual void drawPixel(u32 x, u32 y, const SColor & color) IRR_OVERRIDE; //! Draws a 3d line. virtual void draw3DLine(const core::vector3df& start, const core::vector3df& end, - SColor color = SColor(255,255,255,255)) _IRR_OVERRIDE_; + SColor color = SColor(255,255,255,255)) IRR_OVERRIDE; //! Returns the name of the video driver. - virtual const wchar_t* getName() const _IRR_OVERRIDE_; + virtual const wchar_t* getName() const IRR_OVERRIDE; //! deletes all dynamic lights there are - virtual void deleteAllDynamicLights() _IRR_OVERRIDE_; + virtual void deleteAllDynamicLights() IRR_OVERRIDE; //! adds a dynamic light - virtual s32 addDynamicLight(const SLight& light) _IRR_OVERRIDE_; + virtual s32 addDynamicLight(const SLight& light) IRR_OVERRIDE; //! Turns a dynamic light on or off //! \param lightIndex: the index returned by addDynamicLight //! \param turnOn: true to turn the light on, false to turn it off - virtual void turnLightOn(s32 lightIndex, bool turnOn) _IRR_OVERRIDE_; + virtual void turnLightOn(s32 lightIndex, bool turnOn) IRR_OVERRIDE; //! returns the maximal amount of dynamic lights the device can handle - virtual u32 getMaximalDynamicLightAmount() const _IRR_OVERRIDE_; + virtual u32 getMaximalDynamicLightAmount() const IRR_OVERRIDE; //! Sets the dynamic ambient light color. - virtual void setAmbientLight(const SColorf& color) _IRR_OVERRIDE_; + virtual void setAmbientLight(const SColorf& color) IRR_OVERRIDE; //! Draws a shadow volume into the stencil buffer. - virtual void drawStencilShadowVolume(const core::array& triangles, bool zfail, u32 debugDataVisible=0) _IRR_OVERRIDE_; + virtual void drawStencilShadowVolume(const core::array& triangles, bool zfail, u32 debugDataVisible=0) IRR_OVERRIDE; //! Fills the stencil shadow with color. virtual void drawStencilShadow(bool clearStencilBuffer=false, video::SColor leftUpEdge = video::SColor(0,0,0,0), video::SColor rightUpEdge = video::SColor(0,0,0,0), video::SColor leftDownEdge = video::SColor(0,0,0,0), - video::SColor rightDownEdge = video::SColor(0,0,0,0)) _IRR_OVERRIDE_; + video::SColor rightDownEdge = video::SColor(0,0,0,0)) IRR_OVERRIDE; //! sets a viewport - virtual void setViewPort(const core::rect& area) _IRR_OVERRIDE_; + virtual void setViewPort(const core::rect& area) IRR_OVERRIDE; //! Sets the fog mode. virtual void setFog(SColor color, E_FOG_TYPE fogType, f32 start, - f32 end, f32 density, bool pixelFog, bool rangeFog) _IRR_OVERRIDE_; + f32 end, f32 density, bool pixelFog, bool rangeFog) IRR_OVERRIDE; //! Only used internally by the engine - virtual void OnResize(const core::dimension2d& size) _IRR_OVERRIDE_; + virtual void OnResize(const core::dimension2d& size) IRR_OVERRIDE; //! Returns type of video driver - virtual E_DRIVER_TYPE getDriverType() const _IRR_OVERRIDE_; + virtual E_DRIVER_TYPE getDriverType() const IRR_OVERRIDE; //! get color format of the current color buffer - virtual ECOLOR_FORMAT getColorFormat() const _IRR_OVERRIDE_; + virtual ECOLOR_FORMAT getColorFormat() const IRR_OVERRIDE; //! Returns the transformation set by setTransform - virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const _IRR_OVERRIDE_; + virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const IRR_OVERRIDE; //! Can be called by an IMaterialRenderer to make its work easier. virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastmaterial, - bool resetAllRenderstates) _IRR_OVERRIDE_; + bool resetAllRenderstates) IRR_OVERRIDE; //! Compare in SMaterial doesn't check texture parameters, so we should call this on each OnRender call. virtual void setTextureRenderStates(const SMaterial& material, bool resetAllRenderstates); //! 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. - virtual s32 getPixelShaderConstantID(const c8* name) _IRR_OVERRIDE_; + virtual s32 getPixelShaderConstantID(const c8* name) IRR_OVERRIDE; //! 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. - 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. - 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. - 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. - 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. - virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) _IRR_OVERRIDE_; + virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) IRR_OVERRIDE; //! 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. - 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; //! Adds a new material renderer to the VideoDriver virtual s32 addShaderMaterial(const c8* vertexShaderProgram, const c8* pixelShaderProgram, - IShaderConstantSetCallBack* callback, E_MATERIAL_TYPE baseMaterial, s32 userData) _IRR_OVERRIDE_; + IShaderConstantSetCallBack* callback, E_MATERIAL_TYPE baseMaterial, s32 userData) IRR_OVERRIDE; //! Adds a new material renderer to the VideoDriver virtual s32 addHighLevelShaderMaterial(const c8* vertexShaderProgram, const c8* vertexShaderEntryPointName, @@ -246,57 +246,57 @@ namespace video E_PIXEL_SHADER_TYPE psCompileTarget, const c8* geometryShaderProgram, const c8* geometryShaderEntryPointName, E_GEOMETRY_SHADER_TYPE gsCompileTarget, scene::E_PRIMITIVE_TYPE inType, scene::E_PRIMITIVE_TYPE outType, u32 verticesOut, IShaderConstantSetCallBack* callback, E_MATERIAL_TYPE baseMaterial, - s32 userData) _IRR_OVERRIDE_; + s32 userData) IRR_OVERRIDE; //! Returns pointer to the IGPUProgrammingServices interface. - virtual IGPUProgrammingServices* getGPUProgrammingServices() _IRR_OVERRIDE_; + virtual IGPUProgrammingServices* getGPUProgrammingServices() IRR_OVERRIDE; //! Returns a pointer to the IVideoDriver interface. - virtual IVideoDriver* getVideoDriver() _IRR_OVERRIDE_; + virtual IVideoDriver* getVideoDriver() IRR_OVERRIDE; //! Returns the maximum amount of primitives - virtual u32 getMaximalPrimitiveCount() const _IRR_OVERRIDE_; + virtual u32 getMaximalPrimitiveCount() const IRR_OVERRIDE; virtual ITexture* addRenderTargetTexture(const core::dimension2d& size, - const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) _IRR_OVERRIDE_; + const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) IRR_OVERRIDE; //! Creates a render target texture for a cubemap ITexture* addRenderTargetTextureCubemap(const irr::u32 sideLen, - const io::path& name, const ECOLOR_FORMAT format) _IRR_OVERRIDE_; + const io::path& name, const ECOLOR_FORMAT format) IRR_OVERRIDE; virtual bool setRenderTargetEx(IRenderTarget* target, u16 clearFlag, SColor clearColor = SColor(255, 0, 0, 0), - f32 clearDepth = 1.f, u8 clearStencil = 0) _IRR_OVERRIDE_; + f32 clearDepth = 1.f, u8 clearStencil = 0) IRR_OVERRIDE; - virtual void clearBuffers(u16 flag, SColor color = SColor(255, 0, 0, 0), f32 depth = 1.f, u8 stencil = 0) _IRR_OVERRIDE_; + virtual void clearBuffers(u16 flag, SColor color = SColor(255, 0, 0, 0), f32 depth = 1.f, u8 stencil = 0) IRR_OVERRIDE; //! Returns an image created from the last rendered frame. - virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER) _IRR_OVERRIDE_; + virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER) IRR_OVERRIDE; //! checks if an OpenGL error has happened and prints it (+ some internal code which is usually the line number) bool testGLError(int code=0); //! 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. - virtual void enableClipPlane(u32 index, bool enable) _IRR_OVERRIDE_; + virtual void enableClipPlane(u32 index, bool enable) IRR_OVERRIDE; //! Returns the graphics card vendor name. - virtual core::stringc getVendorInfo() _IRR_OVERRIDE_ + virtual core::stringc getVendorInfo() IRR_OVERRIDE { return VendorName; } //! Get the maximal texture size for this driver - virtual core::dimension2du getMaxTextureSize() const _IRR_OVERRIDE_; + virtual core::dimension2du getMaxTextureSize() const IRR_OVERRIDE; - virtual void removeTexture(ITexture* texture) _IRR_OVERRIDE_; + virtual void removeTexture(ITexture* texture) IRR_OVERRIDE; //! Check if the driver supports creating textures with the given color format - virtual bool queryTextureFormat(ECOLOR_FORMAT format) const _IRR_OVERRIDE_; + virtual bool queryTextureFormat(ECOLOR_FORMAT format) const IRR_OVERRIDE; //! 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; //! Convert E_BLEND_FACTOR to OpenGL equivalent GLenum getGLBlend(E_BLEND_FACTOR factor) const; @@ -315,9 +315,9 @@ namespace video //! inits the opengl-es driver bool genericDriverInit(const core::dimension2d& screenSize, bool stencilBuffer); - 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& image) _IRR_OVERRIDE_; + virtual ITexture* createDeviceDependentTextureCubemap(const io::path& name, const core::array& image) IRR_OVERRIDE; //! creates a transposed matrix in supplied GLfloat array to pass to OGLES1 inline void getGLMatrix(GLfloat gl_matrix[16], const core::matrix4& m); diff --git a/source/Irrlicht/COGLESMaterialRenderer.h b/source/Irrlicht/COGLESMaterialRenderer.h index 8a811cb9..d8465727 100644 --- a/source/Irrlicht/COGLESMaterialRenderer.h +++ b/source/Irrlicht/COGLESMaterialRenderer.h @@ -450,7 +450,7 @@ public: } virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE { Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); @@ -464,7 +464,7 @@ public: } } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { Driver->getCacheHandler()->setActiveTexture(GL_TEXTURE1); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); diff --git a/source/Irrlicht/COSOperator.h b/source/Irrlicht/COSOperator.h index d913b863..b887baae 100644 --- a/source/Irrlicht/COSOperator.h +++ b/source/Irrlicht/COSOperator.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_OS_OPERATOR_H_INCLUDED__ -#define __C_OS_OPERATOR_H_INCLUDED__ +#ifndef IRR_C_OS_OPERATOR_H_INCLUDED +#define IRR_C_OS_OPERATOR_H_INCLUDED #include "IOSOperator.h" @@ -24,25 +24,25 @@ public: COSOperator(const core::stringc& osversion); //! returns the current operation system version as string. - virtual const core::stringc& getOperatingSystemVersion() const _IRR_OVERRIDE_; + virtual const core::stringc& getOperatingSystemVersion() const IRR_OVERRIDE; //! copies text to the clipboard - virtual void copyToClipboard(const c8* text) const _IRR_OVERRIDE_; + virtual void copyToClipboard(const c8* text) const IRR_OVERRIDE; //! gets text from the clipboard //! \return Returns 0 if no string is in there. - virtual const c8* getTextFromClipboard() const _IRR_OVERRIDE_; + virtual const c8* getTextFromClipboard() const IRR_OVERRIDE; //! gets the processor speed in megahertz //! \param Mhz: //! \return Returns true if successful, false if not - virtual bool getProcessorSpeedMHz(u32* MHz) const _IRR_OVERRIDE_; + virtual bool getProcessorSpeedMHz(u32* MHz) const IRR_OVERRIDE; //! gets the total and available system RAM in kB //! \param Total: will contain the total system memory //! \param Avail: will contain the available memory //! \return Returns true if successful, false if not - virtual bool getSystemMemory(u32* Total, u32* Avail) const _IRR_OVERRIDE_; + virtual bool getSystemMemory(u32* Total, u32* Avail) const IRR_OVERRIDE; private: @@ -57,4 +57,3 @@ private: } // end namespace #endif - diff --git a/source/Irrlicht/COctreeSceneNode.h b/source/Irrlicht/COctreeSceneNode.h index 5ef28088..816e2c9b 100644 --- a/source/Irrlicht/COctreeSceneNode.h +++ b/source/Irrlicht/COctreeSceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_OCTREE_SCENE_NODE_H_INCLUDED__ -#define __C_OCTREE_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_OCTREE_SCENE_NODE_H_INCLUDED +#define IRR_C_OCTREE_SCENE_NODE_H_INCLUDED #include "IOctreeSceneNode.h" #include "Octree.h" @@ -26,13 +26,13 @@ namespace scene //! destructor virtual ~COctreeSceneNode(); - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; //! renders the node. - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! creates the tree bool createTree(IMesh* mesh); @@ -42,41 +42,41 @@ namespace scene //! 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 //! 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. - virtual u32 getMaterialCount() const _IRR_OVERRIDE_; + virtual u32 getMaterialCount() const IRR_OVERRIDE; //! 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. - 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 - virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_OCTREE; } + virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_OCTREE; } //! Sets a new mesh to display - virtual void setMesh(IMesh* mesh) _IRR_OVERRIDE_; + virtual void setMesh(IMesh* mesh) IRR_OVERRIDE; //! Get the currently defined mesh for display. - virtual IMesh* getMesh(void) _IRR_OVERRIDE_; + virtual IMesh* getMesh(void) IRR_OVERRIDE; //! Sets if the scene node should not copy the materials of the mesh but use them in a read only style. - virtual void setReadOnlyMaterials(bool readonly) _IRR_OVERRIDE_; + virtual void setReadOnlyMaterials(bool readonly) IRR_OVERRIDE; //! Check 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; //! Creates shadow volume scene node as child of this node //! and returns a pointer to it. virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh, - s32 id, bool zfailmethod=true, f32 infinity=10000.0f) _IRR_OVERRIDE_; + s32 id, bool zfailmethod=true, f32 infinity=10000.0f) IRR_OVERRIDE; //! Removes a child from this scene node. //! Implemented here, to be able to remove the shadow properly, if there is one, //! or to remove attached child. - virtual bool removeChild(ISceneNode* child) _IRR_OVERRIDE_; + virtual bool removeChild(ISceneNode* child) IRR_OVERRIDE; // TODO: Currently using VBO's will crash when reloading the model. // The reason is that COctreeSceneNode uses Octree::SMeshChunk @@ -88,13 +88,13 @@ namespace scene virtual void setUseVBO(EOCTREENODE_VBO useVBO); //! Get if/how vertex buffer object are used for the meshbuffers - virtual EOCTREENODE_VBO getUseVBO() const _IRR_OVERRIDE_; + virtual EOCTREENODE_VBO getUseVBO() const IRR_OVERRIDE; //! Set the kind of tests polygons do for visibility against the camera - virtual void setPolygonChecks(EOCTREE_POLYGON_CHECKS checks) _IRR_OVERRIDE_; + virtual void setPolygonChecks(EOCTREE_POLYGON_CHECKS checks) IRR_OVERRIDE; //! Get the kind of tests polygons do for visibility against the camera - virtual EOCTREE_POLYGON_CHECKS getPolygonChecks() const _IRR_OVERRIDE_; + virtual EOCTREE_POLYGON_CHECKS getPolygonChecks() const IRR_OVERRIDE; private: @@ -129,4 +129,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/COctreeTriangleSelector.h b/source/Irrlicht/COctreeTriangleSelector.h index b022b2ab..bcd92184 100644 --- a/source/Irrlicht/COctreeTriangleSelector.h +++ b/source/Irrlicht/COctreeTriangleSelector.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_OCTREE_TRIANGLE_SELECTOR_H_INCLUDED__ -#define __C_OCTREE_TRIANGLE_SELECTOR_H_INCLUDED__ +#ifndef IRR_C_OCTREE_TRIANGLE_SELECTOR_H_INCLUDED +#define IRR_C_OCTREE_TRIANGLE_SELECTOR_H_INCLUDED #include "CTriangleSelector.h" @@ -30,13 +30,13 @@ public: //! Gets all triangles which lie within a specific bounding box. virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, const core::aabbox3d& box, const core::matrix4* transform, bool useNodeTransform, - irr::core::array* outTriangleInfo) const _IRR_OVERRIDE_; + irr::core::array* outTriangleInfo) const IRR_OVERRIDE; //! Gets all triangles which have or may have contact with a 3d line. virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, const core::line3d& line, const core::matrix4* transform, bool useNodeTransform, - irr::core::array* outTriangleInfo) const _IRR_OVERRIDE_; + irr::core::array* outTriangleInfo) const IRR_OVERRIDE; private: @@ -80,6 +80,4 @@ private: } // end namespace scene } // end namespace irr - #endif - diff --git a/source/Irrlicht/COgreMeshFileLoader.h b/source/Irrlicht/COgreMeshFileLoader.h index c4c4e479..facab78d 100644 --- a/source/Irrlicht/COgreMeshFileLoader.h +++ b/source/Irrlicht/COgreMeshFileLoader.h @@ -3,8 +3,8 @@ // For conditions of distribution and use, see copyright notice in irrlicht.h // originally written by Christian Stehno, modified by Nikolaus Gebhardt -#ifndef __C_OGRE_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_OGRE_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_OGRE_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_OGRE_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "IFileSystem.h" @@ -36,13 +36,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! See IReferenceCounted::drop() for more information. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: @@ -266,4 +266,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/COpenGLCacheHandler.h b/source/Irrlicht/COpenGLCacheHandler.h index f7d14c03..54365ba4 100644 --- a/source/Irrlicht/COpenGLCacheHandler.h +++ b/source/Irrlicht/COpenGLCacheHandler.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in Irrlicht.h -#ifndef __C_OPENGL_CACHE_HANDLER_H_INCLUDED__ -#define __C_OPENGL_CACHE_HANDLER_H_INCLUDED__ +#ifndef IRR_C_OPENGL_CACHE_HANDLER_H_INCLUDED +#define IRR_C_OPENGL_CACHE_HANDLER_H_INCLUDED #include "IrrCompileConfig.h" diff --git a/source/Irrlicht/COpenGLCommon.h b/source/Irrlicht/COpenGLCommon.h index 4d38c3a0..63fe07a9 100644 --- a/source/Irrlicht/COpenGLCommon.h +++ b/source/Irrlicht/COpenGLCommon.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_OPENGL_COMMON_H_INCLUDED__ -#define __C_OPENGL_COMMON_H_INCLUDED__ +#ifndef IRR_C_OPENGL_COMMON_H_INCLUDED +#define IRR_C_OPENGL_COMMON_H_INCLUDED #include "IrrCompileConfig.h" diff --git a/source/Irrlicht/COpenGLCoreCacheHandler.h b/source/Irrlicht/COpenGLCoreCacheHandler.h index 5726e5f2..7f544526 100644 --- a/source/Irrlicht/COpenGLCoreCacheHandler.h +++ b/source/Irrlicht/COpenGLCoreCacheHandler.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_OGLCORE_CACHE_HANDLER_H_INCLUDED__ -#define __C_OGLCORE_CACHE_HANDLER_H_INCLUDED__ +#ifndef IRR_C_OGLCORE_CACHE_HANDLER_H_INCLUDED +#define IRR_C_OGLCORE_CACHE_HANDLER_H_INCLUDED #include "IrrCompileConfig.h" diff --git a/source/Irrlicht/COpenGLCoreFeature.h b/source/Irrlicht/COpenGLCoreFeature.h index 6ec58227..738348fd 100644 --- a/source/Irrlicht/COpenGLCoreFeature.h +++ b/source/Irrlicht/COpenGLCoreFeature.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_OGLCORE_FEATURE_H_INCLUDED__ -#define __C_OGLCORE_FEATURE_H_INCLUDED__ +#ifndef IRR_C_OGLCORE_FEATURE_H_INCLUDED +#define IRR_C_OGLCORE_FEATURE_H_INCLUDED #include "IrrCompileConfig.h" diff --git a/source/Irrlicht/COpenGLCoreRenderTarget.h b/source/Irrlicht/COpenGLCoreRenderTarget.h index c4c4530f..d6a086a9 100644 --- a/source/Irrlicht/COpenGLCoreRenderTarget.h +++ b/source/Irrlicht/COpenGLCoreRenderTarget.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_OGLCORE_RENDER_TARGET_H_INCLUDED__ -#define __C_OGLCORE_RENDER_TARGET_H_INCLUDED__ +#ifndef IRR_C_OGLCORE_RENDER_TARGET_H_INCLUDED +#define IRR_C_OGLCORE_RENDER_TARGET_H_INCLUDED #include "IrrCompileConfig.h" @@ -58,7 +58,7 @@ public: DepthStencil->drop(); } - 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 { bool needSizeUpdate = false; diff --git a/source/Irrlicht/COpenGLCoreTexture.h b/source/Irrlicht/COpenGLCoreTexture.h index f18c7789..ec3d39f6 100644 --- a/source/Irrlicht/COpenGLCoreTexture.h +++ b/source/Irrlicht/COpenGLCoreTexture.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_OGLCORE_TEXTURE_H_INCLUDED__ -#define __C_OGLCORE_TEXTURE_H_INCLUDED__ +#ifndef IRR_C_OGLCORE_TEXTURE_H_INCLUDED +#define IRR_C_OGLCORE_TEXTURE_H_INCLUDED #include "IrrCompileConfig.h" @@ -54,7 +54,7 @@ public: TextureName(0), InternalFormat(GL_RGBA), PixelFormat(GL_RGBA), PixelType(GL_UNSIGNED_BYTE), Converter(0), LockReadOnly(false), LockImage(0), LockLayer(0), KeepImage(false), MipLevelStored(0), LegacyAutoGenerateMipMaps(false) { - _IRR_DEBUG_BREAK_IF(images.size() == 0) + IRR_DEBUG_BREAK_IF(images.size() == 0) DriverType = Driver->getDriverType(); TextureType = TextureTypeIrrToGL(Type); @@ -234,7 +234,7 @@ public: Images[i]->drop(); } - 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 { if (LockImage) return getLockImageData(MipLevelStored); @@ -248,7 +248,7 @@ public: if (KeepImage) { - _IRR_DEBUG_BREAK_IF(LockLayer > Images.size()) + IRR_DEBUG_BREAK_IF(LockLayer > Images.size()) if ( mipmapLevel == 0 || (Images[LockLayer] && Images[LockLayer]->getMipMapsData(mipmapLevel)) ) { @@ -278,7 +278,7 @@ public: if (tmpTextureType == GL_TEXTURE_CUBE_MAP) { - _IRR_DEBUG_BREAK_IF(layer > 5) + IRR_DEBUG_BREAK_IF(layer > 5) tmpTextureType = GL_TEXTURE_CUBE_MAP_POSITIVE_X + layer; } @@ -376,7 +376,7 @@ public: return (LockImage) ? getLockImageData(MipLevelStored) : 0; } - virtual void unlock() _IRR_OVERRIDE_ + virtual void unlock() IRR_OVERRIDE { if (!LockImage) return; @@ -398,7 +398,7 @@ public: LockLayer = 0; } - virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) _IRR_OVERRIDE_ + virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) IRR_OVERRIDE { if (!HasMipMaps || LegacyAutoGenerateMipMaps || (Size.Width <= 1 && Size.Height <= 1)) return; @@ -574,7 +574,7 @@ protected: if (tmpTextureType == GL_TEXTURE_CUBE_MAP) { - _IRR_DEBUG_BREAK_IF(layer > 5) + IRR_DEBUG_BREAK_IF(layer > 5) tmpTextureType = GL_TEXTURE_CUBE_MAP_POSITIVE_X + layer; } diff --git a/source/Irrlicht/COpenGLDriver.cpp b/source/Irrlicht/COpenGLDriver.cpp index 22d4abfe..5dcbfbaa 100644 --- a/source/Irrlicht/COpenGLDriver.cpp +++ b/source/Irrlicht/COpenGLDriver.cpp @@ -866,7 +866,7 @@ void COpenGLDriver::drawVertexPrimitiveList(const void* vertices, u32 vertexCoun else { // avoid passing broken pointer to OpenGL - _IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); + IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]); } } @@ -1193,7 +1193,7 @@ void COpenGLDriver::draw2DVertexPrimitiveList(const void* vertices, u32 vertexCo else { // avoid passing broken pointer to OpenGL - _IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); + IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]); } } @@ -1351,7 +1351,7 @@ void COpenGLDriver::draw2DImage(const video::ITexture* texture, const core::posi glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast(Quad2DVertices))[0].Color); else { - _IRR_DEBUG_BREAK_IF(ColorBuffer.size() == 0); + IRR_DEBUG_BREAK_IF(ColorBuffer.size() == 0); glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]); } @@ -1435,7 +1435,7 @@ void COpenGLDriver::draw2DImage(const video::ITexture* texture, const core::rect glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast(Quad2DVertices))[0].Color); else { - _IRR_DEBUG_BREAK_IF(ColorBuffer.size() == 0); + IRR_DEBUG_BREAK_IF(ColorBuffer.size() == 0); glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]); } @@ -1599,7 +1599,7 @@ void COpenGLDriver::draw2DImageBatch(const video::ITexture* texture, glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast(Quad2DVertices))[0].Color); else { - _IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); + IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]); } @@ -1770,7 +1770,7 @@ void COpenGLDriver::draw2DImageBatch(const video::ITexture* texture, glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast(Quad2DVertices))[0].Color); else { - _IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); + IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]); } @@ -1875,7 +1875,7 @@ void COpenGLDriver::draw2DRectangle(const core::rect& position, glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast(Quad2DVertices))[0].Color); else { - _IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); + IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]); } @@ -1918,7 +1918,7 @@ void COpenGLDriver::draw2DLine(const core::position2d& start, glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast(Quad2DVertices))[0].Color); else { - _IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); + IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]); } @@ -1956,7 +1956,7 @@ void COpenGLDriver::drawPixel(u32 x, u32 y, const SColor &color) glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast(Quad2DVertices))[0].Color); else { - _IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); + IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]); } @@ -2083,7 +2083,7 @@ bool COpenGLDriver::testGLError(int code) os::Printer::log("GL_INVALID_FRAMEBUFFER_OPERATION", core::stringc(code).c_str(), ELL_ERROR); break; #endif }; -// _IRR_DEBUG_BREAK_IF(true); +// IRR_DEBUG_BREAK_IF(true); return true; #else return false; @@ -3450,7 +3450,7 @@ void COpenGLDriver::drawStencilShadow(bool clearStencilBuffer, video::SColor lef glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast(Quad2DVertices))[0].Color); else { - _IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); + IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]); } @@ -3561,7 +3561,7 @@ void COpenGLDriver::draw3DBox( const core::aabbox3d& box, SColor color ) glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast(v))[0].Color); else { - _IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); + IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]); } @@ -3597,7 +3597,7 @@ void COpenGLDriver::draw3DLine(const core::vector3df& start, glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast(Quad2DVertices))[0].Color); else { - _IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); + IRR_DEBUG_BREAK_IF(ColorBuffer.size()==0); glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]); } diff --git a/source/Irrlicht/COpenGLDriver.h b/source/Irrlicht/COpenGLDriver.h index 7c9f8690..c43c1fa2 100644 --- a/source/Irrlicht/COpenGLDriver.h +++ b/source/Irrlicht/COpenGLDriver.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in Irrlicht.h -#ifndef __C_VIDEO_OPEN_GL_H_INCLUDED__ -#define __C_VIDEO_OPEN_GL_H_INCLUDED__ +#ifndef IRR_C_VIDEO_OPEN_GL_H_INCLUDED +#define IRR_C_VIDEO_OPEN_GL_H_INCLUDED #include "IrrCompileConfig.h" @@ -58,12 +58,12 @@ namespace video virtual ~COpenGLDriver(); 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* sourceRect = 0) _IRR_OVERRIDE_; + const SExposedVideoData& videoData = SExposedVideoData(), core::rect* sourceRect = 0) IRR_OVERRIDE; - virtual bool endScene() _IRR_OVERRIDE_; + virtual bool endScene() IRR_OVERRIDE; //! sets transformation - virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) _IRR_OVERRIDE_; + virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) IRR_OVERRIDE; struct SHWBufferLink_opengl : public SHWBufferLink @@ -78,75 +78,75 @@ namespace video }; //! updates hardware buffer if needed - virtual bool updateHardwareBuffer(SHWBufferLink *HWBuffer) _IRR_OVERRIDE_; + virtual bool updateHardwareBuffer(SHWBufferLink *HWBuffer) IRR_OVERRIDE; //! 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) - virtual void deleteHardwareBuffer(SHWBufferLink *HWBuffer) _IRR_OVERRIDE_; + virtual void deleteHardwareBuffer(SHWBufferLink *HWBuffer) IRR_OVERRIDE; //! Draw hardware buffer - virtual void drawHardwareBuffer(SHWBufferLink *HWBuffer) _IRR_OVERRIDE_; + virtual void drawHardwareBuffer(SHWBufferLink *HWBuffer) IRR_OVERRIDE; //! Create occlusion query. /** Use node for identification and mesh for occlusion test. */ virtual void addOcclusionQuery(scene::ISceneNode* node, - const scene::IMesh* mesh=0) _IRR_OVERRIDE_; + const scene::IMesh* mesh=0) IRR_OVERRIDE; //! Remove occlusion query. - virtual void removeOcclusionQuery(scene::ISceneNode* node) _IRR_OVERRIDE_; + virtual void removeOcclusionQuery(scene::ISceneNode* node) IRR_OVERRIDE; //! Run occlusion query. Draws mesh stored in query. /** If the mesh shall not be rendered visible, use overrideMaterial to disable the color and depth buffer. */ - virtual void runOcclusionQuery(scene::ISceneNode* node, bool visible=false) _IRR_OVERRIDE_; + virtual void runOcclusionQuery(scene::ISceneNode* node, bool visible=false) IRR_OVERRIDE; //! Update occlusion query. Retrieves results from GPU. /** If the query shall not block, set the flag to false. Update might not occur in this case, though */ - virtual void updateOcclusionQuery(scene::ISceneNode* node, bool block=true) _IRR_OVERRIDE_; + virtual void updateOcclusionQuery(scene::ISceneNode* node, bool block=true) IRR_OVERRIDE; //! Return query result. /** Return value is the number of visible pixels/fragments. The value is a safe approximation, i.e. can be larger then the actual value of pixels. */ - virtual u32 getOcclusionQueryResult(scene::ISceneNode* node) const _IRR_OVERRIDE_; + virtual u32 getOcclusionQueryResult(scene::ISceneNode* node) const IRR_OVERRIDE; //! Create render target. - virtual IRenderTarget* addRenderTarget() _IRR_OVERRIDE_; + virtual IRenderTarget* addRenderTarget() IRR_OVERRIDE; //! draws a vertex primitive list virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const void* indexList, u32 primitiveCount, - E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) _IRR_OVERRIDE_; + E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) IRR_OVERRIDE; //! draws a vertex primitive list in 2d virtual void draw2DVertexPrimitiveList(const void* vertices, u32 vertexCount, const void* indexList, u32 primitiveCount, - E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) _IRR_OVERRIDE_; + E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) IRR_OVERRIDE; //! queries the features of the driver, returns true if feature is available - virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const _IRR_OVERRIDE_ + virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const IRR_OVERRIDE { return FeatureEnabled[feature] && COpenGLExtensionHandler::queryFeature(feature); } //! Disable a feature of the driver. - virtual void disableFeature(E_VIDEO_DRIVER_FEATURE feature, bool flag=true) _IRR_OVERRIDE_; + virtual void disableFeature(E_VIDEO_DRIVER_FEATURE feature, bool flag=true) IRR_OVERRIDE; //! Sets a material. All 3d drawing functions draw geometry now //! using this material. //! \param material: Material to be used from now on. - virtual void setMaterial(const SMaterial& material) _IRR_OVERRIDE_; + virtual void setMaterial(const SMaterial& material) IRR_OVERRIDE; virtual void draw2DImage(const video::ITexture* texture, const core::position2d& destPos, const core::rect& sourceRect, const core::rect* 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; virtual void draw2DImage(const video::ITexture* texture, const core::rect& destRect, const core::rect& sourceRect, const core::rect* clipRect = 0, - const video::SColor* const colors = 0, bool useAlphaChannelOfTexture = false) _IRR_OVERRIDE_; + const video::SColor* const colors = 0, bool useAlphaChannelOfTexture = false) IRR_OVERRIDE; virtual void draw2DImage(const video::ITexture* texture, u32 layer, bool flip); @@ -157,7 +157,7 @@ namespace video const core::array >& sourceRects, const core::rect* clipRect, SColor color, - bool useAlphaChannelOfTexture) _IRR_OVERRIDE_; + bool useAlphaChannelOfTexture) IRR_OVERRIDE; //! draws a set of 2d images, using a color and the alpha /** channel of the texture if desired. The images are drawn @@ -182,62 +182,62 @@ namespace video s32 kerningWidth=0, const core::rect* clipRect=0, SColor color=SColor(255,255,255,255), - bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_; + bool useAlphaChannelOfTexture=false) IRR_OVERRIDE; //! draw an 2d rectangle virtual void draw2DRectangle(SColor color, const core::rect& pos, - const core::rect* clip = 0) _IRR_OVERRIDE_; + const core::rect* clip = 0) IRR_OVERRIDE; //!Draws an 2d rectangle with a gradient. virtual void draw2DRectangle(const core::rect& pos, SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown, - const core::rect* clip = 0) _IRR_OVERRIDE_; + const core::rect* clip = 0) IRR_OVERRIDE; //! Draws a 2d line. virtual void draw2DLine(const core::position2d& start, const core::position2d& end, - SColor color=SColor(255,255,255,255)) _IRR_OVERRIDE_; + SColor color=SColor(255,255,255,255)) IRR_OVERRIDE; //! Draws a single pixel - virtual void drawPixel(u32 x, u32 y, const SColor & color) _IRR_OVERRIDE_; + virtual void drawPixel(u32 x, u32 y, const SColor & color) IRR_OVERRIDE; //! Draws a 3d box - virtual void draw3DBox( const core::aabbox3d& box, SColor color = SColor(255,255,255,255 ) ) _IRR_OVERRIDE_; + virtual void draw3DBox( const core::aabbox3d& box, SColor color = SColor(255,255,255,255 ) ) IRR_OVERRIDE; //! Draws a 3d line. virtual void draw3DLine(const core::vector3df& start, const core::vector3df& end, - SColor color = SColor(255,255,255,255)) _IRR_OVERRIDE_; + SColor color = SColor(255,255,255,255)) IRR_OVERRIDE; //! \return Returns the name of the video driver. Example: In case of the Direct3D8 //! driver, it would return "Direct3D8.1". - virtual const wchar_t* getName() const _IRR_OVERRIDE_; + virtual const wchar_t* getName() const IRR_OVERRIDE; //! deletes all dynamic lights there are - virtual void deleteAllDynamicLights() _IRR_OVERRIDE_; + virtual void deleteAllDynamicLights() IRR_OVERRIDE; //! adds a dynamic light, returning an index to the light //! \param light: the light data to use to create the light //! \return An index to the light, or -1 if an error occurs - virtual s32 addDynamicLight(const SLight& light) _IRR_OVERRIDE_; + virtual s32 addDynamicLight(const SLight& light) IRR_OVERRIDE; //! Turns a dynamic light on or off //! \param lightIndex: the index returned by addDynamicLight //! \param turnOn: true to turn the light on, false to turn it off - virtual void turnLightOn(s32 lightIndex, bool turnOn) _IRR_OVERRIDE_; + virtual void turnLightOn(s32 lightIndex, bool turnOn) IRR_OVERRIDE; //! returns the maximal amount of dynamic lights the device can handle - virtual u32 getMaximalDynamicLightAmount() const _IRR_OVERRIDE_; + virtual u32 getMaximalDynamicLightAmount() const IRR_OVERRIDE; //! Sets the dynamic ambient light color. The default color is //! (0,0,0,0) which means it is dark. //! \param color: New color of the ambient light. - virtual void setAmbientLight(const SColorf& color) _IRR_OVERRIDE_; + virtual void setAmbientLight(const SColorf& color) IRR_OVERRIDE; //! Draws a shadow volume into the stencil buffer. To draw a stencil shadow, do //! this: First, draw all geometry. Then use this method, to draw the shadow //! volume. Then, use IVideoDriver::drawStencilShadow() to visualize the shadow. - virtual void drawStencilShadowVolume(const core::array& triangles, bool zfail, u32 debugDataVisible=0) _IRR_OVERRIDE_; + virtual void drawStencilShadowVolume(const core::array& triangles, bool zfail, u32 debugDataVisible=0) IRR_OVERRIDE; //! Fills the stencil shadow with color. After the shadow volume has been drawn //! into the stencil buffer using IVideoDriver::drawStencilShadowVolume(), use this @@ -246,64 +246,64 @@ namespace video video::SColor leftUpEdge = video::SColor(0,0,0,0), video::SColor rightUpEdge = video::SColor(0,0,0,0), video::SColor leftDownEdge = video::SColor(0,0,0,0), - video::SColor rightDownEdge = video::SColor(0,0,0,0)) _IRR_OVERRIDE_; + video::SColor rightDownEdge = video::SColor(0,0,0,0)) IRR_OVERRIDE; //! sets a viewport - virtual void setViewPort(const core::rect& area) _IRR_OVERRIDE_; + virtual void setViewPort(const core::rect& area) IRR_OVERRIDE; //! Sets the fog mode. virtual void setFog(SColor color, E_FOG_TYPE fogType, f32 start, - f32 end, f32 density, bool pixelFog, bool rangeFog) _IRR_OVERRIDE_; + f32 end, f32 density, bool pixelFog, bool rangeFog) IRR_OVERRIDE; //! Only used by the internal engine. Used to notify the driver that //! the window was resized. - virtual void OnResize(const core::dimension2d& size) _IRR_OVERRIDE_; + virtual void OnResize(const core::dimension2d& size) IRR_OVERRIDE; //! Returns type of video driver - virtual E_DRIVER_TYPE getDriverType() const _IRR_OVERRIDE_; + virtual E_DRIVER_TYPE getDriverType() const IRR_OVERRIDE; //! get color format of the current color buffer - virtual ECOLOR_FORMAT getColorFormat() const _IRR_OVERRIDE_; + virtual ECOLOR_FORMAT getColorFormat() const IRR_OVERRIDE; //! Returns the transformation set by setTransform - virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const _IRR_OVERRIDE_; + virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const IRR_OVERRIDE; //! Can be called by an IMaterialRenderer to make its work easier. virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastmaterial, - bool resetAllRenderstates) _IRR_OVERRIDE_; + bool resetAllRenderstates) IRR_OVERRIDE; //! Compare in SMaterial doesn't check texture parameters, so we should call this on each OnRender call. virtual void setTextureRenderStates(const SMaterial& material, bool resetAllRenderstates); //! 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. - virtual s32 getPixelShaderConstantID(const c8* name) _IRR_OVERRIDE_; + virtual s32 getPixelShaderConstantID(const c8* name) IRR_OVERRIDE; //! 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. - 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. - 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. - 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. - 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. - 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. - 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. - virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) _IRR_OVERRIDE_; + virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) IRR_OVERRIDE; //! disables all textures beginning with the optional fromStage parameter. Otherwise all texture stages are disabled. //! Returns whether disabling was successful or not. @@ -313,7 +313,7 @@ namespace video //! extGLGetObjectParameteriv(shaderHandle, GL_OBJECT_COMPILE_STATUS_ARB, &status) //! pixel and/or vertex shaders to render geometry. virtual s32 addShaderMaterial(const c8* vertexShaderProgram, const c8* pixelShaderProgram, - IShaderConstantSetCallBack* callback, E_MATERIAL_TYPE baseMaterial, s32 userData) _IRR_OVERRIDE_; + IShaderConstantSetCallBack* callback, E_MATERIAL_TYPE baseMaterial, s32 userData) IRR_OVERRIDE; //! Adds a new material renderer to the VideoDriver, using GLSL to render geometry. virtual s32 addHighLevelShaderMaterial( @@ -331,31 +331,31 @@ namespace video u32 verticesOut = 0, IShaderConstantSetCallBack* callback = 0, E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID, - s32 userData = 0) _IRR_OVERRIDE_; + s32 userData = 0) IRR_OVERRIDE; //! Returns a pointer to the IVideoDriver interface. (Implementation for //! IMaterialRendererServices) - virtual IVideoDriver* getVideoDriver() _IRR_OVERRIDE_; + virtual IVideoDriver* getVideoDriver() IRR_OVERRIDE; //! Returns the maximum amount of primitives (mostly vertices) which //! the device is able to render with one drawIndexedTriangleList //! call. - virtual u32 getMaximalPrimitiveCount() const _IRR_OVERRIDE_; + virtual u32 getMaximalPrimitiveCount() const IRR_OVERRIDE; virtual ITexture* addRenderTargetTexture(const core::dimension2d& size, - const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) _IRR_OVERRIDE_; + const io::path& name, const ECOLOR_FORMAT format = ECF_UNKNOWN) IRR_OVERRIDE; //! Creates a render target texture for a cubemap ITexture* addRenderTargetTextureCubemap(const irr::u32 sideLen, - const io::path& name, const ECOLOR_FORMAT format) _IRR_OVERRIDE_; + const io::path& name, const ECOLOR_FORMAT format) IRR_OVERRIDE; virtual bool setRenderTargetEx(IRenderTarget* target, u16 clearFlag, SColor clearColor = SColor(255,0,0,0), - f32 clearDepth = 1.f, u8 clearStencil = 0) _IRR_OVERRIDE_; + f32 clearDepth = 1.f, u8 clearStencil = 0) IRR_OVERRIDE; - virtual void clearBuffers(u16 flag, SColor color = SColor(255,0,0,0), f32 depth = 1.f, u8 stencil = 0) _IRR_OVERRIDE_; + virtual void clearBuffers(u16 flag, SColor color = SColor(255,0,0,0), f32 depth = 1.f, u8 stencil = 0) IRR_OVERRIDE; //! Returns an image created from the last rendered frame. - virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER) _IRR_OVERRIDE_; + virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER) IRR_OVERRIDE; //! checks if an OpenGL error has happened and prints it (+ some internal code which is usually the line number) //! for performance reasons only available in debug mode @@ -366,31 +366,31 @@ namespace video //! \param index: The plane index. Must be between 0 and MaxUserClipPlanes. //! \param plane: The plane itself. //! \param enable: If true, enable the clipping plane else disable it. - virtual bool setClipPlane(u32 index, const core::plane3df& plane, bool enable=false) _IRR_OVERRIDE_; + virtual bool setClipPlane(u32 index, const core::plane3df& plane, bool enable=false) IRR_OVERRIDE; //! Enable/disable a clipping plane. //! There are at least 6 clipping planes available for the user to set at will. //! \param index: The plane index. Must be between 0 and MaxUserClipPlanes. //! \param enable: If true, enable the clipping plane else disable it. - virtual void enableClipPlane(u32 index, bool enable) _IRR_OVERRIDE_; + virtual void enableClipPlane(u32 index, bool enable) IRR_OVERRIDE; //! Enable the 2d override material - virtual void enableMaterial2D(bool enable=true) _IRR_OVERRIDE_; + virtual void enableMaterial2D(bool enable=true) IRR_OVERRIDE; //! Returns the graphics card vendor name. - virtual core::stringc getVendorInfo() _IRR_OVERRIDE_ {return VendorName;} + virtual core::stringc getVendorInfo() IRR_OVERRIDE {return VendorName;} //! Returns the maximum texture size supported. - virtual core::dimension2du getMaxTextureSize() const _IRR_OVERRIDE_; + virtual core::dimension2du getMaxTextureSize() const IRR_OVERRIDE; //! Removes a texture from the texture cache and deletes it, freeing lot of memory. - virtual void removeTexture(ITexture* texture) _IRR_OVERRIDE_; + virtual void removeTexture(ITexture* texture) IRR_OVERRIDE; //! 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 - virtual bool needsTransparentRenderPass(const irr::video::SMaterial& material) const _IRR_OVERRIDE_; + virtual bool needsTransparentRenderPass(const irr::video::SMaterial& material) const IRR_OVERRIDE; //! Convert E_PRIMITIVE_TYPE to OpenGL equivalent GLenum primitiveTypeToGL(scene::E_PRIMITIVE_TYPE type) const; @@ -425,9 +425,9 @@ namespace video //! inits the parts of the open gl driver used on all platforms bool genericDriverInit(); - 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& image) _IRR_OVERRIDE_; + virtual ITexture* createDeviceDependentTextureCubemap(const io::path& name, const core::array& image) IRR_OVERRIDE; //! creates a transposed matrix in supplied GLfloat array to pass to OpenGL inline void getGLMatrix(GLfloat gl_matrix[16], const core::matrix4& m); @@ -529,4 +529,3 @@ namespace video #endif // _IRR_COMPILE_WITH_OPENGL_ #endif - diff --git a/source/Irrlicht/COpenGLExtensionHandler.h b/source/Irrlicht/COpenGLExtensionHandler.h index 4f88324f..600412a7 100644 --- a/source/Irrlicht/COpenGLExtensionHandler.h +++ b/source/Irrlicht/COpenGLExtensionHandler.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in Irrlicht.h -#ifndef __C_OPEN_GL_FEATURE_MAP_H_INCLUDED__ -#define __C_OPEN_GL_FEATURE_MAP_H_INCLUDED__ +#ifndef IRR_C_OPEN_GL_FEATURE_MAP_H_INCLUDED +#define IRR_C_OPEN_GL_FEATURE_MAP_H_INCLUDED #include "IrrCompileConfig.h" @@ -3439,4 +3439,3 @@ inline void COpenGLExtensionHandler::extGlSwapInterval(int interval) #endif #endif - diff --git a/source/Irrlicht/COpenGLMaterialRenderer.h b/source/Irrlicht/COpenGLMaterialRenderer.h index 43d72190..43028352 100644 --- a/source/Irrlicht/COpenGLMaterialRenderer.h +++ b/source/Irrlicht/COpenGLMaterialRenderer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_OPENGL_MATERIAL_RENDERER_H_INCLUDED__ -#define __C_OPENGL_MATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_OPENGL_MATERIAL_RENDERER_H_INCLUDED +#define IRR_C_OPENGL_MATERIAL_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_OPENGL_ @@ -26,7 +26,7 @@ public: COpenGLMaterialRenderer_SOLID(video::COpenGLDriver* d) : Driver(d) {} virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE { if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE) Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE); @@ -51,7 +51,7 @@ public: COpenGLMaterialRenderer_ONETEXTURE_BLEND(video::COpenGLDriver* d) : Driver(d) {} virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE { if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE) Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE); @@ -137,7 +137,7 @@ public: } } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { Driver->getCacheHandler()->setActiveTexture(GL_TEXTURE0_ARB); @@ -158,7 +158,7 @@ public: //! Returns if the material is transparent. /** Is not always transparent, but mostly. */ - virtual bool isTransparent() const _IRR_OVERRIDE_ + virtual bool isTransparent() const IRR_OVERRIDE { return true; } @@ -177,7 +177,7 @@ public: COpenGLMaterialRenderer_SOLID_2_LAYER(video::COpenGLDriver* d) : Driver(d) {} virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE { if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE) Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE); @@ -215,7 +215,7 @@ public: } } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { if (Driver->queryFeature(EVDF_MULTITEXTURE)) { @@ -245,7 +245,7 @@ public: COpenGLMaterialRenderer_TRANSPARENT_ADD_COLOR(video::COpenGLDriver* d) : Driver(d) {} virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE { if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE) Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE); @@ -259,13 +259,13 @@ public: Driver->getCacheHandler()->setBlend(true); } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { Driver->getCacheHandler()->setBlend(false); } //! Returns if the material is transparent. - virtual bool isTransparent() const _IRR_OVERRIDE_ + virtual bool isTransparent() const IRR_OVERRIDE { return true; } @@ -284,7 +284,7 @@ public: COpenGLMaterialRenderer_TRANSPARENT_VERTEX_ALPHA(video::COpenGLDriver* d) : Driver(d) {} virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE { if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE) Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE); @@ -319,7 +319,7 @@ public: } } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { Driver->getCacheHandler()->setActiveTexture(GL_TEXTURE0_ARB); @@ -336,7 +336,7 @@ public: } //! Returns if the material is transparent. - virtual bool isTransparent() const _IRR_OVERRIDE_ + virtual bool isTransparent() const IRR_OVERRIDE { return true; } @@ -355,7 +355,7 @@ public: COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL(video::COpenGLDriver* d) : Driver(d) {} virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE { if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE) Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE); @@ -392,7 +392,7 @@ public: } } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { Driver->getCacheHandler()->setActiveTexture(GL_TEXTURE0_ARB); @@ -407,7 +407,7 @@ public: } //! Returns if the material is transparent. - virtual bool isTransparent() const _IRR_OVERRIDE_ + virtual bool isTransparent() const IRR_OVERRIDE { return true; } @@ -426,7 +426,7 @@ public: COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL_REF(video::COpenGLDriver* d) : Driver(d) {} virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE { if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE) Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE); @@ -443,13 +443,13 @@ public: } } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { Driver->getCacheHandler()->setAlphaTest(false); } //! Returns if the material is 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. } @@ -468,7 +468,7 @@ public: COpenGLMaterialRenderer_LIGHTMAP(video::COpenGLDriver* d) : Driver(d) {} virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE { if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE) Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE); @@ -562,7 +562,7 @@ public: } } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { if (Driver->queryFeature(EVDF_MULTITEXTURE)) { @@ -595,7 +595,7 @@ public: COpenGLMaterialRenderer_DETAIL_MAP(video::COpenGLDriver* d) : Driver(d) {} virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE { if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE) Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE); @@ -627,7 +627,7 @@ public: } } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { if (Driver->queryFeature(EVDF_MULTITEXTURE)) { @@ -651,7 +651,7 @@ public: COpenGLMaterialRenderer_SPHERE_MAP(video::COpenGLDriver* d) : Driver(d) {} virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE { if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE) Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE); @@ -677,7 +677,7 @@ public: } } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { Driver->getCacheHandler()->setActiveTexture(GL_TEXTURE0_ARB); @@ -699,7 +699,7 @@ public: COpenGLMaterialRenderer_REFLECTION_2_LAYER(video::COpenGLDriver* d) : Driver(d) {} virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE { if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE) Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE); @@ -735,7 +735,7 @@ public: } } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { if (Driver->queryFeature(EVDF_MULTITEXTURE)) { @@ -761,7 +761,7 @@ public: COpenGLMaterialRenderer_TRANSPARENT_REFLECTION_2_LAYER(video::COpenGLDriver* d) : Driver(d) {} virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE { if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE) Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE); @@ -820,7 +820,7 @@ public: } } - virtual void OnUnsetMaterial() _IRR_OVERRIDE_ + virtual void OnUnsetMaterial() IRR_OVERRIDE { if (Driver->queryFeature(EVDF_MULTITEXTURE)) { @@ -840,7 +840,7 @@ public: } //! Returns if the material is transparent. - virtual bool isTransparent() const _IRR_OVERRIDE_ + virtual bool isTransparent() const IRR_OVERRIDE { return true; } @@ -855,4 +855,3 @@ protected: #endif #endif - diff --git a/source/Irrlicht/COpenGLNormalMapRenderer.h b/source/Irrlicht/COpenGLNormalMapRenderer.h index f9991ad1..20fbb81b 100644 --- a/source/Irrlicht/COpenGLNormalMapRenderer.h +++ b/source/Irrlicht/COpenGLNormalMapRenderer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_OPENGL_NORMAL_MAP_RENDERER_H_INCLUDED__ -#define __C_OPENGL_NORMAL_MAP_RENDERER_H_INCLUDED__ +#ifndef IRR_C_OPENGL_NORMAL_MAP_RENDERER_H_INCLUDED +#define IRR_C_OPENGL_NORMAL_MAP_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" @@ -32,10 +32,10 @@ public: //! Called by the engine when the vertex and/or pixel shader constants for an //! material renderer should be set. - virtual void OnSetConstants(IMaterialRendererServices* services, s32 userData) _IRR_OVERRIDE_; + virtual void OnSetConstants(IMaterialRendererServices* services, s32 userData) IRR_OVERRIDE; //! Returns the render capability of the material. - virtual s32 getRenderCapability() const _IRR_OVERRIDE_; + virtual s32 getRenderCapability() const IRR_OVERRIDE; protected: @@ -48,4 +48,3 @@ protected: #endif #endif - diff --git a/source/Irrlicht/COpenGLParallaxMapRenderer.h b/source/Irrlicht/COpenGLParallaxMapRenderer.h index f2d1c487..2afd75b2 100644 --- a/source/Irrlicht/COpenGLParallaxMapRenderer.h +++ b/source/Irrlicht/COpenGLParallaxMapRenderer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_OPENGL_PARALLAX_MAP_RENDERER_H_INCLUDED__ -#define __C_OPENGL_PARALLAX_MAP_RENDERER_H_INCLUDED__ +#ifndef IRR_C_OPENGL_PARALLAX_MAP_RENDERER_H_INCLUDED +#define IRR_C_OPENGL_PARALLAX_MAP_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" @@ -32,15 +32,15 @@ public: //! Called by the engine when the vertex and/or pixel shader constants for an //! material renderer should be set. - virtual void OnSetConstants(IMaterialRendererServices* services, s32 userData) _IRR_OVERRIDE_; + virtual void OnSetConstants(IMaterialRendererServices* services, s32 userData) IRR_OVERRIDE; //! 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, const video::SMaterial& lastMaterial, - bool resetAllRenderstates, video::IMaterialRendererServices* services) _IRR_OVERRIDE_; + bool resetAllRenderstates, video::IMaterialRendererServices* services) IRR_OVERRIDE; protected: @@ -54,4 +54,3 @@ protected: #endif #endif - diff --git a/source/Irrlicht/COpenGLSLMaterialRenderer.h b/source/Irrlicht/COpenGLSLMaterialRenderer.h index 354f1a06..389157c6 100644 --- a/source/Irrlicht/COpenGLSLMaterialRenderer.h +++ b/source/Irrlicht/COpenGLSLMaterialRenderer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_OPENGL_SHADER_LANGUAGE_MATERIAL_RENDERER_H_INCLUDED__ -#define __C_OPENGL_SHADER_LANGUAGE_MATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_OPENGL_SHADER_LANGUAGE_MATERIAL_RENDERER_H_INCLUDED +#define IRR_C_OPENGL_SHADER_LANGUAGE_MATERIAL_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" @@ -56,34 +56,34 @@ public: virtual ~COpenGLSLMaterialRenderer(); virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_; + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE; - virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) _IRR_OVERRIDE_; + virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) IRR_OVERRIDE; - virtual void OnUnsetMaterial() _IRR_OVERRIDE_; + virtual void OnUnsetMaterial() IRR_OVERRIDE; //! 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 - virtual IShaderConstantSetCallBack* getShaderConstantSetCallBack() const _IRR_OVERRIDE_ + virtual IShaderConstantSetCallBack* getShaderConstantSetCallBack() const IRR_OVERRIDE { return CallBack; } // implementations for the render services - virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates) _IRR_OVERRIDE_; - virtual s32 getVertexShaderConstantID(const c8* name) _IRR_OVERRIDE_; - virtual s32 getPixelShaderConstantID(const c8* name) _IRR_OVERRIDE_; - virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) _IRR_OVERRIDE_; - virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) _IRR_OVERRIDE_; - virtual bool setVertexShaderConstant(s32 index, const f32* floats, int count) _IRR_OVERRIDE_; - virtual bool setVertexShaderConstant(s32 index, const s32* ints, int count) _IRR_OVERRIDE_; - virtual bool setVertexShaderConstant(s32 index, const u32* ints, int count) _IRR_OVERRIDE_; - virtual bool setPixelShaderConstant(s32 index, const f32* floats, int count) _IRR_OVERRIDE_; - virtual bool setPixelShaderConstant(s32 index, const s32* ints, int count) _IRR_OVERRIDE_; - virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) _IRR_OVERRIDE_; - virtual IVideoDriver* getVideoDriver() _IRR_OVERRIDE_; + virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates) IRR_OVERRIDE; + virtual s32 getVertexShaderConstantID(const c8* name) IRR_OVERRIDE; + virtual s32 getPixelShaderConstantID(const c8* name) IRR_OVERRIDE; + virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) IRR_OVERRIDE; + virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) IRR_OVERRIDE; + virtual bool setVertexShaderConstant(s32 index, const f32* floats, int count) IRR_OVERRIDE; + virtual bool setVertexShaderConstant(s32 index, const s32* ints, int count) IRR_OVERRIDE; + virtual bool setVertexShaderConstant(s32 index, const u32* ints, int count) IRR_OVERRIDE; + virtual bool setPixelShaderConstant(s32 index, const f32* floats, int count) IRR_OVERRIDE; + virtual bool setPixelShaderConstant(s32 index, const s32* ints, int count) IRR_OVERRIDE; + virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) IRR_OVERRIDE; + virtual IVideoDriver* getVideoDriver() IRR_OVERRIDE; protected: @@ -133,4 +133,3 @@ protected: #endif // compile with OpenGL #endif // if included - diff --git a/source/Irrlicht/COpenGLShaderMaterialRenderer.h b/source/Irrlicht/COpenGLShaderMaterialRenderer.h index 7cae915e..06ebf309 100644 --- a/source/Irrlicht/COpenGLShaderMaterialRenderer.h +++ b/source/Irrlicht/COpenGLShaderMaterialRenderer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED__ -#define __C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED +#define IRR_C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED #include "IrrCompileConfig.h" @@ -35,17 +35,17 @@ public: virtual ~COpenGLShaderMaterialRenderer(); virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_; + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE; - virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) _IRR_OVERRIDE_; + virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) IRR_OVERRIDE; - virtual void OnUnsetMaterial() _IRR_OVERRIDE_; + virtual void OnUnsetMaterial() IRR_OVERRIDE; //! 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 - virtual IShaderConstantSetCallBack* getShaderConstantSetCallBack() const _IRR_OVERRIDE_ + virtual IShaderConstantSetCallBack* getShaderConstantSetCallBack() const IRR_OVERRIDE { return CallBack; } @@ -94,4 +94,3 @@ protected: #endif #endif - diff --git a/source/Irrlicht/CPLYMeshFileLoader.h b/source/Irrlicht/CPLYMeshFileLoader.h index 4335c924..1d6270f5 100644 --- a/source/Irrlicht/CPLYMeshFileLoader.h +++ b/source/Irrlicht/CPLYMeshFileLoader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_PLY_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_PLY_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_PLY_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_PLY_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "ISceneManager.h" @@ -38,10 +38,10 @@ public: //! returns true if the file maybe is able to be loaded by this class //! based on the file extension (e.g. ".ply") - 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. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: @@ -145,4 +145,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CPLYMeshWriter.h b/source/Irrlicht/CPLYMeshWriter.h index d87a1d05..7b44264f 100644 --- a/source/Irrlicht/CPLYMeshWriter.h +++ b/source/Irrlicht/CPLYMeshWriter.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __IRR_PLY_MESH_WRITER_H_INCLUDED__ -#define __IRR_PLY_MESH_WRITER_H_INCLUDED__ +#ifndef IRR_PLY_MESH_WRITER_H_INCLUDED +#define IRR_PLY_MESH_WRITER_H_INCLUDED #include "IMeshWriter.h" @@ -22,10 +22,10 @@ namespace scene CPLYMeshWriter(); //! 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 - 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; }; diff --git a/source/Irrlicht/CPakReader.h b/source/Irrlicht/CPakReader.h index 2301b170..bb7cc185 100644 --- a/source/Irrlicht/CPakReader.h +++ b/source/Irrlicht/CPakReader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_PAK_READER_H_INCLUDED__ -#define __C_PAK_READER_H_INCLUDED__ +#ifndef IRR_C_PAK_READER_H_INCLUDED +#define IRR_C_PAK_READER_H_INCLUDED #include "IrrCompileConfig.h" @@ -48,28 +48,28 @@ namespace io //! returns true if the file maybe is able to be loaded by this class //! based on the file extension (e.g. ".zip") - virtual bool isALoadableFileFormat(const io::path& filename) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(const io::path& filename) const IRR_OVERRIDE; //! Check if the file might be loaded by this class /** Check might look into the file. \param file File handle to check. \return True if file seems to be loadable. */ - virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE; //! Check to see if the loader can create archives of this type. /** Check based on the archive type. \param fileType The archive type to check. \return True if the archile loader supports this type, false if not */ - virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const IRR_OVERRIDE; //! Creates an archive from the filename /** \param file File handle to check. \return Pointer to newly created archive, or 0 upon error. */ - virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const _IRR_OVERRIDE_; + virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const IRR_OVERRIDE; //! creates/loads an archive from the file. //! \return Pointer to the created archive. Returns 0 if loading failed. - virtual io::IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const _IRR_OVERRIDE_; + virtual io::IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const IRR_OVERRIDE; private: io::IFileSystem* FileSystem; @@ -87,22 +87,22 @@ namespace io // file archive methods //! return the id of the file Archive - virtual const io::path& getArchiveName() const _IRR_OVERRIDE_ + virtual const io::path& getArchiveName() const IRR_OVERRIDE { return File->getFileName(); } //! opens a file by file name - virtual IReadFile* createAndOpenFile(const io::path& filename) _IRR_OVERRIDE_; + virtual IReadFile* createAndOpenFile(const io::path& filename) IRR_OVERRIDE; //! opens a file by index - virtual IReadFile* createAndOpenFile(u32 index) _IRR_OVERRIDE_; + virtual IReadFile* createAndOpenFile(u32 index) IRR_OVERRIDE; //! returns the list of files - virtual const IFileList* getFileList() const _IRR_OVERRIDE_; + virtual const IFileList* getFileList() const IRR_OVERRIDE; //! get the class Type - virtual E_FILE_ARCHIVE_TYPE getType() const _IRR_OVERRIDE_ { return EFAT_PAK; } + virtual E_FILE_ARCHIVE_TYPE getType() const IRR_OVERRIDE { return EFAT_PAK; } private: @@ -118,5 +118,4 @@ namespace io #endif // __IRR_COMPILE_WITH_PAK_ARCHIVE_LOADER_ -#endif // __C_PAK_READER_H_INCLUDED__ - +#endif // IRR_C_PAK_READER_H_INCLUDED diff --git a/source/Irrlicht/CParticleAnimatedMeshSceneNodeEmitter.h b/source/Irrlicht/CParticleAnimatedMeshSceneNodeEmitter.h index 176abf97..3b2c46aa 100644 --- a/source/Irrlicht/CParticleAnimatedMeshSceneNodeEmitter.h +++ b/source/Irrlicht/CParticleAnimatedMeshSceneNodeEmitter.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__ -#define __C_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED +#define IRR_C_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED #include "IParticleAnimatedMeshSceneNodeEmitter.h" #include "irrArray.h" @@ -39,93 +39,93 @@ public: //! Prepares an array with new particles to emitt into the system //! and returns how much new particles there are. - virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) _IRR_OVERRIDE_; + virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) IRR_OVERRIDE; //! Set Mesh to emit particles from - virtual void setAnimatedMeshSceneNode( IAnimatedMeshSceneNode* node ) _IRR_OVERRIDE_; + virtual void setAnimatedMeshSceneNode( IAnimatedMeshSceneNode* node ) IRR_OVERRIDE; //! Set whether to use vertex normal for direction, or direction specified - virtual void setUseNormalDirection( bool useNormalDirection ) _IRR_OVERRIDE_ { UseNormalDirection = useNormalDirection; } + virtual void setUseNormalDirection( bool useNormalDirection ) IRR_OVERRIDE { UseNormalDirection = useNormalDirection; } //! Set direction the emitter emits particles - virtual void setDirection( const core::vector3df& newDirection ) _IRR_OVERRIDE_ { Direction = newDirection; } + virtual void setDirection( const core::vector3df& newDirection ) IRR_OVERRIDE { Direction = newDirection; } //! Set the amount that the normal is divided by for getting a particles direction - virtual void setNormalDirectionModifier( f32 normalDirectionModifier ) _IRR_OVERRIDE_ { NormalDirectionModifier = normalDirectionModifier; } + virtual void setNormalDirectionModifier( f32 normalDirectionModifier ) IRR_OVERRIDE { NormalDirectionModifier = normalDirectionModifier; } //! Sets whether to emit min<->max particles for every vertex per second, or to pick //! min<->max vertices every second - virtual void setEveryMeshVertex( bool everyMeshVertex ) _IRR_OVERRIDE_ { EveryMeshVertex = everyMeshVertex; } + virtual void setEveryMeshVertex( bool everyMeshVertex ) IRR_OVERRIDE { EveryMeshVertex = everyMeshVertex; } //! Set minimum number of particles the emitter emits per second - virtual void setMinParticlesPerSecond( u32 minPPS ) _IRR_OVERRIDE_ { MinParticlesPerSecond = minPPS; } + virtual void setMinParticlesPerSecond( u32 minPPS ) IRR_OVERRIDE { MinParticlesPerSecond = minPPS; } //! Set maximum number of particles the emitter emits per second - virtual void setMaxParticlesPerSecond( u32 maxPPS ) _IRR_OVERRIDE_ { MaxParticlesPerSecond = maxPPS; } + virtual void setMaxParticlesPerSecond( u32 maxPPS ) IRR_OVERRIDE { MaxParticlesPerSecond = maxPPS; } //! Set minimum starting color for particles - virtual void setMinStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MinStartColor = color; } + virtual void setMinStartColor( const video::SColor& color ) IRR_OVERRIDE { MinStartColor = color; } //! Set maximum starting color for particles - virtual void setMaxStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MaxStartColor = color; } + virtual void setMaxStartColor( const video::SColor& color ) IRR_OVERRIDE { MaxStartColor = color; } //! Set the maximum starting size for particles - virtual void setMaxStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MaxStartSize = size; } + virtual void setMaxStartSize( const core::dimension2df& size ) IRR_OVERRIDE { MaxStartSize = size; } //! Set the minimum starting size for particles - virtual void setMinStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MinStartSize = size; } + virtual void setMinStartSize( const core::dimension2df& size ) IRR_OVERRIDE { MinStartSize = size; } //! Set the minimum particle life-time in milliseconds - virtual void setMinLifeTime( u32 lifeTimeMin ) _IRR_OVERRIDE_ { MinLifeTime = lifeTimeMin; } + virtual void setMinLifeTime( u32 lifeTimeMin ) IRR_OVERRIDE { MinLifeTime = lifeTimeMin; } //! Set the maximum particle life-time in milliseconds - virtual void setMaxLifeTime( u32 lifeTimeMax ) _IRR_OVERRIDE_ { MaxLifeTime = lifeTimeMax; } + virtual void setMaxLifeTime( u32 lifeTimeMax ) IRR_OVERRIDE { MaxLifeTime = lifeTimeMax; } //! Maximal random derivation from the direction - virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) _IRR_OVERRIDE_ { MaxAngleDegrees = maxAngleDegrees; } + virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) IRR_OVERRIDE { MaxAngleDegrees = maxAngleDegrees; } //! Get Mesh we're emitting particles from - virtual const IAnimatedMeshSceneNode* getAnimatedMeshSceneNode() const _IRR_OVERRIDE_ { return Node; } + virtual const IAnimatedMeshSceneNode* getAnimatedMeshSceneNode() const IRR_OVERRIDE { return Node; } //! Get whether to use vertex normal for direciton, or direction specified - virtual bool isUsingNormalDirection() const _IRR_OVERRIDE_ { return UseNormalDirection; } + virtual bool isUsingNormalDirection() const IRR_OVERRIDE { return UseNormalDirection; } //! Get direction the emitter emits particles - virtual const core::vector3df& getDirection() const _IRR_OVERRIDE_ { return Direction; } + virtual const core::vector3df& getDirection() const IRR_OVERRIDE { return Direction; } //! Get the amount that the normal is divided by for getting a particles direction - virtual f32 getNormalDirectionModifier() const _IRR_OVERRIDE_ { return NormalDirectionModifier; } + virtual f32 getNormalDirectionModifier() const IRR_OVERRIDE { return NormalDirectionModifier; } //! Gets whether to emit min<->max particles for every vertex per second, or to pick //! min<->max vertices every second - virtual bool getEveryMeshVertex() const _IRR_OVERRIDE_ { return EveryMeshVertex; } + virtual bool getEveryMeshVertex() const IRR_OVERRIDE { return EveryMeshVertex; } //! Get the minimum number of particles the emitter emits per second - virtual u32 getMinParticlesPerSecond() const _IRR_OVERRIDE_ { return MinParticlesPerSecond; } + virtual u32 getMinParticlesPerSecond() const IRR_OVERRIDE { return MinParticlesPerSecond; } //! Get the maximum number of particles the emitter emits per second - virtual u32 getMaxParticlesPerSecond() const _IRR_OVERRIDE_ { return MaxParticlesPerSecond; } + virtual u32 getMaxParticlesPerSecond() const IRR_OVERRIDE { return MaxParticlesPerSecond; } //! Get the minimum starting color for particles - virtual const video::SColor& getMinStartColor() const _IRR_OVERRIDE_ { return MinStartColor; } + virtual const video::SColor& getMinStartColor() const IRR_OVERRIDE { return MinStartColor; } //! Get the maximum starting color for particles - virtual const video::SColor& getMaxStartColor() const _IRR_OVERRIDE_ { return MaxStartColor; } + virtual const video::SColor& getMaxStartColor() const IRR_OVERRIDE { return MaxStartColor; } //! Get the maximum starting size for particles - virtual const core::dimension2df& getMaxStartSize() const _IRR_OVERRIDE_ { return MaxStartSize; } + virtual const core::dimension2df& getMaxStartSize() const IRR_OVERRIDE { return MaxStartSize; } //! Get the minimum starting size for particles - virtual const core::dimension2df& getMinStartSize() const _IRR_OVERRIDE_ { return MinStartSize; } + virtual const core::dimension2df& getMinStartSize() const IRR_OVERRIDE { return MinStartSize; } //! Get the minimum particle life-time in milliseconds - virtual u32 getMinLifeTime() const _IRR_OVERRIDE_ { return MinLifeTime; } + virtual u32 getMinLifeTime() const IRR_OVERRIDE { return MinLifeTime; } //! Get the maximum particle life-time in milliseconds - virtual u32 getMaxLifeTime() const _IRR_OVERRIDE_ { return MaxLifeTime; } + virtual u32 getMaxLifeTime() const IRR_OVERRIDE { return MaxLifeTime; } //! Maximal random derivation from the direction - virtual s32 getMaxAngleDegrees() const _IRR_OVERRIDE_ { return MaxAngleDegrees; } + virtual s32 getMaxAngleDegrees() const IRR_OVERRIDE { return MaxAngleDegrees; } private: @@ -155,6 +155,4 @@ private: } // end namespace scene } // end namespace irr - -#endif // __C_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__ - +#endif // IRR_C_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED diff --git a/source/Irrlicht/CParticleAttractionAffector.h b/source/Irrlicht/CParticleAttractionAffector.h index 6e126cd9..a435deb3 100644 --- a/source/Irrlicht/CParticleAttractionAffector.h +++ b/source/Irrlicht/CParticleAttractionAffector.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__ -#define __C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED +#define IRR_C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -26,49 +26,49 @@ public: bool affectY = true, bool affectZ = true ); //! Affects a particle. - virtual void affect(u32 now, SParticle* particlearray, u32 count) _IRR_OVERRIDE_; + virtual void affect(u32 now, SParticle* particlearray, u32 count) IRR_OVERRIDE; //! Set the point that particles will attract to - virtual void setPoint( const core::vector3df& point ) _IRR_OVERRIDE_ { Point = point; } + virtual void setPoint( const core::vector3df& point ) IRR_OVERRIDE { Point = point; } //! Set the speed, in game units per second that the particles will attract to the specified point - virtual void setSpeed( f32 speed ) _IRR_OVERRIDE_ { Speed = speed; } + virtual void setSpeed( f32 speed ) IRR_OVERRIDE { Speed = speed; } //! Set whether or not the particles are attracting or detracting - virtual void setAttract( bool attract ) _IRR_OVERRIDE_ { Attract = attract; } + virtual void setAttract( bool attract ) IRR_OVERRIDE { Attract = attract; } //! Set whether or not this will affect particles in the X direction - virtual void setAffectX( bool affect ) _IRR_OVERRIDE_ { AffectX = affect; } + virtual void setAffectX( bool affect ) IRR_OVERRIDE { AffectX = affect; } //! Set whether or not this will affect particles in the Y direction - virtual void setAffectY( bool affect ) _IRR_OVERRIDE_ { AffectY = affect; } + virtual void setAffectY( bool affect ) IRR_OVERRIDE { AffectY = affect; } //! Set whether or not this will affect particles in the Z direction - virtual void setAffectZ( bool affect ) _IRR_OVERRIDE_ { AffectZ = affect; } + virtual void setAffectZ( bool affect ) IRR_OVERRIDE { AffectZ = affect; } //! Get the point that particles are attracted to - virtual const core::vector3df& getPoint() const _IRR_OVERRIDE_ { return Point; } + virtual const core::vector3df& getPoint() const IRR_OVERRIDE { return Point; } //! Get the speed that points attract to the specified point - virtual f32 getSpeed() const _IRR_OVERRIDE_ { return Speed; } + virtual f32 getSpeed() const IRR_OVERRIDE { return Speed; } //! Get whether or not the particles are attracting or detracting - virtual bool getAttract() const _IRR_OVERRIDE_ { return Attract; } + virtual bool getAttract() const IRR_OVERRIDE { return Attract; } //! Get whether or not the particles X position are affected - virtual bool getAffectX() const _IRR_OVERRIDE_ { return AffectX; } + virtual bool getAffectX() const IRR_OVERRIDE { return AffectX; } //! Get whether or not the particles Y position are affected - virtual bool getAffectY() const _IRR_OVERRIDE_ { return AffectY; } + virtual bool getAffectY() const IRR_OVERRIDE { return AffectY; } //! Get whether or not the particles Z position are affected - virtual bool getAffectZ() const _IRR_OVERRIDE_ { return AffectZ; } + virtual bool getAffectZ() const IRR_OVERRIDE { return AffectZ; } //! Writes attributes of the object. - 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 object. - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: @@ -86,5 +86,4 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ -#endif // __C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__ - +#endif // IRR_C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED diff --git a/source/Irrlicht/CParticleBoxEmitter.h b/source/Irrlicht/CParticleBoxEmitter.h index 21d8dd3e..4f970019 100644 --- a/source/Irrlicht/CParticleBoxEmitter.h +++ b/source/Irrlicht/CParticleBoxEmitter.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_PARTICLE_BOX_EMITTER_H_INCLUDED__ -#define __C_PARTICLE_BOX_EMITTER_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_BOX_EMITTER_H_INCLUDED +#define IRR_C_PARTICLE_BOX_EMITTER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -39,79 +39,79 @@ public: //! Prepares an array with new particles to emitt into the system //! and returns how much new particles there are. - virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) _IRR_OVERRIDE_; + virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) IRR_OVERRIDE; //! Set direction the emitter emits particles. - virtual void setDirection( const core::vector3df& newDirection ) _IRR_OVERRIDE_ { Direction = newDirection; } + virtual void setDirection( const core::vector3df& newDirection ) IRR_OVERRIDE { Direction = newDirection; } //! Set minimum number of particles emitted per second. - virtual void setMinParticlesPerSecond( u32 minPPS ) _IRR_OVERRIDE_ { MinParticlesPerSecond = minPPS; } + virtual void setMinParticlesPerSecond( u32 minPPS ) IRR_OVERRIDE { MinParticlesPerSecond = minPPS; } //! Set maximum number of particles emitted per second. - virtual void setMaxParticlesPerSecond( u32 maxPPS ) _IRR_OVERRIDE_ { MaxParticlesPerSecond = maxPPS; } + virtual void setMaxParticlesPerSecond( u32 maxPPS ) IRR_OVERRIDE { MaxParticlesPerSecond = maxPPS; } //! Set minimum start color. - virtual void setMinStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MinStartColor = color; } + virtual void setMinStartColor( const video::SColor& color ) IRR_OVERRIDE { MinStartColor = color; } //! Set maximum start color. - virtual void setMaxStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MaxStartColor = color; } + virtual void setMaxStartColor( const video::SColor& color ) IRR_OVERRIDE { MaxStartColor = color; } //! Set the maximum starting size for particles - virtual void setMaxStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MaxStartSize = size; } + virtual void setMaxStartSize( const core::dimension2df& size ) IRR_OVERRIDE { MaxStartSize = size; } //! Set the minimum starting size for particles - virtual void setMinStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MinStartSize = size; } + virtual void setMinStartSize( const core::dimension2df& size ) IRR_OVERRIDE { MinStartSize = size; } //! Set the minimum particle life-time in milliseconds - virtual void setMinLifeTime( u32 lifeTimeMin ) _IRR_OVERRIDE_ { MinLifeTime = lifeTimeMin; } + virtual void setMinLifeTime( u32 lifeTimeMin ) IRR_OVERRIDE { MinLifeTime = lifeTimeMin; } //! Set the maximum particle life-time in milliseconds - virtual void setMaxLifeTime( u32 lifeTimeMax ) _IRR_OVERRIDE_ { MaxLifeTime = lifeTimeMax; } + virtual void setMaxLifeTime( u32 lifeTimeMax ) IRR_OVERRIDE { MaxLifeTime = lifeTimeMax; } //! Maximal random derivation from the direction - virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) _IRR_OVERRIDE_ { MaxAngleDegrees = maxAngleDegrees; } + virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) IRR_OVERRIDE { MaxAngleDegrees = maxAngleDegrees; } //! Set box from which the particles are emitted. - virtual void setBox( const core::aabbox3df& box ) _IRR_OVERRIDE_ { Box = box; } + virtual void setBox( const core::aabbox3df& box ) IRR_OVERRIDE { Box = box; } //! Gets direction the emitter emits particles. - virtual const core::vector3df& getDirection() const _IRR_OVERRIDE_ { return Direction; } + virtual const core::vector3df& getDirection() const IRR_OVERRIDE { return Direction; } //! Gets minimum number of particles emitted per second. - virtual u32 getMinParticlesPerSecond() const _IRR_OVERRIDE_ { return MinParticlesPerSecond; } + virtual u32 getMinParticlesPerSecond() const IRR_OVERRIDE { return MinParticlesPerSecond; } //! Gets maximum number of particles emitted per second. - virtual u32 getMaxParticlesPerSecond() const _IRR_OVERRIDE_ { return MaxParticlesPerSecond; } + virtual u32 getMaxParticlesPerSecond() const IRR_OVERRIDE { return MaxParticlesPerSecond; } //! Gets minimum start color. - virtual const video::SColor& getMinStartColor() const _IRR_OVERRIDE_ { return MinStartColor; } + virtual const video::SColor& getMinStartColor() const IRR_OVERRIDE { return MinStartColor; } //! Gets maximum start color. - virtual const video::SColor& getMaxStartColor() const _IRR_OVERRIDE_ { return MaxStartColor; } + virtual const video::SColor& getMaxStartColor() const IRR_OVERRIDE { return MaxStartColor; } //! Gets the maximum starting size for particles - virtual const core::dimension2df& getMaxStartSize() const _IRR_OVERRIDE_ { return MaxStartSize; } + virtual const core::dimension2df& getMaxStartSize() const IRR_OVERRIDE { return MaxStartSize; } //! Gets the minimum starting size for particles - virtual const core::dimension2df& getMinStartSize() const _IRR_OVERRIDE_ { return MinStartSize; } + virtual const core::dimension2df& getMinStartSize() const IRR_OVERRIDE { return MinStartSize; } //! Get the minimum particle life-time in milliseconds - virtual u32 getMinLifeTime() const _IRR_OVERRIDE_ { return MinLifeTime; } + virtual u32 getMinLifeTime() const IRR_OVERRIDE { return MinLifeTime; } //! Get the maximum particle life-time in milliseconds - virtual u32 getMaxLifeTime() const _IRR_OVERRIDE_ { return MaxLifeTime; } + virtual u32 getMaxLifeTime() const IRR_OVERRIDE { return MaxLifeTime; } //! Maximal random derivation from the direction - virtual s32 getMaxAngleDegrees() const _IRR_OVERRIDE_ { return MaxAngleDegrees; } + virtual s32 getMaxAngleDegrees() const IRR_OVERRIDE { return MaxAngleDegrees; } //! Get box from which the particles are emitted. - virtual const core::aabbox3df& getBox() const _IRR_OVERRIDE_ { return Box; } + virtual const core::aabbox3df& getBox() const IRR_OVERRIDE { return Box; } //! Writes attributes of the object. - 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 object. - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: @@ -133,4 +133,3 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ #endif - diff --git a/source/Irrlicht/CParticleCylinderEmitter.h b/source/Irrlicht/CParticleCylinderEmitter.h index c49c939a..4e94e8d2 100644 --- a/source/Irrlicht/CParticleCylinderEmitter.h +++ b/source/Irrlicht/CParticleCylinderEmitter.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_PARTICLE_CYLINDER_EMITTER_H_INCLUDED__ -#define __C_PARTICLE_CYLINDER_EMITTER_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_CYLINDER_EMITTER_H_INCLUDED +#define IRR_C_PARTICLE_CYLINDER_EMITTER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -39,103 +39,103 @@ public: //! Prepares an array with new particles to emitt into the system //! and returns how much new particles there are. - virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) _IRR_OVERRIDE_; + virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) IRR_OVERRIDE; //! Set the center of the radius for the cylinder, at one end of the cylinder - virtual void setCenter( const core::vector3df& center ) _IRR_OVERRIDE_ { Center = center; } + virtual void setCenter( const core::vector3df& center ) IRR_OVERRIDE { Center = center; } //! Set the normal of the cylinder - virtual void setNormal( const core::vector3df& normal ) _IRR_OVERRIDE_ { Normal = normal; } + virtual void setNormal( const core::vector3df& normal ) IRR_OVERRIDE { Normal = normal; } //! Set the radius of the cylinder - virtual void setRadius( f32 radius ) _IRR_OVERRIDE_ { Radius = radius; } + virtual void setRadius( f32 radius ) IRR_OVERRIDE { Radius = radius; } //! Set the length of the cylinder - virtual void setLength( f32 length ) _IRR_OVERRIDE_ { Length = length; } + virtual void setLength( f32 length ) IRR_OVERRIDE { Length = length; } //! Set whether or not to draw points inside the cylinder - virtual void setOutlineOnly( bool outlineOnly ) _IRR_OVERRIDE_ { OutlineOnly = outlineOnly; } + virtual void setOutlineOnly( bool outlineOnly ) IRR_OVERRIDE { OutlineOnly = outlineOnly; } //! Set direction the emitter emits particles - virtual void setDirection( const core::vector3df& newDirection ) _IRR_OVERRIDE_ { Direction = newDirection; } + virtual void setDirection( const core::vector3df& newDirection ) IRR_OVERRIDE { Direction = newDirection; } //! Set direction the emitter emits particles - virtual void setMinParticlesPerSecond( u32 minPPS ) _IRR_OVERRIDE_ { MinParticlesPerSecond = minPPS; } + virtual void setMinParticlesPerSecond( u32 minPPS ) IRR_OVERRIDE { MinParticlesPerSecond = minPPS; } //! Set direction the emitter emits particles - virtual void setMaxParticlesPerSecond( u32 maxPPS ) _IRR_OVERRIDE_ { MaxParticlesPerSecond = maxPPS; } + virtual void setMaxParticlesPerSecond( u32 maxPPS ) IRR_OVERRIDE { MaxParticlesPerSecond = maxPPS; } //! Set direction the emitter emits particles - virtual void setMinStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MinStartColor = color; } + virtual void setMinStartColor( const video::SColor& color ) IRR_OVERRIDE { MinStartColor = color; } //! Set direction the emitter emits particles - virtual void setMaxStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MaxStartColor = color; } + virtual void setMaxStartColor( const video::SColor& color ) IRR_OVERRIDE { MaxStartColor = color; } //! Set the maximum starting size for particles - virtual void setMaxStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MaxStartSize = size; } + virtual void setMaxStartSize( const core::dimension2df& size ) IRR_OVERRIDE { MaxStartSize = size; } //! Set the minimum starting size for particles - virtual void setMinStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MinStartSize = size; } + virtual void setMinStartSize( const core::dimension2df& size ) IRR_OVERRIDE { MinStartSize = size; } //! Set the minimum particle life-time in milliseconds - virtual void setMinLifeTime( u32 lifeTimeMin ) _IRR_OVERRIDE_ { MinLifeTime = lifeTimeMin; } + virtual void setMinLifeTime( u32 lifeTimeMin ) IRR_OVERRIDE { MinLifeTime = lifeTimeMin; } //! Set the maximum particle life-time in milliseconds - virtual void setMaxLifeTime( u32 lifeTimeMax ) _IRR_OVERRIDE_ { MaxLifeTime = lifeTimeMax; } + virtual void setMaxLifeTime( u32 lifeTimeMax ) IRR_OVERRIDE { MaxLifeTime = lifeTimeMax; } //! Maximal random derivation from the direction - virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) _IRR_OVERRIDE_ { MaxAngleDegrees = maxAngleDegrees; } + virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) IRR_OVERRIDE { MaxAngleDegrees = maxAngleDegrees; } //! Get the center of the cylinder - virtual const core::vector3df& getCenter() const _IRR_OVERRIDE_ { return Center; } + virtual const core::vector3df& getCenter() const IRR_OVERRIDE { return Center; } //! Get the normal of the cylinder - virtual const core::vector3df& getNormal() const _IRR_OVERRIDE_ { return Normal; } + virtual const core::vector3df& getNormal() const IRR_OVERRIDE { return Normal; } //! Get the radius of the cylinder - virtual f32 getRadius() const _IRR_OVERRIDE_ { return Radius; } + virtual f32 getRadius() const IRR_OVERRIDE { return Radius; } //! Get the center of the cylinder - virtual f32 getLength() const _IRR_OVERRIDE_ { return Length; } + virtual f32 getLength() const IRR_OVERRIDE { return Length; } //! Get whether or not to draw points inside the cylinder - virtual bool getOutlineOnly() const _IRR_OVERRIDE_ { return OutlineOnly; } + virtual bool getOutlineOnly() const IRR_OVERRIDE { return OutlineOnly; } //! Gets direction the emitter emits particles - virtual const core::vector3df& getDirection() const _IRR_OVERRIDE_ { return Direction; } + virtual const core::vector3df& getDirection() const IRR_OVERRIDE { return Direction; } //! Gets direction the emitter emits particles - virtual u32 getMinParticlesPerSecond() const _IRR_OVERRIDE_ { return MinParticlesPerSecond; } + virtual u32 getMinParticlesPerSecond() const IRR_OVERRIDE { return MinParticlesPerSecond; } //! Gets direction the emitter emits particles - virtual u32 getMaxParticlesPerSecond() const _IRR_OVERRIDE_ { return MaxParticlesPerSecond; } + virtual u32 getMaxParticlesPerSecond() const IRR_OVERRIDE { return MaxParticlesPerSecond; } //! Gets direction the emitter emits particles - virtual const video::SColor& getMinStartColor() const _IRR_OVERRIDE_ { return MinStartColor; } + virtual const video::SColor& getMinStartColor() const IRR_OVERRIDE { return MinStartColor; } //! Gets direction the emitter emits particles - virtual const video::SColor& getMaxStartColor() const _IRR_OVERRIDE_ { return MaxStartColor; } + virtual const video::SColor& getMaxStartColor() const IRR_OVERRIDE { return MaxStartColor; } //! Gets the maximum starting size for particles - virtual const core::dimension2df& getMaxStartSize() const _IRR_OVERRIDE_ { return MaxStartSize; } + virtual const core::dimension2df& getMaxStartSize() const IRR_OVERRIDE { return MaxStartSize; } //! Gets the minimum starting size for particles - virtual const core::dimension2df& getMinStartSize() const _IRR_OVERRIDE_ { return MinStartSize; } + virtual const core::dimension2df& getMinStartSize() const IRR_OVERRIDE { return MinStartSize; } //! Get the minimum particle life-time in milliseconds - virtual u32 getMinLifeTime() const _IRR_OVERRIDE_ { return MinLifeTime; } + virtual u32 getMinLifeTime() const IRR_OVERRIDE { return MinLifeTime; } //! Get the maximum particle life-time in milliseconds - virtual u32 getMaxLifeTime() const _IRR_OVERRIDE_ { return MaxLifeTime; } + virtual u32 getMaxLifeTime() const IRR_OVERRIDE { return MaxLifeTime; } //! Maximal random derivation from the direction - virtual s32 getMaxAngleDegrees() const _IRR_OVERRIDE_ { return MaxAngleDegrees; } + virtual s32 getMaxAngleDegrees() const IRR_OVERRIDE { return MaxAngleDegrees; } //! Writes attributes of the object. - 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 object. - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: @@ -164,4 +164,3 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ #endif - diff --git a/source/Irrlicht/CParticleFadeOutAffector.h b/source/Irrlicht/CParticleFadeOutAffector.h index f0bbf057..3143bc40 100644 --- a/source/Irrlicht/CParticleFadeOutAffector.h +++ b/source/Irrlicht/CParticleFadeOutAffector.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED__ -#define __C_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED +#define IRR_C_PARTICLE_FADE_OUT_AFFECTOR_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -24,33 +24,33 @@ public: CParticleFadeOutAffector(const video::SColor& targetColor, u32 fadeOutTime); //! Affects a particle. - virtual void affect(u32 now, SParticle* particlearray, u32 count) _IRR_OVERRIDE_; + virtual void affect(u32 now, SParticle* particlearray, u32 count) IRR_OVERRIDE; //! Sets the targetColor, i.e. the color the particles will interpolate //! to over time. - virtual void setTargetColor( const video::SColor& targetColor ) _IRR_OVERRIDE_ { TargetColor = targetColor; } + virtual void setTargetColor( const video::SColor& targetColor ) IRR_OVERRIDE { TargetColor = targetColor; } //! Sets the amount of time it takes for each particle to fade out. - virtual void setFadeOutTime( u32 fadeOutTime ) _IRR_OVERRIDE_ { FadeOutTime = fadeOutTime ? static_cast(fadeOutTime) : 1.0f; } + virtual void setFadeOutTime( u32 fadeOutTime ) IRR_OVERRIDE { FadeOutTime = fadeOutTime ? static_cast(fadeOutTime) : 1.0f; } //! Sets the targetColor, i.e. the color the particles will interpolate //! to over time. - virtual const video::SColor& getTargetColor() const _IRR_OVERRIDE_ { return TargetColor; } + virtual const video::SColor& getTargetColor() const IRR_OVERRIDE { return TargetColor; } //! Sets the amount of time it takes for each particle to fade out. - virtual u32 getFadeOutTime() const _IRR_OVERRIDE_ { return static_cast(FadeOutTime); } + virtual u32 getFadeOutTime() const IRR_OVERRIDE { return static_cast(FadeOutTime); } //! Writes attributes of the object. //! Implement this to expose the attributes of your scene node animator for //! scripting languages, editors, debuggers or xml serialization purposes. - 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 object. //! Implement this to set the attributes of your scene node animator for //! scripting languages, editors, debuggers or xml deserialization purposes. //! \param startIndex: start index where to start reading attributes. //! \return: returns last index of an attribute read by this affector - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: @@ -65,4 +65,3 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ #endif - diff --git a/source/Irrlicht/CParticleGravityAffector.h b/source/Irrlicht/CParticleGravityAffector.h index 1c926fc2..d3bd6196 100644 --- a/source/Irrlicht/CParticleGravityAffector.h +++ b/source/Irrlicht/CParticleGravityAffector.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED__ -#define __C_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED +#define IRR_C_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -26,33 +26,33 @@ public: u32 timeForceLost = 1000); //! Affects a particle. - virtual void affect(u32 now, SParticle* particlearray, u32 count) _IRR_OVERRIDE_; + virtual void affect(u32 now, SParticle* particlearray, u32 count) IRR_OVERRIDE; //! Set the time in milliseconds when the gravity force is totally //! lost and the particle does not move any more. - virtual void setTimeForceLost( f32 timeForceLost ) _IRR_OVERRIDE_ { TimeForceLost = timeForceLost; } + virtual void setTimeForceLost( f32 timeForceLost ) IRR_OVERRIDE { TimeForceLost = timeForceLost; } //! Set the direction and force of gravity. - virtual void setGravity( const core::vector3df& gravity ) _IRR_OVERRIDE_ { Gravity = gravity; } + virtual void setGravity( const core::vector3df& gravity ) IRR_OVERRIDE { Gravity = gravity; } //! Set the time in milliseconds when the gravity force is totally //! lost and the particle does not move any more. - virtual f32 getTimeForceLost() const _IRR_OVERRIDE_ { return TimeForceLost; } + virtual f32 getTimeForceLost() const IRR_OVERRIDE { return TimeForceLost; } //! Set the direction and force of gravity. - virtual const core::vector3df& getGravity() const _IRR_OVERRIDE_ { return Gravity; } + virtual const core::vector3df& getGravity() const IRR_OVERRIDE { return Gravity; } //! Writes attributes of the object. //! Implement this to expose the attributes of your scene node animator for //! scripting languages, editors, debuggers or xml serialization purposes. - 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 object. //! Implement this to set the attributes of your scene node animator for //! scripting languages, editors, debuggers or xml deserialization purposes. //! \param startIndex: start index where to start reading attributes. //! \return: returns last index of an attribute read by this affector - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: f32 TimeForceLost; @@ -65,4 +65,3 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ #endif - diff --git a/source/Irrlicht/CParticleMeshEmitter.h b/source/Irrlicht/CParticleMeshEmitter.h index 08a076c1..2863c939 100644 --- a/source/Irrlicht/CParticleMeshEmitter.h +++ b/source/Irrlicht/CParticleMeshEmitter.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_PARTICLE_MESH_EMITTER_H_INCLUDED__ -#define __C_PARTICLE_MESH_EMITTER_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_MESH_EMITTER_H_INCLUDED +#define IRR_C_PARTICLE_MESH_EMITTER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -43,93 +43,93 @@ public: //! Prepares an array with new particles to emitt into the system //! and returns how much new particles there are. - virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) _IRR_OVERRIDE_; + virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) IRR_OVERRIDE; //! Set Mesh to emit particles from - virtual void setMesh( IMesh* mesh ) _IRR_OVERRIDE_; + virtual void setMesh( IMesh* mesh ) IRR_OVERRIDE; //! Set whether to use vertex normal for direction, or direction specified - virtual void setUseNormalDirection( bool useNormalDirection ) _IRR_OVERRIDE_ { UseNormalDirection = useNormalDirection; } + virtual void setUseNormalDirection( bool useNormalDirection ) IRR_OVERRIDE { UseNormalDirection = useNormalDirection; } //! Set direction the emitter emits particles - virtual void setDirection( const core::vector3df& newDirection ) _IRR_OVERRIDE_ { Direction = newDirection; } + virtual void setDirection( const core::vector3df& newDirection ) IRR_OVERRIDE { Direction = newDirection; } //! Set the amount that the normal is divided by for getting a particles direction - virtual void setNormalDirectionModifier( f32 normalDirectionModifier ) _IRR_OVERRIDE_ { NormalDirectionModifier = normalDirectionModifier; } + virtual void setNormalDirectionModifier( f32 normalDirectionModifier ) IRR_OVERRIDE { NormalDirectionModifier = normalDirectionModifier; } //! Sets whether to emit min<->max particles for every vertex per second, or to pick //! min<->max vertices every second - virtual void setEveryMeshVertex( bool everyMeshVertex ) _IRR_OVERRIDE_ { EveryMeshVertex = everyMeshVertex; } + virtual void setEveryMeshVertex( bool everyMeshVertex ) IRR_OVERRIDE { EveryMeshVertex = everyMeshVertex; } //! Set minimum number of particles the emitter emits per second - virtual void setMinParticlesPerSecond( u32 minPPS ) _IRR_OVERRIDE_ { MinParticlesPerSecond = minPPS; } + virtual void setMinParticlesPerSecond( u32 minPPS ) IRR_OVERRIDE { MinParticlesPerSecond = minPPS; } //! Set maximum number of particles the emitter emits per second - virtual void setMaxParticlesPerSecond( u32 maxPPS ) _IRR_OVERRIDE_ { MaxParticlesPerSecond = maxPPS; } + virtual void setMaxParticlesPerSecond( u32 maxPPS ) IRR_OVERRIDE { MaxParticlesPerSecond = maxPPS; } //! Set minimum starting color for particles - virtual void setMinStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MinStartColor = color; } + virtual void setMinStartColor( const video::SColor& color ) IRR_OVERRIDE { MinStartColor = color; } //! Set maximum starting color for particles - virtual void setMaxStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MaxStartColor = color; } + virtual void setMaxStartColor( const video::SColor& color ) IRR_OVERRIDE { MaxStartColor = color; } //! Set the maximum starting size for particles - virtual void setMaxStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MaxStartSize = size; } + virtual void setMaxStartSize( const core::dimension2df& size ) IRR_OVERRIDE { MaxStartSize = size; } //! Set the minimum starting size for particles - virtual void setMinStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MinStartSize = size; } + virtual void setMinStartSize( const core::dimension2df& size ) IRR_OVERRIDE { MinStartSize = size; } //! Set the minimum particle life-time in milliseconds - virtual void setMinLifeTime( u32 lifeTimeMin ) _IRR_OVERRIDE_ { MinLifeTime = lifeTimeMin; } + virtual void setMinLifeTime( u32 lifeTimeMin ) IRR_OVERRIDE { MinLifeTime = lifeTimeMin; } //! Set the maximum particle life-time in milliseconds - virtual void setMaxLifeTime( u32 lifeTimeMax ) _IRR_OVERRIDE_ { MaxLifeTime = lifeTimeMax; } + virtual void setMaxLifeTime( u32 lifeTimeMax ) IRR_OVERRIDE { MaxLifeTime = lifeTimeMax; } //! Set maximal random derivation from the direction - virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) _IRR_OVERRIDE_ { MaxAngleDegrees = maxAngleDegrees; } + virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) IRR_OVERRIDE { MaxAngleDegrees = maxAngleDegrees; } //! Get Mesh we're emitting particles from - virtual const IMesh* getMesh() const _IRR_OVERRIDE_ { return Mesh; } + virtual const IMesh* getMesh() const IRR_OVERRIDE { return Mesh; } //! Get whether to use vertex normal for direciton, or direction specified - virtual bool isUsingNormalDirection() const _IRR_OVERRIDE_ { return UseNormalDirection; } + virtual bool isUsingNormalDirection() const IRR_OVERRIDE { return UseNormalDirection; } //! Get direction the emitter emits particles - virtual const core::vector3df& getDirection() const _IRR_OVERRIDE_ { return Direction; } + virtual const core::vector3df& getDirection() const IRR_OVERRIDE { return Direction; } //! Get the amount that the normal is divided by for getting a particles direction - virtual f32 getNormalDirectionModifier() const _IRR_OVERRIDE_ { return NormalDirectionModifier; } + virtual f32 getNormalDirectionModifier() const IRR_OVERRIDE { return NormalDirectionModifier; } //! Gets whether to emit min<->max particles for every vertex per second, or to pick //! min<->max vertices every second - virtual bool getEveryMeshVertex() const _IRR_OVERRIDE_ { return EveryMeshVertex; } + virtual bool getEveryMeshVertex() const IRR_OVERRIDE { return EveryMeshVertex; } //! Get the minimum number of particles the emitter emits per second - virtual u32 getMinParticlesPerSecond() const _IRR_OVERRIDE_ { return MinParticlesPerSecond; } + virtual u32 getMinParticlesPerSecond() const IRR_OVERRIDE { return MinParticlesPerSecond; } //! Get the maximum number of particles the emitter emits per second - virtual u32 getMaxParticlesPerSecond() const _IRR_OVERRIDE_ { return MaxParticlesPerSecond; } + virtual u32 getMaxParticlesPerSecond() const IRR_OVERRIDE { return MaxParticlesPerSecond; } //! Get the minimum starting color for particles - virtual const video::SColor& getMinStartColor() const _IRR_OVERRIDE_ { return MinStartColor; } + virtual const video::SColor& getMinStartColor() const IRR_OVERRIDE { return MinStartColor; } //! Get the maximum starting color for particles - virtual const video::SColor& getMaxStartColor() const _IRR_OVERRIDE_ { return MaxStartColor; } + virtual const video::SColor& getMaxStartColor() const IRR_OVERRIDE { return MaxStartColor; } //! Gets the maximum starting size for particles - virtual const core::dimension2df& getMaxStartSize() const _IRR_OVERRIDE_ { return MaxStartSize; } + virtual const core::dimension2df& getMaxStartSize() const IRR_OVERRIDE { return MaxStartSize; } //! Gets the minimum starting size for particles - virtual const core::dimension2df& getMinStartSize() const _IRR_OVERRIDE_ { return MinStartSize; } + virtual const core::dimension2df& getMinStartSize() const IRR_OVERRIDE { return MinStartSize; } //! Get the minimum particle life-time in milliseconds - virtual u32 getMinLifeTime() const _IRR_OVERRIDE_ { return MinLifeTime; } + virtual u32 getMinLifeTime() const IRR_OVERRIDE { return MinLifeTime; } //! Get the maximum particle life-time in milliseconds - virtual u32 getMaxLifeTime() const _IRR_OVERRIDE_ { return MaxLifeTime; } + virtual u32 getMaxLifeTime() const IRR_OVERRIDE { return MaxLifeTime; } //! Get maximal random derivation from the direction - virtual s32 getMaxAngleDegrees() const _IRR_OVERRIDE_ { return MaxAngleDegrees; } + virtual s32 getMaxAngleDegrees() const IRR_OVERRIDE { return MaxAngleDegrees; } private: @@ -159,5 +159,4 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ -#endif // __C_PARTICLE_MESH_EMITTER_H_INCLUDED__ - +#endif // IRR_C_PARTICLE_MESH_EMITTER_H_INCLUDED diff --git a/source/Irrlicht/CParticlePointEmitter.h b/source/Irrlicht/CParticlePointEmitter.h index 985bb490..c88645d2 100644 --- a/source/Irrlicht/CParticlePointEmitter.h +++ b/source/Irrlicht/CParticlePointEmitter.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_PARTICLE_POINT_EMITTER_H_INCLUDED__ -#define __C_PARTICLE_POINT_EMITTER_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_POINT_EMITTER_H_INCLUDED +#define IRR_C_PARTICLE_POINT_EMITTER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -36,73 +36,73 @@ public: //! Prepares an array with new particles to emitt into the system //! and returns how much new particles there are. - virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) _IRR_OVERRIDE_; + virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) IRR_OVERRIDE; //! Set direction the emitter emits particles. - virtual void setDirection( const core::vector3df& newDirection ) _IRR_OVERRIDE_ { Direction = newDirection; } + virtual void setDirection( const core::vector3df& newDirection ) IRR_OVERRIDE { Direction = newDirection; } //! Set minimum number of particles emitted per second. - virtual void setMinParticlesPerSecond( u32 minPPS ) _IRR_OVERRIDE_ { MinParticlesPerSecond = minPPS; } + virtual void setMinParticlesPerSecond( u32 minPPS ) IRR_OVERRIDE { MinParticlesPerSecond = minPPS; } //! Set maximum number of particles emitted per second. - virtual void setMaxParticlesPerSecond( u32 maxPPS ) _IRR_OVERRIDE_ { MaxParticlesPerSecond = maxPPS; } + virtual void setMaxParticlesPerSecond( u32 maxPPS ) IRR_OVERRIDE { MaxParticlesPerSecond = maxPPS; } //! Set minimum start color. - virtual void setMinStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MinStartColor = color; } + virtual void setMinStartColor( const video::SColor& color ) IRR_OVERRIDE { MinStartColor = color; } //! Set maximum start color. - virtual void setMaxStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MaxStartColor = color; } + virtual void setMaxStartColor( const video::SColor& color ) IRR_OVERRIDE { MaxStartColor = color; } //! Set the maximum starting size for particles - virtual void setMaxStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MaxStartSize = size; } + virtual void setMaxStartSize( const core::dimension2df& size ) IRR_OVERRIDE { MaxStartSize = size; } //! Set the minimum starting size for particles - virtual void setMinStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MinStartSize = size; } + virtual void setMinStartSize( const core::dimension2df& size ) IRR_OVERRIDE { MinStartSize = size; } //! Set the minimum particle life-time in milliseconds - virtual void setMinLifeTime( u32 lifeTimeMin ) _IRR_OVERRIDE_ { MinLifeTime = lifeTimeMin; } + virtual void setMinLifeTime( u32 lifeTimeMin ) IRR_OVERRIDE { MinLifeTime = lifeTimeMin; } //! Set the maximum particle life-time in milliseconds - virtual void setMaxLifeTime( u32 lifeTimeMax ) _IRR_OVERRIDE_ { MaxLifeTime = lifeTimeMax; } + virtual void setMaxLifeTime( u32 lifeTimeMax ) IRR_OVERRIDE { MaxLifeTime = lifeTimeMax; } //! Set maximal random derivation from the direction - virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) _IRR_OVERRIDE_ { MaxAngleDegrees = maxAngleDegrees; } + virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) IRR_OVERRIDE { MaxAngleDegrees = maxAngleDegrees; } //! Gets direction the emitter emits particles. - virtual const core::vector3df& getDirection() const _IRR_OVERRIDE_ { return Direction; } + virtual const core::vector3df& getDirection() const IRR_OVERRIDE { return Direction; } //! Gets minimum number of particles emitted per second. - virtual u32 getMinParticlesPerSecond() const _IRR_OVERRIDE_ { return MinParticlesPerSecond; } + virtual u32 getMinParticlesPerSecond() const IRR_OVERRIDE { return MinParticlesPerSecond; } //! Gets maximum number of particles emitted per second. - virtual u32 getMaxParticlesPerSecond() const _IRR_OVERRIDE_ { return MaxParticlesPerSecond; } + virtual u32 getMaxParticlesPerSecond() const IRR_OVERRIDE { return MaxParticlesPerSecond; } //! Gets minimum start color. - virtual const video::SColor& getMinStartColor() const _IRR_OVERRIDE_ { return MinStartColor; } + virtual const video::SColor& getMinStartColor() const IRR_OVERRIDE { return MinStartColor; } //! Gets maximum start color. - virtual const video::SColor& getMaxStartColor() const _IRR_OVERRIDE_ { return MaxStartColor; } + virtual const video::SColor& getMaxStartColor() const IRR_OVERRIDE { return MaxStartColor; } //! Gets the maximum starting size for particles - virtual const core::dimension2df& getMaxStartSize() const _IRR_OVERRIDE_ { return MaxStartSize; } + virtual const core::dimension2df& getMaxStartSize() const IRR_OVERRIDE { return MaxStartSize; } //! Gets the minimum starting size for particles - virtual const core::dimension2df& getMinStartSize() const _IRR_OVERRIDE_ { return MinStartSize; } + virtual const core::dimension2df& getMinStartSize() const IRR_OVERRIDE { return MinStartSize; } //! Get the minimum particle life-time in milliseconds - virtual u32 getMinLifeTime() const _IRR_OVERRIDE_ { return MinLifeTime; } + virtual u32 getMinLifeTime() const IRR_OVERRIDE { return MinLifeTime; } //! Get the maximum particle life-time in milliseconds - virtual u32 getMaxLifeTime() const _IRR_OVERRIDE_ { return MaxLifeTime; } + virtual u32 getMaxLifeTime() const IRR_OVERRIDE { return MaxLifeTime; } //! Get maximal random derivation from the direction - virtual s32 getMaxAngleDegrees() const _IRR_OVERRIDE_ { return MaxAngleDegrees; } + virtual s32 getMaxAngleDegrees() const IRR_OVERRIDE { return MaxAngleDegrees; } //! Writes attributes of the object. - 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 object. - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CParticleRingEmitter.h b/source/Irrlicht/CParticleRingEmitter.h index f36254dd..f1e62145 100644 --- a/source/Irrlicht/CParticleRingEmitter.h +++ b/source/Irrlicht/CParticleRingEmitter.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_PARTICLE_RING_EMITTER_H_INCLUDED__ -#define __C_PARTICLE_RING_EMITTER_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_RING_EMITTER_H_INCLUDED +#define IRR_C_PARTICLE_RING_EMITTER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -38,91 +38,91 @@ public: //! Prepares an array with new particles to emitt into the system //! and returns how much new particles there are. - virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) _IRR_OVERRIDE_; + virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) IRR_OVERRIDE; //! Set direction the emitter emits particles - virtual void setDirection( const core::vector3df& newDirection ) _IRR_OVERRIDE_ { Direction = newDirection; } + virtual void setDirection( const core::vector3df& newDirection ) IRR_OVERRIDE { Direction = newDirection; } //! Set minimum number of particles the emitter emits per second - virtual void setMinParticlesPerSecond( u32 minPPS ) _IRR_OVERRIDE_ { MinParticlesPerSecond = minPPS; } + virtual void setMinParticlesPerSecond( u32 minPPS ) IRR_OVERRIDE { MinParticlesPerSecond = minPPS; } //! Set maximum number of particles the emitter emits per second - virtual void setMaxParticlesPerSecond( u32 maxPPS ) _IRR_OVERRIDE_ { MaxParticlesPerSecond = maxPPS; } + virtual void setMaxParticlesPerSecond( u32 maxPPS ) IRR_OVERRIDE { MaxParticlesPerSecond = maxPPS; } //! Set minimum starting color for particles - virtual void setMinStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MinStartColor = color; } + virtual void setMinStartColor( const video::SColor& color ) IRR_OVERRIDE { MinStartColor = color; } //! Set maximum starting color for particles - virtual void setMaxStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MaxStartColor = color; } + virtual void setMaxStartColor( const video::SColor& color ) IRR_OVERRIDE { MaxStartColor = color; } //! Set the maximum starting size for particles - virtual void setMaxStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MaxStartSize = size; } + virtual void setMaxStartSize( const core::dimension2df& size ) IRR_OVERRIDE { MaxStartSize = size; } //! Set the minimum starting size for particles - virtual void setMinStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MinStartSize = size; } + virtual void setMinStartSize( const core::dimension2df& size ) IRR_OVERRIDE { MinStartSize = size; } //! Set the minimum particle life-time in milliseconds - virtual void setMinLifeTime( u32 lifeTimeMin ) _IRR_OVERRIDE_ { MinLifeTime = lifeTimeMin; } + virtual void setMinLifeTime( u32 lifeTimeMin ) IRR_OVERRIDE { MinLifeTime = lifeTimeMin; } //! Set the maximum particle life-time in milliseconds - virtual void setMaxLifeTime( u32 lifeTimeMax ) _IRR_OVERRIDE_ { MaxLifeTime = lifeTimeMax; } + virtual void setMaxLifeTime( u32 lifeTimeMax ) IRR_OVERRIDE { MaxLifeTime = lifeTimeMax; } //! Set maximal random derivation from the direction - virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) _IRR_OVERRIDE_ { MaxAngleDegrees = maxAngleDegrees; } + virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) IRR_OVERRIDE { MaxAngleDegrees = maxAngleDegrees; } //! Set the center of the ring - virtual void setCenter( const core::vector3df& center ) _IRR_OVERRIDE_ { Center = center; } + virtual void setCenter( const core::vector3df& center ) IRR_OVERRIDE { Center = center; } //! Set the radius of the ring - virtual void setRadius( f32 radius ) _IRR_OVERRIDE_ { Radius = radius; } + virtual void setRadius( f32 radius ) IRR_OVERRIDE { Radius = radius; } //! Set the thickness of the ring - virtual void setRingThickness( f32 ringThickness ) _IRR_OVERRIDE_ { RingThickness = ringThickness; } + virtual void setRingThickness( f32 ringThickness ) IRR_OVERRIDE { RingThickness = ringThickness; } //! Gets direction the emitter emits particles - virtual const core::vector3df& getDirection() const _IRR_OVERRIDE_ { return Direction; } + virtual const core::vector3df& getDirection() const IRR_OVERRIDE { return Direction; } //! Gets the minimum number of particles the emitter emits per second - virtual u32 getMinParticlesPerSecond() const _IRR_OVERRIDE_ { return MinParticlesPerSecond; } + virtual u32 getMinParticlesPerSecond() const IRR_OVERRIDE { return MinParticlesPerSecond; } //! Gets the maximum number of particles the emitter emits per second - virtual u32 getMaxParticlesPerSecond() const _IRR_OVERRIDE_ { return MaxParticlesPerSecond; } + virtual u32 getMaxParticlesPerSecond() const IRR_OVERRIDE { return MaxParticlesPerSecond; } //! Gets the minimum starting color for particles - virtual const video::SColor& getMinStartColor() const _IRR_OVERRIDE_ { return MinStartColor; } + virtual const video::SColor& getMinStartColor() const IRR_OVERRIDE { return MinStartColor; } //! Gets the maximum starting color for particles - virtual const video::SColor& getMaxStartColor() const _IRR_OVERRIDE_ { return MaxStartColor; } + virtual const video::SColor& getMaxStartColor() const IRR_OVERRIDE { return MaxStartColor; } //! Gets the maximum starting size for particles - virtual const core::dimension2df& getMaxStartSize() const _IRR_OVERRIDE_ { return MaxStartSize; } + virtual const core::dimension2df& getMaxStartSize() const IRR_OVERRIDE { return MaxStartSize; } //! Gets the minimum starting size for particles - virtual const core::dimension2df& getMinStartSize() const _IRR_OVERRIDE_ { return MinStartSize; } + virtual const core::dimension2df& getMinStartSize() const IRR_OVERRIDE { return MinStartSize; } //! Get the minimum particle life-time in milliseconds - virtual u32 getMinLifeTime() const _IRR_OVERRIDE_ { return MinLifeTime; } + virtual u32 getMinLifeTime() const IRR_OVERRIDE { return MinLifeTime; } //! Get the maximum particle life-time in milliseconds - virtual u32 getMaxLifeTime() const _IRR_OVERRIDE_ { return MaxLifeTime; } + virtual u32 getMaxLifeTime() const IRR_OVERRIDE { return MaxLifeTime; } //! Get maximal random derivation from the direction - virtual s32 getMaxAngleDegrees() const _IRR_OVERRIDE_ { return MaxAngleDegrees; } + virtual s32 getMaxAngleDegrees() const IRR_OVERRIDE { return MaxAngleDegrees; } //! Get the center of the ring - virtual const core::vector3df& getCenter() const _IRR_OVERRIDE_ { return Center; } + virtual const core::vector3df& getCenter() const IRR_OVERRIDE { return Center; } //! Get the radius of the ring - virtual f32 getRadius() const _IRR_OVERRIDE_ { return Radius; } + virtual f32 getRadius() const IRR_OVERRIDE { return Radius; } //! Get the thickness of the ring - virtual f32 getRingThickness() const _IRR_OVERRIDE_ { return RingThickness; } + virtual f32 getRingThickness() const IRR_OVERRIDE { return RingThickness; } //! Writes attributes of the object. - 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 object. - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: @@ -148,4 +148,3 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ #endif - diff --git a/source/Irrlicht/CParticleRotationAffector.h b/source/Irrlicht/CParticleRotationAffector.h index 2828b8ef..26cae503 100644 --- a/source/Irrlicht/CParticleRotationAffector.h +++ b/source/Irrlicht/CParticleRotationAffector.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED__ -#define __C_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED +#define IRR_C_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -24,25 +24,25 @@ public: const core::vector3df& point = core::vector3df() ); //! Affects a particle. - virtual void affect(u32 now, SParticle* particlearray, u32 count) _IRR_OVERRIDE_; + virtual void affect(u32 now, SParticle* particlearray, u32 count) IRR_OVERRIDE; //! Set the point that particles will attract to - virtual void setPivotPoint( const core::vector3df& point ) _IRR_OVERRIDE_ { PivotPoint = point; } + virtual void setPivotPoint( const core::vector3df& point ) IRR_OVERRIDE { PivotPoint = point; } //! Set the speed in degrees per second - virtual void setSpeed( const core::vector3df& speed ) _IRR_OVERRIDE_ { Speed = speed; } + virtual void setSpeed( const core::vector3df& speed ) IRR_OVERRIDE { Speed = speed; } //! Get the point that particles are attracted to - virtual const core::vector3df& getPivotPoint() const _IRR_OVERRIDE_ { return PivotPoint; } + virtual const core::vector3df& getPivotPoint() const IRR_OVERRIDE { return PivotPoint; } //! Get the speed in degrees per second - virtual const core::vector3df& getSpeed() const _IRR_OVERRIDE_ { return Speed; } + virtual const core::vector3df& getSpeed() const IRR_OVERRIDE { return Speed; } //! Writes attributes of the object. - 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 object. - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: @@ -56,4 +56,4 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ -#endif // __C_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED__ +#endif // IRR_C_PARTICLE_ROTATION_AFFECTOR_H_INCLUDED diff --git a/source/Irrlicht/CParticleScaleAffector.h b/source/Irrlicht/CParticleScaleAffector.h index 0f403c91..2efb84c0 100644 --- a/source/Irrlicht/CParticleScaleAffector.h +++ b/source/Irrlicht/CParticleScaleAffector.h @@ -19,22 +19,22 @@ namespace irr public: CParticleScaleAffector(const core::dimension2df& scaleTo = core::dimension2df(1.0f, 1.0f)); - virtual void affect(u32 now, SParticle *particlearray, u32 count) _IRR_OVERRIDE_; + virtual void affect(u32 now, SParticle *particlearray, u32 count) IRR_OVERRIDE; //! Writes attributes of the object. //! Implement this to expose the attributes of your scene node animator for //! scripting languages, editors, debuggers or xml serialization purposes. - 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 object. //! Implement this to set the attributes of your scene node animator for //! scripting languages, editors, debuggers or xml deserialization purposes. //! \param startIndex: start index where to start reading attributes. //! \return: returns last index of an attribute read by this affector - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; //! Get emitter type - virtual E_PARTICLE_AFFECTOR_TYPE getType() const _IRR_OVERRIDE_; + virtual E_PARTICLE_AFFECTOR_TYPE getType() const IRR_OVERRIDE; protected: core::dimension2df ScaleTo; diff --git a/source/Irrlicht/CParticleSphereEmitter.h b/source/Irrlicht/CParticleSphereEmitter.h index 1d9475bd..96060fcd 100644 --- a/source/Irrlicht/CParticleSphereEmitter.h +++ b/source/Irrlicht/CParticleSphereEmitter.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_PARTICLE_SPHERE_EMITTER_H_INCLUDED__ -#define __C_PARTICLE_SPHERE_EMITTER_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_SPHERE_EMITTER_H_INCLUDED +#define IRR_C_PARTICLE_SPHERE_EMITTER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -38,85 +38,85 @@ public: //! Prepares an array with new particles to emitt into the system //! and returns how much new particles there are. - virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) _IRR_OVERRIDE_; + virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) IRR_OVERRIDE; //! Set direction the emitter emits particles - virtual void setDirection( const core::vector3df& newDirection ) _IRR_OVERRIDE_ { Direction = newDirection; } + virtual void setDirection( const core::vector3df& newDirection ) IRR_OVERRIDE { Direction = newDirection; } //! Set minimum number of particles per second. - virtual void setMinParticlesPerSecond( u32 minPPS ) _IRR_OVERRIDE_ { MinParticlesPerSecond = minPPS; } + virtual void setMinParticlesPerSecond( u32 minPPS ) IRR_OVERRIDE { MinParticlesPerSecond = minPPS; } //! Set maximum number of particles per second. - virtual void setMaxParticlesPerSecond( u32 maxPPS ) _IRR_OVERRIDE_ { MaxParticlesPerSecond = maxPPS; } + virtual void setMaxParticlesPerSecond( u32 maxPPS ) IRR_OVERRIDE { MaxParticlesPerSecond = maxPPS; } //! Set minimum start color - virtual void setMinStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MinStartColor = color; } + virtual void setMinStartColor( const video::SColor& color ) IRR_OVERRIDE { MinStartColor = color; } //! Set maximum start color - virtual void setMaxStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MaxStartColor = color; } + virtual void setMaxStartColor( const video::SColor& color ) IRR_OVERRIDE { MaxStartColor = color; } //! Set the maximum starting size for particles - virtual void setMaxStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MaxStartSize = size; } + virtual void setMaxStartSize( const core::dimension2df& size ) IRR_OVERRIDE { MaxStartSize = size; } //! Set the minimum starting size for particles - virtual void setMinStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MinStartSize = size; } + virtual void setMinStartSize( const core::dimension2df& size ) IRR_OVERRIDE { MinStartSize = size; } //! Set the minimum particle life-time in milliseconds - virtual void setMinLifeTime( u32 lifeTimeMin ) _IRR_OVERRIDE_ { MinLifeTime = lifeTimeMin; } + virtual void setMinLifeTime( u32 lifeTimeMin ) IRR_OVERRIDE { MinLifeTime = lifeTimeMin; } //! Set the maximum particle life-time in milliseconds - virtual void setMaxLifeTime( u32 lifeTimeMax ) _IRR_OVERRIDE_ { MaxLifeTime = lifeTimeMax; } + virtual void setMaxLifeTime( u32 lifeTimeMax ) IRR_OVERRIDE { MaxLifeTime = lifeTimeMax; } //! Set maximal random derivation from the direction - virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) _IRR_OVERRIDE_ { MaxAngleDegrees = maxAngleDegrees; } + virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) IRR_OVERRIDE { MaxAngleDegrees = maxAngleDegrees; } //! Set the center of the sphere for particle emissions - virtual void setCenter( const core::vector3df& center ) _IRR_OVERRIDE_ { Center = center; } + virtual void setCenter( const core::vector3df& center ) IRR_OVERRIDE { Center = center; } //! Set the radius of the sphere for particle emissions - virtual void setRadius( f32 radius ) _IRR_OVERRIDE_ { Radius = radius; } + virtual void setRadius( f32 radius ) IRR_OVERRIDE { Radius = radius; } //! Gets direction the emitter emits particles - virtual const core::vector3df& getDirection() const _IRR_OVERRIDE_ { return Direction; } + virtual const core::vector3df& getDirection() const IRR_OVERRIDE { return Direction; } //! Get minimum number of particles per second. - virtual u32 getMinParticlesPerSecond() const _IRR_OVERRIDE_ { return MinParticlesPerSecond; } + virtual u32 getMinParticlesPerSecond() const IRR_OVERRIDE { return MinParticlesPerSecond; } //! Get maximum number of particles per second. - virtual u32 getMaxParticlesPerSecond() const _IRR_OVERRIDE_ { return MaxParticlesPerSecond; } + virtual u32 getMaxParticlesPerSecond() const IRR_OVERRIDE { return MaxParticlesPerSecond; } //! Get minimum start color - virtual const video::SColor& getMinStartColor() const _IRR_OVERRIDE_ { return MinStartColor; } + virtual const video::SColor& getMinStartColor() const IRR_OVERRIDE { return MinStartColor; } //! Get maximum start color - virtual const video::SColor& getMaxStartColor() const _IRR_OVERRIDE_ { return MaxStartColor; } + virtual const video::SColor& getMaxStartColor() const IRR_OVERRIDE { return MaxStartColor; } //! Gets the maximum starting size for particles - virtual const core::dimension2df& getMaxStartSize() const _IRR_OVERRIDE_ { return MaxStartSize; } + virtual const core::dimension2df& getMaxStartSize() const IRR_OVERRIDE { return MaxStartSize; } //! Gets the minimum starting size for particles - virtual const core::dimension2df& getMinStartSize() const _IRR_OVERRIDE_ { return MinStartSize; } + virtual const core::dimension2df& getMinStartSize() const IRR_OVERRIDE { return MinStartSize; } //! Get the minimum particle life-time in milliseconds - virtual u32 getMinLifeTime() const _IRR_OVERRIDE_ { return MinLifeTime; } + virtual u32 getMinLifeTime() const IRR_OVERRIDE { return MinLifeTime; } //! Get the maximum particle life-time in milliseconds - virtual u32 getMaxLifeTime() const _IRR_OVERRIDE_ { return MaxLifeTime; } + virtual u32 getMaxLifeTime() const IRR_OVERRIDE { return MaxLifeTime; } //! Get maximal random derivation from the direction - virtual s32 getMaxAngleDegrees() const _IRR_OVERRIDE_ { return MaxAngleDegrees; } + virtual s32 getMaxAngleDegrees() const IRR_OVERRIDE { return MaxAngleDegrees; } //! Get the center of the sphere for particle emissions - virtual const core::vector3df& getCenter() const _IRR_OVERRIDE_ { return Center; } + virtual const core::vector3df& getCenter() const IRR_OVERRIDE { return Center; } //! Get the radius of the sphere for particle emissions - virtual f32 getRadius() const _IRR_OVERRIDE_ { return Radius; } + virtual f32 getRadius() const IRR_OVERRIDE { return Radius; } //! Writes attributes of the object. - 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 object. - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: @@ -141,4 +141,3 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ #endif - diff --git a/source/Irrlicht/CParticleSystemSceneNode.h b/source/Irrlicht/CParticleSystemSceneNode.h index 779f7141..1510549d 100644 --- a/source/Irrlicht/CParticleSystemSceneNode.h +++ b/source/Irrlicht/CParticleSystemSceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_PARTICLE_SYSTEM_SCENE_NODE_H_INCLUDED__ -#define __C_PARTICLE_SYSTEM_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_PARTICLE_SYSTEM_SCENE_NODE_H_INCLUDED +#define IRR_C_PARTICLE_SYSTEM_SCENE_NODE_H_INCLUDED #include "IrrCompileConfig.h" #ifdef _IRR_COMPILE_WITH_PARTICLES_ @@ -37,34 +37,34 @@ public: virtual ~CParticleSystemSceneNode(); //! Gets the particle emitter, which creates the particles. - virtual IParticleEmitter* getEmitter() _IRR_OVERRIDE_; + virtual IParticleEmitter* getEmitter() IRR_OVERRIDE; //! Sets the particle emitter, which creates the particles. - virtual void setEmitter(IParticleEmitter* emitter) _IRR_OVERRIDE_; + virtual void setEmitter(IParticleEmitter* emitter) IRR_OVERRIDE; //! Adds new particle affector to the particle system. - virtual void addAffector(IParticleAffector* affector) _IRR_OVERRIDE_; + virtual void addAffector(IParticleAffector* affector) IRR_OVERRIDE; //! Get a list of all particle affectors. - virtual const core::list& getAffectors() const _IRR_OVERRIDE_; + virtual const core::list& getAffectors() const IRR_OVERRIDE; //! Removes all particle affectors in the particle system. - virtual void removeAllAffectors() _IRR_OVERRIDE_; + virtual void removeAllAffectors() IRR_OVERRIDE; //! Returns the material based on the zero based index i. - 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. - virtual u32 getMaterialCount() const _IRR_OVERRIDE_; + virtual u32 getMaterialCount() const IRR_OVERRIDE; //! pre render event - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; //! render - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! Creates a particle emitter for an animated mesh scene node virtual IParticleAnimatedMeshSceneNodeEmitter* createAnimatedMeshSceneNodeEmitter( @@ -78,7 +78,7 @@ public: u32 lifeTimeMin = 2000, u32 lifeTimeMax = 4000, s32 maxAngleDegrees = 0, const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f), - const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) _IRR_OVERRIDE_; + const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) IRR_OVERRIDE; //! Creates a box particle emitter. virtual IParticleBoxEmitter* createBoxEmitter( @@ -91,7 +91,7 @@ public: u32 lifeTimeMin=2000, u32 lifeTimeMax=4000, s32 maxAngleDegrees=0, const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f), - const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) _IRR_OVERRIDE_; + const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) IRR_OVERRIDE; //! Creates a particle emitter for emitting from a cylinder virtual IParticleCylinderEmitter* createCylinderEmitter( @@ -104,7 +104,7 @@ public: u32 lifeTimeMin = 2000, u32 lifeTimeMax = 4000, s32 maxAngleDegrees = 0, const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f), - const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) _IRR_OVERRIDE_; + const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) IRR_OVERRIDE; //! Creates a mesh particle emitter. virtual IParticleMeshEmitter* createMeshEmitter( @@ -119,7 +119,7 @@ public: u32 lifeTimeMin = 2000, u32 lifeTimeMax = 4000, s32 maxAngleDegrees = 0, const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f), - const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) _IRR_OVERRIDE_; + const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) IRR_OVERRIDE; //! Creates a point particle emitter. virtual IParticlePointEmitter* createPointEmitter( @@ -131,7 +131,7 @@ public: u32 lifeTimeMin=2000, u32 lifeTimeMax=4000, s32 maxAngleDegrees=0, const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f), - const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) _IRR_OVERRIDE_; + const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) IRR_OVERRIDE; //! Creates a ring particle emitter. virtual IParticleRingEmitter* createRingEmitter( @@ -144,7 +144,7 @@ public: u32 lifeTimeMin=2000, u32 lifeTimeMax=4000, s32 maxAngleDegrees=0, const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f), - const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) _IRR_OVERRIDE_; + const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) IRR_OVERRIDE; //! Creates a sphere particle emitter. virtual IParticleSphereEmitter* createSphereEmitter( @@ -157,62 +157,62 @@ public: u32 lifeTimeMin=2000, u32 lifeTimeMax=4000, s32 maxAngleDegrees=0, const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f), - const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) _IRR_OVERRIDE_; + const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) IRR_OVERRIDE; //! Creates a point attraction affector. This affector modifies the positions of the //! particles and attracts them to a specified point at a specified speed per second. virtual IParticleAttractionAffector* createAttractionAffector( const core::vector3df& point, f32 speed = 1.0f, bool attract = true, - bool affectX = true, bool affectY = true, bool affectZ = true) _IRR_OVERRIDE_; + bool affectX = true, bool affectY = true, bool affectZ = true) IRR_OVERRIDE; //! Creates a scale particle affector. virtual IParticleAffector* createScaleParticleAffector( - const core::dimension2df& scaleTo = core::dimension2df(1.0f, 1.0f)) _IRR_OVERRIDE_; + const core::dimension2df& scaleTo = core::dimension2df(1.0f, 1.0f)) IRR_OVERRIDE; //! Creates a fade out particle affector. virtual IParticleFadeOutAffector* createFadeOutParticleAffector( const video::SColor& targetColor = video::SColor(0,0,0,0), - u32 timeNeededToFadeOut = 1000) _IRR_OVERRIDE_; + u32 timeNeededToFadeOut = 1000) IRR_OVERRIDE; //! Creates a gravity affector. virtual IParticleGravityAffector* createGravityAffector( const core::vector3df& gravity = core::vector3df(0.0f,-0.03f,0.0f), - u32 timeForceLost = 1000) _IRR_OVERRIDE_; + u32 timeForceLost = 1000) IRR_OVERRIDE; //! Creates a rotation affector. This affector rotates the particles //! around a specified pivot point. The speed is in Degrees per second. virtual IParticleRotationAffector* createRotationAffector( const core::vector3df& speed = core::vector3df(5.0f,5.0f,5.0f), - const core::vector3df& pivotPoint = core::vector3df(0.0f,0.0f,0.0f) ) _IRR_OVERRIDE_; + const core::vector3df& pivotPoint = core::vector3df(0.0f,0.0f,0.0f) ) IRR_OVERRIDE; //! Sets the size of all particles. virtual void setParticleSize( - const core::dimension2d &size = core::dimension2d(5.0f, 5.0f)) _IRR_OVERRIDE_; + const core::dimension2d &size = core::dimension2d(5.0f, 5.0f)) IRR_OVERRIDE; //! Sets if the particles should be global. If they are, the particles are affected by //! the movement of the particle system scene node too, otherwise they completely //! ignore it. Default is true. - virtual void setParticlesAreGlobal(bool global=true) _IRR_OVERRIDE_; + virtual void setParticlesAreGlobal(bool global=true) IRR_OVERRIDE; //! Remove all currently visible particles - virtual void clearParticles() _IRR_OVERRIDE_; + virtual void clearParticles() IRR_OVERRIDE; //! Sets if the node should be visible or not. - virtual void setVisible(bool isVisible) _IRR_OVERRIDE_; + virtual void setVisible(bool isVisible) IRR_OVERRIDE; //! Do manually update the particles. //! This should only be called when you want to render the node outside the scenegraph, //! as the node will care about this otherwise automatically. - virtual void doParticleSystem(u32 time) _IRR_OVERRIDE_; + virtual void doParticleSystem(u32 time) IRR_OVERRIDE; //! 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. - 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 - virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_PARTICLE_SYSTEM; } + virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_PARTICLE_SYSTEM; } private: @@ -246,4 +246,3 @@ private: #endif // _IRR_COMPILE_WITH_PARTICLES_ #endif - diff --git a/source/Irrlicht/CProfiler.h b/source/Irrlicht/CProfiler.h index d86f9e0a..ac4c1f2f 100644 --- a/source/Irrlicht/CProfiler.h +++ b/source/Irrlicht/CProfiler.h @@ -2,8 +2,8 @@ // For conditions of distribution and use, see copyright notice in irrlicht.h // Written by Michael Zeilfelder -#ifndef __C_PROFILER_H_INCLUDED__ -#define __C_PROFILER_H_INCLUDED__ +#ifndef IRR_C_PROFILER_H_INCLUDED +#define IRR_C_PROFILER_H_INCLUDED #include "IrrCompileConfig.h" #include "IProfiler.h" @@ -18,10 +18,10 @@ public: virtual ~CProfiler(); //! Write all profile-data into a string - virtual void printAll(core::stringw &result, bool includeOverview,bool suppressUncalled) const _IRR_OVERRIDE_; + virtual void printAll(core::stringw &result, bool includeOverview,bool suppressUncalled) const IRR_OVERRIDE; //! Write the profile data of one group into a string - virtual void printGroup(core::stringw &result, u32 groupIndex, bool suppressUncalled) const _IRR_OVERRIDE_; + virtual void printGroup(core::stringw &result, u32 groupIndex, bool suppressUncalled) const IRR_OVERRIDE; protected: core::stringw makeTitleString() const; @@ -29,4 +29,4 @@ protected: }; } // namespace irr -#endif // __C_PROFILER_H_INCLUDED__ +#endif // IRR_C_PROFILER_H_INCLUDED diff --git a/source/Irrlicht/CQ3LevelMesh.h b/source/Irrlicht/CQ3LevelMesh.h index 595f6c95..b10a2cba 100644 --- a/source/Irrlicht/CQ3LevelMesh.h +++ b/source/Irrlicht/CQ3LevelMesh.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_Q3_LEVEL_MESH_H_INCLUDED__ -#define __C_Q3_LEVEL_MESH_H_INCLUDED__ +#ifndef IRR_C_Q3_LEVEL_MESH_H_INCLUDED +#define IRR_C_Q3_LEVEL_MESH_H_INCLUDED #include "IQ3LevelMesh.h" #include "IReadFile.h" @@ -36,11 +36,11 @@ namespace scene //! returns the amount of frames in milliseconds. 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. /** \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; } @@ -48,7 +48,7 @@ namespace scene //! Gets the frame count of the animated mesh. /** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated. The actual speed is set in the scene node the mesh is instantiated in.*/ - virtual void setAnimationSpeed(f32 fps) _IRR_OVERRIDE_ + virtual void setAnimationSpeed(f32 fps) IRR_OVERRIDE { FramesPerSecond=fps; } @@ -57,49 +57,49 @@ namespace scene //! lowest, 255 the highest detail. Note, that some Meshes will //! ignore the detail level. virtual IMesh* getMesh(s32 frameInMs, s32 detailLevel=255, - s32 startFrameLoop=-1, s32 endFrameLoop=-1) _IRR_OVERRIDE_; + s32 startFrameLoop=-1, s32 endFrameLoop=-1) IRR_OVERRIDE; //! Returns an axis aligned bounding box of the mesh. //! \return A bounding box of this mesh is returned. - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; - virtual void setBoundingBox( const core::aabbox3df& box) _IRR_OVERRIDE_; + virtual void setBoundingBox( const core::aabbox3df& box) IRR_OVERRIDE; //! 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; //! loads the shader definition void getShader( io::IReadFile* file ); //! loads the shader definition - virtual const quake3::IShader * getShader( const c8 * filename, bool fileNameIsValid=true ) _IRR_OVERRIDE_; + virtual const quake3::IShader * getShader( const c8 * filename, bool fileNameIsValid=true ) IRR_OVERRIDE; //! returns a already loaded Shader - virtual const quake3::IShader * getShader( u32 index ) const _IRR_OVERRIDE_; + virtual const quake3::IShader * getShader( u32 index ) const IRR_OVERRIDE; //! loads a configuration file void getConfiguration( io::IReadFile* file ); //! get's an interface to the entities - virtual quake3::tQ3EntityList & getEntityList() _IRR_OVERRIDE_; + virtual quake3::tQ3EntityList & getEntityList() IRR_OVERRIDE; //! returns the requested brush entity - virtual IMesh* getBrushEntityMesh(s32 num) const _IRR_OVERRIDE_; + virtual IMesh* getBrushEntityMesh(s32 num) const IRR_OVERRIDE; //! returns the requested brush entity - virtual IMesh* getBrushEntityMesh(quake3::IEntity &ent) const _IRR_OVERRIDE_; + virtual IMesh* getBrushEntityMesh(quake3::IEntity &ent) const IRR_OVERRIDE; //Link to held meshes? ... //! returns amount of mesh buffers. - virtual u32 getMeshBufferCount() const _IRR_OVERRIDE_ + virtual u32 getMeshBufferCount() const IRR_OVERRIDE { return 0; } //! returns pointer to a mesh buffer - virtual IMeshBuffer* getMeshBuffer(u32 nr) const _IRR_OVERRIDE_ + virtual IMeshBuffer* getMeshBuffer(u32 nr) const IRR_OVERRIDE { return 0; } @@ -107,24 +107,24 @@ namespace scene //! Returns pointer to a mesh buffer which fits a material /** \param material: material to search for \return Pointer to the mesh buffer or 0 if there is no such mesh buffer. */ - virtual IMeshBuffer* getMeshBuffer( const video::SMaterial &material) const _IRR_OVERRIDE_ + virtual IMeshBuffer* getMeshBuffer( const video::SMaterial &material) const IRR_OVERRIDE { return 0; } - virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) _IRR_OVERRIDE_ + virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) IRR_OVERRIDE { return; } //! set the hardware mapping hint, for driver - virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_ + virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) IRR_OVERRIDE { return; } //! flags the meshbuffer as changed, reloads hardware buffers - virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_ + virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) IRR_OVERRIDE { return; } @@ -485,4 +485,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CQuake3ShaderSceneNode.h b/source/Irrlicht/CQuake3ShaderSceneNode.h index 874bae83..6b9948e7 100644 --- a/source/Irrlicht/CQuake3ShaderSceneNode.h +++ b/source/Irrlicht/CQuake3ShaderSceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_QUAKE3_SCENE_NODE_H_INCLUDED__ -#define __C_QUAKE3_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_QUAKE3_SCENE_NODE_H_INCLUDED +#define IRR_C_QUAKE3_SCENE_NODE_H_INCLUDED #include "IMeshSceneNode.h" #include "IQ3Shader.h" @@ -31,31 +31,31 @@ public: virtual ~CQuake3ShaderSceneNode(); - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; - virtual void render() _IRR_OVERRIDE_; - virtual void OnAnimate(u32 timeMs) _IRR_OVERRIDE_; - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; + virtual void render() IRR_OVERRIDE; + virtual void OnAnimate(u32 timeMs) IRR_OVERRIDE; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; - virtual u32 getMaterialCount() const _IRR_OVERRIDE_; - virtual video::SMaterial& getMaterial(u32 i) _IRR_OVERRIDE_; + virtual u32 getMaterialCount() const IRR_OVERRIDE; + virtual video::SMaterial& getMaterial(u32 i) IRR_OVERRIDE; //! Returns type of the scene node - virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_Q3SHADER_SCENE_NODE; } + virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_Q3SHADER_SCENE_NODE; } - virtual void setMesh(IMesh* mesh)_IRR_OVERRIDE_ {} - virtual IMesh* getMesh() _IRR_OVERRIDE_ { return Mesh; } - virtual void setReadOnlyMaterials(bool readonly) _IRR_OVERRIDE_ {} - virtual bool isReadOnlyMaterials() const _IRR_OVERRIDE_ { return true; } + virtual void setMesh(IMesh* mesh)IRR_OVERRIDE {} + virtual IMesh* getMesh() IRR_OVERRIDE { return Mesh; } + virtual void setReadOnlyMaterials(bool readonly) IRR_OVERRIDE {} + virtual bool isReadOnlyMaterials() const IRR_OVERRIDE { return true; } //! Creates shadow volume scene node as child of this node //! and returns a pointer to it. virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh, - s32 id, bool zfailmethod=true, f32 infinity=10000.0f) _IRR_OVERRIDE_; + s32 id, bool zfailmethod=true, f32 infinity=10000.0f) IRR_OVERRIDE; //! Removes a child from this scene node. //! Implemented here, to be able to remove the shadow properly, if there is one, //! or to remove attached childs. - virtual bool removeChild(ISceneNode* child) _IRR_OVERRIDE_; + virtual bool removeChild(ISceneNode* child) IRR_OVERRIDE; private: const quake3::IShader* Shader; @@ -113,6 +113,4 @@ private: } // end namespace scene } // end namespace irr - #endif - diff --git a/source/Irrlicht/CReadFile.h b/source/Irrlicht/CReadFile.h index d0a3cac3..4f7e1351 100644 --- a/source/Irrlicht/CReadFile.h +++ b/source/Irrlicht/CReadFile.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_READ_FILE_H_INCLUDED__ -#define __C_READ_FILE_H_INCLUDED__ +#ifndef IRR_C_READ_FILE_H_INCLUDED +#define IRR_C_READ_FILE_H_INCLUDED #include #include "IReadFile.h" @@ -27,13 +27,13 @@ namespace io virtual ~CReadFile(); //! returns how much was read - virtual size_t read(void* buffer, size_t sizeToRead) _IRR_OVERRIDE_; + virtual size_t read(void* buffer, size_t sizeToRead) IRR_OVERRIDE; //! changes position in file, returns true if successful - virtual bool seek(long finalPos, bool relativeMovement = false) _IRR_OVERRIDE_; + virtual bool seek(long finalPos, bool relativeMovement = false) IRR_OVERRIDE; //! returns size of file - virtual long getSize() const _IRR_OVERRIDE_; + virtual long getSize() const IRR_OVERRIDE; //! returns if file is open bool isOpen() const @@ -42,13 +42,13 @@ namespace io } //! returns where in the file we are. - virtual long getPos() const _IRR_OVERRIDE_; + virtual long getPos() const IRR_OVERRIDE; //! returns name of file - virtual const io::path& getFileName() const _IRR_OVERRIDE_; + virtual const io::path& getFileName() const IRR_OVERRIDE; //! Get the type of the class implementing this interface - virtual EREAD_FILE_TYPE getType() const _IRR_OVERRIDE_ + virtual EREAD_FILE_TYPE getType() const IRR_OVERRIDE { return ERFT_READ_FILE; } @@ -70,4 +70,3 @@ namespace io } // end namespace irr #endif - diff --git a/source/Irrlicht/CSMFMeshFileLoader.h b/source/Irrlicht/CSMFMeshFileLoader.h index 9f89ef75..87aeb089 100644 --- a/source/Irrlicht/CSMFMeshFileLoader.h +++ b/source/Irrlicht/CSMFMeshFileLoader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SMF_MESH_LOADER_H_INCLUDED__ -#define __C_SMF_MESH_LOADER_H_INCLUDED__ +#ifndef IRR_C_SMF_MESH_LOADER_H_INCLUDED +#define IRR_C_SMF_MESH_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "SMesh.h" @@ -31,10 +31,10 @@ public: CSMFMeshFileLoader(irr::io::IFileSystem* fs, video::IVideoDriver* driver); //! Returns true if the file might be loaded by this class. - 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. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: void loadLimb(io::IReadFile* file, scene::SMesh* mesh, const core::matrix4 &parentTransformation); @@ -65,5 +65,4 @@ namespace io } // end namespace irr -#endif // __C_SMF_MESH_LOADER_H_INCLUDED__ - +#endif // IRR_C_SMF_MESH_LOADER_H_INCLUDED diff --git a/source/Irrlicht/CSTLMeshFileLoader.h b/source/Irrlicht/CSTLMeshFileLoader.h index d15a9f42..d5cbdecd 100644 --- a/source/Irrlicht/CSTLMeshFileLoader.h +++ b/source/Irrlicht/CSTLMeshFileLoader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_STL_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_STL_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_STL_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_STL_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "irrString.h" @@ -21,13 +21,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! based on the file extension (i.e. ".stl") - 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. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! See IReferenceCounted::drop() for more information. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; private: @@ -46,4 +46,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CSTLMeshWriter.h b/source/Irrlicht/CSTLMeshWriter.h index 18ac6b70..58974f30 100644 --- a/source/Irrlicht/CSTLMeshWriter.h +++ b/source/Irrlicht/CSTLMeshWriter.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __IRR_STL_MESH_WRITER_H_INCLUDED__ -#define __IRR_STL_MESH_WRITER_H_INCLUDED__ +#ifndef IRR_STL_MESH_WRITER_H_INCLUDED +#define IRR_STL_MESH_WRITER_H_INCLUDED #include "IMeshWriter.h" #include "S3DVertex.h" @@ -25,10 +25,10 @@ namespace scene virtual ~CSTLMeshWriter(); //! 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 - 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; protected: // write binary format @@ -52,4 +52,3 @@ namespace scene } // end namespace #endif - diff --git a/source/Irrlicht/CSceneCollisionManager.h b/source/Irrlicht/CSceneCollisionManager.h index 93d0d277..23a42319 100644 --- a/source/Irrlicht/CSceneCollisionManager.h +++ b/source/Irrlicht/CSceneCollisionManager.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SCENE_COLLISION_MANAGER_H_INCLUDED__ -#define __C_SCENE_COLLISION_MANAGER_H_INCLUDED__ +#ifndef IRR_C_SCENE_COLLISION_MANAGER_H_INCLUDED +#define IRR_C_SCENE_COLLISION_MANAGER_H_INCLUDED #include "ISceneCollisionManager.h" #include "ISceneManager.h" @@ -28,22 +28,22 @@ namespace scene //! Returns the scene node, which is currently visible at the given //! screen coordinates, viewed from the currently active camera. virtual ISceneNode* getSceneNodeFromScreenCoordinatesBB(const core::position2d& pos, - s32 idBitMask=0, bool bNoDebugObjects=false, ISceneNode* root=0) _IRR_OVERRIDE_; + s32 idBitMask=0, bool bNoDebugObjects=false, ISceneNode* root=0) IRR_OVERRIDE; //! Returns the nearest scene node which collides with a 3d ray and //! whose id matches a bitmask. virtual ISceneNode* getSceneNodeFromRayBB(const core::line3d& ray, s32 idBitMask=0, bool bNoDebugObjects=false, - ISceneNode* root=0) _IRR_OVERRIDE_; + ISceneNode* root=0) IRR_OVERRIDE; //! Returns the scene node, at which the given camera is looking at and //! which id matches the bitmask. virtual ISceneNode* getSceneNodeFromCameraBB(const ICameraSceneNode* camera, - s32 idBitMask=0, bool bNoDebugObjects = false) _IRR_OVERRIDE_; + s32 idBitMask=0, bool bNoDebugObjects = false) IRR_OVERRIDE; //! Finds the nearest collision point of a line and lots of triangles, if there is one. virtual bool getCollisionPoint(SCollisionHit& hitResult, const core::line3d& ray, - ITriangleSelector* selector) _IRR_OVERRIDE_; + ITriangleSelector* selector) IRR_OVERRIDE; //! Collides a moving ellipsoid with a 3d world with gravity and returns //! the resulting new position of the ellipsoid. @@ -57,15 +57,15 @@ namespace scene bool& outFalling, ISceneNode*& outNode, f32 slidingSpeed, - const core::vector3df& gravityDirectionAndSpeed) _IRR_OVERRIDE_; + const core::vector3df& gravityDirectionAndSpeed) IRR_OVERRIDE; //! Returns a 3d ray which would go through the 2d screen coordinates. virtual core::line3d getRayFromScreenCoordinates( - const core::position2d & pos, const ICameraSceneNode* camera = 0) _IRR_OVERRIDE_; + const core::position2d & pos, const ICameraSceneNode* camera = 0) IRR_OVERRIDE; //! Calculates 2d screen position from a 3d position. virtual core::position2d getScreenCoordinatesFrom3DPosition( - const core::vector3df & pos, const ICameraSceneNode* camera=0, bool useViewPort=false) _IRR_OVERRIDE_; + const core::vector3df & pos, const ICameraSceneNode* camera=0, bool useViewPort=false) IRR_OVERRIDE; //! Gets the scene node and nearest collision point for a ray based on //! the nodes' id bitmasks, bounding boxes and triangle selectors. @@ -74,7 +74,7 @@ namespace scene const core::line3df& ray, s32 idBitMask = 0, ISceneNode * collisionRootNode = 0, - bool noDebugObjects = false) _IRR_OVERRIDE_; + bool noDebugObjects = false) IRR_OVERRIDE; private: @@ -150,4 +150,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneLoaderIrr.h b/source/Irrlicht/CSceneLoaderIrr.h index 2ac73e4f..f45317b4 100644 --- a/source/Irrlicht/CSceneLoaderIrr.h +++ b/source/Irrlicht/CSceneLoaderIrr.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SCENE_LOADER_IRR_H_INCLUDED__ -#define __C_SCENE_LOADER_IRR_H_INCLUDED__ +#ifndef IRR_C_SCENE_LOADER_IRR_H_INCLUDED +#define IRR_C_SCENE_LOADER_IRR_H_INCLUDED #include "ISceneLoader.h" @@ -34,15 +34,15 @@ public: virtual ~CSceneLoaderIrr(); //! Returns true if the class might be able to load this file. - virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_; + virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE; //! Returns true if the class might be able to load this file. - virtual bool isALoadableFileFormat(io::IReadFile *file) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(io::IReadFile *file) const IRR_OVERRIDE; //! Loads the scene into the scene manager. virtual bool loadScene(io::IReadFile* file, ISceneUserDataSerializer* userDataSerializer=0, - ISceneNode* rootNode=0) _IRR_OVERRIDE_; + ISceneNode* rootNode=0) IRR_OVERRIDE; private: @@ -80,4 +80,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneManager.cpp b/source/Irrlicht/CSceneManager.cpp index 7d6de532..8f727c11 100644 --- a/source/Irrlicht/CSceneManager.cpp +++ b/source/Irrlicht/CSceneManager.cpp @@ -1224,7 +1224,7 @@ void CSceneManager::render() //! returns the axis aligned bounding box of this node const core::aabbox3d& CSceneManager::getBoundingBox() const { - _IRR_DEBUG_BREAK_IF(true) // Bounding Box of Scene Manager should never be used. + IRR_DEBUG_BREAK_IF(true) // Bounding Box of Scene Manager should never be used. static const core::aabbox3d dummy; return dummy; diff --git a/source/Irrlicht/CSceneManager.h b/source/Irrlicht/CSceneManager.h index 5f0daf33..ab9c975e 100644 --- a/source/Irrlicht/CSceneManager.h +++ b/source/Irrlicht/CSceneManager.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SCENE_MANAGER_H_INCLUDED__ -#define __C_SCENE_MANAGER_H_INCLUDED__ +#ifndef IRR_C_SCENE_MANAGER_H_INCLUDED +#define IRR_C_SCENE_MANAGER_H_INCLUDED #include "ISceneManager.h" #include "ISceneNode.h" @@ -41,22 +41,22 @@ namespace scene virtual ~CSceneManager(); //! gets an animateable mesh. loads it if needed. returned pointer must not be dropped. - virtual IAnimatedMesh* getMesh(const io::path& filename, const io::path& alternativeCacheName) _IRR_OVERRIDE_; + virtual IAnimatedMesh* getMesh(const io::path& filename, const io::path& alternativeCacheName) IRR_OVERRIDE; //! gets an animateable mesh. loads it if needed. returned pointer must not be dropped. - virtual IAnimatedMesh* getMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* getMesh(io::IReadFile* file) IRR_OVERRIDE; //! Returns an interface to the mesh cache which is shared between all existing scene managers. - virtual IMeshCache* getMeshCache() _IRR_OVERRIDE_; + virtual IMeshCache* getMeshCache() IRR_OVERRIDE; //! returns the video driver - virtual video::IVideoDriver* getVideoDriver() _IRR_OVERRIDE_; + virtual video::IVideoDriver* getVideoDriver() IRR_OVERRIDE; //! return the gui environment - virtual gui::IGUIEnvironment* getGUIEnvironment() _IRR_OVERRIDE_; + virtual gui::IGUIEnvironment* getGUIEnvironment() IRR_OVERRIDE; //! return the filesystem - virtual io::IFileSystem* getFileSystem() _IRR_OVERRIDE_; + virtual io::IFileSystem* getFileSystem() IRR_OVERRIDE; //! adds Volume Lighting Scene Node. //! the returned pointer must not be dropped. @@ -66,27 +66,27 @@ namespace scene const video::SColor tail = video::SColor(0, 0, 0, 0), const core::vector3df& position = core::vector3df(0,0,0), const core::vector3df& rotation = core::vector3df(0,0,0), - const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f)) _IRR_OVERRIDE_; + const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f)) IRR_OVERRIDE; //! adds a cube scene node to the scene. It is a simple cube of (1,1,1) size. //! the returned pointer must not be dropped. virtual IMeshSceneNode* addCubeSceneNode(f32 size=10.0f, ISceneNode* parent=0, s32 id=-1, const core::vector3df& position = core::vector3df(0,0,0), const core::vector3df& rotation = core::vector3df(0,0,0), - const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f)) _IRR_OVERRIDE_; + const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f)) IRR_OVERRIDE; //! Adds a sphere scene node to the scene. virtual IMeshSceneNode* addSphereSceneNode(f32 radius=5.0f, s32 polyCount=16, ISceneNode* parent=0, s32 id=-1, const core::vector3df& position = core::vector3df(0,0,0), const core::vector3df& rotation = core::vector3df(0,0,0), - const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f)) _IRR_OVERRIDE_; + const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f)) IRR_OVERRIDE; //! adds a scene node for rendering an animated mesh model virtual IAnimatedMeshSceneNode* addAnimatedMeshSceneNode(IAnimatedMesh* mesh, ISceneNode* parent=0, s32 id=-1, const core::vector3df& position = core::vector3df(0,0,0), const core::vector3df& rotation = core::vector3df(0,0,0), const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f), - bool alsoAddIfMeshPointerZero=false) _IRR_OVERRIDE_; + bool alsoAddIfMeshPointerZero=false) IRR_OVERRIDE; //! adds a scene node for rendering a static mesh //! the returned pointer must not be dropped. @@ -94,40 +94,40 @@ namespace scene const core::vector3df& position = core::vector3df(0,0,0), const core::vector3df& rotation = core::vector3df(0,0,0), const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f), - bool alsoAddIfMeshPointerZero=false) _IRR_OVERRIDE_; + bool alsoAddIfMeshPointerZero=false) IRR_OVERRIDE; //! Adds a scene node for rendering a animated water surface mesh. virtual ISceneNode* addWaterSurfaceSceneNode(IMesh* mesh, f32 waveHeight, f32 waveSpeed, f32 wlength, ISceneNode* parent=0, s32 id=-1, const core::vector3df& position = core::vector3df(0,0,0), const core::vector3df& rotation = core::vector3df(0,0,0), - const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f)) _IRR_OVERRIDE_; + const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f)) IRR_OVERRIDE; //! renders the node. - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! registers a node for rendering it at a specific time. - virtual u32 registerNodeForRendering(ISceneNode* node, E_SCENE_NODE_RENDER_PASS pass = ESNRP_AUTOMATIC) _IRR_OVERRIDE_; + virtual u32 registerNodeForRendering(ISceneNode* node, E_SCENE_NODE_RENDER_PASS pass = ESNRP_AUTOMATIC) IRR_OVERRIDE; //! Clear all nodes which are currently registered for rendering - virtual void clearAllRegisteredNodesForRendering() _IRR_OVERRIDE_; + virtual void clearAllRegisteredNodesForRendering() IRR_OVERRIDE; //! draws all scene nodes - virtual void drawAll() _IRR_OVERRIDE_; + virtual void drawAll() IRR_OVERRIDE; //! Adds a scene node for rendering using a octree to the scene graph. This a good method for rendering //! scenes with lots of geometry. The Octree is built on the fly from the mesh, much //! faster then a bsp tree. virtual IOctreeSceneNode* addOctreeSceneNode(IAnimatedMesh* mesh, ISceneNode* parent=0, - s32 id=-1, s32 minimalPolysPerNode=512, bool alsoAddIfMeshPointerZero=false) _IRR_OVERRIDE_; + s32 id=-1, s32 minimalPolysPerNode=512, bool alsoAddIfMeshPointerZero=false) IRR_OVERRIDE; //! Adss a scene node for rendering using a octree. This a good method for rendering //! scenes with lots of geometry. The Octree is built on the fly from the mesh, much //! faster then a bsp tree. virtual IOctreeSceneNode* addOctreeSceneNode(IMesh* mesh, ISceneNode* parent=0, - s32 id=-1, s32 minimalPolysPerNode=128, bool alsoAddIfMeshPointerZero=false) _IRR_OVERRIDE_; + s32 id=-1, s32 minimalPolysPerNode=128, bool alsoAddIfMeshPointerZero=false) IRR_OVERRIDE; //! Adds a camera scene node to the tree and sets it as active camera. //! \param position: Position of the space relative to its parent where the camera will be placed. @@ -138,7 +138,7 @@ namespace scene virtual ICameraSceneNode* addCameraSceneNode(ISceneNode* parent = 0, const core::vector3df& position = core::vector3df(0,0,0), const core::vector3df& lookat = core::vector3df(0,0,100), - s32 id=-1, bool makeActive=true) _IRR_OVERRIDE_; + s32 id=-1, bool makeActive=true) IRR_OVERRIDE; //! Adds a camera scene node which is able to be controlle with the mouse similar //! like in the 3D Software Maya by Alias Wavefront. @@ -146,7 +146,7 @@ namespace scene virtual ICameraSceneNode* addCameraSceneNodeMaya(ISceneNode* parent=0, f32 rotateSpeed=-1500.f, f32 zoomSpeed=200.f, f32 translationSpeed=1500.f, s32 id=-1, f32 distance=70.f, - bool makeActive=true) _IRR_OVERRIDE_; + bool makeActive=true) IRR_OVERRIDE; //! Adds a camera scene node which is able to be controled with the mouse and keys //! like in most first person shooters (FPS): @@ -154,7 +154,7 @@ namespace scene f32 rotateSpeed = 100.0f, f32 moveSpeed = .5f, s32 id=-1, SKeyMap* keyMapArray=0, s32 keyMapSize=0, bool noVerticalMovement=false, f32 jumpSpeed = 0.f, - bool invertMouseY=false, bool makeActive=true) _IRR_OVERRIDE_; + bool invertMouseY=false, bool makeActive=true) IRR_OVERRIDE; //! Adds a dynamic light scene node. The light will cast dynamic light on all //! other scene nodes in the scene, which have the material flag video::MTF_LIGHTING @@ -162,7 +162,7 @@ namespace scene virtual ILightSceneNode* addLightSceneNode(ISceneNode* parent = 0, const core::vector3df& position = core::vector3df(0,0,0), video::SColorf color = video::SColorf(1.0f, 1.0f, 1.0f), - f32 range=100.0f, s32 id=-1) _IRR_OVERRIDE_; + f32 range=100.0f, s32 id=-1) IRR_OVERRIDE; //! Adds a billboard scene node to the scene. A billboard is like a 3d sprite: A 2d element, //! which always looks to the camera. It is usually used for things like explosions, fire, @@ -170,38 +170,38 @@ namespace scene virtual IBillboardSceneNode* addBillboardSceneNode(ISceneNode* parent = 0, const core::dimension2d& size = core::dimension2d(10.0f, 10.0f), const core::vector3df& position = core::vector3df(0,0,0), s32 id=-1, - video::SColor shadeTop = 0xFFFFFFFF, video::SColor shadeBottom = 0xFFFFFFFF) _IRR_OVERRIDE_; + video::SColor shadeTop = 0xFFFFFFFF, video::SColor shadeBottom = 0xFFFFFFFF) IRR_OVERRIDE; //! Adds a skybox scene node. A skybox is a big cube with 6 textures on it and //! is drawn around the camera position. virtual ISceneNode* addSkyBoxSceneNode(video::ITexture* top, video::ITexture* bottom, video::ITexture* left, video::ITexture* right, video::ITexture* front, - video::ITexture* back, ISceneNode* parent = 0, s32 id=-1) _IRR_OVERRIDE_; + video::ITexture* back, ISceneNode* parent = 0, s32 id=-1) IRR_OVERRIDE; //! Adds a skydome scene node. A skydome is a large (half-) sphere with a //! panoramic texture on it and is drawn around the camera position. virtual ISceneNode* addSkyDomeSceneNode(video::ITexture* texture, u32 horiRes=16, u32 vertRes=8, f32 texturePercentage=0.9, f32 spherePercentage=2.0,f32 radius = 1000.f, - ISceneNode* parent=0, s32 id=-1) _IRR_OVERRIDE_; + ISceneNode* parent=0, s32 id=-1) IRR_OVERRIDE; //! Adds a text scene node, which is able to display //! 2d text at a position in three dimensional space virtual ITextSceneNode* addTextSceneNode(gui::IGUIFont* font, const wchar_t* text, video::SColor color=video::SColor(100,255,255,255), ISceneNode* parent = 0, const core::vector3df& position = core::vector3df(0,0,0), - s32 id=-1) _IRR_OVERRIDE_; + s32 id=-1) IRR_OVERRIDE; //! Adds a text scene node, which uses billboards virtual IBillboardTextSceneNode* addBillboardTextSceneNode(gui::IGUIFont* font, const wchar_t* text, ISceneNode* parent = 0, const core::dimension2d& size = core::dimension2d(10.0f, 10.0f), const core::vector3df& position = core::vector3df(0,0,0), s32 id=-1, - video::SColor colorTop = 0xFFFFFFFF, video::SColor colorBottom = 0xFFFFFFFF) _IRR_OVERRIDE_; + video::SColor colorTop = 0xFFFFFFFF, video::SColor colorBottom = 0xFFFFFFFF) IRR_OVERRIDE; //! Adds a scene node, which can render a quake3 shader virtual IMeshSceneNode* addQuake3SceneNode(const IMeshBuffer* meshBuffer, const quake3::IShader * shader, - ISceneNode* parent=0, s32 id=-1) _IRR_OVERRIDE_; + ISceneNode* parent=0, s32 id=-1) IRR_OVERRIDE; //! Adds a Hill Plane mesh to the mesh pool. The mesh is @@ -215,37 +215,37 @@ namespace scene const core::dimension2d& tileSize, const core::dimension2d& tileCount, video::SMaterial* material = 0, f32 hillHeight = 0.0f, const core::dimension2d& countHills = core::dimension2d(1.0f, 1.0f), - const core::dimension2d& textureRepeatCount = core::dimension2d(1.0f, 1.0f)) _IRR_OVERRIDE_; + const core::dimension2d& textureRepeatCount = core::dimension2d(1.0f, 1.0f)) IRR_OVERRIDE; //! Adds a terrain mesh to the mesh pool. virtual IAnimatedMesh* addTerrainMesh(const io::path& meshname, video::IImage* texture, video::IImage* heightmap, const core::dimension2d& stretchSize = core::dimension2d(10.0f,10.0f), f32 maxHeight=200.0f, - const core::dimension2d& defaultVertexBlockSize = core::dimension2d(64,64)) _IRR_OVERRIDE_; + const core::dimension2d& defaultVertexBlockSize = core::dimension2d(64,64)) IRR_OVERRIDE; //! Add a arrow mesh to the mesh pool virtual IAnimatedMesh* addArrowMesh(const io::path& name, video::SColor vtxColor0, video::SColor vtxColor1, u32 tesselationCylinder, u32 tesselationCone, f32 height, f32 cylinderHeight, f32 width0, - f32 width1) _IRR_OVERRIDE_; + f32 width1) IRR_OVERRIDE; //! Adds a static sphere mesh to the mesh pool. virtual IAnimatedMesh* addSphereMesh(const io::path& name, - f32 radius=5.f, u32 polyCountX=16, u32 polyCountY=16) _IRR_OVERRIDE_; + f32 radius=5.f, u32 polyCountX=16, u32 polyCountY=16) IRR_OVERRIDE; //! Adds a static volume light mesh to the mesh pool. virtual IAnimatedMesh* addVolumeLightMesh(const io::path& name, const u32 SubdivideU = 32, const u32 SubdivideV = 32, const video::SColor FootColor = video::SColor(51, 0, 230, 180), - const video::SColor TailColor = video::SColor(0, 0, 0, 0)) _IRR_OVERRIDE_; + const video::SColor TailColor = video::SColor(0, 0, 0, 0)) IRR_OVERRIDE; //! Adds a particle system scene node. virtual IParticleSystemSceneNode* addParticleSystemSceneNode( bool withDefaultEmitter=true, ISceneNode* parent=0, s32 id=-1, const core::vector3df& position = core::vector3df(0,0,0), const core::vector3df& rotation = core::vector3df(0,0,0), - const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f)) _IRR_OVERRIDE_; + const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f)) IRR_OVERRIDE; //! Adds a terrain scene node to the scene graph. virtual ITerrainSceneNode* addTerrainSceneNode( @@ -256,7 +256,7 @@ namespace scene const core::vector3df& scale = core::vector3df(1.0f,1.0f,1.0f), video::SColor vertexColor = video::SColor(255,255,255,255), s32 maxLOD=4, E_TERRAIN_PATCH_SIZE patchSize=ETPS_17,s32 smoothFactor=0, - bool addAlsoIfHeightmapEmpty = false) _IRR_OVERRIDE_; + bool addAlsoIfHeightmapEmpty = false) IRR_OVERRIDE; //! Adds a terrain scene node to the scene graph. virtual ITerrainSceneNode* addTerrainSceneNode( @@ -267,36 +267,36 @@ namespace scene const core::vector3df& scale = core::vector3df(1.0f,1.0f,1.0f), video::SColor vertexColor = video::SColor(255,255,255,255), s32 maxLOD=4, E_TERRAIN_PATCH_SIZE patchSize=ETPS_17,s32 smoothFactor=0, - bool addAlsoIfHeightmapEmpty=false) _IRR_OVERRIDE_; + bool addAlsoIfHeightmapEmpty=false) IRR_OVERRIDE; //! Adds a dummy transformation scene node to the scene graph. virtual IDummyTransformationSceneNode* addDummyTransformationSceneNode( - ISceneNode* parent=0, s32 id=-1) _IRR_OVERRIDE_; + ISceneNode* parent=0, s32 id=-1) IRR_OVERRIDE; //! Adds an empty scene node. - virtual ISceneNode* addEmptySceneNode(ISceneNode* parent, s32 id=-1) _IRR_OVERRIDE_; + virtual ISceneNode* addEmptySceneNode(ISceneNode* parent, s32 id=-1) IRR_OVERRIDE; //! Returns the root scene node. This is the scene node which is parent //! of all scene nodes. The root scene node is a special scene node which //! only exists to manage all scene nodes. It is not rendered and cannot //! be removed from the scene. //! \return Pointer to the root scene node. - virtual ISceneNode* getRootSceneNode() _IRR_OVERRIDE_; + virtual ISceneNode* getRootSceneNode() IRR_OVERRIDE; //! Returns the current active camera. //! \return The active camera is returned. Note that this can be NULL, if there //! was no camera created yet. - virtual ICameraSceneNode* getActiveCamera() const _IRR_OVERRIDE_; + virtual ICameraSceneNode* getActiveCamera() const IRR_OVERRIDE; //! Sets the active camera. The previous active camera will be deactivated. //! \param camera: The new camera which should be active. - virtual void setActiveCamera(ICameraSceneNode* camera) _IRR_OVERRIDE_; + virtual void setActiveCamera(ICameraSceneNode* camera) IRR_OVERRIDE; //! creates a rotation animator, which rotates the attached scene node around itself. //! \param rotationPerSecond: Specifies the speed of the animation //! \return The animator. Attach it to a scene node with ISceneNode::addAnimator() //! and the animator will animate it. - virtual ISceneNodeAnimator* createRotationAnimator(const core::vector3df& rotationPerSecond) _IRR_OVERRIDE_; + virtual ISceneNodeAnimator* createRotationAnimator(const core::vector3df& rotationPerSecond) IRR_OVERRIDE; //! creates a fly circle animator /** Lets the attached scene node fly around a center. @@ -312,21 +312,21 @@ namespace scene f32 radius=100.f, f32 speed=0.001f, const core::vector3df& direction=core::vector3df(0.f, 1.f, 0.f), f32 startPosition = 0.f, - f32 radiusEllipsoid = 0.f) _IRR_OVERRIDE_; + f32 radiusEllipsoid = 0.f) IRR_OVERRIDE; //! Creates a fly straight animator, which lets the attached scene node //! fly or move along a line between two points. virtual ISceneNodeAnimator* createFlyStraightAnimator(const core::vector3df& startPoint, - const core::vector3df& endPoint, u32 timeForWay, bool loop=false,bool pingpong = false) _IRR_OVERRIDE_; + const core::vector3df& endPoint, u32 timeForWay, bool loop=false,bool pingpong = false) IRR_OVERRIDE; //! Creates a texture animator, which switches the textures of the target scene //! node based on a list of textures. virtual ISceneNodeAnimator* createTextureAnimator(const core::array& textures, - s32 timePerFrame, bool loop) _IRR_OVERRIDE_; + s32 timePerFrame, bool loop) IRR_OVERRIDE; //! Creates a scene node animator, which deletes the scene node after //! some time automatically. - virtual ISceneNodeAnimator* createDeleteAnimator(u32 timeMS) _IRR_OVERRIDE_; + virtual ISceneNodeAnimator* createDeleteAnimator(u32 timeMS) IRR_OVERRIDE; //! Creates a special scene node animator for doing automatic collision detection @@ -336,203 +336,203 @@ namespace scene const core::vector3df& ellipsoidRadius = core::vector3df(30,60,30), const core::vector3df& gravityPerSecond = core::vector3df(0,-1.0f,0), const core::vector3df& ellipsoidTranslation = core::vector3df(0,0,0), - f32 slidingValue = 0.0005f) _IRR_OVERRIDE_; + f32 slidingValue = 0.0005f) IRR_OVERRIDE; //! Creates a follow spline animator. virtual ISceneNodeAnimator* createFollowSplineAnimator(s32 startTime, const core::array< core::vector3df >& points, - f32 speed, f32 tightness, bool loop, bool pingpong, bool steer) _IRR_OVERRIDE_; + f32 speed, f32 tightness, bool loop, bool pingpong, bool steer) IRR_OVERRIDE; //! Creates a simple ITriangleSelector, based on a mesh. - virtual ITriangleSelector* createTriangleSelector(IMesh* mesh, ISceneNode* node, bool separateMeshbuffers) _IRR_OVERRIDE_; + virtual ITriangleSelector* createTriangleSelector(IMesh* mesh, ISceneNode* node, bool separateMeshbuffers) IRR_OVERRIDE; //! Creates a simple ITriangleSelector, based on a meshbuffer. - virtual ITriangleSelector* createTriangleSelector(const IMeshBuffer* meshBuffer, irr::u32 materialIndex, ISceneNode* node) _IRR_OVERRIDE_; + virtual ITriangleSelector* createTriangleSelector(const IMeshBuffer* meshBuffer, irr::u32 materialIndex, ISceneNode* node) IRR_OVERRIDE; //! Creates a simple ITriangleSelector, based on an animated mesh scene node. //! Details of the mesh associated with the node will be extracted internally. //! Call ITriangleSelector::update() to have the triangle selector updated based //! on the current frame of the animated mesh scene node. //! \param: The animated mesh scene node from which to build the selector - virtual ITriangleSelector* createTriangleSelector(IAnimatedMeshSceneNode* node, bool separateMeshbuffers) _IRR_OVERRIDE_; + virtual ITriangleSelector* createTriangleSelector(IAnimatedMeshSceneNode* node, bool separateMeshbuffers) IRR_OVERRIDE; //! Creates a simple ITriangleSelector, based on a mesh. virtual ITriangleSelector* createOctreeTriangleSelector(IMesh* mesh, - ISceneNode* node, s32 minimalPolysPerNode) _IRR_OVERRIDE_; + ISceneNode* node, s32 minimalPolysPerNode) IRR_OVERRIDE; //! Creates a simple ITriangleSelector, based on a meshbuffer. virtual ITriangleSelector* createOctreeTriangleSelector(IMeshBuffer* meshBuffer, irr::u32 materialIndex, - ISceneNode* node, s32 minimalPolysPerNode=32) _IRR_OVERRIDE_; + ISceneNode* node, s32 minimalPolysPerNode=32) IRR_OVERRIDE; //! Creates a simple dynamic ITriangleSelector, based on a axis aligned bounding box. virtual ITriangleSelector* createTriangleSelectorFromBoundingBox( - ISceneNode* node) _IRR_OVERRIDE_; + ISceneNode* node) IRR_OVERRIDE; //! Creates a meta triangle selector. - virtual IMetaTriangleSelector* createMetaTriangleSelector() _IRR_OVERRIDE_; + virtual IMetaTriangleSelector* createMetaTriangleSelector() IRR_OVERRIDE; //! Creates a triangle selector which can select triangles from a terrain scene node //! \param: Pointer to the created terrain scene node //! \param: Level of detail, 0 for highest detail. virtual ITriangleSelector* createTerrainTriangleSelector( - ITerrainSceneNode* node, s32 LOD=0) _IRR_OVERRIDE_; + ITerrainSceneNode* node, s32 LOD=0) IRR_OVERRIDE; //! Adds an external mesh loader. - virtual void addExternalMeshLoader(IMeshLoader* externalLoader) _IRR_OVERRIDE_; + virtual void addExternalMeshLoader(IMeshLoader* externalLoader) IRR_OVERRIDE; //! Returns the number of mesh loaders supported by Irrlicht at this time - virtual u32 getMeshLoaderCount() const _IRR_OVERRIDE_; + virtual u32 getMeshLoaderCount() const IRR_OVERRIDE; //! Retrieve the given mesh loader - virtual IMeshLoader* getMeshLoader(u32 index) const _IRR_OVERRIDE_; + virtual IMeshLoader* getMeshLoader(u32 index) const IRR_OVERRIDE; //! Adds an external scene loader. - virtual void addExternalSceneLoader(ISceneLoader* externalLoader) _IRR_OVERRIDE_; + virtual void addExternalSceneLoader(ISceneLoader* externalLoader) IRR_OVERRIDE; //! Returns the number of scene loaders supported by Irrlicht at this time - virtual u32 getSceneLoaderCount() const _IRR_OVERRIDE_; + virtual u32 getSceneLoaderCount() const IRR_OVERRIDE; //! Retrieve the given scene loader - virtual ISceneLoader* getSceneLoader(u32 index) const _IRR_OVERRIDE_; + virtual ISceneLoader* getSceneLoader(u32 index) const IRR_OVERRIDE; //! Returns a pointer to the scene collision manager. - virtual ISceneCollisionManager* getSceneCollisionManager() _IRR_OVERRIDE_; + virtual ISceneCollisionManager* getSceneCollisionManager() IRR_OVERRIDE; //! Returns a pointer to the mesh manipulator. - virtual IMeshManipulator* getMeshManipulator() _IRR_OVERRIDE_; + virtual IMeshManipulator* getMeshManipulator() IRR_OVERRIDE; //! Sets the color of stencil buffers shadows drawn by the scene manager. - virtual void setShadowColor(video::SColor color) _IRR_OVERRIDE_; + virtual void setShadowColor(video::SColor color) IRR_OVERRIDE; //! Returns the current color of shadows. - virtual video::SColor getShadowColor() const _IRR_OVERRIDE_; + virtual video::SColor getShadowColor() const IRR_OVERRIDE; //! Create a shadow volume scene node to be used with custom nodes - virtual IShadowVolumeSceneNode* createShadowVolumeSceneNode(const IMesh* shadowMesh, ISceneNode* parent, s32 id, bool zfailmethod, f32 infinity) _IRR_OVERRIDE_; + virtual IShadowVolumeSceneNode* createShadowVolumeSceneNode(const IMesh* shadowMesh, ISceneNode* parent, s32 id, bool zfailmethod, f32 infinity) IRR_OVERRIDE; //! Adds a scene node to the deletion queue. - virtual void addToDeletionQueue(ISceneNode* node) _IRR_OVERRIDE_; + virtual void addToDeletionQueue(ISceneNode* node) IRR_OVERRIDE; //! Returns the first scene node with the specified id. - virtual ISceneNode* getSceneNodeFromId(s32 id, ISceneNode* start=0) _IRR_OVERRIDE_; + virtual ISceneNode* getSceneNodeFromId(s32 id, ISceneNode* start=0) IRR_OVERRIDE; //! Returns the first scene node with the specified name. - virtual ISceneNode* getSceneNodeFromName(const c8* name, ISceneNode* start=0) _IRR_OVERRIDE_; + virtual ISceneNode* getSceneNodeFromName(const c8* name, ISceneNode* start=0) IRR_OVERRIDE; //! Returns the first scene node with the specified type. - virtual ISceneNode* getSceneNodeFromType(scene::ESCENE_NODE_TYPE type, ISceneNode* start=0) _IRR_OVERRIDE_; + virtual ISceneNode* getSceneNodeFromType(scene::ESCENE_NODE_TYPE type, ISceneNode* start=0) IRR_OVERRIDE; //! returns scene nodes by type. - virtual void getSceneNodesFromType(ESCENE_NODE_TYPE type, core::array& outNodes, ISceneNode* start=0) _IRR_OVERRIDE_; + virtual void getSceneNodesFromType(ESCENE_NODE_TYPE type, core::array& outNodes, ISceneNode* start=0) IRR_OVERRIDE; //! Posts an input event to the environment. Usually you do not have to //! use this method, it is used by the internal engine. - virtual bool postEventFromUser(const SEvent& event) _IRR_OVERRIDE_; + virtual bool postEventFromUser(const SEvent& event) IRR_OVERRIDE; //! Clears the whole scene. All scene nodes are removed. - virtual void clear() _IRR_OVERRIDE_; + virtual void clear() IRR_OVERRIDE; //! Removes all children of this scene node - virtual void removeAll() _IRR_OVERRIDE_; + virtual void removeAll() IRR_OVERRIDE; //! Returns interface to the parameters set in this scene. - virtual io::IAttributes* getParameters() _IRR_OVERRIDE_; + virtual io::IAttributes* getParameters() IRR_OVERRIDE; //! Returns current render pass. - virtual E_SCENE_NODE_RENDER_PASS getSceneNodeRenderPass() const _IRR_OVERRIDE_; + virtual E_SCENE_NODE_RENDER_PASS getSceneNodeRenderPass() const IRR_OVERRIDE; //! Creates a new scene manager. - virtual ISceneManager* createNewSceneManager(bool cloneContent) _IRR_OVERRIDE_; + virtual ISceneManager* createNewSceneManager(bool cloneContent) IRR_OVERRIDE; //! Returns type of the scene node - virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_SCENE_MANAGER; } + virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_SCENE_MANAGER; } //! Returns the default scene node factory which can create all built in scene nodes - virtual ISceneNodeFactory* getDefaultSceneNodeFactory() _IRR_OVERRIDE_; + virtual ISceneNodeFactory* getDefaultSceneNodeFactory() IRR_OVERRIDE; //! Adds a scene node factory to the scene manager. /** Use this to extend the scene manager with new scene node types which it should be able to create automatically, for example when loading data from xml files. */ - virtual void registerSceneNodeFactory(ISceneNodeFactory* factoryToAdd) _IRR_OVERRIDE_; + virtual void registerSceneNodeFactory(ISceneNodeFactory* factoryToAdd) IRR_OVERRIDE; //! Returns amount of registered scene node factories. - virtual u32 getRegisteredSceneNodeFactoryCount() const _IRR_OVERRIDE_; + virtual u32 getRegisteredSceneNodeFactoryCount() const IRR_OVERRIDE; //! Returns a scene node factory by index - virtual ISceneNodeFactory* getSceneNodeFactory(u32 index) _IRR_OVERRIDE_; + virtual ISceneNodeFactory* getSceneNodeFactory(u32 index) IRR_OVERRIDE; //! Returns a typename from a scene node type or null if not found - virtual const c8* getSceneNodeTypeName(ESCENE_NODE_TYPE type) _IRR_OVERRIDE_; + virtual const c8* getSceneNodeTypeName(ESCENE_NODE_TYPE type) IRR_OVERRIDE; //! Returns a typename from a scene node animator type or null if not found - virtual const c8* getAnimatorTypeName(ESCENE_NODE_ANIMATOR_TYPE type) _IRR_OVERRIDE_; + virtual const c8* getAnimatorTypeName(ESCENE_NODE_ANIMATOR_TYPE type) IRR_OVERRIDE; //! Adds a scene node to the scene by name - virtual ISceneNode* addSceneNode(const char* sceneNodeTypeName, ISceneNode* parent=0) _IRR_OVERRIDE_; + virtual ISceneNode* addSceneNode(const char* sceneNodeTypeName, ISceneNode* parent=0) IRR_OVERRIDE; //! creates a scene node animator based on its type name - virtual ISceneNodeAnimator* createSceneNodeAnimator(const char* typeName, ISceneNode* target=0) _IRR_OVERRIDE_; + virtual ISceneNodeAnimator* createSceneNodeAnimator(const char* typeName, ISceneNode* target=0) IRR_OVERRIDE; //! Returns the default scene node animator factory which can create all built-in scene node animators - virtual ISceneNodeAnimatorFactory* getDefaultSceneNodeAnimatorFactory() _IRR_OVERRIDE_; + virtual ISceneNodeAnimatorFactory* getDefaultSceneNodeAnimatorFactory() IRR_OVERRIDE; //! Adds a scene node animator factory to the scene manager. - virtual void registerSceneNodeAnimatorFactory(ISceneNodeAnimatorFactory* factoryToAdd) _IRR_OVERRIDE_; + virtual void registerSceneNodeAnimatorFactory(ISceneNodeAnimatorFactory* factoryToAdd) IRR_OVERRIDE; //! Returns amount of registered scene node animator factories. - virtual u32 getRegisteredSceneNodeAnimatorFactoryCount() const _IRR_OVERRIDE_; + virtual u32 getRegisteredSceneNodeAnimatorFactoryCount() const IRR_OVERRIDE; //! Returns a scene node animator factory by index - virtual ISceneNodeAnimatorFactory* getSceneNodeAnimatorFactory(u32 index) _IRR_OVERRIDE_; + virtual ISceneNodeAnimatorFactory* getSceneNodeAnimatorFactory(u32 index) IRR_OVERRIDE; //! Saves the current scene into a file. - virtual bool saveScene(const io::path& filename, ISceneUserDataSerializer* userDataSerializer=0, ISceneNode* node=0) _IRR_OVERRIDE_; + virtual bool saveScene(const io::path& filename, ISceneUserDataSerializer* userDataSerializer=0, ISceneNode* node=0) IRR_OVERRIDE; //! Saves the current scene into a file. - virtual bool saveScene(io::IWriteFile* file, ISceneUserDataSerializer* userDataSerializer=0, ISceneNode* node=0) _IRR_OVERRIDE_; + virtual bool saveScene(io::IWriteFile* file, ISceneUserDataSerializer* userDataSerializer=0, ISceneNode* node=0) IRR_OVERRIDE; //! Saves the current scene into a file. - virtual bool saveScene(io::IXMLWriter* writer, const io::path& currentPath, ISceneUserDataSerializer* userDataSerializer=0, ISceneNode* node=0) _IRR_OVERRIDE_; + virtual bool saveScene(io::IXMLWriter* writer, const io::path& currentPath, ISceneUserDataSerializer* userDataSerializer=0, ISceneNode* node=0) IRR_OVERRIDE; //! Loads a scene. Note that the current scene is not cleared before. - virtual bool loadScene(const io::path& filename, ISceneUserDataSerializer* userDataSerializer=0, ISceneNode* rootNode=0) _IRR_OVERRIDE_; + virtual bool loadScene(const io::path& filename, ISceneUserDataSerializer* userDataSerializer=0, ISceneNode* rootNode=0) IRR_OVERRIDE; //! Loads a scene. Note that the current scene is not cleared before. - virtual bool loadScene(io::IReadFile* file, ISceneUserDataSerializer* userDataSerializer=0, ISceneNode* rootNode=0) _IRR_OVERRIDE_; + virtual bool loadScene(io::IReadFile* file, ISceneUserDataSerializer* userDataSerializer=0, ISceneNode* rootNode=0) IRR_OVERRIDE; //! 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. - 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 a mesh writer implementation if available - virtual IMeshWriter* createMeshWriter(EMESH_WRITER_TYPE type) _IRR_OVERRIDE_; + virtual IMeshWriter* createMeshWriter(EMESH_WRITER_TYPE type) IRR_OVERRIDE; //! Get a skinned mesh, which is not available as header-only code - virtual ISkinnedMesh* createSkinnedMesh() _IRR_OVERRIDE_; + virtual ISkinnedMesh* createSkinnedMesh() IRR_OVERRIDE; //! Sets ambient color of the scene - virtual void setAmbientLight(const video::SColorf &ambientColor) _IRR_OVERRIDE_; + virtual void setAmbientLight(const video::SColorf &ambientColor) IRR_OVERRIDE; //! Returns ambient color of the scene - virtual const video::SColorf& getAmbientLight() const _IRR_OVERRIDE_; + virtual const video::SColorf& getAmbientLight() const IRR_OVERRIDE; //! Register a custom callbacks manager which gets callbacks during scene rendering. - virtual void setLightManager(ILightManager* lightManager) _IRR_OVERRIDE_; + virtual void setLightManager(ILightManager* lightManager) IRR_OVERRIDE; //! Get current render time. - virtual E_SCENE_NODE_RENDER_PASS getCurrentRenderPass() const _IRR_OVERRIDE_ { return CurrentRenderPass; } + virtual E_SCENE_NODE_RENDER_PASS getCurrentRenderPass() const IRR_OVERRIDE { return CurrentRenderPass; } //! Set current render time. - virtual void setCurrentRenderPass(E_SCENE_NODE_RENDER_PASS nextPass) _IRR_OVERRIDE_ { CurrentRenderPass = nextPass; } + virtual void setCurrentRenderPass(E_SCENE_NODE_RENDER_PASS nextPass) IRR_OVERRIDE { CurrentRenderPass = nextPass; } //! Get an instance of a geometry creator. - virtual const IGeometryCreator* getGeometryCreator(void) const _IRR_OVERRIDE_ { return GeometryCreator; } + virtual const IGeometryCreator* getGeometryCreator(void) const IRR_OVERRIDE { return GeometryCreator; } //! returns if node is culled - virtual bool isCulled(const ISceneNode* node) const _IRR_OVERRIDE_; + virtual bool isCulled(const ISceneNode* node) const IRR_OVERRIDE; private: @@ -673,4 +673,3 @@ namespace scene } // end namespace scene #endif - diff --git a/source/Irrlicht/CSceneNodeAnimatorCameraFPS.h b/source/Irrlicht/CSceneNodeAnimatorCameraFPS.h index 127ea590..65acdf41 100644 --- a/source/Irrlicht/CSceneNodeAnimatorCameraFPS.h +++ b/source/Irrlicht/CSceneNodeAnimatorCameraFPS.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED #include "ISceneNodeAnimatorCameraFPS.h" #include "vector2d.h" @@ -36,31 +36,31 @@ namespace scene virtual ~CSceneNodeAnimatorCameraFPS(); //! Animates the scene node, currently only works on cameras - virtual void animateNode(ISceneNode* node, u32 timeMs) _IRR_OVERRIDE_; + virtual void animateNode(ISceneNode* node, u32 timeMs) IRR_OVERRIDE; //! Event receiver - virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; + virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE; //! Returns the speed of movement in units per second - virtual f32 getMoveSpeed() const _IRR_OVERRIDE_; + virtual f32 getMoveSpeed() const IRR_OVERRIDE; //! Sets the speed of movement in units per second - virtual void setMoveSpeed(f32 moveSpeed) _IRR_OVERRIDE_; + virtual void setMoveSpeed(f32 moveSpeed) IRR_OVERRIDE; //! Returns the rotation speed when moving mouse - virtual f32 getRotateSpeed() const _IRR_OVERRIDE_; + virtual f32 getRotateSpeed() const IRR_OVERRIDE; //! Set the rotation speed when moving mouse - virtual void setRotateSpeed(f32 rotateSpeed) _IRR_OVERRIDE_; + virtual void setRotateSpeed(f32 rotateSpeed) IRR_OVERRIDE; //! Returns the rotation speed when using keyboard - virtual f32 getRotateSpeedKeyboard() const _IRR_OVERRIDE_ + virtual f32 getRotateSpeedKeyboard() const IRR_OVERRIDE { return RotateSpeedKeyboard; } //! Set the rotation speed when using keyboard - virtual void setRotateSpeedKeyboard(f32 rotateSpeed) _IRR_OVERRIDE_ + virtual void setRotateSpeedKeyboard(f32 rotateSpeed) IRR_OVERRIDE { RotateSpeedKeyboard = rotateSpeed; } @@ -68,31 +68,31 @@ namespace scene //! Sets the keyboard mapping for this animator (old style) //! \param keymap: an array of keyboard mappings, see SKeyMap //! \param count: the size of the keyboard map array - virtual void setKeyMap(SKeyMap *map, u32 count) _IRR_OVERRIDE_; + virtual void setKeyMap(SKeyMap *map, u32 count) IRR_OVERRIDE; //! Sets the keyboard mapping for this animator //! \param keymap The new keymap array - virtual void setKeyMap(const core::array& keymap) _IRR_OVERRIDE_; + virtual void setKeyMap(const core::array& keymap) IRR_OVERRIDE; //! Gets the keyboard mapping for this animator - virtual const core::array& getKeyMap() const _IRR_OVERRIDE_; + virtual const core::array& getKeyMap() const IRR_OVERRIDE; //! Sets whether vertical movement should be allowed. - virtual void setVerticalMovement(bool allow) _IRR_OVERRIDE_; + virtual void setVerticalMovement(bool allow) IRR_OVERRIDE; //! Sets whether the Y axis of the mouse should be inverted. /** If enabled then moving the mouse down will cause the camera to look up. It is disabled by default. */ - virtual void setInvertMouse(bool invert) _IRR_OVERRIDE_; + virtual void setInvertMouse(bool invert) IRR_OVERRIDE; //! This animator will receive events when attached to the active camera - virtual bool isEventReceiverEnabled() const _IRR_OVERRIDE_ + virtual bool isEventReceiverEnabled() const IRR_OVERRIDE { return true; } //! Returns the type of this animator - virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_ + virtual ESCENE_NODE_ANIMATOR_TYPE getType() const IRR_OVERRIDE { return ESNAT_CAMERA_FPS; } @@ -101,13 +101,13 @@ namespace scene /** Please note that you will have to drop (IReferenceCounted::drop()) the returned pointer once you're done with it. */ - virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) _IRR_OVERRIDE_; + virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) IRR_OVERRIDE; //! Writes attributes of the scene node animator. - 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 animator. - 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: @@ -141,5 +141,4 @@ namespace scene } // end namespace scene } // end namespace irr -#endif // __C_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED__ - +#endif // IRR_C_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED diff --git a/source/Irrlicht/CSceneNodeAnimatorCameraMaya.h b/source/Irrlicht/CSceneNodeAnimatorCameraMaya.h index de03358e..e1031236 100644 --- a/source/Irrlicht/CSceneNodeAnimatorCameraMaya.h +++ b/source/Irrlicht/CSceneNodeAnimatorCameraMaya.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED #include "ISceneNodeAnimatorCameraMaya.h" #include "ICameraSceneNode.h" @@ -35,49 +35,49 @@ namespace scene virtual ~CSceneNodeAnimatorCameraMaya(); //! Animates the scene node, currently only works on cameras - virtual void animateNode(ISceneNode* node, u32 timeMs) _IRR_OVERRIDE_; + virtual void animateNode(ISceneNode* node, u32 timeMs) IRR_OVERRIDE; //! Event receiver - virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_; + virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE; //! Returns the speed of movement in units per millisecond - virtual f32 getMoveSpeed() const _IRR_OVERRIDE_; + virtual f32 getMoveSpeed() const IRR_OVERRIDE; //! Sets the speed of movement in units per millisecond - virtual void setMoveSpeed(f32 moveSpeed) _IRR_OVERRIDE_; + virtual void setMoveSpeed(f32 moveSpeed) IRR_OVERRIDE; //! Returns the rotation speed - virtual f32 getRotateSpeed() const _IRR_OVERRIDE_; + virtual f32 getRotateSpeed() const IRR_OVERRIDE; //! Set the rotation speed - virtual void setRotateSpeed(f32 rotateSpeed) _IRR_OVERRIDE_; + virtual void setRotateSpeed(f32 rotateSpeed) IRR_OVERRIDE; //! Returns the zoom speed - virtual f32 getZoomSpeed() const _IRR_OVERRIDE_; + virtual f32 getZoomSpeed() const IRR_OVERRIDE; //! Set the zoom speed - virtual void setZoomSpeed(f32 zoomSpeed) _IRR_OVERRIDE_; + virtual void setZoomSpeed(f32 zoomSpeed) IRR_OVERRIDE; //! Returns the current distance, i.e. orbit radius - virtual f32 getDistance() const _IRR_OVERRIDE_; + virtual f32 getDistance() const IRR_OVERRIDE; //! Set the distance - virtual void setDistance(f32 distance) _IRR_OVERRIDE_; + virtual void setDistance(f32 distance) IRR_OVERRIDE; //! Set the minimal distance to the camera target for zoom - virtual void setTargetMinDistance(f32 minDistance) _IRR_OVERRIDE_; + virtual void setTargetMinDistance(f32 minDistance) IRR_OVERRIDE; //! Returns the minimal distance to the camera target for zoom - virtual f32 getTargetMinDistance() const _IRR_OVERRIDE_; + virtual f32 getTargetMinDistance() const IRR_OVERRIDE; //! This animator will receive events when attached to the active camera - virtual bool isEventReceiverEnabled() const _IRR_OVERRIDE_ + virtual bool isEventReceiverEnabled() const IRR_OVERRIDE { return true; } //! Returns type of the scene node - virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_ + virtual ESCENE_NODE_ANIMATOR_TYPE getType() const IRR_OVERRIDE { return ESNAT_CAMERA_MAYA; } @@ -86,13 +86,13 @@ namespace scene /** Please note that you will have to drop (IReferenceCounted::drop()) the returned pointer after calling this. */ - virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) _IRR_OVERRIDE_; + virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) IRR_OVERRIDE; //! Writes attributes of the scene node animator. - 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 animator. - 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: @@ -127,4 +127,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneNodeAnimatorCollisionResponse.h b/source/Irrlicht/CSceneNodeAnimatorCollisionResponse.h index 1d490a9e..2ebea321 100644 --- a/source/Irrlicht/CSceneNodeAnimatorCollisionResponse.h +++ b/source/Irrlicht/CSceneNodeAnimatorCollisionResponse.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SCENE_NODE_ANIMATOR_COLLISION_RESPONSE_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_COLLISION_RESPONSE_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_COLLISION_RESPONSE_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_COLLISION_RESPONSE_H_INCLUDED #include "ISceneNodeAnimatorCollisionResponse.h" @@ -38,86 +38,86 @@ namespace scene //! Returns if the attached scene node is falling, which means that //! there is no blocking wall from the scene node in the direction of //! the gravity. - virtual bool isFalling() const _IRR_OVERRIDE_; + virtual bool isFalling() const IRR_OVERRIDE; //! Sets the radius of the ellipsoid with which collision detection and //! response is done. - virtual void setEllipsoidRadius(const core::vector3df& radius) _IRR_OVERRIDE_; + virtual void setEllipsoidRadius(const core::vector3df& radius) IRR_OVERRIDE; //! Returns the radius of the ellipsoid with which the collision detection and //! response is done. - virtual core::vector3df getEllipsoidRadius() const _IRR_OVERRIDE_; + virtual core::vector3df getEllipsoidRadius() const IRR_OVERRIDE; //! Sets the gravity of the environment. - virtual void setGravity(const core::vector3df& gravity) _IRR_OVERRIDE_; + virtual void setGravity(const core::vector3df& gravity) IRR_OVERRIDE; //! 'Jump' the animator, by adding a jump speed opposite to its gravity - virtual void jump(f32 jumpSpeed) _IRR_OVERRIDE_; + virtual void jump(f32 jumpSpeed) IRR_OVERRIDE; //! Should the Target react on collision ( default = true ) - virtual void setAnimateTarget ( bool enable ) _IRR_OVERRIDE_; - virtual bool getAnimateTarget () const _IRR_OVERRIDE_; + virtual void setAnimateTarget ( bool enable ) IRR_OVERRIDE; + virtual bool getAnimateTarget () const IRR_OVERRIDE; //! Returns current vector of gravity. - virtual core::vector3df getGravity() const _IRR_OVERRIDE_; + virtual core::vector3df getGravity() const IRR_OVERRIDE; //! Sets the translation of the ellipsoid for collision detection. - virtual void setEllipsoidTranslation(const core::vector3df &translation) _IRR_OVERRIDE_; + virtual void setEllipsoidTranslation(const core::vector3df &translation) IRR_OVERRIDE; //! Returns the translation of the ellipsoid for collision detection. - virtual core::vector3df getEllipsoidTranslation() const _IRR_OVERRIDE_; + virtual core::vector3df getEllipsoidTranslation() const IRR_OVERRIDE; //! Sets a triangle selector holding all triangles of the world with which //! the scene node may collide. - virtual void setWorld(ITriangleSelector* newWorld) _IRR_OVERRIDE_; + virtual void setWorld(ITriangleSelector* newWorld) IRR_OVERRIDE; //! Returns the current triangle selector containing all triangles for //! collision detection. - virtual ITriangleSelector* getWorld() const _IRR_OVERRIDE_; + virtual ITriangleSelector* getWorld() const IRR_OVERRIDE; //! animates a scene node - virtual void animateNode(ISceneNode* node, u32 timeMs) _IRR_OVERRIDE_; + virtual void animateNode(ISceneNode* node, u32 timeMs) IRR_OVERRIDE; //! Writes attributes of the scene node animator. - 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 animator. - 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 animator - virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_ { return ESNAT_COLLISION_RESPONSE; } + virtual ESCENE_NODE_ANIMATOR_TYPE getType() const IRR_OVERRIDE { return ESNAT_COLLISION_RESPONSE; } //! Creates a clone of this animator. /** Please note that you will have to drop (IReferenceCounted::drop()) the returned pointer after calling this. */ - virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) _IRR_OVERRIDE_; + virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) IRR_OVERRIDE; //! Set the single node that this animator will act on. - virtual void setTargetNode(ISceneNode * node) _IRR_OVERRIDE_ { setNode(node); } + virtual void setTargetNode(ISceneNode * node) IRR_OVERRIDE { setNode(node); } //! Gets the single node that this animator is acting on. - virtual ISceneNode* getTargetNode(void) const _IRR_OVERRIDE_ { return Object; } + virtual ISceneNode* getTargetNode(void) const IRR_OVERRIDE { return Object; } //! Returns true if a collision occurred during the last animateNode() - virtual bool collisionOccurred() const _IRR_OVERRIDE_ { return CollisionOccurred; } + virtual bool collisionOccurred() const IRR_OVERRIDE { return CollisionOccurred; } //! Returns the last point of collision. - virtual const core::vector3df & getCollisionPoint() const _IRR_OVERRIDE_ { return CollisionPoint; } + virtual const core::vector3df & getCollisionPoint() const IRR_OVERRIDE { return CollisionPoint; } //! Returns the last triangle that caused a collision. - virtual const core::triangle3df & getCollisionTriangle() const _IRR_OVERRIDE_ { return CollisionTriangle; } + virtual const core::triangle3df & getCollisionTriangle() const IRR_OVERRIDE { return CollisionTriangle; } - virtual const core::vector3df & getCollisionResultPosition(void) const _IRR_OVERRIDE_ { return CollisionResultPosition; } + virtual const core::vector3df & getCollisionResultPosition(void) const IRR_OVERRIDE { return CollisionResultPosition; } - virtual ISceneNode* getCollisionNode(void) const _IRR_OVERRIDE_ { return CollisionNode; } + virtual ISceneNode* getCollisionNode(void) const IRR_OVERRIDE { return CollisionNode; } //! Sets a callback interface which will be called if a collision occurs. /** \param callback: collision callback handler that will be called when a collision occurs. Set this to 0 to disable the callback. */ - virtual void setCollisionCallback(ICollisionCallback* callback) _IRR_OVERRIDE_; + virtual void setCollisionCallback(ICollisionCallback* callback) IRR_OVERRIDE; private: @@ -154,4 +154,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneNodeAnimatorDelete.h b/source/Irrlicht/CSceneNodeAnimatorDelete.h index 2e78b416..1144b019 100644 --- a/source/Irrlicht/CSceneNodeAnimatorDelete.h +++ b/source/Irrlicht/CSceneNodeAnimatorDelete.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SCENE_NODE_ANIMATOR_DELETE_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_DELETE_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_DELETE_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_DELETE_H_INCLUDED #include "ISceneNodeAnimatorFinishing.h" @@ -19,10 +19,10 @@ namespace scene CSceneNodeAnimatorDelete(ISceneManager* manager, u32 when); //! animates a scene node - virtual void animateNode(ISceneNode* node, u32 timeMs) _IRR_OVERRIDE_; + virtual void animateNode(ISceneNode* node, u32 timeMs) IRR_OVERRIDE; //! Returns type of the scene node animator - virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_ + virtual ESCENE_NODE_ANIMATOR_TYPE getType() const IRR_OVERRIDE { return ESNAT_DELETION; } @@ -31,7 +31,7 @@ namespace scene /** Please note that you will have to drop (IReferenceCounted::drop()) the returned pointer after calling this. */ - virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) _IRR_OVERRIDE_; + virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) IRR_OVERRIDE; private: @@ -43,4 +43,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneNodeAnimatorFlyCircle.h b/source/Irrlicht/CSceneNodeAnimatorFlyCircle.h index ee838755..bcc9151a 100644 --- a/source/Irrlicht/CSceneNodeAnimatorFlyCircle.h +++ b/source/Irrlicht/CSceneNodeAnimatorFlyCircle.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SCENE_NODE_ANIMATOR_FLY_CIRCLE_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_FLY_CIRCLE_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_FLY_CIRCLE_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_FLY_CIRCLE_H_INCLUDED #include "ISceneNode.h" @@ -22,22 +22,22 @@ namespace scene f32 radiusEllipsoid); //! animates a scene node - virtual void animateNode(ISceneNode* node, u32 timeMs) _IRR_OVERRIDE_; + virtual void animateNode(ISceneNode* node, u32 timeMs) IRR_OVERRIDE; //! Writes attributes of the scene node animator. - 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 animator. - 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 animator - virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_ { return ESNAT_FLY_CIRCLE; } + virtual ESCENE_NODE_ANIMATOR_TYPE getType() const IRR_OVERRIDE { return ESNAT_FLY_CIRCLE; } //! Creates a clone of this animator. /** Please note that you will have to drop (IReferenceCounted::drop()) the returned pointer after calling this. */ - virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) _IRR_OVERRIDE_; + virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) IRR_OVERRIDE; private: // do some initial calculations @@ -60,4 +60,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneNodeAnimatorFlyStraight.h b/source/Irrlicht/CSceneNodeAnimatorFlyStraight.h index c7040a00..49bf62fd 100644 --- a/source/Irrlicht/CSceneNodeAnimatorFlyStraight.h +++ b/source/Irrlicht/CSceneNodeAnimatorFlyStraight.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SCENE_NODE_ANIMATOR_FLY_STRAIGHT_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_FLY_STRAIGHT_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_FLY_STRAIGHT_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_FLY_STRAIGHT_H_INCLUDED #include "ISceneNodeAnimatorFinishing.h" @@ -22,21 +22,21 @@ namespace scene bool loop, u32 now, bool pingpong); //! animates a scene node - virtual void animateNode(ISceneNode* node, u32 timeMs) _IRR_OVERRIDE_; + virtual void animateNode(ISceneNode* node, u32 timeMs) IRR_OVERRIDE; //! Writes attributes of the scene node animator. - 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 animator. - 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 animator - virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_ { return ESNAT_FLY_STRAIGHT; } + virtual ESCENE_NODE_ANIMATOR_TYPE getType() const IRR_OVERRIDE { return ESNAT_FLY_STRAIGHT; } //! Creates a clone of this animator. /** Please note that you will have to drop (IReferenceCounted::drop()) the returned pointer after calling this. */ - virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) _IRR_OVERRIDE_; + virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CSceneNodeAnimatorFollowSpline.h b/source/Irrlicht/CSceneNodeAnimatorFollowSpline.h index c2864d23..0a5c719f 100644 --- a/source/Irrlicht/CSceneNodeAnimatorFollowSpline.h +++ b/source/Irrlicht/CSceneNodeAnimatorFollowSpline.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SCENE_NODE_ANIMATOR_FOLLOW_SPLINE_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_FOLLOW_SPLINE_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_FOLLOW_SPLINE_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_FOLLOW_SPLINE_H_INCLUDED #include "ISceneNode.h" #include "irrArray.h" @@ -25,22 +25,22 @@ namespace scene f32 speed = 1.0f, f32 tightness = 0.5f, bool loop=true, bool pingpong=false, bool steer=false); //! animates a scene node - virtual void animateNode(ISceneNode* node, u32 timeMs) _IRR_OVERRIDE_; + virtual void animateNode(ISceneNode* node, u32 timeMs) IRR_OVERRIDE; //! Writes attributes of the scene node animator. - 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 animator. - 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 animator - virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_ { return ESNAT_FOLLOW_SPLINE; } + virtual ESCENE_NODE_ANIMATOR_TYPE getType() const IRR_OVERRIDE { return ESNAT_FOLLOW_SPLINE; } //! Creates a clone of this animator. /** Please note that you will have to drop (IReferenceCounted::drop()) the returned pointer after calling this. */ - virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) _IRR_OVERRIDE_; + virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) IRR_OVERRIDE; protected: @@ -60,4 +60,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneNodeAnimatorRotation.h b/source/Irrlicht/CSceneNodeAnimatorRotation.h index a62a8ed4..837451a0 100644 --- a/source/Irrlicht/CSceneNodeAnimatorRotation.h +++ b/source/Irrlicht/CSceneNodeAnimatorRotation.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SCENE_NODE_ANIMATOR_ROTATION_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_ROTATION_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_ROTATION_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_ROTATION_H_INCLUDED #include "ISceneNode.h" @@ -19,21 +19,21 @@ namespace scene CSceneNodeAnimatorRotation(u32 time, const core::vector3df& rotation); //! animates a scene node - virtual void animateNode(ISceneNode* node, u32 timeMs) _IRR_OVERRIDE_; + virtual void animateNode(ISceneNode* node, u32 timeMs) IRR_OVERRIDE; //! Writes attributes of the scene node animator. - 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 animator. - 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 animator - virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_ { return ESNAT_ROTATION; } + virtual ESCENE_NODE_ANIMATOR_TYPE getType() const IRR_OVERRIDE { return ESNAT_ROTATION; } //! Creates a clone of this animator. /** Please note that you will have to drop (IReferenceCounted::drop()) the returned pointer after calling this. */ - virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) _IRR_OVERRIDE_; + virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) IRR_OVERRIDE; private: @@ -45,4 +45,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CSceneNodeAnimatorTexture.h b/source/Irrlicht/CSceneNodeAnimatorTexture.h index 08c1a727..c0a2689c 100644 --- a/source/Irrlicht/CSceneNodeAnimatorTexture.h +++ b/source/Irrlicht/CSceneNodeAnimatorTexture.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SCENE_NODE_ANIMATOR_TEXTURE_H_INCLUDED__ -#define __C_SCENE_NODE_ANIMATOR_TEXTURE_H_INCLUDED__ +#ifndef IRR_C_SCENE_NODE_ANIMATOR_TEXTURE_H_INCLUDED +#define IRR_C_SCENE_NODE_ANIMATOR_TEXTURE_H_INCLUDED #include "irrArray.h" #include "ISceneNodeAnimatorFinishing.h" @@ -24,22 +24,22 @@ namespace scene virtual ~CSceneNodeAnimatorTexture(); //! animates a scene node - virtual void animateNode(ISceneNode* node, u32 timeMs) _IRR_OVERRIDE_; + virtual void animateNode(ISceneNode* node, u32 timeMs) IRR_OVERRIDE; //! Writes attributes of the scene node animator. - 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 animator. - 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 animator - virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_ { return ESNAT_TEXTURE; } + virtual ESCENE_NODE_ANIMATOR_TYPE getType() const IRR_OVERRIDE { return ESNAT_TEXTURE; } //! Creates a clone of this animator. /** Please note that you will have to drop (IReferenceCounted::drop()) the returned pointer after calling this. */ - virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) _IRR_OVERRIDE_; + virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) IRR_OVERRIDE; private: @@ -56,4 +56,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CShadowVolumeSceneNode.h b/source/Irrlicht/CShadowVolumeSceneNode.h index 6501652e..1179c39c 100644 --- a/source/Irrlicht/CShadowVolumeSceneNode.h +++ b/source/Irrlicht/CShadowVolumeSceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SHADOW_VOLUME_SCENE_NODE_H_INCLUDED__ -#define __C_SHADOW_VOLUME_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_SHADOW_VOLUME_SCENE_NODE_H_INCLUDED +#define IRR_C_SHADOW_VOLUME_SCENE_NODE_H_INCLUDED #include "IShadowVolumeSceneNode.h" @@ -27,34 +27,34 @@ namespace scene //! Sets the mesh from which the shadow volume should be generated. /** To optimize shadow rendering, use a simpler mesh for shadows. */ - virtual void setShadowMesh(const IMesh* mesh) _IRR_OVERRIDE_; + virtual void setShadowMesh(const IMesh* mesh) IRR_OVERRIDE; //! Updates the shadow volumes for current light positions. /** Called each render cycle from Animated Mesh SceneNode render method. */ - virtual void updateShadowVolumes() _IRR_OVERRIDE_; + virtual void updateShadowVolumes() IRR_OVERRIDE; //! Set optimization used to create shadow volumes /** Default is ESV_SILHOUETTE_BY_POS. If the shadow looks bad then give ESV_NONE a try (which will be slower). */ - virtual void setOptimization(ESHADOWVOLUME_OPTIMIZATION optimization) _IRR_OVERRIDE_; + virtual void setOptimization(ESHADOWVOLUME_OPTIMIZATION optimization) IRR_OVERRIDE; //! Get currently active optimization used to create shadow volumes - virtual ESHADOWVOLUME_OPTIMIZATION getOptimization() const _IRR_OVERRIDE_ + virtual ESHADOWVOLUME_OPTIMIZATION getOptimization() const IRR_OVERRIDE { return Optimization; } //! pre render method - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; //! renders the node. - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! Returns type of the scene node - virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_SHADOW_VOLUME; } + virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_SHADOW_VOLUME; } private: diff --git a/source/Irrlicht/CSkinnedMesh.h b/source/Irrlicht/CSkinnedMesh.h index b39aa87b..b51c0384 100644 --- a/source/Irrlicht/CSkinnedMesh.h +++ b/source/Irrlicht/CSkinnedMesh.h @@ -4,8 +4,8 @@ //New skinned mesh -#ifndef __C_SKINNED_MESH_H_INCLUDED__ -#define __C_SKINNED_MESH_H_INCLUDED__ +#ifndef IRR_C_SKINNED_MESH_H_INCLUDED +#define IRR_C_SKINNED_MESH_H_INCLUDED #include "ISkinnedMesh.h" #include "SMeshBuffer.h" @@ -33,116 +33,116 @@ namespace scene virtual ~CSkinnedMesh(); //! 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. /** \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; //! Gets the frame count of the animated mesh. /** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated. The actual speed is set in the scene node the mesh is instantiated in.*/ - virtual void setAnimationSpeed(f32 fps) _IRR_OVERRIDE_; + virtual void setAnimationSpeed(f32 fps) IRR_OVERRIDE; //! returns the animated mesh based on a detail level (which is ignored) - 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; //! Animates this mesh's joints based on frame input //! blend: {0-old position, 1-New position} - virtual void animateMesh(f32 frame, f32 blend) _IRR_OVERRIDE_; + virtual void animateMesh(f32 frame, f32 blend) IRR_OVERRIDE; //! Preforms a software skin on this mesh based of joint positions - virtual void skinMesh() _IRR_OVERRIDE_; + virtual void skinMesh() IRR_OVERRIDE; //! returns amount of mesh buffers. - virtual u32 getMeshBufferCount() const _IRR_OVERRIDE_; + virtual u32 getMeshBufferCount() const IRR_OVERRIDE; //! 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 /** \param material: material to search for \return Returns the pointer to the mesh buffer or 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 - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! 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 - 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 - 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 - 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. - virtual E_ANIMATED_MESH_TYPE getMeshType() const _IRR_OVERRIDE_; + virtual E_ANIMATED_MESH_TYPE getMeshType() const IRR_OVERRIDE; //! Gets joint count. - virtual u32 getJointCount() const _IRR_OVERRIDE_; + virtual u32 getJointCount() const IRR_OVERRIDE; //! Gets the name of a joint. - virtual const c8* getJointName(u32 number) const _IRR_OVERRIDE_; + virtual const c8* getJointName(u32 number) const IRR_OVERRIDE; //! Gets a joint number from its name - virtual s32 getJointNumber(const c8* name) const _IRR_OVERRIDE_; + virtual s32 getJointNumber(const c8* name) const IRR_OVERRIDE; //! uses animation from another mesh - virtual bool useAnimationFrom(const ISkinnedMesh *mesh) _IRR_OVERRIDE_; + virtual bool useAnimationFrom(const ISkinnedMesh *mesh) IRR_OVERRIDE; //! Update Normals when Animating //! False= Don't (default) //! True = Update normals, slower - virtual void updateNormalsWhenAnimating(bool on) _IRR_OVERRIDE_; + virtual void updateNormalsWhenAnimating(bool on) IRR_OVERRIDE; //! Sets Interpolation Mode - virtual void setInterpolationMode(E_INTERPOLATION_MODE mode) _IRR_OVERRIDE_; + virtual void setInterpolationMode(E_INTERPOLATION_MODE mode) IRR_OVERRIDE; //! Convertes the mesh to contain tangent information - virtual void convertMeshToTangents() _IRR_OVERRIDE_; + virtual void convertMeshToTangents() IRR_OVERRIDE; //! Does the mesh have no animation - virtual bool isStatic() _IRR_OVERRIDE_; + virtual bool isStatic() IRR_OVERRIDE; //! (This feature is not implemented in irrlicht yet) - virtual bool setHardwareSkinning(bool on) _IRR_OVERRIDE_; + virtual bool setHardwareSkinning(bool on) IRR_OVERRIDE; //Interface for the mesh loaders (finalize should lock these functions, and they should have some prefix like loader_ //these functions will use the needed arrays, set values, etc to help the loaders //! exposed for loaders to add mesh buffers - virtual core::array &getMeshBuffers() _IRR_OVERRIDE_; + virtual core::array &getMeshBuffers() IRR_OVERRIDE; //! alternative method for adding joints - virtual core::array &getAllJoints() _IRR_OVERRIDE_; + virtual core::array &getAllJoints() IRR_OVERRIDE; //! alternative method for adding joints - virtual const core::array &getAllJoints() const _IRR_OVERRIDE_; + virtual const core::array &getAllJoints() const IRR_OVERRIDE; //! loaders should call this after populating the mesh - virtual void finalize() _IRR_OVERRIDE_; + virtual void finalize() IRR_OVERRIDE; //! Adds a new meshbuffer to the mesh, access it as last one - virtual SSkinMeshBuffer *addMeshBuffer() _IRR_OVERRIDE_; + virtual SSkinMeshBuffer *addMeshBuffer() IRR_OVERRIDE; //! Adds a new joint to the mesh, access it as last one - virtual SJoint *addJoint(SJoint *parent=0) _IRR_OVERRIDE_; + virtual SJoint *addJoint(SJoint *parent=0) IRR_OVERRIDE; //! Adds a new position key to the mesh, access it as last one - virtual SPositionKey *addPositionKey(SJoint *joint) _IRR_OVERRIDE_; + virtual SPositionKey *addPositionKey(SJoint *joint) IRR_OVERRIDE; //! Adds a new rotation key to the mesh, access it as last one - virtual SRotationKey *addRotationKey(SJoint *joint) _IRR_OVERRIDE_; + virtual SRotationKey *addRotationKey(SJoint *joint) IRR_OVERRIDE; //! Adds a new scale key to the mesh, access it as last one - virtual SScaleKey *addScaleKey(SJoint *joint) _IRR_OVERRIDE_; + virtual SScaleKey *addScaleKey(SJoint *joint) IRR_OVERRIDE; //! Adds a new weight to the mesh, access it as last one - virtual SWeight *addWeight(SJoint *joint) _IRR_OVERRIDE_; + virtual SWeight *addWeight(SJoint *joint) IRR_OVERRIDE; virtual void updateBoundingBox(void); @@ -212,4 +212,3 @@ private: } // end namespace irr #endif - diff --git a/source/Irrlicht/CSkyBoxSceneNode.h b/source/Irrlicht/CSkyBoxSceneNode.h index a153b50a..5bdcdefd 100644 --- a/source/Irrlicht/CSkyBoxSceneNode.h +++ b/source/Irrlicht/CSkyBoxSceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SKY_BOX_SCENE_NODE_H_INCLUDED__ -#define __C_SKY_BOX_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_SKY_BOX_SCENE_NODE_H_INCLUDED +#define IRR_C_SKY_BOX_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" #include "S3DVertex.h" @@ -23,29 +23,29 @@ namespace scene video::ITexture* right, video::ITexture* front, video::ITexture* back, ISceneNode* parent, ISceneManager* mgr, s32 id); - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; //! renders the node. - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! returns the material based on the zero based index i. To get the amount //! of materials used by this scene node, use getMaterialCount(). //! 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 //! 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. - virtual u32 getMaterialCount() const _IRR_OVERRIDE_; + virtual u32 getMaterialCount() const IRR_OVERRIDE; //! Returns type of the scene node - virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_SKY_BOX; } + virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_SKY_BOX; } //! 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: @@ -59,4 +59,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CSkyDomeSceneNode.h b/source/Irrlicht/CSkyDomeSceneNode.h index e1a8be0a..68d8c081 100644 --- a/source/Irrlicht/CSkyDomeSceneNode.h +++ b/source/Irrlicht/CSkyDomeSceneNode.h @@ -3,8 +3,8 @@ // For conditions of distribution and use, see copyright notice in irrlicht.h // Code for this scene node has been contributed by Anders la Cour-Harbo (alc) -#ifndef __C_SKY_DOME_SCENE_NODE_H_INCLUDED__ -#define __C_SKY_DOME_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_SKY_DOME_SCENE_NODE_H_INCLUDED +#define IRR_C_SKY_DOME_SCENE_NODE_H_INCLUDED #include "ISceneNode.h" #include "SMeshBuffer.h" @@ -21,16 +21,16 @@ class CSkyDomeSceneNode : public ISceneNode f32 texturePercentage, f32 spherePercentage, f32 radius, ISceneNode* parent, ISceneManager* smgr, s32 id); virtual ~CSkyDomeSceneNode(); - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; - virtual void render() _IRR_OVERRIDE_; - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; - virtual video::SMaterial& getMaterial(u32 i) _IRR_OVERRIDE_; - virtual u32 getMaterialCount() const _IRR_OVERRIDE_; - virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_SKY_DOME; } + virtual void OnRegisterSceneNode() IRR_OVERRIDE; + virtual void render() IRR_OVERRIDE; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; + virtual video::SMaterial& getMaterial(u32 i) IRR_OVERRIDE; + virtual u32 getMaterialCount() const IRR_OVERRIDE; + virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_SKY_DOME; } - virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_; - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; - virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) _IRR_OVERRIDE_; + virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; + virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) IRR_OVERRIDE; private: @@ -47,4 +47,3 @@ class CSkyDomeSceneNode : public ISceneNode } #endif - diff --git a/source/Irrlicht/CSoftware2MaterialRenderer.h b/source/Irrlicht/CSoftware2MaterialRenderer.h index 9715dc9d..3fa42acf 100644 --- a/source/Irrlicht/CSoftware2MaterialRenderer.h +++ b/source/Irrlicht/CSoftware2MaterialRenderer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SOFTWARE2_MATERIAL_RENDERER_H_INCLUDED__ -#define __C_SOFTWARE2_MATERIAL_RENDERER_H_INCLUDED__ +#ifndef IRR_C_SOFTWARE2_MATERIAL_RENDERER_H_INCLUDED +#define IRR_C_SOFTWARE2_MATERIAL_RENDERER_H_INCLUDED #include "SoftwareDriver2_compile_config.h" @@ -27,7 +27,7 @@ public: } virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_ + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE { if (Driver) Driver->setFallback_Material(material.MaterialType); @@ -46,7 +46,7 @@ public: :CSoftware2MaterialRenderer ( driver ) {} //! Returns if the material is transparent. - virtual bool isTransparent() const _IRR_OVERRIDE_ + virtual bool isTransparent() const IRR_OVERRIDE { return false; } @@ -63,7 +63,7 @@ public: //! Returns if the material is transparent. - virtual bool isTransparent() const _IRR_OVERRIDE_ + virtual bool isTransparent() const IRR_OVERRIDE { return true; } @@ -77,7 +77,7 @@ public: CSoftware2MaterialRenderer_UNSUPPORTED ( video::CBurningVideoDriver* driver ) : CSoftware2MaterialRenderer ( driver ) {} - virtual s32 getRenderCapability() const _IRR_OVERRIDE_ { return 1; } + virtual s32 getRenderCapability() const IRR_OVERRIDE { return 1; } }; @@ -87,4 +87,3 @@ public: } // end namespace irr #endif - diff --git a/source/Irrlicht/CSoftwareDriver.h b/source/Irrlicht/CSoftwareDriver.h index c816142e..c51eb29b 100644 --- a/source/Irrlicht/CSoftwareDriver.h +++ b/source/Irrlicht/CSoftwareDriver.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_VIDEO_SOFTWARE_H_INCLUDED__ -#define __C_VIDEO_SOFTWARE_H_INCLUDED__ +#ifndef IRR_C_SOFTWARE_DRIVER_H_INCLUDED +#define IRR_C_SOFTWARE_DRIVER_H_INCLUDED #include "ITriangleRenderer.h" #include "CNullDriver.h" @@ -25,98 +25,98 @@ namespace video virtual ~CSoftwareDriver(); //! 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; //! Create render target. - virtual IRenderTarget* addRenderTarget() _IRR_OVERRIDE_; + virtual IRenderTarget* addRenderTarget() IRR_OVERRIDE; //! sets transformation - virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) _IRR_OVERRIDE_; + virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) IRR_OVERRIDE; //! 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), - f32 clearDepth = 1.f, u8 clearStencil = 0) _IRR_OVERRIDE_; + f32 clearDepth = 1.f, u8 clearStencil = 0) IRR_OVERRIDE; //! sets a viewport - virtual void setViewPort(const core::rect& area) _IRR_OVERRIDE_; + virtual void setViewPort(const core::rect& area) IRR_OVERRIDE; 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* sourceRect = 0) _IRR_OVERRIDE_; + const SExposedVideoData& videoData = SExposedVideoData(), core::rect* sourceRect = 0) IRR_OVERRIDE; - virtual bool endScene() _IRR_OVERRIDE_; + virtual bool endScene() IRR_OVERRIDE; //! Only used by the internal engine. Used to notify the driver that //! the window was resized. - virtual void OnResize(const core::dimension2d& size) _IRR_OVERRIDE_; + virtual void OnResize(const core::dimension2d& size) IRR_OVERRIDE; //! returns size of the current render target - virtual const core::dimension2d& getCurrentRenderTargetSize() const _IRR_OVERRIDE_; + virtual const core::dimension2d& getCurrentRenderTargetSize() const IRR_OVERRIDE; //! draws a vertex primitive list virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const void* indexList, u32 primitiveCount, - E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) _IRR_OVERRIDE_; + E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) IRR_OVERRIDE; //! Draws a 3d line. virtual void draw3DLine(const core::vector3df& start, - const core::vector3df& end, SColor color = SColor(255,255,255,255)) _IRR_OVERRIDE_; + const core::vector3df& end, SColor color = SColor(255,255,255,255)) IRR_OVERRIDE; //! draws an 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted. virtual void draw2DImage(const video::ITexture* texture, const core::position2d& destPos, const core::rect& sourceRect, const core::rect* 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; //! draw an 2d rectangle virtual void draw2DRectangle(SColor color, const core::rect& pos, - const core::rect* clip = 0) _IRR_OVERRIDE_; + const core::rect* clip = 0) IRR_OVERRIDE; //!Draws an 2d rectangle with a gradient. virtual void draw2DRectangle(const core::rect& pos, SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown, - const core::rect* clip = 0) _IRR_OVERRIDE_; + const core::rect* clip = 0) IRR_OVERRIDE; //! Draws a 2d line. virtual void draw2DLine(const core::position2d& start, const core::position2d& end, - SColor color=SColor(255,255,255,255)) _IRR_OVERRIDE_; + SColor color=SColor(255,255,255,255)) IRR_OVERRIDE; //! Draws a single pixel - virtual void drawPixel(u32 x, u32 y, const SColor & color) _IRR_OVERRIDE_; + virtual void drawPixel(u32 x, u32 y, const SColor & color) IRR_OVERRIDE; //! \return Returns the name of the video driver. Example: In case of the Direct3D8 //! driver, it would return "Direct3D8.1". - virtual const wchar_t* getName() const _IRR_OVERRIDE_; + virtual const wchar_t* getName() const IRR_OVERRIDE; //! Returns type of video driver - virtual E_DRIVER_TYPE getDriverType() const _IRR_OVERRIDE_; + virtual E_DRIVER_TYPE getDriverType() const IRR_OVERRIDE; //! get color format of the current color buffer - virtual ECOLOR_FORMAT getColorFormat() const _IRR_OVERRIDE_; + virtual ECOLOR_FORMAT getColorFormat() const IRR_OVERRIDE; //! Returns the transformation set by setTransform - virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const _IRR_OVERRIDE_; + virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const IRR_OVERRIDE; - virtual ITexture* createDeviceDependentTexture(const io::path& name, IImage* image) _IRR_OVERRIDE_; - virtual ITexture* createDeviceDependentTextureCubemap(const io::path& name, const core::array& image) _IRR_OVERRIDE_; + virtual ITexture* createDeviceDependentTexture(const io::path& name, IImage* image) IRR_OVERRIDE; + virtual ITexture* createDeviceDependentTextureCubemap(const io::path& name, const core::array& image) IRR_OVERRIDE; //! Creates a render target texture. virtual ITexture* addRenderTargetTexture(const core::dimension2d& 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; - virtual void clearBuffers(u16 flag, SColor color = SColor(255,0,0,0), f32 depth = 1.f, u8 stencil = 0) _IRR_OVERRIDE_; + virtual void clearBuffers(u16 flag, SColor color = SColor(255,0,0,0), f32 depth = 1.f, u8 stencil = 0) IRR_OVERRIDE; //! Returns an image created from the last rendered frame. - virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER) _IRR_OVERRIDE_; + virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER) IRR_OVERRIDE; //! Returns the maximum amount of primitives (mostly vertices) which //! the device is able to render with one drawIndexedTriangleList //! call. - virtual u32 getMaximalPrimitiveCount() const _IRR_OVERRIDE_; + virtual u32 getMaximalPrimitiveCount() const IRR_OVERRIDE; //! 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; protected: @@ -175,6 +175,4 @@ namespace video } // end namespace video } // end namespace irr - #endif - diff --git a/source/Irrlicht/CSoftwareDriver2.cpp b/source/Irrlicht/CSoftwareDriver2.cpp index 888c8bd5..5962fcd5 100644 --- a/source/Irrlicht/CSoftwareDriver2.cpp +++ b/source/Irrlicht/CSoftwareDriver2.cpp @@ -1351,20 +1351,20 @@ void CBurningVideoDriver::VertexCache_map_source_format() if (s0 != sizeof_s4DVertex || ((sizeof_s4DVertex * sizeof_s4DVertexPairRel) & 31)) { os::Printer::log("BurningVideo vertex format compile problem", ELL_ERROR); - _IRR_DEBUG_BREAK_IF(1); + IRR_DEBUG_BREAK_IF(1); } #if defined(ENV64BIT) if (sizeof(void*) != 8) { os::Printer::log("BurningVideo pointer should be 8 bytes", ELL_ERROR); - _IRR_DEBUG_BREAK_IF(1); + IRR_DEBUG_BREAK_IF(1); } if (((unsigned long long)Transformation&15) || ((unsigned long long)TransformationFlag & 15)) { os::Printer::log("BurningVideo Matrix Stack not 16 byte aligned", ELL_ERROR); - _IRR_DEBUG_BREAK_IF(1); + IRR_DEBUG_BREAK_IF(1); } #endif diff --git a/source/Irrlicht/CSoftwareDriver2.h b/source/Irrlicht/CSoftwareDriver2.h index 62a1bcc5..53634b74 100644 --- a/source/Irrlicht/CSoftwareDriver2.h +++ b/source/Irrlicht/CSoftwareDriver2.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_VIDEO_2_SOFTWARE_H_INCLUDED__ -#define __C_VIDEO_2_SOFTWARE_H_INCLUDED__ +#ifndef IRR_C_VIDEO_2_SOFTWARE_H_INCLUDED +#define IRR_C_VIDEO_2_SOFTWARE_H_INCLUDED #include "SoftwareDriver2_compile_config.h" #include "IBurningShader.h" @@ -29,26 +29,26 @@ namespace video virtual ~CBurningVideoDriver(); //! 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; //! Create render target. - virtual IRenderTarget* addRenderTarget() _IRR_OVERRIDE_; + virtual IRenderTarget* addRenderTarget() IRR_OVERRIDE; //! sets transformation - virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) _IRR_OVERRIDE_; + virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) IRR_OVERRIDE; //! 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, - f32 clearDepth, u8 clearStencil) _IRR_OVERRIDE_; + f32 clearDepth, u8 clearStencil) IRR_OVERRIDE; //! sets a viewport - virtual void setViewPort(const core::rect& area) _IRR_OVERRIDE_; + virtual void setViewPort(const core::rect& area) IRR_OVERRIDE; virtual void setScissor(int x, int y, int width, int height); virtual bool beginScene(u16 clearFlag, SColor clearColor, f32 clearDepth, u8 clearStencil, - const SExposedVideoData& videoData, core::rect* sourceRect) _IRR_OVERRIDE_; + const SExposedVideoData& videoData, core::rect* sourceRect) IRR_OVERRIDE; #if defined(PATCH_SUPERTUX_8_0_1_with_1_9_0) virtual bool beginScene(bool backBuffer, bool zBuffer, SColor color, @@ -62,49 +62,49 @@ namespace video virtual bool setRenderTarget(video::ITexture* texture, bool clearBackBuffer, bool clearZBuffer, SColor color); #endif - virtual bool endScene() _IRR_OVERRIDE_; + virtual bool endScene() IRR_OVERRIDE; //! Only used by the internal engine. Used to notify the driver that //! the window was resized. - virtual void OnResize(const core::dimension2d& size) _IRR_OVERRIDE_; + virtual void OnResize(const core::dimension2d& size) IRR_OVERRIDE; //! returns size of the current render target - virtual const core::dimension2d& getCurrentRenderTargetSize() const _IRR_OVERRIDE_; + virtual const core::dimension2d& getCurrentRenderTargetSize() const IRR_OVERRIDE; //! deletes all dynamic lights there are - virtual void deleteAllDynamicLights() _IRR_OVERRIDE_; + virtual void deleteAllDynamicLights() IRR_OVERRIDE; //! adds a dynamic light, returning an index to the light //! \param light: the light data to use to create the light //! \return An index to the light, or -1 if an error occurs - virtual s32 addDynamicLight(const SLight& light) _IRR_OVERRIDE_; + virtual s32 addDynamicLight(const SLight& light) IRR_OVERRIDE; //! Turns a dynamic light on or off //! \param lightIndex: the index returned by addDynamicLight //! \param turnOn: true to turn the light on, false to turn it off - virtual void turnLightOn(s32 lightIndex, bool turnOn) _IRR_OVERRIDE_; + virtual void turnLightOn(s32 lightIndex, bool turnOn) IRR_OVERRIDE; //! returns the maximal amount of dynamic lights the device can handle - virtual u32 getMaximalDynamicLightAmount() const _IRR_OVERRIDE_; + virtual u32 getMaximalDynamicLightAmount() const IRR_OVERRIDE; //! Sets the dynamic ambient light color. The default color is //! (0,0,0,0) which means it is dark. //! \param color: New color of the ambient light. - virtual void setAmbientLight(const SColorf& color) _IRR_OVERRIDE_; + virtual void setAmbientLight(const SColorf& color) IRR_OVERRIDE; //! draws a vertex primitive list virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const void* indexList, u32 primitiveCount, - E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) _IRR_OVERRIDE_; + E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) IRR_OVERRIDE; //! draws a vertex primitive list in 2d virtual void draw2DVertexPrimitiveList(const void* vertices, u32 vertexCount, const void* indexList, u32 primitiveCount, - E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) _IRR_OVERRIDE_; + E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) IRR_OVERRIDE; //! draws an 2d image - //virtual void draw2DImage(const video::ITexture* texture, const core::position2d& destPos, bool useAlphaChannelOfTexture) _IRR_OVERRIDE_; + //virtual void draw2DImage(const video::ITexture* texture, const core::position2d& destPos, bool useAlphaChannelOfTexture) IRR_OVERRIDE; /* NullDriver calls draw2DImage(texture, destPos, @@ -117,20 +117,20 @@ namespace video //! 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& destPos, const core::rect& sourceRect, const core::rect* clipRect = 0, - SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false) _IRR_OVERRIDE_; + SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false) IRR_OVERRIDE; //! Draws a part of the texture into the rectangle. virtual void draw2DImage(const video::ITexture* texture, const core::rect& destRect, const core::rect& sourceRect, const core::rect* 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 3d line. virtual void draw3DLine(const core::vector3df& start, - const core::vector3df& end, SColor color_start) _IRR_OVERRIDE_; + const core::vector3df& end, SColor color_start) IRR_OVERRIDE; //! draw an 2d rectangle //virtual void draw2DRectangle(SColor color, const core::rect& pos, - // const core::rect* clip = 0) _IRR_OVERRIDE_; + // const core::rect* clip = 0) IRR_OVERRIDE; /* NullDriver calls draw2DRectangle(pos, color, color, color, color, clip); @@ -139,28 +139,28 @@ namespace video //!Draws an 2d rectangle with a gradient. virtual void draw2DRectangle(const core::rect& pos, SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown, - const core::rect* clip = 0) _IRR_OVERRIDE_; + const core::rect* clip = 0) IRR_OVERRIDE; //! Draws a 2d line. virtual void draw2DLine(const core::position2d& start, const core::position2d& end, - SColor color=SColor(255,255,255,255)) _IRR_OVERRIDE_; + SColor color=SColor(255,255,255,255)) IRR_OVERRIDE; //! Draws a single pixel - virtual void drawPixel(u32 x, u32 y, const SColor & color) _IRR_OVERRIDE_; + virtual void drawPixel(u32 x, u32 y, const SColor & color) IRR_OVERRIDE; //! \return Returns the name of the video driver. Example: In case of the DirectX8 //! driver, it would return "Direct3D8.1". - virtual const wchar_t* getName() const _IRR_OVERRIDE_; + virtual const wchar_t* getName() const IRR_OVERRIDE; //! Returns type of video driver - virtual E_DRIVER_TYPE getDriverType() const _IRR_OVERRIDE_; + virtual E_DRIVER_TYPE getDriverType() const IRR_OVERRIDE; //! get color format of the current color buffer - virtual ECOLOR_FORMAT getColorFormat() const _IRR_OVERRIDE_; + virtual ECOLOR_FORMAT getColorFormat() const IRR_OVERRIDE; //! Returns the transformation set by setTransform - virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const _IRR_OVERRIDE_; + virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const IRR_OVERRIDE; //! Creates a render target texture. virtual ITexture* addRenderTargetTexture(const core::dimension2d& size, @@ -168,23 +168,23 @@ namespace video #if defined(PATCH_SUPERTUX_8_0_1_with_1_9_0) , const bool useStencil = false #endif - ) _IRR_OVERRIDE_; + ) IRR_OVERRIDE; - virtual void clearBuffers(u16 flag, SColor color, f32 depth, u8 stencil) _IRR_OVERRIDE_; + virtual void clearBuffers(u16 flag, SColor color, f32 depth, u8 stencil) IRR_OVERRIDE; //! Returns an image created from the last rendered frame. - virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER) _IRR_OVERRIDE_; + virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER) IRR_OVERRIDE; //! Returns the maximum amount of primitives (mostly vertices) which //! the device is able to render with one drawIndexedTriangleList //! call. - virtual u32 getMaximalPrimitiveCount() const _IRR_OVERRIDE_; + virtual u32 getMaximalPrimitiveCount() const IRR_OVERRIDE; //! Draws a shadow volume into the stencil buffer. To draw a stencil shadow, do //! this: First, draw all geometry. Then use this method, to draw the shadow //! volume. Then, use IVideoDriver::drawStencilShadow() to visualize the shadow. - virtual void drawStencilShadowVolume(const core::array& triangles, bool zfail=true, u32 debugDataVisible=0) _IRR_OVERRIDE_; + virtual void drawStencilShadowVolume(const core::array& triangles, bool zfail=true, u32 debugDataVisible=0) IRR_OVERRIDE; //! Fills the stencil shadow with color. After the shadow volume has been drawn //! into the stencil buffer using IVideoDriver::drawStencilShadowVolume(), use this @@ -193,23 +193,23 @@ namespace video video::SColor leftUpEdge = video::SColor(0,0,0,0), video::SColor rightUpEdge = video::SColor(0,0,0,0), video::SColor leftDownEdge = video::SColor(0,0,0,0), - video::SColor rightDownEdge = video::SColor(0,0,0,0)) _IRR_OVERRIDE_; + video::SColor rightDownEdge = video::SColor(0,0,0,0)) IRR_OVERRIDE; //! Enable the 2d override material - virtual void enableMaterial2D(bool enable = true) _IRR_OVERRIDE_; + virtual void enableMaterial2D(bool enable = true) IRR_OVERRIDE; //! Returns the graphics card vendor name. - virtual core::stringc getVendorInfo() _IRR_OVERRIDE_; + virtual core::stringc getVendorInfo() IRR_OVERRIDE; //! 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 - virtual bool queryTextureFormat(ECOLOR_FORMAT format) const _IRR_OVERRIDE_; + virtual bool queryTextureFormat(ECOLOR_FORMAT format) const IRR_OVERRIDE; #if !defined(PATCH_SUPERTUX_8_0_1_with_1_9_0) //! 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; #endif IDepthBuffer * getDepthBuffer () { return DepthBuffer; } @@ -221,7 +221,7 @@ namespace video const c8* pixelShaderProgram, IShaderConstantSetCallBack* callback, E_MATERIAL_TYPE baseMaterial, - s32 userData) _IRR_OVERRIDE_; + s32 userData) IRR_OVERRIDE; //! Adds a new material renderer to the VideoDriver, based on a high level shading //! language. Currently only HLSL in D3D9 is supported. @@ -244,31 +244,31 @@ namespace video #if defined(PATCH_SUPERTUX_8_0_1_with_1_9_0) , E_GPU_SHADING_LANGUAGE shadingLang = EGSL_DEFAULT #endif - ) _IRR_OVERRIDE_; + ) IRR_OVERRIDE; //IMaterialRendererService virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates) _IRR_OVERRIDE_; + bool resetAllRenderstates) IRR_OVERRIDE; //pass BaseMaterialID void setFallback_Material(E_MATERIAL_TYPE fallback_MaterialType); //! Return an index constant for the vertex shader based on a name. - virtual s32 getVertexShaderConstantID(const c8* name) _IRR_OVERRIDE_; - virtual bool setVertexShaderConstant(s32 index, const f32* floats, int count) _IRR_OVERRIDE_; - virtual bool setVertexShaderConstant(s32 index, const s32* ints, int count) _IRR_OVERRIDE_; - virtual bool setVertexShaderConstant(s32 index, const u32* ints, int count) _IRR_OVERRIDE_; - virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount) _IRR_OVERRIDE_; + virtual s32 getVertexShaderConstantID(const c8* name) IRR_OVERRIDE; + virtual bool setVertexShaderConstant(s32 index, const f32* floats, int count) IRR_OVERRIDE; + virtual bool setVertexShaderConstant(s32 index, const s32* ints, int count) IRR_OVERRIDE; + virtual bool setVertexShaderConstant(s32 index, const u32* ints, int count) IRR_OVERRIDE; + virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount) IRR_OVERRIDE; //! Return an index constant for the pixel shader based on a name. - virtual s32 getPixelShaderConstantID(const c8* name) _IRR_OVERRIDE_; - virtual bool setPixelShaderConstant(s32 index, const f32* floats, int count) _IRR_OVERRIDE_; - virtual bool setPixelShaderConstant(s32 index, const s32* ints, int count) _IRR_OVERRIDE_; - virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) _IRR_OVERRIDE_; + virtual s32 getPixelShaderConstantID(const c8* name) IRR_OVERRIDE; + virtual bool setPixelShaderConstant(s32 index, const f32* floats, int count) IRR_OVERRIDE; + virtual bool setPixelShaderConstant(s32 index, const s32* ints, int count) IRR_OVERRIDE; + virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) IRR_OVERRIDE; - virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount) _IRR_OVERRIDE_; + virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount) IRR_OVERRIDE; #if defined(PATCH_SUPERTUX_8_0_1_with_1_9_0) virtual bool setVertexShaderConstant(const c8* name, const f32* floats, int count) @@ -299,7 +299,7 @@ namespace video #endif //! Get pointer to the IVideoDriver interface /** \return Pointer to the IVideoDriver interface */ - virtual IVideoDriver* getVideoDriver() _IRR_OVERRIDE_; + virtual IVideoDriver* getVideoDriver() IRR_OVERRIDE; protected: @@ -311,8 +311,8 @@ namespace video //! sets the current Texture //bool setTexture(u32 stage, video::ITexture* texture); - virtual ITexture* createDeviceDependentTexture(const io::path& name, IImage* image) _IRR_OVERRIDE_; - virtual ITexture* createDeviceDependentTextureCubemap(const io::path& name, const core::array& image) _IRR_OVERRIDE_; + virtual ITexture* createDeviceDependentTexture(const io::path& name, IImage* image) IRR_OVERRIDE; + virtual ITexture* createDeviceDependentTextureCubemap(const io::path& name, const core::array& image) IRR_OVERRIDE; video::CImage* BackBuffer; video::IImagePresenter* Presenter; @@ -407,7 +407,7 @@ namespace video //! Sets the fog mode. virtual void setFog(SColor color, E_FOG_TYPE fogType, f32 start, - f32 end, f32 density, bool pixelFog, bool rangeFog) _IRR_OVERRIDE_; + f32 end, f32 density, bool pixelFog, bool rangeFog) IRR_OVERRIDE; void ndc_2_dc_and_project (s4DVertexPair* dest,const s4DVertexPair* source, const size_t vIn ) const; @@ -447,4 +447,3 @@ namespace video #endif - diff --git a/source/Irrlicht/CSoftwareTexture.h b/source/Irrlicht/CSoftwareTexture.h index e67c50f8..ceca1193 100644 --- a/source/Irrlicht/CSoftwareTexture.h +++ b/source/Irrlicht/CSoftwareTexture.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SOFTWARE_TEXTURE_H_INCLUDED__ -#define __C_SOFTWARE_TEXTURE_H_INCLUDED__ +#ifndef IRR_C_SOFTWARE_TEXTURE_H_INCLUDED +#define IRR_C_SOFTWARE_TEXTURE_H_INCLUDED #include "ITexture.h" #include "IRenderTarget.h" @@ -30,10 +30,10 @@ public: virtual ~CSoftwareTexture(); //! lock function - 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; //! unlock function - virtual void unlock() _IRR_OVERRIDE_; + virtual void unlock() IRR_OVERRIDE; //! returns unoptimized surface virtual CImage* getImage(); @@ -41,7 +41,7 @@ public: //! returns texture surface virtual CImage* getTexture(); - virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) _IRR_OVERRIDE_; + virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) IRR_OVERRIDE; private: CImage* Image; @@ -57,7 +57,7 @@ public: CSoftwareRenderTarget(CSoftwareDriver* driver); virtual ~CSoftwareRenderTarget(); - 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; ITexture* getTexture() const; @@ -70,4 +70,3 @@ protected: } // end namespace irr #endif - diff --git a/source/Irrlicht/CSoftwareTexture2.h b/source/Irrlicht/CSoftwareTexture2.h index 5f64ee02..d625fb10 100644 --- a/source/Irrlicht/CSoftwareTexture2.h +++ b/source/Irrlicht/CSoftwareTexture2.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SOFTWARE_2_TEXTURE_H_INCLUDED__ -#define __C_SOFTWARE_2_TEXTURE_H_INCLUDED__ +#ifndef IRR_C_SOFTWARE_2_TEXTURE_H_INCLUDED +#define IRR_C_SOFTWARE_2_TEXTURE_H_INCLUDED #include "SoftwareDriver2_compile_config.h" @@ -65,7 +65,7 @@ public: #if defined(PATCH_SUPERTUX_8_0_1_with_1_9_0) virtual void* lock(E_TEXTURE_LOCK_MODE mode, u32 mipmapLevel) #else - virtual void* lock(E_TEXTURE_LOCK_MODE mode, u32 mipmapLevel, u32 layer, E_TEXTURE_LOCK_FLAGS lockFlags = ETLF_FLIP_Y_UP_RTT) _IRR_OVERRIDE_ + virtual void* lock(E_TEXTURE_LOCK_MODE mode, u32 mipmapLevel, u32 layer, E_TEXTURE_LOCK_FLAGS lockFlags = ETLF_FLIP_Y_UP_RTT) IRR_OVERRIDE #endif { if (Flags & GEN_MIPMAP) @@ -80,7 +80,7 @@ public: } //! unlock function - virtual void unlock() _IRR_OVERRIDE_ + virtual void unlock() IRR_OVERRIDE { } /* @@ -117,7 +117,7 @@ public: } #if !defined(PATCH_SUPERTUX_8_0_1_with_1_9_0) - virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) _IRR_OVERRIDE_; + virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) IRR_OVERRIDE; #else virtual void regenerateMipMapLevels(void* data = 0); #endif @@ -166,7 +166,7 @@ public: CSoftwareRenderTarget2(CBurningVideoDriver* driver); virtual ~CSoftwareRenderTarget2(); - 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; #if defined(PATCH_SUPERTUX_8_0_1_with_1_9_0) E_DRIVER_TYPE DriverType; @@ -180,6 +180,4 @@ protected: } // end namespace video } // end namespace irr -#endif // __C_SOFTWARE_2_TEXTURE_H_INCLUDED__ - - +#endif // IRR_C_SOFTWARE_2_TEXTURE_H_INCLUDED diff --git a/source/Irrlicht/CSphereSceneNode.h b/source/Irrlicht/CSphereSceneNode.h index 480881cb..97bd252d 100644 --- a/source/Irrlicht/CSphereSceneNode.h +++ b/source/Irrlicht/CSphereSceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_SPHERE_SCENE_NODE_H_INCLUDED__ -#define __C_SPHERE_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_SPHERE_SCENE_NODE_H_INCLUDED +#define IRR_C_SPHERE_SCENE_NODE_H_INCLUDED #include "IMeshSceneNode.h" #include "IMesh.h" @@ -25,59 +25,59 @@ namespace scene //! destructor virtual ~CSphereSceneNode(); - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; //! renders the node. - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! returns the material based on the zero based index i. To get the amount //! of materials used by this scene node, use getMaterialCount(). //! 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 //! 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. - virtual u32 getMaterialCount() const _IRR_OVERRIDE_; + virtual u32 getMaterialCount() const IRR_OVERRIDE; //! Returns type of the scene node - virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_SPHERE; } + virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_SPHERE; } //! 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. - 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. - virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) _IRR_OVERRIDE_; + virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) IRR_OVERRIDE; //! The mesh cannot be changed - virtual void setMesh(IMesh* mesh) _IRR_OVERRIDE_ {} + virtual void setMesh(IMesh* mesh) IRR_OVERRIDE {} //! Returns the current mesh - virtual IMesh* getMesh() _IRR_OVERRIDE_ { return Mesh; } + virtual IMesh* getMesh() 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. /* In this way it is possible to change the materials a mesh causing all mesh scene nodes 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 - virtual bool isReadOnlyMaterials() const _IRR_OVERRIDE_ { return false; } + virtual bool isReadOnlyMaterials() const IRR_OVERRIDE { return false; } //! Creates shadow volume scene node as child of this node //! and returns a pointer to it. virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh, - s32 id, bool zfailmethod=true, f32 infinity=10000.0f) _IRR_OVERRIDE_; + s32 id, bool zfailmethod=true, f32 infinity=10000.0f) IRR_OVERRIDE; //! Removes a child from this scene node. //! Implemented here, to be able to remove the shadow properly, if there is one, //! or to remove attached child. - virtual bool removeChild(ISceneNode* child) _IRR_OVERRIDE_; + virtual bool removeChild(ISceneNode* child) IRR_OVERRIDE; private: @@ -93,4 +93,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CTRFlat.cpp b/source/Irrlicht/CTRFlat.cpp index b3910b1a..45a7add0 100644 --- a/source/Irrlicht/CTRFlat.cpp +++ b/source/Irrlicht/CTRFlat.cpp @@ -25,7 +25,7 @@ public: } //! draws an indexed triangle list - virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_ + virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) IRR_OVERRIDE { const S2DVertex *v1, *v2, *v3; diff --git a/source/Irrlicht/CTRFlatWire.cpp b/source/Irrlicht/CTRFlatWire.cpp index 2f1cca56..b38acdf3 100644 --- a/source/Irrlicht/CTRFlatWire.cpp +++ b/source/Irrlicht/CTRFlatWire.cpp @@ -25,7 +25,7 @@ public: } //! draws an indexed triangle list - virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_ + virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) IRR_OVERRIDE { const S2DVertex *v1, *v2, *v3; diff --git a/source/Irrlicht/CTRGouraud.cpp b/source/Irrlicht/CTRGouraud.cpp index 830aa55a..0e59f9d1 100644 --- a/source/Irrlicht/CTRGouraud.cpp +++ b/source/Irrlicht/CTRGouraud.cpp @@ -26,7 +26,7 @@ public: } //! draws an indexed triangle list - virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_ + virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) IRR_OVERRIDE { const S2DVertex *v1, *v2, *v3; diff --git a/source/Irrlicht/CTRGouraud2.cpp b/source/Irrlicht/CTRGouraud2.cpp index 5558f061..f08a9352 100644 --- a/source/Irrlicht/CTRGouraud2.cpp +++ b/source/Irrlicht/CTRGouraud2.cpp @@ -83,7 +83,7 @@ public: CTRGouraud2(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle (const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; + virtual void drawTriangle (const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; //virtual bool canWireFrame () { return true; } protected: diff --git a/source/Irrlicht/CTRGouraudAlpha2.cpp b/source/Irrlicht/CTRGouraudAlpha2.cpp index 7fc27e30..118859d8 100644 --- a/source/Irrlicht/CTRGouraudAlpha2.cpp +++ b/source/Irrlicht/CTRGouraudAlpha2.cpp @@ -84,7 +84,7 @@ public: CTRGouraudAlpha2(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle ( const s4DVertex* burning_restrict a,const s4DVertex* burning_restrict b,const s4DVertex* burning_restrict c ) _IRR_OVERRIDE_; + virtual void drawTriangle ( const s4DVertex* burning_restrict a,const s4DVertex* burning_restrict b,const s4DVertex* burning_restrict c ) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CTRGouraudAlphaNoZ2.cpp b/source/Irrlicht/CTRGouraudAlphaNoZ2.cpp index 08b798a8..6a9633e5 100644 --- a/source/Irrlicht/CTRGouraudAlphaNoZ2.cpp +++ b/source/Irrlicht/CTRGouraudAlphaNoZ2.cpp @@ -84,7 +84,7 @@ public: CTRGouraudAlphaNoZ2(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle (const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; + virtual void drawTriangle (const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CTRGouraudNoZ2.cpp b/source/Irrlicht/CTRGouraudNoZ2.cpp index fca2ad05..b59a489d 100644 --- a/source/Irrlicht/CTRGouraudNoZ2.cpp +++ b/source/Irrlicht/CTRGouraudNoZ2.cpp @@ -83,8 +83,8 @@ public: CTRGouraudNoZ2(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; - virtual bool canWireFrame () _IRR_OVERRIDE_ { return true; } + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; + virtual bool canWireFrame () IRR_OVERRIDE { return true; } protected: virtual void fragmentShader(); diff --git a/source/Irrlicht/CTRGouraudWire.cpp b/source/Irrlicht/CTRGouraudWire.cpp index fa3402c1..ec9b58d0 100644 --- a/source/Irrlicht/CTRGouraudWire.cpp +++ b/source/Irrlicht/CTRGouraudWire.cpp @@ -25,7 +25,7 @@ public: } //! draws an indexed triangle list - virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_ + virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) IRR_OVERRIDE { const S2DVertex *v1, *v2, *v3; diff --git a/source/Irrlicht/CTRNormalMap.cpp b/source/Irrlicht/CTRNormalMap.cpp index 5b16d083..284c2d7f 100644 --- a/source/Irrlicht/CTRNormalMap.cpp +++ b/source/Irrlicht/CTRNormalMap.cpp @@ -97,8 +97,8 @@ public: CTRNormalMap(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; - virtual void OnSetMaterial(const SBurningShaderMaterial& material) _IRR_OVERRIDE_; + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; + virtual void OnSetMaterial(const SBurningShaderMaterial& material) IRR_OVERRIDE; private: void fragmentShader(); diff --git a/source/Irrlicht/CTRStencilShadow.cpp b/source/Irrlicht/CTRStencilShadow.cpp index 81e64d63..38f4ef51 100644 --- a/source/Irrlicht/CTRStencilShadow.cpp +++ b/source/Irrlicht/CTRStencilShadow.cpp @@ -84,7 +84,7 @@ public: CTRStencilShadow(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; private: void fragmentShader(); diff --git a/source/Irrlicht/CTRTextureBlend.cpp b/source/Irrlicht/CTRTextureBlend.cpp index 8d22291c..18492307 100644 --- a/source/Irrlicht/CTRTextureBlend.cpp +++ b/source/Irrlicht/CTRTextureBlend.cpp @@ -84,8 +84,8 @@ namespace video CTRTextureBlend(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; - virtual void OnSetMaterial(const SBurningShaderMaterial& material) _IRR_OVERRIDE_; + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; + virtual void OnSetMaterial(const SBurningShaderMaterial& material) IRR_OVERRIDE; private: // fragment shader diff --git a/source/Irrlicht/CTRTextureDetailMap2.cpp b/source/Irrlicht/CTRTextureDetailMap2.cpp index c3d81a08..ab4f0286 100644 --- a/source/Irrlicht/CTRTextureDetailMap2.cpp +++ b/source/Irrlicht/CTRTextureDetailMap2.cpp @@ -84,8 +84,8 @@ public: CTRTextureDetailMap2(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; - virtual bool canWireFrame () _IRR_OVERRIDE_ { return true; } + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; + virtual bool canWireFrame () IRR_OVERRIDE { return true; } protected: virtual void fragmentShader(); diff --git a/source/Irrlicht/CTRTextureFlat.cpp b/source/Irrlicht/CTRTextureFlat.cpp index 9ef5ade0..ee4eecb9 100644 --- a/source/Irrlicht/CTRTextureFlat.cpp +++ b/source/Irrlicht/CTRTextureFlat.cpp @@ -25,7 +25,7 @@ public: } //! draws an indexed triangle list - virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_ + virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) IRR_OVERRIDE { const S2DVertex *v1, *v2, *v3; diff --git a/source/Irrlicht/CTRTextureFlatWire.cpp b/source/Irrlicht/CTRTextureFlatWire.cpp index 2147edd0..99dd5fc1 100644 --- a/source/Irrlicht/CTRTextureFlatWire.cpp +++ b/source/Irrlicht/CTRTextureFlatWire.cpp @@ -25,7 +25,7 @@ public: } //! draws an indexed triangle list - virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_ + virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) IRR_OVERRIDE { const S2DVertex *v1, *v2, *v3; diff --git a/source/Irrlicht/CTRTextureGouraud.h b/source/Irrlicht/CTRTextureGouraud.h index 02cc6033..2ba6c888 100644 --- a/source/Irrlicht/CTRTextureGouraud.h +++ b/source/Irrlicht/CTRTextureGouraud.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_TRIANGLE_RENDERER_TEXTURE_GOURAUD_H_INCLUDED__ -#define __C_TRIANGLE_RENDERER_TEXTURE_GOURAUD_H_INCLUDED__ +#ifndef IRR_C_TRIANGLE_RENDERER_TEXTURE_GOURAUD_H_INCLUDED +#define IRR_C_TRIANGLE_RENDERER_TEXTURE_GOURAUD_H_INCLUDED #include "IrrCompileConfig.h" @@ -39,16 +39,16 @@ namespace video virtual ~CTRTextureGouraud(); //! sets a render target - virtual void setRenderTarget(video::IImage* surface, const core::rect& viewPort) _IRR_OVERRIDE_; + virtual void setRenderTarget(video::IImage* surface, const core::rect& viewPort) IRR_OVERRIDE; //! draws an indexed triangle list - virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_; + virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) IRR_OVERRIDE; //! en or disables the backface culling - virtual void setBackfaceCulling(bool enabled = true) _IRR_OVERRIDE_; + virtual void setBackfaceCulling(bool enabled = true) IRR_OVERRIDE; //! sets the Texture - virtual void setTexture(video::IImage* texture) _IRR_OVERRIDE_; + virtual void setTexture(video::IImage* texture) IRR_OVERRIDE; protected: @@ -82,4 +82,3 @@ namespace video #endif #endif - diff --git a/source/Irrlicht/CTRTextureGouraud2.cpp b/source/Irrlicht/CTRTextureGouraud2.cpp index ecf37565..6d8f9e84 100644 --- a/source/Irrlicht/CTRTextureGouraud2.cpp +++ b/source/Irrlicht/CTRTextureGouraud2.cpp @@ -102,8 +102,8 @@ public: CTRTextureGouraud2(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; - virtual bool canWireFrame () _IRR_OVERRIDE_ { return true; } + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; + virtual bool canWireFrame () IRR_OVERRIDE { return true; } private: diff --git a/source/Irrlicht/CTRTextureGouraudAdd.cpp b/source/Irrlicht/CTRTextureGouraudAdd.cpp index 853bef27..fe68287b 100644 --- a/source/Irrlicht/CTRTextureGouraudAdd.cpp +++ b/source/Irrlicht/CTRTextureGouraudAdd.cpp @@ -20,7 +20,7 @@ public: CTRTextureGouraudAdd(IZBuffer* zbuffer); //! draws an indexed triangle list - virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_; + virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) IRR_OVERRIDE; protected: diff --git a/source/Irrlicht/CTRTextureGouraudAdd2.cpp b/source/Irrlicht/CTRTextureGouraudAdd2.cpp index 340cef59..4ba23cfa 100644 --- a/source/Irrlicht/CTRTextureGouraudAdd2.cpp +++ b/source/Irrlicht/CTRTextureGouraudAdd2.cpp @@ -84,7 +84,7 @@ public: CTRTextureGouraudAdd2(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CTRTextureGouraudAddNoZ2.cpp b/source/Irrlicht/CTRTextureGouraudAddNoZ2.cpp index 0a880deb..475b8551 100644 --- a/source/Irrlicht/CTRTextureGouraudAddNoZ2.cpp +++ b/source/Irrlicht/CTRTextureGouraudAddNoZ2.cpp @@ -83,7 +83,7 @@ public: CTRTextureGouraudAddNoZ2(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CTRTextureGouraudAlpha.cpp b/source/Irrlicht/CTRTextureGouraudAlpha.cpp index 995251bf..eab57006 100644 --- a/source/Irrlicht/CTRTextureGouraudAlpha.cpp +++ b/source/Irrlicht/CTRTextureGouraudAlpha.cpp @@ -84,8 +84,8 @@ public: CTRTextureGouraudAlpha2(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; - virtual void OnSetMaterial(const SBurningShaderMaterial& material) _IRR_OVERRIDE_; + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; + virtual void OnSetMaterial(const SBurningShaderMaterial& material) IRR_OVERRIDE; private: void fragmentShader(); diff --git a/source/Irrlicht/CTRTextureGouraudAlphaNoZ.cpp b/source/Irrlicht/CTRTextureGouraudAlphaNoZ.cpp index 2d7b9165..2079c317 100644 --- a/source/Irrlicht/CTRTextureGouraudAlphaNoZ.cpp +++ b/source/Irrlicht/CTRTextureGouraudAlphaNoZ.cpp @@ -90,8 +90,8 @@ public: CTRTextureGouraudAlphaNoZ(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; - virtual void OnSetMaterial(const SBurningShaderMaterial& material) _IRR_OVERRIDE_; + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; + virtual void OnSetMaterial(const SBurningShaderMaterial& material) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CTRTextureGouraudNoZ.cpp b/source/Irrlicht/CTRTextureGouraudNoZ.cpp index f6cd1456..698181b5 100644 --- a/source/Irrlicht/CTRTextureGouraudNoZ.cpp +++ b/source/Irrlicht/CTRTextureGouraudNoZ.cpp @@ -26,7 +26,7 @@ public: } //! draws an indexed triangle list - virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_ + virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) IRR_OVERRIDE { const S2DVertex *v1, *v2, *v3; diff --git a/source/Irrlicht/CTRTextureGouraudNoZ2.cpp b/source/Irrlicht/CTRTextureGouraudNoZ2.cpp index b287e47b..94b9418b 100644 --- a/source/Irrlicht/CTRTextureGouraudNoZ2.cpp +++ b/source/Irrlicht/CTRTextureGouraudNoZ2.cpp @@ -88,8 +88,8 @@ public: CTRTextureGouraudNoZ2(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; - virtual void OnSetMaterial(const SBurningShaderMaterial& material) _IRR_OVERRIDE_; + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; + virtual void OnSetMaterial(const SBurningShaderMaterial& material) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CTRTextureGouraudVertexAlpha2.cpp b/source/Irrlicht/CTRTextureGouraudVertexAlpha2.cpp index b9ff381e..d49311a1 100644 --- a/source/Irrlicht/CTRTextureGouraudVertexAlpha2.cpp +++ b/source/Irrlicht/CTRTextureGouraudVertexAlpha2.cpp @@ -89,7 +89,7 @@ public: CTRTextureVertexAlpha2(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CTRTextureGouraudWire.cpp b/source/Irrlicht/CTRTextureGouraudWire.cpp index 369b91ac..cd8af434 100644 --- a/source/Irrlicht/CTRTextureGouraudWire.cpp +++ b/source/Irrlicht/CTRTextureGouraudWire.cpp @@ -25,7 +25,7 @@ public: } //! draws an indexed triangle list - virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_ + virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) IRR_OVERRIDE { const S2DVertex *v1, *v2, *v3; diff --git a/source/Irrlicht/CTRTextureLightMap2_Add.cpp b/source/Irrlicht/CTRTextureLightMap2_Add.cpp index 61497d3b..3b96c715 100644 --- a/source/Irrlicht/CTRTextureLightMap2_Add.cpp +++ b/source/Irrlicht/CTRTextureLightMap2_Add.cpp @@ -82,7 +82,7 @@ public: CTRTextureLightMap2_Add(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CTRTextureLightMap2_M1.cpp b/source/Irrlicht/CTRTextureLightMap2_M1.cpp index b8d0893f..c8ebfbc5 100644 --- a/source/Irrlicht/CTRTextureLightMap2_M1.cpp +++ b/source/Irrlicht/CTRTextureLightMap2_M1.cpp @@ -82,7 +82,7 @@ public: CTRTextureLightMap2_M1(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CTRTextureLightMap2_M2.cpp b/source/Irrlicht/CTRTextureLightMap2_M2.cpp index 19d051f3..ce906f91 100644 --- a/source/Irrlicht/CTRTextureLightMap2_M2.cpp +++ b/source/Irrlicht/CTRTextureLightMap2_M2.cpp @@ -82,7 +82,7 @@ public: CTRTextureLightMap2_M2(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CTRTextureLightMap2_M4.cpp b/source/Irrlicht/CTRTextureLightMap2_M4.cpp index a78b1e3e..d0a7af5c 100644 --- a/source/Irrlicht/CTRTextureLightMap2_M4.cpp +++ b/source/Irrlicht/CTRTextureLightMap2_M4.cpp @@ -82,7 +82,7 @@ public: CTRTextureLightMap2_M4(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CTRTextureLightMapGouraud2_M4.cpp b/source/Irrlicht/CTRTextureLightMapGouraud2_M4.cpp index 08f5285d..9fd93f85 100644 --- a/source/Irrlicht/CTRTextureLightMapGouraud2_M4.cpp +++ b/source/Irrlicht/CTRTextureLightMapGouraud2_M4.cpp @@ -82,7 +82,7 @@ public: CTRGTextureLightMap2_M4(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/CTRTextureWire2.cpp b/source/Irrlicht/CTRTextureWire2.cpp index af81c4a4..63e590bd 100644 --- a/source/Irrlicht/CTRTextureWire2.cpp +++ b/source/Irrlicht/CTRTextureWire2.cpp @@ -84,11 +84,11 @@ public: CTRTextureWire2(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; - virtual void drawLine ( const s4DVertex *a,const s4DVertex *b) _IRR_OVERRIDE_; - virtual void drawPoint( const s4DVertex *a) _IRR_OVERRIDE_; - virtual bool canWireFrame () _IRR_OVERRIDE_ { return true; } - virtual bool canPointCloud() _IRR_OVERRIDE_ { return true; } + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; + virtual void drawLine ( const s4DVertex *a,const s4DVertex *b) IRR_OVERRIDE; + virtual void drawPoint( const s4DVertex *a) IRR_OVERRIDE; + virtual bool canWireFrame () IRR_OVERRIDE { return true; } + virtual bool canPointCloud() IRR_OVERRIDE { return true; } protected: virtual void fragmentShader(); diff --git a/source/Irrlicht/CTR_transparent_reflection_2_layer.cpp b/source/Irrlicht/CTR_transparent_reflection_2_layer.cpp index eccb6787..05a1b5c1 100644 --- a/source/Irrlicht/CTR_transparent_reflection_2_layer.cpp +++ b/source/Irrlicht/CTR_transparent_reflection_2_layer.cpp @@ -82,8 +82,8 @@ public: CTR_transparent_reflection_2_layer(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; - virtual void OnSetMaterial(const SBurningShaderMaterial& material) _IRR_OVERRIDE_; + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; + virtual void OnSetMaterial(const SBurningShaderMaterial& material) IRR_OVERRIDE; private: void fragmentShader(); diff --git a/source/Irrlicht/CTarReader.h b/source/Irrlicht/CTarReader.h index 3759f5b1..a446fcc5 100644 --- a/source/Irrlicht/CTarReader.h +++ b/source/Irrlicht/CTarReader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_TAR_READER_H_INCLUDED__ -#define __C_TAR_READER_H_INCLUDED__ +#ifndef IRR_C_TAR_READER_H_INCLUDED +#define IRR_C_TAR_READER_H_INCLUDED #include "IrrCompileConfig.h" @@ -70,28 +70,28 @@ namespace io //! returns true if the file maybe is able to be loaded by this class //! based on the file extension (e.g. ".tar") - virtual bool isALoadableFileFormat(const io::path& filename) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(const io::path& filename) const IRR_OVERRIDE; //! Check if the file might be loaded by this class /** Check might look into the file. \param file File handle to check. \return True if file seems to be loadable. */ - virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE; //! Check to see if the loader can create archives of this type. /** Check based on the archive type. \param fileType The archive type to check. \return True if the archile loader supports this type, false if not */ - virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const IRR_OVERRIDE; //! Creates an archive from the filename /** \param file File handle to check. \return Pointer to newly created archive, or 0 upon error. */ - virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const _IRR_OVERRIDE_; + virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const IRR_OVERRIDE; //! creates/loads an archive from the file. //! \return Pointer to the created archive. Returns 0 if loading failed. - virtual io::IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const _IRR_OVERRIDE_; + virtual io::IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const IRR_OVERRIDE; private: io::IFileSystem* FileSystem; @@ -108,19 +108,19 @@ namespace io virtual ~CTarReader(); //! opens a file by file name - virtual IReadFile* createAndOpenFile(const io::path& filename) _IRR_OVERRIDE_; + virtual IReadFile* createAndOpenFile(const io::path& filename) IRR_OVERRIDE; //! opens a file by index - virtual IReadFile* createAndOpenFile(u32 index) _IRR_OVERRIDE_; + virtual IReadFile* createAndOpenFile(u32 index) IRR_OVERRIDE; //! returns the list of files - virtual const IFileList* getFileList() const _IRR_OVERRIDE_; + virtual const IFileList* getFileList() const IRR_OVERRIDE; //! get the class Type - virtual E_FILE_ARCHIVE_TYPE getType() const _IRR_OVERRIDE_ { return EFAT_TAR; } + virtual E_FILE_ARCHIVE_TYPE getType() const IRR_OVERRIDE { return EFAT_TAR; } //! return the name (id) of the file Archive - virtual const io::path& getArchiveName() const _IRR_OVERRIDE_ {return Path;} + virtual const io::path& getArchiveName() const IRR_OVERRIDE {return Path;} private: @@ -133,4 +133,4 @@ namespace io } // end namespace irr #endif // __IRR_COMPILE_WITH_TAR_ARCHIVE_LOADER_ -#endif // __C_TAR_READER_H_INCLUDED__ +#endif // IRR_C_TAR_READER_H_INCLUDED diff --git a/source/Irrlicht/CTerrainSceneNode.h b/source/Irrlicht/CTerrainSceneNode.h index 3e22d69a..d9cacf40 100644 --- a/source/Irrlicht/CTerrainSceneNode.h +++ b/source/Irrlicht/CTerrainSceneNode.h @@ -4,10 +4,10 @@ // The code for the TerrainSceneNode is based on the GeoMipMapSceneNode // developed by Spintz. He made it available for Irrlicht and allowed it to be -// distributed under this licence. I only modified some parts. A lot of thanks go to him. +// distributed under this license. I only modified some parts. A lot of thanks go to him. -#ifndef __C_TERRAIN_SCENE_NODE_H__ -#define __C_TERRAIN_SCENE_NODE_H__ +#ifndef IRR_C_TERRAIN_SCENE_NODE_H +#define IRR_C_TERRAIN_SCENE_NODE_H #include "ITerrainSceneNode.h" #include "IDynamicMeshBuffer.h" @@ -52,22 +52,22 @@ namespace scene //! Initializes the terrain data. Loads the vertices from the heightMapFile. virtual bool loadHeightMap(io::IReadFile* file, - video::SColor vertexColor = video::SColor ( 255, 255, 255, 255 ), s32 smoothFactor = 0 ) _IRR_OVERRIDE_; + video::SColor vertexColor = video::SColor ( 255, 255, 255, 255 ), s32 smoothFactor = 0 ) IRR_OVERRIDE; //! Initializes the terrain data. Loads the vertices from the heightMapFile. virtual bool loadHeightMapRAW(io::IReadFile* file, s32 bitsPerPixel = 16, bool signedData=true, bool floatVals=false, s32 width=0, - video::SColor vertexColor = video::SColor ( 255, 255, 255, 255 ), s32 smoothFactor = 0 ) _IRR_OVERRIDE_; + video::SColor vertexColor = video::SColor ( 255, 255, 255, 255 ), s32 smoothFactor = 0 ) IRR_OVERRIDE; //! Returns the material based on the zero based index i. This scene node only uses //! 1 material. //! \param i: Zero based index i. UNUSED, left in for virtual purposes. //! \return Returns the single material this scene node uses. - 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 ( always 1 ) //! \return Returns current count of materials used by this scene node ( always 1 ) - virtual u32 getMaterialCount() const _IRR_OVERRIDE_; + virtual u32 getMaterialCount() const IRR_OVERRIDE; //! Gets the last scaling factor applied to the scene node. This value only represents the //! last scaling factor presented to the node. For instance, if you make create the node @@ -76,25 +76,25 @@ namespace scene //! core::vector3df ( 2.0f, 2.0f, 2.0f ), although the total scaling of the scene node is //! core::vector3df ( 100.0f, 10.0f, 100.0f ). //! \return Returns the last scaling factor passed to the scene node. - virtual const core::vector3df& getScale() const _IRR_OVERRIDE_ + virtual const core::vector3df& getScale() const IRR_OVERRIDE { return TerrainData.Scale; } //! Scales the scene nodes vertices by the vector specified. //! \param scale: Scaling factor to apply to the node. - virtual void setScale(const core::vector3df& scale) _IRR_OVERRIDE_; + virtual void setScale(const core::vector3df& scale) IRR_OVERRIDE; //! Gets the last rotation factor applied to the scene node. //! \return Returns the last rotation factor applied to the scene node. - virtual const core::vector3df& getRotation() const _IRR_OVERRIDE_ + virtual const core::vector3df& getRotation() const IRR_OVERRIDE { return TerrainData.Rotation; } //! Rotates the node. This only modifies the relative rotation of the node. //! \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; //! Sets the pivot point for rotation of this node. //! NOTE: The default for the RotationPivot will be the center of the individual tile. @@ -102,44 +102,44 @@ namespace scene //! Gets the last positioning vector applied to the scene node. //! \return Returns the last position vector applied to the scene node. - virtual const core::vector3df& getPosition() const _IRR_OVERRIDE_ + virtual const core::vector3df& getPosition() const IRR_OVERRIDE { return TerrainData.Position; } //! Moves the scene nodes vertices by the vector specified. //! \param newpos: Vector specifying how much to move each vertex of the scene node. - virtual void setPosition(const core::vector3df& newpos) _IRR_OVERRIDE_; + virtual void setPosition(const core::vector3df& newpos) IRR_OVERRIDE; //! Updates the scene nodes indices if the camera has moved or rotated by a certain //! threshold, which can be changed using the SetCameraMovementDeltaThreshold and //! SetCameraRotationDeltaThreshold functions. This also determines if a given patch //! for the scene node is within the view frustum and if it's not the indices are not //! generated for that patch. - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; //! Render the scene node - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! Return the bounding box of the entire terrain. - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! Return the bounding box of a patch - virtual const core::aabbox3d& getBoundingBox(s32 patchX, s32 patchZ) const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox(s32 patchX, s32 patchZ) const IRR_OVERRIDE; //! Return the number of indices currently used to draw the scene node. - virtual u32 getIndexCount() const _IRR_OVERRIDE_ { return IndicesToRender; } + virtual u32 getIndexCount() const IRR_OVERRIDE { return IndicesToRender; } //! Returns the mesh - virtual IMesh* getMesh() _IRR_OVERRIDE_; + virtual IMesh* getMesh() IRR_OVERRIDE; //! Returns a pointer to the buffer used by the terrain (most users will not need this) - virtual IMeshBuffer* getRenderBuffer() _IRR_OVERRIDE_ { return RenderBuffer; } + virtual IMeshBuffer* getRenderBuffer() IRR_OVERRIDE { return RenderBuffer; } //! Gets the meshbuffer data based on a specified Level of Detail. //! \param mb: A reference to an IDynamicMeshBuffer object //! \param LOD: The Level Of Detail you want the indices from. - virtual void getMeshBufferForLOD(IDynamicMeshBuffer& mb, s32 LOD=0) const _IRR_OVERRIDE_; + virtual void getMeshBufferForLOD(IDynamicMeshBuffer& mb, s32 LOD=0) const IRR_OVERRIDE; //! Gets the indices for a specified patch at a specified Level of Detail. //! \param indices: A reference to an array of u32 indices. @@ -150,38 +150,38 @@ namespace scene //! then it will retrieve the triangles at the highest LOD (0). //! \return: Number of indices put into the buffer. virtual s32 getIndicesForPatch(core::array& indices, - s32 patchX, s32 patchZ, s32 LOD=0) _IRR_OVERRIDE_; + s32 patchX, s32 patchZ, s32 LOD=0) IRR_OVERRIDE; //! Populates an array with the CurrentLOD of each patch. //! \param LODs: A reference to a core::array to hold the values //! \return Returns the number of elements in the array - virtual s32 getCurrentLODOfPatches(core::array& LODs) const _IRR_OVERRIDE_; + virtual s32 getCurrentLODOfPatches(core::array& LODs) const IRR_OVERRIDE; //! Manually sets the LOD of a patch //! \param patchX: Patch x coordinate. //! \param patchZ: Patch z coordinate. //! \param LOD: The level of detail to set the patch to. - virtual void setLODOfPatch(s32 patchX, s32 patchZ, s32 LOD=0) _IRR_OVERRIDE_; + virtual void setLODOfPatch(s32 patchX, s32 patchZ, s32 LOD=0) IRR_OVERRIDE; //! Returns center of terrain. - virtual const core::vector3df& getTerrainCenter() const _IRR_OVERRIDE_ + virtual const core::vector3df& getTerrainCenter() const IRR_OVERRIDE { return TerrainData.Center; } //! Returns center of terrain. - virtual f32 getHeight( f32 x, f32 y ) const _IRR_OVERRIDE_; + virtual f32 getHeight( f32 x, f32 y ) const IRR_OVERRIDE; //! Sets the movement camera threshold which is used to determine when to recalculate //! indices for the scene node. The default value is 10.0f. - virtual void setCameraMovementDelta(f32 delta) _IRR_OVERRIDE_ + virtual void setCameraMovementDelta(f32 delta) IRR_OVERRIDE { CameraMovementDelta = delta; } //! Sets the rotation camera threshold which is used to determine when to recalculate //! indices for the scene node. The default value is 1.0f. - virtual void setCameraRotationDelta(f32 delta) _IRR_OVERRIDE_ + virtual void setCameraRotationDelta(f32 delta) IRR_OVERRIDE { CameraRotationDelta = delta; } @@ -190,38 +190,38 @@ namespace scene //! the geomipmap data changes. //! param bVal: Boolean value representing whether or not to update selector dynamically. //! NOTE: Temporarily disabled while working out issues with DynamicSelectorUpdate - virtual void setDynamicSelectorUpdate(bool bVal ) _IRR_OVERRIDE_ { DynamicSelectorUpdate = false; } + virtual void setDynamicSelectorUpdate(bool bVal ) IRR_OVERRIDE { DynamicSelectorUpdate = false; } //! Override the default generation of distance thresholds for determining the LOD a patch //! is rendered at. If any LOD is overridden, then the scene node will no longer apply //! scaling factors to these values. If you override these distances and then apply //! a scale to the scene node, it is your responsibility to update the new distances to //! work best with your new terrain size. - virtual bool overrideLODDistance( s32 LOD, f64 newDistance ) _IRR_OVERRIDE_; + virtual bool overrideLODDistance( s32 LOD, f64 newDistance ) IRR_OVERRIDE; //! Scales the two textures - virtual void scaleTexture(f32 scale = 1.0f, f32 scale2 = 0.0f) _IRR_OVERRIDE_; + virtual void scaleTexture(f32 scale = 1.0f, f32 scale2 = 0.0f) IRR_OVERRIDE; //! Force node to use a fixed LOD level at the borders of the terrain. - virtual void setFixedBorderLOD(irr::s32 borderLOD) _IRR_OVERRIDE_ + virtual void setFixedBorderLOD(irr::s32 borderLOD) IRR_OVERRIDE { FixedBorderLOD = borderLOD; } //! Returns type of the scene node - virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ {return ESNT_TERRAIN;} + virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE {return ESNT_TERRAIN;} //! Writes attributes of the scene node. virtual void serializeAttributes(io::IAttributes* out, - io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_; + io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE; //! Reads attributes of the scene node. virtual void deserializeAttributes(io::IAttributes* in, - io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_; + io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE; //! Creates a clone of this scene node and its children. virtual ISceneNode* clone(ISceneNode* newParent, - ISceneManager* newManager) _IRR_OVERRIDE_; + ISceneManager* newManager) IRR_OVERRIDE; private: friend class CTerrainTriangleSelector; @@ -331,6 +331,4 @@ namespace scene } // end namespace scene } // end namespace irr -#endif // __C_TERRAIN_SCENE_NODE_H__ - - +#endif // IRR_C_TERRAIN_SCENE_NODE_H diff --git a/source/Irrlicht/CTerrainTriangleSelector.h b/source/Irrlicht/CTerrainTriangleSelector.h index eee29772..59af7330 100644 --- a/source/Irrlicht/CTerrainTriangleSelector.h +++ b/source/Irrlicht/CTerrainTriangleSelector.h @@ -4,10 +4,10 @@ // The code for the TerrainTriangleSelector is based on the GeoMipMapSelector // developed by Spintz. He made it available for Irrlicht and allowed it to be -// distributed under this licence. I only modified some parts. A lot of thanks go to him. +// distributed under this license. I only modified some parts. A lot of thanks go to him. -#ifndef __C_TERRAIN_TRIANGLE_SELECTOR_H__ -#define __C_TERRAIN_TRIANGLE_SELECTOR_H__ +#ifndef IRR_C_TERRAIN_TRIANGLE_SELECTOR_H +#define IRR_C_TERRAIN_TRIANGLE_SELECTOR_H #include "ITriangleSelector.h" #include "irrArray.h" @@ -41,33 +41,33 @@ public: //! Gets all triangles. void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, const core::matrix4* transform, bool useNodeTransform, - irr::core::array* outTriangleInfo) const _IRR_OVERRIDE_; + irr::core::array* outTriangleInfo) const IRR_OVERRIDE; //! Gets all triangles which lie within a specific bounding box. void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, const core::aabbox3d& box, const core::matrix4* transform, bool useNodeTransform, - irr::core::array* outTriangleInfo) const _IRR_OVERRIDE_; + irr::core::array* outTriangleInfo) const IRR_OVERRIDE; //! Gets all triangles which have or may have contact with a 3d line. virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, const core::line3d& line, const core::matrix4* transform, bool useNodeTransform, - irr::core::array* outTriangleInfo) const _IRR_OVERRIDE_; + irr::core::array* outTriangleInfo) const IRR_OVERRIDE; //! Returns amount of all available triangles in this selector - virtual s32 getTriangleCount() const _IRR_OVERRIDE_; + virtual s32 getTriangleCount() const IRR_OVERRIDE; //! Return the scene node associated with a given triangle. - virtual ISceneNode* getSceneNodeForTriangle(u32 triangleIndex) const _IRR_OVERRIDE_; + virtual ISceneNode* getSceneNodeForTriangle(u32 triangleIndex) const IRR_OVERRIDE; // Get the number of TriangleSelectors that are part of this one - virtual u32 getSelectorCount() const _IRR_OVERRIDE_; + virtual u32 getSelectorCount() const IRR_OVERRIDE; // Get the TriangleSelector based on index based on getSelectorCount - virtual ITriangleSelector* getSelector(u32 index) _IRR_OVERRIDE_; + virtual ITriangleSelector* getSelector(u32 index) IRR_OVERRIDE; // Get the TriangleSelector based on index based on getSelectorCount - virtual const ITriangleSelector* getSelector(u32 index) const _IRR_OVERRIDE_; + virtual const ITriangleSelector* getSelector(u32 index) const IRR_OVERRIDE; private: @@ -99,5 +99,4 @@ private: } // end namespace scene } // end namespace irr - -#endif // __C_TERRAIN_TRIANGLE_SELECTOR_H__ +#endif // IRR_C_TERRAIN_TRIANGLE_SELECTOR_H diff --git a/source/Irrlicht/CTextSceneNode.h b/source/Irrlicht/CTextSceneNode.h index 5b849110..2d2c71ea 100644 --- a/source/Irrlicht/CTextSceneNode.h +++ b/source/Irrlicht/CTextSceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_TEXT_SCENE_NODE_H_INCLUDED__ -#define __C_TEXT_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_TEXT_SCENE_NODE_H_INCLUDED +#define IRR_C_TEXT_SCENE_NODE_H_INCLUDED #include "ITextSceneNode.h" #include "IBillboardTextSceneNode.h" @@ -32,34 +32,34 @@ namespace scene //! destructor virtual ~CTextSceneNode(); - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; //! renders the node. - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! sets the text string - virtual void setText(const wchar_t* text) _IRR_OVERRIDE_; + virtual void setText(const wchar_t* text) IRR_OVERRIDE; //! get the text string - virtual const wchar_t* getText() const _IRR_OVERRIDE_; + virtual const wchar_t* getText() const IRR_OVERRIDE; //! sets the color of the text - virtual void setTextColor(video::SColor color) _IRR_OVERRIDE_; + virtual void setTextColor(video::SColor color) IRR_OVERRIDE; //! get the color of the text - virtual video::SColor getTextColor() const _IRR_OVERRIDE_; + virtual video::SColor getTextColor() const IRR_OVERRIDE; //! set the font used to draw the text - virtual void setFont(gui::IGUIFont* font) _IRR_OVERRIDE_; + virtual void setFont(gui::IGUIFont* font) IRR_OVERRIDE; //! Get the font used to draw the text - virtual gui::IGUIFont* getFont() const _IRR_OVERRIDE_; + virtual gui::IGUIFont* getFont() const IRR_OVERRIDE; //! Returns type of the scene node - virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_TEXT; } + virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_TEXT; } private: @@ -83,67 +83,67 @@ namespace scene virtual ~CBillboardTextSceneNode(); //! sets the vertex positions etc - virtual void OnAnimate(u32 timeMs) _IRR_OVERRIDE_; + virtual void OnAnimate(u32 timeMs) IRR_OVERRIDE; //! registers the node into the transparent pass - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; //! renders the node. - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! sets the text string - virtual void setText(const wchar_t* text) _IRR_OVERRIDE_; + virtual void setText(const wchar_t* text) IRR_OVERRIDE; //! get the text string - virtual const wchar_t* getText() const _IRR_OVERRIDE_; + virtual const wchar_t* getText() const IRR_OVERRIDE; //! Get the font used to draw the text - virtual gui::IGUIFont* getFont() const _IRR_OVERRIDE_; + virtual gui::IGUIFont* getFont() const IRR_OVERRIDE; //! sets the size of the billboard - virtual void setSize(const core::dimension2d& size) _IRR_OVERRIDE_; + virtual void setSize(const core::dimension2d& size) IRR_OVERRIDE; //! gets the size of the billboard - virtual const core::dimension2d& getSize() const _IRR_OVERRIDE_; + virtual const core::dimension2d& getSize() 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. - virtual u32 getMaterialCount() const _IRR_OVERRIDE_; + virtual u32 getMaterialCount() const IRR_OVERRIDE; //! Returns type of the scene node - virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_BILLBOARD_TEXT; } + virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_BILLBOARD_TEXT; } //! Set the color of all vertices of the billboard //! \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 //! \param topColor: the color to set the top vertices //! \param bottomColor: the color to set the bottom vertices - virtual void setColor(const video::SColor & topColor, const video::SColor & bottomColor) _IRR_OVERRIDE_; + virtual void setColor(const video::SColor & topColor, const video::SColor & bottomColor) IRR_OVERRIDE; //! Gets the color of the top and bottom vertices of the billboard //! \param topColor: stores the color of the top vertices //! \param bottomColor: stores the color of the bottom vertices - virtual void getColor(video::SColor & topColor, video::SColor & bottomColor) const _IRR_OVERRIDE_; + virtual void getColor(video::SColor & topColor, video::SColor & bottomColor) const IRR_OVERRIDE; - virtual void setSize(f32 height, f32 bottomEdgeWidth, f32 topEdgeWidth) _IRR_OVERRIDE_ + virtual void setSize(f32 height, f32 bottomEdgeWidth, f32 topEdgeWidth) IRR_OVERRIDE { setSize(core::dimension2df(bottomEdgeWidth, height)); } - virtual void getSize(f32& height, f32& bottomEdgeWidth, f32& topEdgeWidth) const _IRR_OVERRIDE_ + virtual void getSize(f32& height, f32& bottomEdgeWidth, f32& topEdgeWidth) const IRR_OVERRIDE { height = Size.Height; bottomEdgeWidth = Size.Width; topEdgeWidth = Size.Width; } - virtual const core::aabbox3d& getTransformedBillboardBoundingBox(const irr::scene::ICameraSceneNode* camera) _IRR_OVERRIDE_; + virtual const core::aabbox3d& getTransformedBillboardBoundingBox(const irr::scene::ICameraSceneNode* camera) IRR_OVERRIDE; protected: void updateMesh(const irr::scene::ICameraSceneNode* camera); @@ -177,4 +177,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CTimer.h b/source/Irrlicht/CTimer.h index caf2bf5f..6cfc64ed 100644 --- a/source/Irrlicht/CTimer.h +++ b/source/Irrlicht/CTimer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_IRR_C_TIMER_H_INCLUDED__ -#define __C_IRR_C_TIMER_H_INCLUDED__ +#ifndef IRR_C_IRR_C_TIMER_H_INCLUDED +#define IRR_C_IRR_C_TIMER_H_INCLUDED #include "ITimer.h" #include "os.h" @@ -24,13 +24,13 @@ namespace irr /** This value does not start with 0 when the application starts. For example in one implementation the value returned could be the amount of milliseconds which have elapsed since the system was started. */ - virtual u32 getRealTime() const _IRR_OVERRIDE_ + virtual u32 getRealTime() const IRR_OVERRIDE { return os::Timer::getRealTime(); } //! Get current time and date in calendar form - virtual RealTimeDate getRealTimeAndDate() const _IRR_OVERRIDE_ + virtual RealTimeDate getRealTimeAndDate() const IRR_OVERRIDE { return os::Timer::getRealTimeAndDate(); } @@ -39,13 +39,13 @@ namespace irr /** This value starts with 0 and can be manipulated using setTime(), stopTimer(), startTimer(), etc. This value depends on the set speed of the timer if the timer is stopped, etc. If you need the system time, use getRealTime() */ - virtual u32 getTime() const _IRR_OVERRIDE_ + virtual u32 getTime() const IRR_OVERRIDE { return os::Timer::getTime(); } //! sets current virtual time - virtual void setTime(u32 time) _IRR_OVERRIDE_ + virtual void setTime(u32 time) IRR_OVERRIDE { os::Timer::setTime(time); } @@ -54,7 +54,7 @@ namespace irr /** The timer is reference counted, which means everything which calls stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop corretly again. */ - virtual void stop() _IRR_OVERRIDE_ + virtual void stop() IRR_OVERRIDE { os::Timer::stopTimer(); } @@ -63,7 +63,7 @@ namespace irr /** The timer is reference counted, which means everything which calls stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop corretly again. */ - virtual void start() _IRR_OVERRIDE_ + virtual void start() IRR_OVERRIDE { os::Timer::startTimer(); } @@ -71,7 +71,7 @@ namespace irr //! Sets the speed of the timer /** The speed is the factor with which the time is running faster or slower then the real system time. */ - virtual void setSpeed(f32 speed = 1.0f) _IRR_OVERRIDE_ + virtual void setSpeed(f32 speed = 1.0f) IRR_OVERRIDE { os::Timer::setSpeed(speed); } @@ -79,13 +79,13 @@ namespace irr //! Returns current speed of the timer /** The speed is the factor with which the time is running faster or slower then the real system time. */ - virtual f32 getSpeed() const _IRR_OVERRIDE_ + virtual f32 getSpeed() const IRR_OVERRIDE { return os::Timer::getSpeed(); } //! Returns if game timer is currently stopped - virtual bool isStopped() const _IRR_OVERRIDE_ + virtual bool isStopped() const IRR_OVERRIDE { bool ret = os::Timer::isStopped(); return ret; @@ -95,7 +95,7 @@ namespace irr /** Makes the virtual timer update the time value based on the real time. This is called automatically when calling IrrlichtDevice::run(), but you can call it manually if you don't use this method. */ - virtual void tick() _IRR_OVERRIDE_ + virtual void tick() IRR_OVERRIDE { os::Timer::tick(); } @@ -104,4 +104,3 @@ namespace irr } // end namespace #endif - diff --git a/source/Irrlicht/CTriangleBBSelector.h b/source/Irrlicht/CTriangleBBSelector.h index b4444a33..6fe10cd8 100644 --- a/source/Irrlicht/CTriangleBBSelector.h +++ b/source/Irrlicht/CTriangleBBSelector.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_TRIANGLE_BB_SELECTOR_H_INCLUDED__ -#define __C_TRIANGLE_BB_SELECTOR_H_INCLUDED__ +#ifndef IRR_C_TRIANGLE_BB_SELECTOR_H_INCLUDED +#define IRR_C_TRIANGLE_BB_SELECTOR_H_INCLUDED #include "CTriangleSelector.h" @@ -23,18 +23,18 @@ public: //! Gets all triangles. virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, const core::matrix4* transform, bool useNodeTransform, - irr::core::array* outTriangleInfo) const _IRR_OVERRIDE_; + irr::core::array* outTriangleInfo) const IRR_OVERRIDE; //! Gets all triangles which lie within a specific bounding box. virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, const core::aabbox3d& box, const core::matrix4* transform, bool useNodeTransform, - irr::core::array* outTriangleInfo) const _IRR_OVERRIDE_; + irr::core::array* outTriangleInfo) const IRR_OVERRIDE; //! Gets all triangles which have or may have contact with a 3d line. virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, const core::line3d& line, const core::matrix4* transform, bool useNodeTransform, - irr::core::array* outTriangleInfo) const _IRR_OVERRIDE_; + irr::core::array* outTriangleInfo) const IRR_OVERRIDE; protected: void fillTriangles() const; @@ -44,6 +44,4 @@ protected: } // end namespace scene } // end namespace irr - #endif - diff --git a/source/Irrlicht/CTriangleSelector.h b/source/Irrlicht/CTriangleSelector.h index 01acacff..138fca91 100644 --- a/source/Irrlicht/CTriangleSelector.h +++ b/source/Irrlicht/CTriangleSelector.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_TRIANGLE_SELECTOR_H_INCLUDED__ -#define __C_TRIANGLE_SELECTOR_H_INCLUDED__ +#ifndef IRR_C_TRIANGLE_SELECTOR_H_INCLUDED +#define IRR_C_TRIANGLE_SELECTOR_H_INCLUDED #include "ITriangleSelector.h" #include "IMesh.h" @@ -42,33 +42,33 @@ public: //! Gets all triangles. virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, const core::matrix4* transform, bool useNodeTransform, - irr::core::array* outTriangleInfo) const _IRR_OVERRIDE_; + irr::core::array* outTriangleInfo) const IRR_OVERRIDE; //! Gets all triangles which lie within a specific bounding box. virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, const core::aabbox3d& box, const core::matrix4* transform, bool useNodeTransform, - irr::core::array* outTriangleInfo) const _IRR_OVERRIDE_; + irr::core::array* outTriangleInfo) const IRR_OVERRIDE; //! Gets all triangles which have or may have contact with a 3d line. virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, const core::line3d& line, const core::matrix4* transform, bool useNodeTransform, - irr::core::array* outTriangleInfo) const _IRR_OVERRIDE_; + irr::core::array* outTriangleInfo) const IRR_OVERRIDE; //! Returns amount of all available triangles in this selector - virtual s32 getTriangleCount() const _IRR_OVERRIDE_; + virtual s32 getTriangleCount() const IRR_OVERRIDE; //! Return the scene node associated with a given triangle. - virtual ISceneNode* getSceneNodeForTriangle(u32 triangleIndex) const _IRR_OVERRIDE_ { return SceneNode; } + virtual ISceneNode* getSceneNodeForTriangle(u32 triangleIndex) const IRR_OVERRIDE { return SceneNode; } // Get the number of TriangleSelectors that are part of this one - virtual u32 getSelectorCount() const _IRR_OVERRIDE_; + virtual u32 getSelectorCount() const IRR_OVERRIDE; // Get the TriangleSelector based on index based on getSelectorCount - virtual ITriangleSelector* getSelector(u32 index) _IRR_OVERRIDE_; + virtual ITriangleSelector* getSelector(u32 index) IRR_OVERRIDE; // Get the TriangleSelector based on index based on getSelectorCount - virtual const ITriangleSelector* getSelector(u32 index) const _IRR_OVERRIDE_; + virtual const ITriangleSelector* getSelector(u32 index) const IRR_OVERRIDE; protected: //! Create from a mesh diff --git a/source/Irrlicht/CVideoModeList.h b/source/Irrlicht/CVideoModeList.h index 205cad20..b22da64d 100644 --- a/source/Irrlicht/CVideoModeList.h +++ b/source/Irrlicht/CVideoModeList.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __IRR_C_VIDEO_MODE_LIST_H_INCLUDED__ -#define __IRR_C_VIDEO_MODE_LIST_H_INCLUDED__ +#ifndef IRR_C_VIDEO_MODE_LIST_H_INCLUDED +#define IRR_C_VIDEO_MODE_LIST_H_INCLUDED #include "IVideoModeList.h" #include "dimension2d.h" @@ -22,22 +22,22 @@ namespace video CVideoModeList(); //! Gets amount of video modes in the list. - virtual s32 getVideoModeCount() const _IRR_OVERRIDE_; + virtual s32 getVideoModeCount() const IRR_OVERRIDE; //! Returns the screen size of a video mode in pixels. - virtual core::dimension2d getVideoModeResolution(s32 modeNumber) const _IRR_OVERRIDE_; + virtual core::dimension2d getVideoModeResolution(s32 modeNumber) const IRR_OVERRIDE; //! Returns the screen size of an optimal video mode in pixels. - virtual core::dimension2d getVideoModeResolution(const core::dimension2d& minSize, const core::dimension2d& maxSize) const _IRR_OVERRIDE_; + virtual core::dimension2d getVideoModeResolution(const core::dimension2d& minSize, const core::dimension2d& maxSize) const IRR_OVERRIDE; //! Returns the pixel depth of a video mode in bits. - virtual s32 getVideoModeDepth(s32 modeNumber) const _IRR_OVERRIDE_; + virtual s32 getVideoModeDepth(s32 modeNumber) const IRR_OVERRIDE; //! Returns current desktop screen resolution. - virtual const core::dimension2d& getDesktopResolution() const _IRR_OVERRIDE_; + virtual const core::dimension2d& getDesktopResolution() const IRR_OVERRIDE; //! Returns the pixel depth of a video mode in bits. - virtual s32 getDesktopDepth() const _IRR_OVERRIDE_; + virtual s32 getDesktopDepth() const IRR_OVERRIDE; //! adds a new mode to the list void addMode(const core::dimension2d& size, s32 depth); @@ -74,6 +74,4 @@ namespace video } // end namespace video } // end namespace irr - #endif - diff --git a/source/Irrlicht/CVolumeLightSceneNode.h b/source/Irrlicht/CVolumeLightSceneNode.h index 13c0335a..f8352e8c 100644 --- a/source/Irrlicht/CVolumeLightSceneNode.h +++ b/source/Irrlicht/CVolumeLightSceneNode.h @@ -29,43 +29,43 @@ namespace scene virtual ~CVolumeLightSceneNode(); - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; //! renders the node. - virtual void render() _IRR_OVERRIDE_; + virtual void render() IRR_OVERRIDE; //! returns the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_; + virtual const core::aabbox3d& getBoundingBox() const IRR_OVERRIDE; //! returns the material based on the zero based index i. - 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. - virtual u32 getMaterialCount() const _IRR_OVERRIDE_; + virtual u32 getMaterialCount() const IRR_OVERRIDE; //! Returns type of the scene node - virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_VOLUME_LIGHT; } + virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_VOLUME_LIGHT; } //! 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. - 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. - virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) _IRR_OVERRIDE_; + virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) IRR_OVERRIDE; - virtual void setSubDivideU(const u32 inU) _IRR_OVERRIDE_; - virtual void setSubDivideV(const u32 inV) _IRR_OVERRIDE_; + virtual void setSubDivideU(const u32 inU) IRR_OVERRIDE; + virtual void setSubDivideV(const u32 inV) IRR_OVERRIDE; - virtual u32 getSubDivideU() const _IRR_OVERRIDE_ { return SubdivideU; } - virtual u32 getSubDivideV() const _IRR_OVERRIDE_ { return SubdivideV; } + virtual u32 getSubDivideU() const IRR_OVERRIDE { return SubdivideU; } + virtual u32 getSubDivideV() const IRR_OVERRIDE { return SubdivideV; } - virtual void setFootColor(const video::SColor inColor) _IRR_OVERRIDE_; - virtual void setTailColor(const video::SColor inColor) _IRR_OVERRIDE_; + virtual void setFootColor(const video::SColor inColor) IRR_OVERRIDE; + virtual void setTailColor(const video::SColor inColor) IRR_OVERRIDE; - virtual video::SColor getFootColor() const _IRR_OVERRIDE_ { return FootColor; } - virtual video::SColor getTailColor() const _IRR_OVERRIDE_ { return TailColor; } + virtual video::SColor getFootColor() const IRR_OVERRIDE { return FootColor; } + virtual video::SColor getTailColor() const IRR_OVERRIDE { return TailColor; } private: void constructLight(); diff --git a/source/Irrlicht/CWADReader.h b/source/Irrlicht/CWADReader.h index fe2acd1f..8d9a01af 100644 --- a/source/Irrlicht/CWADReader.h +++ b/source/Irrlicht/CWADReader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_WAD_READER_H_INCLUDED__ -#define __C_WAD_READER_H_INCLUDED__ +#ifndef IRR_C_WAD_READER_H_INCLUDED +#define IRR_C_WAD_READER_H_INCLUDED #include "IrrCompileConfig.h" #ifdef __IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_ @@ -89,28 +89,28 @@ namespace io //! returns true if the file maybe is able to be loaded by this class //! based on the file extension (e.g. ".zip") - virtual bool isALoadableFileFormat(const io::path& filename) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(const io::path& filename) const IRR_OVERRIDE; //! Check if the file might be loaded by this class /** Check might look into the file. \param file File handle to check. \return True if file seems to be loadable. */ - virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE; //! Check to see if the loader can create archives of this type. /** Check based on the archive type. \param fileType The archive type to check. \return True if the archile loader supports this type, false if not */ - virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const IRR_OVERRIDE; //! Creates an archive from the filename /** \param file File handle to check. \return Pointer to newly created archive, or 0 upon error. */ - virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const _IRR_OVERRIDE_; + virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const IRR_OVERRIDE; //! creates/loads an archive from the file. //! \return Pointer to the created archive. Returns 0 if loading failed. - virtual io::IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const _IRR_OVERRIDE_; + virtual io::IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const IRR_OVERRIDE; private: io::IFileSystem* FileSystem; @@ -128,19 +128,19 @@ namespace io // file archive methods //! return the id of the file Archive - virtual const io::path& getArchiveName() const _IRR_OVERRIDE_; + virtual const io::path& getArchiveName() const IRR_OVERRIDE; //! opens a file by file name - virtual IReadFile* createAndOpenFile(const io::path& filename) _IRR_OVERRIDE_; + virtual IReadFile* createAndOpenFile(const io::path& filename) IRR_OVERRIDE; //! opens a file by index - virtual IReadFile* createAndOpenFile(u32 index) _IRR_OVERRIDE_; + virtual IReadFile* createAndOpenFile(u32 index) IRR_OVERRIDE; //! returns the list of files - virtual const IFileList* getFileList() const _IRR_OVERRIDE_; + virtual const IFileList* getFileList() const IRR_OVERRIDE; //! get the class Type - virtual E_FILE_ARCHIVE_TYPE getType() const _IRR_OVERRIDE_ { return EFAT_WAD; } + virtual E_FILE_ARCHIVE_TYPE getType() const IRR_OVERRIDE { return EFAT_WAD; } private: @@ -169,8 +169,6 @@ namespace io } // end namespace io } // end namespace irr -#endif - - -#endif // #ifdef __IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_ +#endif // #ifdef __IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_ +#endif diff --git a/source/Irrlicht/CWGLManager.h b/source/Irrlicht/CWGLManager.h index 4cfeb8f0..54d83fcc 100644 --- a/source/Irrlicht/CWGLManager.h +++ b/source/Irrlicht/CWGLManager.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in Irrlicht.h -#ifndef __C_WGL_MANAGER_H_INCLUDED__ -#define __C_WGL_MANAGER_H_INCLUDED__ +#ifndef IRR_C_WGL_MANAGER_H_INCLUDED +#define IRR_C_WGL_MANAGER_H_INCLUDED #include "IrrCompileConfig.h" @@ -32,31 +32,31 @@ namespace video ~CWGLManager(); // Initialize - virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) _IRR_OVERRIDE_; + virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) IRR_OVERRIDE; // Terminate - virtual void terminate() _IRR_OVERRIDE_; + virtual void terminate() IRR_OVERRIDE; // Create surface. - virtual bool generateSurface() _IRR_OVERRIDE_; + virtual bool generateSurface() IRR_OVERRIDE; // Destroy surface. - virtual void destroySurface() _IRR_OVERRIDE_; + virtual void destroySurface() IRR_OVERRIDE; // Create context. - virtual bool generateContext() _IRR_OVERRIDE_; + virtual bool generateContext() IRR_OVERRIDE; // Destroy EGL context. - virtual void destroyContext() _IRR_OVERRIDE_; + virtual void destroyContext() IRR_OVERRIDE; //! 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 - virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) _IRR_OVERRIDE_; + virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) IRR_OVERRIDE; // Swap buffers. - virtual bool swapBuffers() _IRR_OVERRIDE_; + virtual bool swapBuffers() IRR_OVERRIDE; private: SIrrlichtCreationParameters Params; diff --git a/source/Irrlicht/CWaterSurfaceSceneNode.h b/source/Irrlicht/CWaterSurfaceSceneNode.h index 7a588cd2..cdea73dc 100644 --- a/source/Irrlicht/CWaterSurfaceSceneNode.h +++ b/source/Irrlicht/CWaterSurfaceSceneNode.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_WATER_SURFACE_SCENE_NODE_H_INCLUDED__ -#define __C_WATER_SURFACE_SCENE_NODE_H_INCLUDED__ +#ifndef IRR_C_WATER_SURFACE_SCENE_NODE_H_INCLUDED +#define IRR_C_WATER_SURFACE_SCENE_NODE_H_INCLUDED #include "CMeshSceneNode.h" @@ -27,22 +27,22 @@ namespace scene virtual ~CWaterSurfaceSceneNode(); //! frame registration - virtual void OnRegisterSceneNode() _IRR_OVERRIDE_; + virtual void OnRegisterSceneNode() IRR_OVERRIDE; //! animated update - virtual void OnAnimate(u32 timeMs) _IRR_OVERRIDE_; + virtual void OnAnimate(u32 timeMs) IRR_OVERRIDE; //! Update mesh - virtual void setMesh(IMesh* mesh) _IRR_OVERRIDE_; + virtual void setMesh(IMesh* mesh) IRR_OVERRIDE; //! Returns type of the scene node - virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_WATER_SURFACE; } + virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_WATER_SURFACE; } //! Writes attributes of the scene node. - 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 scene node. - virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_; + virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE; private: @@ -58,4 +58,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/CWebGL1Driver.h b/source/Irrlicht/CWebGL1Driver.h index dd1dad82..88161362 100644 --- a/source/Irrlicht/CWebGL1Driver.h +++ b/source/Irrlicht/CWebGL1Driver.h @@ -37,10 +37,10 @@ namespace video virtual ~CWebGL1Driver(); //! Returns type of video driver - virtual E_DRIVER_TYPE getDriverType() const _IRR_OVERRIDE_; + virtual E_DRIVER_TYPE getDriverType() const IRR_OVERRIDE; //! Is VBO recommended on this mesh? - virtual bool isHardwareBufferRecommend(const scene::IMeshBuffer* mb) _IRR_OVERRIDE_ + virtual bool isHardwareBufferRecommend(const scene::IMeshBuffer* mb) IRR_OVERRIDE { // All buffers must be bound, WebGL doesn't allow sending unbound buffers at all. return true; @@ -49,22 +49,22 @@ namespace video //! draws a vertex primitive list virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const void* indexList, u32 primitiveCount, - E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) _IRR_OVERRIDE_; + E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) IRR_OVERRIDE; //! Draws a mesh buffer - virtual void drawMeshBuffer(const scene::IMeshBuffer* mb) _IRR_OVERRIDE_; + virtual void drawMeshBuffer(const scene::IMeshBuffer* mb) IRR_OVERRIDE; virtual void draw2DImage(const video::ITexture* texture, const core::position2d& destPos, const core::rect& sourceRect, const core::rect* 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; virtual void draw2DImage(const video::ITexture* texture, const core::rect& destRect, const core::rect& sourceRect, const core::rect* clipRect = 0, - const video::SColor* const colors = 0, bool useAlphaChannelOfTexture = false) _IRR_OVERRIDE_; + const video::SColor* const colors = 0, bool useAlphaChannelOfTexture = false) IRR_OVERRIDE; // internally used - virtual void draw2DImage(const video::ITexture* texture, u32 layer, bool flip) _IRR_OVERRIDE_; + virtual void draw2DImage(const video::ITexture* texture, u32 layer, bool flip) IRR_OVERRIDE; //! draws a set of 2d images virtual void draw2DImageBatch(const video::ITexture* texture, @@ -73,58 +73,58 @@ namespace video const core::array& indices, s32 kerningWidth = 0, const core::rect* clipRect = 0, SColor color = SColor(255, 255, 255, 255), - bool useAlphaChannelOfTexture = false) _IRR_OVERRIDE_; + bool useAlphaChannelOfTexture = false) IRR_OVERRIDE; void draw2DImageBatch(const video::ITexture* texture, const core::array >& positions, const core::array >& sourceRects, const core::rect* clipRect, SColor color, - bool useAlphaChannelOfTexture) _IRR_OVERRIDE_; + bool useAlphaChannelOfTexture) IRR_OVERRIDE; //! draw an 2d rectangle virtual void draw2DRectangle(SColor color, const core::rect& pos, - const core::rect* clip = 0) _IRR_OVERRIDE_; + const core::rect* clip = 0) IRR_OVERRIDE; //!Draws an 2d rectangle with a gradient. virtual void draw2DRectangle(const core::rect& pos, SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown, - const core::rect* clip = 0) _IRR_OVERRIDE_; + const core::rect* clip = 0) IRR_OVERRIDE; //! Draws a 2d line. virtual void draw2DLine(const core::position2d& start, const core::position2d& end, - SColor color = SColor(255, 255, 255, 255)) _IRR_OVERRIDE_; + SColor color = SColor(255, 255, 255, 255)) IRR_OVERRIDE; //! Draws a single pixel - virtual void drawPixel(u32 x, u32 y, const SColor & color) _IRR_OVERRIDE_; + virtual void drawPixel(u32 x, u32 y, const SColor & color) IRR_OVERRIDE; //! Draws a 3d line. virtual void draw3DLine(const core::vector3df& start, const core::vector3df& end, - SColor color = SColor(255, 255, 255, 255)) _IRR_OVERRIDE_; + SColor color = SColor(255, 255, 255, 255)) IRR_OVERRIDE; //! Draws a shadow volume into the stencil buffer. - virtual void drawStencilShadowVolume(const core::array& triangles, bool zfail, u32 debugDataVisible=0) _IRR_OVERRIDE_; + virtual void drawStencilShadowVolume(const core::array& triangles, bool zfail, u32 debugDataVisible=0) IRR_OVERRIDE; //! Fills the stencil shadow with color. virtual void drawStencilShadow(bool clearStencilBuffer=false, video::SColor leftUpEdge = video::SColor(0,0,0,0), video::SColor rightUpEdge = video::SColor(0,0,0,0), video::SColor leftDownEdge = video::SColor(0,0,0,0), - video::SColor rightDownEdge = video::SColor(0,0,0,0)) _IRR_OVERRIDE_; + video::SColor rightDownEdge = video::SColor(0,0,0,0)) IRR_OVERRIDE; //! Get ZBuffer bits. - virtual GLenum getZBufferBits() const _IRR_OVERRIDE_; + virtual GLenum getZBufferBits() const IRR_OVERRIDE; virtual bool getColorFormatParameters(ECOLOR_FORMAT format, GLint& internalFormat, GLenum& pixelFormat, - GLenum& pixelType, void(**converter)(const void*, s32, void*)) const _IRR_OVERRIDE_; + GLenum& pixelType, void(**converter)(const void*, s32, void*)) const IRR_OVERRIDE; protected: // create a meshbuffer which has as many vertices as indices scene::SMeshBuffer* createSimpleMeshBuffer(irr::u32 numVertices, scene::E_PRIMITIVE_TYPE primitiveType, scene::E_HARDWARE_MAPPING vertexMappingHint=scene::EHM_STREAM, scene::E_HARDWARE_MAPPING indexMappingHint=scene::EHM_STATIC) const; - virtual bool genericDriverInit(const core::dimension2d& screenSize, bool stencilBuffer) _IRR_OVERRIDE_; + virtual bool genericDriverInit(const core::dimension2d& screenSize, bool stencilBuffer) IRR_OVERRIDE; void initWebGLExtensions(); private: diff --git a/source/Irrlicht/CWriteFile.h b/source/Irrlicht/CWriteFile.h index d0e2c804..9f6f4505 100644 --- a/source/Irrlicht/CWriteFile.h +++ b/source/Irrlicht/CWriteFile.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_WRITE_FILE_H_INCLUDED__ -#define __C_WRITE_FILE_H_INCLUDED__ +#ifndef IRR_C_WRITE_FILE_H_INCLUDED +#define IRR_C_WRITE_FILE_H_INCLUDED #include #include "IWriteFile.h" @@ -27,19 +27,19 @@ namespace io virtual ~CWriteFile(); //! Reads an amount of bytes from the file. - virtual size_t write(const void* buffer, size_t sizeToWrite) _IRR_OVERRIDE_; + virtual size_t write(const void* buffer, size_t sizeToWrite) IRR_OVERRIDE; //! Changes position in file, returns true if successful. - virtual bool seek(long finalPos, bool relativeMovement = false) _IRR_OVERRIDE_; + virtual bool seek(long finalPos, bool relativeMovement = false) IRR_OVERRIDE; //! Returns the current position in the file. - virtual long getPos() const _IRR_OVERRIDE_; + virtual long getPos() const IRR_OVERRIDE; //! Returns name of file. - virtual const io::path& getFileName() const _IRR_OVERRIDE_; + virtual const io::path& getFileName() const IRR_OVERRIDE; //! Flush the content of the buffer in the file - virtual bool flush() _IRR_OVERRIDE_; + virtual bool flush() IRR_OVERRIDE; //! returns if file is open bool isOpen() const; @@ -61,4 +61,3 @@ namespace io } // end namespace irr #endif - diff --git a/source/Irrlicht/CXMLReader.cpp b/source/Irrlicht/CXMLReader.cpp index db5a9443..3881e00e 100644 --- a/source/Irrlicht/CXMLReader.cpp +++ b/source/Irrlicht/CXMLReader.cpp @@ -31,13 +31,13 @@ namespace io } //! Reads an amount of bytes from the file. - virtual int read(void* buffer, int sizeToRead) _IRR_OVERRIDE_ + virtual int read(void* buffer, int sizeToRead) IRR_OVERRIDE { return (int)ReadFile->read(buffer, sizeToRead); } //! Returns size of file in bytes - virtual long getSize() const _IRR_OVERRIDE_ + virtual long getSize() const IRR_OVERRIDE { return ReadFile->getSize(); } diff --git a/source/Irrlicht/CXMLReader.h b/source/Irrlicht/CXMLReader.h index 328b92a8..1b7fa590 100644 --- a/source/Irrlicht/CXMLReader.h +++ b/source/Irrlicht/CXMLReader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_XML_READER_H_INCLUDED__ -#define __C_XML_READER_H_INCLUDED__ +#ifndef IRR_C_XML_READER_H_INCLUDED +#define IRR_C_XML_READER_H_INCLUDED #include "IXMLReader.h" @@ -27,4 +27,3 @@ namespace io } // end namespace io #endif - diff --git a/source/Irrlicht/CXMLReaderImpl.h b/source/Irrlicht/CXMLReaderImpl.h index 6dbf5297..8fb87e17 100644 --- a/source/Irrlicht/CXMLReaderImpl.h +++ b/source/Irrlicht/CXMLReaderImpl.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine" and the "irrXML" project. // For conditions of distribution and use, see copyright notice in irrlicht.h and/or irrXML.h -#ifndef __ICXML_READER_IMPL_H_INCLUDED__ -#define __ICXML_READER_IMPL_H_INCLUDED__ +#ifndef IRR_ICXML_READER_IMPL_H_INCLUDED +#define IRR_ICXML_READER_IMPL_H_INCLUDED #include "irrXML.h" #include "irrString.h" @@ -66,7 +66,7 @@ public: //! Reads forward to the next xml node. //! \return Returns false, if there was no further node. - virtual bool read() _IRR_OVERRIDE_ + virtual bool read() IRR_OVERRIDE { // if not end reached, parse the node if (P && ((unsigned int)(P - TextBegin) < TextSize - 1) && (*P != 0)) @@ -79,21 +79,21 @@ public: //! Returns the type of the current XML node. - virtual EXML_NODE getNodeType() const _IRR_OVERRIDE_ + virtual EXML_NODE getNodeType() const IRR_OVERRIDE { return CurrentNodeType; } //! Returns attribute count of the current XML node. - virtual unsigned int getAttributeCount() const _IRR_OVERRIDE_ + virtual unsigned int getAttributeCount() const IRR_OVERRIDE { return Attributes.size(); } //! Returns name of an attribute. - virtual const char_type* getAttributeName(int idx) const _IRR_OVERRIDE_ + virtual const char_type* getAttributeName(int idx) const IRR_OVERRIDE { if ((u32)idx >= Attributes.size()) return 0; @@ -103,7 +103,7 @@ public: //! Returns the value of an attribute. - virtual const char_type* getAttributeValue(int idx) const _IRR_OVERRIDE_ + virtual const char_type* getAttributeValue(int idx) const IRR_OVERRIDE { if ((unsigned int)idx >= Attributes.size()) return 0; @@ -113,7 +113,7 @@ public: //! Returns the value of an attribute. - virtual const char_type* getAttributeValue(const char_type* name) const _IRR_OVERRIDE_ + virtual const char_type* getAttributeValue(const char_type* name) const IRR_OVERRIDE { const SAttribute* attr = getAttributeByName(name); if (!attr) @@ -124,7 +124,7 @@ public: //! Returns the value of an attribute - virtual const char_type* getAttributeValueSafe(const char_type* name) const _IRR_OVERRIDE_ + virtual const char_type* getAttributeValueSafe(const char_type* name) const IRR_OVERRIDE { const SAttribute* attr = getAttributeByName(name); if (!attr) @@ -136,7 +136,7 @@ public: //! Returns the value of an attribute as integer. - virtual int getAttributeValueAsInt(const char_type* name, int defaultNotFound) const _IRR_OVERRIDE_ + virtual int getAttributeValueAsInt(const char_type* name, int defaultNotFound) const IRR_OVERRIDE { const SAttribute* attr = getAttributeByName(name); if (!attr) @@ -148,7 +148,7 @@ public: //! Returns the value of an attribute as integer. - virtual int getAttributeValueAsInt(int idx, int defaultNotFound) const _IRR_OVERRIDE_ + virtual int getAttributeValueAsInt(int idx, int defaultNotFound) const IRR_OVERRIDE { const char_type* attrvalue = getAttributeValue(idx); if (!attrvalue) @@ -160,7 +160,7 @@ public: //! Returns the value of an attribute as float. - virtual float getAttributeValueAsFloat(const char_type* name, float defaultNotFound) const _IRR_OVERRIDE_ + virtual float getAttributeValueAsFloat(const char_type* name, float defaultNotFound) const IRR_OVERRIDE { const SAttribute* attr = getAttributeByName(name); if (!attr) @@ -172,7 +172,7 @@ public: //! Returns the value of an attribute as float. - virtual float getAttributeValueAsFloat(int idx, float defaultNotFound) const _IRR_OVERRIDE_ + virtual float getAttributeValueAsFloat(int idx, float defaultNotFound) const IRR_OVERRIDE { const char_type* attrvalue = getAttributeValue(idx); if (!attrvalue) @@ -184,33 +184,33 @@ public: //! Returns the name of the current node. - virtual const char_type* getNodeName() const _IRR_OVERRIDE_ + virtual const char_type* getNodeName() const IRR_OVERRIDE { return NodeName.c_str(); } //! Returns data of the current node. - virtual const char_type* getNodeData() const _IRR_OVERRIDE_ + virtual const char_type* getNodeData() const IRR_OVERRIDE { return NodeName.c_str(); } //! Returns if an element is an empty element, like - virtual bool isEmptyElement() const _IRR_OVERRIDE_ + virtual bool isEmptyElement() const IRR_OVERRIDE { return IsEmptyElement; } //! Returns format of the source xml file. - virtual ETEXT_FORMAT getSourceFormat() const _IRR_OVERRIDE_ + virtual ETEXT_FORMAT getSourceFormat() const IRR_OVERRIDE { return SourceFormat; } //! Returns format of the strings returned by the parser. - virtual ETEXT_FORMAT getParserFormat() const _IRR_OVERRIDE_ + virtual ETEXT_FORMAT getParserFormat() const IRR_OVERRIDE { return TargetFormat; } diff --git a/source/Irrlicht/CXMLWriter.h b/source/Irrlicht/CXMLWriter.h index 6febc66a..a00f76f2 100644 --- a/source/Irrlicht/CXMLWriter.h +++ b/source/Irrlicht/CXMLWriter.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_XML_WRITER_H_INCLUDED__ -#define __C_XML_WRITER_H_INCLUDED__ +#ifndef IRR_C_XML_WRITER_H_INCLUDED +#define IRR_C_XML_WRITER_H_INCLUDED #include "IXMLWriter.h" @@ -70,7 +70,7 @@ namespace io virtual ~CXMLWriter() {} //! Writes a xml 1.0 header like - virtual void writeXMLHeader() _IRR_OVERRIDE_; + virtual void writeXMLHeader() IRR_OVERRIDE; //! Writes an xml element with maximal 5 attributes virtual void writeElement(const wchar_t* name, bool empty=false, @@ -78,24 +78,24 @@ namespace io const wchar_t* attr2Name = 0, const wchar_t* attr2Value = 0, const wchar_t* attr3Name = 0, const wchar_t* attr3Value = 0, const wchar_t* attr4Name = 0, const wchar_t* attr4Value = 0, - const wchar_t* attr5Name = 0, const wchar_t* attr5Value = 0) _IRR_OVERRIDE_; + const wchar_t* attr5Name = 0, const wchar_t* attr5Value = 0) IRR_OVERRIDE; //! Writes an xml element with any number of attributes virtual void writeElement(const wchar_t* name, bool empty, - core::array &names, core::array &values) _IRR_OVERRIDE_; + core::array &names, core::array &values) IRR_OVERRIDE; //! Writes a comment into the xml file - virtual void writeComment(const wchar_t* comment) _IRR_OVERRIDE_; + virtual void writeComment(const wchar_t* comment) IRR_OVERRIDE; //! Writes the closing tag for an element. Like - virtual void writeClosingTag(const wchar_t* name) _IRR_OVERRIDE_; + virtual void writeClosingTag(const wchar_t* name) IRR_OVERRIDE; //! Writes a text into the file. All occurrences of special characters like //! & (&), < (<), > (>), and " (") are automatically replaced. - virtual void writeText(const wchar_t* text) _IRR_OVERRIDE_; + virtual void writeText(const wchar_t* text) IRR_OVERRIDE; //! Writes a line break - virtual void writeLineBreak() _IRR_OVERRIDE_; + virtual void writeLineBreak() IRR_OVERRIDE; private: @@ -114,7 +114,7 @@ namespace io virtual ~CXMLWriterUTF8() {} //! Writes a xml 1.0 header like - virtual void writeXMLHeader() _IRR_OVERRIDE_; + virtual void writeXMLHeader() IRR_OVERRIDE; //! Writes an xml element with maximal 5 attributes virtual void writeElement(const c8* name, bool empty=false, @@ -122,24 +122,24 @@ namespace io const c8* attr2Name = 0, const c8* attr2Value = 0, const c8* attr3Name = 0, const c8* attr3Value = 0, const c8* attr4Name = 0, const c8* attr4Value = 0, - const c8* attr5Name = 0, const c8* attr5Value = 0) _IRR_OVERRIDE_; + const c8* attr5Name = 0, const c8* attr5Value = 0) IRR_OVERRIDE; //! Writes an xml element with any number of attributes virtual void writeElement(const c8* name, bool empty, - core::array &names, core::array &values) _IRR_OVERRIDE_; + core::array &names, core::array &values) IRR_OVERRIDE; //! Writes a comment into the xml file - virtual void writeComment(const c8* comment) _IRR_OVERRIDE_; + virtual void writeComment(const c8* comment) IRR_OVERRIDE; //! Writes the closing tag for an element. Like - virtual void writeClosingTag(const c8* name) _IRR_OVERRIDE_; + virtual void writeClosingTag(const c8* name) IRR_OVERRIDE; //! Writes a text into the file. All occurrences of special characters like //! & (&), < (<), > (>), and " (") are automatically replaced. - virtual void writeText(const c8* text) _IRR_OVERRIDE_; + virtual void writeText(const c8* text) IRR_OVERRIDE; //! Writes a line break - virtual void writeLineBreak() _IRR_OVERRIDE_; + virtual void writeLineBreak() IRR_OVERRIDE; private: @@ -153,4 +153,3 @@ namespace io #endif // _IRR_COMPILE_WITH_XML_ #endif - diff --git a/source/Irrlicht/CXMeshFileLoader.h b/source/Irrlicht/CXMeshFileLoader.h index a4806d7b..a5f7f7e4 100644 --- a/source/Irrlicht/CXMeshFileLoader.h +++ b/source/Irrlicht/CXMeshFileLoader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_X_MESH_FILE_LOADER_H_INCLUDED__ -#define __C_X_MESH_FILE_LOADER_H_INCLUDED__ +#ifndef IRR_C_X_MESH_FILE_LOADER_H_INCLUDED +#define IRR_C_X_MESH_FILE_LOADER_H_INCLUDED #include "IMeshLoader.h" #include "irrString.h" @@ -31,13 +31,13 @@ public: //! returns true if the file maybe is able to be loaded by this class //! 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. //! \return Pointer to the created mesh. Returns 0 if loading failed. //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). //! See IReferenceCounted::drop() for more information. - virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_; + virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE; struct SXTemplateMaterial { diff --git a/source/Irrlicht/CZBuffer.h b/source/Irrlicht/CZBuffer.h index ff517740..2dbf2cc2 100644 --- a/source/Irrlicht/CZBuffer.h +++ b/source/Irrlicht/CZBuffer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_Z_BUFFER_H_INCLUDED__ -#define __C_Z_BUFFER_H_INCLUDED__ +#ifndef IRR_C_Z_BUFFER_H_INCLUDED +#define IRR_C_Z_BUFFER_H_INCLUDED #include "IZBuffer.h" @@ -23,19 +23,19 @@ namespace video virtual ~CZBuffer(); //! clears the zbuffer - virtual void clear() _IRR_OVERRIDE_; + virtual void clear() IRR_OVERRIDE; //! sets the new size of the zbuffer - virtual void setSize(const core::dimension2d& size) _IRR_OVERRIDE_; + virtual void setSize(const core::dimension2d& size) IRR_OVERRIDE; //! returns the size of the zbuffer - virtual const core::dimension2d& getSize() const _IRR_OVERRIDE_; + virtual const core::dimension2d& getSize() const IRR_OVERRIDE; //! locks the zbuffer - virtual TZBufferType* lock() _IRR_OVERRIDE_; + virtual TZBufferType* lock() IRR_OVERRIDE; //! unlocks the zbuffer - virtual void unlock() _IRR_OVERRIDE_; + virtual void unlock() IRR_OVERRIDE; private: @@ -49,4 +49,3 @@ namespace video } // end namespace irr #endif - diff --git a/source/Irrlicht/CZipReader.h b/source/Irrlicht/CZipReader.h index 286c4ebf..80ba6440 100644 --- a/source/Irrlicht/CZipReader.h +++ b/source/Irrlicht/CZipReader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_ZIP_READER_H_INCLUDED__ -#define __C_ZIP_READER_H_INCLUDED__ +#ifndef IRR_C_ZIP_READER_H_INCLUDED +#define IRR_C_ZIP_READER_H_INCLUDED #include "IrrCompileConfig.h" @@ -145,28 +145,28 @@ namespace io //! returns true if the file maybe is able to be loaded by this class //! based on the file extension (e.g. ".zip") - virtual bool isALoadableFileFormat(const io::path& filename) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(const io::path& filename) const IRR_OVERRIDE; //! Check if the file might be loaded by this class /** Check might look into the file. \param file File handle to check. \return True if file seems to be loadable. */ - virtual bool isALoadableFileFormat(io::IReadFile* file) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(io::IReadFile* file) const IRR_OVERRIDE; //! Check to see if the loader can create archives of this type. /** Check based on the archive type. \param fileType The archive type to check. \return True if the archile loader supports this type, false if not */ - virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const _IRR_OVERRIDE_; + virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const IRR_OVERRIDE; //! Creates an archive from the filename /** \param file File handle to check. \return Pointer to newly created archive, or 0 upon error. */ - virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const _IRR_OVERRIDE_; + virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const IRR_OVERRIDE; //! creates/loads an archive from the file. //! \return Pointer to the created archive. Returns 0 if loading failed. - virtual io::IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const _IRR_OVERRIDE_; + virtual io::IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const IRR_OVERRIDE; private: io::IFileSystem* FileSystem; @@ -186,19 +186,19 @@ namespace io virtual ~CZipReader(); //! opens a file by file name - virtual IReadFile* createAndOpenFile(const io::path& filename) _IRR_OVERRIDE_; + virtual IReadFile* createAndOpenFile(const io::path& filename) IRR_OVERRIDE; //! opens a file by index - virtual IReadFile* createAndOpenFile(u32 index) _IRR_OVERRIDE_; + virtual IReadFile* createAndOpenFile(u32 index) IRR_OVERRIDE; //! returns the list of files - virtual const IFileList* getFileList() const _IRR_OVERRIDE_; + virtual const IFileList* getFileList() const IRR_OVERRIDE; //! get the archive type - virtual E_FILE_ARCHIVE_TYPE getType() const _IRR_OVERRIDE_; + virtual E_FILE_ARCHIVE_TYPE getType() const IRR_OVERRIDE; //! return the id of the file Archive - virtual const io::path& getArchiveName() const _IRR_OVERRIDE_ {return Path;} + virtual const io::path& getArchiveName() const IRR_OVERRIDE {return Path;} protected: @@ -227,5 +227,4 @@ namespace io } // end namespace irr #endif // __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_ -#endif // __C_ZIP_READER_H_INCLUDED__ - +#endif // IRR_C_ZIP_READER_H_INCLUDED diff --git a/source/Irrlicht/IAttribute.h b/source/Irrlicht/IAttribute.h index 554ca951..dc054bbc 100644 --- a/source/Irrlicht/IAttribute.h +++ b/source/Irrlicht/IAttribute.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_ATTRIBUTE_H_INCLUDED__ -#define __I_ATTRIBUTE_H_INCLUDED__ +#ifndef IRR_I_ATTRIBUTE_H_INCLUDED +#define IRR_I_ATTRIBUTE_H_INCLUDED #include "IReferenceCounted.h" #include "SColor.h" diff --git a/source/Irrlicht/IBurningShader.cpp b/source/Irrlicht/IBurningShader.cpp index b72cd9ac..640bf9b2 100644 --- a/source/Irrlicht/IBurningShader.cpp +++ b/source/Irrlicht/IBurningShader.cpp @@ -33,7 +33,7 @@ void IBurningShader::constructor_IBurningShader(CBurningVideoDriver* driver) if (((unsigned long long)&scan & 15) || ((unsigned long long)&line & 15)) { os::Printer::log("BurningVideo Shader not 16 byte aligned", ELL_ERROR); - _IRR_DEBUG_BREAK_IF(1); + IRR_DEBUG_BREAK_IF(1); } #endif diff --git a/source/Irrlicht/IBurningShader.h b/source/Irrlicht/IBurningShader.h index 748a9a40..155b94da 100644 --- a/source/Irrlicht/IBurningShader.h +++ b/source/Irrlicht/IBurningShader.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_BURNING_SHADER_H_INCLUDED__ -#define __I_BURNING_SHADER_H_INCLUDED__ +#ifndef IRR_I_BURNING_SHADER_H_INCLUDED +#define IRR_I_BURNING_SHADER_H_INCLUDED #include "SoftwareDriver2_compile_config.h" #include "IReferenceCounted.h" @@ -272,31 +272,31 @@ namespace video //IMaterialRenderer virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_; + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE; - virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) _IRR_OVERRIDE_; + virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) IRR_OVERRIDE; - virtual void OnUnsetMaterial() _IRR_OVERRIDE_; + virtual void OnUnsetMaterial() IRR_OVERRIDE; //! 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 - virtual IShaderConstantSetCallBack* getShaderConstantSetCallBack() const _IRR_OVERRIDE_; + virtual IShaderConstantSetCallBack* getShaderConstantSetCallBack() const IRR_OVERRIDE; // implementations for the render services - virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates) _IRR_OVERRIDE_; - virtual s32 getVertexShaderConstantID(const c8* name) _IRR_OVERRIDE_; - virtual s32 getPixelShaderConstantID(const c8* name) _IRR_OVERRIDE_; - virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount = 1) _IRR_OVERRIDE_; - virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount = 1) _IRR_OVERRIDE_; - virtual bool setVertexShaderConstant(s32 index, const f32* floats, int count) _IRR_OVERRIDE_; - virtual bool setVertexShaderConstant(s32 index, const s32* ints, int count) _IRR_OVERRIDE_; - virtual bool setVertexShaderConstant(s32 index, const u32* ints, int count) _IRR_OVERRIDE_; - virtual bool setPixelShaderConstant(s32 index, const f32* floats, int count) _IRR_OVERRIDE_; - virtual bool setPixelShaderConstant(s32 index, const s32* ints, int count) _IRR_OVERRIDE_; - virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) _IRR_OVERRIDE_; - virtual IVideoDriver* getVideoDriver() _IRR_OVERRIDE_; + virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates) IRR_OVERRIDE; + virtual s32 getVertexShaderConstantID(const c8* name) IRR_OVERRIDE; + virtual s32 getPixelShaderConstantID(const c8* name) IRR_OVERRIDE; + virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount = 1) IRR_OVERRIDE; + virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount = 1) IRR_OVERRIDE; + virtual bool setVertexShaderConstant(s32 index, const f32* floats, int count) IRR_OVERRIDE; + virtual bool setVertexShaderConstant(s32 index, const s32* ints, int count) IRR_OVERRIDE; + virtual bool setVertexShaderConstant(s32 index, const u32* ints, int count) IRR_OVERRIDE; + virtual bool setPixelShaderConstant(s32 index, const f32* floats, int count) IRR_OVERRIDE; + virtual bool setPixelShaderConstant(s32 index, const s32* ints, int count) IRR_OVERRIDE; + virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) IRR_OVERRIDE; + virtual IVideoDriver* getVideoDriver() IRR_OVERRIDE; #if defined(PATCH_SUPERTUX_8_0_1_with_1_9_0) virtual bool setVertexShaderConstant(const c8* name, const f32* floats, int count) @@ -440,4 +440,3 @@ namespace video } // end namespace irr #endif - diff --git a/source/Irrlicht/IDepthBuffer.h b/source/Irrlicht/IDepthBuffer.h index 996926c8..de2d2a6e 100644 --- a/source/Irrlicht/IDepthBuffer.h +++ b/source/Irrlicht/IDepthBuffer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_Z2_BUFFER_H_INCLUDED__ -#define __I_Z2_BUFFER_H_INCLUDED__ +#ifndef IRR_I_Z2_BUFFER_H_INCLUDED +#define IRR_I_Z2_BUFFER_H_INCLUDED #include "IReferenceCounted.h" #include "dimension2d.h" @@ -79,4 +79,3 @@ namespace video } // end namespace irr #endif - diff --git a/source/Irrlicht/IImagePresenter.h b/source/Irrlicht/IImagePresenter.h index c93fc855..35ff6345 100644 --- a/source/Irrlicht/IImagePresenter.h +++ b/source/Irrlicht/IImagePresenter.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_IMAGE_PRESENTER_H_INCLUDED__ -#define __I_IMAGE_PRESENTER_H_INCLUDED__ +#ifndef IRR_I_IMAGE_PRESENTER_H_INCLUDED +#define IRR_I_IMAGE_PRESENTER_H_INCLUDED #include "IImage.h" @@ -33,4 +33,3 @@ namespace video } // end namespace irr #endif - diff --git a/source/Irrlicht/ISceneNodeAnimatorFinishing.h b/source/Irrlicht/ISceneNodeAnimatorFinishing.h index a6425621..50933a17 100644 --- a/source/Irrlicht/ISceneNodeAnimatorFinishing.h +++ b/source/Irrlicht/ISceneNodeAnimatorFinishing.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_SCENE_NODE_ANIMATOR_FINISHING_H_INCLUDED__ -#define __I_SCENE_NODE_ANIMATOR_FINISHING_H_INCLUDED__ +#ifndef IRR_I_SCENE_NODE_ANIMATOR_FINISHING_H_INCLUDED +#define IRR_I_SCENE_NODE_ANIMATOR_FINISHING_H_INCLUDED #include "ISceneNode.h" @@ -20,7 +20,7 @@ namespace scene ISceneNodeAnimatorFinishing(u32 finishTime) : FinishTime(finishTime), HasFinished(false) { } - virtual bool hasFinished(void) const _IRR_OVERRIDE_ { return HasFinished; } + virtual bool hasFinished(void) const IRR_OVERRIDE { return HasFinished; } protected: @@ -33,4 +33,3 @@ namespace scene } // end namespace irr #endif - diff --git a/source/Irrlicht/ITriangleRenderer.h b/source/Irrlicht/ITriangleRenderer.h index 954ce6de..a55ad237 100644 --- a/source/Irrlicht/ITriangleRenderer.h +++ b/source/Irrlicht/ITriangleRenderer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_TRIANGLE_RENDERER_H_INCLUDED__ -#define __I_TRIANGLE_RENDERER_H_INCLUDED__ +#ifndef IRR_I_TRIANGLE_RENDERER_H_INCLUDED +#define IRR_I_TRIANGLE_RENDERER_H_INCLUDED #include "IReferenceCounted.h" #include "S2DVertex.h" @@ -65,4 +65,3 @@ namespace video } // end namespace irr #endif - diff --git a/source/Irrlicht/IZBuffer.h b/source/Irrlicht/IZBuffer.h index 2c235a89..b16d03be 100644 --- a/source/Irrlicht/IZBuffer.h +++ b/source/Irrlicht/IZBuffer.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __I_Z_BUFFER_H_INCLUDED__ -#define __I_Z_BUFFER_H_INCLUDED__ +#ifndef IRR_I_Z_BUFFER_H_INCLUDED +#define IRR_I_Z_BUFFER_H_INCLUDED #include "IReferenceCounted.h" #include "dimension2d.h" @@ -44,4 +44,3 @@ namespace video } // end namespace irr #endif - diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj b/source/Irrlicht/Irrlicht10.0.vcxproj index 2fde9de2..84d8bc35 100644 --- a/source/Irrlicht/Irrlicht10.0.vcxproj +++ b/source/Irrlicht/Irrlicht10.0.vcxproj @@ -839,24 +839,42 @@ + + + + + + + + + + + + + + + + - + - + + + @@ -897,6 +915,7 @@ + @@ -1016,6 +1035,7 @@ + @@ -1049,9 +1069,9 @@ - + @@ -1187,6 +1207,7 @@ + @@ -1460,10 +1481,10 @@ - + diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj.filters b/source/Irrlicht/Irrlicht10.0.vcxproj.filters index 1fcef60a..5eb92b05 100644 --- a/source/Irrlicht/Irrlicht10.0.vcxproj.filters +++ b/source/Irrlicht/Irrlicht10.0.vcxproj.filters @@ -117,6 +117,9 @@ include + + include + include @@ -132,12 +135,15 @@ include + + include + include include - + include @@ -993,6 +999,9 @@ Irrlicht\irr + + Irrlicht\irr + Irrlicht\irr @@ -1282,12 +1291,6 @@ include\scene - - include - - - Irrlicht\irr - include\video @@ -1411,6 +1414,9 @@ Irrlicht\video\Burning Video + + Irrlicht\video\Null + include\core @@ -1420,6 +1426,63 @@ include\scene + + include\scene + + + include\scene + + + include\gui + + + Irrlicht\scene\animators + + + include\video + + + include\scene + + + include\scene + + + include\io + + + include\scene + + + include\video + + + include\gui + + + include\io + + + include\scene + + + include\scene + + + include\video + + + include\io + + + include\video + + + include\scene + + + include + @@ -1898,6 +1961,9 @@ Irrlicht\irr + + Irrlicht\irr + Irrlicht\irr\extern @@ -2321,9 +2387,6 @@ Irrlicht\scene\loaders - - Irrlicht\irr - Irrlicht\video\Direct3D9 diff --git a/source/Irrlicht/Irrlicht11.0.vcxproj b/source/Irrlicht/Irrlicht11.0.vcxproj index e6b828e4..f3b8ca37 100644 --- a/source/Irrlicht/Irrlicht11.0.vcxproj +++ b/source/Irrlicht/Irrlicht11.0.vcxproj @@ -838,13 +838,30 @@ + + + + + + + + + + + + + + + + + @@ -854,7 +871,9 @@ + + @@ -894,6 +913,9 @@ + + + @@ -1012,6 +1034,7 @@ + @@ -1047,6 +1070,7 @@ + diff --git a/source/Irrlicht/Irrlicht11.0.vcxproj.filters b/source/Irrlicht/Irrlicht11.0.vcxproj.filters index 1cffa753..cb3787e2 100644 --- a/source/Irrlicht/Irrlicht11.0.vcxproj.filters +++ b/source/Irrlicht/Irrlicht11.0.vcxproj.filters @@ -1287,6 +1287,9 @@ include\video + + + include\scene include\video @@ -1411,6 +1414,75 @@ Irrlicht\video\Burning Video + + Irrlicht\video\Null + + + include\core + + + include\scene + + + include\scene + + + include\scene + + + include\scene + + + include\gui + + + Irrlicht\scene\animators + + + include\video + + + include\scene + + + include\scene + + + include\io + + + include\scene + + + include\video + + + include\gui + + + include\io + + + include\scene + + + include\scene + + + include\video + + + include\io + + + include\video + + + include\scene + + + include + diff --git a/source/Irrlicht/Irrlicht12.0.vcxproj b/source/Irrlicht/Irrlicht12.0.vcxproj index 9581357a..cf8b80d4 100644 --- a/source/Irrlicht/Irrlicht12.0.vcxproj +++ b/source/Irrlicht/Irrlicht12.0.vcxproj @@ -838,13 +838,30 @@ + + + + + + + + + + + + + + + + + @@ -854,7 +871,9 @@ + + @@ -894,6 +913,9 @@ + + + @@ -1004,7 +1026,15 @@ + + + + + + + + @@ -1040,6 +1070,7 @@ + @@ -1270,6 +1301,7 @@ + diff --git a/source/Irrlicht/Irrlicht12.0.vcxproj.filters b/source/Irrlicht/Irrlicht12.0.vcxproj.filters index 0623a911..17aae0d6 100644 --- a/source/Irrlicht/Irrlicht12.0.vcxproj.filters +++ b/source/Irrlicht/Irrlicht12.0.vcxproj.filters @@ -1287,6 +1287,9 @@ include\video + + + include\scene include\video @@ -1390,6 +1393,96 @@ include\scene + + Irrlicht\video\Burning Video + + + Irrlicht\video\Burning Video + + + Irrlicht\video\Burning Video + + + Irrlicht\video\Burning Video + + + Irrlicht\video\Burning Video + + + Irrlicht\video\Burning Video + + + Irrlicht\video\Burning Video + + + Irrlicht\video\Null + + + include\core + + + include\scene + + + include\scene + + + include\scene + + + include\scene + + + include\gui + + + Irrlicht\scene\animators + + + include\video + + + include\scene + + + include\scene + + + include\io + + + include\scene + + + include\video + + + include\gui + + + include\io + + + include\scene + + + include\scene + + + include\video + + + include\io + + + include\video + + + include\scene + + + include + @@ -2357,6 +2450,9 @@ Irrlicht\video\OpenGL Context + + Irrlicht\video\Burning Video + Irrlicht\video\Burning Video diff --git a/source/Irrlicht/Irrlicht14.0.vcxproj b/source/Irrlicht/Irrlicht14.0.vcxproj index 47f07a3a..1545697e 100644 --- a/source/Irrlicht/Irrlicht14.0.vcxproj +++ b/source/Irrlicht/Irrlicht14.0.vcxproj @@ -849,13 +849,30 @@ + + + + + + + + + + + + + + + + + @@ -865,7 +882,9 @@ + + @@ -905,6 +924,9 @@ + + + @@ -1059,6 +1081,7 @@ + diff --git a/source/Irrlicht/Irrlicht14.0.vcxproj.filters b/source/Irrlicht/Irrlicht14.0.vcxproj.filters index 077634de..af0084f3 100644 --- a/source/Irrlicht/Irrlicht14.0.vcxproj.filters +++ b/source/Irrlicht/Irrlicht14.0.vcxproj.filters @@ -1287,6 +1287,9 @@ include\video + + + include\scene include\video @@ -1414,6 +1417,72 @@ Irrlicht\video\Null + + include\core + + + include\scene + + + include\scene + + + include\scene + + + include\scene + + + include\gui + + + Irrlicht\scene\animators + + + include\video + + + include\scene + + + include\scene + + + include\io + + + include\scene + + + include\video + + + include\gui + + + include\io + + + include\scene + + + include\scene + + + include\video + + + include\io + + + include\video + + + include\scene + + + include + diff --git a/source/Irrlicht/Irrlicht15.0.vcxproj b/source/Irrlicht/Irrlicht15.0.vcxproj index 4ae8670c..a35d2acc 100644 --- a/source/Irrlicht/Irrlicht15.0.vcxproj +++ b/source/Irrlicht/Irrlicht15.0.vcxproj @@ -849,12 +849,30 @@ + + + + + + + + + + + + + + + + + + @@ -864,7 +882,9 @@ + + @@ -904,6 +924,9 @@ + + + @@ -1022,6 +1045,7 @@ + @@ -1044,6 +1068,7 @@ + diff --git a/source/Irrlicht/Irrlicht15.0.vcxproj.filters b/source/Irrlicht/Irrlicht15.0.vcxproj.filters index 16c0835f..162fd094 100644 --- a/source/Irrlicht/Irrlicht15.0.vcxproj.filters +++ b/source/Irrlicht/Irrlicht15.0.vcxproj.filters @@ -1281,6 +1281,9 @@ include\video + + + include\scene include\video @@ -1342,6 +1345,9 @@ include\video + + include\scene + Irrlicht\video\Burning Video @@ -1363,6 +1369,75 @@ Irrlicht\video\Burning Video + + Irrlicht\video\Null + + + include\core + + + include\scene + + + include\scene + + + include\scene + + + include\scene + + + include\gui + + + Irrlicht\scene\animators + + + include\video + + + include\scene + + + include\scene + + + include\io + + + include\scene + + + include\video + + + include\gui + + + include\io + + + include\scene + + + include\scene + + + include\video + + + include\io + + + include\video + + + include\scene + + + include + diff --git a/source/Irrlicht/Octree.h b/source/Irrlicht/Octree.h index e9c092b8..52543525 100644 --- a/source/Irrlicht/Octree.h +++ b/source/Irrlicht/Octree.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __C_OCTREE_H_INCLUDED__ -#define __C_OCTREE_H_INCLUDED__ +#ifndef IRR_C_OCTREE_H_INCLUDED +#define IRR_C_OCTREE_H_INCLUDED #include "SViewFrustum.h" #include "S3DVertex.h" @@ -386,4 +386,3 @@ private: } // end namespace #endif - diff --git a/source/Irrlicht/S2DVertex.h b/source/Irrlicht/S2DVertex.h index f6f6a885..62876727 100644 --- a/source/Irrlicht/S2DVertex.h +++ b/source/Irrlicht/S2DVertex.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __S_K_2D_VERTEX_H_INCLUDED__ -#define __S_K_2D_VERTEX_H_INCLUDED__ +#ifndef S_K_2D_VERTEX_H_INCLUDED +#define S_K_2D_VERTEX_H_INCLUDED #include "vector2d.h" @@ -27,4 +27,3 @@ namespace video } // end namespace irr #endif - diff --git a/source/Irrlicht/S4DVertex.h b/source/Irrlicht/S4DVertex.h index 667fd6d4..2057a893 100644 --- a/source/Irrlicht/S4DVertex.h +++ b/source/Irrlicht/S4DVertex.h @@ -2,9 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h - -#ifndef __S_4D_VERTEX_H_INCLUDED__ -#define __S_4D_VERTEX_H_INCLUDED__ +#ifndef S_4D_VERTEX_H_INCLUDED +#define S_4D_VERTEX_H_INCLUDED #include "SoftwareDriver2_compile_config.h" #include "SoftwareDriver2_helper.h" @@ -769,7 +768,7 @@ struct sScanConvertData #if BURNING_MATERIAL_MAX_LIGHT_TANGENT > 0 sVec3Pack_unpack l[BURNING_MATERIAL_MAX_LIGHT_TANGENT][2]; // Light Tangent - sVec3Pack_unpack slopeL[BURNING_MATERIAL_MAX_LIGHT_TANGENT][2]; // tanget slope along edges + sVec3Pack_unpack slopeL[BURNING_MATERIAL_MAX_LIGHT_TANGENT][2]; // tangent slope along edges #endif }; @@ -872,4 +871,3 @@ REALINLINE void vec4_to_fix(tFixPoint &a,tFixPoint &r, tFixPoint &g, tFixPoint & } #endif - diff --git a/source/Irrlicht/SoftwareDriver2_compile_config.h b/source/Irrlicht/SoftwareDriver2_compile_config.h index f76bfe7e..968a2d50 100644 --- a/source/Irrlicht/SoftwareDriver2_compile_config.h +++ b/source/Irrlicht/SoftwareDriver2_compile_config.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __S_VIDEO_2_SOFTWARE_COMPILE_CONFIG_H_INCLUDED__ -#define __S_VIDEO_2_SOFTWARE_COMPILE_CONFIG_H_INCLUDED__ +#ifndef S_VIDEO_2_SOFTWARE_COMPILE_CONFIG_H_INCLUDED +#define S_VIDEO_2_SOFTWARE_COMPILE_CONFIG_H_INCLUDED #include "IrrCompileConfig.h" @@ -320,4 +320,4 @@ namespace irr { #define ALIGN(x) #endif -#endif // __S_VIDEO_2_SOFTWARE_COMPILE_CONFIG_H_INCLUDED__ +#endif // S_VIDEO_2_SOFTWARE_COMPILE_CONFIG_H_INCLUDED diff --git a/source/Irrlicht/SoftwareDriver2_helper.h b/source/Irrlicht/SoftwareDriver2_helper.h index 47377aed..54cd8d3a 100644 --- a/source/Irrlicht/SoftwareDriver2_helper.h +++ b/source/Irrlicht/SoftwareDriver2_helper.h @@ -7,8 +7,8 @@ - changed behavior for log2 textures ( replaced multiplies by shift ) */ -#ifndef __S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED__ -#define __S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED__ +#ifndef S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED +#define S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED #include "SoftwareDriver2_compile_config.h" #include "irrMath.h" @@ -1241,4 +1241,3 @@ static inline int tiny_isequal(const char *s1, const char *s2, size_t n) } // end namespace irr #endif - diff --git a/source/Irrlicht/burning_shader_compile_fragment_default.h b/source/Irrlicht/burning_shader_compile_fragment_default.h index 19b33ed9..c6d06ca6 100644 --- a/source/Irrlicht/burning_shader_compile_fragment_default.h +++ b/source/Irrlicht/burning_shader_compile_fragment_default.h @@ -8,10 +8,10 @@ public: burning_shader_class(CBurningVideoDriver* driver); //! draws an indexed triangle list - virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_; - virtual bool canWireFrame() _IRR_OVERRIDE_ { return true; } + virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE; + virtual bool canWireFrame() IRR_OVERRIDE { return true; } - virtual void OnSetMaterial(const SBurningShaderMaterial& material) _IRR_OVERRIDE_; + virtual void OnSetMaterial(const SBurningShaderMaterial& material) IRR_OVERRIDE; private: diff --git a/source/Irrlicht/irrXML.cpp b/source/Irrlicht/irrXML.cpp index 96f0ec79..003b3b26 100644 --- a/source/Irrlicht/irrXML.cpp +++ b/source/Irrlicht/irrXML.cpp @@ -48,7 +48,7 @@ public: } //! Reads an amount of bytes from the file. - virtual int read(void* buffer, int sizeToRead) _IRR_OVERRIDE_ + virtual int read(void* buffer, int sizeToRead) IRR_OVERRIDE { if (!File) return 0; @@ -57,7 +57,7 @@ public: } //! Returns size of file in bytes - virtual long getSize() const _IRR_OVERRIDE_ + virtual long getSize() const IRR_OVERRIDE { return Size; } diff --git a/source/Irrlicht/os.h b/source/Irrlicht/os.h index 379abb83..ca2bbf14 100644 --- a/source/Irrlicht/os.h +++ b/source/Irrlicht/os.h @@ -2,8 +2,8 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#ifndef __IRR_OS_H_INCLUDED__ -#define __IRR_OS_H_INCLUDED__ +#ifndef IRR_OS_H_INCLUDED +#define IRR_OS_H_INCLUDED #include "IrrCompileConfig.h" // for endian check #include "irrTypes.h" @@ -129,6 +129,4 @@ namespace os } // end namespace os } // end namespace irr - #endif -