juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-08 16:21:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge main branch

Browse Source
This commit is contained in:
Lam Wei Lun
2026-10-08 11:12:25 +08:00
parent 987b1b2b63 e729dbf142
commit faa64ab089
505 changed files with 19826 additions and 14837 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.clang-tidy
+9 -4
View File
@@ -1,10 +1,15 @@
# clang-tidy configuration, enforced by the clang-tidy CI job on the lines a pull
# request changes (scripts/clang_tidy_diff.py). Only missing includes are reported
# for now: a file should include the header for every symbol it uses, not rely on
# the precompiled header or another header's includes. Run with --fix to add them.
# request changes (scripts/clang_tidy_diff.py). Two things are reported.
# Missing includes: a file should include the header for every symbol it uses, not
# rely on the precompiled header or another header's includes. Run with --fix to
# add them.
# Using-directives and using-declarations in the global namespace of a header:
# they reach every file that includes the header, and a using-declaration also
# makes the header look like the one to include for that name. Qualify the name
# in the header, and put the using in the source files that want it.
# Every check listed here gates pull requests, so enable a new one only once the
# code it flags on touched lines is reasonable to fix in passing.
Checks: '-*,misc-include-cleaner'
Checks: '-*,misc-include-cleaner,google-global-names-in-headers'
WarningsAsErrors: '*'
CheckOptions:
# Missing includes only. Builds without the precompiled header break on these.
.claude/skills/orca-profiles/references/extruder-variants.md
+6 -5
View File
@@ -105,11 +105,12 @@ Rules:
`single_extruder_multi_material` off, and in the app when the printer tab loads a printer with a
different number of extruders, the pair is rebuilt from `extruder_variant_list` (one
`Direct Drive Standard` per extruder when the list is absent) and the variant arrays are resized to
the rebuilt pair, padded with their first value or cut. The resize skips the `machine_max_*` limits
and `hotend_heating_rate` / `hotend_cooling_rate`: they keep their width, and an extruder beyond it
reads their first value, so extruder 2 and up of a list-less printer take extruder 1's normal limit
as their silent one too. With the three in agreement that changes nothing; a pair written without
the list is replaced. A listed variant the pair lacks is a menu choice that reads variant index 0.
the rebuilt pair, padded with their first value or cut. The `machine_max_*` limits are padded the
same way, so extruder 2 and up of a list-less printer take extruder 1's normal limit as their
silent one too. The resize skips `hotend_heating_rate` / `hotend_cooling_rate`: they keep their
width, and an extruder beyond it reads their first value. With the three in agreement that changes
nothing; a pair written without the list is replaced. A listed variant the pair lacks is a menu
choice that reads variant index 0.
- The pair without `extruder_variant_list` slices, but the sidebar offers no variant switch and
the app cannot add variants to a list-less process: nothing is lost while every extruder
has exactly one variant, and every further variant is unreachable.
.github/workflows/post_merge_profiles.yml
+1 -1
View File
@@ -303,7 +303,7 @@ jobs:
- name: Mint profiles-repo token
id: token
if: steps.vendors.outputs.vendors != ''
uses: actions/create-github-app-token@v1
uses: actions/create-github-app-token@v3
with:
app-id: ${{ secrets.PROFILES_APP_ID }}
private-key: ${{ secrets.PROFILES_APP_PRIVATE_KEY }}
.github/workflows/pr-label-bot.yml
+22 -22
View File
@@ -96,7 +96,7 @@ jobs:
issues: write
runs-on: ubuntu-latest
steps:
- name: Auto-label and remind about the localization glossary
- name: Auto-label localization changes and remind contributors about the glossary
uses: actions/github-script@v9
with:
script: |
@@ -106,37 +106,37 @@ jobs:
const pr = context.payload.pull_request;
// List changed files once (mirrors the `localization/**` paths filter in check_locale.yml)
// Mirrors the `localization/**` paths filter in check_locale.yml
const files = await github.paginate(github.rest.pulls.listFiles, {
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: pr.number,
per_page: 100
});
const touchesLocalization = files.some((file) => file.filename.startsWith('localization/'));
const onlyPoFiles = files.length > 0 && files.every((file) => file.filename.endsWith('.po'));
if (!files.some((file) => file.filename.startsWith('localization/'))) {
core.info('No localization changes detected; skipping Localization label.');
return;
}
// If the PR changes only .po files, automatically apply the Localization label
if (onlyPoFiles) {
try {
await github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: pr.number,
labels: ['Localization']
});
core.info('Applied Localization label (PR changes only .po files).');
} catch (error) {
if (isPermissionDenied(error)) {
core.warning('Cannot add Localization label because token cannot write.');
} else {
throw error;
}
try {
await github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: pr.number,
labels: ['Localization']
});
core.info('Applied Localization label.');
} catch (error) {
if (isPermissionDenied(error)) {
core.warning('Cannot add Localization label because token cannot write.');
} else {
throw error;
}
}
if (!touchesLocalization) {
core.info('No localization changes detected; skipping glossary reminder.');
// Collaborators know the glossary; only remind outside contributors
if (['COLLABORATOR', 'OWNER', 'MEMBER'].includes(pr.author_association)) {
core.info('Author is a collaborator; skipping glossary reminder.');
return;
}
.github/workflows/update-translation.yml
+1 -1
View File
@@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@v7
- name: Setup Python
uses: actions/setup-python@v6
uses: actions/setup-python@v7
with:
python-version: '3.12'
AGENTS.md
+6 -4
View File
@@ -4,15 +4,17 @@ OrcaSlicer — open-source C++17 3D slicer. wxWidgets GUI, CMake build system.
## Build Commands
Build the Release configuration unless asked otherwise.
```bash
# macOS
cmake --build build/arm64 --config RelWithDebInfo --target all --
cmake --build build/arm64 --config Release --target all --
# Linux
cmake --build build --config RelWithDebInfo --target all --
cmake --build build --config Release --target all --
# Windows (replace %build_type% with Debug/Release/RelWithDebInfo)
cmake --build . --config %build_type% --target ALL_BUILD -- -m
# Windows
cmake --build . --config Release --target ALL_BUILD -- -m
```
## Testing
deps/CGAL/CGAL.cmake
Vendored
+3 -3
View File
@@ -5,10 +5,10 @@ endif ()
orcaslicer_add_cmake_project(
CGAL
# GIT_REPOSITORY https://github.com/CGAL/cgal.git
# GIT_TAG 3654f780ae0c64675cabaef0e5ddaf904c48b4b7 # releases/CGAL-5.6.3
# GIT_TAG 28811b671a12b5caa9e3688569dadbc6b3728fe6 # v6.2.1
# For whatever reason, this keeps downloading forever (repeats downloads if finished)
URL https://github.com/CGAL/cgal/releases/download/v5.6.3/CGAL-5.6.3.zip
URL_HASH SHA256=5d577acb4a9918ccb960491482da7a3838f8d363aff47e14d703f19fd84733d4
URL https://github.com/CGAL/cgal/releases/download/v6.2.1/CGAL-6.2.1.zip
URL_HASH SHA256=eebd737d9b7f0199647ba5c1f9f6c7a3d0651aacef9c2fd4dedc52da6c25edbe
DEPENDS dep_Boost dep_Eigen dep_GMP dep_MPFR
)
deps_src/libigl/igl/copyleft/cgal/CGAL_includes.hpp
+2 -2
View File
@@ -33,8 +33,8 @@
// Axis-aligned bounding box tree for tet tri intersection
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_triangle_primitive.h>
#include <CGAL/AABB_traits_3.h>
#include <CGAL/AABB_triangle_primitive_3.h>
// Boolean operations
#include <CGAL/Polyhedron_3.h>
deps_src/libigl/igl/copyleft/cgal/closest_facet.cpp
+10 -10
View File
@@ -41,9 +41,9 @@ IGL_INLINE void igl::copyleft::cgal::closest_facet(
const std::vector<std::vector<size_t> > & VF,
const std::vector<std::vector<size_t> > & VFi,
const CGAL::AABB_tree<
CGAL::AABB_traits<
CGAL::AABB_traits_3<
Kernel,
CGAL::AABB_triangle_primitive<
CGAL::AABB_triangle_primitive_3<
Kernel, typename std::vector<
typename Kernel::Triangle_3 >::iterator > > > & tree,
const std::vector<typename Kernel::Triangle_3 > & triangles,
@@ -56,8 +56,8 @@ IGL_INLINE void igl::copyleft::cgal::closest_facet(
typedef typename Kernel::Segment_3 Segment_3;
typedef typename Kernel::Triangle_3 Triangle;
typedef typename std::vector<Triangle>::iterator Iterator;
typedef typename CGAL::AABB_triangle_primitive<Kernel, Iterator> Primitive;
typedef typename CGAL::AABB_traits<Kernel, Primitive> AABB_triangle_traits;
typedef typename CGAL::AABB_triangle_primitive_3<Kernel, Iterator> Primitive;
typedef typename CGAL::AABB_traits_3<Kernel, Primitive> AABB_triangle_traits;
typedef typename CGAL::AABB_tree<AABB_triangle_traits> Tree;
if (F.rows() <= 0 || I.rows() <= 0) {
@@ -451,8 +451,8 @@ IGL_INLINE void igl::copyleft::cgal::closest_facet(
typedef CGAL::Exact_predicates_exact_constructions_kernel Kernel;
typedef Kernel::Triangle_3 Triangle;
typedef std::vector<Triangle>::iterator Iterator;
typedef CGAL::AABB_triangle_primitive<Kernel, Iterator> Primitive;
typedef CGAL::AABB_traits<Kernel, Primitive> AABB_triangle_traits;
typedef CGAL::AABB_triangle_primitive_3<Kernel, Iterator> Primitive;
typedef CGAL::AABB_traits_3<Kernel, Primitive> AABB_triangle_traits;
typedef CGAL::AABB_tree<AABB_triangle_traits> Tree;
if (F.rows() <= 0 || I.rows() <= 0) {
@@ -498,9 +498,9 @@ IGL_INLINE void igl::copyleft::cgal::closest_facet(
#ifdef IGL_STATIC_LIBRARY
// Explicit template instantiation
// generated by autoexplicit.sh
template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 1, -1, 3>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>>::iterator, CGAL::Boolean_tag<false>>, CGAL::Default>> const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>> const&, std::vector<bool, std::allocator<bool>> const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&);
template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 1, -1, 3>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>>::iterator, CGAL::Boolean_tag<false>>, CGAL::Default>> const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>> const&, std::vector<bool, std::allocator<bool>> const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&);
// generated by autoexplicit.sh
template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>>::iterator, CGAL::Boolean_tag<false>>, CGAL::Default>> const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>> const&, std::vector<bool, std::allocator<bool>> const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&);
template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>>::iterator, CGAL::Boolean_tag<false>>, CGAL::Default>> const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>> const&, std::vector<bool, std::allocator<bool>> const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&);
// generated by autoexplicit.sh
template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1> >(
Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&,
@@ -509,7 +509,7 @@ template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT,
Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&,
Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&,
Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&,
Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> > const&, std::vector<bool, std::allocator<bool> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&);
Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> > const&, std::vector<bool, std::allocator<bool> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&);
#include <cstdint>
template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1> >(
Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1> > const&,
@@ -518,7 +518,7 @@ Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&,
Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1> > const&,
Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&,
Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&,
Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> > const&, std::vector<bool, std::allocator<bool> > const&,
Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> > const&, std::vector<bool, std::allocator<bool> > const&,
Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&,
Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&);
deps_src/libigl/igl/copyleft/cgal/closest_facet.h
+6 -6
View File
@@ -14,8 +14,8 @@
#include <vector>
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_triangle_primitive.h>
#include <CGAL/AABB_traits_3.h>
#include <CGAL/AABB_triangle_primitive_3.h>
#include <CGAL/intersections.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
@@ -67,9 +67,9 @@ namespace igl
const std::vector<std::vector<size_t> > & VF,
const std::vector<std::vector<size_t> > & VFi,
const CGAL::AABB_tree<
CGAL::AABB_traits<
CGAL::AABB_traits_3<
Kernel,
CGAL::AABB_triangle_primitive<
CGAL::AABB_triangle_primitive_3<
Kernel, typename std::vector<
typename Kernel::Triangle_3 >::iterator > > > & tree,
const std::vector<typename Kernel::Triangle_3 > & triangles,
@@ -139,9 +139,9 @@ namespace igl
const std::vector<std::vector<size_t> > & VF,
const std::vector<std::vector<size_t> > & VFi,
const CGAL::AABB_tree<
CGAL::AABB_traits<
CGAL::AABB_traits_3<
Kernel,
CGAL::AABB_triangle_primitive<
CGAL::AABB_triangle_primitive_3<
Kernel, typename std::vector<
typename Kernel::Triangle_3 >::iterator > > > & tree,
const std::vector<typename Kernel::Triangle_3 > & triangles,
deps_src/libigl/igl/copyleft/cgal/component_inside_component.cpp
+2 -2
View File
@@ -12,8 +12,8 @@
#include "points_inside_component.h"
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_triangle_primitive.h>
#include <CGAL/AABB_traits_3.h>
#include <CGAL/AABB_triangle_primitive_3.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <cassert>
deps_src/libigl/igl/copyleft/cgal/extract_cells.cpp
+4 -4
View File
@@ -23,8 +23,8 @@
#include "../../vertex_triangle_adjacency.h"
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_triangle_primitive.h>
#include <CGAL/AABB_traits_3.h>
#include <CGAL/AABB_triangle_primitive_3.h>
#include <CGAL/intersections.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
@@ -156,9 +156,9 @@ IGL_INLINE size_t igl::copyleft::cgal::extract_cells(
std::vector<VectorXI> Is(num_components);
std::vector<
CGAL::AABB_tree<
CGAL::AABB_traits<
CGAL::AABB_traits_3<
Kernel,
CGAL::AABB_triangle_primitive<
CGAL::AABB_triangle_primitive_3<
Kernel, std::vector<
Kernel::Triangle_3 >::iterator > > > > trees(num_components);
std::vector< std::vector<Kernel::Triangle_3 > >
deps_src/libigl/igl/copyleft/cgal/hausdorff.cpp
+5 -5
View File
@@ -9,8 +9,8 @@ template <
IGL_INLINE void igl::copyleft::cgal::hausdorff(
const Eigen::MatrixBase<DerivedV>& V,
const CGAL::AABB_tree<
CGAL::AABB_traits<Kernel,
CGAL::AABB_triangle_primitive<Kernel,
CGAL::AABB_traits_3<Kernel,
CGAL::AABB_triangle_primitive_3<Kernel,
typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
>
>
@@ -27,8 +27,8 @@ IGL_INLINE void igl::copyleft::cgal::hausdorff(
{
CGAL::Point_3<Kernel> query(x,y,z);
typename CGAL::AABB_tree<
CGAL::AABB_traits<Kernel,
CGAL::AABB_triangle_primitive<Kernel,
CGAL::AABB_traits_3<Kernel,
CGAL::AABB_triangle_primitive_3<Kernel,
typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
>
>
@@ -41,5 +41,5 @@ IGL_INLINE void igl::copyleft::cgal::hausdorff(
#ifdef IGL_STATIC_LIBRARY
// Explicit template instantiation
// generated by autoexplicit.sh
template void igl::copyleft::cgal::hausdorff<Eigen::Matrix<double, -1, -1, 0, -1, -1>, CGAL::Simple_cartesian<double>, double>(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > > const&, double&, double&);
template void igl::copyleft::cgal::hausdorff<Eigen::Matrix<double, -1, -1, 0, -1, -1>, CGAL::Simple_cartesian<double>, double>(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive_3<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > > const&, double&, double&);
#endif
deps_src/libigl/igl/copyleft/cgal/hausdorff.h
+2 -2
View File
@@ -38,8 +38,8 @@ namespace igl
IGL_INLINE void hausdorff(
const Eigen::MatrixBase<DerivedV>& V,
const CGAL::AABB_tree<
CGAL::AABB_traits<Kernel,
CGAL::AABB_triangle_primitive<Kernel,
CGAL::AABB_traits_3<Kernel,
CGAL::AABB_triangle_primitive_3<Kernel,
typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
>
>
deps_src/libigl/igl/copyleft/cgal/outer_hull.cpp
+2 -2
View File
@@ -12,8 +12,8 @@
#include "../../remove_unreferenced.h"
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_triangle_primitive.h>
#include <CGAL/AABB_traits_3.h>
#include <CGAL/AABB_triangle_primitive_3.h>
#include <CGAL/intersections.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
deps_src/libigl/igl/copyleft/cgal/outer_hull_legacy.cpp
+2 -2
View File
@@ -12,8 +12,8 @@
#include "../../remove_unreferenced.h"
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_triangle_primitive.h>
#include <CGAL/AABB_traits_3.h>
#include <CGAL/AABB_triangle_primitive_3.h>
#include <CGAL/intersections.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
deps_src/libigl/igl/copyleft/cgal/point_mesh_squared_distance.cpp
+11 -11
View File
@@ -29,8 +29,8 @@ IGL_INLINE void igl::copyleft::cgal::point_mesh_squared_distance(
using namespace std;
typedef CGAL::Triangle_3<Kernel> Triangle_3;
typedef typename std::vector<Triangle_3>::iterator Iterator;
typedef CGAL::AABB_triangle_primitive<Kernel, Iterator> Primitive;
typedef CGAL::AABB_traits<Kernel, Primitive> AABB_triangle_traits;
typedef CGAL::AABB_triangle_primitive_3<Kernel, Iterator> Primitive;
typedef CGAL::AABB_traits_3<Kernel, Primitive> AABB_triangle_traits;
typedef CGAL::AABB_tree<AABB_triangle_traits> Tree;
Tree tree;
vector<Triangle_3> T;
@@ -43,8 +43,8 @@ IGL_INLINE void igl::copyleft::cgal::point_mesh_squared_distance_precompute(
const Eigen::MatrixBase<DerivedV> & V,
const Eigen::MatrixBase<DerivedF> & F,
CGAL::AABB_tree<
CGAL::AABB_traits<Kernel,
CGAL::AABB_triangle_primitive<Kernel,
CGAL::AABB_traits_3<Kernel,
CGAL::AABB_triangle_primitive_3<Kernel,
typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
>
>
@@ -90,8 +90,8 @@ template <
IGL_INLINE void igl::copyleft::cgal::point_mesh_squared_distance(
const Eigen::MatrixBase<DerivedP> & P,
const CGAL::AABB_tree<
CGAL::AABB_traits<Kernel,
CGAL::AABB_triangle_primitive<Kernel,
CGAL::AABB_traits_3<Kernel,
CGAL::AABB_triangle_primitive_3<Kernel,
typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
>
>
@@ -103,8 +103,8 @@ IGL_INLINE void igl::copyleft::cgal::point_mesh_squared_distance(
{
typedef CGAL::Triangle_3<Kernel> Triangle_3;
typedef typename std::vector<Triangle_3>::iterator Iterator;
typedef CGAL::AABB_triangle_primitive<Kernel, Iterator> Primitive;
typedef CGAL::AABB_traits<Kernel, Primitive> AABB_triangle_traits;
typedef CGAL::AABB_triangle_primitive_3<Kernel, Iterator> Primitive;
typedef CGAL::AABB_traits_3<Kernel, Primitive> AABB_triangle_traits;
typedef CGAL::AABB_tree<AABB_triangle_traits> Tree;
typedef typename Tree::Point_and_primitive_id Point_and_primitive_id;
typedef CGAL::Point_3<Kernel> Point_3;
@@ -134,7 +134,7 @@ IGL_INLINE void igl::copyleft::cgal::point_mesh_squared_distance(
template void igl::copyleft::cgal::point_mesh_squared_distance<CGAL::Epeck, Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, 1, 0, -1, 1>>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>> const&, Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>> const&, Eigen::PlainObjectBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1>>&);
template void igl::copyleft::cgal::point_mesh_squared_distance<CGAL::Epeck, Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, -1, 0, -1, -1> >(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> >&);
template void igl::copyleft::cgal::point_mesh_squared_distance<CGAL::Epeck, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<double, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, -1, 0, -1, -1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> >&);
template void igl::copyleft::cgal::point_mesh_squared_distance<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, 3, 1, -1, 3>, Eigen::Matrix<double, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, 3, 1, -1, 3> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> >&);
template void igl::copyleft::cgal::point_mesh_squared_distance_precompute<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> >&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >&);
template void igl::copyleft::cgal::point_mesh_squared_distance_precompute<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> >&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >&);
template void igl::copyleft::cgal::point_mesh_squared_distance<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, 3, 1, -1, 3>, Eigen::Matrix<double, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, 3, 1, -1, 3> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive_3<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> >&);
template void igl::copyleft::cgal::point_mesh_squared_distance_precompute<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive_3<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> >&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >&);
template void igl::copyleft::cgal::point_mesh_squared_distance_precompute<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive_3<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> >&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >&);
#endif
deps_src/libigl/igl/copyleft/cgal/point_mesh_squared_distance.h
+4 -4
View File
@@ -63,8 +63,8 @@ namespace igl
const Eigen::MatrixBase<DerivedV> & V,
const Eigen::MatrixBase<DerivedF> & F,
CGAL::AABB_tree<
CGAL::AABB_traits<Kernel,
CGAL::AABB_triangle_primitive<Kernel,
CGAL::AABB_traits_3<Kernel,
CGAL::AABB_triangle_primitive_3<Kernel,
typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
>
>
@@ -89,8 +89,8 @@ namespace igl
IGL_INLINE void point_mesh_squared_distance(
const Eigen::MatrixBase<DerivedP> & P,
const CGAL::AABB_tree<
CGAL::AABB_traits<Kernel,
CGAL::AABB_triangle_primitive<Kernel,
CGAL::AABB_traits_3<Kernel,
CGAL::AABB_triangle_primitive_3<Kernel,
typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
>
>
deps_src/libigl/igl/copyleft/cgal/points_inside_component.cpp
+4 -4
View File
@@ -13,8 +13,8 @@
#include "assign_scalar.h"
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_triangle_primitive.h>
#include <CGAL/AABB_traits_3.h>
#include <CGAL/AABB_triangle_primitive_3.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <cassert>
@@ -35,8 +35,8 @@ namespace igl {
typedef Kernel::Triangle_3 Triangle;
typedef Kernel::Plane_3 Plane_3;
typedef std::vector<Triangle>::iterator Iterator;
typedef CGAL::AABB_triangle_primitive<Kernel, Iterator> Primitive;
typedef CGAL::AABB_traits<Kernel, Primitive> AABB_triangle_traits;
typedef CGAL::AABB_triangle_primitive_3<Kernel, Iterator> Primitive;
typedef CGAL::AABB_traits_3<Kernel, Primitive> AABB_triangle_traits;
typedef CGAL::AABB_tree<AABB_triangle_traits> Tree;
template<typename DerivedF, typename DerivedI>
deps_src/libigl/igl/copyleft/cgal/signed_distance_isosurface.cpp
+2 -2
View File
@@ -23,8 +23,8 @@
#include <CGAL/IO/output_surface_facets_to_polyhedron.h>
// Axis-aligned bounding box tree for tet tri intersection
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_triangle_primitive.h>
#include <CGAL/AABB_traits_3.h>
#include <CGAL/AABB_triangle_primitive_3.h>
#include <vector>
IGL_INLINE bool igl::copyleft::cgal::signed_distance_isosurface(
deps_src/libigl/igl/copyleft/cgal/submesh_aabb_tree.cpp
+5 -5
View File
@@ -18,9 +18,9 @@ IGL_INLINE void igl::copyleft::cgal::submesh_aabb_tree(
const Eigen::MatrixBase<DerivedF>& F,
const Eigen::MatrixBase<DerivedI>& I,
CGAL::AABB_tree<
CGAL::AABB_traits<
CGAL::AABB_traits_3<
Kernel,
CGAL::AABB_triangle_primitive<
CGAL::AABB_triangle_primitive_3<
Kernel, typename std::vector<
typename Kernel::Triangle_3 >::iterator > > > & tree,
std::vector<typename Kernel::Triangle_3 > & triangles,
@@ -51,7 +51,7 @@ IGL_INLINE void igl::copyleft::cgal::submesh_aabb_tree(
#ifdef IGL_STATIC_LIBRARY
// Explicit template instantiation
// generated by autoexplicit.sh
template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 3, 1, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 3, 1, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
#endif
deps_src/libigl/igl/copyleft/cgal/submesh_aabb_tree.h
+4 -4
View File
@@ -14,8 +14,8 @@
#include <vector>
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_triangle_primitive.h>
#include <CGAL/AABB_traits_3.h>
#include <CGAL/AABB_triangle_primitive_3.h>
#include <CGAL/intersections.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
@@ -44,9 +44,9 @@ namespace igl
const Eigen::MatrixBase<DerivedF>& F,
const Eigen::MatrixBase<DerivedI>& I,
CGAL::AABB_tree<
CGAL::AABB_traits<
CGAL::AABB_traits_3<
Kernel,
CGAL::AABB_triangle_primitive<
CGAL::AABB_triangle_primitive_3<
Kernel, typename std::vector<
typename Kernel::Triangle_3 >::iterator > > > & tree,
std::vector<typename Kernel::Triangle_3 > & triangles,
docs/CAD/design/SKETCHER_TOOL_ARCHITECTURE.md
+2 -2
View File
@@ -262,9 +262,9 @@ and a band is not a "gesture" in the `CadLevel::Gesture` sense because nothing h
|---|---|---|---|---|---|
| `Move` | — | `update_hover` / `update_solid_hover` (**non-consuming**, returns false) | — | passthrough | hover only asks for a repaint, `:10022-10025` |
| `LeftDown` | orbit may begin | latch press, **return false** | — | consume-or-orbit is the canvas's call | `:10058-10063`; consuming here killed orbit once already |
| `LeftDrag` > 8 px | — | start + drive band, **consume** | — | no longer orbits in this canvas | middle-drag orbits, right-drag pans (`:10013-10016`) |
| `LeftDrag` > 8 px | — | start + drive band, **consume**, when Shift is held or the left button has no camera action | — | otherwise the left button's drag action (Preferences > Control) | the band is Prepare's Shift+left-drag rectangle selection |
| `LeftUp` | — | commit pick **or** resolve band | — | — | `:10035-10041` |
| `MiddleDrag` / `RightDrag` | — | must not see it | — | orbit / pan | camera gestures never reach the FSM |
| `MiddleDrag` / `RightDrag` | — | must not see it | — | the button's drag action (Preferences > Control) | camera gestures never reach the FSM; a right press reaches the tool only once its release shows it was a click |
| `RightClick` | — | — | offer menu | — | `snaporca-xmh6` open: a right-click that only clears the sketch selection eats the offer |
| `Esc` | — | — | `escape()` ladder | — | one route whatever holds focus (`:4228-4231`) |
| `Del` / `Backspace` | — | `delete_selected_or_last_sketch_entity()` | char hook | — | `:4260` |
docs/HLSD/design-tab.md
+92 -21
View File
@@ -135,7 +135,7 @@ contract between them is stated in code rather than spread across handlers.
| --- | --- | --- |
| `Transient` | a value field or a popup menu | closes it; the tool stays armed |
| `Gesture` | an uncommitted delta — an entity being drawn, a body being dragged | reverts it; committed work is untouched |
| `Tool` | a feature card, an armed sketch tool, a constrain session | exits it; drawn entities survive |
| `Tool` | a feature card, Sketch waiting for its plane, an armed sketch tool, a constrain session | exits it; drawn entities survive |
| `Idle` | nothing transient | clears the selection, a Feature tree or Bodies row included; leaves a sketch session only if it is empty |
`cad_escape_level()` is a `constexpr` free function over a POD of four booleans rather than a
@@ -149,26 +149,66 @@ explicit selection, the sketch ribbon's Cancel, which asks first, or `Ctrl+Z`. A
*session* is deliberately not a `Tool` level; it is the environment the `Idle` level lives in,
which makes the destructive path unrepresentable rather than merely unlikely.
A body Move is the one `Gesture` that outlives the press: its gizmo stays up between drags until
Confirm keeps the placement or `Esc` or Cancel puts the body back. Until then the selection is
held — a click off the gizmo only steers the camera — and undo is refused, since the placement
is not in the history. Anything that starts another edit (a feature card, a sketch, placing
imported art or text, another body's Move, a rebuild) keeps the placement, as switching gizmos
keeps a move in Prepare. The panel ends the Move in one place (`DesignPanel::end_body_move`), so
the gizmo, the Move / Rotate card and the ✓/✗ cannot outlive one another.
Right-click is read at button-up against one budget, 3 px of drift, applied to the whole press
rather than to its end points: a press that wandered past the budget at any moment is
navigation, even if it comes back to where it started, which is what stops a slow, careful
orbit from ending in a menu. There is no time budget — a gesture that means something different
when it is slow is exactly what the interaction charter rules out. The raycast uses the press
position, not the release. An armed sketch tool that already consumed the right
button (to terminate a chain, say) declines to also open a menu, through a read-and-clear flag.
Past either budget the event is navigation, and navigation does not transition the state
machine.
position, not the release. The sketch tool sees a right press only once the release has shown it
was a click: the press itself goes to the camera, which may pan or orbit with that button, and the
canvas replays it to the tool on a stationary release. A tool that uses the click (to terminate a
chain, say) keeps the menu closed. Past either budget the event is navigation, and navigation
does not transition the state machine.
Navigation itself is Prepare's: the camera reads the drag actions set in Preferences > Control
for each button. The left button is shared with picking, so a whole body is swept with a
rectangle on plain left-drag only while no camera action is assigned to it, and with
Shift+left-drag otherwise — Prepare's own rectangle selection.
for each button, and in the Touchpad camera style a move with Alt held orbits and one with Shift
held pans, whatever tool is armed. The left button is shared with picking and drawing, so a tool
handle or a press that draws takes it first, as a gizmo does in Prepare; a whole body is swept
with a rectangle on plain left-drag only while no camera action is assigned to the left button,
and with Shift+left-drag otherwise — Prepare's own rectangle selection.
Entering a sketch changes three things at once so the mode is legible: a banner above the
Entering a sketch changes two things at once so the mode is legible: a banner above the
canvas (a sibling of the canvas, not a child over it — on GTK a child window over a
`wxGLCanvas` is a native window and does not reliably stack over GL), the printer bed muted so
a plate grid is never read as a sketch grid, and `N` to look normal to the plane. Code that
changes any of the three belongs with a change to this section.
`wxGLCanvas` is a native window and does not reliably stack over GL), and `N` to look normal to
the plane. The printer bed stays: there is no sketch grid, so the plate grid is the only ground
reference a sketch has. Code that changes either belongs with a change to this section.
Sketch mode is never entered without a plane under it, so the banner, the sketch keys and the
sketch offer always have a session to act on. Sketch on a picked flat face or reference plane opens
the session on it at once. With nothing picked it stays in Feature mode and waits for one — an
armed `Tool`, left with `Esc` or ✗, and ended by anything that starts another edit — and the
reference plane or flat face clicked next opens the session. A picked plane is a selection like a
face: the sketch on it uses it up, and `Esc` or a click on nothing lets go of it, so a plane that
can no longer be seen never decides where the next sketch goes.
The reference planes — XY, XZ and YZ through the modeling origin, with their half-axes — are
drawn on demand, because three translucent squares over every model are noise once they are not
the thing being picked. Sketch brings them up while it waits for a plane, which is exactly when
they are picked, and the session the pick opens takes them away; a live session draws none. The
Feature tree's Origin row keeps them up outside a sketch. Its state is a view preference in
AppConfig rather than part of the recipe, so it costs the project format nothing. The Plane tool
keeps its own rule: the planes and the datums as Offset bases, and nothing for the other methods,
where a click on a plane would rewrite the datum's references. The `P` and `A` keys are a
separate, unpickable view helper and do not follow the Origin row.
The Bed row, under the Origin row, is the printer bed's switch in the same way: it draws or hides
the bed and its plate grid in every mode. It is a view preference in AppConfig too, and the bed is
shown until it is turned off.
The two rows are view switches, not history, and the tree says so: they sit unframed on the Feature
tree's card, above the features' own framed list, and stay put while the features scroll. A click
never selects either row, since a selected Origin or Bed would have nothing to edit, move or
delete; the eye and the right-click menu are the only targets, and a row's label dims while its
thing is hidden, as a hidden body's does. Because the block never takes the focus, `Ctrl+Shift+O`
and `Ctrl+Shift+B` flip the Origin and the Bed from the keyboard.
## Rendering the bodies
@@ -189,6 +229,15 @@ degenerate edges are left out (`GeometryEngine::display_edges`), and the polylin
once per shape, keyed by its `TShape`, because a recompute that leaves a body unchanged is the
common case.
While a feature card is open, its preview ghost is the whole model the candidate would produce,
drawn translucent over the bodies, so every face the feature leaves alone is in both at the same
depth. The ghost is drawn with a depth bias that pushes it back (`GLVolume::depth_bias`), so on a shared face
the body always wins instead of the two copies z-fighting, and the ghost shows only where the
result reaches past the bodies. Material a feature removes lies inside the old solid and would not
show at all, so the tools whose result mostly coincides with the body — Fillet/Chamfer, Draft,
Hole and the Mate hover — hide the bodies once the preview is valid and draw the result alone,
opaque.
## Showing what is selected
A selection is drawn on the faces it names, never as a tint over the body: a translucent
@@ -214,7 +263,17 @@ replay costs up to a recompute, so the panel finds the faces once per row and to
generation, off the UI thread, and only while no feature card is open. One selection is live at
a time: a viewport pick clears the feature row and a feature row clears the viewport pick, as the
Feature tree and Bodies list do between themselves. `Esc`, a click on empty space and an
empty rubber band all let go of it, whichever list or pick made it.
empty rubber band all let go of it, whichever list or pick made it — except while a body Move is
open, which holds the selection until it ends (see the interaction contract).
Zoom to selection, on a Feature tree or Bodies row and in its right-click menu, frames one thing
along the current view direction, as the canvas's Fit button frames the selection. On a body it
frames the body whole, hidden or not, from its display mesh: the viewport never selects a hidden
body, so the selection cannot stand in for it. On a sketch it frames the sketch's own geometry,
drawn, consumed or suppressed; on any other feature, the faces the feature made, found as the row
highlight finds them and from the same cache. From the offer it frames whatever the selection is,
a body again included. A feature that is not a sketch and makes no faces, such as a datum plane
or a suppressed Extrude, has no Zoom to selection.
## Following the app
@@ -231,9 +290,21 @@ The tab is a page of Orca's main window and answers to the same settings as Prep
- **Sidebar icons.** Every clickable icon in the sidebar shows a hover chip. The card-header and
constraint-row buttons are Orca's self-painted `Button`, because a native button cannot take a
hover background on macOS. The Feature tree and Bodies lists are a custom-drawn
`DesignRowList` rather than a `wxTreeCtrl`, so each row carries its own actions — Edit,
Show/hide and Delete on a feature, Move, Show/hide and Delete on a body — and the eye shows
whether that row is hidden.
`DesignRowList` rather than a `wxTreeCtrl`, so each row carries its own actions — Zoom to
selection, Edit, Show/hide and Delete on a feature, Zoom to selection, Move, Show/hide and
Delete on a body, and only Show/hide on the Origin and Bed rows, a separate non-selectable list
above the features — and the eye shows whether that row is hidden. A feature with nothing to
frame keeps a blank cell where Zoom to selection would be, so every icon stays in its column.
- **Plates.** This is the one thing the tab does not follow. The canvas has a bed of its own at
the printer bed's home position, whichever plate Prepare has current, and a new document's
modeling origin is that bed's centre. A bed that followed the current plate would slide out
from under a design: the origin is fixed once per document, baked into every sketch plane and
saved in the recipe, while the current plate can change between visits. Commit to Plate does
not need it either, since the committed object is placed on an empty spot of the current
plate. What the canvas does read from the plate is moved onto its bed: the exclude areas, the
plate box the camera orbits about when nothing is picked (`GLCanvas3D::_current_plate_box`),
and the first view, which starts from Prepare's camera turned to the tab's iso view: the CAD
isometric from the front-right corner that Home returns to, not Prepare's front-left one.
- **Viewport text.** The status line and the active tool's values are drawn by the canvas in
its ImGui pass, so they go with the canvas: a top-level window over GL does not follow its
frame and was left floating over other applications.
@@ -256,12 +327,12 @@ permanent row index, verbs that do not apply shown disabled **in place with thei
rather than removed. The invariant is that a verb's row index is identical in every selection
where it appears and that adding a verb never moves an existing one — the hand learns the
position, so the menu is never re-sorted, compacted or adaptively ordered. Above the families
sits one *flat* row, holding Rename and Color — what a selection is opened for most: its verbs are
items of their own at the top of the menu rather than a family's submenu. It is appended after
the eight, so it moved no existing index, and it reads the same from the viewport and from a row
of the Bodies list.
sits one *flat* row, holding Rename, Color and Zoom to selection — what a selection is opened for
most: its verbs are items of their own at the top of the menu rather than a family's submenu. It
is appended after the eight, so it moved no existing index, and it reads the same from the
viewport and from a row of the Bodies list.
An invariant across 92 verbs and 20 selection kinds does not survive by review, so the map
An invariant across 93 verbs and 20 selection kinds does not survive by review, so the map
exists once, as data: `scripts/CAD/tool_atlas.json` carries every verb with its row, key, icon,
accepted selections, preconditions and refusal string, and `scripts/CAD/gen_offer_table.py`
emits `src/slic3r/GUI/CAD/DesignOffer.hpp` from it. The header is checked in and never
docs/HLSD/preset-cache.md
+6 -5
View File
@@ -39,7 +39,7 @@ presets are never serialized — they have their own storage and their own lifec
| Location | Contents on a shipped build | Role |
|---|---|---|
| `resources/profiles/` | `<vendor>.opc` alone — the profile and its preset JSONs both pruned | What the app ships with; what installing copies from, and the only thing it is read for |
| `resources/profiles/` | `<vendor>.opc` alone — the profile and its preset JSONs both pruned | What the app ships with and what installing copies from; read directly for vendors not installed |
| `<data_dir>/system/` | `<vendor>.opc` alone, or `<vendor>.json` + `<vendor>/` after an update | What the user has installed |
| `<data_dir>/system/` (dev build) | `<vendor>.json` + `<vendor>/` + `<vendor>.opc` written at runtime | A developer tree caches as it parses |
| `<data_dir>/cache/wizard_profile_data.json` | The wizard's derived vendor catalog plus the stamps it was built from | Written and read by the setup wizard only; never shipped (see "The wizard's profile-data cache") |
@@ -182,10 +182,11 @@ one startup.
**A vendor is loaded from where it is installed and nowhere else.** For startup that
is `<data_dir>/system/`; resources reaches the app by being *installed* into that
directory first, never by being loaded from. (The setup wizard is the one caller with
a different notion of "where": it also shows vendors the user has not installed, and
loads those from `resources/profiles` — see "The wizard's profile-data cache".) There
is one lookup tier and one parse source:
directory first, never by being loaded from. (The setup wizard and the Create Printer
dialog also offer vendors the user has not installed, and load those from
`resources/profiles`; see "The wizard's profile-data cache". The dialog's vendor-only and
filament-only scans read a cache only where it is the whole installation, and never write
one.) There is one lookup tier and one parse source:
```
load vendor V from <data_dir>/system:
docs/HLSD/prusa-indx-profiles.md
+7 -2
View File
@@ -36,8 +36,13 @@ override is not available in these profiles. The source's `EXCLUDE_E_START` and
`EXCLUDE_E_END` internal markers become comments rather than printer commands.
Pressure-advance restoration and automatic pressure-advance emission use the
selected filament preset's settings. These profiles do not impose machine-owned
filament overrides. Dock-fan control retains the source's material and layer
selected filament preset's settings. The INDX filament presets include
`fdm_filament_template_indx`, whose start G-code sets the filament's pressure
advance with `M572` and then starts the firmware's automatic calibration with
`M573 R`, the commands PrusaSlicer emits after a tool change; the station purge
disables pressure advance before it. The template also carries Prusa's
multi-tool ramming and a 10 mm³ minimal purge. These profiles do not impose
machine-owned filament overrides. Dock-fan control retains the source's material and layer
conditions; shutdown parks the tool and turns off the used heaters and dock fan.
## Configuration boundaries
localization/i18n/OrcaSlicer.pot
+78 -203
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-10-06 13:42+0800\n"
"POT-Creation-Date: 2026-10-08 11:08+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3168,7 +3168,7 @@ msgstr ""
msgid "Remove parameter"
msgstr ""
msgid "to"
msgid "Range"
msgstr ""
msgid "Add height range"
@@ -5067,9 +5067,6 @@ msgstr ""
msgid "layers"
msgstr ""
msgid "Range"
msgstr ""
msgid "Empty string"
msgstr ""
@@ -9664,6 +9661,9 @@ msgstr ""
msgid "Please input layer value (>= 2)."
msgstr ""
msgid "to"
msgstr ""
msgid "Plate name"
msgstr ""
@@ -20452,6 +20452,21 @@ msgstr ""
msgid "The filament model is unknown. A random filament preset will be used."
msgstr ""
msgid "Hide reference planes and axes"
msgstr ""
msgid "Show reference planes and axes"
msgstr ""
msgid "Hide the printer bed and its plate grid"
msgstr ""
msgid "Show the printer bed and its plate grid"
msgstr ""
msgid "Click a reference plane or a flat face to sketch on it — Esc cancels"
msgstr ""
msgid "Construction"
msgstr ""
@@ -20537,26 +20552,10 @@ msgstr ""
msgid "Bed hidden"
msgstr ""
msgid "FEATURES"
msgid "Reference planes shown"
msgstr ""
msgid "Sketch"
msgstr ""
#, possible-c-format, possible-boost-format
msgid "Sketch plane: %s — pick a tool"
msgstr ""
msgid "Click a face or a reference plane in the viewport, then a sketch tool"
msgstr ""
#, possible-c-format, possible-boost-format
msgid ""
"Sketch plane: %s.\n"
"Pick a tool, or press Menu for the list."
msgstr ""
msgid "Click a face or a reference plane, then a sketch tool."
msgid "Reference planes hidden"
msgstr ""
msgid "Add material (extrude / revolve / sweep / loft / thicken / rib)"
@@ -20824,12 +20823,6 @@ msgstr ""
msgid "Pick a cylindrical surface (bore / outer) or a circular edge for a thread"
msgstr ""
msgid "Import STEP (editable B-rep solid)"
msgstr ""
msgid "Import mesh (STL/OBJ) as an editable B-rep solid"
msgstr ""
msgid "Constrain selected sketch"
msgstr ""
@@ -21142,10 +21135,16 @@ msgstr ""
msgid "New Design — clear the feature tree"
msgstr ""
msgid "Import STEP (editable B-rep solid)"
msgstr ""
msgid "Import mesh (STL/OBJ) as an editable B-rep solid"
msgstr ""
msgid "Export STEP…"
msgstr ""
msgid "Show the printer bed and its plate grid"
msgid "Create a new sketch"
msgstr ""
msgid "Place on Face (F) — lay the picked face on the bed"
@@ -21178,6 +21177,9 @@ msgstr ""
msgid "Height / Y"
msgstr ""
msgid "Sketch"
msgstr ""
msgid "Distance X"
msgstr ""
@@ -21656,6 +21658,9 @@ msgstr ""
msgid "Value"
msgstr ""
msgid "Pick a tool, or press Menu for the list."
msgstr ""
msgid "Constraints"
msgstr ""
@@ -21685,6 +21690,9 @@ msgstr ""
msgid "Show / hide"
msgstr ""
msgid "Zoom to selection"
msgstr ""
msgid "Check interference — find overlapping bodies"
msgstr ""
@@ -21742,6 +21750,9 @@ msgstr ""
msgid "Sketch selected — right-click to Extrude, or double-click to edit"
msgstr ""
msgid "That face is not flat — click a flat face or a reference plane"
msgstr ""
#, possible-c-format, possible-boost-format
msgid "Body %d: vertex selected — click again for the whole body"
msgstr ""
@@ -21784,10 +21795,6 @@ msgstr ""
msgid "Edge %d selected — Shift+click to add edges, or click again for the whole body"
msgstr ""
#, possible-c-format, possible-boost-format
msgid "%s plane selected — right-click for the drawing tools"
msgstr ""
#, possible-c-format, possible-boost-format
msgid "%s plane selected — right-click to sketch on it, or click an object to select it"
msgstr ""
@@ -21842,7 +21849,7 @@ msgstr ""
msgid "Text unchanged"
msgstr ""
msgid "Text cancelled"
msgid "Text canceled"
msgstr ""
msgid "Import SVG"
@@ -22462,7 +22469,7 @@ msgstr ""
msgid ""
"Nothing yet — import a STEP or a mesh from the toolbar,\n"
"or click a reference plane and right-click it to start a sketch."
"or press Sketch and click a reference plane to start a sketch."
msgstr ""
msgid "No solid yet — select a sketch and right-click it to Extrude."
@@ -22494,12 +22501,25 @@ msgstr ""
msgid "Finding the feature's faces…"
msgstr ""
msgid "Select a body first — click it in the viewport or the Bodies list"
msgid "The model is being rebuilt — zoom again when it finishes"
msgstr ""
#, possible-c-format, possible-boost-format
msgid "%s has nothing on show to zoom to"
msgstr ""
msgid "That body has no display mesh yet — recompute first"
msgstr ""
msgid "Select something to zoom to"
msgstr ""
msgid "Finish or cancel what is open first"
msgstr ""
msgid "Select a body first — click it in the viewport or the Bodies list"
msgstr ""
msgid "Drag the arrows to move, the rings to rotate — then Confirm (Esc cancels)"
msgstr ""
@@ -22519,9 +22539,6 @@ msgstr ""
msgid "Placed on face — body laid flat on the bed"
msgstr ""
msgid "Finish or cancel what is open first"
msgstr ""
#, possible-c-format, possible-boost-format
msgid "Edit rejected: %s"
msgstr ""
@@ -22870,6 +22887,16 @@ msgstr ""
msgid "Line E%d"
msgstr ""
#, possible-c-format, possible-boost-format
msgid "Sketch plane: %s — pick a tool"
msgstr ""
#, possible-c-format, possible-boost-format
msgid ""
"Sketch plane: %s.\n"
"Pick a tool, or press Menu for the list."
msgstr ""
msgid "Plane ready"
msgstr ""
@@ -23086,7 +23113,10 @@ msgctxt "Design"
msgid "Sketch"
msgstr ""
msgid "Click a face or a reference plane, then pick a drawing tool"
msgid "Select a flat face or a reference plane to sketch on"
msgstr ""
msgid "Sketch on the selected flat face or plane, or click one next"
msgstr ""
msgctxt "Design"
@@ -23156,9 +23186,6 @@ msgctxt "Design"
msgid "Hole"
msgstr ""
msgid "Drill a hole, centerd on a picked face or placed on a plane"
msgstr ""
msgctxt "Design"
msgid "Thread"
msgstr ""
@@ -23321,6 +23348,13 @@ msgstr ""
msgid "Set the selected body's display color"
msgstr ""
msgctxt "Design"
msgid "Zoom to selection"
msgstr ""
msgid "Frame the selection in the view, keeping the view direction"
msgstr ""
msgctxt "Design"
msgid "Delete"
msgstr ""
@@ -23585,165 +23619,6 @@ msgstr ""
msgid "Size: %.1f × %.1f mm"
msgstr ""
msgid "Primitive"
msgstr ""
msgid "Empty mesh generated"
msgstr ""
#. TRN Default name of an object created from the box primitive shape.
msgid "Box"
msgstr ""
#. TRN Primitive gizmo: label in front of the preset cube size buttons
msgid "Quick:"
msgstr ""
msgid "Width (X)"
msgstr ""
msgid "Depth (Y)"
msgstr ""
msgid "Height (Z)"
msgstr ""
#. TRN Primitive gizmo: bottom radius of a cone ("Top R" is the top radius)
msgid "Bottom R"
msgstr ""
msgid "Top R"
msgstr ""
#. TRN Primitive gizmo: major radius of a torus ("Minor R" is the tube radius)
msgid "Major R"
msgstr ""
msgid "Minor R"
msgstr ""
msgid "All edges"
msgstr ""
msgid "Top edges"
msgstr ""
msgid "Bottom edges"
msgstr ""
msgid "Lateral edges"
msgstr ""
msgid "Mesh resolution"
msgstr ""
msgid "Add Shape"
msgstr ""
msgid "No outer profile"
msgstr ""
msgid "Failed to make outer face"
msgstr ""
msgid "Failed to build face with holes"
msgstr ""
msgid "Revolve failed"
msgstr ""
msgid "Profile"
msgstr ""
msgid "Start new profile (for holes)"
msgstr ""
msgid "Segments"
msgstr ""
msgid "Sides"
msgstr ""
msgid "Click on canvas to draw"
msgstr ""
msgid "Snap to grid"
msgstr ""
msgid "Grid step"
msgstr ""
msgid "Outer"
msgstr ""
msgid "closed"
msgstr ""
#. TRN Sketch gizmo profile list: "Outer" or "Hole", profile number, point count, "closed" or nothing
#, possible-boost-format
msgid "%1% %2%: %3% points %4%"
msgstr ""
msgid "XY (Top)"
msgstr ""
msgid "XZ (Front)"
msgstr ""
msgid "YZ (Side)"
msgstr ""
msgid "Revolve deg"
msgstr ""
msgid "Set to 0 for extrude, >0 for revolve"
msgstr ""
msgid "Pocket (cut)"
msgstr ""
#, possible-c-format
msgid "%zu closed profile"
msgid_plural "%zu closed profiles"
msgstr[0] ""
msgstr[1] ""
msgid "Draw a closed profile to enable"
msgstr ""
msgid "Clear all"
msgstr ""
msgid "Empty result"
msgstr ""
#, possible-boost-format
msgid "Extrude: %1%"
msgstr ""
#, possible-boost-format
msgid "Revolve: %1%"
msgstr ""
msgid "No object selected"
msgstr ""
msgid "Face failed"
msgstr ""
msgid "Face with holes failed"
msgstr ""
msgid "Tool mesh empty"
msgstr ""
msgid "Pocket added (negative volume)"
msgstr ""
#, possible-boost-format
msgid "Pocket: %1%"
msgstr ""
msgctxt "Keyboard Shortcut"
msgid "Ins"
msgstr ""
localization/i18n/ca/OrcaSlicer_ca.po
+676 -437
View File
File diff suppressed because it is too large Load Diff
localization/i18n/cs/OrcaSlicer_cs.po
+682 -443
View File
File diff suppressed because it is too large Load Diff
localization/i18n/de/OrcaSlicer_de.po
+676 -437
View File
File diff suppressed because it is too large Load Diff
localization/i18n/en/OrcaSlicer_en.po
+78 -203
View File
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Orca Slicer\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-10-06 13:42+0800\n"
"POT-Creation-Date: 2026-10-08 11:08+0800\n"
"PO-Revision-Date: 2026-06-17 15:44-0300\n"
"Last-Translator: Alexandre Folle de Menezes\n"
"Language-Team: \n"
@@ -3164,7 +3164,7 @@ msgstr ""
msgid "Remove parameter"
msgstr ""
msgid "to"
msgid "Range"
msgstr ""
msgid "Add height range"
@@ -5063,9 +5063,6 @@ msgstr ""
msgid "layers"
msgstr ""
msgid "Range"
msgstr ""
msgid "Empty string"
msgstr ""
@@ -9660,6 +9657,9 @@ msgstr ""
msgid "Please input layer value (>= 2)."
msgstr ""
msgid "to"
msgstr ""
msgid "Plate name"
msgstr ""
@@ -20448,6 +20448,21 @@ msgstr ""
msgid "The filament model is unknown. A random filament preset will be used."
msgstr ""
msgid "Hide reference planes and axes"
msgstr ""
msgid "Show reference planes and axes"
msgstr ""
msgid "Hide the printer bed and its plate grid"
msgstr ""
msgid "Show the printer bed and its plate grid"
msgstr ""
msgid "Click a reference plane or a flat face to sketch on it — Esc cancels"
msgstr ""
msgid "Construction"
msgstr ""
@@ -20533,26 +20548,10 @@ msgstr ""
msgid "Bed hidden"
msgstr ""
msgid "FEATURES"
msgid "Reference planes shown"
msgstr ""
msgid "Sketch"
msgstr ""
#, c-format, boost-format
msgid "Sketch plane: %s — pick a tool"
msgstr ""
msgid "Click a face or a reference plane in the viewport, then a sketch tool"
msgstr ""
#, c-format, boost-format
msgid ""
"Sketch plane: %s.\n"
"Pick a tool, or press Menu for the list."
msgstr ""
msgid "Click a face or a reference plane, then a sketch tool."
msgid "Reference planes hidden"
msgstr ""
msgid "Add material (extrude / revolve / sweep / loft / thicken / rib)"
@@ -20820,12 +20819,6 @@ msgstr ""
msgid "Pick a cylindrical surface (bore / outer) or a circular edge for a thread"
msgstr ""
msgid "Import STEP (editable B-rep solid)"
msgstr ""
msgid "Import mesh (STL/OBJ) as an editable B-rep solid"
msgstr ""
msgid "Constrain selected sketch"
msgstr ""
@@ -21138,10 +21131,16 @@ msgstr ""
msgid "New Design — clear the feature tree"
msgstr ""
msgid "Import STEP (editable B-rep solid)"
msgstr ""
msgid "Import mesh (STL/OBJ) as an editable B-rep solid"
msgstr ""
msgid "Export STEP…"
msgstr ""
msgid "Show the printer bed and its plate grid"
msgid "Create a new sketch"
msgstr ""
msgid "Place on Face (F) — lay the picked face on the bed"
@@ -21174,6 +21173,9 @@ msgstr ""
msgid "Height / Y"
msgstr ""
msgid "Sketch"
msgstr ""
msgid "Distance X"
msgstr ""
@@ -21652,6 +21654,9 @@ msgstr ""
msgid "Value"
msgstr ""
msgid "Pick a tool, or press Menu for the list."
msgstr ""
msgid "Constraints"
msgstr ""
@@ -21681,6 +21686,9 @@ msgstr ""
msgid "Show / hide"
msgstr ""
msgid "Zoom to selection"
msgstr ""
msgid "Check interference — find overlapping bodies"
msgstr ""
@@ -21738,6 +21746,9 @@ msgstr ""
msgid "Sketch selected — right-click to Extrude, or double-click to edit"
msgstr ""
msgid "That face is not flat — click a flat face or a reference plane"
msgstr ""
#, c-format, boost-format
msgid "Body %d: vertex selected — click again for the whole body"
msgstr ""
@@ -21780,10 +21791,6 @@ msgstr ""
msgid "Edge %d selected — Shift+click to add edges, or click again for the whole body"
msgstr ""
#, c-format, boost-format
msgid "%s plane selected — right-click for the drawing tools"
msgstr ""
#, c-format, boost-format
msgid "%s plane selected — right-click to sketch on it, or click an object to select it"
msgstr ""
@@ -21838,7 +21845,7 @@ msgstr ""
msgid "Text unchanged"
msgstr ""
msgid "Text cancelled"
msgid "Text canceled"
msgstr ""
msgid "Import SVG"
@@ -22458,7 +22465,7 @@ msgstr ""
msgid ""
"Nothing yet — import a STEP or a mesh from the toolbar,\n"
"or click a reference plane and right-click it to start a sketch."
"or press Sketch and click a reference plane to start a sketch."
msgstr ""
msgid "No solid yet — select a sketch and right-click it to Extrude."
@@ -22490,12 +22497,25 @@ msgstr ""
msgid "Finding the feature's faces…"
msgstr ""
msgid "Select a body first — click it in the viewport or the Bodies list"
msgid "The model is being rebuilt — zoom again when it finishes"
msgstr ""
#, c-format, boost-format
msgid "%s has nothing on show to zoom to"
msgstr ""
msgid "That body has no display mesh yet — recompute first"
msgstr ""
msgid "Select something to zoom to"
msgstr ""
msgid "Finish or cancel what is open first"
msgstr ""
msgid "Select a body first — click it in the viewport or the Bodies list"
msgstr ""
msgid "Drag the arrows to move, the rings to rotate — then Confirm (Esc cancels)"
msgstr ""
@@ -22515,9 +22535,6 @@ msgstr ""
msgid "Placed on face — body laid flat on the bed"
msgstr ""
msgid "Finish or cancel what is open first"
msgstr ""
#, c-format, boost-format
msgid "Edit rejected: %s"
msgstr ""
@@ -22866,6 +22883,16 @@ msgstr ""
msgid "Line E%d"
msgstr ""
#, c-format, boost-format
msgid "Sketch plane: %s — pick a tool"
msgstr ""
#, c-format, boost-format
msgid ""
"Sketch plane: %s.\n"
"Pick a tool, or press Menu for the list."
msgstr ""
msgid "Plane ready"
msgstr ""
@@ -23082,7 +23109,10 @@ msgctxt "Design"
msgid "Sketch"
msgstr ""
msgid "Click a face or a reference plane, then pick a drawing tool"
msgid "Select a flat face or a reference plane to sketch on"
msgstr ""
msgid "Sketch on the selected flat face or plane, or click one next"
msgstr ""
msgctxt "Design"
@@ -23152,9 +23182,6 @@ msgctxt "Design"
msgid "Hole"
msgstr ""
msgid "Drill a hole, centerd on a picked face or placed on a plane"
msgstr ""
msgctxt "Design"
msgid "Thread"
msgstr ""
@@ -23317,6 +23344,13 @@ msgstr ""
msgid "Set the selected body's display color"
msgstr ""
msgctxt "Design"
msgid "Zoom to selection"
msgstr ""
msgid "Frame the selection in the view, keeping the view direction"
msgstr ""
msgctxt "Design"
msgid "Delete"
msgstr ""
@@ -23581,165 +23615,6 @@ msgstr ""
msgid "Size: %.1f × %.1f mm"
msgstr ""
msgid "Primitive"
msgstr ""
msgid "Empty mesh generated"
msgstr ""
#. TRN Default name of an object created from the box primitive shape.
msgid "Box"
msgstr ""
#. TRN Primitive gizmo: label in front of the preset cube size buttons
msgid "Quick:"
msgstr ""
msgid "Width (X)"
msgstr ""
msgid "Depth (Y)"
msgstr ""
msgid "Height (Z)"
msgstr ""
#. TRN Primitive gizmo: bottom radius of a cone ("Top R" is the top radius)
msgid "Bottom R"
msgstr ""
msgid "Top R"
msgstr ""
#. TRN Primitive gizmo: major radius of a torus ("Minor R" is the tube radius)
msgid "Major R"
msgstr ""
msgid "Minor R"
msgstr ""
msgid "All edges"
msgstr ""
msgid "Top edges"
msgstr ""
msgid "Bottom edges"
msgstr ""
msgid "Lateral edges"
msgstr ""
msgid "Mesh resolution"
msgstr ""
msgid "Add Shape"
msgstr ""
msgid "No outer profile"
msgstr ""
msgid "Failed to make outer face"
msgstr ""
msgid "Failed to build face with holes"
msgstr ""
msgid "Revolve failed"
msgstr ""
msgid "Profile"
msgstr ""
msgid "Start new profile (for holes)"
msgstr ""
msgid "Segments"
msgstr ""
msgid "Sides"
msgstr ""
msgid "Click on canvas to draw"
msgstr ""
msgid "Snap to grid"
msgstr ""
msgid "Grid step"
msgstr ""
msgid "Outer"
msgstr ""
msgid "closed"
msgstr ""
#. TRN Sketch gizmo profile list: "Outer" or "Hole", profile number, point count, "closed" or nothing
#, boost-format
msgid "%1% %2%: %3% points %4%"
msgstr ""
msgid "XY (Top)"
msgstr ""
msgid "XZ (Front)"
msgstr ""
msgid "YZ (Side)"
msgstr ""
msgid "Revolve deg"
msgstr ""
msgid "Set to 0 for extrude, >0 for revolve"
msgstr ""
msgid "Pocket (cut)"
msgstr ""
#, c-format
msgid "%zu closed profile"
msgid_plural "%zu closed profiles"
msgstr[0] ""
msgstr[1] ""
msgid "Draw a closed profile to enable"
msgstr ""
msgid "Clear all"
msgstr ""
msgid "Empty result"
msgstr ""
#, boost-format
msgid "Extrude: %1%"
msgstr ""
#, boost-format
msgid "Revolve: %1%"
msgstr ""
msgid "No object selected"
msgstr ""
msgid "Face failed"
msgstr ""
msgid "Face with holes failed"
msgstr ""
msgid "Tool mesh empty"
msgstr ""
msgid "Pocket added (negative volume)"
msgstr ""
#, boost-format
msgid "Pocket: %1%"
msgstr ""
msgctxt "Keyboard Shortcut"
msgid "Ins"
msgstr ""
localization/i18n/es/OrcaSlicer_es.po
+671 -433
View File
File diff suppressed because it is too large Load Diff
localization/i18n/eu/OrcaSlicer_eu.po
+672 -433
View File
File diff suppressed because it is too large Load Diff
localization/i18n/fr/OrcaSlicer_fr.po
+670 -431
View File
File diff suppressed because it is too large Load Diff
localization/i18n/hu/OrcaSlicer_hu.po
+676 -437
View File
File diff suppressed because it is too large Load Diff
localization/i18n/it/OrcaSlicer_it.po
+676 -437
View File
File diff suppressed because it is too large Load Diff
localization/i18n/ja/OrcaSlicer_ja.po
+670 -431
View File
File diff suppressed because it is too large Load Diff
localization/i18n/ko/OrcaSlicer_ko.po
+672 -432
View File
File diff suppressed because it is too large Load Diff
localization/i18n/list.txt
-2
View File
@@ -296,8 +296,6 @@ src/slic3r/GUI/CAD/DesignSketchTool.cpp
src/slic3r/GUI/CAD/SketchInlineEditor.cpp
src/slic3r/GUI/CAD/DesignOffer.hpp
src/slic3r/GUI/CAD/DesignTextDialog.cpp
src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp
src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp
src/slic3r/GUI/KeyChord.cpp
src/slic3r/GUI/Shortcuts.cpp
src/libslic3r/CAD/CadDocument.cpp
localization/i18n/lt/OrcaSlicer_lt.po
+678 -439
View File
File diff suppressed because it is too large Load Diff
localization/i18n/nl/OrcaSlicer_nl.po
+676 -437
View File
File diff suppressed because it is too large Load Diff
localization/i18n/pl/OrcaSlicer_pl.po
+678 -439
View File
File diff suppressed because it is too large Load Diff
localization/i18n/pt_BR/OrcaSlicer_pt_BR.po
+672 -433
View File
File diff suppressed because it is too large Load Diff
localization/i18n/ru/OrcaSlicer_ru.po
+678 -439
View File
File diff suppressed because it is too large Load Diff
localization/i18n/sv/OrcaSlicer_sv.po
+676 -437
View File
File diff suppressed because it is too large Load Diff
localization/i18n/th/OrcaSlicer_th.po
+666 -427
View File
File diff suppressed because it is too large Load Diff
localization/i18n/tr/OrcaSlicer_tr.po
+676 -437
View File
File diff suppressed because it is too large Load Diff
localization/i18n/uk/OrcaSlicer_uk.po
+684 -445
View File
File diff suppressed because it is too large Load Diff
localization/i18n/vi/OrcaSlicer_vi.po
+670 -431
View File
File diff suppressed because it is too large Load Diff
localization/i18n/zh_CN/OrcaSlicer_zh_CN.po
+666 -427
View File
File diff suppressed because it is too large Load Diff
localization/i18n/zh_TW/OrcaSlicer_zh_TW.po
+666 -427
View File
File diff suppressed because it is too large Load Diff
resources/images/design_bed.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#949494" stroke-width="0.85" stroke-linecap="round" stroke-linejoin="round"><path d="M2 9 14 9 22 15 10 15Z"/><path d="M2 9V11L10 17H22V15M10 15V17"/><path d="M6 9 14 15M10 9 18 15M6 12H18"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 301 B

resources/images/design_export.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#949494" stroke-width="0.85" stroke-linecap="round" stroke-linejoin="round"><path d="M3.15 19.57V4.43A1.28 1.28 0 0 1 4.43 3.15H17.05L20.85 6.95V19.57A1.28 1.28 0 0 1 19.57 20.85H4.43A1.28 1.28 0 0 1 3.15 19.57ZM8.2 3.15V5.68A1.28 1.28 0 0 0 9.48 6.95H14.52A1.28 1.28 0 0 0 15.8 5.68V3.15M17.05 20.85V15.8A1.28 1.28 0 0 0 15.8 14.53H8.2A1.28 1.28 0 0 0 6.95 15.8V20.85"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 481 B

resources/images/design_import_mesh.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M8.08,10.74 8.08,5.4M8.08,10.74 15.55,4.87M17.15,10.2 15.55,4.87M4.88,8.6 8.62,20.87M17.15,10.2 20.89,16.07M8.08,10.74 12.78,15.54 17.15,10.2M17.15,19.8 12.78,15.54 8.62,20.87M4.88,8.6 8.08,10.74 17.15,10.2 19.82,7M8.08,10.74 8.62,20.87M17.15,10.2 17.15,19.8" fill="none" stroke="#949494" stroke-width="0.6" stroke-linecap="round" stroke-linejoin="round"/><polygon points="4.88,8.6 8.08,5.4 15.55,4.87 19.82,7 20.89,16.07 17.15,19.8 8.62,20.87 4.35,17.14" fill="none" stroke="#949494" stroke-width="0.85" stroke-linejoin="round"/><polygon points="2.84,4.68 7.32,4.68 7.32,2.84 11.29,5.86 7.32,8.88 7.32,7.04 2.84,7.04" style="fill:#009688;stroke:#009688;stroke-width:0.4;stroke-linejoin:round"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 794 B

resources/images/design_new.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#949494" stroke-width="0.85" stroke-linecap="round" stroke-linejoin="round"><rect x="3.15" y="3.15" width="17.7" height="17.7" rx="1.28"/><path d="M7.6 12H16.4M12 7.6V16.4"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 284 B

resources/images/design_new_sketch.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#949494" stroke-width="0.85" stroke-linecap="round" stroke-linejoin="round"><path d="M5.88 3.88H17.16M3.88 5.88V17.16M19.16 5.88V12.38M5.88 19.16H12.38M9.85 7.85H13.2M7.85 9.85V13.2M14.92 9.85A7.35 7.35 0 0 1 9.85 14.92"/><path d="M2.83 2.83h2.1v2.1h-2.1zM18.11 2.83h2.1v2.1h-2.1zM2.83 18.11h2.1v2.1h-2.1zM6.8 6.8h2.1v2.1h-2.1zM14.15 6.8h2.1v2.1h-2.1zM6.8 14.15h2.1v2.1h-2.1z" fill="#949494" stroke="none"/><polygon points="16.01,13.19 18.3,13.19 18.3,16.01 21.12,16.01 21.12,18.3 18.3,18.3 18.3,21.12 16.01,21.12 16.01,18.3 13.19,18.3 13.19,16.01 16.01,16.01" style="fill:#009688;stroke:#009688;stroke-width:0.4;stroke-linejoin:round"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 747 B

resources/images/design_step.svg
+1 -1
View File
@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3.0 9.0 L16.0 9.0 L16.0 21.0 L3.0 21.0 ZM3.0 9.0 L7.0 5.0 L20.0 5.0 L16.0 9.0M20.0 5.0 L20.0 17.0 L16.0 21.0" fill="none" stroke="#949494" stroke-width="0.85" stroke-linecap="round" stroke-linejoin="round"/><path d="M6.168410256410256 13.423897435897436V13.868410256410256Q5.908923076923077 13.744307692307691 5.678769230769231 13.683384615384615Q5.448615384615385 13.622461538461538 5.23425641025641 13.622461538461538Q4.861948717948718 13.622461538461538 4.66 13.766871794871793Q4.458051282051283 13.91128205128205 4.458051282051283 14.177538461538461Q4.458051282051283 14.400923076923076 4.592307692307693 14.514871794871794Q4.726564102564103 14.628820512820512 5.101128205128205 14.69876923076923L5.3764102564102565 14.755179487179486Q5.886358974358975 14.852205128205128 6.128923076923078 15.09702564102564Q6.37148717948718 15.341846153846152 6.37148717948718 15.75251282051282Q6.37148717948718 16.242153846153844 6.043179487179488 16.49487179487179Q5.7148717948717955 16.747589743589742 5.080820512820513 16.747589743589742Q4.841641025641026 16.747589743589742 4.572000000000001 16.693435897435897Q4.302358974358975 16.639282051282052 4.013538461538462 16.53323076923077V16.063897435897434Q4.291076923076924 16.219589743589744 4.557333333333334 16.2985641025641Q4.823589743589745 16.37753846153846 5.080820512820513 16.37753846153846Q5.471179487179487 16.37753846153846 5.683282051282052 16.224102564102562Q5.895384615384616 16.070666666666664 5.895384615384616 15.786358974358974Q5.895384615384616 15.538153846153845 5.743076923076924 15.398256410256408Q5.590769230769231 15.258358974358973 5.243282051282051 15.188410256410256L4.965743589743591 15.134256410256409Q4.455794871794872 15.032717948717949 4.227897435897436 14.816102564102565Q4.000000000000001 14.599487179487179 4.000000000000001 14.213641025641024Q4.000000000000001 13.766871794871793 4.314769230769231 13.509641025641024Q4.629538461538462 13.252410256410256 5.182358974358975 13.252410256410256Q5.419282051282051 13.252410256410256 5.665230769230769 13.29528205128205Q5.911179487179488 13.338153846153846 6.168410256410256 13.423897435897436ZM6.615179487179487 13.313333333333333H9.46502564102564V13.696923076923076H8.269128205128204V16.682153846153845H7.811076923076923V13.696923076923076H6.615179487179487ZM9.905025641025642 13.313333333333333H12.035076923076925V13.696923076923076H10.360820512820514V14.69425641025641H11.965128205128206V15.077846153846153H10.360820512820514V16.2985641025641H12.075692307692309V16.682153846153845H9.905025641025642ZM13.280615384615384 13.687897435897435V14.953743589743588H13.85374358974359Q14.171897435897435 14.953743589743588 14.345641025641026 14.78902564102564Q14.519384615384615 14.624307692307692 14.519384615384615 14.319692307692307Q14.519384615384615 14.017333333333333 14.345641025641026 13.852615384615383Q14.171897435897435 13.687897435897435 13.85374358974359 13.687897435897435ZM12.824820512820512 13.313333333333333H13.85374358974359Q14.420102564102564 13.313333333333333 14.710051282051282 13.569435897435897Q15.0 13.82553846153846 15.0 14.319692307692307Q15.0 14.818358974358974 14.710051282051282 15.073333333333332Q14.420102564102564 15.32830769230769 13.85374358974359 15.32830769230769H13.280615384615384V16.682153846153845H12.824820512820512Z" fill="#949494" stroke="none"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 1.5 23 23"><path d="M3.0 9.0 L16.0 9.0 L16.0 21.0 L3.0 21.0 ZM3.0 9.0 L7.0 5.0 L20.0 5.0 L16.0 9.0M20.0 5.0 L20.0 17.0 L16.0 21.0" fill="none" stroke="#949494" stroke-width="0.85" stroke-linecap="round" stroke-linejoin="round"/><path d="M6.168410256410256 13.423897435897436V13.868410256410256Q5.908923076923077 13.744307692307691 5.678769230769231 13.683384615384615Q5.448615384615385 13.622461538461538 5.23425641025641 13.622461538461538Q4.861948717948718 13.622461538461538 4.66 13.766871794871793Q4.458051282051283 13.91128205128205 4.458051282051283 14.177538461538461Q4.458051282051283 14.400923076923076 4.592307692307693 14.514871794871794Q4.726564102564103 14.628820512820512 5.101128205128205 14.69876923076923L5.3764102564102565 14.755179487179486Q5.886358974358975 14.852205128205128 6.128923076923078 15.09702564102564Q6.37148717948718 15.341846153846152 6.37148717948718 15.75251282051282Q6.37148717948718 16.242153846153844 6.043179487179488 16.49487179487179Q5.7148717948717955 16.747589743589742 5.080820512820513 16.747589743589742Q4.841641025641026 16.747589743589742 4.572000000000001 16.693435897435897Q4.302358974358975 16.639282051282052 4.013538461538462 16.53323076923077V16.063897435897434Q4.291076923076924 16.219589743589744 4.557333333333334 16.2985641025641Q4.823589743589745 16.37753846153846 5.080820512820513 16.37753846153846Q5.471179487179487 16.37753846153846 5.683282051282052 16.224102564102562Q5.895384615384616 16.070666666666664 5.895384615384616 15.786358974358974Q5.895384615384616 15.538153846153845 5.743076923076924 15.398256410256408Q5.590769230769231 15.258358974358973 5.243282051282051 15.188410256410256L4.965743589743591 15.134256410256409Q4.455794871794872 15.032717948717949 4.227897435897436 14.816102564102565Q4.000000000000001 14.599487179487179 4.000000000000001 14.213641025641024Q4.000000000000001 13.766871794871793 4.314769230769231 13.509641025641024Q4.629538461538462 13.252410256410256 5.182358974358975 13.252410256410256Q5.419282051282051 13.252410256410256 5.665230769230769 13.29528205128205Q5.911179487179488 13.338153846153846 6.168410256410256 13.423897435897436ZM6.615179487179487 13.313333333333333H9.46502564102564V13.696923076923076H8.269128205128204V16.682153846153845H7.811076923076923V13.696923076923076H6.615179487179487ZM9.905025641025642 13.313333333333333H12.035076923076925V13.696923076923076H10.360820512820514V14.69425641025641H11.965128205128206V15.077846153846153H10.360820512820514V16.2985641025641H12.075692307692309V16.682153846153845H9.905025641025642ZM13.280615384615384 13.687897435897435V14.953743589743588H13.85374358974359Q14.171897435897435 14.953743589743588 14.345641025641026 14.78902564102564Q14.519384615384615 14.624307692307692 14.519384615384615 14.319692307692307Q14.519384615384615 14.017333333333333 14.345641025641026 13.852615384615383Q14.171897435897435 13.687897435897435 13.85374358974359 13.687897435897435ZM12.824820512820512 13.313333333333333H13.85374358974359Q14.420102564102564 13.313333333333333 14.710051282051282 13.569435897435897Q15.0 13.82553846153846 15.0 14.319692307692307Q15.0 14.818358974358974 14.710051282051282 15.073333333333332Q14.420102564102564 15.32830769230769 13.85374358974359 15.32830769230769H13.280615384615384V16.682153846153845H12.824820512820512Z" fill="#949494" stroke="none"/><polygon points="2.72,5.99 7.02,5.99 7.02,4.22 10.82,7.12 7.02,10.01 7.02,8.25 2.72,8.25" style="fill:#009688;stroke:#009688;stroke-width:0.38;stroke-linejoin:round"/></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

resources/images/design_zoom.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#949494" stroke-width="0.85" stroke-linecap="round" stroke-linejoin="round"><circle cx="10" cy="10" r="7"/><path d="M6 10a4 4 0 0 1 4-4M15 15 21.5 21.5"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 264 B

resources/images/toolbar_modifier_cube_dark.svg
-4
View File
@@ -1,4 +0,0 @@
<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.0007 3.15607L5.26748 9.97446C5.0759 10.0857 4.8723 10.2988 4.71546 10.5713C4.55862 10.8438 4.47656 11.127 4.47656 11.349V24.4715C4.47656 24.6929 4.55879 24.9752 4.71606 25.2472C4.87328 25.5192 5.07737 25.7322 5.26956 25.8438L17.1143 32.6992C17.3061 32.8102 17.5904 32.8795 17.902 32.8782C18.2136 32.8768 18.4968 32.8049 18.6868 32.6927L30.2729 25.8523C30.4645 25.739 30.6677 25.524 30.8242 25.2501C30.9806 24.9761 31.0625 24.6919 31.0625 24.4693V11.2435C31.0625 11.0216 30.9805 10.7392 30.8238 10.4679C30.667 10.1966 30.4635 9.98491 30.2715 9.87455L18.582 3.15275C18.3912 3.04273 18.1054 2.97271 17.7915 2.97339C17.4777 2.97408 17.192 3.045 17.0007 3.15607ZM6.3957 11.3642C6.53284 11.1245 6.83831 11.0414 7.07799 11.1785L16.9733 16.8405C17.3553 17.0587 17.6738 17.4171 17.8953 17.7985C18.1169 18.1801 18.2703 18.6338 18.2717 19.0733L18.2893 30.4075C18.2897 30.6837 18.0662 30.9079 17.7901 30.9083C17.5139 30.9087 17.2897 30.6852 17.2893 30.4091L17.2717 19.0767C17.2708 18.8547 17.1879 18.5717 17.0305 18.3007C16.8729 18.0294 16.6691 17.8183 16.4776 17.709L6.58136 12.0465C6.34168 11.9093 6.25855 11.6039 6.3957 11.3642Z" fill="#4db6ac"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M19.0809 2.28613C18.7002 2.0665 18.2304 1.97243 17.7893 1.9734C17.3481 1.97436 16.8787 2.07053 16.4985 2.29133L4.76515 9.10978C4.38527 9.33044 4.06884 9.69007 3.84874 10.0725C3.6286 10.455 3.47656 10.9093 3.47656 11.349V24.4715C3.47656 24.9118 3.62953 25.3658 3.85033 25.7477C4.07118 26.1297 4.38804 26.4882 4.76735 26.7085L16.6135 33.5647C16.9954 33.7857 17.4651 33.8801 17.9064 33.8782C18.3475 33.8762 18.8161 33.7778 19.1954 33.5537L30.7814 26.7133C31.1591 26.4902 31.4737 26.1292 31.6925 25.746C31.9114 25.3627 32.0625 24.9084 32.0625 24.4693V11.2435C32.0625 10.8037 31.9104 10.3497 31.6896 9.96764C31.4689 9.58563 31.1515 9.22695 30.7698 9.00759L19.0809 2.28613ZM29.6625 11.8015C29.786 12.0485 29.6859 12.3489 29.4389 12.4723L20.3956 16.994C20.1486 17.1175 19.8483 17.0174 19.7248 16.7704C19.6013 16.5234 19.7014 16.2231 19.9484 16.0996L28.9917 11.5779C29.2387 11.4544 29.539 11.5545 29.6625 11.8015Z" fill="#bdbdbd"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

resources/images/toolbar_sketch.svg
-8
View File
@@ -1,8 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
<!-- Pencil body -->
<path d="M28.5 6.5l5 5L14 31l-5.5 1.5L10 27 28.5 6.5z" style="fill:#009688"/>
<!-- Pencil tip (dark) -->
<path d="M8.5 28.5l1.5 1.5 4.5-1L28.5 15l-3.5-3.5L8.5 28z" style="fill:#2b3436"/>
<!-- Pencil line -->
<line x1="10" y1="26" x2="25" y2="11" stroke="#2b3436" stroke-width="2"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 406 B

resources/images/toolbar_sketch_dark.svg
-8
View File
@@ -1,8 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
<!-- Pencil body (dark mode colors) -->
<path d="M28.5 6.5l5 5L14 31l-5.5 1.5L10 27 28.5 6.5z" style="fill:#4db6ac"/>
<!-- Pencil tip -->
<path d="M8.5 28.5l1.5 1.5 4.5-1L28.5 15l-3.5-3.5L8.5 28z" style="fill:#e0e0e0"/>
<!-- Pencil line -->
<line x1="10" y1="26" x2="25" y2="11" stroke="#e0e0e0" stroke-width="2"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 418 B

resources/profiles/Anycubic/Anycubic Kobra 3 V2_buildplate_model.stl
BIN
View File
Binary file not shown.
resources/profiles/Anycubic/Anycubic Kobra 3 V2_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 457 KiB

After

Width:  |  Height:  |  Size: 42 KiB

resources/profiles/BBL/Bambu Lab A2L_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 44 KiB

resources/profiles/BBL/Bambu Lab H2C_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 33 KiB

resources/profiles/BBL/Bambu Lab H2D Pro_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 24 KiB

resources/profiles/BBL/Bambu Lab H2S_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 24 KiB

resources/profiles/BBL/Bambu Lab P2S_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 32 KiB

resources/profiles/BBL/Bambu Lab X2D_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 18 KiB

resources/profiles/BBL/bbl-3dp-A1M.stl
BIN
View File
Binary file not shown.
resources/profiles/BBL/bbl-3dp-H2C.stl
BIN
View File
Binary file not shown.
resources/profiles/BBL/bbl-3dp-H2D.stl
BIN
View File
Binary file not shown.
resources/profiles/BBL/bbl-3dp-O1S.stl
BIN
View File
Binary file not shown.
resources/profiles/BBL/bbl-3dp-X1.stl
BIN
View File
Binary file not shown.
resources/profiles/BBL/bbl-3dp-hotend.stl
BIN
View File
Binary file not shown.
resources/profiles/Creality.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "Creality",
"version": "02.03.02.86",
"version": "02.03.02.87",
"force_update": "0",
"description": "Creality configurations",
"machine_model_list": [
resources/profiles/Creality/Creality CR-10 Smart Pro_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 263 KiB

After

Width:  |  Height:  |  Size: 36 KiB

resources/profiles/Creality/Creality CR-10 Smart_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 33 KiB

resources/profiles/Creality/Creality CR-10S Pro V2_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 242 KiB

After

Width:  |  Height:  |  Size: 36 KiB

resources/profiles/Creality/Creality CR-10_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 195 KiB

After

Width:  |  Height:  |  Size: 46 KiB

resources/profiles/Creality/Creality CR-20 Pro_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 242 KiB

After

Width:  |  Height:  |  Size: 41 KiB

resources/profiles/Creality/Creality CR-M4 SE_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 130 KiB

After

Width:  |  Height:  |  Size: 36 KiB

resources/profiles/Creality/Creality Ender-2 Pro_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 175 KiB

After

Width:  |  Height:  |  Size: 32 KiB

resources/profiles/Creality/Creality Ender-3 Max Neo_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 233 KiB

After

Width:  |  Height:  |  Size: 41 KiB

resources/profiles/Creality/Creality Ender-3 Max_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 33 KiB

resources/profiles/Creality/Creality Ender-3 Neo_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 142 KiB

After

Width:  |  Height:  |  Size: 39 KiB

resources/profiles/Creality/Creality Ender-3 S1 Sonic_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 174 KiB

After

Width:  |  Height:  |  Size: 37 KiB

resources/profiles/Creality/Creality Ender-5 S1 Sonic_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 130 KiB

After

Width:  |  Height:  |  Size: 48 KiB

resources/profiles/Creality/Creality Sermoon D3 Pro_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 301 KiB

After

Width:  |  Height:  |  Size: 48 KiB

resources/profiles/Creality/Creality Sermoon D3_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 43 KiB

resources/profiles/Creality/Creality Sermoon M300_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 123 KiB

After

Width:  |  Height:  |  Size: 44 KiB

resources/profiles/Creality/Creality Sermoon V1 Pro_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 235 KiB

After

Width:  |  Height:  |  Size: 42 KiB

resources/profiles/Creality/Creality Sermoon V1_cover.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 41 KiB

resources/profiles/Creality/creality_ender2pro_buildplate_model.stl
BIN
View File
Binary file not shown.
resources/profiles/Creality/creality_ender2pro_buildplate_texture.svg
+1
View File
@@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 175 175"><path d="M59.89,164.54s.06.03.06.06v1.7s-.03.06-.06.06l-5.42.02c-1.6,0-2.89,1.31-2.87,2.92.02,1.58,1.34,2.83,2.91,2.83h5.37s.06.03.06.06v1.7s-.03.06-.06.06h-5.36c-2.66,0-4.82-2.18-4.74-4.84.07-2.47,2.07-4.47,4.53-4.55l5.57-.02ZM68.08,170.15c1.56,0,2.82-1.28,2.8-2.85-.02-1.54-1.31-2.77-2.85-2.77h-6.85s-.06.03-.06.06v9.3s.03.06.06.06h1.7s.06-.03.06-.06v-7.47s.03-.06.06-.06h5.05c.53,0,.98.41,1,.94.02.56-.43,1.01-.98,1.01h-4.83c-.06,0-.08.07-.04.11l5.5,5.51s.03.02.04.02h2.4c.06,0,.08-.07.04-.11l-3.69-3.7s0,0,0,0h.57ZM96.24,164.54h-1.7s-.06.03-.06.06v8.3c0,.58.47,1.05,1.05,1.05h6.76s.06-.03.06-.06v-1.7s-.03-.06-.06-.06h-5.92s-.06-.03-.06-.06v-7.47s-.03-.06-.06-.06M88.42,164.61c-.05-.08-.17-.08-.22,0l-5.34,9.26s.03.05.06.1h1.96s.04-.02.05-.03l3.32-5.76h.11l2.23,3.87s-.03.05-.06.1h-2.91s-.04.02-.05.03l-.98,1.7s.03.05.05.1c1.58,0,6.28,0,7.05,0,.05,0,.08-.05.05-.09-.58-1-5.33-9.26-5.33-9.26M125.16,164.54h-2.22s-.04,0-.05.02l-3.22,3.85s-.07.03-.1,0l-3.23-3.85s-.03-.02-.05-.02c-.49,0-7.47,0-10.16,0-.04,0-.06.03-.06.06v1.7s.03.06.06.06h3.67s.06.03.06.06v7.47s.03.06.06.06h1.7s.06-.03.06-.06v-7.47s.03-.06.06-.06h3.69s.04,0,.05.02l3.2,3.82s.02.03.02.04v3.65s.03.06.06.06h1.7s.06-.03.06-.06v-3.65s0-.03.02-.04l4.66-5.56s0-.1-.05-.1M103.47,173.96h1.7s.06-.03.06-.06v-9.29s-.03-.06-.06-.06h-1.7s-.06.03-.06.06v9.29s.03.06.06.06M81.84,166.31v-1.7s-.03-.06-.06-.06h-5.28c-2.6,0-4.71,2.11-4.71,4.71s2.11,4.71,4.71,4.71h5.28s.06-.03.06-.06v-1.7s-.03-.06-.06-.06h-5.28c-1.27,0-2.35-.83-2.74-1.97h8.02s.06-.03.06-.06v-1.7s-.03-.06-.06-.06h-8.02c.38-1.14,1.46-1.97,2.74-1.97h5.28s.06-.03.06-.06" style="fill:#bcbec0;"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

resources/profiles/Creality/creality_sermoond3_buildplate_model.stl
BIN
View File
Binary file not shown.
resources/profiles/Creality/creality_sermoond3_buildplate_texture.svg
+1
View File
@@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 175 175"><path d="M59.89,164.54s.06.03.06.06v1.7s-.03.06-.06.06l-5.42.02c-1.6,0-2.89,1.31-2.87,2.92.02,1.58,1.34,2.83,2.91,2.83h5.37s.06.03.06.06v1.7s-.03.06-.06.06h-5.36c-2.66,0-4.82-2.18-4.74-4.84.07-2.47,2.07-4.47,4.53-4.55l5.57-.02ZM68.08,170.15c1.56,0,2.82-1.28,2.8-2.85-.02-1.54-1.31-2.77-2.85-2.77h-6.85s-.06.03-.06.06v9.3s.03.06.06.06h1.7s.06-.03.06-.06v-7.47s.03-.06.06-.06h5.05c.53,0,.98.41,1,.94.02.56-.43,1.01-.98,1.01h-4.83c-.06,0-.08.07-.04.11l5.5,5.51s.03.02.04.02h2.4c.06,0,.08-.07.04-.11l-3.69-3.7s0,0,0,0h.57ZM96.24,164.54h-1.7s-.06.03-.06.06v8.3c0,.58.47,1.05,1.05,1.05h6.76s.06-.03.06-.06v-1.7s-.03-.06-.06-.06h-5.92s-.06-.03-.06-.06v-7.47s-.03-.06-.06-.06M88.42,164.61c-.05-.08-.17-.08-.22,0l-5.34,9.26s.03.05.06.1h1.96s.04-.02.05-.03l3.32-5.76h.11l2.23,3.87s-.03.05-.06.1h-2.91s-.04.02-.05.03l-.98,1.7s.03.05.05.1c1.58,0,6.28,0,7.05,0,.05,0,.08-.05.05-.09-.58-1-5.33-9.26-5.33-9.26M125.16,164.54h-2.22s-.04,0-.05.02l-3.22,3.85s-.07.03-.1,0l-3.23-3.85s-.03-.02-.05-.02c-.49,0-7.47,0-10.16,0-.04,0-.06.03-.06.06v1.7s.03.06.06.06h3.67s.06.03.06.06v7.47s.03.06.06.06h1.7s.06-.03.06-.06v-7.47s.03-.06.06-.06h3.69s.04,0,.05.02l3.2,3.82s.02.03.02.04v3.65s.03.06.06.06h1.7s.06-.03.06-.06v-3.65s0-.03.02-.04l4.66-5.56s0-.1-.05-.1M103.47,173.96h1.7s.06-.03.06-.06v-9.29s-.03-.06-.06-.06h-1.7s-.06.03-.06.06v9.29s.03.06.06.06M81.84,166.31v-1.7s-.03-.06-.06-.06h-5.28c-2.6,0-4.71,2.11-4.71,4.71s2.11,4.71,4.71,4.71h5.28s.06-.03.06-.06v-1.7s-.03-.06-.06-.06h-5.28c-1.27,0-2.35-.83-2.74-1.97h8.02s.06-.03.06-.06v-1.7s-.03-.06-.06-.06h-8.02c.38-1.14,1.46-1.97,2.74-1.97h5.28s.06-.03.06-.06" style="fill:#bcbec0;"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

resources/profiles/Creality/machine/Creality Ender-2 Pro.json
+2 -2
View File
@@ -2,9 +2,9 @@
"type": "machine_model",
"name": "Creality Ender-2 Pro",
"nozzle_diameter": "0.4",
"bed_model": "creality_k1_buildplate_model.stl",
"bed_model": "creality_ender2pro_buildplate_model.stl",
"default_bed_type": "Cool Plate",
"bed_texture": "",
"bed_texture": "creality_ender2pro_buildplate_texture.svg",
"family": "Creality",
"hotend_model": "",
"machine_tech": "FFF",
resources/profiles/Creality/machine/Creality Sermoon D3 Pro.json
+2 -2
View File
@@ -2,9 +2,9 @@
"type": "machine_model",
"name": "Creality Sermoon D3 Pro",
"nozzle_diameter": "0.4",
"bed_model": "creality_cr10v2_buildplate_model.stl",
"bed_model": "creality_sermoond3_buildplate_model.stl",
"default_bed_type": "High Temp Plate",
"bed_texture": "creality_cr10v2_buildplate_texture.svg",
"bed_texture": "creality_sermoond3_buildplate_texture.svg",
"family": "Creality",
"hotend_model": "",
"machine_tech": "FFF",
resources/profiles/Creality/machine/Creality Sermoon D3.json
+2 -2
View File
@@ -2,9 +2,9 @@
"type": "machine_model",
"name": "Creality Sermoon D3",
"nozzle_diameter": "0.4",
"bed_model": "creality_cr10v2_buildplate_model.stl",
"bed_model": "creality_sermoond3_buildplate_model.stl",
"default_bed_type": "High Temp Plate",
"bed_texture": "creality_cr10v2_buildplate_texture.svg",
"bed_texture": "creality_sermoond3_buildplate_texture.svg",
"family": "Creality",
"hotend_model": "",
"machine_tech": "FFF",

Some files were not shown because too many files have changed in this diff Show More