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

Tech ENABLE_RAYCAST_PICKING - Fixed other warnings on Mac

Browse source
This commit is contained in:
enricoturri1966 2022-06-15 15:32:34 +02:00
parent 692aabd8e1
commit 3a760d61e4
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/slic3r/GUI/3DScene.cpp
View file

@ -1055,12 +1055,12 @@ int GLVolumeCollection::load_wipe_tower_preview(
};
TriangleMesh tooth_mesh;
indexed_triangle_set its = generate_lateral(0.0f, 38.453f);
tooth_mesh.merge(TriangleMesh(std::move(its)));
its = generate_central();
tooth_mesh.merge(TriangleMesh(std::move(its)));
its = generate_lateral(61.547f, 100.0f);
tooth_mesh.merge(TriangleMesh(std::move(its)));
indexed_triangle_set data = generate_lateral(0.0f, 38.453f);
tooth_mesh.merge(TriangleMesh(std::move(data)));
data = generate_central();
tooth_mesh.merge(TriangleMesh(std::move(data)));
data = generate_lateral(61.547f, 100.0f);
tooth_mesh.merge(TriangleMesh(std::move(data)));
#else
float out_points_idx[][3] = { { 0, -depth, 0 }, { 0, 0, 0 }, { 38.453f, 0, 0 }, { 61.547f, 0, 0 }, { 100.0f, 0, 0 }, { 100.0f, -depth, 0 }, { 55.7735f, -10.0f, 0 }, { 44.2265f, 10.0f, 0 },
{ 38.453f, 0, 1 }, { 0, 0, 1 }, { 0, -depth, 1 }, { 100.0f, -depth, 1 }, { 100.0f, 0, 1 }, { 61.547f, 0, 1 }, { 55.7735f, -10.0f, 1 }, { 44.2265f, 10.0f, 1 } };
@ -1161,8 +1161,10 @@ int GLVolumeCollection::load_wipe_tower_preview(
return its;
};
mesh.merge(TriangleMesh(std::move(generate_negx_cap())));
mesh.merge(TriangleMesh(std::move(generate_posx_cap())));
data = generate_negx_cap();
mesh.merge(TriangleMesh(std::move(data)));
data = generate_posx_cap();
mesh.merge(TriangleMesh(std::move(data)));
mesh.scale(Vec3f(width / (n * 100.0f), 1.0f, height)); // Scaling to proper width
#else
mesh.scale(Vec3f(width / (n * min_width), 1.f, height)); // Scaling to proper width