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

Fix compilation with GCC/Clang 

Thanks to @Gawaboumga


Former-commit-id: c2ecad3d8c0bad06cb47b906829585c8d0b910c0 [formerly 7790b792e730ed65c3e8b8dddbd91b1527631e2e] [formerly ae62fe532d14dd33bfc88cf7bca1d19e63487a3f [formerly 41b273ee595cc56c6145651fb4caa1ceca0b2bf6]]
Former-commit-id: 7d4c3b3d0b48235a6c3534154c5787738440b2ae [formerly 96dcb709ba81c5696ba633b06e887007d5d9caf5]
Former-commit-id: 2a2013af6d26bb64362d1edd2e6aacaac000708f
This commit is contained in:
Lynix 2016-08-10 22:17:55 +02:00
parent 6129689573
commit 5ebff77ef0
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SDK/include/NDK/Systems/ParticleSystem.hpp
View File

@ -4,6 +4,7 @@
#pragma once #pragma once
#ifndef NDK_SERVER
#ifndef NDK_SYSTEMS_PARTICLESYSTEM_HPP #ifndef NDK_SYSTEMS_PARTICLESYSTEM_HPP
#define NDK_SYSTEMS_PARTICLESYSTEM_HPP #define NDK_SYSTEMS_PARTICLESYSTEM_HPP
@ -27,3 +28,4 @@ namespace Ndk
#include <NDK/Systems/ParticleSystem.inl> #include <NDK/Systems/ParticleSystem.inl>
#endif // NDK_SYSTEMS_PARTICLESYSTEM_HPP #endif // NDK_SYSTEMS_PARTICLESYSTEM_HPP
#endif // NDK_SERVER

2
build/scripts/tools/ndk_server.lua
View File

@ -30,6 +30,8 @@ TOOL.FilesExcluded = {
"../SDK/**/LightComponent.*", "../SDK/**/LightComponent.*",
"../SDK/**/ListenerComponent.*", "../SDK/**/ListenerComponent.*",
"../SDK/**/ListenerSystem.*", "../SDK/**/ListenerSystem.*",
"../SDK/**/Particle*Component.*",
"../SDK/**/ParticleSystem.*",
"../SDK/**/RenderSystem.*", "../SDK/**/RenderSystem.*",
"../SDK/**/LuaBinding_Audio.*", "../SDK/**/LuaBinding_Audio.*",
"../SDK/**/LuaBinding_Graphics.*", "../SDK/**/LuaBinding_Graphics.*",

2
include/Nazara/Core/Algorithm.inl
View File

@ -124,7 +124,7 @@ namespace Nz
template<typename T, std::size_t N> template<typename T, std::size_t N>
constexpr std::size_t CountOf(T(&name)[N]) noexcept constexpr std::size_t CountOf(T(&name)[N]) noexcept
{ {
NazaraUnused(name); // NazaraUnused(name); //< Because "body of function is not a return-statement" >.>
return N; return N;
} }

6
include/Nazara/Graphics/MaterialPipeline.inl
View File

@ -61,7 +61,7 @@ namespace Nz
if (!operator==(static_cast<const RenderStates&>(lhs), static_cast<const RenderStates&>(rhs))) if (!operator==(static_cast<const RenderStates&>(lhs), static_cast<const RenderStates&>(rhs)))
return false; return false;
#define NazaraPipelineMember(field) if (lhs.##field != rhs.##field) return false #define NazaraPipelineMember(field) if (lhs.field != rhs.field) return false
#define NazaraPipelineBoolMember NazaraPipelineMember #define NazaraPipelineBoolMember NazaraPipelineMember
NazaraPipelineBoolMember(alphaTest); NazaraPipelineBoolMember(alphaTest);
@ -115,8 +115,8 @@ namespace std
Nz::UInt16 parameterHash = 0; Nz::UInt16 parameterHash = 0;
Nz::UInt16 parameterIndex = 0; Nz::UInt16 parameterIndex = 0;
#define NazaraPipelineMember(member) Nz::HashCombine(seed, pipelineInfo.##member) #define NazaraPipelineMember(member) Nz::HashCombine(seed, pipelineInfo.member)
#define NazaraPipelineBoolMember(member) parameterHash |= ((pipelineInfo.##member) ? 1U : 0U) << (parameterIndex++) #define NazaraPipelineBoolMember(member) parameterHash |= ((pipelineInfo.member) ? 1U : 0U) << (parameterIndex++)
NazaraPipelineBoolMember(alphaTest); NazaraPipelineBoolMember(alphaTest);
NazaraPipelineBoolMember(depthSorting); NazaraPipelineBoolMember(depthSorting);

4
src/Nazara/Graphics/MaterialPipeline.cpp
View File

@ -49,8 +49,8 @@ namespace Nz
*/ */
MaterialPipelineRef MaterialPipeline::GetPipeline(const MaterialPipelineInfo& pipelineInfo) MaterialPipelineRef MaterialPipeline::GetPipeline(const MaterialPipelineInfo& pipelineInfo)
{ {
auto it = s_pipelineCache.lower_bound(pipelineInfo); auto it = s_pipelineCache.find(pipelineInfo);
if (it == s_pipelineCache.end() || it->first != pipelineInfo) if (it == s_pipelineCache.end())
it = s_pipelineCache.insert(it, PipelineCache::value_type(pipelineInfo, New(pipelineInfo))); it = s_pipelineCache.insert(it, PipelineCache::value_type(pipelineInfo, New(pipelineInfo)));
return it->second; return it->second;