juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-02 05:11:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,265 Commits 58 Branches 82 Tags
e82ea69e65ba7ee53c0a5f9a4bafb90742f9304a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Sykala 9dbb2dfe0d Various gizmos refactoring 2023-11-04 11:41:10 +08:00
Filip Sykala 30af274d44 Separate GizmoManager on_move into gizmo itself 
(cherry picked from commit prusa3d/PrusaSlicer@c751d6327d)
 2023-11-04 11:41:10 +08:00
Filip Sykala 8e2ab660c5 Add virtual function to process mouse_event 
(cherry picked from commit prusa3d/PrusaSlicer@2ab44546bd)
 2023-11-04 11:41:10 +08:00
Filip Sykala 158bb47af3 Suggestion to detect volume modification instead of check some gizmos during dragging 
(cherry picked from commit prusa3d/PrusaSlicer@96610ecea9)
 2023-11-04 11:41:10 +08:00
Filip Sykala da4a70785d remove unnecessary getting of raw pointer from unique pointer 
(cherry picked from commit prusa3d/PrusaSlicer@209eda75a0)
 2023-11-04 11:41:10 +08:00
Filip Sykala f6a3421e2a remove GLModel from base class 
- only 2 gizmo use cone

(cherry picked from commit prusa3d/PrusaSlicer@3c7390e34e)
(cherry picked from commit 4647fc49ef5b925432e087252f32a6601d0410da)
 2023-11-04 11:41:00 +08:00
Filip Sykala 934ed0bbae Remove static flag and extend case when call after will be from unactive Gizmo. 2021-11-12 06:49:09 +01:00
Filip Sykala d72fba2a6a translation of progress 2021-11-12 06:49:09 +01:00
Filip Sykala 3c61d2b352 Merge branch 'master' into fs_removes_SimplifyMesh 2021-11-11 16:05:43 +01:00
Filip Sykala 9086879e16 Change float slider to wrap function. Enrico's request 2021-11-05 14:48:37 +01:00
Filip Sykala f9bdde5603 Remove SimplifyMesh 2021-11-02 14:23:49 +01:00
Filip Sykala 1a9a4088c2 Fix translation suggestion by @Oleksandra Iushchenko 2021-10-21 11:01:15 +02:00
Filip Sykala fce4242663 Merge branch 'master' into fs_realtime_simplify 2021-10-20 11:19:27 +02:00
Filip Sykala fa7b2f351f Fix for: 
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:102:46: error: control reaches end of non-void function [-Werror=return-type]
src\slic3r\GUI\Gizmos\GLGizmoSimplify.cpp(103) : warning C4715: '<lambda_8434c3588ffcd21c397d2cfeb10266a5>::operator()': not all control paths return a value
 2021-10-20 11:19:15 +02:00
Filip Sykala 76c0c76f5f open simplification on center when open from notification 2021-10-19 18:53:42 +02:00
Filip Sykala 7e2691241b Merge branch 'master' into fs_realtime_simplify 2021-10-19 16:51:26 +02:00
Filip Sykala ee7d5db31c Add live preview on open gizmo 
Add delay 250ms before process for live move with slider
Add short cut for unmodified mesh in processing
 2021-10-19 16:51:03 +02:00
Filip Sykala 79dd007ec7 Fix bloating of history with live preview 2021-10-19 16:15:27 +02:00
Filip Sykala 76cbb7c17e Fix 
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:433:11: warning: unused variable 'checkbox_width' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:227:27: warning: format string is not a string literal (potentially insecure) [-Wformat-security]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:245:27: warning: format string is not a string literal (potentially insecure) [-Wformat-security]
 2021-10-18 20:15:11 +02:00
