Final pass of Clang warning fixes

This commit is contained in:
Lynix 2016-10-17 16:14:35 +02:00
parent c221d53839
commit d530ca22e0
17 changed files with 35 additions and 73 deletions

View File

@ -185,7 +185,7 @@ namespace Ndk
* \param viewer Viewer of the scene * \param viewer Viewer of the scene
*/ */
void RenderSystem::UpdateDirectionalShadowMaps(const Nz::AbstractViewer& viewer) void RenderSystem::UpdateDirectionalShadowMaps(const Nz::AbstractViewer& /*viewer*/)
{ {
if (!m_shadowRT.IsValid()) if (!m_shadowRT.IsValid())
m_shadowRT.Create(); m_shadowRT.Create();

View File

@ -78,7 +78,6 @@ namespace Nz
Color m_color; Color m_color;
MaterialRef m_material; MaterialRef m_material;
Recti m_localBounds; Recti m_localBounds;
mutable bool m_verticesUpdated;
float m_scale; float m_scale;
static TextSpriteLibrary::LibraryMap s_library; static TextSpriteLibrary::LibraryMap s_library;

View File

@ -72,11 +72,11 @@ bool IsSupported(const String& extension)
return (aiIsExtensionSupported(dotExt.GetConstBuffer()) == AI_TRUE); return (aiIsExtensionSupported(dotExt.GetConstBuffer()) == AI_TRUE);
} }
Ternary Check(Stream& stream, const MeshParams& parameters) Ternary Check(Stream& /*stream*/, const MeshParams& parameters)
{ {
bool skip; bool skip;
if (parameters.custom.GetBooleanParameter("SkipAssimpLoader", &skip) && skip) if (parameters.custom.GetBooleanParameter("SkipAssimpLoader", &skip) && skip)
return Ternary_False; return Ternary_False;
return Ternary_Unknown; return Ternary_Unknown;
} }

View File

@ -85,7 +85,7 @@ namespace Nz
} }
m_activeSockets.clear(); m_activeSockets.clear();
if (activeSockets > 0U) if (activeSockets > 0)
{ {
int socketCount = activeSockets; int socketCount = activeSockets;
for (int i = 0; i < socketCount; ++i) for (int i = 0; i < socketCount; ++i)

View File

@ -110,23 +110,13 @@ namespace Nz
return it->first * m_functionScales[functionIndex]; return it->first * m_functionScales[functionIndex];
} }
float Worley::Get(float x, float y, float z, float scale) const float Worley::Get(float /*x*/, float /*y*/, float /*z*/, float /*scale*/) const
{ {
NazaraUnused(x);
NazaraUnused(y);
NazaraUnused(z);
NazaraUnused(scale);
throw std::runtime_error("Worley 3D not available yet."); throw std::runtime_error("Worley 3D not available yet.");
} }
float Worley::Get(float x, float y, float z, float w, float scale) const float Worley::Get(float /*x*/, float /*y*/, float /*z*/, float /*w*/, float /*scale*/) const
{ {
NazaraUnused(x);
NazaraUnused(y);
NazaraUnused(z);
NazaraUnused(scale);
throw std::runtime_error("Worley 4D not available yet."); throw std::runtime_error("Worley 4D not available yet.");
} }

View File

