GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-12 14:41:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
21,131 Commits 131 Branches 318 Tags
Commit Graph

58 Commits

Author SHA1 Message Date
enricoturri1966
6f18f8f784 Tech ENABLE_RAYCAST_PICKING set as default 2022-12-05 10:24:30 +01:00
Filip Sykala - NTB T15p
c549c6afbe Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/Model.hpp
#	src/libslic3r/Point.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/CMakeLists.txt
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GLSelectionRectangle.cpp
#	src/slic3r/GUI/GUI_Factories.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
#	src/slic3r/GUI/MeshUtils.cpp
#	src/slic3r/GUI/MeshUtils.hpp
#	src/slic3r/GUI/ObjectDataViewModel.cpp
#	src/slic3r/GUI/ObjectDataViewModel.hpp
#	src/slic3r/GUI/Selection.cpp
 2022-08-31 15:22:10 +02:00
enricoturri1966
df47ba7122 Tech ENABLE_RAYCAST_PICKING - Raytraced picking of gizmos - Move Gizmo 2022-06-13 13:09:24 +02:00
Filip Sykala
a50d93cd66 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Geometry.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/ImGuiWrapper.cpp
#	src/slic3r/GUI/ImGuiWrapper.hpp
#	src/slic3r/GUI/Selection.cpp
#	tests/slic3rutils/slic3r_jobs_tests.cpp
 2022-02-02 15:27:25 +01:00
Filip Sykala
0b2a52f916 Merge branch 'dev' into fs_simplify_multipart_object 
# Conflicts:
#	src/slic3r/GUI/GLModel.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
 2022-01-16 19:21:02 +01:00
Filip Sykala
d698df2c31 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/GUI_App.cpp
#	tests/libslic3r/test_indexed_triangle_set.cpp
 2021-12-01 14:35:42 +01:00
Vojtech Bubnik
5fd279cbc8 Fixing clang compiler warnings 2021-11-30 10:50:27 +01:00
Filip Sykala
eba68f9a9e Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/GUI_ObjectList.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/ImGuiWrapper.hpp
 2021-11-23 09:09:09 +01:00
Filip Sykala
13072f9cd2 Fix 
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp:43:32: warning: 'on_get_requirements' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
 2021-11-22 17:38:24 +01:00
Filip Sykala
4211aba981 Fix esc key 
Fix model color
Fix
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:559:35: warning: unused variable 'volume_ids' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:560:28: warning: unused variable 'model_objects' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:694:16: warning: unused variable 'info' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:721:35: warning: unused variable 'volume_ids' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:97:17: warning: 'uint32_t Slic3r::GUI::get_triangle_count(const std::set<Slic3r::ObjectID>&, const Slic3r::GUI::Selection&)' defined but not used [-Wunused-function]
 2021-11-22 17:36:08 +01:00
Filip Sykala
471ebe5c83 using ObjectID instead of ModelVolume pointer and CompositID 2021-11-22 15:45:57 +01:00
Filip Sykala
edba9cfca3 multipart - Not finished 2021-11-19 15:42:03 +01:00
Filip Sykala
3670280ab6 multipart merge 2021-11-16 14:42:25 +01:00
Lukáš Hejl
9c35e0cb75 Added a missing include (GCC 11.1). 2021-11-12 13:29:17 +01:00
Lukas Matena
a61c892c05 Some more fixes when switching objects while simplifying 2021-11-12 06:49:09 +01:00
Lukas Matena
0bfa81be56 Several more fixes: 
- fixed crash on close when worker is running
- refresh percentage in the UI by requesting extra frames
- get rid of extra m_is_worker_running variable
 2021-11-12 06:49:09 +01:00
Lukas Matena
9ad54ab4db Some more cleanup 2021-11-12 06:49:09 +01:00
Lukas Matena
be04751776 Many small fixes 2021-11-12 06:49:09 +01:00
Lukas Matena
7bcab6f795 Simplify does not touch ModelVolume all the time (runs, but needs polishing) 2021-11-12 06:49:09 +01:00
Lukas Matena
ab260d005e More adjustments, still working with Model directly 2021-11-12 06:49:09 +01:00
Lukas Matena
6661967f9f Shared data packed in a struct 2021-11-12 06:49:09 +01:00
Lukas Matena
ba56a79795 Simplify gizmo now renders the volume by itself, 
it does not rely on the usual GLVolume rendering. GLCanvas3D::toggle_model_object_visibility
was extended to hide a single volume. Rendering the model and wireframe uses the same
vertex buffer, which is now used through GLModel class. GLGizmoRenderTransparent class
should no longer be needed. GLCanvas3D::reload_scene calls replaced with request_rerender.
 2021-11-12 06:49:09 +01:00
Lukas Matena
50ea144b84 Minor improvements: 
- const corectness
- volatile -> std::atomic
- GUI::format
- encoding issues
 2021-11-12 06:49:09 +01:00
Filip Sykala
5224e9c5cb Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
 2021-10-20 12:41:49 +02:00
Filip Sykala
76c0c76f5f open simplification on center when open from notification 2021-10-19 18:53:42 +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
6c8f754186 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/3DScene.cpp
 2021-10-19 13:40:19 +02:00
Filip Sykala
88f9a387e3 Do not disapeared apply button 2021-10-18 19:20:20 +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
3bd9fc07d2 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Format/3mf.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
 2021-10-07 08:28:17 +02:00
Filip Sykala
39a98e97b4 Fix. Allow simplify volume inside object, fix drawing wireframe 2021-10-04 12:29:45 +02:00
Filip Sykala
da251fbd1c Add checkbox for show wire frame 2021-09-30 13:56:04 +02:00
Filip Sykala
e3459c7c46 Add Rendering wire frame when simplify 2021-09-30 13:03:15 +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
8226f74413 Emboss open by context menu only 2021-09-14 10:02:01 +02:00
Filip Sykala
7df893177c Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
 2021-09-14 09:50:19 +02:00
Filip Sykala
f6f70f6fd4 Fix Crash when delete model during simplification 2021-09-01 20:29:27 +02:00
Filip Sykala
ffc92090cc Fix simplify 2021-08-30 10:51:04 +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
Lukáš Hejl
1c25078bc3 Added a missing include (GCC 11.1). 2021-08-26 08:43:47 +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
9896a21904 @Vojta request --> change ratio to decimation ratio 2021-08-25 13:09:37 +02:00
Filip Sykala
db6c984b36 remove unused variable 2021-08-23 16:26:21 +02:00
Filip Sykala
b555910185 Simplify dialog, 
remove fast reduction - create mistake
 2021-08-23 15:57:09 +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
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