sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings reported by Clang

This commit is contained in:
Lynix 2017-02-17 00:21:28 +01:00
parent c8d046158c
commit dc158d06a8
11 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/Graphics/DepthRenderTechnique.cpp
View File

@ -68,7 +68,7 @@ namespace Nz
* \param sceneData Data of the scene * \param sceneData Data of the scene
*/ */
void DepthRenderTechnique::Clear(const SceneData& sceneData) const void DepthRenderTechnique::Clear(const SceneData& /*sceneData*/) const
{ {
Renderer::Enable(RendererParameter_DepthBuffer, true); Renderer::Enable(RendererParameter_DepthBuffer, true);
Renderer::Enable(RendererParameter_DepthWrite, true); Renderer::Enable(RendererParameter_DepthWrite, true);

2
src/Nazara/Graphics/ForwardRenderTechnique.cpp
View File

@ -990,7 +990,6 @@ namespace Nz
if (uniforms.locations.shadowMapping != -1) if (uniforms.locations.shadowMapping != -1)
shader->SendBoolean(uniforms.locations.shadowMapping + uniformOffset, light.shadowMap != nullptr); shader->SendBoolean(uniforms.locations.shadowMapping + uniformOffset, light.shadowMap != nullptr);
unsigned int textureUnit = Material::GetTextureUnit(static_cast<TextureMap>(TextureMap_ShadowCube_1 + index));
if (light.shadowMap) if (light.shadowMap)
{ {
unsigned int textureUnitCube = Material::GetTextureUnit(static_cast<TextureMap>(TextureMap_ShadowCube_1 + index)); unsigned int textureUnitCube = Material::GetTextureUnit(static_cast<TextureMap>(TextureMap_ShadowCube_1 + index));
@ -1014,7 +1013,6 @@ namespace Nz
if (uniforms.locations.shadowMapping != -1) if (uniforms.locations.shadowMapping != -1)
shader->SendBoolean(uniforms.locations.shadowMapping + uniformOffset, light.shadowMap != nullptr); shader->SendBoolean(uniforms.locations.shadowMapping + uniformOffset, light.shadowMap != nullptr);
unsigned int textureUnit = Material::GetTextureUnit(static_cast<TextureMap>(TextureMap_Shadow2D_1 + index));
if (light.shadowMap) if (light.shadowMap)
{ {
unsigned int textureUnit2D = Material::GetTextureUnit(static_cast<TextureMap>(TextureMap_Shadow2D_1 + index)); unsigned int textureUnit2D = Material::GetTextureUnit(static_cast<TextureMap>(TextureMap_Shadow2D_1 + index));

8
src/Nazara/Graphics/ParticleGroup.cpp
View File

@ -40,9 +40,9 @@ namespace Nz
ParticleGroup::ParticleGroup(unsigned int maxParticleCount, ParticleDeclarationConstRef declaration) : ParticleGroup::ParticleGroup(unsigned int maxParticleCount, ParticleDeclarationConstRef declaration) :
m_declaration(std::move(declaration)), m_declaration(std::move(declaration)),
m_processing(false),
m_maxParticleCount(maxParticleCount), m_maxParticleCount(maxParticleCount),
m_particleCount(0) m_particleCount(0),
m_processing(false)
{ {
// In case of error, the constructor can only throw an exception // In case of error, the constructor can only throw an exception
ErrorFlags flags(ErrorFlag_ThrowException, true); ErrorFlags flags(ErrorFlag_ThrowException, true);
@ -64,10 +64,10 @@ namespace Nz
m_generators(system.m_generators), m_generators(system.m_generators),
m_declaration(system.m_declaration), m_declaration(system.m_declaration),
m_renderer(system.m_renderer), m_renderer(system.m_renderer),
m_processing(false),
m_maxParticleCount(system.m_maxParticleCount), m_maxParticleCount(system.m_maxParticleCount),
m_particleCount(system.m_particleCount), m_particleCount(system.m_particleCount),
m_particleSize(system.m_particleSize) m_particleSize(system.m_particleSize),
m_processing(false)
{ {
ErrorFlags flags(ErrorFlag_ThrowException, true); ErrorFlags flags(ErrorFlag_ThrowException, true);

1
src/Nazara/Utility/Image.cpp
View File

@ -835,7 +835,6 @@ namespace Nz
if (!PixelFormat::IsCompressed(m_sharedImage->format)) if (!PixelFormat::IsCompressed(m_sharedImage->format))
{ {
const PixelFormatInfo& info = PixelFormat::GetInfo(m_sharedImage->format); const PixelFormatInfo& info = PixelFormat::GetInfo(m_sharedImage->format);
const UInt8* pixel = GetConstPixels();
Bitset<> workingBitset; Bitset<> workingBitset;
std::size_t pixelCount = m_sharedImage->width * m_sharedImage->height * ((m_sharedImage->type == ImageType_Cubemap) ? 6 : m_sharedImage->depth); std::size_t pixelCount = m_sharedImage->width * m_sharedImage->height * ((m_sharedImage->type == ImageType_Cubemap) ? 6 : m_sharedImage->depth);

4
src/Nazara/Utility/IndexBuffer.cpp
View File

@ -35,10 +35,10 @@ namespace Nz
IndexBuffer::IndexBuffer(const IndexBuffer& indexBuffer) : IndexBuffer::IndexBuffer(const IndexBuffer& indexBuffer) :
RefCounted(), RefCounted(),
m_buffer(indexBuffer.m_buffer), m_buffer(indexBuffer.m_buffer),
m_largeIndices(indexBuffer.m_largeIndices),
m_endOffset(indexBuffer.m_endOffset), m_endOffset(indexBuffer.m_endOffset),
m_indexCount(indexBuffer.m_indexCount), m_indexCount(indexBuffer.m_indexCount),
m_startOffset(indexBuffer.m_startOffset) m_startOffset(indexBuffer.m_startOffset),
m_largeIndices(indexBuffer.m_largeIndices)
{ {
} }

4
src/Nazara/Utility/SimpleTextDrawer.cpp
View File

@ -365,12 +365,14 @@ namespace Nz
{ {
case '\n': case '\n':
{ {
// Extend the line bounding rect to the last glyph it contains, thus extending upon all glyphs of the line
if (!m_glyphs.empty()) if (!m_glyphs.empty())
{ {
Glyph& glyph = m_glyphs.back(); Glyph& lastGlyph = m_glyphs.back();
m_lines.back().bounds.ExtendTo(glyph.bounds); m_lines.back().bounds.ExtendTo(glyph.bounds);
} }
// Reset cursor
advance = 0; advance = 0;
m_drawPos.x = 0; m_drawPos.x = 0;
m_drawPos.y += sizeInfo.lineHeight; m_drawPos.y += sizeInfo.lineHeight;

4
src/Nazara/Utility/VertexBuffer.cpp
View File

@ -31,10 +31,10 @@ namespace Nz
VertexBuffer::VertexBuffer(const VertexBuffer& vertexBuffer) : VertexBuffer::VertexBuffer(const VertexBuffer& vertexBuffer) :
RefCounted(), RefCounted(),
m_buffer(vertexBuffer.m_buffer), m_buffer(vertexBuffer.m_buffer),
m_vertexDeclaration(vertexBuffer.m_vertexDeclaration),
m_endOffset(vertexBuffer.m_endOffset), m_endOffset(vertexBuffer.m_endOffset),
m_startOffset(vertexBuffer.m_startOffset), m_startOffset(vertexBuffer.m_startOffset),
m_vertexCount(vertexBuffer.m_vertexCount) m_vertexCount(vertexBuffer.m_vertexCount),
m_vertexDeclaration(vertexBuffer.m_vertexDeclaration)
{ {
} }

40
src/Nazara/Utility/X11/CursorImpl.cpp
View File

@ -232,25 +232,27 @@ namespace Nz
std::array<const char*, SystemCursor_Max + 1> CursorImpl::s_systemCursorIds = std::array<const char*, SystemCursor_Max + 1> CursorImpl::s_systemCursorIds =
{ {
// http://gnome-look.org/content/preview.php?preview=1&id=128170&file1=128170-1.png&file2=&file3=&name=Dummy+X11+cursors&PHPSESSID=6 {
"crosshair", // SystemCursor_Crosshair // http://gnome-look.org/content/preview.php?preview=1&id=128170&file1=128170-1.png&file2=&file3=&name=Dummy+X11+cursors&PHPSESSID=6
"left_ptr", // SystemCursor_Default "crosshair", // SystemCursor_Crosshair
"hand", // SystemCursor_Hand "left_ptr", // SystemCursor_Default
"help", // SystemCursor_Help "hand", // SystemCursor_Hand
"fleur", // SystemCursor_Move "help", // SystemCursor_Help
nullptr, // SystemCursor_None "fleur", // SystemCursor_Move
"hand", // SystemCursor_Pointer nullptr, // SystemCursor_None
"watch", // SystemCursor_Progress "hand", // SystemCursor_Pointer
"right_side", // SystemCursor_ResizeE "watch", // SystemCursor_Progress
"top_side", // SystemCursor_ResizeN "right_side", // SystemCursor_ResizeE
"top_right_corner", // SystemCursor_ResizeNE "top_side", // SystemCursor_ResizeN
"top_left_corner", // SystemCursor_ResizeNW "top_right_corner", // SystemCursor_ResizeNE
"bottom_side", // SystemCursor_ResizeS "top_left_corner", // SystemCursor_ResizeNW
"bottom_right_corner", // SystemCursor_ResizeSE "bottom_side", // SystemCursor_ResizeS
"bottom_left_corner", // SystemCursor_ResizeSW "bottom_right_corner", // SystemCursor_ResizeSE
"left_side", // SystemCursor_ResizeW "bottom_left_corner", // SystemCursor_ResizeSW
"xterm", // SystemCursor_Text "left_side", // SystemCursor_ResizeW
"watch" // SystemCursor_Wait "xterm", // SystemCursor_Text
"watch" // SystemCursor_Wait
}
}; };
static_assert(SystemCursor_Max + 1 == 18, "System cursor array is incomplete"); static_assert(SystemCursor_Max + 1 == 18, "System cursor array is incomplete");

6
src/Nazara/Utility/X11/Display.cpp
View File

@ -229,14 +229,14 @@ namespace Nz
return screen_nbr; return screen_nbr;
} }
xcb_screen_t* X11::XCBScreenOfDisplay(xcb_connection_t* connection, int screen_nbr) xcb_screen_t* X11::XCBScreenOfDisplay(xcb_connection_t* connection, int screenIndex)
{ {
NazaraAssert(connection == sharedConnection, "The model is meant for one connection to X11 server"); NazaraAssert(connection == sharedConnection, "The model is meant for one connection to X11 server");
xcb_screen_iterator_t iter = xcb_setup_roots_iterator(xcb_get_setup(connection)); xcb_screen_iterator_t iter = xcb_setup_roots_iterator(xcb_get_setup(connection));
for (; iter.rem; --screen_nbr, xcb_screen_next (&iter)) for (; iter.rem; --screenIndex, xcb_screen_next (&iter))
{ {
if (screen_nbr == 0) if (screenIndex == 0)
return iter.data; return iter.data;
} }

6
src/Nazara/Utility/X11/WindowImpl.cpp
View File

@ -58,7 +58,6 @@ namespace Nz
m_style(0), m_style(0),
m_parent(parent), m_parent(parent),
m_smoothScrolling(false), m_smoothScrolling(false),
m_scrolling(0),
m_mousePos(0, 0), m_mousePos(0, 0),
m_keyRepeat(true) m_keyRepeat(true)
{ {
@ -1134,7 +1133,6 @@ namespace Nz
// if (std::isprint(codePoint)) Is not working ? + handle combining ? // if (std::isprint(codePoint)) Is not working ? + handle combining ?
{ {
WindowEvent event;
event.type = Nz::WindowEventType_TextEntered; event.type = Nz::WindowEventType_TextEntered;
event.text.character = codePoint; event.text.character = codePoint;
event.text.repeated = false; event.text.repeated = false;
@ -1396,7 +1394,7 @@ namespace Nz
hints.functions |= MWM_FUNC_CLOSE; hints.functions |= MWM_FUNC_CLOSE;
} }
ScopedXCB<xcb_generic_error_t> error(xcb_request_check( ScopedXCB<xcb_generic_error_t> propertyError(xcb_request_check(
connection, connection,
xcb_change_property_checked( xcb_change_property_checked(
connection, connection,
@ -1410,7 +1408,7 @@ namespace Nz
) )
)); ));
if (error) if (propertyError)
NazaraError("xcb_change_property failed, could not set window hints"); NazaraError("xcb_change_property failed, could not set window hints");
} }
else else

1
src/Nazara/Utility/X11/WindowImpl.hpp
View File

@ -111,7 +111,6 @@ namespace Nz
bool m_ownsWindow; bool m_ownsWindow;
bool m_smoothScrolling; bool m_smoothScrolling;
bool m_threadActive; bool m_threadActive;
short m_scrolling;
Vector2i m_mousePos; Vector2i m_mousePos;
bool m_keyRepeat; bool m_keyRepeat;