diff --git a/include/IBoneSceneNode.h b/include/IBoneSceneNode.h index 4032bb0a..a96a28be 100644 --- a/include/IBoneSceneNode.h +++ b/include/IBoneSceneNode.h @@ -74,13 +74,13 @@ namespace scene virtual E_BONE_ANIMATION_MODE getAnimationMode() const = 0; //! Get the axis aligned bounding box of this node - virtual const core::aabbox3d& getBoundingBox() const = 0; + virtual const core::aabbox3d& getBoundingBox() const _IRR_OVERRIDE_ = 0; //! Returns the relative transformation of the scene node. //virtual core::matrix4 getRelativeTransformation() const = 0; //! The animation method. - virtual void OnAnimate(u32 timeMs) =0; + virtual void OnAnimate(u32 timeMs) _IRR_OVERRIDE_ =0; //! The render method. /** Does nothing as bones are not visible. */ diff --git a/include/ICameraSceneNode.h b/include/ICameraSceneNode.h index 2743dae8..69fbae86 100644 --- a/include/ICameraSceneNode.h +++ b/include/ICameraSceneNode.h @@ -90,7 +90,7 @@ namespace scene 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) =0; + virtual void setRotation(const core::vector3df& rotation) _IRR_OVERRIDE_ =0; //! Gets the current look at target of the camera /** \return The current look at target of the camera, in world co-ordinates */ diff --git a/include/IGUIFontBitmap.h b/include/IGUIFontBitmap.h index 42b94d94..4141236e 100644 --- a/include/IGUIFontBitmap.h +++ b/include/IGUIFontBitmap.h @@ -36,7 +36,7 @@ public: kerning value. For example, EGFT_BITMAP will add the right kerning value of previousLetter to the left side kerning value of thisLetter, then add the global value. */ - virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const = 0; + virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const _IRR_OVERRIDE_ = 0; }; } // end namespace gui diff --git a/source/Irrlicht/CNSOGLManager.h b/source/Irrlicht/CNSOGLManager.h index c4e38124..4f47e52d 100644 --- a/source/Irrlicht/CNSOGLManager.h +++ b/source/Irrlicht/CNSOGLManager.h @@ -31,22 +31,22 @@ namespace video ~CNSOGLManager(); // Initialize - bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data); + bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) _IRR_OVERRIDE_; // Terminate - void terminate(); + void terminate() _IRR_OVERRIDE_; // Create surface. - bool generateSurface(); + bool generateSurface() _IRR_OVERRIDE_; // Destroy surface. - void destroySurface(); + void destroySurface() _IRR_OVERRIDE_; // Create context. - bool generateContext(); + bool generateContext() _IRR_OVERRIDE_; // Destroy EGL context. - void destroyContext(); + void destroyContext() _IRR_OVERRIDE_; //! Get current context const SExposedVideoData& getContext() const; @@ -55,7 +55,7 @@ namespace video bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) _IRR_OVERRIDE_; // Swap buffers. - bool swapBuffers(); + bool swapBuffers() _IRR_OVERRIDE_; private: SIrrlichtCreationParameters Params; diff --git a/source/Irrlicht/CSoftwareDriver2.cpp b/source/Irrlicht/CSoftwareDriver2.cpp index 8fa5a9de..97e27c42 100644 --- a/source/Irrlicht/CSoftwareDriver2.cpp +++ b/source/Irrlicht/CSoftwareDriver2.cpp @@ -748,9 +748,11 @@ bool CBurningVideoDriver::setRenderTargetEx(IRenderTarget* target, u16 clearFlag return true; } +/* static inline f32 map_value(f32 x, f32 in_min, f32 in_max, f32 out_min, f32 out_max) { return (x - in_min) * (out_max - out_min) / (f32)(in_max - in_min) + out_min; } +*/ //! sets a render target void CBurningVideoDriver::setRenderTargetImage2(video::IImage* color, video::IImage* depth, video::IImage* stencil) @@ -2166,8 +2168,8 @@ void CBurningVideoDriver::drawVertexPrimitiveList(const void* vertices, u32 vert { // if primitive fully outside or outside on same side continue; - vOut = 0; - vertex_from_clipper = 0; + //vOut = 0; + //vertex_from_clipper = 0; } else if (clipMask_o == VERTEX4D_INSIDE) { diff --git a/source/Irrlicht/CSoftwareTexture2.cpp b/source/Irrlicht/CSoftwareTexture2.cpp index 2da1baa7..c4eb6fe1 100644 --- a/source/Irrlicht/CSoftwareTexture2.cpp +++ b/source/Irrlicht/CSoftwareTexture2.cpp @@ -277,7 +277,7 @@ void CSoftwareTexture2::regenerateMipMapLevels(void* data) } } - +#if 0 //visualize mipmap for (i = 1; i < 0 && i < array_size(MipMap); ++i) { @@ -327,7 +327,7 @@ void CSoftwareTexture2::regenerateMipMapLevels(void* data) } } } - +#endif calcDerivative(); } diff --git a/source/Irrlicht/CTRGouraudNoZ2.cpp b/source/Irrlicht/CTRGouraudNoZ2.cpp index b7201832..fca2ad05 100644 --- a/source/Irrlicht/CTRGouraudNoZ2.cpp +++ b/source/Irrlicht/CTRGouraudNoZ2.cpp @@ -84,7 +84,7 @@ public: //! 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 () { return true; } + virtual bool canWireFrame () _IRR_OVERRIDE_ { return true; } protected: virtual void fragmentShader(); diff --git a/source/Irrlicht/CTRTextureDetailMap2.cpp b/source/Irrlicht/CTRTextureDetailMap2.cpp index 78896647..c3d81a08 100644 --- a/source/Irrlicht/CTRTextureDetailMap2.cpp +++ b/source/Irrlicht/CTRTextureDetailMap2.cpp @@ -85,7 +85,7 @@ public: //! 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 () { return true; } + virtual bool canWireFrame () _IRR_OVERRIDE_ { return true; } protected: virtual void fragmentShader(); diff --git a/source/Irrlicht/CTRTextureGouraud2.cpp b/source/Irrlicht/CTRTextureGouraud2.cpp index 1cd7bd18..ecf37565 100644 --- a/source/Irrlicht/CTRTextureGouraud2.cpp +++ b/source/Irrlicht/CTRTextureGouraud2.cpp @@ -103,7 +103,7 @@ public: //! 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 () { return true; } + virtual bool canWireFrame () _IRR_OVERRIDE_ { return true; } private: diff --git a/source/Irrlicht/burning_shader_compile_fragment_default.h b/source/Irrlicht/burning_shader_compile_fragment_default.h index ab5bb7c7..19b33ed9 100644 --- a/source/Irrlicht/burning_shader_compile_fragment_default.h +++ b/source/Irrlicht/burning_shader_compile_fragment_default.h @@ -9,7 +9,7 @@ public: //! 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() { return true; } + virtual bool canWireFrame() _IRR_OVERRIDE_ { return true; } virtual void OnSetMaterial(const SBurningShaderMaterial& material) _IRR_OVERRIDE_;