diff --git a/source/Irrlicht/CIrrDeviceConsole.h b/source/Irrlicht/CIrrDeviceConsole.h index 43d34591..350e4b54 100644 --- a/source/Irrlicht/CIrrDeviceConsole.h +++ b/source/Irrlicht/CIrrDeviceConsole.h @@ -95,7 +95,7 @@ namespace irr //! Get the device type virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ { - return EIDT_CONSOLE; + return EIDT_CONSOLE; } void addPostPresentText(s16 X, s16 Y, const wchar_t *text); diff --git a/source/Irrlicht/CIrrDeviceLinux.h b/source/Irrlicht/CIrrDeviceLinux.h index ee71ca1c..0697fc99 100644 --- a/source/Irrlicht/CIrrDeviceLinux.h +++ b/source/Irrlicht/CIrrDeviceLinux.h @@ -134,7 +134,7 @@ namespace irr //! Get the device type virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ { - return EIDT_X11; + return EIDT_X11; } #ifdef _IRR_COMPILE_WITH_X11_ diff --git a/source/Irrlicht/CIrrDeviceSDL.h b/source/Irrlicht/CIrrDeviceSDL.h index d7cb0284..3dd51ce1 100644 --- a/source/Irrlicht/CIrrDeviceSDL.h +++ b/source/Irrlicht/CIrrDeviceSDL.h @@ -92,7 +92,7 @@ namespace irr //! Get the device type virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ { - return EIDT_SDL; + return EIDT_SDL; } //! Implementation of the linux cursor control diff --git a/source/Irrlicht/CIrrDeviceWin32.h b/source/Irrlicht/CIrrDeviceWin32.h index 9e64a13e..47f3cf2d 100644 --- a/source/Irrlicht/CIrrDeviceWin32.h +++ b/source/Irrlicht/CIrrDeviceWin32.h @@ -107,7 +107,7 @@ namespace irr //! Get the device type virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ { - return EIDT_WIN32; + return EIDT_WIN32; } //! Compares to the last call of this function to return double and triple clicks. diff --git a/source/Irrlicht/CSoftwareDriver2.cpp b/source/Irrlicht/CSoftwareDriver2.cpp index 97e27c42..888c8bd5 100644 --- a/source/Irrlicht/CSoftwareDriver2.cpp +++ b/source/Irrlicht/CSoftwareDriver2.cpp @@ -173,7 +173,7 @@ static inline float powf_limit(const float a, const float b) } //! clamp(value,0,1) -static inline const float clampf01(const float v) +static inline float clampf01(const float v) { return v < 0.f ? 0.f : v > 1.f ? 1.f : v; } @@ -804,7 +804,7 @@ void CBurningVideoDriver::setRenderTargetImage2(video::IImage* color, video::IIm // used to scale <-1,-1><1,1> to viewport [center,scale] // controls subtexel and fill convention. -// Don't tweak SOFTWARE_DRIVER_2_SUBTEXEL (-0.5f in m[1]) anymore to control texture blur effect, it's used for viewport scaling. +// Don't tweak SOFTWARE_DRIVER_2_SUBTEXEL (-0.5f in m[1]) anymore to control texture blur effect, it's used for viewport scaling. // naming is misleading. it will write outside memory location.. void buildNDCToDCMatrix(f32* m, const core::rect& viewport, f32 tx) @@ -1605,7 +1605,7 @@ void CBurningVideoDriver::VertexCache_fill(const u32 sourceIndex, const u32 dest } // Texture Coo Transform - // Always set all internal uv (v1.9 SOFTWARE_DRIVER_2_TEXTURE_TRANSFORM always on) + // Always set all internal uv (v1.9 SOFTWARE_DRIVER_2_TEXTURE_TRANSFORM always on) for (size_t t = 0; t < BURNING_MATERIAL_MAX_TEXTURES; ++t) { sVec4 r; @@ -2258,14 +2258,14 @@ void CBurningVideoDriver::drawVertexPrimitiveList(const void* vertices, u32 vert } lod_bias *= tex->get_lod_bias(); //lod_bias += Material.org.TextureLayer[m].LODBias * 0.125f; - + s32 lodFactor = lodFactor_inside(face, m, dc_area, lod_bias); CurrentShader->setTextureParam(m, tex, lodFactor); //currently shader receives texture coordinate as Pixelcoo of 1 Texture select_polygon_mipmap_inside(face, m, tex->getTexBound()); } - + CurrentShader->drawWireFrameTriangle(face[0] + s4DVertex_proj(0), face[1] + s4DVertex_proj(0), face[2] + s4DVertex_proj(0)); vertex_from_clipper = 1; } @@ -3366,7 +3366,7 @@ void CBurningVideoDriver::draw3DLine(const core::vector3df& start, v[s4DVertex_proj(has_vertex_run)].flag = v[s4DVertex_ofs(has_vertex_run)].flag; } - + size_t vOut; // vertices count per line