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

Merge pull request #31 from Gawaboumga/master

Browse Source 
Some changes

Former-commit-id: f4ef15537da8edef3881def68dce39f6455f9b94
This commit is contained in:
Lynix
2014-09-03 13:47:39 +02:00
parent ce2aa91b32 177ed1f3c7
commit c86de3ed7e
6 changed files with 92 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nazara/Utility/Algorithm.cpp
View File

@@ -189,11 +189,9 @@ namespace
void MoveTriangleToEnd(int tri)
{
auto it = std::find(tri_indices.begin(), tri_indices.end(), tri);
int t_ind = (it != tri_indices.end()) ? std::distance(tri_indices.begin(), it) : -1;
NazaraAssert(it != tri_indices.end(), "Triangle not found");
NazaraAssert(t_ind >= 0, "Triangle not found");
tri_indices.erase(tri_indices.begin() + t_ind, tri_indices.begin() + t_ind + 1);
tri_indices.erase(it);
tri_indices.push_back(tri);
}
};

2
src/Nazara/Utility/Utility.cpp
View File

@@ -146,7 +146,7 @@ unsigned int NzUtility::ComponentCount[nzComponentType_Max+1] =
static_assert(nzComponentType_Max+1 == 14, "Component count array is incomplete");
unsigned int NzUtility::ComponentStride[nzComponentType_Max+1] =
std::size_t NzUtility::ComponentStride[nzComponentType_Max+1] =
{
4*sizeof(nzUInt8), // nzComponentType_Color
1*sizeof(double), // nzComponentType_Double1