[Bf-blender-cvs] [72ea9b9e06e] soc-2021-adaptive-cloth: adaptive_cloth: MeshReader to MeshIO

[ishbosamiya]

Commit: 72ea9b9e06ea1699232c4ab0731812945d87ae89
Author: ishbosamiya
Date:   Thu Jun 24 16:50:29 2021 +0530
Branches: soc-2021-adaptive-cloth
https://developer.blender.org/rB72ea9b9e06ea1699232c4ab0731812945d87ae89

adaptive_cloth: MeshReader to MeshIO

===================================================================

M	source/blender/blenkernel/BKE_cloth_remesh.hh
M	source/blender/blenkernel/tests/BKE_cloth_remesh_test.cc

===================================================================

diff --git a/source/blender/blenkernel/BKE_cloth_remesh.hh b/source/blender/blenkernel/BKE_cloth_remesh.hh
index e1f100a3161..bc3dba35997 100644
--- a/source/blender/blenkernel/BKE_cloth_remesh.hh
+++ b/source/blender/blenkernel/BKE_cloth_remesh.hh
@@ -68,7 +68,7 @@ template<typename> class Vert;
 template<typename> class Edge;
 template<typename> class Face;
 template<typename, typename, typename, typename> class Mesh;
-class MeshReader;
+class MeshIO;
 
 namespace ga = blender::generational_arena;
 namespace fs = std::filesystem;
@@ -334,7 +334,7 @@ template<typename T> class Face {
   template<typename, typename, typename, typename> friend class Mesh;
 };
 
-class MeshReader {
+class MeshIO {
   using FaceData = std::tuple<usize, usize, usize>; /* position,
                                                      * uv,
                                                      * normal */
@@ -350,7 +350,7 @@ class MeshReader {
     FILETYPE_OBJ,
   };
 
-  MeshReader() = default;
+  MeshIO() = default;
 
   bool read(const fs::path &filepath, FileType type)
   {
@@ -621,7 +621,7 @@ template<typename END, typename EVD, typename EED, typename EFD> class Mesh {
     return std::nullopt;
   }
 
-  void read(const MeshReader &reader)
+  void read(const MeshIO &reader)
   {
     const auto positions = reader.get_positions();
     const auto uvs = reader.get_uvs();
@@ -730,8 +730,8 @@ template<typename END, typename EVD, typename EED, typename EFD> class Mesh {
 
   void read_obj(const fs::path &filepath)
   {
-    MeshReader reader;
-    const auto reader_success = reader.read(filepath, MeshReader::FILETYPE_OBJ);
+    MeshIO reader;
+    const auto reader_success = reader.read(filepath, MeshIO::FILETYPE_OBJ);
     BLI_assert(reader_success); /* must successfully load obj */
 
     this->read(reader);
diff --git a/source/blender/blenkernel/tests/BKE_cloth_remesh_test.cc b/source/blender/blenkernel/tests/BKE_cloth_remesh_test.cc
index f38ae45f425..a2e3b4a0760 100644
--- a/source/blender/blenkernel/tests/BKE_cloth_remesh_test.cc
+++ b/source/blender/blenkernel/tests/BKE_cloth_remesh_test.cc
@@ -50,11 +50,11 @@ static const char *cube_pos_uv_normal =
     "f 2/13/5 1/1/5 3/4/5 4/5/5\n"
     "f 6/11/6 5/10/6 1/1/6 2/13/6\n";
 
-TEST(cloth_remesh, MeshReader_ReadObj)
+TEST(cloth_remesh, MeshIO_ReadObj)
 {
-  MeshReader reader;
+  MeshIO reader;
   std::istringstream stream(cube_pos_uv_normal);
-  auto res = reader.read(std::move(stream), MeshReader::FILETYPE_OBJ);
+  auto res = reader.read(std::move(stream), MeshIO::FILETYPE_OBJ);
 
   EXPECT_TRUE(res);
 
@@ -73,9 +73,9 @@ TEST(cloth_remesh, MeshReader_ReadObj)
 
 TEST(cloth_remesh, Mesh_Read)
 {
-  MeshReader reader;
+  MeshIO reader;
   std::istringstream stream(cube_pos_uv_normal);
-  reader.read(std::move(stream), MeshReader::FILETYPE_OBJ);
+  reader.read(std::move(stream), MeshIO::FILETYPE_OBJ);
 
   Mesh<bool, bool, bool, bool> mesh;
   mesh.read(reader);