enricoturri1966
2904ee6e1a
Added missing include
2020-05-28 09:38:08 +02:00
enricoturri1966
9c8892c869
GCodeViewer -> Shaders code cleanup
2020-05-28 09:23:30 +02:00
enricoturri1966
edaabf3fbd
GCodeViewer -> Experimental hexagonal icons for toolpaths in legend
2020-05-28 07:52:11 +02:00
enricoturri1966
0cb4a5ce56
GCodeViewer -> Improved depth detection in shader for options
2020-05-28 07:06:54 +02:00
YuSanka
4b6bcd7028
Merge: Implemented merge to the separate object, when some instance is selected
2020-05-27 22:30:24 +02:00
Lukas Matena
6d432f5426
Fixes second part of #4282 (wxWidgets 3.0 compatibility)
2020-05-27 17:30:56 +02:00
enricoturri1966
0e018e6690
Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-05-27 16:31:26 +02:00
enricoturri1966
abd7d74800
GCodeViewer -> Small refactoring
2020-05-27 16:31:02 +02:00
enricoturri1966
35190936a3
GCodeViewer -> Newer version of shader for options
2020-05-27 16:19:40 +02:00
enricoturri1966
af3765c04c
Follow up of e77fa3512a
-> changed logic for DoubleSlider::Control accelerators
2020-05-27 16:14:14 +02:00
enricoturri1966
edb643e178
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-05-27 16:03:56 +02:00
enricoturri1966
e77fa3512a
DoubleSlider::Control -> Shift and Ctrl used as accelerators for moving thumbs with arrows key and mouse wheel
2020-05-27 16:03:40 +02:00
enricoturri1966
100484dabe
Added missing include
2020-05-27 15:28:24 +02:00
Yuri D'Elia
c6f0cd5b5b
Ironingy typo
2020-05-27 14:31:17 +02:00
enricoturri1966
448d92df68
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-05-27 14:29:54 +02:00
enricoturri1966
a0acf24ab8
DoubleSlider::Control -> Fixed crash when pressing numpad [+] and [-] keys while the horizontal slider has focus
2020-05-27 14:29:27 +02:00
Lukas Matena
d9b764bd10
Removed obsolete LambdaObjectDialog.cpp/hpp, more include cleanups:
...
BedShapeDialog.hpp (needs not include) OptionsGroup.hpp
Tab.hpp GUI_App.hpp
2020-05-27 14:01:48 +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
YuSanka
ee1942e4e9
Implemented merge of the objects to the one multi-part object
...
+ Implemented merge of the parts to the one object. But now this function doesn't used.
+ Fixed Model::looks_like_imperial_units()
2020-05-27 11:59:43 +02:00
enricoturri1966
94a4689b00
DoubleSlider::Control -> Change text position at the edges of horizontal slider
2020-05-27 11:50:29 +02:00
Lukas Matena
f2f1cfef9a
Fix of #4282 (wxOVERRIDE macro not available in wxWidgets 3.0)
...
Now that we use C++17, there is no point in using it in PrusaSlicer codebase
2020-05-27 10:58:38 +02:00
enricoturri1966
908650630b
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-05-27 10:45:19 +02:00
enricoturri1966
2eb4b2caed
Fixed conflicts after merge with master
2020-05-27 10:32:02 +02:00
Lukas Matena
3ced59d2a3
Reenabled SLIC3R_HOLE_RAYCASTER before unit tests are updated properly
...
There are still tests of removing holes on slices and raycasting on unaltered mesh (which was eventually superseded by CGAL boolean operations)
2020-05-27 10:05:54 +02:00
enricoturri1966
aa04f0e555
ENABLE_GCODE_VIEWER -> Completed implementation of new GLModel class
2020-05-27 08:06:02 +02:00
Lukas Matena
e6317cdefb
Merge branch 'lm_aabb_improvements'
2020-05-27 02:15:54 +02:00
Lukas Matena
55395e046f
EigenMesh3D does not store a copy of the mesh
...
Instead, it stores a pointer to extern TriangleMesh (which must not be destroyed before the EigenMesh3D object)
2020-05-27 00:51:11 +02:00
Lukas Matena
1f833921a2
More code cleaning,...
...
optimizations regarding normals calculation
removed unused EigenMesh3D(const Contour3D &other) constructor
removed unused class si_result
2020-05-27 00:51:11 +02:00
Lukas Matena
d85fa8e9ab
EigenMesh3D now stores TriangleMesh inside, not a mesh in Eigen format
...
Rotfinder was apparently building the AABB tree needlessly
2020-05-27 00:51:11 +02:00
Lukas Matena
9224a6a3e6
Removed some unused code
...
- removed define USE_AABB_INDIRECT (which switched between old and new AABB implementation)
- removed define SLIC3R_SLA_NEEDS_WINDTREE (relied on igl and was not used anyway)
- new define SLIC3R_HOLE_RAYCASTER (hides currently unused code)
- slight include cleanup
- removed obsolete source file SupportTreeIGL.cpp
2020-05-27 00:51:11 +02:00
Lukas Matena
cdf80c3b3f
Switched to new AABB tree implementation for raycasting
2020-05-27 00:13:38 +02:00
Lukas Matena
6e716faa1c
Merge branch 'lm_includes_warnings'
...
No functional changes (hopefully).
2020-05-26 16:14:09 +02:00
Lukas Matena
32a353058f
Fixed few warnings
2020-05-26 16:06:11 +02:00
Lukas Matena
3e855d36dc
Fixed unit tests after previous include manipulations
2020-05-26 15:33:44 +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
Lukas Matena
c2cd430941
Few more include chains broken
2020-05-26 13:46:59 +02:00
Lukas Matena
02838eaa30
Slight include cleanup
2020-05-26 13:45:36 +02:00
Lukas Matena
cc5fe02cde
Include cleanup: GUI_ObjectManipulation.hpp, GUI, GUI_Preview
2020-05-26 13:45:36 +02:00
Lukas Matena
fb9d8b2025
Include cleanup: do not include Model.hpp from 3DScene.hpp
2020-05-26 13:45:36 +02:00
enricoturri1966
8f91b4f4f4
DoubleSlider::Control -> Tweaks to text position for horizontal case
2020-05-26 08:34:19 +02:00
enricoturri1966
1d317489fd
GCodeViewer -> Temporary ImGui dialog for editing shaders parameters
2020-05-26 08:16:08 +02:00
enricoturri1966
13098938ac
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-05-25 13:55:23 +02:00
Enrico Turri
2759380000
DoubleSlider:Control platform dependent background color
2020-05-25 13:53:41 +02:00
Enrico Turri
5b7cb8f5a9
Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-05-25 12:08:26 +02:00
enricoturri1966
a63e5b352e
ENABLE_GCODE_VIEWER -> Reduced vertical size of horizontal slider
2020-05-25 12:08:09 +02:00
Enrico Turri
94b66fe987
Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-05-25 12:01:10 +02:00
enricoturri1966
6810550a6c
DoubleSlider::Control background color
2020-05-25 11:59:12 +02:00
Enrico Turri
06b950c8d7
Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-05-25 11:17:07 +02:00
enricoturri1966
1af798dbd7
DoubleSlider::Control thumb text rendered closer to the slider
2020-05-25 11:16:40 +02:00
enricoturri1966
1c826c063b
GCodeViewer refactoring and GLShaderProgram upgrade
2020-05-25 10:48:53 +02:00