amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix build errors (#8210)

Browse source 
* fix build errors

* fix windows

* fix flatpak
This commit is contained in:
SoftFever 2025-01-28 01:07:27 +08:00 committed by GitHub
parent fd0b2547f2
commit 6ed68342e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/build_deps.yml vendored
View file

@ -66,11 +66,6 @@ jobs:
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | run: |
choco install strawberryperl choco install strawberryperl
$Folder = ${{ github.workspace }}/deps/build
if (!(Test-Path -Path $Folder)) {
mkdir ${{ github.workspace }}/deps/build
mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
}
.\build_release_vs2022.bat deps .\build_release_vs2022.bat deps
.\build_release_vs2022.bat pack .\build_release_vs2022.bat pack
cd ${{ github.workspace }}/deps/build cd ${{ github.workspace }}/deps/build

2
cmake/modules/Findlibnoise.cmake
View file

@ -1,5 +1,5 @@
find_path(LIBNOISE_INCLUDE_DIR libnoise/noise.h) find_path(LIBNOISE_INCLUDE_DIR libnoise/noise.h)
find_library(LIBNOISE_LIBRARY NAMES libnoise libnoise_static) find_library(LIBNOISE_LIBRARY NAMES libnoise libnoise_static liblibnoise_static)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(libnoise DEFAULT_MSG find_package_handle_standard_args(libnoise DEFAULT_MSG
LIBNOISE_LIBRARY LIBNOISE_LIBRARY

1
deps/CMakeLists.txt vendored
View file

@ -361,6 +361,7 @@ set(_dep_list
${PNG_PKG} ${PNG_PKG}
${ZLIB_PKG} ${ZLIB_PKG}
${EXPAT_PKG} ${EXPAT_PKG}
dep_libnoise
) )
if (MSVC) if (MSVC)

5
flatpak/io.github.softfever.OrcaSlicer.yml
View file

@ -260,6 +260,11 @@ modules:
url: https://github.com/glfw/glfw/archive/refs/tags/3.3.7.zip url: https://github.com/glfw/glfw/archive/refs/tags/3.3.7.zip
dest: external-packages/GLFW dest: external-packages/GLFW
sha256: e02d956935e5b9fb4abf90e2c2e07c9a0526d7eacae8ee5353484c69a2a76cd0 sha256: e02d956935e5b9fb4abf90e2c2e07c9a0526d7eacae8ee5353484c69a2a76cd0
# libnoise
- type: file
url: https://github.com/SoftFever/Orca-deps-libnoise/archive/refs/tags/1.0.zip
dest: external-packages/libnoise
sha256: 96ffd6cc47898dd8147aab53d7d1b1911b507d9dbaecd5613ca2649468afd8b6
- name: OrcaSlicer - name: OrcaSlicer
buildsystem: simple buildsystem: simple

10
src/libslic3r/PerimeterGenerator.cpp
View file

@ -1035,7 +1035,7 @@ static ExtrusionEntityCollection traverse_extrusions(const PerimeterGenerator& p
const auto& config = regions.begin()->first; const auto& config = regions.begin()->first;
const bool fuzzify = should_fuzzify(config, perimeter_generator.layer_id, extrusion->inset_idx, is_contour); const bool fuzzify = should_fuzzify(config, perimeter_generator.layer_id, extrusion->inset_idx, is_contour);
if (fuzzify) if (fuzzify)
fuzzy_extrusion_line(extrusion.junctions, slice_z, config); fuzzy_extrusion_line(extrusion->junctions, slice_z, config);
} else { } else {
// Find all affective regions // Find all affective regions
std::vector<std::pair<const FuzzySkinConfig&, const ExPolygons&>> fuzzified_regions; std::vector<std::pair<const FuzzySkinConfig&, const ExPolygons&>> fuzzified_regions;
@ -1057,7 +1057,7 @@ static ExtrusionEntityCollection traverse_extrusions(const PerimeterGenerator& p
// Fuzzy splitted extrusion // Fuzzy splitted extrusion
if (std::all_of(splitted.begin(), splitted.end(), [](const Algorithm::SplitLineJunction& j) { return j.clipped; })) { if (std::all_of(splitted.begin(), splitted.end(), [](const Algorithm::SplitLineJunction& j) { return j.clipped; })) {
// The entire polygon is fuzzified // The entire polygon is fuzzified
fuzzy_extrusion_line(extrusion.junctions, slice_z, r.first); fuzzy_extrusion_line(extrusion->junctions, slice_z, r.first);
} else { } else {
const auto current_ext = extrusion->junctions; const auto current_ext = extrusion->junctions;
std::vector<Arachne::ExtrusionJunction> segment; std::vector<Arachne::ExtrusionJunction> segment;
@ -1065,11 +1065,11 @@ static ExtrusionEntityCollection traverse_extrusions(const PerimeterGenerator& p
extrusion->junctions.clear(); extrusion->junctions.clear();
const auto fuzzy_current_segment = [&segment, &extrusion, &r, slice_z]() { const auto fuzzy_current_segment = [&segment, &extrusion, &r, slice_z]() {
extrusion.junctions.push_back(segment.front()); extrusion->junctions.push_back(segment.front());
const auto back = segment.back(); const auto back = segment.back();
fuzzy_extrusion_line(segment, slice_z, r.first); fuzzy_extrusion_line(segment, slice_z, r.first);
extrusion.junctions.insert(extrusion.junctions.end(), segment.begin(), segment.end()); extrusion->junctions.insert(extrusion->junctions.end(), segment.begin(), segment.end());
extrusion.junctions.push_back(back); extrusion->junctions.push_back(back);
segment.clear(); segment.clear();
}; };