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

Tech ENABLE_WORLD_COORDINATE_SHOW_AXES merged into tech ENABLE_WORLD_COORDINATE

Browse source 
Fixed conflicts during rebase with master
This commit is contained in:
enricoturri1966 2022-05-13 14:27:18 +02:00
parent 7c86cf84a3
commit ebb9a4aadb
9 changed files with 74 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/slic3r/GUI/3DBed.hpp
View file

@ -3,11 +3,11 @@
#include "GLTexture.hpp"
#include "3DScene.hpp"
#if ENABLE_WORLD_COORDINATE_SHOW_AXES
#if ENABLE_WORLD_COORDINATE
#include "CoordAxes.hpp"
#else
#include "GLModel.hpp"
#endif // ENABLE_WORLD_COORDINATE_SHOW_AXES
#endif // ENABLE_WORLD_COORDINATE
#include "libslic3r/BuildVolume.hpp"
#if ENABLE_LEGACY_OPENGL_REMOVAL
@ -48,7 +48,7 @@ public:
class Bed3D
{
#if !ENABLE_WORLD_COORDINATE_SHOW_AXES
#if !ENABLE_WORLD_COORDINATE
class Axes
{
public:
@ -72,7 +72,7 @@ class Bed3D
float get_total_length() const { return m_stem_length + DefaultTipLength; }
void render();
};
#endif // !ENABLE_WORLD_COORDINATE_SHOW_AXES
#endif // !ENABLE_WORLD_COORDINATE
public:
enum class Type : unsigned char
@ -113,11 +113,11 @@ private:
#if !ENABLE_LEGACY_OPENGL_REMOVAL
unsigned int m_vbo_id{ 0 };
#endif // !ENABLE_LEGACY_OPENGL_REMOVAL
#if ENABLE_WORLD_COORDINATE_SHOW_AXES
#if ENABLE_WORLD_COORDINATE
CoordAxes m_axes;
#else
Axes m_axes;
#endif // ENABLE_WORLD_COORDINATE_SHOW_AXES
#endif // ENABLE_WORLD_COORDINATE
float m_scale_factor{ 1.0f };