diff options
Diffstat (limited to 'extern/mantaflow/preprocessed/mesh.cpp')
-rw-r--r-- | extern/mantaflow/preprocessed/mesh.cpp | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/extern/mantaflow/preprocessed/mesh.cpp b/extern/mantaflow/preprocessed/mesh.cpp index 7a27b88ece7..6a9b0283bef 100644 --- a/extern/mantaflow/preprocessed/mesh.cpp +++ b/extern/mantaflow/preprocessed/mesh.cpp @@ -213,34 +213,36 @@ Mesh &Mesh::operator=(const Mesh &o) return *this; } -void Mesh::load(string name, bool append) +int Mesh::load(string name, bool append) { if (name.find_last_of('.') == string::npos) errMsg("file '" + name + "' does not have an extension"); string ext = name.substr(name.find_last_of('.')); if (ext == ".gz") // assume bobj gz - readBobjFile(name, this, append); + return readBobjFile(name, this, append); else if (ext == ".obj") - readObjFile(name, this, append); + return readObjFile(name, this, append); else errMsg("file '" + name + "' filetype not supported"); // dont always rebuild... // rebuildCorners(); // rebuildLookup(); + return 0; } -void Mesh::save(string name) +int Mesh::save(string name) { if (name.find_last_of('.') == string::npos) errMsg("file '" + name + "' does not have an extension"); string ext = name.substr(name.find_last_of('.')); if (ext == ".obj") - writeObjFile(name, this); + return writeObjFile(name, this); else if (ext == ".gz") - writeBobjFile(name, this); + return writeBobjFile(name, this); else errMsg("file '" + name + "' filetype not supported"); + return 0; } void Mesh::fromShape(Shape &shape, bool append) @@ -1379,30 +1381,32 @@ void Mesh::updateDataFields() } } -template<typename T> void MeshDataImpl<T>::load(string name) +template<typename T> int MeshDataImpl<T>::load(string name) { if (name.find_last_of('.') == string::npos) errMsg("file '" + name + "' does not have an extension"); string ext = name.substr(name.find_last_of('.')); if (ext == ".uni") - readMdataUni<T>(name, this); + return readMdataUni<T>(name, this); else if (ext == ".raw") // raw = uni for now - readMdataUni<T>(name, this); + return readMdataUni<T>(name, this); else errMsg("mesh data '" + name + "' filetype not supported for loading"); + return 0; } -template<typename T> void MeshDataImpl<T>::save(string name) +template<typename T> int MeshDataImpl<T>::save(string name) { if (name.find_last_of('.') == string::npos) errMsg("file '" + name + "' does not have an extension"); string ext = name.substr(name.find_last_of('.')); if (ext == ".uni") - writeMdataUni<T>(name, this); + return writeMdataUni<T>(name, this); else if (ext == ".raw") // raw = uni for now - writeMdataUni<T>(name, this); + return writeMdataUni<T>(name, this); else errMsg("mesh data '" + name + "' filetype not supported for saving"); + return 0; } // specializations |