Port PrusaSlicer's Measure & Cut gizmos #2603

Noisyfox · 2023-11-04T04:01:24Z

Build on top of #2520 and replaces it.

This PR includes:

Rewrite the opengl rendering code, which now renders (almost) everything using shaders instead of legacy opengl function calls
Rewriting the gizmo mouse handling code that moves the mouse handling coding into each gizmo themselves
Rewriting the mouse picking code, now it uses ray casting to figure out what's under the mouse cursor
Porting of the PrusaSlicer's measure tool
Replacing existing cuting tool with the better one PrusaSlicer has
Updating of other gizmos using PrusaSlicer's latest code base

There was a plan to also port PrusaSlicer's emboss & svg tools, but this PR is already very big and the changes needed for emboss will be even bigger and might take forever to finish. So I decided to separate them so we can get something out and start rolling out testing builds for people to play with as soon as possible.

This was developed mainly using Windows, be prepared it could have graphic issue under Linux & macOS.

Huge credit to Prusa for their amazing job!

Fixes #717
Fixes #1150
Fixes #1590

…finition and manipulation (cherry picked from commit prusa3d/PrusaSlicer@d0bff2d )

…ing box (cherry picked from commit prusa3d/PrusaSlicer@22f3823)

(cherry picked from commit prusa3d/PrusaSlicer@bebb550)

- only 2 gizmo use cone (cherry picked from commit prusa3d/PrusaSlicer@3c7390e) (cherry picked from commit 4647fc4)

prusa3d/PrusaSlicer@35dd03e prusa3d/PrusaSlicer@bcaa0d3 prusa3d/PrusaSlicer@2673994 prusa3d/PrusaSlicer@0e3a3aa prusa3d/PrusaSlicer@08a2711 prusa3d/PrusaSlicer@f6f9580 prusa3d/PrusaSlicer@81edc7d prusa3d/PrusaSlicer@0b6e2b4 prusa3d/PrusaSlicer@71f0884

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@afcac6e)

…nd texture rendering Tech ENABLE_GLBEGIN_GLEND_REMOVAL - A few fixes in layers editing profile rendering (cherry picked from commit prusa3d/PrusaSlicer@a939d8e) (cherry picked from commit prusa3d/PrusaSlicer@8c807db)

(cherry picked from commit prusa3d/PrusaSlicer@eda5570)

(cherry picked from commit prusa3d/PrusaSlicer@1a47211)

(cherry picked from commit prusa3d/PrusaSlicer@deb17c5)

…er from 3DBed.hpp and replaced with GLModel (cherry picked from commit prusa3d/PrusaSlicer@6b04142)

…ay with GLModel - GLGizmoFlatten::PlaneData::vbo (cherry picked from commit prusa3d/PrusaSlicer@ffa3a1d)

…de of GLModel::Geometry (cherry picked from commit prusa3d/PrusaSlicer@be6b659)

…mat in dependence of data size, where possible (cherry picked from commit prusa3d/PrusaSlicer@4d2d77e)

…ostly 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@e3d5cd4)

…ay 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@8916a00)

…ur from GLGizmoPainterBase.hpp/.cpp and replaced with GLModel (cherry picked from commit prusa3d/PrusaSlicer@df3d670)

…ay with GLModel: MeshClipper::m_vertex_array (cherry picked from commit prusa3d/PrusaSlicer@be69227)

…lient code of GLModel::Geometry (cherry picked from commit prusa3d/PrusaSlicer@fa1ff1c)

…GLCanvas3D::init() (cherry picked from commit prusa3d/PrusaSlicer@aa4714a)

(cherry picked from commit prusa3d/PrusaSlicer@c9ff260)

(cherry picked from commit prusa3d/PrusaSlicer@0c74081)

(cherry picked from commit prusa3d/PrusaSlicer@5089d14)

(cherry picked from commit prusa3d/PrusaSlicer@5fcb618)

…ay with GLModel: GLVolume geometry + removed class GLIndexedVertexArray from codebase (cherry picked from commit prusa3d/PrusaSlicer@1eac357)

