juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENABLE_GCODE_VIEWER -> Completed implementation of new GLModel class

Browse Source
This commit is contained in:
enricoturri1966
2020-05-27 08:06:02 +02:00
parent 8f91b4f4f4
commit aa04f0e555
8 changed files with 105 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/3DScene.cpp
View File

@@ -1822,6 +1822,7 @@ void _3DScene::point3_to_verts(const Vec3crd& point, double width, double height
thick_point_to_verts(point, width, height, volume);
}
#if !ENABLE_GCODE_VIEWER
GLModel::GLModel()
: m_filename("")
{
@@ -1904,7 +1905,6 @@ void GLModel::render() const
glsafe(::glDisable(GL_BLEND));
}
#if !ENABLE_GCODE_VIEWER
bool GLArrow::on_init()
{
Pointf3s vertices;
@@ -2076,7 +2076,6 @@ bool GLCurvedArrow::on_init()
m_volume.indexed_vertex_array.finalize_geometry(true);
return true;
}
#endif // !ENABLE_GCODE_VIEWER
bool GLBed::on_init_from_file(const std::string& filename)
{
@@ -2108,5 +2107,6 @@ bool GLBed::on_init_from_file(const std::string& filename)
return true;
}
#endif // !ENABLE_GCODE_VIEWER
} // namespace Slic3r