Filip Sykala 88f9a387e3 Do not disapeared apply button 2021-10-18 19:20:20 +02:00
Filip Sykala d101d031dc Merge branch 'master' into fs_realtime_simplify 2021-10-18 16:47:38 +02:00
Filip Sykala a9bd989eda Add [esc] to interupt preview in simplify 2021-10-18 16:47:25 +02:00
Filip Sykala 80ccb77b00 live preview in simplification 2021-10-18 16:01:32 +02:00
Filip Sykala 39a98e97b4 Fix. Allow simplify volume inside object, fix drawing wireframe 2021-10-04 12:29:45 +02:00
Filip Sykala 56996104cc fix assert 2021-10-04 09:30:30 +02:00
Filip Sykala f97d6a442b Merge branch 'master' into Fix_wireframe_trafo 2021-10-04 09:23:13 +02:00
Filip Sykala 91462cf9d5 Fix wireframe transformation when supports in SLA are added 2021-10-04 09:23:06 +02:00
Filip Sykala 44db8f58c7 Merge branch 'master' into fs_fix_close_simlify_notify 2021-10-01 17:40:56 +02:00
Filip Sykala f5faad80a9 add close suggestion notification 2021-10-01 17:40:30 +02:00
Filip Sykala da251fbd1c Add checkbox for show wire frame 2021-09-30 13:56:04 +02:00
Filip Sykala 07a97f41d3 Fix: ../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:411:21: warning: comparison of integer expressions of different signedness: 'std::vector<Slic3r::ModelObject*>::size_type' {aka 'long unsigned int'} and 'int' [-Wsign-compare] 2021-09-30 13:15:21 +02:00
Filip Sykala a2d2dec107 Merge branch 'master' into fs_simplify_wireframe 2021-09-30 13:03:32 +02:00
Filip Sykala e3459c7c46 Add Rendering wire frame when simplify 2021-09-30 13:03:15 +02:00
Filip Sykala 6b08cc4d22 Merge branch 'master' into fs_simplify_wireframe 2021-09-30 09:52:10 +02:00
Filip Sykala f7a479a90e Merge branch 'master' into fs_fix_simplify 2021-09-30 09:40:22 +02:00
Filip Sykala 6b9ee1126d Not buildable render contour 2021-09-30 09:40:06 +02:00
Filip Sykala 6bd78aa9c4 Add call for render 2021-09-30 09:23:04 +02:00
Filip Sykala 84f8ba9fb4 Fix for deleted object after preview 2021-09-29 19:06:31 +02:00
Filip Sykala 95fc054590 fix for getting name of gizmo without key(like simplify) 2021-09-29 18:17:19 +02:00
Filip Sykala cd80c67729 Merge branch 'fs_fix_Simplification' 2021-09-02 11:56:14 +02:00
Filip Sykala 3f923628aa fix 
../src/libslic3r/QuadricEdgeCollapse.cpp:628:21: warning: comparison of integer expressions of different signedness: 'const int' and 'uint32_t' {aka 'unsigned int'} [-Wsign-compare]
../src/libslic3r/QuadricEdgeCollapse.cpp:631:21: warning: comparison of integer expressions of different signedness: 'const int' and 'uint32_t' {aka 'unsigned int'} [-Wsign-compare]
../src/libslic3r/QuadricEdgeCollapse.cpp:638:48: warning: comparison of integer expressions of different signedness: 'const int' and 'uint32_t' {aka 'unsigned int'} [-Wsign-compare]
../src/libslic3r/QuadricEdgeCollapse.cpp:643:25: warning: comparison of integer expressions of different signedness: 'const int' and 'uint32_t' {aka 'unsigned int'} [-Wsign-compare]
../src/libslic3r/QuadricEdgeCollapse.cpp:647:25: warning: comparison of integer expressions of different signedness: 'const int' and 'uint32_t' {aka 'unsigned int'} [-Wsign-compare]
 2021-09-02 11:41:11 +02:00
Filip Sykala 746300eafd Fix @(Lukas Matena) note about using NDEBUG 2021-09-02 11:24:33 +02:00
Filip Sykala d45ab1c484 Fix trouble case test 2021-09-02 11:17:07 +02:00
Filip Sykala f6f70f6fd4 Fix Crash when delete model during simplification 2021-09-01 20:29:27 +02:00
Filip Sykala 25feacfd95 FIX Creation of non volume place in mode during simplification 2021-09-01 19:15:16 +02:00
Filip Sykala f90b10b63e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2021-08-26 14:21:59 +02:00
Filip Sykala 9f70afe44e Fix: Do not revert changes on change GLGizmoBase::m_state when apply was used 2021-08-26 14:21:54 +02:00
Filip Sykala 673a2bdac8 Fix: 
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:109:23: warning: comparison of integer expressions of different signedness: 'std::basic_string<char>::size_type' {aka 'long unsigned int'} and 'int' [-Wsign-compare]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:132:17: warning: format string is not a string literal (potentially insecure) [-Wformat-security]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:171:17: warning: format string is not a string literal (potentially insecure) [-Wformat-security]
Severity Code Description Project File Line Suppression State
Warning C26451 Arithmetic overflow: Using operator '-' on a 4 byte value and then casting the result to a 8 byte value. Cast the value to the wider type before calling operator '-' to avoid overflow (io.2). libslic3r_gui C:\GIT\slic3r\src\slic3r\GUI\Gizmos\GLGizmoSimplify.cpp 143
 2021-08-25 18:25:37 +02:00
