From 750ff33f265ced732e08c1381866824d52c62013 Mon Sep 17 00:00:00 2001 From: Xuchen Han Date: Wed, 21 Aug 2019 22:39:07 -0700 Subject: [PATCH] remove the std::istream version of vtkfileread --- src/BulletSoftBody/btSoftBodyHelpers.cpp | 16 +++++----------- src/BulletSoftBody/btSoftBodyHelpers.h | 2 +- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/BulletSoftBody/btSoftBodyHelpers.cpp b/src/BulletSoftBody/btSoftBodyHelpers.cpp index 6c67a3b78..d9bd513ad 100644 --- a/src/BulletSoftBody/btSoftBodyHelpers.cpp +++ b/src/BulletSoftBody/btSoftBodyHelpers.cpp @@ -1244,13 +1244,7 @@ btSoftBody* btSoftBodyHelpers::CreateFromVtkFile(btSoftBodyWorldInfo& worldInfo, std::ifstream fs; fs.open(vtk_file); btAssert(fs); - btSoftBody* psb = CreateFromVtkFile(worldInfo, fs); - fs.close(); - return psb; -} - -btSoftBody* btSoftBodyHelpers::CreateFromVtkFile(btSoftBodyWorldInfo& worldInfo, std::istream& in) -{ + typedef btAlignedObjectArray Index; std::string line; btAlignedObjectArray X; @@ -1262,7 +1256,7 @@ btSoftBody* btSoftBodyHelpers::CreateFromVtkFile(btSoftBodyWorldInfo& worldInfo, size_t n_tets = 0; size_t x_count = 0; size_t indices_count = 0; - while (std::getline(in, line)) + while (std::getline(fs, line)) { std::stringstream ss(line); if (line.size() == (size_t)(0)) @@ -1332,7 +1326,7 @@ btSoftBody* btSoftBodyHelpers::CreateFromVtkFile(btSoftBodyWorldInfo& worldInfo, printf("Links: %u\r\n", psb->m_links.size()); printf("Faces: %u\r\n", psb->m_faces.size()); printf("Tetras: %u\r\n", psb->m_tetras.size()); - return (psb); + + fs.close(); + return psb; } - - diff --git a/src/BulletSoftBody/btSoftBodyHelpers.h b/src/BulletSoftBody/btSoftBodyHelpers.h index 24c86afdd..60e0d6133 100644 --- a/src/BulletSoftBody/btSoftBodyHelpers.h +++ b/src/BulletSoftBody/btSoftBodyHelpers.h @@ -143,7 +143,7 @@ struct btSoftBodyHelpers bool btetralinks, bool bfacesfromtetras); static btSoftBody* CreateFromVtkFile(btSoftBodyWorldInfo& worldInfo, const char* vtk_file); - static btSoftBody* CreateFromVtkFile(btSoftBodyWorldInfo& worldInfo, std::istream& in); + /// Sort the list of links to move link calculations that are dependent upon earlier