iGoX/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-09-14 14:48:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,163 Commits 4 Branches 1 Tag
e9d57c932acfac13e7be9eed3971426032ab5f44
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
enricoturri1966 e9d57c932a Fixed conflicts after merge with master 2020-05-28 15:50:21 +02:00
enricoturri1966 0599dc4df7 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-05-28 15:27:39 +02:00
enricoturri1966 c63e03c367 1st installment of tech ENABLE_ENVIRONMENT_MAP 2020-05-28 15:27:29 +02:00
enricoturri1966 96db6aaadb Attempt to fix rambling crash on Mac Asan 2020-05-28 11:14:56 +02:00
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
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
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
enricoturri1966 94a4689b00 DoubleSlider::Control -> Change text position at the edges of horizontal slider 2020-05-27 11:50:29 +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
enricoturri1966 aa04f0e555 ENABLE_GCODE_VIEWER -> Completed implementation of new GLModel class 2020-05-27 08:06:02 +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
enricoturri1966 ed252f1741 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-25 07:07:49 +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
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
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
Enrico Turri 78cbba4ce1 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 14:45:12 +02:00
enricoturri1966 8a9dbb3414 ENABLE_SHADERS_MANAGER -> Fixed crash while rendering selection hints 2020-05-21 13:19:07 +02:00
enricoturri1966 4eb1b9432f Fixed selection of thumbs into gcode sequential view slider 2020-05-21 13:07:55 +02:00
enricoturri1966 0d579f5467 ENABLE_SHADERS_MANAGER -> Small refactoring 2020-05-21 12:13:24 +02:00
enricoturri1966 dd424b6bcf Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 11:38:22 +02:00
enricoturri1966 4f5aefc919 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 10:36:54 +02:00
Enrico Turri a9e2444d29 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 10:32:29 +02:00
enricoturri1966 3bbe2ef960 Fixed typo 2020-05-21 10:27:41 +02:00
Enrico Turri afc378f317 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 10:19:37 +02:00
enricoturri1966 cae84d2857 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 10:15:24 +02:00
enricoturri1966 5aa8cc5779 ENABLE_SHADERS_MANAGER -> Unified client code of new GLShadersManager and GLShaderProgram classes 2020-05-21 10:15:00 +02:00
Enrico Turri 2c6ed1c26e Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 08:07:39 +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
Enrico Turri 1c09484a5d Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-20 14:50:17 +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
Enrico Turri e2bf72a494 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-19 11:18:12 +02:00
enricoturri1966 98c2e3c7b1 GCodeViewer -> New icons for thumbs of horizontal DoubleSlider::Control 2020-05-19 11:17:47 +02:00
enricoturri1966 053f509437 GCodeViewer -> Fixed visibility of bottom toolbar 2020-05-19 10:04:14 +02:00
enricoturri1966 8a834b76e4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-19 07:57:19 +02:00
Enrico Turri 48091bb9f0 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-18 15:01:41 +02:00
enricoturri1966 f4303fc419 Attempt to fix build on OsX 2020-05-18 13:32:07 +02:00
enricoturri1966 7916082764 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-18 13:24:35 +02:00
enricoturri1966 163fbec8c8 GCodeViewer -> Completed implementation of slider for sequential view 2020-05-18 13:24:07 +02:00
Enrico Turri d8efd90153 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-16 10:24:44 +02:00
enricoturri1966 c49f46d904 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-15 17:58:07 +02:00
enricoturri1966 2b536137d2 Tech ENABLE_GCODE_VIEWER -> Adapting DoubleSlider::Control for sequential view 2020-05-15 17:57:47 +02:00
enricoturri1966 9487676680 ENABLE_CANVAS_TOOLTIP_USING_IMGUI set as default 2020-05-15 13:40:45 +02:00
enricoturri1966 b9f0b9eeda ENABLE_GIZMO_TOOLBAR_DRAGGING_FIX set as default 2020-05-15 12:42:29 +02:00
Enrico Turri 6bc246b5b9 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-15 12:29:58 +02:00
enricoturri1966 94b431f3af Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-15 12:26:18 +02:00
enricoturri1966 a68eefbe4a Tech ENABLE_GCODE_VIEWER -> Refactoring and code cleanup 2020-05-15 12:25:38 +02:00
Enrico Turri f0bb09b472 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-15 09:24:55 +02:00
enricoturri1966 e57bc8afc1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-15 09:23:20 +02:00
enricoturri1966 5be901547e GCodeViewer -> Imgui slider for sequential view replaced by DoubleSlider::Control (wip) 2020-05-15 09:22:51 +02:00
Enrico Turri 6041ec9aae Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-15 07:52:57 +02:00
enricoturri1966 32529b66ac Tech ENABLE_GCODE_VIEWER -> Small refactoring 2020-05-13 13:55:00 +02:00
enricoturri1966 2bd514614b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-13 12:34:50 +02:00
enricoturri1966 54925a191e Updated imgui README.md to contain reference to the commit which modify it 2020-05-13 12:31:48 +02:00
enricoturri1966 79101d6e54 Fixed toolbar items reacting when disabled 2020-05-13 12:30:09 +02:00
enricoturri1966 cd2e4002ed Tech ENABLE_GCODE_VIEWER -> Removed obsolete class GLArrow 2020-05-13 11:59:48 +02:00
enricoturri1966 800a6c5e57 Tech ENABLE_GCODE_VIEWER -> Fixed normals in curved arrows model 2020-05-13 11:48:29 +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 8d5cea82f4 Tech ENABLE_GCODE_VIEWER -> Bed axes rendered using the new OpenGL model class 2020-05-12 11:33:50 +02:00
enricoturri1966 3475604362 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-11 16:37:19 +02:00
enricoturri1966 b2f8f2bca6 Added missing includes 2020-05-11 16:37:04 +02:00
enricoturri1966 769cca4b25 GCodeViewer -> Enhanced tool marker + refactoring (added new base class for OpenGL models) 2020-05-11 16:26:35 +02:00
enricoturri1966 c02a77d942 GCodeViewer -> Prototype for tool marker 2020-05-11 13:09:26 +02:00
enricoturri1966 fd32e7ea6a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-11 08:06:48 +02:00
enricoturri1966 3b2a4a0c13 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-07 16:48:11 +02:00
enricoturri1966 2daa12d467 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-05-07 16:47:28 +02:00
enricoturri1966 dcb603bed5 Fix for tooltip not disappearing when loading an object using the top toolbar 'Add' command and when swithing to preview 2020-05-07 16:47:15 +02:00
enricoturri1966 40e686451a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-07 13:23:06 +02:00
enricoturri1966 383d7f2d73 2nd attempt to fix build on OsX 2020-05-07 13:07:56 +02:00
enricoturri1966 d118d27d60 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-07 12:04:03 +02:00