mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,068 Commits 3 Branches 0 Tags 638 MiB
Commit Graph

55 Commits

Author SHA1 Message Date
zhou.xu 53d8085833 ENH:After cutting,fix non manifold edges needed confirmed by user 
Jira: STUDIO-5217
Change-Id: I52ba0db27ebe0b7b763c49311c7aa305bc4dcd5a
 2023-12-14 22:08:53 +08:00
zhou.xu ed126ae10c FIX:Reorganize the assignment of variables of "m_editing_window_width" 
Jira: STUDIO-5238
Change-Id: If369916f3f5c21510f5f297bfd05c1230bdda7a4
 2023-11-30 09:51:52 +08:00
zhou.xu 6d3572270c ENH:cancel EnterReturnsTrue for imgui in cut 
Jira: STUDIO-5269
Change-Id: Ifc4b183a4e4c4fdb4f47742f14f70a1ed93fa056
Signed-off-by: zhou.xu <zhou.xu@bambulab.com>
 2023-11-30 09:51:52 +08:00
zhou.xu 6e8ff40ad5 ENH:add reset_cut_by_contours in on_load function 
Jira:STUDIO-5269
m_connector_size_tolerance default value is 0.1f

Change-Id: I6c67fff3cb0c1190e9141ed6f68fbfa848679f35
 2023-11-30 09:51:52 +08:00
zhou.xu e4cfd78e2c FIX:cancel the variable of "checkbox_size" as a fixed value 
Jira: STUDIO-5150
Change-Id: I30d876d141b8b35ab4a3fee4889993d87b7c1741
 2023-11-30 09:51:52 +08:00
zhou.xu 41a5117c93 ENH: Resolve non manifold edges by fixing model interfaces 
Jira: STUDIO-5124
Change-Id: I7ea86be44acb80b6c4762a76208b4a031acd0b27
 2023-11-30 09:51:52 +08:00
zhou.xu 636c7dd048 ENH:editing_window_width's value is small on the laptop 
Jira: STUDIO-5238
Change-Id: I9044129f4e0c8ca7469db05b3e547fca4754342a
 2023-11-30 09:51:52 +08:00
zhou.xu c59e7ca79d ENH:editing_window_width's value is small on the laptop 
Jira: STUDIO-5238 STUDIO-5265
Change-Id: Ia958772bcb081817da621115f99328bb62770cd5
 2023-11-30 09:51:52 +08:00
zhou.xu 8ddee271ea FIX: reset_cut_by_contours should update_buffer_data 
Jira: STUDIO-5376
Change-Id: I5aacb1f7b65822031d7138abd61a45b09c743531
 2023-11-30 09:51:52 +08:00
zhou.xu fbcc9f58b0 ENH:cancel EnterReturnsTrue for imgui in cut 
Jira: STUDIO-5269
Change-Id: I2832e1dccaf9755448debe7b2bd56426f90dfe0d
 2023-11-22 11:06:25 +08:00
zhou.xu ba55b9712c ENH:display the euler angle of rotation plane 
Jira: STUDIO-5268
Change-Id: I6b7b431931d60f1a9a832908400417781798c472
 2023-11-22 08:23:38 +08:00
zhou.xu 3fd1c6702a ENH:editing_window_width's value is small on the laptop 
Jira: STUDIO-5238 STUDIO-5265
apply_selected_connectors should check_and_update_connectors_state

Change-Id: I8c2c1c920cc4d197d1908815a3e62f4962335451
 2023-11-22 08:23:38 +08:00
zhou.xu f5637dac77 FIX: merge the patch from Prusa 
Thanks for PrusaSlicer and YuSanka
Jira:STUDIO-5175
commit 510d59687b3b19c4a0f4e6540620d0694dd1b7ac
Author: YuSanka <yusanka@gmail.com>
Date:   Thu Oct 5 14:13:14 2023 +0200
    Follow-up 1b451cdf: Fixed #11415 - Connectors disappear when slicing => only when using multiple cut planes AND excluding parts

Change-Id: I9ccd5b85f482d723d21fccf5e104c9e0a9cc4849
 2023-11-22 08:23:38 +08:00
zhou.xu dfa707fc7a FIX: rendered color changes 
Jira: STUDIO-4956
during the drag processin connectors editing state

Change-Id: I3027176ea9f93a9ba9d6a2052f41aaa4adef79f1
 2023-11-22 08:23:38 +08:00
zhou.xu 4adae5e595 FIX:not TakeSnapshot for m_start_dragging_m 
Jira: STUDIO-5176

Change-Id: Ia03e3e2c2664dbdcffa19ec8d0fa97dfd95e6d35
 2023-11-22 08:23:38 +08:00
zhou.xu 7d33cb0ff1 FIX:cut imgui has overlapping rendering on Apple 
Jira: STUDIO-5150
Change-Id: I7969e19dc189cd617026a183067dad628208955c
 2023-11-22 08:23:38 +08:00
zhou.xu 8aa0c06137 FIX: missed manually entered values for secondary processing 
Jira: STUDIO-4964
Change-Id: I5cf0da1ae77cccd34de05b4a0318a751ac9f6753
 2023-11-09 10:09:10 +08:00