@ -25,7 +25,7 @@ namespace Nz
return parser.Check(); return parser.Check();
} }
bool Load(Animation* animation, Stream& stream, const AnimationParams& parameters) bool Load(Animation* animation, Stream& stream, const AnimationParams& /*parameters*/)
{ {
///TODO: Utiliser les paramètres ///TODO: Utiliser les paramètres
MD5AnimParser parser(stream); MD5AnimParser parser(stream);

View File

@ -11,10 +11,8 @@
namespace Nz namespace Nz
{ {
SoftwareBuffer::SoftwareBuffer(Buffer* parent, BufferType type) : SoftwareBuffer::SoftwareBuffer(Buffer* /*parent*/, BufferType type)
m_type(type)
{ {
NazaraUnused(parent);
} }
SoftwareBuffer::~SoftwareBuffer() SoftwareBuffer::~SoftwareBuffer()
@ -25,7 +23,7 @@ namespace Nz
{ {
NazaraUnused(usage); NazaraUnused(usage);
// Cette allocation est protégée car sa taille dépend directement de paramètres utilisateurs // Protect the allocation to prevent a memory exception to escape the function
try try
{ {
m_buffer = new UInt8[size]; m_buffer = new UInt8[size];
@ -46,20 +44,11 @@ namespace Nz
delete[] m_buffer; delete[] m_buffer;
} }
bool SoftwareBuffer::Fill(const void* data, unsigned int offset, unsigned int size, bool forceDiscard) bool SoftwareBuffer::Fill(const void* data, unsigned int offset, unsigned int size, bool /*forceDiscard*/)
{ {
NazaraUnused(forceDiscard); NazaraAssert(!m_mapped, "Buffer is already mapped");
#if NAZARA_UTILITY_SAFE
if (m_mapped)
{
NazaraError("Buffer already mapped");
return false;
}
#endif
std::memcpy(&m_buffer[offset], data, size); std::memcpy(&m_buffer[offset], data, size);
return true; return true;
} }
@ -68,18 +57,9 @@ namespace Nz
return false; return false;
} }
void* SoftwareBuffer::Map(BufferAccess access, unsigned int offset, unsigned int size) void* SoftwareBuffer::Map(BufferAccess /*access*/, unsigned int offset, unsigned int /*size*/)
{ {
NazaraUnused(access); NazaraAssert(!m_mapped, "Buffer is already mapped");
NazaraUnused(size);
#if NAZARA_UTILITY_SAFE
if (m_mapped)
{
NazaraError("Buffer already mapped");
return nullptr;
}
#endif
m_mapped = true; m_mapped = true;
@ -88,13 +68,7 @@ namespace Nz
bool SoftwareBuffer::Unmap() bool SoftwareBuffer::Unmap()
{ {
#if NAZARA_UTILITY_SAFE NazaraAssert(m_mapped, "Buffer is not mapped");
if (!m_mapped)
{
NazaraError("Buffer not mapped");
return true;
}
#endif
m_mapped = false; m_mapped = false;

View File

@ -29,7 +29,6 @@ namespace Nz
bool Unmap(); bool Unmap();
private: private:
BufferType m_type;
UInt8* m_buffer; UInt8* m_buffer;
bool m_mapped; bool m_mapped;
}; };

View File

@ -35,12 +35,12 @@ void EventState::Enter(Ndk::StateMachine& fsm)
}); });
} }
void EventState::Leave(Ndk::StateMachine& fsm) void EventState::Leave(Ndk::StateMachine& /*fsm*/)
{ {
m_text.SetVisible(false); m_text.SetVisible(false);
} }
bool EventState::Update(Ndk::StateMachine& fsm, float elapsedTime) bool EventState::Update(Ndk::StateMachine& /*fsm*/, float /*elapsedTime*/)
{ {
return true; return true;
} }

View File

@ -38,12 +38,12 @@ void FocusState::Enter(Ndk::StateMachine& fsm)
}); });
} }
void FocusState::Leave(Ndk::StateMachine& fsm) void FocusState::Leave(Ndk::StateMachine& /*fsm*/)
{ {
m_text.SetVisible(false); m_text.SetVisible(false);
} }
bool FocusState::Update(Ndk::StateMachine& fsm, float elapsedTime) bool FocusState::Update(Ndk::StateMachine& /*fsm*/, float /*elapsedTime*/)
{ {
return true; return true;
} }

View File

@ -31,12 +31,12 @@ void KeyState::Enter(Ndk::StateMachine& fsm)
}); });
} }
void KeyState::Leave(Ndk::StateMachine& fsm) void KeyState::Leave(Ndk::StateMachine& /*fsm*/)
{ {
m_text.SetVisible(false); m_text.SetVisible(false);
} }
bool KeyState::Update(Ndk::StateMachine& fsm, float elapsedTime) bool KeyState::Update(Ndk::StateMachine& /*fsm*/, float /*elapsedTime*/)
{ {
return true; return true;
} }

View File

