3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-07 15:07:31 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
22590 commits 19 branches 69 tags 1.6 GiB
Commit graph

29 commits

Author SHA1 Message Date
enricoturri1966
1561d65712 Sync most of the gizmos with latest PrusaSlicer 2023-11-04 11:41:10 +08:00
enricoturri1966
049dfd3e08 Added method const GLVolume* Selection::get_first_volume() const to simplify client code 
(cherry picked from commit prusa3d/PrusaSlicer@0e3490620e)
 2023-11-04 11:41:10 +08:00
Filip Sykala
9dbb2dfe0d Various gizmos refactoring 2023-11-04 11:41:10 +08:00
Filip Sykala
30af274d44 Separate GizmoManager on_move into gizmo itself 
(cherry picked from commit prusa3d/PrusaSlicer@c751d6327d)
 2023-11-04 11:41:10 +08:00
enricoturri1966
19ad0ca4d9 Tech ENABLE_LEGACY_OPENGL_REMOVAL - Fixed calculation of normal matrices sent to shaders 
(cherry picked from commit prusa3d/PrusaSlicer@c468dcbed7)
 2023-11-04 11:41:06 +08:00
enricoturri1966
fe78e40cb4 Various fixes 2023-11-04 11:41:06 +08:00
enricoturri1966
1e4f16bd39 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Added shaders for glsl version 140 
(cherry picked from commit prusa3d/PrusaSlicer@76d1d4949b)
 2023-11-04 11:41:05 +08:00
enricoturri1966
63272a9df8 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Use shader's vertex attributes and matrices in GLMmSegmentationGizmo3DScene 
(cherry picked from commit prusa3d/PrusaSlicer@4eee0d05f3)
 2023-11-04 11:41:05 +08:00
enricoturri1966
71fd4084c2 Tech ENABLE_LEGACY_OPENGL_REMOVAL - porting remaining changes 
(cherry picked from commit prusa3d/PrusaSlicer@2f572d3cf0 )
 2023-11-04 11:41:04 +08:00
enricoturri1966
d8551d7a7d Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Use 2D vertices to render GLGizmoPainterBase circle 
(cherry picked from commit prusa3d/PrusaSlicer@5193a15852)
 2023-11-04 11:41:04 +08:00
enricoturri1966
12dbbf2d1c Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Another refactoring to simplify client code of GLModel::Geometry 
(cherry picked from commit prusa3d/PrusaSlicer@fa1ff1c357)
 2023-11-04 11:41:03 +08:00
enricoturri1966
fc1c8c2565 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Removed Slic3r::GUI::GLPaintContour from GLGizmoPainterBase.hpp/.cpp and replaced with GLModel 
(cherry picked from commit prusa3d/PrusaSlicer@df3d670357)
 2023-11-04 11:41:03 +08:00
enricoturri1966
baa575b5aa Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Replace GLIndexedVertexArray with GLModel: 
TriangleSelectorGUI::m_iva_enforcers

TriangleSelectorGUI::m_iva_blockers

TriangleSelectorGUI::m_iva_seed_fills

TriangleSelectorGUI::m_varrays

GLGizmoPainterBase::s_sphere

(cherry picked from commit prusa3d/PrusaSlicer@8916a00821)
 2023-11-04 11:41:03 +08:00
enricoturri1966
b7989e3b2f Gizmos refactoring - Removed GLModels defined into GLGizmoBase, and mostly unused, to avoid wasting GPU memory. Use a shared GLModel for Gizmos inheriting from GLGizmoPainterBase. Initialization of GLModels moved from constructor to render methods 
(cherry picked from commit prusa3d/PrusaSlicer@e3d5cd445c)
 2023-11-04 11:41:03 +08:00
enricoturri1966
269fbaa60c Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Refactoring to simplify client code of GLModel::Geometry 
(cherry picked from commit prusa3d/PrusaSlicer@be6b6590be)
 2023-11-04 11:41:03 +08:00
