GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-16 10:25:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cppgui

Browse Source
This commit is contained in:
Joseph Lenox 2018-04-25 18:51:22 -05:00
commit 998999e747
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xs/src/libslic3r/Print.hpp
View File

@ -75,20 +75,20 @@ class PrintObject
friend class Print; friend class Print;
public: public:
// map of (vectors of volume ids), indexed by region_id /// map of (vectors of volume ids), indexed by region_id
/* (we use map instead of vector so that we don't have to worry about /// (we use map instead of vector so that we don't have to worry about
resizing it and the [] operator adds new items automagically) */ /// resizing it and the [] operator adds new items automagically)
std::map< size_t,std::vector<int> > region_volumes; std::map< size_t,std::vector<int> > region_volumes;
PrintObjectConfig config; PrintObjectConfig config; //< Configuration
t_layer_height_ranges layer_height_ranges; t_layer_height_ranges layer_height_ranges;
LayerHeightSpline layer_height_spline; LayerHeightSpline layer_height_spline;
// this is set to true when LayerRegion->slices is split in top/internal/bottom /// this is set to true when LayerRegion->slices is split in top/internal/bottom
// so that next call to make_perimeters() performs a union() before computing loops /// so that next call to make_perimeters() performs a union() before computing loops
bool typed_slices; bool typed_slices;
Point3 size; // XYZ in scaled coordinates Point3 size; //< XYZ in scaled coordinates
// scaled coordinates to add to copies (to compensate for the alignment // scaled coordinates to add to copies (to compensate for the alignment
// operated when creating the object but still preserving a coherent API // operated when creating the object but still preserving a coherent API

4
xs/src/libslic3r/PrintObject.cpp
View File

@ -8,8 +8,8 @@
namespace Slic3r { namespace Slic3r {
PrintObject::PrintObject(Print* print, ModelObject* model_object, const BoundingBoxf3 &modobj_bbox) PrintObject::PrintObject(Print* print, ModelObject* model_object, const BoundingBoxf3 &modobj_bbox)
: typed_slices(false), : layer_height_spline(model_object->layer_height_spline),
layer_height_spline(model_object->layer_height_spline), typed_slices(false),
_print(print), _print(print),
_model_object(model_object) _model_object(model_object)
{ {