zhou.xu e9dbf52775 ENH:use on_render_rotate_gizmos() replace GLGizmoRotate3D::on_render() 
Jira: STUDIO-4227
Change-Id: If9b9ea5596e59472d5fa87ac56aeb7f6ecc65643
 2023-11-09 10:09:10 +08:00
zhou.xu 30faa26919 FIX:The plane should rotate around the world coordinate system 
Jira: STUDIO-5054
Change-Id: I16e484b38d79cabd9473acf1abf3c5c6b0adc4c6
 2023-11-09 10:09:10 +08:00
zhou.xu 008676510c ENH:add "Snap Global Parameters" imgui text 
Jira: STUDIO-4959
Change-Id: Id410e318a4bc08da398dd7f4401ad211f6d03226
 2023-11-09 10:09:10 +08:00
zhou.xu 295c40709f FIX:Imgui's StyleVar not pop according to PushStyleVar 
Jira: STUDIO-5000
Change-Id: I4bdafb41404651a19a211e2e1eec78169ff8b9f3
 2023-11-09 10:09:10 +08:00
zhou.xu 275dd249a1 FIX:added snap connector may not been selected 
Jira: STUDIO-4960
Due to space in snap, added snap connector may result in not been selected

Change-Id: Ib2573a88c867ffc4d5839940a038dc2a193e979e
 2023-11-09 10:09:10 +08:00
zhou.xu 08bfc8d980 FIX:when init on_set_state(),m_hover_id should be -1 
Jira: STUDIO-4955
Change-Id: Ida2c7564ca45cfd331dba933ac3bf93cf2c4cd34
 2023-11-09 10:09:10 +08:00
zhou.xu b552a3c534 FIX:add_connector should check_and_update_connectors_state 
Jira: STUDIO-4957
Change-Id: Iebdb5f537788c9f376bbd3cc407a0a495a988f98
 2023-11-09 10:09:10 +08:00
zhou.xu 21e370e779 FIX:fix enable condition of "Object" 
Jira: STUDIO-4958
Change-Id: Ibbd57ebe09697ec5011884eaaa72d4aa050c4bb8
 2023-11-09 10:09:10 +08:00
zhou.xu 72401faeda FIX:fix to_ImU32 and modify "Left click" to "Left drag" 
Jira: STUDIO-4952
Change-Id: I50e9a03400046aaa9e456540193db3db781ce43f
 2023-11-09 10:09:10 +08:00
zhou.xu 8c0ff69474 FIX:allow cutting into only an object 
"keep" modify to "Keep orientation"
Jira:STUDIO-4227

Change-Id: I37759258f527ce1aa1f6b66dd4918eab135cb583
 2023-11-09 10:09:10 +08:00
zhou.xu 6021d12110 FIX:cut reset failed after setted rotation Y=90 
Jira: STUDIO-4814
Change-Id: I9f8c89744ddf0f48245c45af35f3193ff2cf929b
 2023-11-09 10:09:10 +08:00
zhou.xu 8a8020e0a9 FIX:miss reset_cut_by_contours When synchronizing parameters 
Jira: STUDIO-4227
Change-Id: Ia6c30a5ada478a320db158e1d10901044c53ecf2
(cherry picked from commit 93de292a97cef762cc62573b3efe98a66f44ecfa)
 2023-11-09 10:09:10 +08:00
Oleksandra Yushchenko 771f8e6aad ENH:identify Upper/Lower parts for cut tool 
Jira:STUDIO-4227
most of code from PrusaSlcer,thanks for PrusaSlcer and YuSanka
commit b40473be51fd1050fa4d7b2c3297230758085d46
Author: YuSanka <yusanka@gmail.com>
Date:   Thu Feb 9 08:52:07 2023 +0100
    CutGizmo: Improvements to identify Upper/Lower parts_count

Change-Id: I36cd64ec0a6ede696d22b854146fa3cdfd87ad91
 2023-11-01 09:33:21 +08:00
zhou.xu f9f44d0785 NEW:add groove cut function 
Jira:STUDIO-4227
Approximately 70% of the code comes from Prusa,thanks for PrusaSlcer and YuSanka

commit 492e356a21734b3503caae115fbb280da5fbaa22
Author: YuSanka <yusanka@gmail.com>
Date:   Thu Aug 3 16:09:28 2023 +0200
    CutGizmo: Fixed and improved Undo/Redo.
...

Change-Id: I63abb69180aec2ab0ce9bc8f30477d9e9a25a5fb
 2023-11-01 09:33:21 +08:00
zhou.xu 67a4457b30 ENH:upgrade render_combo and calc_projection api 
Jira: STUDIO-4227
Change-Id: I0cfcca0c7b845fe84647ed017a5f8cf757b3e46a
 2023-11-01 09:33:21 +08:00
Oleksandra Yushchenko eea3e32d0d NEW:add PartSelection class and some apis for cut tool 
Jira:STUDIO-4227
most of code from PrusaSlcer,thanks for PrusaSlcer and YuSanka

