Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port Emboss & SVG gizmo from PrusaSlicer #2819

Merged
merged 58 commits into from
Dec 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
ffba59e
Rework UI jobs to make them more understandable and flexible.
tamasmeszaros Sep 18, 2023
9a93e1b
Update Orca specific jobs
Noisyfox Sep 18, 2023
1fdb9b1
Fix progress issue
Noisyfox Sep 18, 2023
ad45836
Fix dark mode and window radius
Noisyfox Sep 18, 2023
f85b511
Update cereal version from 1.2.2 to 1.3.0
tamasmeszaros Nov 1, 2023
cff0ffe
Initial port of Emboss gizmo
Noisyfox Nov 20, 2023
cca9984
Bump up CGAL version to 5.4
tamasmeszaros Nov 21, 2023
e5de2d5
Fix text rotation
Noisyfox Nov 20, 2023
2f858db
Fix test dragging
Noisyfox Nov 21, 2023
84d7aaa
Add text gizmo to right click menu
Noisyfox Nov 21, 2023
a60b7e9
Initial port of SVG gizmo
Noisyfox Nov 21, 2023
c21eb15
Fix text rotation
Noisyfox Nov 22, 2023
af05b33
Fix Linux build
Noisyfox Nov 22, 2023
425ef3a
Fix "from surface"
Noisyfox Nov 23, 2023
b9fdb6a
Fix -90 rotation
Noisyfox Nov 23, 2023
a6116fa
Fix icon path
Noisyfox Nov 24, 2023
0feecaa
Fix loading font with non-ascii name
Noisyfox Nov 25, 2023
5dd294a
Fix storing non-utf8 font descriptor in 3mf file
Noisyfox Nov 25, 2023
a3260ff
Fix filtering with non-utf8 characters
Noisyfox Nov 26, 2023
b52fcea
Emboss: Use Orca style input dialog
Noisyfox Nov 24, 2023
bf92633
Fix build on macOS
Noisyfox Nov 26, 2023
15c7a09
Fix tooltip color in light mode
Noisyfox Nov 26, 2023
e150d9b
InputText: fixed incorrect padding when FrameBorder > 0. (ocornut/img…
ocornut Nov 26, 2023
8f851a9
SVG: Use Orca style input dialog
Noisyfox Nov 26, 2023
8bbdce5
Merge remote-tracking branch 'remote/main' into dev/gizmo-svg
Noisyfox Nov 26, 2023
7103a7c
Fix job progress update
Noisyfox Nov 27, 2023
fd6fbeb
Fix crash when select editing text in preview screen
Noisyfox Nov 27, 2023
a103fa0
Merge branch 'main' into dev/gizmo-emboss
Noisyfox Nov 28, 2023
e86d847
Use Orca checkbox style
Noisyfox Nov 28, 2023
afeb56d
Fix issue that toolbar icons are kept regenerated
Noisyfox Nov 28, 2023
50317e5
Emboss: Fix text & icon alignment
Noisyfox Nov 28, 2023
048b9b6
SVG: Fix text & icon alignment
Noisyfox Nov 29, 2023
80d6044
Merge remote-tracking branch 'upstream/main' into dev/gizmo-svg
Noisyfox Nov 29, 2023
2f27efc
Emboss: fix toolbar icon mouse hover state
Noisyfox Nov 29, 2023
672b1e6
Add a simple subtle outline effect by drawing back faces using wirefr…
Noisyfox Nov 30, 2023
b413972
Merge branch 'dev/outline' into dev/gizmo-svg
Noisyfox Nov 30, 2023
634c1fe
Disable selection outlines
Noisyfox Nov 30, 2023
7c34d6a
Show outline in white if the model color is too dark
Noisyfox Dec 2, 2023
74354a2
Make the outline algorithm more reliable
Noisyfox Dec 2, 2023
77279b0
Enable cull face, which fix render on Linux
Noisyfox Dec 2, 2023
00b519d
Merge branch 'dev/outline' into dev/gizmo-svg
Noisyfox Dec 2, 2023
0fb0975
Fix `disable_cullface`
Noisyfox Dec 2, 2023
3b88cb9
Merge branch 'dev/outline' into dev/gizmo-svg
Noisyfox Dec 2, 2023
a28b467
Merge remote-tracking branch 'upstream/main' into dev/gizmo-svg
Noisyfox Dec 5, 2023
ece97e4
Post merge fix
Noisyfox Dec 5, 2023
9224d73
Merge branch 'main' into dev/gizmo-emboss
SoftFever Dec 5, 2023
49ce3d4
Optimize selection rendering
Noisyfox Dec 6, 2023
091b1c1
Fix scale gizmo
Noisyfox Dec 6, 2023
5bfd65a
Emboss: Fix text rotation if base object is scaled
Noisyfox Dec 7, 2023
a442b31
Fix volume synchronize
Noisyfox Dec 7, 2023
ef8d928
Fix emboss rotation
Noisyfox Dec 7, 2023
d353e2c
Emboss: Fix advance toggle
Noisyfox Dec 7, 2023
a471d16
Fix text position after reopened the project
Noisyfox Dec 8, 2023
7ed88ac
Merge remote-tracking branch 'remote/main' into dev/gizmo-svg
Noisyfox Dec 8, 2023
b9c06f0
Make font style preview darker
Noisyfox Dec 8, 2023
a34a2e7
Make font style preview selector height shorter
Noisyfox Dec 8, 2023
221297e
Merge branch 'main' into dev/gizmo-emboss
Noisyfox Dec 9, 2023
94c19fd
Merge remote-tracking branch 'remote/main' into dev/gizmo-svg
Noisyfox Dec 9, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 4 additions & 24 deletions deps/CGAL/CGAL.cmake
Original file line number Diff line number Diff line change
@@ -1,31 +1,11 @@
orcaslicer_add_cmake_project(
CGAL
GIT_REPOSITORY https://github.com/CGAL/cgal.git
GIT_TAG caacd806dc55c61cc68adaad99f2240f00493b29 # releases/CGAL-5.3
# GIT_REPOSITORY https://github.com/CGAL/cgal.git
# GIT_TAG bec70a6d52d8aacb0b3d82a7b4edc3caa899184b # releases/CGAL-5.0
# For whatever reason, this keeps downloading forever (repeats downloads if finished)
#URL https://github.com/CGAL/cgal/archive/releases/CGAL-5.0.zip
#URL_HASH SHA256=c2b035bd078687b6d8c0fb6371a7443adcdb647856af9969532c4050cd5f48e5
URL https://github.com/CGAL/cgal/archive/refs/tags/v5.4.zip
URL_HASH SHA256=d7605e0a5a5ca17da7547592f6f6e4a59430a0bc861948974254d0de43eab4c0
DEPENDS dep_Boost dep_GMP dep_MPFR
)

include(GNUInstallDirs)

# CGAL, for whatever reason, makes itself non-relocatable by writing the build directory into
# CGALConfig-installation-dirs.cmake and including it in configure time.
# If this file is not present, it will not consider the stored absolute path
ExternalProject_Add_Step(dep_CGAL dep_CGAL_relocation_fix
DEPENDEES install

COMMAND ${CMAKE_COMMAND} -E remove CGALConfig-installation-dirs.cmake
WORKING_DIRECTORY "${DESTDIR}/usr/local/${CMAKE_INSTALL_LIBDIR}/cmake/CGAL"
)

# Again, for whatever reason, CGAL thinks that its version is not relevant if
# configured as a header only library. Fixing it by placing a cmake version file
# besides the installed config file.
ExternalProject_Add_Step(dep_CGAL dep_CGAL_version_fix
DEPENDEES install

COMMAND ${CMAKE_COMMAND} -E copy cgal/CGALConfigVersion.cmake "${DESTDIR}/usr/local/${CMAKE_INSTALL_LIBDIR}/cmake/CGAL/CGALConfigVersion.cmake"
WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
)
12 changes: 9 additions & 3 deletions deps/Cereal/Cereal.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
#/|/ Copyright (c) Prusa Research 2021 - 2022 Tomáš Mészáros @tamasmeszaros, Filip Sykala @Jony01
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
orcaslicer_add_cmake_project(Cereal
URL "https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz"
URL_HASH SHA256=1921f26d2e1daf9132da3c432e2fd02093ecaedf846e65d7679ddf868c7289c4
URL "https://github.com/USCiLab/cereal/archive/refs/tags/v1.3.0.zip"
URL_HASH SHA256=71642cb54658e98c8f07a0f0d08bf9766f1c3771496936f6014169d3726d9657
CMAKE_ARGS
-DJUST_INSTALL_CEREAL=on
-DJUST_INSTALL_CEREAL=ON
-DSKIP_PERFORMANCE_COMPARISON=ON
-DBUILD_TESTS=OFF
)
4 changes: 2 additions & 2 deletions resources/images/add_copies.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions resources/images/add_text_modifier.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions resources/images/add_text_negative.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions resources/images/add_text_part.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions resources/images/align_horizontal_center.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions resources/images/align_horizontal_left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions resources/images/align_horizontal_right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 60 additions & 0 deletions resources/images/align_vertical_bottom.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 60 additions & 0 deletions resources/images/align_vertical_center.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 60 additions & 0 deletions resources/images/align_vertical_top.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions resources/images/burn.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions resources/images/delete.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions resources/images/exclamation.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions resources/images/lock_closed.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions resources/images/lock_closed_f.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions resources/images/lock_open.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions resources/images/lock_open_f.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading