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

99 Commits

Author SHA1 Message Date
enricoturri1966
448d92df68 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 14:29:54 +02:00
Lukas Matena
48c186331a Includes cleanup: 
GUI_App.hpp      (should not include) MainFrame.hpp
MainFrame.hpp    Plater.hpp
ModelArrange.hpp Model.hpp
Slicing.hpp      PrintConfig.hpp
FillBase.hpp     PrintConfig.hpp
GUI_App.hpp      PrintConfig.hpp
OptionsGroup.hpp GUI_App.hpp
 2020-05-27 14:01:47 +02:00
enricoturri1966
2eb4b2caed Fixed conflicts after merge with master 2020-05-27 10:32:02 +02:00
Lukas Matena
94b0ab603f Include cleanup: Selection.hpp 
It does not need 3DScene.hpp and Model.hpp
And it does not to be included by GLGizmoBase.hpp
 2020-05-26 13:46:59 +02:00
enricoturri1966
314995fa0b ENABLE_SHADERS_MANAGER set as default 2020-05-22 16:08:02 +02:00
enricoturri1966
8a9dbb3414 ENABLE_SHADERS_MANAGER -> Fixed crash while rendering selection hints 2020-05-21 13:19:07 +02:00
enricoturri1966
0d579f5467 ENABLE_SHADERS_MANAGER -> Small refactoring 2020-05-21 12:13:24 +02:00
enricoturri1966
cbfb09a241 Fixed build for all 4 cases of tech ENABLE_SHADERS_MANAGER and ENABLE_GCODE_VIEWER enabled/disabled and code cleanup 2020-05-20 17:03:53 +02:00
enricoturri1966
c7c87973b7 First installment of tech ENABLE_SHADERS_MANAGER, using class GLShadersManager as a central point to manage OpenGL shaders 2020-05-20 14:11:22 +02:00
enricoturri1966
b59fc1e57d Tech ENABLE_GCODE_VIEWER -> Selection straight arrows rendered using the new OpenGL model class 2020-05-13 09:07:06 +02:00
enricoturri1966
58258df113 Tech ENABLE_GCODE_VIEWER -> Selection curved arrows rendered using the new OpenGL model class 2020-05-12 16:15:43 +02:00
enricoturri1966
0bb56736a1 Tech ENABLE_NON_STATIC_CANVAS_MANAGER set as default 2020-05-06 12:19:34 +02:00
Enrico Turri
de7a09f833 Fixed conflicts after merge with master 2020-03-05 10:41:11 +01:00
Lukas Matena
eb3b65d8af Fixing build against wxWidgets 3.0 
The wxString saga continues. wxWidgets 3.0 don't have the wxString::FromUTF8(const std::string&) overload, we must use the GUI::from_u8 helper
Also wxWidgets 3.0 don't allow to disable wxString->const char* conversion, so calling show_info(wxWindow*, wxString, const char*) was ambiguous
Several includes moved around
 2020-03-04 10:34:59 +01:00
Enrico Turri
96f5430cee Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-03 11:10:59 +01:00
Lukas Matena
f2b98bddee Fixing wxString::Format encoding mismatches (part 3) 2020-03-03 10:54:17 +01:00
Enrico Turri
0b629eb905 GLCanvas3DManager moved from being a static member of _3DScene to be a normal member of GUI_App 2020-03-02 10:58:46 +01:00
Enrico Turri
847efec2ed ENABLE_6DOF_CAMERA set as default 2020-02-13 12:13:54 +01:00
Lukas Matena
f902fc3445 Don't forget to copy drain holes when an object is copied 2020-02-06 14:23:03 +01:00
Enrico Turri
62e60bcb43 Six degrees of freedom camera - 1st installment 2020-01-15 12:49:34 +01:00
Enrico Turri
835ee148e5 Fixed conflicts after merging with master 2019-10-09 11:17:48 +02:00
Lukas Matena
7861fa5086 Whitespace changes to supress misleading indentation warnings 
These appear in newer gcc when spaces and tabs are mixed
 2019-09-24 16:01:01 +02:00
Enrico Turri
2dc9949a4c ENABLE_ENHANCED_RELOAD_FROM_DISK set as default 2019-09-23 15:35:49 +02:00
Enrico Turri
3a40565d03 Added tech ENABLE_ENHANCED_RELOAD_FROM_DISK 
1) Reworked void Plater::priv::reload_from_disk() to be more general

2) Added source data to class ModelVolume

3) Modified .3mf import/export to save/load volume matrices and source data