commit 1aa8d8ea99a56a622d234f71be8d312e1ebe4735
Author: YuSanka <yusanka@gmail.com>
Date:   Fri Jun 23 16:53:29 2023 +0200
    WIP: Cut with Tongue and Groove
    * Implemented preview rendering of groove
...

Change-Id: Id5db8742db50aa10f9b5ebb057ba70f92fc22aeb
 2023-11-01 09:33:21 +08:00
zhou.xu a92a138918 FIX: Cannot undo after moving the connector 
Jira: STUDIO-4506
Change-Id: I53de8eb3a884de1acb02b825f826bdad2547ad64
 2023-11-01 09:33:21 +08:00
zhou.xu b4e675f627 FIX: modify render_connector_model to render_glmodel 
Jira: STUDIO-4506

Change-Id: I5739857400efda0ca6f5e3ca6f96235b84c4cd46
 2023-11-01 09:33:21 +08:00
zhou.xu 71d8fe1013 ENH: upgrade render_slider_double_input_show_percentage api 
Jira: STUDIO-4506
upgrade render_slider_double_input_show_percentage api to render_slider_double_input_by_format

Change-Id: I62004e0d8be628ad73c2f2dfb61bff77caf32aab
 2023-11-01 09:33:21 +08:00
zhou.xu 7e51bf41a1 NEW: add snap connector 
Jira:STUDIO-4227

most of the codes are referenced from PrusaSlicer,thanks YuSanka for the original submits

commit 7cd99d98f537198b78158feced2aa8977bfcbe08
Author: YuSanka <yusanka@gmail.com>
Date:   Wed Jul 12 18:06:51 2023 +0200
    WIP: Cut with Rivets
    * Code refactoring: get_connector_mesh() and apply_cut_connectors() moved from ModelObject to CutGizmo.
    * Allow to change values of space and bulges for snaps
7cd99d98f5
...

Change-Id: Id4c7991a0ed5bf9608823601775920a81a3dd1c4
 2023-11-01 09:33:21 +08:00
zhimin.zeng 4f48c48ad2 FIX: crash when multi-select connectors with different shape 
Jira: 3916
Change-Id: Ic011827e5d301f91f684039a85b228196be1ba98
 2023-11-01 09:11:19 +08:00
zhimin.zeng 5cd1c1b685 FIX: the cut tool gizmo display problem 
STUDIO-3182

Change-Id: I728cae259b613835f4c2a0a86543c23936e713c8
 2023-07-07 17:29:08 +08:00
liz.li 8ae8cce200 FIX:enable tab key of cut toolbar[STUDIO-2998] 
Change-Id: I4c731aeb54cf81a68f6a2501f41986942b71e604
 2023-07-07 17:29:08 +08:00
zhimin.zeng 63acf7f6f0 FIX: Crash when perform cut 
"keep upper" and "keep lower" may be not checked when check "Cut to parts"

Change-Id: I8f902d3013e465f0a672369f1b732cce5f30f66d
 2023-07-07 17:25:51 +08:00
zhimin.zeng c720e1eb0f ENH: Tolerance of the connectors in mm instead of percents 
github issue #1644

Change-Id: I7d7bd02f7b695108abbcbdb0c077d2c1ce911af4
(cherry picked from commit fd89cbdba2bd4a9808d43e8ad2d68b60d076ddb8)
 2023-07-07 17:25:51 +08:00
zhimin.zeng e002885efc FIX: modify the style and layout for cut 
Change-Id: Id9f84fc58385ae408a4c28c0d4eb63e48335039e
 2023-04-17 15:39:02 +08:00
zhimin.zeng b746877d70 FIX: modify the shader load error for mac 
Change-Id: I3e2b282b145b4d87e09c22d4fec1b88537212d60
 2023-04-17 15:39:02 +08:00
zhimin.zeng 518cd4ce27 ENH: recover CutToParts for cut 
Change-Id: I5d7fb089c5d2ea9d36fce3d70ec4da896d601940
(cherry picked from commit e0232b21ebf5a37bedee1c213d1c21890634c563)
 2023-04-17 15:39:02 +08:00
zhimin.zeng e031708043 FIX: translation for cut 
Change-Id: I31f755b857f07e920fe6e50d48f4aa34a53e07da
 2023-04-17 15:39:02 +08:00
zhimin.zeng cd4cddfca4 ENH: Cut optimization, support for custom connectors 
Change-Id: I65163314374fb74f0b16df47dacae82caa6fab0d
(cherry picked from commit 7bacc2c2a89be471f6fee51dd07a42222a28b55a)
 2023-04-17 15:39:02 +08:00
Arthur 18366df5d0 ENH: only allow setting height when cut plane is horizontal 
Jira: STUDIO-1819
Change-Id: I04d258949cbf98a59f7313d714430f361bb2c4a9
(cherry picked from commit 2ffa8430b819cfffe20f4c7734125a3aabd33202)
 2023-02-01 16:24:44 +08: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
Arthur 92f1236128 FIX: height not synced when inputing cut movement 
Change-Id: I0640f9a21e1d700806ade79e4e1637338aef963a
(cherry picked from commit 8bacb887da19a9bed6451d2aaa1ebc149c20359d)
 2022-09-29 11:16:43 +08:00