mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-19 11:23:42 +00:00
* 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>
266 lines
9.6 KiB
C++
266 lines
9.6 KiB
C++
// This file is part of libigl, a simple c++ geometry processing library.
|
||
//
|
||
// Copyright (C) 2014 Daniele Panozzo <daniele.panozzo@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_OPENGL_GLFW_VIEWER_H
|
||
#define IGL_OPENGL_GLFW_VIEWER_H
|
||
|
||
#ifndef IGL_OPENGL_4
|
||
#define IGL_OPENGL_4
|
||
#endif
|
||
|
||
#include "../../igl_inline.h"
|
||
#include "../MeshGL.h"
|
||
#include "../ViewerCore.h"
|
||
#include "../ViewerData.h"
|
||
#include "ViewerPlugin.h"
|
||
|
||
#include <Eigen/Core>
|
||
#include <Eigen/Geometry>
|
||
|
||
#include <vector>
|
||
#include <string>
|
||
#include <cstdint>
|
||
|
||
#define IGL_MOD_SHIFT 0x0001
|
||
#define IGL_MOD_CONTROL 0x0002
|
||
#define IGL_MOD_ALT 0x0004
|
||
#define IGL_MOD_SUPER 0x0008
|
||
|
||
struct GLFWwindow;
|
||
|
||
namespace igl
|
||
{
|
||
namespace opengl
|
||
{
|
||
namespace glfw
|
||
{
|
||
// GLFW-based mesh viewer
|
||
class Viewer
|
||
{
|
||
public:
|
||
// UI Enumerations
|
||
enum class MouseButton {Left, Middle, Right};
|
||
enum class MouseMode { None, Rotation, Zoom, Pan, Translation} mouse_mode;
|
||
IGL_INLINE int launch (bool fullscreen = false, const std::string &name = "libigl viewer", int width = 0, int height = 0);
|
||
IGL_INLINE int launch_init(bool fullscreen = false, const std::string &name = "libigl viewer", int width = 0, int height = 0);
|
||
IGL_INLINE bool launch_rendering(bool loop = true);
|
||
IGL_INLINE void launch_shut();
|
||
IGL_INLINE void init();
|
||
IGL_INLINE void init_plugins();
|
||
IGL_INLINE void shutdown_plugins();
|
||
Viewer();
|
||
~Viewer();
|
||
// Mesh IO
|
||
IGL_INLINE bool load_mesh_from_file(const std::string & mesh_file_name);
|
||
IGL_INLINE bool save_mesh_to_file(const std::string & mesh_file_name);
|
||
// Callbacks
|
||
IGL_INLINE bool key_pressed(unsigned int unicode_key,int modifier);
|
||
IGL_INLINE bool key_down(int key,int modifier);
|
||
IGL_INLINE bool key_up(int key,int modifier);
|
||
IGL_INLINE bool mouse_down(MouseButton button,int modifier);
|
||
IGL_INLINE bool mouse_up(MouseButton button,int modifier);
|
||
IGL_INLINE bool mouse_move(int mouse_x,int mouse_y);
|
||
IGL_INLINE bool mouse_scroll(float delta_y);
|
||
// Scene IO
|
||
IGL_INLINE bool load_scene();
|
||
IGL_INLINE bool load_scene(std::string fname);
|
||
IGL_INLINE bool save_scene();
|
||
IGL_INLINE bool save_scene(std::string fname);
|
||
// Draw everything
|
||
IGL_INLINE void draw();
|
||
// Render given ViewerCore to a buffer. The width and height are determined
|
||
// by non-zeros dimensions of R or – if both are zero — are set to this
|
||
// core's viewport sizes. Other buffers are resized to fit if needed.
|
||
//
|
||
// Template:
|
||
// T image storage type, e.g., unsigned char (values ∈ [0,255]), double
|
||
// (values ∈ [0.0,1.0]).
|
||
// Inputs:
|
||
// data which ViewerData to draw
|
||
// update_matrices whether to update view, proj, and norm matrices in
|
||
// shaders
|
||
// Outputs:
|
||
// R width by height red pixel color values
|
||
// G width by height green pixel color values
|
||
// B width by height blue pixel color values
|
||
// A width by height alpha pixel color values
|
||
// D width by height depth pixel values. Depth values are _not_
|
||
// anti-aliased like RGBA.
|
||
//
|
||
template <typename T>
|
||
IGL_INLINE void draw_buffer(
|
||
// can't be const because of writing in and out of `core.viewport`
|
||
/*const*/ igl::opengl::ViewerCore & core,
|
||
Eigen::Matrix<T,Eigen::Dynamic,Eigen::Dynamic> & R,
|
||
Eigen::Matrix<T,Eigen::Dynamic,Eigen::Dynamic> & G,
|
||
Eigen::Matrix<T,Eigen::Dynamic,Eigen::Dynamic> & B,
|
||
Eigen::Matrix<T,Eigen::Dynamic,Eigen::Dynamic> & A,
|
||
Eigen::Matrix<T,Eigen::Dynamic,Eigen::Dynamic> & D);
|
||
// OpenGL context resize
|
||
IGL_INLINE void resize(int w,int h); // explicitly set window size
|
||
IGL_INLINE void post_resize(int w,int h); // external resize due to user interaction
|
||
// Helper functions
|
||
IGL_INLINE void snap_to_canonical_quaternion();
|
||
IGL_INLINE void open_dialog_load_mesh();
|
||
IGL_INLINE void open_dialog_save_mesh();
|
||
|
||
////////////////////////
|
||
// Multi-mesh methods //
|
||
////////////////////////
|
||
|
||
// Return the current mesh, or the mesh corresponding to a given unique identifier
|
||
//
|
||
// Inputs:
|
||
// mesh_id unique identifier associated to the desired mesh (current mesh if -1)
|
||
IGL_INLINE ViewerData& data(int mesh_id = -1);
|
||
IGL_INLINE const ViewerData& data(int mesh_id = -1) const;
|
||
|
||
// Append a new "slot" for a mesh (i.e., create empty entries at the end of
|
||
// the data_list and opengl_state_list.
|
||
//
|
||
// Inputs:
|
||
// visible If true, the new mesh is set to be visible on all existing viewports
|
||
// Returns the id of the last appended mesh
|
||
//
|
||
// Side Effects:
|
||
// selected_data_index is set this newly created, last entry (i.e.,
|
||
// #meshes-1)
|
||
IGL_INLINE int append_mesh(bool visible = true);
|
||
|
||
// Erase a mesh (i.e., its corresponding data and state entires in data_list
|
||
// and opengl_state_list)
|
||
//
|
||
// Inputs:
|
||
// index index of mesh to erase
|
||
// Returns whether erasure was successful <=> cannot erase last mesh
|
||
//
|
||
// Side Effects:
|
||
// If selected_data_index is greater than or equal to index then it is
|
||
// decremented
|
||
// Example:
|
||
// // Erase all mesh slots except first and clear remaining mesh
|
||
// viewer.selected_data_index = viewer.data_list.size()-1;
|
||
// while(viewer.erase_mesh(viewer.selected_data_index)){};
|
||
// viewer.data().clear();
|
||
//
|
||
IGL_INLINE bool erase_mesh(const size_t index);
|
||
|
||
// Retrieve mesh index from its unique identifier
|
||
// Returns 0 if not found
|
||
IGL_INLINE size_t mesh_index(const int id) const;
|
||
|
||
////////////////////////////
|
||
// Multi-viewport methods //
|
||
////////////////////////////
|
||
|
||
// Return the current viewport, or the viewport corresponding to a given unique identifier
|
||
//
|
||
// Inputs:
|
||
// core_id unique identifier corresponding to the desired viewport (current viewport if 0)
|
||
IGL_INLINE ViewerCore& core(unsigned core_id = 0);
|
||
IGL_INLINE const ViewerCore& core(unsigned core_id = 0) const;
|
||
|
||
// Append a new "slot" for a viewport (i.e., copy properties of the current viewport, only
|
||
// changing the viewport size/position)
|
||
//
|
||
// Inputs:
|
||
// viewport Vector specifying the viewport origin and size in screen coordinates.
|
||
// append_empty If true, existing meshes are hidden on the new viewport.
|
||
//
|
||
// Returns the unique id of the newly inserted viewport. There can be a maximum of 31
|
||
// viewports created in the same viewport. Erasing a viewport does not change the id of
|
||
// other existing viewports
|
||
IGL_INLINE int append_core(Eigen::Vector4f viewport, bool append_empty = false);
|
||
|
||
// Erase a viewport
|
||
//
|
||
// Inputs:
|
||
// index index of the viewport to erase
|
||
IGL_INLINE bool erase_core(const size_t index);
|
||
|
||
// Retrieve viewport index from its unique identifier
|
||
// Returns 0 if not found
|
||
IGL_INLINE size_t core_index(const int id) const;
|
||
|
||
// Change selected_core_index to the viewport containing the mouse
|
||
// (current_mouse_x, current_mouse_y)
|
||
IGL_INLINE void select_hovered_core();
|
||
|
||
public:
|
||
//////////////////////
|
||
// Member variables //
|
||
//////////////////////
|
||
|
||
// Alec: I call this data_list instead of just data to avoid confusion with
|
||
// old "data" variable.
|
||
// Stores all the data that should be visualized
|
||
std::vector<ViewerData> data_list;
|
||
|
||
size_t selected_data_index;
|
||
int next_data_id;
|
||
GLFWwindow* window;
|
||
|
||
// Stores all the viewing options
|
||
std::vector<ViewerCore> core_list;
|
||
size_t selected_core_index;
|
||
int next_core_id;
|
||
|
||
// List of registered plugins
|
||
std::vector<ViewerPlugin*> plugins;
|
||
// Temporary data stored when the mouse button is pressed
|
||
Eigen::Quaternionf down_rotation;
|
||
int current_mouse_x;
|
||
int current_mouse_y;
|
||
int down_mouse_x;
|
||
int down_mouse_y;
|
||
float down_mouse_z;
|
||
Eigen::Vector3f down_translation;
|
||
bool down;
|
||
bool hack_never_moved;
|
||
// Keep track of the global position of the scrollwheel
|
||
float scroll_position;
|
||
// C++-style functions
|
||
//
|
||
// Returns **true** if action should be cancelled.
|
||
std::function<bool(Viewer& viewer)> callback_init;
|
||
std::function<bool(Viewer& viewer)> callback_pre_draw;
|
||
std::function<bool(Viewer& viewer)> callback_post_draw;
|
||
std::function<bool(Viewer& viewer, int button, int modifier)> callback_mouse_down;
|
||
std::function<bool(Viewer& viewer, int button, int modifier)> callback_mouse_up;
|
||
std::function<bool(Viewer& viewer, int mouse_x, int mouse_y)> callback_mouse_move;
|
||
std::function<bool(Viewer& viewer, float delta_y)> callback_mouse_scroll;
|
||
std::function<bool(Viewer& viewer, unsigned int key, int modifiers)> callback_key_pressed;
|
||
std::function<bool(Viewer& viewer, int w, int h)> callback_post_resize;
|
||
// THESE SHOULD BE DEPRECATED:
|
||
std::function<bool(Viewer& viewer, unsigned int key, int modifiers)> callback_key_down;
|
||
std::function<bool(Viewer& viewer, unsigned int key, int modifiers)> callback_key_up;
|
||
// Pointers to per-callback data
|
||
void* callback_init_data;
|
||
void* callback_pre_draw_data;
|
||
void* callback_post_draw_data;
|
||
void* callback_mouse_down_data;
|
||
void* callback_mouse_up_data;
|
||
void* callback_mouse_move_data;
|
||
void* callback_mouse_scroll_data;
|
||
void* callback_key_pressed_data;
|
||
void* callback_key_down_data;
|
||
void* callback_key_up_data;
|
||
|
||
public:
|
||
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
|
||
};
|
||
|
||
} // end namespace
|
||
} // end namespace
|
||
} // end namespace
|
||
|
||
#ifndef IGL_STATIC_LIBRARY
|
||
# include "Viewer.cpp"
|
||
#endif
|
||
|
||
#endif
|