3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed conflicts after merge with master

Browse source
This commit is contained in:
enricoturri1966 2022-07-21 08:14:44 +02:00
commit 520261925f
260 changed files with 69374 additions and 49837 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -132,6 +132,15 @@ private:
wxTimer* m_timer;
};
class KeyAutoRepeatFilter
{
size_t m_count{ 0 };
public:
void increase_count() { ++m_count; }
void reset_count() { m_count = 0; }
bool is_first() const { return m_count == 0; }
};
wxDECLARE_EVENT(EVT_GLCANVAS_OBJECT_SELECT, SimpleEvent);
@ -469,7 +478,8 @@ public:
struct ArrangeSettings
{
float distance = 6.;
float distance = 6.f;
float distance_from_bed = 0.f;
// float distance_seq_print = 6.; // Used when sequential print is ON
// float distance_sla = 6.;
float accuracy = 0.65f; // Unused currently
@ -537,6 +547,9 @@ private:
bool m_show_picking_texture;
#endif // ENABLE_RENDER_PICKING_PASS
KeyAutoRepeatFilter m_shift_kar_filter;
KeyAutoRepeatFilter m_ctrl_kar_filter;
RenderStats m_render_stats;
int m_imgui_undo_redo_hovered_pos{ -1 };
@ -847,7 +860,6 @@ public:
// Returns the view ray line, in world coordinate, at the given mouse position.
Linef3 mouse_ray(const Point& mouse_pos);
void set_mouse_as_dragging() { m_mouse.dragging = true; }
bool is_mouse_dragging() const { return m_mouse.dragging; }
double get_size_proportional_to_max_bed_size(double factor) const;