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

Fixes a lot of warnings and move math enums to enum classes

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-08-19 20:27:20 +02:00
parent a2a0e6bd54
commit 8db8533300
27 changed files with 323 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/Nazara/Graphics/CullingList.inl
View File

@@ -33,7 +33,7 @@ namespace Nz
{
switch (frustum.Intersect(entry.box))
{
case IntersectionSide_Inside:
case IntersectionSide::Inside:
m_fullyVisibleResults.push_back(entry.renderable);
fullyVisibleHash = CombineHash(fullyVisibleHash, std::hash<const T*>()(entry.renderable));
@@ -41,7 +41,7 @@ namespace Nz
entry.forceInvalidation = false;
break;
case IntersectionSide_Intersecting:
case IntersectionSide::Intersecting:
m_partiallyVisibleResults.push_back(entry.renderable);
partiallyVisibleHash = CombineHash(partiallyVisibleHash, std::hash<const T*>()(entry.renderable));
@@ -49,7 +49,7 @@ namespace Nz
entry.forceInvalidation = false;
break;
case IntersectionSide_Outside:
case IntersectionSide::Outside:
break;
}
}
@@ -70,7 +70,7 @@ namespace Nz
{
switch (frustum.Intersect(entry.sphere))
{
case IntersectionSide_Inside:
case IntersectionSide::Inside:
m_fullyVisibleResults.push_back(entry.renderable);
fullyVisibleHash = CombineHash(fullyVisibleHash, std::hash<const T*>()(entry.renderable));
@@ -78,7 +78,7 @@ namespace Nz
entry.forceInvalidation = false;
break;
case IntersectionSide_Intersecting:
case IntersectionSide::Intersecting:
m_partiallyVisibleResults.push_back(entry.renderable);
partiallyVisibleHash = CombineHash(partiallyVisibleHash, std::hash<const T*>()(entry.renderable));
@@ -86,7 +86,7 @@ namespace Nz
entry.forceInvalidation = false;
break;
case IntersectionSide_Outside:
case IntersectionSide::Outside:
break;
}
}
@@ -95,7 +95,7 @@ namespace Nz
{
switch (frustum.Intersect(entry.volume))
{
case IntersectionSide_Inside:
case IntersectionSide::Inside:
m_fullyVisibleResults.push_back(entry.renderable);
fullyVisibleHash = CombineHash(fullyVisibleHash, std::hash<const T*>()(entry.renderable));
@@ -103,7 +103,7 @@ namespace Nz
entry.forceInvalidation = false;
break;
case IntersectionSide_Intersecting:
case IntersectionSide::Intersecting:
m_partiallyVisibleResults.push_back(entry.renderable);
partiallyVisibleHash = CombineHash(partiallyVisibleHash, std::hash<const T*>()(entry.renderable));
@@ -111,7 +111,7 @@ namespace Nz
entry.forceInvalidation = false;
break;
case IntersectionSide_Outside:
case IntersectionSide::Outside:
break;
}
}

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

@@ -77,6 +77,8 @@ namespace std
Nz::HashCombine(seed, shader.uberShader.get());
}
NazaraUnused(parameterIndex);
#undef NazaraPipelineMember
#undef NazaraPipelineBoolMember