…e_arc(): Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Fix in GLModel::render() (cherry picked from commit prusa3d/PrusaSlicer@2379588)

(cherry picked from commit prusa3d/PrusaSlicer@5f9aeb1)

Noisyfox · 2023-11-10T15:36:21Z

No juice. Dark theme is fixed but the crashing continues. I even tried to compile the slicer on my PC as I used to do, neither master of SoftFever branches compile. Usually, when I cannot compile the slicer on my PC, something is off, unless those branches aren't ready and I need to fetch a 1.7.0 branch or something ( sorry I am not a developer and hate coding )

Also, the file GLCanvas3D.cpp seems to be a lot different from master. I am totally noob when it comes to windowing on Linux, I will see if I can find out what is wrong.

I think the crash has been fixed now. Your gif really helps, thanks!

…ing part to other side + Added check objects after cut + CutUtils: Ensuring that volumes start with solid parts after solid parts merging for proper slicing (cherry picked from commit prusa3d/PrusaSlicer@a9410ed)

HakunMatat4 · 2023-11-11T07:36:24Z

@Noisyfox yup, beautiful. Out of curiosity, what was causing that?
I might start using this one now as my main one.

Noisyfox · 2023-11-11T08:26:22Z

@Noisyfox yup, beautiful. Out of curiosity, what was causing that? I might start using this one now as my main one.

I have to write some extra code to support plate selection as well as mouse interaction with those 6 icons next to the bed, and I made a few mistakes there. It failed to release the mouse detector when creating new projects and caused the crash. Linux Mint does something slightly differently which triggers the issue.

…rusa3d/PrusaSlicer#11186). (cherry picked from commit prusa3d/PrusaSlicer@926af1a)

discip · 2023-11-18T12:52:49Z

@Noisyfox

Thank you very much for being persistent in getting this done! 😃👍🏻

The toolbar looks much nicer now.
Although in my opinion it appears to be blurrier compared to the current look. 😅
Also, I encountered what igiannakas mentioned earlier on:

Transparency on the model when browsing layers seems to not be too transparent :) Personally I am not a fan of the model outline but that's a taste thing I suppose.

Latest commit:

Current state:

SoftFever · 2023-11-19T08:50:01Z

It looks all good.
@Noisyfox Thanks for the fantastic work!

For any issues, let's use ticket to track them and discord to discuss

cpasoft · 2023-11-19T09:09:32Z

I love it... thanks @Noisyfox. I agree, you've done a fantastic work...

SoftFever · 2023-11-19T13:16:27Z

@Noisyfox

Thank you very much for being persistent in getting this done! 😃👍🏻
The toolbar looks much nicer now.
Although in my opinion it appears to be blurrier compared to the current look. 😅

Also, I encountered what igiannakas mentioned earlier on:

Transparency on the model when browsing layers seems to not be too transparent :) Personally I am not a fan of the model outline but that's a taste thing I suppose.

Latest commit:

Current state:

Looks like the shading effect was not turn off for the transparent mode.

Noisyfox · 2023-11-19T13:20:47Z

Yeah I'm working on this issue right now.

igiannakas · 2023-11-27T10:54:28Z

Hey @Noisyfox I've been getting a crash when closing the application on MacOS - ARM64 build consistently. I think it's related to this PR as it is triggered by the below with the m_objects_model being a null pointer which is used in the WX framework. I've tried debugging it but have failed miserably...

ObjectList::~ObjectList()
{
delete m_objects_model;
}

igiannakas · 2023-11-27T10:56:52Z

Crash log attached.
Crash Log.txt

igiannakas · 2023-11-27T11:00:30Z

src/slic3r/GUI/GUI_ObjectList.cpp

