3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-17 23:22:07 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Removed 2D gizmos

Browse source
This commit is contained in:
Enrico Turri 2018-08-28 12:50:26 +02:00
parent 4e37f9d232
commit 255e837d33
3 changed files with 3 additions and 237 deletions
Download patch file Download diff file Expand all files Collapse all files

35
xs/src/slic3r/GUI/GLGizmo.hpp
View file

@ -7,8 +7,6 @@
#include <vector>
#define ENABLE_GIZMOS_3D 1
namespace Slic3r {
class BoundingBoxf3;
@ -37,21 +35,11 @@ protected:
Grabber();
void render(bool hover) const;
#if ENABLE_GIZMOS_3D
void render_for_picking() const { render(color, false); }
#else
void render_for_picking() const { render(color); }
#endif // ENABLE_GIZMOS_3D
private:
#if ENABLE_GIZMOS_3D
void render(const float* render_color, bool use_lighting) const;
#else
void render(const float* render_color) const;
#endif // ENABLE_GIZMOS_3D
#if ENABLE_GIZMOS_3D
void render_face(float half_size) const;
#endif // ENABLE_GIZMOS_3D
};
public:
@ -234,29 +222,6 @@ protected:
}
};
class GLGizmoScale : public GLGizmoBase
{
static const float Offset;
float m_scale;
float m_starting_scale;
Vec2d m_starting_drag_position;
public:
explicit GLGizmoScale(GLCanvas3D& parent);
float get_scale() const { return m_scale; }
void set_scale(float scale) { m_starting_scale = scale; }
protected:
virtual bool on_init();
virtual void on_start_dragging();
virtual void on_update(const Linef3& mouse_ray);
virtual void on_render(const BoundingBoxf3& box) const;
virtual void on_render_for_picking(const BoundingBoxf3& box) const;
};
class GLGizmoScale3D : public GLGizmoBase
{
static const float Offset;