enricoturri1966
354f8e20fb Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Refactoring of GLModel to: 
1) allow for custom vertex data layout

2) allow for custom index data format

3) allow for any OpenGL primitive type

(cherry picked from commit prusa3d/PrusaSlicer@afcac6e2ea)
 2023-11-04 11:41:00 +08:00
enricoturri1966
7e04448b7a Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Various Gizmos updates and fixes 
prusa3d/PrusaSlicer@35dd03e8cb
prusa3d/PrusaSlicer@bcaa0d38bd
prusa3d/PrusaSlicer@2673994471
prusa3d/PrusaSlicer@0e3a3aa522
prusa3d/PrusaSlicer@08a2711034
prusa3d/PrusaSlicer@f6f95808cc
prusa3d/PrusaSlicer@81edc7d752
prusa3d/PrusaSlicer@0b6e2b4aec
prusa3d/PrusaSlicer@71f08841f9
 2023-11-04 11:41:00 +08:00
enricoturri1966
28d0147d09 Introduction of classes ColorRGB and ColorRGBA to unify color data definition and manipulation 
(cherry picked from commit prusa3d/PrusaSlicer@d0bff2d996 )
 2023-11-04 11:41:00 +08:00
SoftFever
388b483774
Feat: 1. Vertical and horizontal mode for painting 2. Optimize Camera behavior (#2424) 
* fix camera and update locale

* Paint horizontally or vertically
 2023-10-15 16:43:52 +08:00
SoftFever
da05ae02da Merge some BS1.7 changes: 
Boolean operation feature
 2023-08-08 22:14:20 +08:00
SoftFever
2492e5d39c merge upstream changes 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
 2023-01-21 00:37:10 +08:00
Stone Li
db8a66e49e ENH: do not adjust camera when entering paint gizmo 
Change-Id: I1510a57af7c2a5cea96346681dac4865f533d335
 2022-12-15 04:33:48 -05:00
lane.wei
a9a228d071 ENH: wireframe: refine the rendering logic under paint 
1. remove wireframe in 3d view, only keep in paint;
2. pass barycentric_coordinates from outside
3. add shortcut hints

Change-Id: I911e5cdf3475926d9527dc0839fdce072ed54746
(cherry picked from commit 6e16d0ccfb71741e55daabd757be9f9e7613e695)
 2022-12-15 04:33:48 -05:00
lane.wei
79b5c94f4f ENH: enable wireframe 
This reverts commit ed6e149381240fd83b61da70891127d400f30a39.

Change-Id: I010871fcf22322214c627fe907539c0916fa6ff5
 2022-12-15 04:33:48 -05:00
yifan.wu
f3c65f8597 ENH: refine gizmo paint tools 
1. support to adjust cursor size and section view by key + mouse wheel
2. display shortcut tips according to the selected tool type
3. change the left mouse behavior to object movement for color painting tool

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I13d2a83d562d6ccd8d915158e263a90ad3c02db0
 2022-10-20 19:34:37 +08:00
yifan.wu
b55d9672b9 FIX: fix crash issues when deleting filament during color painting 
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
(cherry picked from commit 5c8405309b4a9f00fe004b0510283385464763cc)

Change-Id: I32150ac2707601ba74eec1cf2163b06764378664
 2022-09-02 12:52:18 +08:00
lane.wei
2f849a86b8 refine the black color's rendering behavior 
let the black color not hard to see at the 3d page

Change-Id: Id739a589c2f28781e646fb59e50ed270eb2f0e91
 2022-08-26 09:25:59 +08:00
yifan.wu
c1ac1d8cfc ENH: rename Fragment Filter to Gap Fill 
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: If9b417c0bb80d2a9f331c1878507df427690f348
 2022-07-25 10:17:49 +08:00
lane.wei
1555904bef Add the full source of BambuStudio 
using version 1.0.10
 2022-07-15 23:42:08 +08:00