Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove auto and add include

Browse Source
This commit is contained in:
Xuchen Han
2019-09-27 15:50:25 -07:00
parent 9f11ac5d4d
commit 212b990b0e
2 changed files with 3 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/BulletSoftBody/btConjugateGradient.h
View File

@@ -17,6 +17,7 @@
#define BT_CONJUGATE_GRADIENT_H #define BT_CONJUGATE_GRADIENT_H
#include <iostream> #include <iostream>
#include <cmath> #include <cmath>
#include <limits>
#include <LinearMath/btAlignedObjectArray.h> #include <LinearMath/btAlignedObjectArray.h>
#include <LinearMath/btVector3.h> #include <LinearMath/btVector3.h>
#include "LinearMath/btQuickprof.h" #include "LinearMath/btQuickprof.h"

52
src/BulletSoftBody/btSoftBodyHelpers.cpp
View File

@@ -1326,56 +1326,8 @@ btSoftBody* btSoftBodyHelpers::CreateFromVtkFile(btSoftBodyWorldInfo& worldInfo,
} }
} }
std::map<std::vector<int>, std::vector<int> > dict;
for (int i = 0; i < indices.size(); ++i)
{
for (int j = 0; j < 4; ++j)
{
std::vector<int> f;
if (j == 0)
{
f.push_back(indices[i][1]);
f.push_back(indices[i][0]);
f.push_back(indices[i][2]);
}
if (j == 1)
{
f.push_back(indices[i][3]);
f.push_back(indices[i][0]);
f.push_back(indices[i][1]);
}
if (j == 2)
{
f.push_back(indices[i][3]);
f.push_back(indices[i][1]);
f.push_back(indices[i][2]);
}
if (j == 3)
{
f.push_back(indices[i][2]);
f.push_back(indices[i][0]);
f.push_back(indices[i][3]);
}
std::vector<int> f_sorted = f;
std::sort(f_sorted.begin(), f_sorted.end());
if (dict.find(f_sorted) != dict.end())
{
dict.erase(f_sorted);
}
else
{
dict.insert(std::make_pair(f_sorted, f));
}
}
}
for (auto it = dict.begin(); it != dict.end(); ++it)
{
std::vector<int> f = it->second;
psb->appendFace(f[0], f[1], f[2]);
}
generateBoundaryFaces(psb);
psb->initializeDmInverse(); psb->initializeDmInverse();
psb->m_tetraScratches.resize(psb->m_tetras.size()); psb->m_tetraScratches.resize(psb->m_tetras.size());
psb->m_tetraScratchesTn.resize(psb->m_tetras.size()); psb->m_tetraScratchesTn.resize(psb->m_tetras.size());
@@ -1451,7 +1403,7 @@ void btSoftBodyHelpers::generateBoundaryFaces(btSoftBody* psb)
} }
} }
for (auto it = dict.begin(); it != dict.end(); ++it) for (std::map<std::vector<int>, std::vector<int> >::iterator it = dict.begin(); it != dict.end(); ++it)
{ {
std::vector<int> f = it->second; std::vector<int> f = it->second;
psb->appendFace(f[0], f[1], f[2]); psb->appendFace(f[0], f[1], f[2]);