Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

check everything when it comes to joining meshes

Browse Source
This commit is contained in:
Mark Vejvoda 2013-06-23 03:09:59 +00:00
parent 9549b7f87a
commit 4764da0e50
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/shared_lib/sources/graphics/model.cpp
View File

@ -1579,7 +1579,10 @@ void Model::autoJoinMeshFrames() {
string("_") + intToStr(mesh.getTwoSided()) +
string("_") + intToStr(mesh.getCustomTexture()) +
string("_") + intToStr(mesh.getNoSelect()) +
string("_") + floatToStr(mesh.getOpacity());
string("_") + floatToStr(mesh.getOpacity()) +
string("_") + mesh.getDiffuseColor().getString() +
string("_") + mesh.getSpecularColor().getString() +
string("_") + floatToStr(mesh.getSpecularPower());
joinedMeshes[mesh_key].add(index,&mesh);
if(haveJoinedMeshes == false && joinedMeshes[mesh_key].size() > 1) {
@ -1621,11 +1624,11 @@ void Model::autoJoinMeshFrames() {
for(unsigned int joinIndex = 1;
joinIndex < iterMap->second.size(); ++joinIndex) {
Mesh *mesh = iterMap->second[joinIndex];
if(base->getIndexCount() + mesh->getIndexCount() > 0xffff) {
printf("Not exactly sure what this IF statement is for?\n");
mesh->copyInto(base, true, true);
}
else {
//if(base->getIndexCount() + mesh->getIndexCount() > 0xffff) {
// printf("Not exactly sure what this IF statement is for?\n");
// mesh->copyInto(base, true, true);
//}
//else {
// Need to add verticies for each from from mesh to base
uint32 originalBaseVertexCount = base->getVertexCount();
@ -1703,7 +1706,7 @@ void Model::autoJoinMeshFrames() {
join_index_index++;
}
base->setIndices(joined_indexes, newindexCount);
}
//}
}
}
base->buildInterpolationData();