GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 14:06:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try to Fix linux build

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-07-12 14:10:00 +02:00
parent eb0d840b3f
commit 6dcabda7db
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
View File

@ -202,6 +202,10 @@ bool GLGizmoSVG::create_volume(std::string_view svg_file, ModelVolumeType volume
CreateVolumeParams input = create_input(m_parent, m_raycast_manager, volume_type); CreateVolumeParams input = create_input(m_parent, m_raycast_manager, volume_type);
DataBasePtr base = create_emboss_data_base(m_job_cancel, svg_file); DataBasePtr base = create_emboss_data_base(m_job_cancel, svg_file);
base->is_outside = volume_type == ModelVolumeType::MODEL_PART; base->is_outside = volume_type == ModelVolumeType::MODEL_PART;
// is not a number || is infinity
if (mouse_pos.x() != mouse_pos.x() ||
mouse_pos.y() != mouse_pos.y())
return start_create_volume_without_position(input, std::move(base));
return start_create_volume(input, std::move(base), mouse_pos); return start_create_volume(input, std::move(base), mouse_pos);
} }

2
src/slic3r/GUI/Gizmos/GLGizmoSVG.hpp
View File

@ -63,7 +63,7 @@ public:
/// <param name="volume_type">Object part / Negative volume / Modifier</param> /// <param name="volume_type">Object part / Negative volume / Modifier</param>
/// <param name="mouse_pos">Position on screen where to create volume</param> /// <param name="mouse_pos">Position on screen where to create volume</param>
/// <returns>True on succesfull start creation otherwise False</returns> /// <returns>True on succesfull start creation otherwise False</returns>
bool create_volume(std::string_view svg_file, ModelVolumeType volume_type = ModelVolumeType::MODEL_PART, const Vec2d &mouse_pos = Vec2d(nan, nan)); bool create_volume(std::string_view svg_file, ModelVolumeType volume_type = ModelVolumeType::MODEL_PART, const Vec2d &mouse_pos = Vec2d(std::nan, std::nan));
/// <summary> /// <summary>
/// Check whether volume is object containing only emboss volume /// Check whether volume is object containing only emboss volume

13
src/slic3r/GUI/Jobs/EmbossJob.cpp
View File

@ -719,8 +719,7 @@ bool check(const DataCreateVolume &input, bool is_main_thread)
assert(input.base != nullptr); assert(input.base != nullptr);
bool res = input.base != nullptr; bool res = input.base != nullptr;
res &= check(*input.base, check_fontfile); res &= check(*input.base, check_fontfile);
assert(input.volume_type != ModelVolumeType::INVALID); res &= is_valid(input.volume_type);
res &= input.volume_type != ModelVolumeType::INVALID;
res &= check(input.gizmo); res &= check(input.gizmo);
assert(!input.base->shape.projection.use_surface); assert(!input.base->shape.projection.use_surface);
res &= !input.base->shape.projection.use_surface; res &= !input.base->shape.projection.use_surface;
@ -1401,7 +1400,12 @@ bool finalize(bool canceled, std::exception_ptr &eptr, const DataBase &input)
bool is_valid(ModelVolumeType volume_type) bool is_valid(ModelVolumeType volume_type)
{ {
if (volume_type == ModelVolumeType::MODEL_PART || volume_type == ModelVolumeType::NEGATIVE_VOLUME || assert(volume_type != ModelVolumeType::INVALID);
assert(volume_type == ModelVolumeType::MODEL_PART ||
volume_type == ModelVolumeType::NEGATIVE_VOLUME ||
volume_type == ModelVolumeType::PARAMETER_MODIFIER);
if (volume_type == ModelVolumeType::MODEL_PART ||
volume_type == ModelVolumeType::NEGATIVE_VOLUME ||
volume_type == ModelVolumeType::PARAMETER_MODIFIER) volume_type == ModelVolumeType::PARAMETER_MODIFIER)
return true; return true;
@ -1424,9 +1428,6 @@ bool start_create_volume_job(Worker &worker,
if (sources.empty() || !volume_tr.has_value()) { if (sources.empty() || !volume_tr.has_value()) {
use_surface = false; use_surface = false;
} else { } else {
bool is_outside = volume_type == ModelVolumeType::MODEL_PART;
// check that there is not unexpected volume type
assert(is_outside || volume_type == ModelVolumeType::NEGATIVE_VOLUME || volume_type == ModelVolumeType::PARAMETER_MODIFIER);
SurfaceVolumeData sfvd{*volume_tr, std::move(sources)}; SurfaceVolumeData sfvd{*volume_tr, std::move(sources)};
CreateSurfaceVolumeData surface_data{std::move(sfvd), std::move(data), volume_type, object.id(), gizmo}; CreateSurfaceVolumeData surface_data{std::move(sfvd), std::move(data), volume_type, object.id(), gizmo};
job = std::make_unique<CreateSurfaceVolumeJob>(std::move(surface_data)); job = std::make_unique<CreateSurfaceVolumeJob>(std::move(surface_data));