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

Big f***ing cleanup part 1

Browse Source
This commit is contained in:
Lynix
2020-02-23 00:42:22 +01:00
parent 67d0e0a689
commit 3d22321109
178 changed files with 2190 additions and 5113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Nazara/Utility/SubMesh.cpp
View File

@@ -32,14 +32,14 @@ namespace Nz
void SubMesh::GenerateNormals()
{
VertexMapper mapper(this);
UInt32 vertexCount = mapper.GetVertexCount();
std::size_t vertexCount = mapper.GetVertexCount();
SparsePtr<Vector3f> normals = mapper.GetComponentPtr<Vector3f>(VertexComponent_Normal);
SparsePtr<Vector3f> positions = mapper.GetComponentPtr<Vector3f>(VertexComponent_Position);
if (!normals || !positions)
return;
for (UInt32 i = 0; i < vertexCount; ++i)
for (std::size_t i = 0; i < vertexCount; ++i)
normals[i].MakeZero();
TriangleIterator iterator(this);
@@ -58,14 +58,14 @@ namespace Nz
}
while (iterator.Advance());
for (UInt32 i = 0; i < vertexCount; ++i)
for (std::size_t i = 0; i < vertexCount; ++i)
normals[i].Normalize();
}
void SubMesh::GenerateNormalsAndTangents()
{
VertexMapper mapper(this);
UInt32 vertexCount = mapper.GetVertexCount();
std::size_t vertexCount = mapper.GetVertexCount();
SparsePtr<Vector3f> normals = mapper.GetComponentPtr<Vector3f>(VertexComponent_Normal);
SparsePtr<Vector3f> positions = mapper.GetComponentPtr<Vector3f>(VertexComponent_Position);
@@ -74,7 +74,7 @@ namespace Nz
if (!normals || !positions || !tangents || !texCoords)
return;
for (UInt32 i = 0; i < vertexCount; ++i)
for (std::size_t i = 0; i < vertexCount; ++i)
{
normals[i].MakeZero();
tangents[i].MakeZero();
@@ -169,10 +169,10 @@ namespace Nz
return m_primitiveMode;
}
unsigned int SubMesh::GetTriangleCount() const
std::size_t SubMesh::GetTriangleCount() const
{
const IndexBuffer* indexBuffer = GetIndexBuffer();
unsigned int indexCount;
std::size_t indexCount;
if (indexBuffer)
indexCount = indexBuffer->GetIndexCount();
else
@@ -199,7 +199,7 @@ namespace Nz
return 0;
}
UInt32 SubMesh::GetMaterialIndex() const
std::size_t SubMesh::GetMaterialIndex() const
{
return m_matIndex;
}
@@ -209,7 +209,7 @@ namespace Nz
m_primitiveMode = mode;
}
void SubMesh::SetMaterialIndex(UInt32 matIndex)
void SubMesh::SetMaterialIndex(std::size_t matIndex)
{
m_matIndex = matIndex;
}