@@ -304,6 +310,7 @@ ObjectList::ObjectList(wxWindow* parent) :

 ObjectList::~ObjectList()
 {
+ delete m_objects_model;


This line is causing crash when closing the application. Hence probably why the original BBL code did not have the destructor invoked.

igiannakas · 2023-11-27T11:11:13Z

I've opened a tiny PR to remove that line but feel that this is just a workaround, unless there is something upstream that can be debugged - #2904

enricoturri1966 and others added 30 commits November 4, 2023 11:41

Introduction of classes ColorRGB and ColorRGBA to unify color data de…

28d0147

…finition and manipulation (cherry picked from commit prusa3d/PrusaSlicer@d0bff2d )

Tech ENABLE_GLBEGIN_GLEND_REMOVAL - 1st installment - Selection bound…

7f0c095

…ing box (cherry picked from commit prusa3d/PrusaSlicer@22f3823)

Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Selection layers hints

356405a

(cherry picked from commit prusa3d/PrusaSlicer@bebb550)

remove GLModel from base class

f6a3421

- only 2 gizmo use cone (cherry picked from commit prusa3d/PrusaSlicer@3c7390e) (cherry picked from commit 4647fc4)

Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Refactoring of GLModel to:

354f8e2

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@afcac6e)

Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Background rendering

04ad26f

(cherry picked from commit prusa3d/PrusaSlicer@eda5570)

Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Textures rendering

7907426

(cherry picked from commit prusa3d/PrusaSlicer@1a47211)

Fix various memory leaks

499b9d1

(cherry picked from commit prusa3d/PrusaSlicer@deb17c5)

Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Removed Slic3r::GUI::GeometryBuff…

f9de4ec

…er from 3DBed.hpp and replaced with GLModel (cherry picked from commit prusa3d/PrusaSlicer@6b04142)

Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Replace GLIndexedVertexArr…

6eed220

…ay with GLModel - GLGizmoFlatten::PlaneData::vbo (cherry picked from commit prusa3d/PrusaSlicer@ffa3a1d)

Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Refactoring to simplify client co…

269fbaa

…de of GLModel::Geometry (cherry picked from commit prusa3d/PrusaSlicer@be6b659)

Fix move gizmo grabber connection render

6d4e084

Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Adapt GLModel::Geometry index for…

874f39a

…mat in dependence of data size, where possible (cherry picked from commit prusa3d/PrusaSlicer@4d2d77e)

Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Removed Slic3r::GUI::GLPaintConto…

fc1c8c2

…ur from GLGizmoPainterBase.hpp/.cpp and replaced with GLModel (cherry picked from commit prusa3d/PrusaSlicer@df3d670)

Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Replace GLIndexedVertexArr…

8107057

…ay with GLModel: MeshClipper::m_vertex_array (cherry picked from commit prusa3d/PrusaSlicer@be69227)

Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Another refactoring to simplify c…

12dbbf2

…lient code of GLModel::Geometry (cherry picked from commit prusa3d/PrusaSlicer@fa1ff1c)

Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Removed OpenGL legacy calls from …

10243b3

…GLCanvas3D::init() (cherry picked from commit prusa3d/PrusaSlicer@aa4714a)

Tech ENABLE_GLBEGIN_GLEND_REMOVAL - SLA caps rendered using GLModel

dde64ac

(cherry picked from commit prusa3d/PrusaSlicer@c9ff260)

Follow-up of fdf8b11 - Fixed GLGizmoSlaSupports::render_points()

dd51ce3

(cherry picked from commit prusa3d/PrusaSlicer@0c74081)

Removed obsolete member variable GLCanvas3D::m_color_by

d1b0743

(cherry picked from commit prusa3d/PrusaSlicer@5089d14)

Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Fixed bug in rendering gizmo rotate

d85bbcb

(cherry picked from commit prusa3d/PrusaSlicer@5fcb618)

Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Replace GLIndexedVertexArr…

d09dc36

…ay with GLModel: GLVolume geometry + removed class GLIndexedVertexArray from codebase (cherry picked from commit prusa3d/PrusaSlicer@1eac357)

Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Fix in GLGizmoRotate::render_angl…

1fedcb6

…e_arc(): Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Fix in GLModel::render() (cherry picked from commit prusa3d/PrusaSlicer@2379588)

Fix a few issues in cut gizmo

c5b2092

