minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2024-11-19 08:40:24 +01:00
Code Issues Projects Releases Wiki Activity

Avoid gcc warning and fix some indention/whitespace.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6246 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2021-08-26 21:09:08 +00:00
parent 0c2049610a
commit 8e149ffb40
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Irrlicht/CIrrDeviceConsole.h
View File

@ -95,7 +95,7 @@ namespace irr
//! Get the device type //! Get the device type
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_
{ {
return EIDT_CONSOLE; return EIDT_CONSOLE;
} }
void addPostPresentText(s16 X, s16 Y, const wchar_t *text); void addPostPresentText(s16 X, s16 Y, const wchar_t *text);

2
source/Irrlicht/CIrrDeviceLinux.h
View File

@ -134,7 +134,7 @@ namespace irr
//! Get the device type //! Get the device type
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_
{ {
return EIDT_X11; return EIDT_X11;
} }
#ifdef _IRR_COMPILE_WITH_X11_ #ifdef _IRR_COMPILE_WITH_X11_

2
source/Irrlicht/CIrrDeviceSDL.h
View File

@ -92,7 +92,7 @@ namespace irr
//! Get the device type //! Get the device type
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_
{ {
return EIDT_SDL; return EIDT_SDL;
} }
//! Implementation of the linux cursor control //! Implementation of the linux cursor control

2
source/Irrlicht/CIrrDeviceWin32.h
View File

@ -107,7 +107,7 @@ namespace irr
//! Get the device type //! Get the device type
virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_ virtual E_DEVICE_TYPE getType() const _IRR_OVERRIDE_
{ {
return EIDT_WIN32; return EIDT_WIN32;
} }
//! Compares to the last call of this function to return double and triple clicks. //! Compares to the last call of this function to return double and triple clicks.

12
source/Irrlicht/CSoftwareDriver2.cpp
View File

@ -173,7 +173,7 @@ static inline float powf_limit(const float a, const float b)
} }
//! clamp(value,0,1) //! 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; 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] // used to scale <-1,-1><1,1> to viewport [center,scale]
// controls subtexel and fill convention. // 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.. // naming is misleading. it will write outside memory location..
void buildNDCToDCMatrix(f32* m, const core::rect<s32>& viewport, f32 tx) void buildNDCToDCMatrix(f32* m, const core::rect<s32>& viewport, f32 tx)
@ -1605,7 +1605,7 @@ void CBurningVideoDriver::VertexCache_fill(const u32 sourceIndex, const u32 dest
} }
// Texture Coo Transform // 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) for (size_t t = 0; t < BURNING_MATERIAL_MAX_TEXTURES; ++t)
{ {
sVec4 r; sVec4 r;
@ -2258,14 +2258,14 @@ void CBurningVideoDriver::drawVertexPrimitiveList(const void* vertices, u32 vert
} }
lod_bias *= tex->get_lod_bias(); lod_bias *= tex->get_lod_bias();
//lod_bias += Material.org.TextureLayer[m].LODBias * 0.125f; //lod_bias += Material.org.TextureLayer[m].LODBias * 0.125f;
s32 lodFactor = lodFactor_inside(face, m, dc_area, lod_bias); s32 lodFactor = lodFactor_inside(face, m, dc_area, lod_bias);
CurrentShader->setTextureParam(m, tex, lodFactor); CurrentShader->setTextureParam(m, tex, lodFactor);
//currently shader receives texture coordinate as Pixelcoo of 1 Texture //currently shader receives texture coordinate as Pixelcoo of 1 Texture
select_polygon_mipmap_inside(face, m, tex->getTexBound()); 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)); CurrentShader->drawWireFrameTriangle(face[0] + s4DVertex_proj(0), face[1] + s4DVertex_proj(0), face[2] + s4DVertex_proj(0));
vertex_from_clipper = 1; 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; v[s4DVertex_proj(has_vertex_run)].flag = v[s4DVertex_ofs(has_vertex_run)].flag;
} }
size_t vOut; size_t vOut;
// vertices count per line // vertices count per line