walterioo/OrcaSlicer-KX
1
0
Fork 0
forked from viewit/OrcaSlicer-KX
Code Pull Requests Releases 2 Activity
13,353 Commits 10 Branches 9 Tags
dfed8d8d8330c5220cc98f9b3673e659ec8cbef4
Commit Graph

103 Commits

Author SHA1 Message Date
enricoturri1966
2b2091d46c Modal estimated printing time dialog 
Fixed conflicts after merge with master
 2020-07-27 14:53:17 +02:00
YuSanka
89123a93b3 Hot fix for the last commit 2020-07-24 13:02:46 +02:00
YuSanka
58e6d4b43d Fixed a bug in selection from the 3D scene. 
Steps to the reproduce a crash:
1. In SLA mode add some object with several instances
2. Slice
3. Back to 3Dview scene, select all using Ctrl+A
4. Press "Delete"
 2020-07-24 11:21:49 +02:00
enricoturri1966
329077ab22 Fixed build when ENABLE_GCODE_VIEWER is disabled 2020-07-08 14:43:14 +02:00
enricoturri1966
5bbc804744 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 14:29:54 +02:00
Lukas Matena
edcaab8b0a 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
acd8801d3a Fixed conflicts after merge with master 2020-05-27 10:32:02 +02:00
Lukas Matena
937af2a2ce 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
1eb6ec97ed ENABLE_SHADERS_MANAGER set as default 2020-05-22 16:08:02 +02:00
enricoturri1966
579ac88ea3 ENABLE_SHADERS_MANAGER -> Fixed crash while rendering selection hints 2020-05-21 13:19:07 +02:00
enricoturri1966
a2459bbc52 ENABLE_SHADERS_MANAGER -> Small refactoring 2020-05-21 12:13:24 +02:00
enricoturri1966
2e64da5c1d 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
4194c347ab 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
1cd2ffa6fe Tech ENABLE_GCODE_VIEWER -> Selection straight arrows rendered using the new OpenGL model class 2020-05-13 09:07:06 +02:00
enricoturri1966
9d784a4f4a Tech ENABLE_GCODE_VIEWER -> Selection curved arrows rendered using the new OpenGL model class 2020-05-12 16:15:43 +02:00
enricoturri1966
8bba1d96dc Tech ENABLE_NON_STATIC_CANVAS_MANAGER set as default 2020-05-06 12:19:34 +02:00
Enrico Turri
4500fe7d3d Fixed conflicts after merge with master 2020-03-05 10:41:11 +01:00
Lukas Matena
18fd7fa45f 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
2a38f85772 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-03 11:10:59 +01:00
Lukas Matena
4949150313 Fixing wxString::Format encoding mismatches (part 3) 2020-03-03 10:54:17 +01:00
Enrico Turri
f61f6a98a5 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
ddf6501acd ENABLE_6DOF_CAMERA set as default 2020-02-13 12:13:54 +01:00
Lukas Matena
164c2da18b Don't forget to copy drain holes when an object is copied 2020-02-06 14:23:03 +01:00
Enrico Turri
94a95f9786 Six degrees of freedom camera - 1st installment 2020-01-15 12:49:34 +01:00
Enrico Turri
d3c337b69a Fixed conflicts after merging with master 2019-10-09 11:17:48 +02:00
Lukas Matena
a34a1341c5 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
03507f9b7d ENABLE_ENHANCED_RELOAD_FROM_DISK set as default 2019-09-23 15:35:49 +02:00
Enrico Turri
0c461f6db6 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
f7f5a38764 Removed another bunch of compile warnings 2019-09-04 10:46:51 +02:00
Enrico Turri
2b2584c285 Do not apply out of bed detection for non printable volumes 2019-08-30 10:33:21 +02:00
bubnikv
465e3df14b 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
ba58c3438a Another round of translation adjustments. 2019-08-28 15:12:55 +02:00
YuSanka
de3b001622 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
0fcc6cb159 Merge remote-tracking branch 'origin' into ys_printable_property 2019-08-06 10:31:17 +02:00
bubnikv
b0fc0cf49f Fixed a regression issue where excessive memory was allocated 
for the GLVolumes before sending to the GPU driver. The following commits
were partially reverted:

4269c8b23c Removed GLVolume non-VBO rendering
d15698e21e 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
ccf167b29c Merge remote-tracking branch 'origin/master' into ys_printable_property 2019-08-05 08:45:47 +02:00
YuSanka
2032cb0c89 Implemented set printable state for ObjectList 2019-08-05 08:44:55 +02:00
bubnikv
a04690cc88 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
fcb95df738 Code cleanup 2019-07-31 11:12:50 +02:00
Enrico Turri
adf64d9d23 Render non printable instances with a darker color 2019-07-31 11:01:50 +02:00
Enrico Turri
eb40cdef49 Code cleanup 2019-07-26 11:32:44 +02:00
Enrico Turri
450ae17d59 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
58c862e742 Do not store into undo/redo stack remove all from selection command 2019-07-24 09:47:01 +02:00
Enrico Turri
d14e0d2c90 1st installment for selection's undo/redo snapshots 2019-07-23 15:14:08 +02:00
Enrico Turri
459dd8f1af Fixed use of translate macros 2019-07-17 14:13:50 +02:00
bubnikv
e8e35579dd Merge remote-tracking branch 'remotes/origin/vb_undo_redo' 2019-07-15 11:34:18 +02:00
Enrico Turri
3bd9bb360e Modified logic to add snapshots to undo/redo stack using GLCanvas::do_xxxxxx() methods 2019-07-09 10:18:57 +02:00
Enrico Turri
85e9318081 Fixed conflicts after merge with master 2019-07-08 09:23:37 +02:00
bubnikv
445cd20919 Undo / Redo fixes 2019-07-05 19:06:19 +02:00
bubnikv
d98aa0f91d Merge remote-tracking branch 'origin/master' into vb_undo_redo 2019-07-04 20:22:15 +02:00