Removed empty IMSlider_Utils.hpp

e6443b5

Removed unneeded pairs glPushMatrix()/glPopMatrix()

61ed614

(cherry picked from commit prusa3d/PrusaSlicer@5f9aeb1)

Merge branch 'main' into dev/gizmo

66d4b4d

Noisyfox added 3 commits November 11, 2023 16:27

Hide raycast debug window

6510fd4

Merge branch 'main' into dev/gizmo

5669b4f

Merge branch 'main' into dev/gizmo

d6c2192

Noisyfox added this to the 1.9.0 milestone Nov 16, 2023

Noisyfox added the enhancement New feature or request label Nov 16, 2023

Noisyfox and others added 2 commits November 17, 2023 09:18

Merge branch 'main' into dev/gizmo

f6e4c48

Fixed a crash when deleting the last object with autocenter enabled (p…

67c1f40

…rusa3d/PrusaSlicer#11186). (cherry picked from commit prusa3d/PrusaSlicer@926af1a)

Noisyfox mentioned this pull request Nov 17, 2023

Build plate appears black in Creality K1. #2713

Closed

2 tasks

Noisyfox added 2 commits November 18, 2023 14:51

Bring back anti-aliasing to toolbar icons (SoftFever#2739)

67fe5ee

Merge branch 'main' into dev/gizmo

5045642

Merge branch 'main' into dev/gizmo

df48b05

SoftFever approved these changes Nov 19, 2023

View reviewed changes

SoftFever merged commit e9f519d into SoftFever:main Nov 19, 2023
12 checks passed

Noisyfox deleted the dev/gizmo branch November 19, 2023 12:27

Noisyfox mentioned this pull request Nov 19, 2023

Fix color blending of preview shells #2799

Merged

igiannakas reviewed Nov 27, 2023

View reviewed changes

igiannakas mentioned this pull request Dec 5, 2023

1.9: Performance issues #3002

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Port PrusaSlicer's Measure & Cut gizmos #2603

Port PrusaSlicer's Measure & Cut gizmos #2603

Noisyfox commented Nov 4, 2023 •

edited

Loading

Noisyfox commented Nov 10, 2023 •

edited

Loading

HakunMatat4 commented Nov 11, 2023

Noisyfox commented Nov 11, 2023 •

edited

Loading

discip commented Nov 18, 2023 •

edited

Loading

Thank you very much for being persistent in getting this done! 😃👍🏻

SoftFever commented Nov 19, 2023

cpasoft commented Nov 19, 2023

SoftFever commented Nov 19, 2023

Thank you very much for being persistent in getting this done! 😃👍🏻

Noisyfox commented Nov 19, 2023

igiannakas commented Nov 27, 2023

igiannakas commented Nov 27, 2023

igiannakas Nov 27, 2023

igiannakas commented Nov 27, 2023

Port PrusaSlicer's Measure & Cut gizmos #2603

Port PrusaSlicer's Measure & Cut gizmos #2603

Conversation

Noisyfox commented Nov 4, 2023 • edited Loading

Noisyfox commented Nov 10, 2023 • edited Loading

HakunMatat4 commented Nov 11, 2023

Noisyfox commented Nov 11, 2023 • edited Loading

discip commented Nov 18, 2023 • edited Loading

Thank you very much for being persistent in getting this done! 😃👍🏻

SoftFever commented Nov 19, 2023

cpasoft commented Nov 19, 2023

SoftFever commented Nov 19, 2023

Thank you very much for being persistent in getting this done! 😃👍🏻

Noisyfox commented Nov 19, 2023

igiannakas commented Nov 27, 2023

igiannakas commented Nov 27, 2023

igiannakas Nov 27, 2023

Choose a reason for hiding this comment

igiannakas commented Nov 27, 2023

Noisyfox commented Nov 4, 2023 •

edited

Loading

Noisyfox commented Nov 10, 2023 •

edited

Loading

Noisyfox commented Nov 11, 2023 •

edited

Loading

discip commented Nov 18, 2023 •

edited

Loading