@ -14,7 +14,7 @@ m_selectedNextState(-1)
{ {
} }
void MenuState::Enter(Ndk::StateMachine& fsm) void MenuState::Enter(Ndk::StateMachine& /*fsm*/)
{ {
m_text.SetVisible(true); m_text.SetVisible(true);
DrawMenu(); DrawMenu();
@ -29,13 +29,13 @@ void MenuState::Enter(Ndk::StateMachine& fsm)
}); });
} }
void MenuState::Leave(Ndk::StateMachine& fsm) void MenuState::Leave(Ndk::StateMachine& /*fsm*/)
{ {
m_text.SetVisible(false); m_text.SetVisible(false);
m_selectedNextState = -1; m_selectedNextState = -1;
} }
bool MenuState::Update(Ndk::StateMachine& fsm, float elapsedTime) bool MenuState::Update(Ndk::StateMachine& fsm, float /*elapsedTime*/)
{ {
if (m_selectedNextState != -1) { if (m_selectedNextState != -1) {
fsm.ChangeState(StateFactory::Get(m_selectedNextState + 1)); fsm.ChangeState(StateFactory::Get(m_selectedNextState + 1));

View File

@ -43,12 +43,12 @@ void MouseClickState::Enter(Ndk::StateMachine& fsm)
}); });
} }
void MouseClickState::Leave(Ndk::StateMachine& fsm) void MouseClickState::Leave(Ndk::StateMachine& /*fsm*/)
{ {
m_text.SetVisible(false); m_text.SetVisible(false);
} }
bool MouseClickState::Update(Ndk::StateMachine& fsm, float elapsedTime) bool MouseClickState::Update(Ndk::StateMachine& /*fsm*/, float /*elapsedTime*/)
{ {
return true; return true;
} }

View File

@ -38,12 +38,12 @@ void MouseEnterState::Enter(Ndk::StateMachine& fsm)
}); });
} }
void MouseEnterState::Leave(Ndk::StateMachine& fsm) void MouseEnterState::Leave(Ndk::StateMachine& /*fsm*/)
{ {
m_text.SetVisible(false); m_text.SetVisible(false);
} }
bool MouseEnterState::Update(Ndk::StateMachine& fsm, float elapsedTime) bool MouseEnterState::Update(Ndk::StateMachine& /*fsm*/, float /*elapsedTime*/)
{ {
return true; return true;
} }

View File

@ -38,12 +38,12 @@ void MouseMoveState::Enter(Ndk::StateMachine& fsm)
}); });
} }
void MouseMoveState::Leave(Ndk::StateMachine& fsm) void MouseMoveState::Leave(Ndk::StateMachine& /*fsm*/)
{ {
m_text.SetVisible(false); m_text.SetVisible(false);
} }
bool MouseMoveState::Update(Ndk::StateMachine& fsm, float elapsedTime) bool MouseMoveState::Update(Ndk::StateMachine& /*fsm*/, float /*elapsedTime*/)
{ {
return true; return true;
} }

View File

@ -36,12 +36,12 @@ void TextEnterState::Enter(Ndk::StateMachine& fsm)
}); });
} }
void TextEnterState::Leave(Ndk::StateMachine& fsm) void TextEnterState::Leave(Ndk::StateMachine& /*fsm*/)
{ {
m_text.SetVisible(false); m_text.SetVisible(false);
} }
bool TextEnterState::Update(Ndk::StateMachine& fsm, float elapsedTime) bool TextEnterState::Update(Ndk::StateMachine& /*fsm*/, float /*elapsedTime*/)
{ {
return true; return true;
} }

View File

@ -38,12 +38,12 @@ void WindowModificationState::Enter(Ndk::StateMachine& fsm)
}); });
} }
void WindowModificationState::Leave(Ndk::StateMachine& fsm) void WindowModificationState::Leave(Ndk::StateMachine& /*fsm*/)
{ {
m_text.SetVisible(false); m_text.SetVisible(false);
} }
bool WindowModificationState::Update(Ndk::StateMachine& fsm, float elapsedTime) bool WindowModificationState::Update(Ndk::StateMachine& /*fsm*/, float /*elapsedTime*/)
{ {
return true; return true;
} }