Filip Sykala 9ea3be485f Merge branch 'master' into fs_QuadricEdgeCollapse 2021-08-25 16:56:24 +02:00
Filip Sykala 0e4a987bed extend git ignore 2021-08-25 13:17:36 +02:00
Filip Sykala 790d445420 Merge branch 'master' into fs_QuadricEdgeCollapse 
# Conflicts:
#	src/slic3r/GUI/NotificationManager.hpp
 2021-08-25 13:16:01 +02:00
Filip Sykala 9896a21904 @Vojta request --> change ratio to decimation ratio 2021-08-25 13:09:37 +02:00
Filip Sykala beb38d09ae Add reserve to mesh boolean operation 2021-08-25 10:51:11 +02:00
Filip Sykala debf4981a6 Fix clang for VisualStudio usage 2021-08-25 09:44:50 +02:00
Filip Sykala d7d4d52843 Fix 
../src/libslic3r/QuadricEdgeCollapse.cpp:565:22: warning: comparison of integer expressions of different signedness: 'const int' and 'uint32_t' {aka 'unsigned int'} [-Wsign-compare]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:48:15: warning: unused variable 'min_triangle_count' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:160:9: warning: unused variable 'wanted_count' [-Wunused-variable]
..\src\slic3r\GUI\Gizmos\GLGizmoSimplify.cpp(167): warning C4305: '=': truncation from 'double' to 'float'
 2021-08-24 08:21:14 +02:00
Filip Sykala db6c984b36 remove unused variable 2021-08-23 16:26:21 +02:00
Filip Sykala db1458f99b Merge branch 'master' into fs_QuadricEdgeCollapse 2021-08-23 15:57:18 +02:00
Filip Sykala b555910185 Simplify dialog, 
remove fast reduction - create mistake
 2021-08-23 15:57:09 +02:00
Filip Sykala 89819c1c22 Merge branch 'master' into fs_QuadricEdgeCollapse 2021-08-23 11:33:14 +02:00
Filip Sykala 1aa4b32fa7 Create multiple simplify notification 2021-08-23 11:31:38 +02:00
Filip Sykala 6d895872b0 call render in main thread by function callAfter(hint by @Vojtech) 2021-08-20 14:29:52 +02:00
Filip Sykala 8fab4885c7 Add dirty state into Gizmo (hint by @DavidKocik) 2021-08-20 09:13:09 +02:00
Filip Sykala cce3041a95 Add warning as tip for simplify big model. 2021-08-20 07:53:33 +02:00
Filip Sykala cc48f6c6a4 Merge branch 'master' into fs_QuadricEdgeCollapse 2021-08-18 12:08:00 +02:00
Filip Sykala 27fcf55eaa Add cancel and statusFn into init phase of simplification 
Move debug functions into NDEBUG macro
 2021-08-18 12:07:46 +02:00
Filip Sykala cc88b1e86b Merge branch 'master' into fs_QuadricEdgeCollapse 2021-08-18 10:37:21 +02:00
Filip Sykala 1e863cc031 Add restriction for simplification 
Refuse outgoing during simlification.
Refuse start simplification when other Gizmo is active
Fix close after preview to revert changes
Allow change model for simplification
 2021-08-18 10:37:08 +02:00
Filip Sykala 11c91d781e FIX: extra frame request 
Do not freeze bargraph in Siplify dialog when no mouse move.
 2021-08-17 15:28:08 +02:00
