mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-21 04:13:50 +00:00
Update eigen to v5.0.1 and libigl to v2.6.0. (#11311)
* 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>
This commit is contained in:
Donovan Baarda
@@ -14,169 +14,89 @@
|
||||
// * remove Preview3D from comments
|
||||
// * clean comments
|
||||
#include <string>
|
||||
#include <igl/igl_inline.h>
|
||||
#include "../../igl_inline.h"
|
||||
#include <vector>
|
||||
|
||||
namespace igl
|
||||
{
|
||||
namespace opengl
|
||||
{
|
||||
namespace glfw
|
||||
{
|
||||
|
||||
// Abstract class for plugins
|
||||
// All plugins MUST have this class as their parent and may implement any/all
|
||||
// the callbacks marked `virtual` here.
|
||||
//
|
||||
// /////For an example of a basic plugins see plugins/skeleton.h
|
||||
//
|
||||
// Return value of callbacks: returning true to any of the callbacks tells
|
||||
// Viewer that the event has been handled and that it should not be passed to
|
||||
// other plugins or to other internal functions of Viewer
|
||||
|
||||
// Forward declaration of the viewer
|
||||
class Viewer;
|
||||
|
||||
class ViewerPlugin
|
||||
{
|
||||
public:
|
||||
IGL_INLINE ViewerPlugin()
|
||||
{plugin_name = "dummy";}
|
||||
|
||||
virtual ~ViewerPlugin(){}
|
||||
|
||||
// This function is called when the viewer is initialized (no mesh will be loaded at this stage)
|
||||
IGL_INLINE virtual void init(Viewer *_viewer)
|
||||
namespace opengl
|
||||
{
|
||||
viewer = _viewer;
|
||||
namespace glfw
|
||||
{
|
||||
|
||||
|
||||
// Forward declaration of the viewer
|
||||
class Viewer;
|
||||
|
||||
/// Abstract class for plugins
|
||||
/// All plugins MUST have this class as their parent and may implement any/all
|
||||
/// the callbacks marked `virtual` here.
|
||||
///
|
||||
/// Return value of callbacks: returning true to any of the callbacks tells
|
||||
/// Viewer that the event has been handled and that it should not be passed to
|
||||
/// other plugins or to other internal functions of Viewer
|
||||
class ViewerPlugin
|
||||
{
|
||||
public:
|
||||
IGL_INLINE ViewerPlugin() {plugin_name = "dummy";}
|
||||
virtual ~ViewerPlugin(){}
|
||||
/// This function is called when the viewer is initialized (no mesh will be loaded at this stage)
|
||||
IGL_INLINE virtual void init(Viewer *_viewer) { viewer = _viewer; }
|
||||
/// This function is called before shutdown
|
||||
IGL_INLINE virtual void shutdown() { }
|
||||
/// This function is called before a mesh is loaded
|
||||
IGL_INLINE virtual bool load(std::string /*filename*/) { return false; }
|
||||
/// This function is called before a mesh is saved
|
||||
IGL_INLINE virtual bool save(std::string /*filename*/) { return false; }
|
||||
/// This function is called when the scene is serialized
|
||||
IGL_INLINE virtual bool serialize(std::vector<char>& /*buffer*/) const
|
||||
{ return false; }
|
||||
/// This function is called when the scene is deserialized
|
||||
IGL_INLINE virtual bool deserialize(const std::vector<char>& /*buffer*/)
|
||||
{ return false; }
|
||||
/// Runs immediately after a new mesh has been loaded.
|
||||
IGL_INLINE virtual bool post_load() { return false; }
|
||||
/// This function is called before the draw procedure of Viewer
|
||||
IGL_INLINE virtual bool pre_draw() { return false; }
|
||||
/// This function is called after the draw procedure of Viewer
|
||||
IGL_INLINE virtual bool post_draw() { return false; }
|
||||
/// This function is called after the window has been resized
|
||||
IGL_INLINE virtual void post_resize(int /*w*/, int /*h*/) { }
|
||||
IGL_INLINE virtual bool mouse_down(int /*button*/, int /*modifier*/)
|
||||
{ return false; }
|
||||
IGL_INLINE virtual bool mouse_up(int /*button*/, int /*modifier*/)
|
||||
{ return false; }
|
||||
IGL_INLINE virtual bool mouse_move(int /*mouse_x*/, int /*mouse_y*/)
|
||||
{ return false; }
|
||||
IGL_INLINE virtual bool mouse_scroll(float /*delta_y*/)
|
||||
{ return false; }
|
||||
IGL_INLINE virtual bool key_pressed(unsigned int /*key*/, int /*modifiers*/)
|
||||
{ return false; }
|
||||
IGL_INLINE virtual bool key_down(int /*key*/, int /*modifiers*/)
|
||||
{ return false; }
|
||||
IGL_INLINE virtual bool key_up(int /*key*/, int /*modifiers*/)
|
||||
{ return false; }
|
||||
std::string plugin_name;
|
||||
protected:
|
||||
// Pointer to the main Viewer class
|
||||
Viewer *viewer;
|
||||
};
|
||||
|
||||
namespace serialization
|
||||
{
|
||||
inline void serialize(const ViewerPlugin& obj,std::vector<char>& buffer)
|
||||
{
|
||||
obj.serialize(buffer);
|
||||
}
|
||||
|
||||
inline void deserialize(ViewerPlugin& obj,const std::vector<char>& buffer)
|
||||
{
|
||||
obj.deserialize(buffer);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// This function is called before shutdown
|
||||
IGL_INLINE virtual void shutdown()
|
||||
{
|
||||
}
|
||||
|
||||
// This function is called before a mesh is loaded
|
||||
IGL_INLINE virtual bool load(std::string filename)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// This function is called before a mesh is saved
|
||||
IGL_INLINE virtual bool save(std::string filename)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// This function is called when the scene is serialized
|
||||
IGL_INLINE virtual bool serialize(std::vector<char>& buffer) const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// This function is called when the scene is deserialized
|
||||
IGL_INLINE virtual bool deserialize(const std::vector<char>& buffer)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Runs immediately after a new mesh has been loaded.
|
||||
IGL_INLINE virtual bool post_load()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// This function is called before the draw procedure of Preview3D
|
||||
IGL_INLINE virtual bool pre_draw()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// This function is called after the draw procedure of Preview3D
|
||||
IGL_INLINE virtual bool post_draw()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// This function is called after the window has been resized
|
||||
IGL_INLINE virtual void post_resize(int w, int h)
|
||||
{
|
||||
}
|
||||
|
||||
// This function is called when the mouse button is pressed
|
||||
// - button can be GLUT_LEFT_BUTTON, GLUT_MIDDLE_BUTTON or GLUT_RIGHT_BUTTON
|
||||
// - modifiers is a bitfield that might one or more of the following bits Preview3D::NO_KEY, Preview3D::SHIFT, Preview3D::CTRL, Preview3D::ALT;
|
||||
IGL_INLINE virtual bool mouse_down(int button, int modifier)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// This function is called when the mouse button is released
|
||||
// - button can be GLUT_LEFT_BUTTON, GLUT_MIDDLE_BUTTON or GLUT_RIGHT_BUTTON
|
||||
// - modifiers is a bitfield that might one or more of the following bits Preview3D::NO_KEY, Preview3D::SHIFT, Preview3D::CTRL, Preview3D::ALT;
|
||||
IGL_INLINE virtual bool mouse_up(int button, int modifier)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// This function is called every time the mouse is moved
|
||||
// - mouse_x and mouse_y are the new coordinates of the mouse pointer in screen coordinates
|
||||
IGL_INLINE virtual bool mouse_move(int mouse_x, int mouse_y)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// This function is called every time the scroll wheel is moved
|
||||
// Note: this callback is not working with every glut implementation
|
||||
IGL_INLINE virtual bool mouse_scroll(float delta_y)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// This function is called when a keyboard key is pressed. Unlike key_down
|
||||
// this will reveal the actual character being sent (not just the physical
|
||||
// key)
|
||||
// - modifiers is a bitfield that might one or more of the following bits Preview3D::NO_KEY, Preview3D::SHIFT, Preview3D::CTRL, Preview3D::ALT;
|
||||
IGL_INLINE virtual bool key_pressed(unsigned int key, int modifiers)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// This function is called when a keyboard key is down
|
||||
// - modifiers is a bitfield that might one or more of the following bits Preview3D::NO_KEY, Preview3D::SHIFT, Preview3D::CTRL, Preview3D::ALT;
|
||||
IGL_INLINE virtual bool key_down(int key, int modifiers)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// This function is called when a keyboard key is release
|
||||
// - modifiers is a bitfield that might one or more of the following bits Preview3D::NO_KEY, Preview3D::SHIFT, Preview3D::CTRL, Preview3D::ALT;
|
||||
IGL_INLINE virtual bool key_up(int key, int modifiers)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
std::string plugin_name;
|
||||
protected:
|
||||
// Pointer to the main Viewer class
|
||||
Viewer *viewer;
|
||||
};
|
||||
|
||||
namespace serialization
|
||||
{
|
||||
inline void serialize(const ViewerPlugin& obj,std::vector<char>& buffer)
|
||||
{
|
||||
obj.serialize(buffer);
|
||||
}
|
||||
|
||||
inline void deserialize(ViewerPlugin& obj,const std::vector<char>& buffer)
|
||||
{
|
||||
obj.deserialize(buffer);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user