Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 16:58:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up coding standard violations

Browse source
This commit is contained in:
Virendra Singh 2015-02-27 00:59:59 +05:30
parent 93106be466
commit d4367924ad
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
tools/vhacd/src/VHACDUtil.cpp
View file

@ -26,25 +26,26 @@ bool vhacd::VHACDUtil::loadFBX(const QString filename, vhacd::LoadFBXResults *re
QByteArray fbxContents = fbx.readAll(); QByteArray fbxContents = fbx.readAll();
FBXGeometry geometry = readFBX(fbxContents, QVariantHash()); FBXGeometry geometry = readFBX(fbxContents, QVariantHash());
//results->meshCount = geometry.meshes.count(); //results->meshCount = geometry.meshes.count();
int count = 0; int count = 0;
foreach(FBXMesh mesh, geometry.meshes) { foreach(FBXMesh mesh, geometry.meshes){
//get vertices for each mesh //get vertices for each mesh
QVector<glm::vec3> vertices = mesh.vertices; QVector<glm::vec3> vertices = mesh.vertices;
//get the triangle indices for each mesh //get the triangle indices for each mesh
QVector<int> triangles; QVector<int> triangles;
foreach(FBXMeshPart part, mesh.parts) { foreach(FBXMeshPart part, mesh.parts){
QVector<int> indices = part.triangleIndices; QVector<int> indices = part.triangleIndices;
triangles += indices; triangles += indices;
} }
//only read meshes with triangles //only read meshes with triangles
if (triangles.count() <= 0) if (triangles.count() <= 0){
continue; continue;
}
results->perMeshVertices.append(vertices); results->perMeshVertices.append(vertices);
results->perMeshTriangleIndices.append(triangles); results->perMeshTriangleIndices.append(triangles);
count++; count++;
} }
results->meshCount = count; results->meshCount = count;
@ -55,10 +56,10 @@ bool vhacd::VHACDUtil::computeVHACD(vhacd::LoadFBXResults *meshes, VHACD::IVHACD
VHACD::IVHACD * interfaceVHACD = VHACD::CreateVHACD(); VHACD::IVHACD * interfaceVHACD = VHACD::CreateVHACD();
int meshCount = meshes->meshCount; int meshCount = meshes->meshCount;
int count = 0; int count = 0;
std::cout << "Performing V-HACD computation on " << meshCount <<" meshes ..... " << std::endl; std::cout << "Performing V-HACD computation on " << meshCount << " meshes ..... " << std::endl;
for (int i = 0; i < meshCount; i++){ for (int i = 0; i < meshCount; i++){
std::vector<glm::vec3> vertices = meshes->perMeshVertices.at(i).toStdVector(); std::vector<glm::vec3> vertices = meshes->perMeshVertices.at(i).toStdVector();
std::vector<int> triangles = meshes->perMeshTriangleIndices.at(i).toStdVector(); std::vector<int> triangles = meshes->perMeshTriangleIndices.at(i).toStdVector();
int nPoints = (unsigned int)vertices.size(); int nPoints = (unsigned int)vertices.size();
@ -92,10 +93,13 @@ bool vhacd::VHACDUtil::computeVHACD(vhacd::LoadFBXResults *meshes, VHACD::IVHACD
interfaceVHACD->Clean(); interfaceVHACD->Clean();
interfaceVHACD->Release(); interfaceVHACD->Release();
if (count > 0) if (count > 0){
return true; return true;
else }
else{
return false; return false;
}
} }
vhacd::VHACDUtil:: ~VHACDUtil(){ vhacd::VHACDUtil:: ~VHACDUtil(){
@ -103,19 +107,22 @@ vhacd::VHACDUtil:: ~VHACDUtil(){
} }
//ProgressClaback implementation //ProgressClaback implementation
void vhacd::ProgressCallback::Update(const double overallProgress, const double stageProgress, const double operationProgress, void vhacd::ProgressCallback::Update(const double overallProgress, const double stageProgress, const double operationProgress,
const char * const stage, const char * const operation){ const char * const stage, const char * const operation){
int progress = (int)(overallProgress + 0.5); int progress = (int)(overallProgress + 0.5);
if (progress < 10) if (progress < 10){
std::cout << "\b\b"; std::cout << "\b\b";
else }
else{
std::cout << "\b\b\b"; std::cout << "\b\b\b";
}
std::cout << progress << "%"; std::cout << progress << "%";
if (progress >= 100) if (progress >= 100){
std::cout << std::endl; std::cout << std::endl;
}
} }
vhacd::ProgressCallback::ProgressCallback(void){} vhacd::ProgressCallback::ProgressCallback(void){}