Filip Sykala 090728b9d5 Add private member prefix m_ 2021-08-17 08:58:45 +02:00
Filip Sykala c04856e049 Extend simplify test to chack distance of each triangle center and each vertices. Both simplify to origin and vice versa 2021-08-16 18:04:38 +02:00
Filip Sykala 268b06bdbb fix position of window 2021-08-16 15:30:33 +02:00
Filip Sykala 21fd35d243 Fix: Do not close dialog after preview 2021-08-16 13:06:51 +02:00
Filip Sykala b90ca142a5 Merge branch 'master' into fs_QuadricEdgeCollapse 2021-08-16 11:56:56 +02:00
Filip Sykala 6745076e79 Merge branch 'fs_QuadricEdgeCollapse' of https://github.com/prusa3d/PrusaSlicer into fs_QuadricEdgeCollapse 2021-08-16 11:55:43 +02:00
Filip Sykala 62f8ab1cbe Add check of neighbors 
Add store triangle for debug purpose
 2021-08-16 11:53:37 +02:00
Filip Sykala ef5c94f90a Fix: prevent degeneration of model during simplification 2021-08-06 15:11:20 +02:00
Filip Sykala fc4b18ebb1 Merge master 2021-08-02 10:46:47 +02:00
Filip Sykala 59d02aea0a Merge branch 'master' into fs_QuadricEdgeCollapse 2021-08-02 09:04:15 +02:00
Filip Sykala c0b73a92a3 Try fix warning icon 2021-07-22 15:17:23 +02:00
Filip Sykala 72d01d75e4 FIX schedule_extra_frame on end; 2021-07-21 15:48:10 +02:00
Filip Sykala b225fadfde Allow skip edge with only one triangle during simplification 2021-07-21 15:23:48 +02:00
Filip Sykala 0079091a8c Fix gui size 2021-07-21 11:58:01 +02:00
Filip Sykala 6bcc576b5f truncate model name 2021-07-21 08:34:43 +02:00
Filip Sykala 87a6c8cb73 Merge branch 'master' into fs_QuadricEdgeCollapse 2021-07-21 07:52:57 +02:00
Filip Sykala ca3fc06e36 GUI edits 2021-07-20 18:39:09 +02:00
Filip Sykala b88629974d Change UI 
Fix minimal triangle count
Fix progress rendering
 2021-07-20 15:07:48 +02:00
Filip Sykala 5ac2809426 Merge branch 'master' into fs_QuadricEdgeCollapse 2021-07-20 12:05:58 +02:00
Filip Sykala 6464a5b698 Fix Typo 2021-07-20 12:05:44 +02:00
Filip Sykala 2a2530924f FIX for build Asan_OsX_Mojave_Universal_ARM64/590 
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:72:81: error: cannot pass non-trivial object of type 'std::string' (aka 'basic_string<char, char_traits<char>, allocator<char> >') to variadic function; expected type from format string was 'char *' [-Wnon-pod-varargs]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:72:87: warning: format specifies type 'int' but the argument has type 'size_t' (aka 'unsigned long') [-Wformat]
 2021-07-20 08:30:49 +02:00
Filip Sykala bc3da9973b Merge branch 'master' into fs_QuadricEdgeCollapse 2021-07-20 08:22:06 +02:00
Filip Sykala 25a4887075 QEC: When collapsing edge flip normal than check other edges in triangle 
Quadric is calculated with double precission of normal
Fix calculation of normal for changed triangles
 2021-07-19 15:46:41 +02:00
Filip Sykala c444ef81bd Fix status function 2021-07-19 10:12:19 +02:00
Filip Sykala 709ea1283e FIX: new imgui change input float 2021-07-19 09:50:45 +02:00
Filip Sykala 86a3fd00a5 Merge branch 'master' into fs_QuadricEdgeCollapse 2021-07-19 09:18:55 +02:00
Filip Sykala af526c54f4 Add simplification GUI 2021-07-19 09:17:50 +02:00
Filip Sykala 756d2694eb FIX: Mutable priority queue 2021-07-12 16:36:08 +02:00
Filip Sykala aca93a7ced Merge branch 'master' into fs_QuadricEdgeCollapse 2021-07-09 14:14:54 +02:00
Filip Sykala b2238834fb Merge branch 'master' into fs_QuadricEdgeCollapse 2021-07-09 13:40:58 +02:00
Filip Sykala 2c0b89e4a7 FIX Simplify test 2021-07-09 10:31:05 +02:00
Filip Sykala 8b4588d361 Merge branch 'simplification' into fs_QuadricEdgeCollapse 2021-07-09 09:21:07 +02:00