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

Renamed PrimitiveType to PrimitiveMode

Browse Source 
Also renamed RENDERER_INSTANCING_MAX to RENDERER_MAX_INSTANCES
Added RENDERER_SHADER_MAX_LIGHTCOUNT


Former-commit-id: bc26e087dd1b55c424836e6e2fa6e1dc0f17effa
This commit is contained in:
Lynix
2013-05-24 20:12:40 +02:00
parent 50e8ce3658
commit cf6e2be0b0
14 changed files with 80 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@
NzSubMesh::NzSubMesh(const NzMesh* parent) :
NzResource(false), // Un SubMesh n'est pas persistant par défaut
m_primitiveType(nzPrimitiveType_TriangleList),
m_primitiveMode(nzPrimitiveMode_TriangleList),
m_parent(parent),
m_matIndex(0)
{
@@ -147,9 +147,9 @@ const NzMesh* NzSubMesh::GetParent() const
return m_parent;
}
nzPrimitiveType NzSubMesh::GetPrimitiveType() const
nzPrimitiveMode NzSubMesh::GetPrimitiveMode() const
{
return m_primitiveType;
return m_primitiveMode;
}
unsigned int NzSubMesh::GetTriangleCount() const
@@ -161,24 +161,24 @@ unsigned int NzSubMesh::GetTriangleCount() const
else
indexCount = GetVertexCount();
switch (m_primitiveType)
switch (m_primitiveMode)
{
case nzPrimitiveType_LineList:
case nzPrimitiveType_LineStrip:
case nzPrimitiveType_PointList:
case nzPrimitiveMode_LineList:
case nzPrimitiveMode_LineStrip:
case nzPrimitiveMode_PointList:
return 0;
case nzPrimitiveType_TriangleFan:
case nzPrimitiveMode_TriangleFan:
return (indexCount - 1) / 2;
case nzPrimitiveType_TriangleList:
case nzPrimitiveMode_TriangleList:
return indexCount / 3;
case nzPrimitiveType_TriangleStrip:
case nzPrimitiveMode_TriangleStrip:
return indexCount - 2;
}
NazaraError("Primitive type not handled (0x" + NzString::Number(m_primitiveType, 16) + ')');
NazaraError("Primitive mode not handled (0x" + NzString::Number(m_primitiveMode, 16) + ')');
return 0;
}
@@ -187,9 +187,9 @@ unsigned int NzSubMesh::GetMaterialIndex() const
return m_matIndex;
}
void NzSubMesh::SetPrimitiveType(nzPrimitiveType primitiveType)
void NzSubMesh::SetPrimitiveMode(nzPrimitiveMode mode)
{
m_primitiveType = primitiveType;
m_primitiveMode = mode;
}
void NzSubMesh::SetMaterialIndex(unsigned int matIndex)