mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-16 18:12:10 +00:00
807520ca1d
* Update eigen from v3.3.7 to v5.0.1. This updates eigen from v3.3.7 released on December 11, 2018-12-11 to v5.0.1 released on 2025-11-11. There have be a large number of bug-fixes, optimizations, and improvements between these releases. See the details at; https://gitlab.com/libeigen/eigen/-/releases It retains the previous custom minimal `CMakeLists.txt`, and adds a README-OrcaSlicer.md that explains what version and parts of the upstream eigen release have been included, and where the full release can be found. * Update libigl from v2.0.0 (or older) to v2.6.0. This updates libigl from what was probably v2.0.0 released on 2018-10-16 to v2.6.0 released on 2025-05-15. It's possible the old version was even older than that but there is no version indicators in the code and I ran out of patience identifying missing changes and only went back as far as v2.0.0. There have been a large number of bug-fixes, optimizations, and improvements between these versions. See the following for details; https://github.com/libigl/libigl/releases I retained the minimal custom `CMakeLists.txt`, added `README.md` from the libigl distribution which identifies the version, and added a README-OrcaSlicer.md that details the version and parts that have been included. * Update libslic3r for libigl v2.6.0 changes. This updates libslic3r for all changes moving to eigen v5.0.1 and libigl v2.6.0. Despite the large number of updates to both dependencies, no changes were required for the eigen update, and only one change was required for the libigl update. For libigl, `igl::Hit` was changed to a template taking the Scalar type to use. Previously it was hard-coded to `float`, so to minimize possible impact I've updated all places it is used from `igl::Hit` to `igl::Hit<float>`. * Add compiler option `-DNOMINMAX` for libigl with MSVC. MSVC by default defines `min(()` and `max()` macros that break `std::numeric_limits<>::max()`. The upstream cmake that we don't include adds `-DNOMINMAX` for the libigl module when compiling with MSVC, so we need to add the same thing here. * Fix src/libslic3r/TriangleMeshDeal.cpp for the unmodified upstream libigl. This fixes `TriangleMeshDeal.cpp` to work with the unmodified upstream libigl v2.6.0. loop.{h,cpp} implementation. This file and feature was added in PR "BBS Port: Mesh Subdivision" (#12150) which included changes to `loop.{h,cpp}` in the old version of libigl. This PR avoids modifying the included dependencies, and uses the updated upstream versions of those files without any modifications, which requires fixing TriangleMeshDeal.cpp to work with them. In particular, the modifications made to `loop.{h,cpp}` included changing the return type from void to bool, adding additional validation checking of the input meshes, and returning false if they failed validation. These added checks looked unnecessary and would only have caught problems if the input mesh was very corrupt. To make `TriangleMeshDeal.cpp` work without this built-in checking functionality, I removed checking/handling of any `false` return value. There was also a hell of a lot of redundant copying and casting back and forth between float and double, so I cleaned that up. The input and output meshs use floats for the vertexes, and there would be no accuracy benefits from casting to and from doubles for the simple weighted average operations done by igl::loop(). So this just uses `Eigen:Map` to use the original input mesh vertex data directly without requiring any copy or casting. * Move eigen from included `deps_src` to externaly fetched `deps`. This copys what PrusaSlicer did and moved it from an included dependency under `deps_src` to an externaly fetched dependency under `deps`. This requires updating some `CMakeList.txt` configs and removing the old and obsolete `cmake/modules/FindEigen3.cmake`. The details of when this was done in PrusaSlicer and the followup fixes are at; *21116995d7* https://github.com/prusa3d/PrusaSlicer/issues/13608 * https://github.com/prusa3d/PrusaSlicer/pull/13609 *e3c277b9eeFor some reason I don't fully understand this also required fixing `src/slic3r/GUI/GUI_App.cpp` by adding `#include <boost/nowide/cstdio.hpp>` to fix an `error: ‘remove’ is not a member of ‘boost::nowide'`. The main thing I don't understand is how it worked before. Note that this include is in the PrusaSlicer version of this file, but it also significantly deviates from what is currently in OrcaSlicer in many other ways. * Whups... I missed adding the deps/Eigen/Eigen.cmake file... * Tidy some whitespace indenting in CMakeLists.txt. * Ugh... tabs indenting needing fixes. * Change the include order of deps/Eigen. It turns out that although Boost includes some references to Eigen, Eigen also includes some references to Boost for supporting some of it's additional numeric types. I don't think it matters much since we are not using these features, but I think technically its more correct to say Eigen depends on Boost than the other way around, so I've re-ordered them. * Add source for Eigen 5.0.1 download to flatpak yml config. * Add explicit `DEPENDS dep_Boost to deps/Eigen. I missed this before. This ensures we don't rely on include orders to make sure Boost is installed before we configure Eigen. * Add `DEPENDS dep_Boost dep_GMP dep_MPFR` to deps/Eigen. It turns out Eigen can also use GMP and MPFR for multi-precision and multi-precision-rounded numeric types if they are available. Again, I don't think we are using these so it doesn't really matter, but it is technically correct and ensures they are there if we ever do need them. * Fix deps DEPENDENCY ordering for GMP, MPFR, Eigen, and CGAL. I think this is finally correct. Apparently CGAL also optionally depends on Eigen, so the correct dependency order from lowest to highest is GMP, MPFR, Eigen, and CGAL. --------- Co-authored-by: Donovan Baarda <dbaarda@google.com> Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
256 lines
12 KiB
C++
256 lines
12 KiB
C++
//
|
||
// Copyright (C) 2014 Christian Sch<63>ller <schuellchr@gmail.com>
|
||
//
|
||
// This Source Code Form is subject to the terms of the Mozilla Public License
|
||
// v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||
// obtain one at http://mozilla.org/MPL/2.0/.
|
||
#ifndef IGL_XML_SERIALIZABLE_XML_H
|
||
#define IGL_XML_SERIALIZABLE_XML_H
|
||
// -----------------------------------------------------------------------------
|
||
// Functions to save and load a serialization of fundamental c++ data types to
|
||
// and from a xml file. STL containers, Eigen matrix types and nested data
|
||
// structures are also supported. To serialize a user defined class implement
|
||
// the interface XMLSerializable or XMLSerializableBase.
|
||
//
|
||
// See also: serialize.h
|
||
// -----------------------------------------------------------------------------
|
||
|
||
#include "../igl_inline.h"
|
||
|
||
|
||
#include <Eigen/Dense>
|
||
#include <Eigen/Sparse>
|
||
#include <tinyxml2.h>
|
||
|
||
#include <type_traits>
|
||
#include <functional>
|
||
#include <iostream>
|
||
#include <vector>
|
||
#include <set>
|
||
#include <map>
|
||
#include <memory>
|
||
|
||
//#define SERIALIZE_XML(x) igl::xml::serialize_xml(x,#x,doc,element);
|
||
//#define DESERIALIZE_XML(x) igl::xml::deserialize_xml(x,#x,,doc,element);
|
||
|
||
namespace igl
|
||
{
|
||
namespace xml
|
||
{
|
||
struct XMLSerializableBase;
|
||
/// Serialize object to file
|
||
/// @tparam T type of the object to serialize
|
||
/// @param[in] obj object to serialize
|
||
/// @param[in] filename name of the file containing the serialization
|
||
/// Serialize object to file
|
||
///
|
||
/// @tparam T type of the object to serialize
|
||
/// @param[in] obj object to serialize
|
||
/// @param[in] objectName unique object name,used for the identification
|
||
/// @param[in] filename name of the file containing the serialization
|
||
/// @param[in] binary set to true to serialize the object in binary format (faster for big data)
|
||
/// @param[in] overwrite set to true to overwrite an existing xml file
|
||
template <typename T>
|
||
IGL_INLINE void serialize_xml(
|
||
const T& obj,
|
||
const std::string& objectName,
|
||
const std::string& filename,
|
||
bool binary = false,
|
||
bool overwrite = false);
|
||
/// \overload
|
||
template <typename T>
|
||
IGL_INLINE void serialize_xml(const T& obj,const std::string& filename);
|
||
/// \overload
|
||
///
|
||
/// @param[in,out] doc contains current tinyxml2 virtual representation of the xml data
|
||
/// @param[in,out] element tinyxml2 virtual representation of the current xml node
|
||
template <typename T>
|
||
IGL_INLINE void serialize_xml(
|
||
const T& obj,
|
||
const std::string& objectName,
|
||
tinyxml2::XMLDocument* doc,
|
||
tinyxml2::XMLElement* element,
|
||
bool binary = false);
|
||
|
||
/// deserialize object to file
|
||
///
|
||
/// @tparam T type of the object to serialize
|
||
/// @param[in] obj object to serialize
|
||
/// @param[in] objectName unique object name,used for the identification
|
||
/// @param[in] filename name of the file containing the serialization
|
||
/// @param[in] binary set to true to serialize the object in binary format (faster for big data)
|
||
/// @param[in] overwrite set to true to overwrite an existing xml file
|
||
///
|
||
/// \fileinfo
|
||
template <typename T>
|
||
IGL_INLINE void deserialize_xml(T& obj,const std::string& objectName,const std::string& filename);
|
||
/// \overload
|
||
///
|
||
/// \fileinfo
|
||
template <typename T>
|
||
IGL_INLINE void deserialize_xml(T& obj,const std::string& filename);
|
||
/// Deserialize to xml doc
|
||
///
|
||
/// @param[in,out] doc contains current tinyxml2 virtual representation of the xml data
|
||
/// @param[in,out] element tinyxml2 virtual representation of the current xml node
|
||
///
|
||
/// \fileinfo
|
||
template <typename T>
|
||
IGL_INLINE void deserialize_xml(T& obj,const std::string& objectName,const tinyxml2::XMLDocument* doc,const tinyxml2::XMLElement* element);
|
||
|
||
// internal functions
|
||
/// @private
|
||
namespace serialization_xml
|
||
{
|
||
// fundamental types
|
||
template <typename T>
|
||
IGL_INLINE typename std::enable_if<std::is_fundamental<T>::value>::type serialize(const T& obj,tinyxml2::XMLDocument* doc,tinyxml2::XMLElement* element,const std::string& name);
|
||
template <typename T>
|
||
IGL_INLINE typename std::enable_if<std::is_fundamental<T>::value>::type deserialize(T& obj,const tinyxml2::XMLDocument* doc,const tinyxml2::XMLElement* element,const std::string& name);
|
||
|
||
// std::string
|
||
IGL_INLINE void serialize(const std::string& obj,tinyxml2::XMLDocument* doc,tinyxml2::XMLElement* element,const std::string& name);
|
||
IGL_INLINE void deserialize(std::string& obj,const tinyxml2::XMLDocument* doc,const tinyxml2::XMLElement* element,const std::string& name);
|
||
|
||
// XMLSerializableBase
|
||
template <typename T>
|
||
IGL_INLINE typename std::enable_if<std::is_base_of<XMLSerializableBase,T>::value>::type serialize(const T& obj,tinyxml2::XMLDocument* doc,tinyxml2::XMLElement* element,const std::string& name);
|
||
template <typename T>
|
||
IGL_INLINE typename std::enable_if<std::is_base_of<XMLSerializableBase,T>::value>::type deserialize(T& obj,const tinyxml2::XMLDocument* doc,const tinyxml2::XMLElement* element,const std::string& name);
|
||
|
||
// STL containers
|
||
template <typename T1, typename T2>
|
||
IGL_INLINE void serialize(const std::pair<T1,T2>& obj,tinyxml2::XMLDocument* doc,tinyxml2::XMLElement* element,const std::string& name);
|
||
template <typename T1,typename T2>
|
||
IGL_INLINE void deserialize(std::pair<T1,T2>& obj,const tinyxml2::XMLDocument* doc,const tinyxml2::XMLElement* element,const std::string& name);
|
||
|
||
template <typename T1,typename T2>
|
||
IGL_INLINE void serialize(const std::vector<T1,T2>& obj,tinyxml2::XMLDocument* doc,tinyxml2::XMLElement* element,const std::string& name);
|
||
template <typename T1,typename T2>
|
||
IGL_INLINE void deserialize(std::vector<T1,T2>& obj,const tinyxml2::XMLDocument* doc,const tinyxml2::XMLElement* element,const std::string& name);
|
||
|
||
template <typename T>
|
||
IGL_INLINE void serialize(const std::set<T>& obj,tinyxml2::XMLDocument* doc,tinyxml2::XMLElement* element,const std::string& name);
|
||
template <typename T>
|
||
IGL_INLINE void deserialize(std::set<T>& obj,const tinyxml2::XMLDocument* doc,const tinyxml2::XMLElement* element,const std::string& name);
|
||
|
||
template <typename T1,typename T2>
|
||
IGL_INLINE void serialize(const std::map<T1,T2>& obj,tinyxml2::XMLDocument* doc,tinyxml2::XMLElement* element,const std::string& name);
|
||
template <typename T1,typename T2>
|
||
IGL_INLINE void deserialize(std::map<T1,T2>& obj,const tinyxml2::XMLDocument* doc,const tinyxml2::XMLElement* element,const std::string& name);
|
||
|
||
// Eigen types
|
||
|
||
// Serialize a Dense Eigen Matrix to xml (in the matrix= attribute,
|
||
// awkward...)
|
||
//
|
||
// Inputs:
|
||
// obj MR by MC matrix of T types
|
||
// name name of matrix
|
||
// to_string function converting T to string
|
||
// Outputs:
|
||
// doc pointer to xml document
|
||
// element pointer to xml element
|
||
//
|
||
template<typename T,int R,int C,int P,int MR,int MC>
|
||
IGL_INLINE void serialize(
|
||
const Eigen::Matrix<T,R,C,P,MR,MC>& obj,
|
||
const std::string& name,
|
||
const std::function<std::string(const T &) >& to_string,
|
||
tinyxml2::XMLDocument* doc,
|
||
tinyxml2::XMLElement* element);
|
||
// De-Serialize a Dense Eigen Matrix from xml (in the matrix= attribute,
|
||
// awkward...)
|
||
//
|
||
// Inputs:
|
||
// doc pointer to xml document
|
||
// element pointer to xml element
|
||
// name name of matrix
|
||
// from_string function string to T
|
||
// Outputs:
|
||
// obj MR by MC matrix of T types
|
||
template<typename T,int R,int C,int P,int MR,int MC>
|
||
IGL_INLINE void deserialize(
|
||
const tinyxml2::XMLDocument* doc,
|
||
const tinyxml2::XMLElement* element,
|
||
const std::string& name,
|
||
const std::function<void(const std::string &,T &)> & from_string,
|
||
Eigen::Matrix<T,R,C,P,MR,MC>& obj);
|
||
|
||
// Legacy APIs
|
||
template<typename T,int R,int C,int P,int MR,int MC>
|
||
IGL_INLINE void serialize(
|
||
const Eigen::Matrix<T,R,C,P,MR,MC>& obj,
|
||
tinyxml2::XMLDocument* doc,
|
||
tinyxml2::XMLElement* element,
|
||
const std::string& name);
|
||
template<typename T,int R,int C,int P,int MR,int MC>
|
||
IGL_INLINE void deserialize(
|
||
Eigen::Matrix<T,R,C,P,MR,MC>& obj,
|
||
const tinyxml2::XMLDocument* doc,
|
||
const tinyxml2::XMLElement* element,
|
||
const std::string& name);
|
||
|
||
template<typename T,int P,typename I>
|
||
IGL_INLINE void serialize(const Eigen::SparseMatrix<T,P,I>& obj,tinyxml2::XMLDocument* doc,tinyxml2::XMLElement* element,const std::string& name);
|
||
template<typename T,int P,typename I>
|
||
IGL_INLINE void deserialize(Eigen::SparseMatrix<T,P,I>& obj,const tinyxml2::XMLDocument* doc,const tinyxml2::XMLElement* element,const std::string& name);
|
||
|
||
// raw pointers
|
||
template <typename T>
|
||
IGL_INLINE typename std::enable_if<std::is_pointer<T>::value>::type serialize(const T& obj,tinyxml2::XMLDocument* doc,tinyxml2::XMLElement* element,const std::string& name);
|
||
template <typename T>
|
||
IGL_INLINE typename std::enable_if<std::is_pointer<T>::value>::type deserialize(T& obj,const tinyxml2::XMLDocument* doc,const tinyxml2::XMLElement* element,const std::string& name);
|
||
|
||
// helper functions
|
||
tinyxml2::XMLElement* getElement(tinyxml2::XMLDocument* doc,tinyxml2::XMLElement* element,const std::string& name);
|
||
IGL_INLINE void getAttribute(const char* src,bool& dest);
|
||
IGL_INLINE void getAttribute(const char* scr,char& dest);
|
||
IGL_INLINE void getAttribute(const char* src,std::string& dest);
|
||
IGL_INLINE void getAttribute(const char* src,float& dest);
|
||
IGL_INLINE void getAttribute(const char* src,double& dest);
|
||
template<typename T>
|
||
IGL_INLINE typename std::enable_if<std::is_integral<T>::value && std::is_unsigned<T>::value>::type getAttribute(const char* src,T& dest);
|
||
template<typename T>
|
||
IGL_INLINE typename std::enable_if<std::is_integral<T>::value && !std::is_unsigned<T>::value>::type getAttribute(const char* src,T& dest);
|
||
IGL_INLINE void replaceSubString(std::string& str,const std::string& search,const std::string& replace);
|
||
IGL_INLINE void encodeXMLElementName(std::string& name);
|
||
IGL_INLINE void decodeXMLElementName(std::string& name);
|
||
IGL_INLINE std::string base64_encode(unsigned char const* bytes_to_encode,unsigned int in_len);
|
||
IGL_INLINE std::string base64_decode(std::string const& encoded_string);
|
||
|
||
// compile time type serializable check
|
||
template <typename T>
|
||
struct is_stl_container { static const bool value = false; };
|
||
template <typename T1,typename T2>
|
||
struct is_stl_container<std::pair<T1,T2> > { static const bool value = true; };
|
||
template <typename T1,typename T2>
|
||
struct is_stl_container<std::vector<T1,T2> > { static const bool value = true; };
|
||
template <typename T>
|
||
struct is_stl_container<std::set<T> > { static const bool value = true; };
|
||
template <typename T1,typename T2>
|
||
struct is_stl_container<std::map<T1,T2> > { static const bool value = true; };
|
||
|
||
template <typename T>
|
||
struct is_eigen_type { static const bool value = false; };
|
||
template <typename T,int R,int C,int P,int MR,int MC>
|
||
struct is_eigen_type<Eigen::Matrix<T,R,C,P,MR,MC> > { static const bool value = true; };
|
||
template <typename T,int P,typename I>
|
||
struct is_eigen_type<Eigen::SparseMatrix<T,P,I> > { static const bool value = true; };
|
||
|
||
template <typename T>
|
||
struct is_serializable {
|
||
using T0 = typename std::remove_pointer<T>::type;
|
||
static const bool value = std::is_fundamental<T0>::value || std::is_same<std::string,T0>::value || std::is_base_of<XMLSerializableBase,T0>::value
|
||
|| is_stl_container<T0>::value || is_eigen_type<T0>::value;
|
||
};
|
||
}
|
||
}
|
||
}
|
||
|
||
#ifndef IGL_STATIC_LIBRARY
|
||
#include "serialize_xml.cpp"
|
||
#endif
|
||
|
||
#endif
|