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

Cleaned code

Browse Source 
Former-commit-id: 65b235b0c8326e060ec7032bb2a153e22518a25a
This commit is contained in:
Lynix
2012-10-04 09:32:55 +02:00
parent b219b19710
commit 7bab3d9443
9 changed files with 48 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nazara/Audio/Loaders/sndfile/Loader.cpp
View File

@@ -17,19 +17,19 @@ namespace
{
sf_count_t GetSize(void* user_data)
{
NzInputStream* stream = reinterpret_cast<NzInputStream*>(user_data);
NzInputStream* stream = static_cast<NzInputStream*>(user_data);
return stream->GetSize();
}
sf_count_t Read(void* ptr, sf_count_t count, void* user_data)
{
NzInputStream* stream = reinterpret_cast<NzInputStream*>(user_data);
NzInputStream* stream = static_cast<NzInputStream*>(user_data);
return stream->Read(ptr, count);
}
sf_count_t Seek(sf_count_t offset, int whence, void* user_data)
{
NzInputStream* stream = reinterpret_cast<NzInputStream*>(user_data);
NzInputStream* stream = static_cast<NzInputStream*>(user_data);
switch (whence)
{
case SEEK_CUR:

12
src/Nazara/Core/Win32/FileImpl.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2012 Jérôme Leclercq
// Copyright (C) 2012 Jérôme Leclercq
// This file is part of the "Nazara Engine - Core module"
// For conditions of distribution and use, see copyright notice in Config.hpp
@@ -113,11 +113,11 @@ std::size_t NzFileImpl::Read(void* buffer, std::size_t size)
m_endOfFileUpdated = true;
return read;
///FIXME: D'après la documenation, read vaut 0 si ReadFile atteint la fin du fichier
/// D'après les tests, ce n'est pas le cas, la taille lue est inférieure à la taille en argument, mais pas nulle
/// Peut-être ais-je mal compris la documentation
/// Le correctif (dans le cas où la doc serait vraie) est commenté en début de fonction et après ce commentaire
/// Il est cependant plus lourd, et ne fonctionne pas avec le comportement observé de la fonction
///FIXME: D'après la documentation, read vaut 0 si ReadFile atteint la fin du fichier
/// D'après les tests, ce n'est pas le cas, la taille lue est inférieure à la taille en argument, mais pas nulle
/// Peut-être ais-je mal compris la documentation
/// Le correctif (dans le cas où la doc serait vraie) est commenté en début de fonction et après ce commentaire
/// Il est cependant plus lourd, et ne fonctionne pas avec le comportement observé de la fonction
/*
if (read == 0)
{

35
src/Nazara/Renderer/Context.cpp
View File

@@ -37,27 +37,27 @@ namespace
ss << "\n-Source: ";
switch (source)
{
case GL_DEBUG_SOURCE_API_ARB:
case GL_DEBUG_SOURCE_API:
ss << "OpenGL";
break;
case GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB:
case GL_DEBUG_SOURCE_WINDOW_SYSTEM:
ss << "Operating system";
break;
case GL_DEBUG_SOURCE_SHADER_COMPILER_ARB:
case GL_DEBUG_SOURCE_SHADER_COMPILER:
ss << "Shader compiler";
break;
case GL_DEBUG_SOURCE_THIRD_PARTY_ARB:
case GL_DEBUG_SOURCE_THIRD_PARTY:
ss << "Shader compiler";
break;
case GL_DEBUG_SOURCE_APPLICATION_ARB:
case GL_DEBUG_SOURCE_APPLICATION:
ss << "Application";
break;
case GL_DEBUG_SOURCE_OTHER_ARB:
case GL_DEBUG_SOURCE_OTHER:
ss << "Other";
break;
@@ -71,27 +71,27 @@ namespace
ss << "-Type: ";
switch (type)
{
case GL_DEBUG_TYPE_ERROR_ARB:
case GL_DEBUG_TYPE_ERROR:
ss << "Error";
break;
case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB:
case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR:
ss << "Deprecated behavior";
break;
case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB:
case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR:
ss << "Undefined behavior";
break;
case GL_DEBUG_TYPE_PORTABILITY_ARB:
case GL_DEBUG_TYPE_PORTABILITY:
ss << "Portability";
break;
case GL_DEBUG_TYPE_PERFORMANCE_ARB:
case GL_DEBUG_TYPE_PERFORMANCE:
ss << "Performance";
break;
case GL_DEBUG_TYPE_OTHER_ARB:
case GL_DEBUG_TYPE_OTHER:
ss << "Other";
break;
@@ -105,15 +105,15 @@ namespace
ss << "-Severity: ";
switch (severity)
{
case GL_DEBUG_SEVERITY_HIGH_ARB:
case GL_DEBUG_SEVERITY_HIGH:
ss << "High";
break;
case GL_DEBUG_SEVERITY_MEDIUM_ARB:
case GL_DEBUG_SEVERITY_MEDIUM:
ss << "Medium";
break;
case GL_DEBUG_SEVERITY_LOW_ARB:
case GL_DEBUG_SEVERITY_LOW:
ss << "Low";
break;
@@ -130,11 +130,6 @@ namespace
}
}
NzContext::NzContext() :
m_impl(nullptr)
{
}
NzContext::~NzContext()
{
Destroy();

19
src/Nazara/Renderer/Renderer.cpp
View File

@@ -616,8 +616,13 @@ bool NzRenderer::SetTarget(NzRenderTarget* target)
if (s_target == target)
return true;
if (s_target && !s_target->HasContext())
s_target->Desactivate();
if (s_target)
{
if (!s_target->HasContext())
s_target->Desactivate();
s_target = nullptr;
}
if (target)
{
@@ -629,18 +634,14 @@ bool NzRenderer::SetTarget(NzRenderTarget* target)
}
#endif
if (target->Activate())
s_target = target;
else
if (!target->Activate())
{
NazaraError("Failed to activate target");
s_target = nullptr;
return false;
}
s_target = target;
}
else
s_target = nullptr;
return true;
}

3
src/Nazara/Utility/Buffer.cpp
View File

@@ -292,10 +292,9 @@ bool NzBuffer::SetStorage(nzBufferStorage storage)
m_impl->Unmap();
m_impl->Destroy();
delete m_impl;
m_impl = impl;
m_impl = impl;
m_storage = storage;
return true;