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
YuSanka
f78f5c85be
MSW specific issue: Fixed scaling of the Tabs when They are in the separated dialog
2020-05-25 10:21:30 +02:00
YuSanka
7e88e20402
Fixed a bitmap getting for the case, when application was started in Light mode and then switched to the Dark
2020-05-25 09:41:19 +02:00
enricoturri1966
ed252f1741
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-05-25 07:07:49 +02:00
YuSanka
c7ef1feaf0
Added missed icons for the dark mode.
...
Fixed typos from the previous commit
2020-05-22 17:05:21 +02:00
Enrico Turri
1b0d1fd143
Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-05-22 16:50:26 +02:00
enricoturri1966
43b78b630c
GCodeViewer -> Enhanced legend icons
2020-05-22 16:37:53 +02:00
enricoturri1966
314995fa0b
ENABLE_SHADERS_MANAGER set as default
2020-05-22 16:08:02 +02:00
Vojtech Bubnik
180742ccaa
Pulling patched boost::polygon from github prusa3d/polygon.
2020-05-22 15:33:11 +02:00
YuSanka
a56bbea140
Reworked sys_color_changed() functions
...
Fixed OSX specific bugs:
- toolbar flashing for some mainframe sizes (Retina specific)
- size of mainframe when settings layout in slNew mode
Added missed icons to the "white" folder
2020-05-22 15:26:35 +02:00
Enrico Turri
627df86802
Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-05-22 13:32:30 +02:00
enricoturri1966
4d05ec0856
GCodeViewer -> New shaders for options
2020-05-22 13:21:43 +02:00
Enrico Turri
e3cb969474
Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-05-22 13:15:55 +02:00
enricoturri1966
80c2f107c1
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
2020-05-22 12:12:56 +02:00
enricoturri1966
83ea38c2f3
GCodeViewer -> Refactoring of options coloring + options added to legend
2020-05-22 11:52:07 +02:00
Vojtech Bubnik
c09d702045
Show Eigen vectorization support in system info dialog.
2020-05-22 11:36:10 +02:00
Vojtech Bubnik
ac1f24e5c9
AABB: Some further polishing and a reference to an SSE implementation
...
of the 3D Box vs. ray intersection implementation.
2020-05-22 11:35:49 +02:00
enricoturri1966
6e279cbec2
GCodeViewer -> Refactoring of sequential view marker positioning
2020-05-22 10:43:59 +02:00
enricoturri1966
f345e58358
Fix in ENABLE_CAMERA_STATISTICS
2020-05-22 09:51:57 +02:00
enricoturri1966
082a30a5db
ENABLE_SHADERS_MANAGER -> Added method GLShaderProgram::set_uniform(const char* name, double value)
2020-05-22 09:49:42 +02:00
enricoturri1966
df010a1d4e
Added methods GUI_App::is_gl_version_greater_or_equal_to() and GUI_App::is_glsl_version_greater_or_equal_to()
2020-05-22 09:45:31 +02:00