Skip to content

Commit

Permalink
change names related to dependency and github back to "OrcaSlicer"
Browse files Browse the repository at this point in the history
  • Loading branch information
womendoushihaoyin committed Sep 11, 2024
1 parent 90b8a76 commit 09119eb
Show file tree
Hide file tree
Showing 23 changed files with 65 additions and 65 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ body:
**Thank you for using Snapmaker Orca and wanting to report a bug.**
Please note that this is not the place to make feature requests or ask for help.
For this, please use the [Feature request](https://github.com/SoftFever/Snapmaker_Orca/issues/new?assignees=&labels=&projects=&template=feature_request.yml) issue type or you can discuss your idea on our [Discord server](https://discord.gg/P4VE9UY9gJ) with others.
For this, please use the [Feature request](https://github.com/SoftFever/OrcaSlicer/issues/new?assignees=&labels=&projects=&template=feature_request.yml) issue type or you can discuss your idea on our [Discord server](https://discord.gg/P4VE9UY9gJ) with others.
Before filing, please check if the issue already exists (either open or closed) by using the search bar on the issues page. If it does, comment there. Even if it's closed, we can reopen it based on your comment.
- type: checkboxes
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ contact_links:
url: https://discord.gg/P4VE9UY9gJ
about: Please ask and answer support "how do I?"questions here.
- name: Discussion Forum
url: https://github.com/SoftFever/Snapmaker_Orca/discussions
url: https://github.com/SoftFever/OrcaSlicer/discussions
about: Please raise ideas and feature suggestions here.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ body:
Thanks for taking the time to fill out this feature request!
If your idea is still at the formulation stage, or you're not sure it would
be useful to many users, you can raise it as a discussion topic under [Ideas](https://github.com/SoftFever/Snapmaker_Orca/discussions/categories/ideas)
be useful to many users, you can raise it as a discussion topic under [Ideas](https://github.com/SoftFever/OrcaSlicer/discussions/categories/ideas)
or you can raise it on the [Discord server](https://discord.gg/P4VE9UY9gJ).
- type: checkboxes
attributes:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_check_cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
env:
underscore-arch: ${{ inputs.os == 'macos-14' && '_' || ''}}${{ inputs.os == 'macos-14' && inputs.arch || '' }} # if is macos, make a string that does "_{arch}", else output nothing
dash-arch: ${{ inputs.os == 'macos-14' && '-' || ''}}${{ inputs.os == 'macos-14' && inputs.arch || '' }} # if is macos, make a string that does "-{arch}", else output nothing
dep-folder-name: ${{ (inputs.os == 'windows-latest' || inputs.os == 'macos-14') && 'Snapmaker_Orca_dep' || 'destdir' }}
dep-folder-name: ${{ (inputs.os == 'windows-latest' || inputs.os == 'macos-14') && 'OrcaSlicer_dep' || 'destdir' }}
output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}}
run: |
echo cache-key=${{ inputs.os }}${{ env.dash-arch }}-cache-Snapmaker_Orca_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }}
echo cache-key=${{ inputs.os }}${{ env.dash-arch }}-cache-OrcaSlicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }}
echo cache-path=${{ github.workspace }}/deps/build${{ env.underscore-arch }}/${{ env.dep-folder-name }}${{ env.underscore-arch }} >> ${{ env.output-cmd }}
- name: load cache
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/build_deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
run: |
choco install strawberryperl
mkdir ${{ github.workspace }}/deps/build
mkdir ${{ github.workspace }}/deps/build/Snapmaker_Orca_dep
mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
.\build_release_vs2022.bat deps
.\build_release_vs2022.bat pack
cd ${{ github.workspace }}/deps/build
Expand All @@ -79,7 +79,7 @@ jobs:
brew install automake texinfo ninja libtool
brew list
mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}
mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}/Snapmaker_Orca_dep_${{ inputs.arch }}
mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep_${{ inputs.arch }}
brew uninstall --ignore-dependencies zstd
./build_release_macos.sh -dpx -a ${{ inputs.arch }} -t 10.15 -1
brew install zstd
Expand Down Expand Up @@ -109,32 +109,32 @@ jobs:
sudo chown $USER -R ./
./BuildLinux.sh -dr
cd deps/build
tar -czvf Snapmaker_Orca_dep_ubuntu_$(date +"%Y%m%d").tar.gz destdir
tar -czvf OrcaSlicer_dep_ubuntu_$(date +"%Y%m%d").tar.gz destdir
# Upload Artifacts
- name: Upload Mac ${{ inputs.arch }} artifacts
if: inputs.os == 'macos-14'
uses: actions/upload-artifact@v4
with:
name: Snapmaker_Orca_dep_mac_${{ inputs.arch }}_${{ env.date }}
path: ${{ github.workspace }}/deps/build_${{ inputs.arch }}/Snapmaker_Orca_dep*.tar.gz
name: OrcaSlicer_dep_mac_${{ inputs.arch }}_${{ env.date }}
path: ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep*.tar.gz