4) Incremented .3mf version to 2
 2019-09-19 09:09:11 +02:00
Enrico Turri
308f601a99 Removed another bunch of compile warnings 2019-09-04 10:46:51 +02:00
Enrico Turri
bb65ad6f2c Do not apply out of bed detection for non printable volumes 2019-08-30 10:33:21 +02:00
bubnikv
3ba144bfe5 Removed Selection-Add Volumes, Selection-Add Volume, 
Selection-Remove Volume, Selection-Remove Volumes
from taking snapshots, therefore from localizations.
 2019-08-29 10:43:26 +02:00
bubnikv
048ed74318 Another round of translation adjustments. 2019-08-28 15:12:55 +02:00
YuSanka
0a9c5a9433 Fixed extra "Add_Selection" snapshot on call context menu from scene 
+ Added take_snapshot for toggle_instance_printable_state
 2019-08-09 09:49:10 +02:00
YuSanka
0520da3241 Merge remote-tracking branch 'origin' into ys_printable_property 2019-08-06 10:31:17 +02:00
bubnikv
731e5abd88 Fixed a regression issue where excessive memory was allocated 
for the GLVolumes before sending to the GPU driver. The following commits
were partially reverted:

4269c8b23cb6878a20f468a916d0079ecaf647a0 Removed GLVolume non-VBO rendering
d15698e21e86a4e896bbb5f3c59440ec2dc721e9 GLVolume and GLIndexedVertexArray refactored to send data to gpu at the first render call

Namely, the GLVolume buffers are "shrink to size"'d before sending their
content to the OpenGL driver, and the vertex buffers are populated
as quickly as possible from the GLVolume, so that the same buffer is not
kept twice in RAM on systems, where the RAM is shared with the graphics
card.

Also the memory allocation reporting was improved for the GLVolumes.
 2019-08-05 14:30:32 +02:00
YuSanka
825446d145 Merge remote-tracking branch 'origin/master' into ys_printable_property 2019-08-05 08:45:47 +02:00
YuSanka
f712e5fcf4 Implemented set printable state for ObjectList 2019-08-05 08:44:55 +02:00
bubnikv
9f393e6b9b Not taking the snapshot with non-empty Redo stack will likely be more confusing than losing the Redo stack. 
Let's wait for user feedback.
 2019-08-01 15:25:35 +02:00
Enrico Turri
0647d3ac1e Code cleanup 2019-07-31 11:12:50 +02:00
Enrico Turri
03820a38cf Render non printable instances with a darker color 2019-07-31 11:01:50 +02:00
Enrico Turri
10b27968d1 Code cleanup 2019-07-26 11:32:44 +02:00
Enrico Turri
0a04a6d92a Add remove all from selection command to undo/redo stack only when the redo stack is empty 2019-07-24 13:51:39 +02:00
Enrico Turri
18965f5c22 Do not store into undo/redo stack remove all from selection command 2019-07-24 09:47:01 +02:00
Enrico Turri
0d10d8aba7 1st installment for selection's undo/redo snapshots 2019-07-23 15:14:08 +02:00
Enrico Turri
f97a61cdcf Fixed use of translate macros 2019-07-17 14:13:50 +02:00
bubnikv
ab7ecc1819 Merge remote-tracking branch 'remotes/origin/vb_undo_redo' 2019-07-15 11:34:18 +02:00
Enrico Turri
d4914441f3 Modified logic to add snapshots to undo/redo stack using GLCanvas::do_xxxxxx() methods 2019-07-09 10:18:57 +02:00
Enrico Turri
9ba5568539 Fixed conflicts after merge with master 2019-07-08 09:23:37 +02:00
bubnikv
4e2fda3315 Undo / Redo fixes 2019-07-05 19:06:19 +02:00
bubnikv
c7cc760067 Merge remote-tracking branch 'origin/master' into vb_undo_redo 2019-07-04 20:22:15 +02:00
YuSanka
a29cc9e242 Update object list after undo/redo 2019-07-04 19:46:46 +02:00
bubnikv
1798e2a84c WIP Undo / Redo : serialization / deserialization of object selection. 2019-07-04 14:35:04 +02:00
bubnikv
e2a670218b WIP Undo / Redo: Serializing the configs of ModelObject / ModelVolume 
/ ModelMaterial as separate objects to conserve memory.
 2019-07-03 13:43:54 +02:00
Enrico Turri
90daffccf2 View dependent order of rendering for layers editing visual hints to keep the correct transparency 2019-07-02 15:49:18 +02:00