diff --git a/resources/images/bbl_bed_ep_bottom.svg b/resources/images/bbl_bed_ep_bottom.svg index 8c3373139..2ef998bba 100644 --- a/resources/images/bbl_bed_ep_bottom.svg +++ b/resources/images/bbl_bed_ep_bottom.svg @@ -1,71 +1,71 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/bbl_bed_ep_left.svg b/resources/images/bbl_bed_ep_left.svg index 06d0b1091..5ae83ea4a 100644 --- a/resources/images/bbl_bed_ep_left.svg +++ b/resources/images/bbl_bed_ep_left.svg @@ -1,26 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/bbl_bed_pc_bottom.svg b/resources/images/bbl_bed_pc_bottom.svg index cccc20063..357994a0f 100644 --- a/resources/images/bbl_bed_pc_bottom.svg +++ b/resources/images/bbl_bed_pc_bottom.svg @@ -1,67 +1,67 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/bbl_bed_pc_left.svg b/resources/images/bbl_bed_pc_left.svg index d8acdd5b1..5d3d78775 100644 --- a/resources/images/bbl_bed_pc_left.svg +++ b/resources/images/bbl_bed_pc_left.svg @@ -1,18 +1,16 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/resources/images/bbl_bed_pei_bottom.svg b/resources/images/bbl_bed_pei_bottom.svg index 8143d03a2..57303a7f5 100644 --- a/resources/images/bbl_bed_pei_bottom.svg +++ b/resources/images/bbl_bed_pei_bottom.svg @@ -1,68 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/bbl_bed_pei_left.svg b/resources/images/bbl_bed_pei_left.svg index 11ca8892b..91fe15040 100644 --- a/resources/images/bbl_bed_pei_left.svg +++ b/resources/images/bbl_bed_pei_left.svg @@ -1,28 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/bbl_bed_pte_bottom.svg b/resources/images/bbl_bed_pte_bottom.svg index cf00a644d..529471e53 100644 --- a/resources/images/bbl_bed_pte_bottom.svg +++ b/resources/images/bbl_bed_pte_bottom.svg @@ -1,33 +1,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/bbl_bed_pte_left.svg b/resources/images/bbl_bed_pte_left.svg index ce812d76b..c2ddff20d 100644 --- a/resources/images/bbl_bed_pte_left.svg +++ b/resources/images/bbl_bed_pte_left.svg @@ -1,34 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp index ba3969519..8bd711d87 100644 --- a/src/slic3r/GUI/PartPlate.cpp +++ b/src/slic3r/GUI/PartPlate.cpp @@ -5144,15 +5144,15 @@ void PartPlateList::BedTextureInfo::TexturePart::update_buffer() void PartPlateList::init_bed_type_info() { - BedTextureInfo::TexturePart pc_part1( 5, 130, 10, 110, "bbl_bed_pc_left.svg"); - BedTextureInfo::TexturePart pc_part2( 74, -12, 150, 12, "bbl_bed_pc_bottom.svg"); - BedTextureInfo::TexturePart ep_part1( 4, 87, 12, 153, "bbl_bed_ep_left.svg"); - BedTextureInfo::TexturePart ep_part2( 72, -11, 150, 12, "bbl_bed_ep_bottom.svg"); - BedTextureInfo::TexturePart pei_part1( 6, 50, 12, 190, "bbl_bed_pei_left.svg"); - BedTextureInfo::TexturePart pei_part2(72, -11, 150, 12, "bbl_bed_pei_bottom.svg"); - BedTextureInfo::TexturePart pte_part1( 6, 40, 12, 200, "bbl_bed_pte_left.svg"); - BedTextureInfo::TexturePart pte_part2(72, -11, 150, 12, "bbl_bed_pte_bottom.svg"); - for (size_t i = 0; i < btCount; i++) { + BedTextureInfo::TexturePart pc_part1(10, 130, 10, 110, "bbl_bed_pc_left.svg"); + BedTextureInfo::TexturePart pc_part2(74, -10, 148, 12, "bbl_bed_pc_bottom.svg"); + BedTextureInfo::TexturePart ep_part1(7.5, 90, 12.5, 150, "bbl_bed_ep_left.svg"); + BedTextureInfo::TexturePart ep_part2(74, -10, 148, 12, "bbl_bed_ep_bottom.svg"); + BedTextureInfo::TexturePart pei_part1(7.5, 50, 12.5, 190, "bbl_bed_pei_left.svg"); + BedTextureInfo::TexturePart pei_part2(74, -10, 148, 12, "bbl_bed_pei_bottom.svg"); + BedTextureInfo::TexturePart pte_part1(10, 80, 10, 160, "bbl_bed_pte_left.svg"); + BedTextureInfo::TexturePart pte_part2(74, -10, 148, 12, "bbl_bed_pte_bottom.svg"); + for (size_t i = 0; i < btCount; i++) { bed_texture_info[i].parts.clear(); } bed_texture_info[btPC].parts.push_back(pc_part1); @@ -5172,7 +5172,7 @@ void PartPlateList::init_bed_type_info() float x_rate = bed_width / base_width; float y_rate = bed_height / base_height; for (int i = 0; i < btCount; i++) { - for (int j = 0; j < bed_texture_info[i].parts.size(); j++) { + for (int j = 0; j < bed_texture_info[i].parts.size(); j++) { bed_texture_info[i].parts[j].x *= x_rate; bed_texture_info[i].parts[j].y *= y_rate; bed_texture_info[i].parts[j].w *= x_rate; diff --git a/src/slic3r/GUI/PartPlate.hpp b/src/slic3r/GUI/PartPlate.hpp index 523ae974c..55dc13ce5 100644 --- a/src/slic3r/GUI/PartPlate.hpp +++ b/src/slic3r/GUI/PartPlate.hpp @@ -562,16 +562,16 @@ public: class TexturePart { public: // position - int x; - int y; - int w; - int h; + float x; + float y; + float w; + float h; unsigned int vbo_id; std::string filename; GLTexture* texture { nullptr }; Vec2d offset; GeometryBuffer* buffer { nullptr }; - TexturePart(int xx, int yy, int ww, int hh, std::string file) { + TexturePart(float xx, float yy, float ww, float hh, std::string file){ x = xx; y = yy; w = ww; h = hh; filename = file;