- name: Upload Windows artifacts
if: inputs.os == 'windows-latest'
uses: actions/upload-artifact@v4
with:
name: Snapmaker_Orca_dep_win64_${{ env.date }}
path: ${{ github.workspace }}/deps/build/Snapmaker_Orca_dep*.zip
name: OrcaSlicer_dep_win64_${{ env.date }}
path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip

- name: Upload Ubuntu artifacts
if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }}
env:
ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }}
uses: actions/upload-artifact@v4
with:
name: Snapmaker_Orca_dep_ubuntu_${{ env.ubuntu-ver }}_${{ env.date }}
path: ${{ github.workspace }}/deps/build/Snapmaker_Orca_dep_ubuntu_*.tar.gz
name: OrcaSlicer_dep_ubuntu_${{ env.ubuntu-ver }}_${{ env.date }}
path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz

build_orca:
name: Build Snapmaker_Orca
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build_orca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ jobs:
brew install tree ninja libtool
brew list
mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}
mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}/Snapmaker_Orca_dep_${{inputs.arch}}
tree ${{ github.workspace }}/deps/build_${{inputs.arch}}/Snapmaker_Orca_dep_${{inputs.arch}}
mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}}
tree ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}}
- name: Build slicer mac
if: inputs.os == 'macos-14'
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
if: github.ref == 'refs/heads/main' && inputs.os == 'macos-14'
uses: WebFreak001/[email protected]
with:
upload_url: https://uploads.github.com/repos/Snapmaker/Snapmaker_Orca/releases/169912305/assets{?name,label}
upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label}
release_id: 169912305
asset_path: ${{ github.workspace }}/Snapmaker_Orca_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
asset_name: Snapmaker_Orca_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:
if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
uses: WebFreak001/[email protected]
with:
upload_url: https://uploads.github.com/repos/Snapmaker/Snapmaker_Orca/releases/169912305/assets{?name,label}
upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label}
release_id: 169912305
asset_path: ${{ github.workspace }}/build/Snapmaker_Orca_Windows_${{ env.ver }}_portable.zip
asset_name: Snapmaker_Orca_Windows_${{ env.ver }}_portable.zip
Expand All @@ -215,7 +215,7 @@ jobs:
if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
uses: WebFreak001/[email protected]
with:
upload_url: https://uploads.github.com/repos/Snapmaker/Snapmaker_Orca/releases/169912305/assets{?name,label}
upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label}
release_id: 169912305
asset_path: ${{ github.workspace }}/build/Snapmaker_Orca_Windows_Installer_${{ env.ver }}.exe
asset_name: Snapmaker_Orca_Windows_Installer_${{ env.ver }}.exe
Expand Down Expand Up @@ -282,7 +282,7 @@ jobs:
ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
uses: WebFreak001/[email protected]
with:
upload_url: https://uploads.github.com/repos/Snapmaker/Snapmaker_Orca/releases/169912305/assets{?name,label}
upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label}
release_id: 169912305
asset_path: ./build/Snapmaker_Orca_Linux${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
asset_name: Snapmaker_Orca_Linux${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
Expand All @@ -293,7 +293,7 @@ jobs:
if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04' }}
uses: WebFreak001/[email protected]
with:
upload_url: https://uploads.github.com/repos/Snapmaker/Snapmaker_Orca/releases/169912305/assets{?name,label}
upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label}
release_id: 169912305
asset_path: ${{ github.workspace }}/resources/profiles/orca_custom_preset_tests.zip
asset_name: orca_custom_preset_tests.zip
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/check_profiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,20 @@ jobs:
- name: Download
working-directory: ${{ github.workspace }}
run: |
curl -LJO https://github.com/SoftFever/Orca_tools/releases/download/1/Snapmaker_Orca_profile_validator
chmod +x ./Snapmaker_Orca_profile_validator
curl -LJO https://github.com/SoftFever/Orca_tools/releases/download/1/OrcaSlicer_profile_validator
chmod +x ./OrcaSlicer_profile_validator
# validate profiles
- name: validate system profiles
run: |
./Snapmaker_Orca_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2
./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2
- name: validate custom presets
working-directory: ${{ github.workspace }}
run: |
curl -LJO https://github.com/SoftFever/Snapmaker_Orca/releases/download/nightly-builds/orca_custom_preset_tests.zip
curl -LJO https://github.com/SoftFever/OrcaSlicer/releases/download/nightly-builds/orca_custom_preset_tests.zip
unzip ./orca_custom_preset_tests.zip -d ${{ github.workspace }}/resources/profiles
./Snapmaker_Orca_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2
./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ set (CPACK_PACKAGE_VERSION_MINOR "${ORCA_VERSION_MINOR}")
set (CPACK_PACKAGE_VERSION_PATCH "${ORCA_VERSION_PATCH}")
set (CPACK_PACKAGE_FILE_NAME "Snapmaker_Orca_Windows_Installer_V${SoftFever_VERSION}")
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Snapmaker Orca is an open source slicer for FDM printers")
set (CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/SoftFever/Snapmaker_Orca")
set (CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/SoftFever/OrcaSlicer")
set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
set (CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources/images\\\\Snapmaker_Orca.ico")
set (CPACK_NSIS_MUI_ICON "${CPACK_PACKAGE_ICON}")
Expand Down
6 changes: 3 additions & 3 deletions build_release.bat
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ echo build type set to %build_type%
cd deps
mkdir %build_dir%
cd %build_dir%
set DEPS=%CD%/Snapmaker_Orca_dep
set DEPS=%CD%/OrcaSlicer_dep
if "%1"=="slicer" (
GOTO :slicer
)
echo "building deps.."

echo cmake ../ -G "Visual Studio 16 2019" -A x64 -DDESTDIR="%CD%/Snapmaker_Orca_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
cmake ../ -G "Visual Studio 16 2019" -A x64 -DDESTDIR="%CD%/Snapmaker_Orca_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
echo cmake ../ -G "Visual Studio 16 2019" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
cmake ../ -G "Visual Studio 16 2019" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
cmake --build . --config %build_type% --target deps -- -m

if "%1"=="deps" exit /b 0
Expand Down
4 changes: 2 additions & 2 deletions build_release_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ PROJECT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_BUILD_DIR="$PROJECT_DIR/build_$ARCH"
DEPS_DIR="$PROJECT_DIR/deps"
DEPS_BUILD_DIR="$DEPS_DIR/build_$ARCH"
DEPS="$DEPS_BUILD_DIR/Snapmaker_Orca_dep_$ARCH"
DEPS="$DEPS_BUILD_DIR/OrcaSlicer_dep_$ARCH"

# Fix for Multi-config generators
if [ "$SLICER_CMAKE_GENERATOR" == "Xcode" ]; then
Expand Down Expand Up @@ -144,7 +144,7 @@ function pack_deps() {
set -x
mkdir -p "$DEPS"
cd "$DEPS_BUILD_DIR"
tar -zcvf "Snapmaker_Orca_dep_mac_${ARCH}_$(date +"%Y%m%d").tar.gz" "Snapmaker_Orca_dep_$ARCH"
tar -zcvf "OrcaSlicer_dep_mac_${ARCH}_$(date +"%Y%m%d").tar.gz" "OrcaSlicer_dep_$ARCH"
)
}

Expand Down
6 changes: 3 additions & 3 deletions build_release_vs2022.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ if "%1"=="pack" (
setlocal ENABLEDELAYEDEXPANSION
cd %WP%/deps/build
for /f "tokens=2-4 delims=/ " %%a in ('date /t') do set build_date=%%c%%b%%a
echo packing deps: Snapmaker_Orca_dep_win64_!build_date!_vs2022.zip
echo packing deps: OrcaSlicer_dep_win64_!build_date!_vs2022.zip

%WP%/tools/7z.exe a Snapmaker_Orca_dep_win64_!build_date!_vs2022.zip Snapmaker_Orca_dep
%WP%/tools/7z.exe a OrcaSlicer_dep_win64_!build_date!_vs2022.zip OrcaSlicer_dep
exit /b 0
)

Expand Down Expand Up @@ -37,7 +37,7 @@ setlocal DISABLEDELAYEDEXPANSION
cd deps
mkdir %build_dir%
cd %build_dir%
set DEPS=%CD%/Snapmaker_Orca_dep
set DEPS=%CD%/OrcaSlicer _dep

if "%1"=="slicer" (
GOTO :slicer
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/MacOSXBundleInfo.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
<key>NSAppTransportSecurity</key>
<dict>
<!-- Disable App Transport Security. Resolves https://github.com/SoftFever/Snapmaker_Orca/issues/791 -->
<!-- Disable App Transport Security. Resolves https://github.com/SoftFever/OrcaSlicer/issues/791 -->
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSAllowsArbitraryLoadsInWebContent</key>
Expand Down
2 changes: 1 addition & 1 deletion deps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ elseif(FLATPAK)
# the only reason this is here is because of the HACK at the bottom for ci
#
# note for future devs: shared libs may actually create a size reduction
# but Snapmaker_Orca_deps tends to get really funny regarding linking after that (notably boost)
# but OrcaSlicer_deps tends to get really funny regarding linking after that (notably boost)
# so, as much as I would like to use that, it's not happening
ExternalProject_Add(
dep_${projectname}
Expand Down
2 changes: 1 addition & 1 deletion deps/GMP/GMP.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ else ()
endif ()

ExternalProject_Add(dep_GMP
URL https://github.com/SoftFever/Snapmaker_Orca_deps/releases/download/gmp-6.2.1/gmp-6.2.1.tar.bz2
URL https://github.com/SoftFever/OrcaSlicer_deps/releases/download/gmp-6.2.1/gmp-6.2.1.tar.bz2
URL_HASH SHA256=eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/GMP
BUILD_IN_SOURCE ON
Expand Down
12 changes: 6 additions & 6 deletions doc/Extrusion-rate-smoothing.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This happens by reducing the stresses put on the extrusion system as well as red

This feature is especially helpful when printing at high accelerations and large flow rates as the deviations are larger in these cases.

![Screenshot 2023-09-18 at 22 44 26](https://github.com/SoftFever/Snapmaker_Orca/assets/59056762/281b9c78-9f5c-428e-86b9-509de099a3e7)
![Screenshot 2023-09-18 at 22 44 26](https://github.com/SoftFever/OrcaSlicera/assets/59056762/281b9c78-9f5c-428e-86b9-509de099a3e7)

<h2>Theory</h2>

Expand All @@ -17,7 +17,7 @@ This works by breaking down the printed line segments into smaller "chunks", pro
In summary, **it takes the "edge" off rapid extrusion changes caused by acceleration/deceleration as these are now spread over a longer distance and time.** Therefore, it can reduce wall artefacts that show when the print speeds change suddenly. These artefacts are occuring because the extruder and firmware cannot perfectly adhere to the requested by the slicer flow rates, especially when the extrusion rate is changing rapidly.

**The example below shows the artefact that is mitigated by ERS.**
![ERS Disabled](https://github.com/SoftFever/Snapmaker_Orca/assets/59056762/31fdbf91-2067-4286-8bc1-4f7de4a628b6)
![ERS Disabled](https://github.com/SoftFever/OrcaSlicera/assets/59056762/31fdbf91-2067-4286-8bc1-4f7de4a628b6)

The bulging visible above is due to the extruder not being able to respond fast enough against the required speed change when printing with high accelerations and high speeds and requested to slow down for an overhang.

Expand Down Expand Up @@ -45,17 +45,17 @@ When a speed change is requested, the firmware look ahead planner calculates the

This deceleration move would happen over approximately 9.6mm. This is derived from the following equation:

![image](https://github.com/igiannakas/Snapmaker_Orca/assets/59056762/4ba0356b-49ab-428c-ab10-f2c88bcc1bcb)
![image](https://github.com/igiannakas/OrcaSlicera/assets/59056762/4ba0356b-49ab-428c-ab10-f2c88bcc1bcb)

![image](https://github.com/igiannakas/Snapmaker_Orca/assets/59056762/3958deb5-fbc3-4d07-8903-4575033717fd)
![image](https://github.com/igiannakas/OrcaSlicera/assets/59056762/3958deb5-fbc3-4d07-8903-4575033717fd)

The time taken to decelerate to this new speed would be approx. 0.08 seconds, derived from the following equation:

![image](https://github.com/igiannakas/Snapmaker_Orca/assets/59056762/ea9f19b4-defe-4656-9ecc-a6576c87d8e0)
![image](https://github.com/igiannakas/OrcaSlicera/assets/59056762/ea9f19b4-defe-4656-9ecc-a6576c87d8e0)

A printer printing at 200mm/sec with a 0.42 line width and 0.16 layer height would be extruding plastic at approx. 12.16mm3/sec, as can also be seen from the below visual.

![image](https://github.com/igiannakas/Snapmaker_Orca/assets/59056762/83242b26-7174-4da1-b815-d9fcec767bcd)
![image](https://github.com/igiannakas/OrcaSlicera/assets/59056762/83242b26-7174-4da1-b815-d9fcec767bcd)

When the printer is extruding at 40mm/sec with the same line width and layer height as above, the flow rate is 2.43mm3/sec.

Expand Down
Loading

0 comments on commit 09119eb

Please sign in to comment.