mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-20 21:27:52 -06:00

* FIX: do not touch the plate with different printing sequence jira: STUDIO-5424 Change-Id: I8ad00fa991b753de126a5bef0d320c452033e2e7 (cherry picked from commit c4adfe16e285f238f2c5cd8938b2167fdfb6b1b0) * FIX: global arrange setting is wrong global arrange setting is wrong if a plate's setting is changed from object list jira: STUDIO-5438 Change-Id: Iaa7f35837edbacff9b97ca17a8ab34c8e6bb023d (cherry picked from commit fa2f56575b2e4305e35dd59ff55e0881720de025) * FIX: temperature symbols not shown correctly Need to use wxString::FromUTF8 to convert unicode symbols to wxString. jira: none Change-Id: Ia8b559d437c956a2cc28916d8963823356402d05 * FIX:Repair calculation process of plate_box Jira: STUDIO-5520 Change-Id: I4c3f9597542ad2dfec4d7849e75fa28272fa4ea3 * FIX:frequent calls to _update_imgui_select_plate_toolbar Jira: STUDIO-5488 Change-Id: I12e6f37c2fe94de004aa6da43421970d6df10f0f * FIX: & is not displayed on the sending print page Jira: STUDIO-5343 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I1736bb97433581ff117bfe09afe8ee70c1b08fc4 * FIX: file name is not fully displayed if it is too long Jira: STUDIO-5230 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I992fa0c0575afbd2eecb2af02c8a305eda028f7f (cherry picked from commit d0d7fb0b1394429ee9d28d8ef4060a286ba0112d) * FIX: The warning box still exits when the temperature has reset. Jira: STUDIO-5562 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I7532db69880449eb3fa0a14fc4dfc61e7f6d518e (cherry picked from commit 589ed5fe045b5e7ec3effe437c9685085960c0fc) * FIX: White circle is not clear on auto refill page Jira: STUDIO-3262 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I05ac6257638063d32a9943c09bb7c14cc9229b3a * FIX: Groove text ctrl is not wide engough Jira: STUDIO-5434 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I93c0995473a72b5c19bc413c38c090906e360455 (cherry picked from commit e4a8b0ef5e62ba0053dc782c30ea79b237a46ac3) * FIX: values are not saved when clicking on an empty space Jira: STUDIO-4637 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I837050029635f673b3ae671ea1ad049aaf4fdd16 * FIX: Temperature warning is not fully displayed Jira: STUDIO-5038 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I460cbe2a5d0a092c4257b7bd5192058bf2e4707b * NEW: display bitmap when calibrating Jira: STUDIO-4661 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I60cf4f9769feca74699012418880e93fcfe34432 (cherry picked from commit 1213aea816694405311dc0c1061655a4c2a1d067) * FIX: remember the flow ratio calibration type Jira: STUDIO-5181 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Id6125d1d4ea58972ce55c2c2498259596b25111e (cherry picked from commit 1af1038fd4824d989e992cb630cf34e00c787af7) * FIX: File panel crash on scroll Change-Id: I56833a376fa52c960efea5fbd60003367ba410c2 Jira: STUDIO-5337, STUDIO-5513 * FIX: auto arranging skip unprintable high items Jira: STUDIO-5646 Change-Id: I72dc3d8c71a075bab8204f4418e869a7a34c0c8e (cherry picked from commit 0afdf8361493485da2254c426719594fd9a982ed) * FIX: MediaFilePanel error state Change-Id: I318ef59fb97478ffee16dff594022b2b9029964a Jira: STUDIO-5638 * FIX: sync whole preset vendor directory Change-Id: I191dbe979a87ff35d38cab1149b7975664344838 Jira: STUDIO-5534 * ENH: support turn off liveview auto retry Change-Id: I24b39f74e0a40a13277d6eae3830c95c5c9de333 Jira: none (cherry picked from commit f6ceb3fb8e4df3f876c50a1c4ba96b4a1be60190) * FIX: SwitchButton auto scale font Change-Id: If4004c0963cc8bb2f41e8e71c304d5239bf252ab Jira: STUDIO-4969 STUDIO-4921 * FIX: set WEBKIT_DISABLE_COMPOSITING_MODE=1 for linux gtk Change-Id: I8a500585ca815948bab1210578ba5c45858ed78e Jira: STUDIO-5199 * FIX: Prefer old selection when sync AMS not compatible Change-Id: I6b18db51887132a997cf78d70fff9a92e23bc44a Jira: STUDIO-5416 * ENH: show liveview stat Change-Id: I70d1f458aa2ed379ad7fe07dee76fbe035316420 Jira: none * NEW:remember custom color Jira: STUDIO-5635 Change-Id: I439080f6a8ddb6fde3899cffbabc3b6e66afbd96 * FIX: copy live555 dll Change-Id: Idf727b8e26107e93aa9934299e87dc71531d1c63 Jira: STUDIO-4480 * FIX: optimize batch update object list on macOS Change-Id: I92e24cc53c0b3bf0658d15abc64292f0e17c0a82 Jira: STUDIO-5440 STUDIO-5515 * FIX: network plugins tip disappear on dark mode Change-Id: I422ab63f71158a49920438f01dd9c39774c27744 Jira: STUDIO-4891 * FIX: Display inconsistence in parameter table JIra: STUDIO-3716 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I986473bcbb3efff4abd9c5917926d9e888a4f28c * FIX: Incomplete copy display in Transfer or discard dialog Jira: 5569 5549 Change-Id: I757b636259d7e1a222b9fc09276c12235360fd57 * FIX: Limit the max length of k when calibrating Jira: STUDIO-4291 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Ie7cff086cf2a3c744213525d5d83f9ac4b55333d * fix build break * FIX: delete sdcard file crash Change-Id: I814fd4b557fa92ac4060cbeb18a53f5616e49662 Jira: STUDIO-5977 * FIX: Yield when join media thread Change-Id: I746d7df88a0de8363da7d9507cb63c9e0ffe970a Jira: STUDIO-5952 * FIX: Guide page can't show in screen with mainframe Jira: STUDIO-4911 Change-Id: I7e89614e0f1585263456c847a1b38dcfd0ad59e6 * FIX: filament combox has blank line Change-Id: Ia39ddb564b3c9cc943d0ea4c0cf7cc4d24bef799 * FIX: load 3mf crash when studio has no base filament Jira: none Change-Id: I4387f425f60e6a53a53cf68addb1ab2d6f8f8901 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX:add resume button JIRA2860 Change-Id: I39035d929876ab3c84c5f5c3494376967300938c * FIX: CLI: fix an arrange issue when duplicate failed restore the wipe_tower position to original when duplicate fail JIRA: MAK-2638 Change-Id: I355056f1d87648cc1f6aafa15a98ff569359b44f * FIX: fix printer list without nozzle such as 0.35 or 0.75 Jira: 5409 Change-Id: I1a258fd10bcc03e297b791256880f2518d602905 * ENH:The first object should locate at plate center Jira: STUDIO-6023 Change-Id: If4284136fe63ca576463445f3ab16b6e18ead30f * FIX: Colored filament is not matched against. github: #2190 Colored filament is not matched against the same color in AMS slot. Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: Id4588fc9c8115a46881e2f5d198d79fe831f4371 * FIX: Revert "[STUDIO-4284] not set max height of liveview window" This reverts commit 0312aee4d9b92e23884be8802da9801ff3b9fe93. Reason for revert: STUDIO-5653 Jira: STUDIO-5653 Change-Id: If9d5f3e63968a0a54f9af1a2dae8f95f7f1f3f80 * ENH:modify file name rules when export stl Jira: STUDIO-6091 Change-Id: Ic27e4e341cc09099e98a5eab7dfd48416f2922ae * FIX: Flow calibration stage incorrect when switching printers Jira: 6093 Change-Id: I41f1ac10ac9422ac808eab3254f32ea14a0d3b76 * FIX: UserGuide Can not Click When Computer User name has chinese JIRA: None Change-Id: If50baa8c6a13eb501918fd5cdaf0ea3da7c788ef (cherry picked from commit 4e5ccc9f2de5ac429af6541c6a8bd412848801d0) * ENH: Little Optimize JS Code Execute Progress JIRA: STUDIO-5792 Change-Id: I12b03d8b968a9dd8dfce9eb3ef925fa8768e2046 (cherry picked from commit 2bf861092c9e306e1311eda8ac36fd981e73b6c2) * FIX: Delete Test Code JIRA: NONE Change-Id: I838a348edb22e09d2b1d5c41600c6fade535d184 (cherry picked from commit 51e664da0209ae8a3de5cbf30a72505c0b5bd028) * FIX: the object list order changed after clone github: 2798 Change-Id: I10a05ee7e00b05cb1255cfb708876ed784cabac7 * ENH: add alias for custom Filament preset Jira: XXXX Change-Id: I2fecc8b2bdb63618155e3d21f9db374a6119e416 * FIX: [5779] fix show alias logic when load preset Jira: 5779 Change-Id: I4fefe3c1ffbca9bd8296f1b3fdd5de48c6a36a28 * ENH: Optimize the logic for deleting third-party printers Mark the Filament and Process presets to be deleted first then delete the child presets first and then the parent presets. Jira: none Change-Id: I100b873baae96c6ba27af258e708e6ab8e6ee4ab * ENH:default selection of virtual tray jira:[for def selected] Change-Id: I0661f179f8e4bcac33ae12fbbeaeaf95c5b7c110 * ENH:add protection when no thumbnail data jira:[for protection] Change-Id: I3834a5ffde11ff54567dd854271184f06f94547f * FIX:fixed issue with chinese path jira:[Fixed the issue of failed loading of configuration files under Chinese path] Change-Id: I9badd8fc158fcf49f46411ac4e5f72d58823eeb2 * NEW:add new msg notification for hms jira:[STUDIO-6154] Change-Id: If1aa33030a99550d0c859d594a2711aea4dcea4a * NEW:using new humidity display ui jira:[STUDIO-5967] Change-Id: I13be4212e6b97f646d21e0af64cbc5006753fdeb * NEW:Dye materials above grade 10 with shortcut keys JIRA:STUDIO-5827 Change-Id: I002ecdd19167fb36772e4b4e9e2f7760e21079db * NEW:update automatically when inserting materials JIRA: STUDIO-6157 Change-Id: I2cefbb7b330ca4f13e841066548992b3fb3740f1 * FIX: check sdcard exists for file connect Change-Id: I69199a29294c04d1fe46ee66682085b1f1d1d049 Jira: none * FIX: not load printer files when it's busy Change-Id: Ie5a58befcfc0d7fa0d4e587e8429c0b1bfeff72a Jira: STUDIO-6105 * ENH: save video ctrl size to reduce layout change Change-Id: I470f29d7f029d304c9badeeb8f94bed281080b29 Jira: STUDIO-6141 * ENH: stop liveview track record Change-Id: Id4f236b239740bd919f2aa2f2892c1e63ce233bd Jira: STUDIO-6131 * FIX: thread safe of http extra headers Change-Id: I6ffa424be7ccb6abd78a66cc8be535f038b05469 Jira: none * optimize MeshBoolean * FIX: parse printer_model_id from 3mf Change-Id: Ib149c986885ee6412898f1f51dd5a4aaad0a596d Jira: none * ENH: find grid empty cells for fill bed if the item is too small jira: STUDIO-6015 Change-Id: I4e5eafdadd77482a27a8903d32bb83325283088d (cherry picked from commit 8df4da4a863cdc42c790a9d5da37f8633423e406) * ENH: always return product for firmware and lifycycle JIRA: STUDIO-6282 Change-Id: I1f942babdcb7afee2c9a9076ac539063c5406ad7 Signed-off-by: Stone Li <stone.li@bambulab.com> * ENH:STL tracking restricted area jira:[STUDIO-6155] Change-Id: I289c8b8aa8f62f0e5cc7004fb60437aa3337ca85 * NEW:add nozzle settings jira:[STUDIO-6226] Change-Id: I0db8333e5b5c8195add111fdcfa2e92387997815 * ENH:display the current humidity of AMS jira:[ENH] Change-Id: I98bdd6d70cd173ed640f0d96692fcb6836416bb8 * FIX: [6123] create printer for exist printer can not into next page Jira: 6123 Change-Id: I338ac0fde4f69b6f312f20e53851d91339e8156f * ENH: Display value of flushing volumes JIRA:STUDIO-6139 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I273fb22b0d378a839c34e9e0e9c414f0e5134799 * FIX: show printer file path & title Change-Id: Ie5eff188c3039deeca5da96b54407194bf8910a0 Jira: STUDIO-6268 * FIX: liveview error message Change-Id: Ie437e07916d7b6feae2dbcfa166c4e73bdcf31a1 Jira: STUDIO-6107 * FIX: file proto error message Change-Id: I2c4117961c615e424780fb3830441e6a93c50bcc Jira: none * ENH: earse sensitive fields when export configs Jira: None Change-Id: Id9ca0637240b80773f39d2308192f8c78a5de3c6 * fix build errors * FIX: unexpected layers in multi color print github: 3131 Change-Id: I2a42e3bbd2247fbc0957022e1baae43c9375a8fb * ENH: Add "New" button for PA cali Jira: XXXX Change-Id: Ic39f2508f2f9d390c2b9246fb3d3e281cde9b064 * NEW:add printer compatible check from sd card view jira:[STUDIO-5969] Change-Id: I86d10ebe2e9bc77e6350e26aeed6b4f0f9fdcecb * NEW:enable loadl/unload when printing pause jira:[STUDIO-5968] Change-Id: Ieb3ef2423378e44b81a61a2b18c16f68aa335922 * FIX:fixed HMS message not cleared jira:[STUDIO-6296] Change-Id: Ic7692ce337fd00ece4ab8d65214a8c406f8543f8 * ENH:error code setting default value jira:[for error code] Change-Id: Ica61344c8217d41adb2947a40f633dc8d19a197a * ENH:display conflict information jira:[STUDIO-6297] Change-Id: Ie1501323a7e8d9ceb4060ae6c0b4eab20f8b088a * ENH: refresh printer file list Change-Id: Ic86942d2b0b2e8383ef0f06311164aad59e837ad Github: 3383 * FIX: Unnecessary prime tower error prompts Custom gcode on other plate causes unnecessary prime tower error prompts Jira: 6305 Change-Id: If499659b364a6b6898db1587b7b2aeed03758667 * FIX:multi colour displayed as gradient color on AMS JIRA:5925 Change-Id: Ic7a925dda2e3bde066ba40ba27002569040f9518 * NEW:Color painting shortcut keys 10~16 JIRA:STUDIO-6238 Change-Id: I3cce838fad5e73d41f109b32f2e563716fd5b0da * ENH: Print when unnamed project, task named as object names github: #2286 Change-Id: I9be3fd25d16a00b78326ec43db9afcf3645d90f1 * ENH:reset user access code jira:[for lan mode] Change-Id: I2d0ed48411d683c3f20b2febc0d54747287870a7 * FIX:fixed crash when selecting new printer jira:[fix] Change-Id: I6a81186e822eb6bf6ce7aa70561dfae35d4de0e7 * FIX: not show printer's camera error when updating Jira: STUDIO-6232 Change-Id: I985d75b3772849e07100799c4f13db5d4cbafde3 * FIX: clear error after reload file list ok Change-Id: I5d5e4f2870302b198d3a9d40603a6fa8010b7e76 Jira: STUDIO-6306 * ENH: custom filament sync with printer 1. prompt sync user presets when create custom filament 2. Fix the issue of not displaying printers when creating custom Filaments based on presets when selecting PLA Aero Type. 3. Optimizing the traversal logic during AMS Setting Pop up reduces time complexity and allows for quick pop ups. Additionally, using nozzle calibers for retrieval and repairing custom materials may result in inaccurate retrieval. 4. Implement synchronization logic with the printer -a. Received slot information, reset the slot when the "filament_id" in the information does not exist in Studio -b. Received slot information, the nozzle temperature in the information is different from the preset nozzle temperature in Studio, reset the current temperature. Jira: none Change-Id: I511dc82563ec77a341839671d398607048ce1985 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * NEW: add api of "toggle_selected_volume_visibility" Jira: STUDIO-6166 Change-Id: I77eb988a3ea43cd37d50888d1753b973795d8b36 * FIX: No data in the drop-down menu of the AMS settings page Jira: 6342 6343 Change-Id: I6938fb4a7ae2816a4675d8d739622e25f219f469 * fix build error * FIX: label wrap all & ping test for liveview Change-Id: I7767ed0740e20bb578b6ef9f5e9873c8c79d172a Jira: STUDIO-5821 * ENH: reuse controls in param Field Change-Id: I42bb4da01e1e9b64c343b7fda4357a9553cf8684 Jira: STUDIO-5983 * FIX: use wide path to create camera process Change-Id: I5de31fce0dea14df9a0ad363f3cb16dc40c275bc Jira: STUDIO-4946 * ENH: optimize the get_tool_order func Use Dp to refine performance jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I38b0c875e4deee9d9fbe926087fb5b2e274f8f90 (cherry picked from commit 9b7b66dc7a1f5e3efa318227ae7694bec5ec1216) * Fix build errors * ENH: add customize other layers print sequence Jira: 6338 Change-Id: Ic14b2671ade37ab37583b81c5b509447b6c0d8f8 * ENH: [#3236] Unsaved changes to interface copy adjustment github: #3236 Change-Id: I53931859bdcdfedfa9f63f6239d0fd2fd6d2766c * NEW: support to adjust other layers print sequence Jira: 6338 Change-Id: I5e6aef71aa9e6e97c1859aaaeb9ada5f1340414a * FIX: imgui support toolbar window text wrapping issue jira: STUDIO-5821 Change-Id: I57ee984baffbb2f00a7ecc5d5c8061074b06aff6 * FIX: updater: fix force upgrade logic JIRA: STUDIO-6393 Change-Id: I46c51e09e7390e5ab0de40215911aac9635ab476 (cherry picked from commit 673ba6ff4ebda039d71dcbfdaa28c1252f5b8821) * FIX:final step of slicing is to execute post-processing script JIRA: STUDIO-5828 Change-Id: I8c33e2a66ac5c692244c778586040663b7b54bd7 * NEW:enable 3dMouse detect in .conf JIRA: 5830 Change-Id: I8731e0244d2f551130c84bcfbbb46967ae6b19cd * FIX:finish init "return" icon and hide it Jira: STUDIO-6350 Change-Id: I0f1efd4a64ea204daeac7de822602ef6dfa3e4a5 * FIX: seq_print: fix an invalid warning caused by sinking github: https://github.com/bambulab/BambuStudio/issues/3007 Change-Id: I1111910f2c625d5a871ea01b37dbfa7b04a849ee (cherry picked from commit a3db95bb0940d5afe07ef0bb07113cc2acd7cd0a) * ENH: plater: optimize the loading time of 3mf with large objects JIRA: STUDIO-6021 Change-Id: Ia97f681041bb553c5c4b5b1d9109e5e5c42daf6b * FIX:Fixed HMS issue jira:[STUDIO-6344 STUDIO-6310 STUDIO-6356 STUDIO-6348] Change-Id: I9d6660e7c349775004b69bfe41b651bfa8b359b7 * ENH:handling dirty data after nozzle settings jira:[STUDIO-6332] Change-Id: I00d6d1324376f973ec3cf9f2154ae83ef3302705 * ENH: use Bambu_StartStreamEx for agora tunnel Change-Id: I5c28dea49d267bf7ff967d0982dd83555899c8c4 Jira: none * FIX: use safe language code for http Change-Id: Id1f4927308350ee35b891a5352cbf1e2d0c2577e Github: 3655 * FIX: add cli_id, cli_ver to bambu url Change-Id: Ic527d1497c6dee0c723d7b4629f0be825a8f7545 Jira: none * FIX: not throw when _add_auxiliary_dir_to_archive Change-Id: Idf54bbbd0ef557ec5e1a8e51ed669a1eb1fb4261 Jira: STUDIO-6339 * NEW: vase mode can be applied to one plate jira: STUDIO-5838 Change-Id: Ifb315f7d79b570aeb7ee31d3495b4d465e3af0c6 * fix crashes * ENH: update overhang degree method on calssic mode Jira: none Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: I90f6e4c2ef618fdaef00bdaf1ca309893f484c1e * FIX: auto-arranging unprintable items may crash github: #3676 Change-Id: I68eb87c73ad2c0c269f60e661136fd1a72ee5e2f (cherry picked from commit 7e3c57eaa811424935fe8db6a4e77dd142ee2b58) * FIX: use old slicer_uuid for client_id Change-Id: I6c45e83213d613fc28eef04115f9cfb19dea703e Jira: none * ci: update network module based on commit 542ced8 Change-Id: I3ad5032cc56a99d1c3a687b2891d147b13af066d * NEW:Support OLTP file Jira: STUDIO-6421 Change-Id: I58bc94e978e6d2dd136ea370fb01f6ec80e14b23 * ENH: detect in_head_wrap_zone more precisly 1.Union first layer convex hull with object's bbox to detect whether model enter head_wrap_detect_zone jira:NEW Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com> Change-Id: I11f26967d7421f41e9c824e62794c96591e6ae71 * FIX: fix the plate cannot be searched JIRA: STUDIO-6283 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I88206c91ea24c6a41a0bd06f05f0f3c2fdc58a36 * NEW:hms error code JIRA: STUDIO-6302 Change-Id: Ia33511f4c636c8ada39ed5a4e52d9b185da9c00b * FIX:Color adaptation for numpad JIRA:STUDIO-6410 Change-Id: If6e49638af8616fd349367073883592e6bebb503 * FIX: error overhang degree mapping Jira: none Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: Ifa24aa0cad0a06b09ee62a8be8781188a765d1d0 * FIX:display correct humidity jira:[fix] Change-Id: I27aae54a8355911b5d88ed45be320d3c9178081c * ENH:Hide confirmation button when unable to send print jira:[STUDIO-6355, STUDIO-6332] Change-Id: I8f9c0edea4d5ee70e9fef1e9d42838d598dc32c4 * NEW: new type for Custom Filament Type: "PE", "PP", "EVA", "PHA", "BVOH", "PE-CF", "PP-CF", "PP-GF" Github: 3205 3169 3127 Change-Id: I8a30dd806c35460d9dae0f808190ce013b125d51 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX:fixed filament settings page display error in French jira:[STUDIO-5821] Change-Id: I6cc6dd9b83c7570688c2adc55efe2407cbcb4390 * FIX:fixed thumbnail not updating when using multiple plates jira:[STUDIO-6313] Change-Id: If49daa5b38b9a580ae226ff00a1e0085d167c15c * FIX: Color Bleed in slicer github: 3681 jira: 6450 Change-Id: Icb6274f7ddb238c238c133b95167310b1af905f7 * ci: update network module based on commit 8befd46 Change-Id: I3a6420684f106bdde5897a50d27dfec69e0aa37f * ci: update network module based on commit e411785 Change-Id: I3a9c7bfa5ac5a942f339ad0194a24d9170847371 * FIX:reload paint after background process apply Jira: STUDIO-6493 Change-Id: I9a1986152f05163f236f58bb24210b690ca3d562 * FIX: use object name of plate when send task in untitled project Jira: 6430 Change-Id: I78ec811fab1cf028c0d5f81ac7738abdbeb6145f * FIX: auto arranging spacing can't be adjusted correctly jira: none Change-Id: Ibddfe85aab9f3fad6a1612e8db437e52c40e20a3 (cherry picked from commit 136bca01f45e62042bd699a9a0a9f6d13519712c) * FIX: fix change nozzle temp in Studio but printer not change Jira: 6510 Change-Id: Ia0e1ac586ff41ddbabdac0845415e70774299387 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH:rename some img files jira:[STUDIO-6512] Change-Id: I69872533cccda37b94384bc219cc35c5dec9310b * ENH:PEI bed is no longer unchecked by default jira:[STUDIO-6508] Change-Id: Ic9ca99860d46c27ca4c36a735df3f57fe71417df * FIX:fix the load status of vtray jira:[STUDIO-6435] Change-Id: I8cafcc0b6caf19492aae6c153fb509f470dc7e83 * FIX: Supports automatic calibration of textured PEI jira: 6504 Change-Id: I3234fb555b9bf0ea97e73387651874733e761ee7 * ENH:add tooltip for search item JIRA: STUDIO-6459 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I7602a32159d21de8f37ea0208dd6a9f59b90dcce * ENH: CLI: add version check logic add option allow_newer_file Change-Id: I8e8e4a45f77ebdd6dae6189841e4a9952e95ca82 * ci: update build version to 01.09.00.52 Change-Id: Id6e32b5afcf5eaabce9c0c7ab2c422e97b00e632 * NEW: switch to object panel if double click on object jira: none switch to object panel if double click on object, otherwise switch to global panel if double click on background. Change-Id: I6e54d7957aa19f1ebb1f993bc38125bbee8a1c98 (cherry picked from commit cc2e07bc9489c76a7d767acff0406c83c996504c) * FIX:fixed loading img resource failure jira:[for fix img load] Change-Id: Ifb26b2ca23029abeda000322bf2ef7d2b3cda3b4 * FIX: Project Title can Click JIRA: none Change-Id: I614c60e76efe04875e36e3a8ef7a10acd3ef9ecf * FIX:Prioritize selecting filament with smaller serial numbers in AMS JIRA: 5909 Change-Id: If3030d4dd8d59af36bc1ae1801be1b89b0027a71 * NEW:material adaptation in select machine dialog JIRA:xxxx Change-Id: I625eac75c88cad804dd3741f750c5ea68a975421 * FIX:mac ams setting display JIRA: STUDIO-6228\6409 Change-Id: I432a3aa96601a8e223b5949bc0ad5234c1374dca * FIX: Image Scale Mode and Online Display JIRA: none Change-Id: I528f16e93b82748d86dc93e2dd3d85f317babaa7 * FIX: sequential_print_clearance_valid not working not working correctly with short objects jira: STUDIO-6489 Change-Id: I33e1a165f448e1c3e272d4045934c63ad345db2f (cherry picked from commit 9348eaa22a056db5384a38ea966cec9ba4a533a7) * NEW: add nozzle_height to machine profile and do not detect conflict Jira: request from 1.9 1. add nozzle_height to machine profile 2. auto arranging and sequential_print_clearance_valid don't consider objects conflicting if they are all shorter than nozzle_height and close. 3. do not detect conflict when all models are short. Change-Id: I8d1eebb15d5bfa8c40d7491e033149e360531b89 (cherry picked from commit 6b4b52653db5f08d724a556c5c766c0bfa00f34d) * FIX: sequential_print_clearance_valid not working not working correctly with short objects jira: STUDIO-6489 Change-Id: I33e1a165f448e1c3e272d4045934c63ad345db2f (cherry picked from commit 9348eaa22a056db5384a38ea966cec9ba4a533a7) * FIX: [6510] set nozzle temp incorrectly when popup AMS Setting Change-Id: I898f0b94794a3d67017b1917ce196c4019f5eb4a * FIX: auto-calculate flushing volumes JIRA: STUDIO-6547 FIX the first modification of consumable color after synchronizing filaments, without automatically calculating the flushing volumes Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I2bc76a29afde5241d100cc42a5161db0f9b901c4 * FIX: custom layer sequence from End to End comboBox display issue jira: new Change-Id: I413cd5896d7e921f2c7c03b91b08788fefb9a4f3 * FIX:fix the v tray's filament unload logic jira:[STUDIO-6627] Change-Id: I34420bc4d1d27b6b36defb9852bba2eaf77fdcf2 * NEW:reducing purge through retracting filament 1.reducing purge through retracting filament.Currently only applicable to X&P series github: PR#3100 Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com> Change-Id: Ie328039872e50e699dc5e5082fa99f68ac5f5fd1 * FIX: wrong role cache in wipe tower 1. Add wipe tower role cache in GCodeProcessor result 2. Add wiki link for prime tower jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ia766c7218df68fb1ffba567af193d6bfecacf588 * Fix plate settng icon * NEW:revert hms error code Change-Id: Ib5cc8bb8b8ced0f70d5bbe4751a1f97258218c6f * FIX: calibration page button broken display issue jira: STUDIO-3913 Change-Id: I2fd488e829d898b7d81d09db814ed6518f0c54a8 * FIX: do not check spiral vase mode config if an object is loaded jira: STUDIO-6514 Change-Id: Ib44ec8322ff178b5765f7fe94b588aa38339691d * FIX: implicitly set spiral vase config for objects just loading jira: 6514 Change-Id: I04bb2b1abeb62d4dfff4e526b723b1cf1bd5fd7f * FIX: filling bed fails if the bed is already full JIRA: STUDIO-6490 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I71b5a01a95cdffef7c0750e6347fa8911dcd781d * ci: update network module based on commit 868f5d7 Change-Id: I5584e4441e1f2ab400addaa87ee8013927fb9e15 * FIX: add query_real_volume_idx_from_other_view api Jira: STUDIO-6545 Change-Id: Ib8216981c5d2945a0221a5caa1fbc14ed74e930b * FIX: Can't edit text github: 3750 Change-Id: I1caecaa968e60cadcdbe9f7aa67cba141bb88230 * FIX: Slicer creates invalid color pattern github: 3749 Change-Id: I3fd74a9ca59b75873fcbca4437e4858c749ee853 * ENH: hide tuck did Change-Id: I9021d3f51c9a73bc9208b479f96b1ddbe7a2f8f8 Jira: none * FIX: PrinterFileSystem: retry connect on user action Change-Id: I3e8902298385ed2e5906fd15d1817b6e33522a76 Jira: STUDIO-6354 * FIX: Remove user ID and other information Jira: XXXX Change-Id: Ia63ec88a335d88fd40a29952abe6d40d8991efee * ENH: refine retraction before cut 1. Add filament retraction before cut control jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ifcb087c9791c0461b793ef811b21ebd4c007d880 * FIX: enable resumed read only Field Change-Id: Id09e671932458699c020f0a061d8cfc11a6958ab Jira: STUDIO-6641 * ENH: add precise_z_height jira: none Change-Id: Idb9fcf0063e773f1531a49961478460b91ded10f * ENH: modify the multi-material segmentation and voronoi This patch is cherry pick from Prusa, thanks to Prusa Rework multi-material segmentation to work directly on the Voronoi diagram without creating a copy of it. Previous algorithms assume that they can get an invalid Voronoi diagram. Because of that, during the multi-material segmentation, a copy of the Voronoi diagram was created, and there were several attempts to fix missing vertices and edges. But as it shows, this wasn't a good enough approach and sometimes led to several issues like bleeding layers. After generalization, our approach for detection and repairs of invalid Voronoi diagrams from Arachne, we could assume that multi-material segmentation gets non-invalid Voronoi diagrams. With this assumption, we reimplement multi-materials segmentation to work directly on the Voronoi diagram. That should make multi-material segmentation more stable. So, this should fix several issues like bleeding layers. Also, memory consumption should decrease by a lot. Also, there should be some speedup of multi-materials segmentation. Jira: none Change-Id: I72aa6e1f9634d9ee8759aa469a0b39a36ace62f5 * FIX: infill speed not work on region level Jira: none Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: Ie3d17c5e3cbf91a8854e3b4cd80babeb2b1bd121 * ENH: support saving PA calibration results for P series Jira: none Change-Id: I9402b8bcce7b48a63d0e97e0708080701d065e7a * ENH: refine long retraction ui 1. associate button display logic 2. Add valid range tip 3. seperate the printer into three types jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ie14c8746eb20456dacd5c129a5449c1e7c7db372 * FIX:height range cut = volume_count * 2 Jira: none Change-Id: I539c2f9cda7985b4b3c318ca8aa1eb7c52fdce82 * FIX: auto arranging gets wrong object height obj->bounding_box().size() is not the real object size if the object has been rotated. jira: STUDIO-5999 Change-Id: I6553d4c990696efd674e3e57063802127d5d5282 (cherry picked from commit 479ea9fb02f55d24f27c94633f3d852bd5c62c83) * ENH: seperate support weight from model jira:NEW Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com> Change-Id: I86bb34941269bf1aa29436a94ebbdff675497e85 * ENH: add support for gcodeviewer statistics jira: new Change-Id: Ied6d61e8c48ac82daf16579d9caed9723cf8e29d * FIX: invalid support weight per extruder jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I0e4b857c9c758ab7c54ef13aee1bf596f975640b * FIX: do not need reset bed_type for pa calibration jira: none Change-Id: I411064cf14d94a9bd1f0f6668ee23aa10d372f3d * FIX: P1P/S can not modify the k value in old version jira: 6745 Change-Id: I5c9dffe8e998213e6af6e1d01a6b0ae82521e8db * Add rotation support for 3D Honeycomb Ported from BS * ENH: add default params for long retraction 1. Only auto calculate flush when enabled 2. Add default params for long retraction 3. Disable filament override for unsupport machines jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ib5d51505b58101839527e944f9a237483951f9fe * misc fixes * ENH: remove long retraction warning jira:NEW Signed-off-by: tao wang <tao.wang@bambulab.com> Change-Id: If60236b3282991a2d94df7d125427cff86899536 * avoid zero length path * FIX: check recommended nozzle temperature Jira: XXXX Change-Id: I4dbb274cf27ef9c6d20a8479b29af1069652b2bc * FIX: fix not popping up a prompt when the temperature is set to 0 Jira: 6497 Change-Id: I6498fc6962e7da376d4c652dab0a99a161932eef Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH: When creating a custom Filament, use the system Filament type. Jira: 6301 Change-Id: I1bfddcf43d2ebaebca4eb494d1f64165c3d59e9e Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: seam and unretarct pos error on smooth vase casused by invalid path of smooth vase mode Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: Ib597e8c05760886aae2c42e42e8d46e82b844578 * FIX: unable to map if filament not used in model 1.Fix filament can not map if it's not used in model body jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ibd2685ffd198b2e17dbf44289d0144b5b7c25788 * NEW:Update data only on device pages jira:[STUDIO-6776] Change-Id: I33b0c9f35c1dc6df2db3b6bd4f446f46b31ecf6c * set(SLIC3R_VERSION "01.09.00.70") * update BBL machine profile 01.09.00.04 * scarf clip start and end Ported from BambuStudio * fix linux build error --------- Co-authored-by: Arthur <arthur.tang@bambulab.com> Co-authored-by: zhou.xu <zhou.xu@bambulab.com> Co-authored-by: wenjie.guo <wenjie.guo@bambulab.com> Co-authored-by: chunmao.guo <chunmao.guo@bambulab.com> Co-authored-by: maosheng.wei <maosheng.wei@bambulab.com> Co-authored-by: hu.wang <hu.wang@bambulab.com> Co-authored-by: lane.wei <lane.wei@bambulab.com> Co-authored-by: Kunlong Ma <kunlong.ma@bambulab.com> Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com> Co-authored-by: zorro.zhang <zorro.zhang@bambulab.com> Co-authored-by: tao wang <tao.wang@bambulab.com> Co-authored-by: Stone Li <stone.li@bambulab.com> Co-authored-by: xun.zhang <xun.zhang@bambulab.com> Co-authored-by: liz.li <liz.li@bambulab.com> Co-authored-by: qing.zhang <qing.zhang@bambulab.com> Co-authored-by: gerrit <gerrit@bambulab.com> Co-authored-by: Leon Fisher-Skipper <47602359+LeonFisherSkipper@users.noreply.github.com> Co-authored-by: Lukas Matena <lukasmatena@seznam.cz> Co-authored-by: jianjia.ma <jianjia.ma@bambulab.com>
2000 lines
76 KiB
C++
2000 lines
76 KiB
C++
// Include GLGizmoBase.hpp before I18N.hpp as it includes some libigl code, which overrides our localization "L" macro.
|
|
#include "GLGizmoAdvancedCut.hpp"
|
|
#include "slic3r/GUI/GLCanvas3D.hpp"
|
|
|
|
#include <GL/glew.h>
|
|
|
|
#include <wx/button.h>
|
|
#include <wx/checkbox.h>
|
|
#include <wx/stattext.h>
|
|
#include <wx/sizer.h>
|
|
|
|
#include <algorithm>
|
|
|
|
#include "slic3r/GUI/GUI_App.hpp"
|
|
#include "slic3r/GUI/Plater.hpp"
|
|
#include "libslic3r/AppConfig.hpp"
|
|
#include "../GUI/MsgDialog.hpp"
|
|
|
|
#include <imgui/imgui_internal.h>
|
|
|
|
#include "slic3r/GUI/CameraUtils.hpp"
|
|
|
|
namespace Slic3r {
|
|
namespace GUI {
|
|
|
|
const double units_in_to_mm = 25.4;
|
|
const double units_mm_to_in = 1 / units_in_to_mm;
|
|
|
|
const int c_connectors_group_id = 4;
|
|
const float UndefFloat = -999.f;
|
|
|
|
// connector colors
|
|
static const ColorRGBA PLAG_COLOR = ColorRGBA::YELLOW();
|
|
static const ColorRGBA DOWEL_COLOR = ColorRGBA::DARK_YELLOW();
|
|
static const ColorRGBA HOVERED_PLAG_COLOR = ColorRGBA::CYAN();
|
|
static const ColorRGBA HOVERED_DOWEL_COLOR = {0.0f, 0.5f, 0.5f, 1.0f};
|
|
static const ColorRGBA SELECTED_PLAG_COLOR = ColorRGBA::GRAY();
|
|
static const ColorRGBA SELECTED_DOWEL_COLOR = ColorRGBA::GRAY(); // DARK_GRAY();
|
|
static const ColorRGBA CONNECTOR_DEF_COLOR = {1.0f, 1.0f, 1.0f, 0.5f};
|
|
static const ColorRGBA CONNECTOR_ERR_COLOR = {1.0f, 0.3f, 0.3f, 0.5f};
|
|
static const ColorRGBA HOVERED_ERR_COLOR = {1.0f, 0.3f, 0.3f, 1.0f};
|
|
|
|
static Vec3d rotate_vec3d_around_vec3d_with_rotate_matrix(
|
|
const Vec3d& rotate_point,
|
|
const Vec3d& origin_point,
|
|
const Transform3d& rotate_matrix)
|
|
{
|
|
Transform3d translate_to_point = Transform3d::Identity();
|
|
translate_to_point.translate(origin_point);
|
|
Transform3d translate_to_zero = Transform3d::Identity();
|
|
translate_to_zero.translate(-origin_point);
|
|
return (translate_to_point * rotate_matrix * translate_to_zero) * rotate_point;
|
|
}
|
|
|
|
static inline void rotate_point_2d(double& x, double& y, const double c, const double s)
|
|
{
|
|
double xold = x;
|
|
double yold = y;
|
|
x = c * xold - s * yold;
|
|
y = s * xold + c * yold;
|
|
}
|
|
|
|
static void rotate_x_3d(std::array<Vec3d, 4>& verts, float radian_angle)
|
|
{
|
|
double c = cos(radian_angle);
|
|
double s = sin(radian_angle);
|
|
for (uint32_t i = 0; i < verts.size(); ++i)
|
|
rotate_point_2d(verts[i](1), verts[i](2), c, s);
|
|
}
|
|
|
|
static void rotate_y_3d(std::array<Vec3d, 4>& verts, float radian_angle)
|
|
{
|
|
double c = cos(radian_angle);
|
|
double s = sin(radian_angle);
|
|
for (uint32_t i = 0; i < verts.size(); ++i)
|
|
rotate_point_2d(verts[i](2), verts[i](0), c, s);
|
|
}
|
|
|
|
static void rotate_z_3d(std::array<Vec3d, 4>& verts, float radian_angle)
|
|
{
|
|
double c = cos(radian_angle);
|
|
double s = sin(radian_angle);
|
|
for (uint32_t i = 0; i < verts.size(); ++i)
|
|
rotate_point_2d(verts[i](0), verts[i](1), c, s);
|
|
}
|
|
|
|
const double GLGizmoAdvancedCut::Offset = 10.0;
|
|
const double GLGizmoAdvancedCut::Margin = 20.0;
|
|
const ColorRGBA GLGizmoAdvancedCut::GrabberColor = { 1.0f, 1.0f, 0.0f, 1.0f };
|
|
const ColorRGBA GLGizmoAdvancedCut::GrabberHoverColor = { 0.7f, 0.7f, 0.0f, 1.0f };
|
|
|
|
GLGizmoAdvancedCut::GLGizmoAdvancedCut(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id)
|
|
: GLGizmoRotate3D(parent, icon_filename, sprite_id, nullptr)
|
|
, m_movement(0.0)
|
|
, m_buffered_movement(0.0)
|
|
, m_last_active_id(0)
|
|
, m_keep_upper(true)
|
|
, m_keep_lower(true)
|
|
, m_cut_to_parts(false)
|
|
, m_do_segment(false)
|
|
, m_segment_smoothing_alpha(0.5)
|
|
, m_segment_number(5)
|
|
, m_connector_type(CutConnectorType::Plug)
|
|
, m_connector_style(size_t(CutConnectorStyle::Prizm))
|
|
, m_connector_shape_id(size_t(CutConnectorShape::Circle))
|
|
{
|
|
for (int i = 0; i < 4; i++)
|
|
m_cut_plane_points[i] = { 0., 0., 0. };
|
|
|
|
m_group_id = (m_gizmos.size());
|
|
m_rotation.setZero();
|
|
//m_current_base_rotation.setZero();
|
|
m_rotate_cmds.clear();
|
|
m_buffered_rotation.setZero();
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::data_changed(bool is_serializing)
|
|
{
|
|
GLGizmoRotate3D::data_changed(is_serializing);
|
|
finish_rotation();
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::gizmo_event(SLAGizmoEventType action, const Vec2d &mouse_position, bool shift_down, bool alt_down, bool control_down)
|
|
{
|
|
CutConnectors &connectors = m_c->selection_info()->model_object()->cut_connectors;
|
|
|
|
if (shift_down && !m_connectors_editing &&
|
|
(action == SLAGizmoEventType::LeftDown || action == SLAGizmoEventType::LeftUp || action == SLAGizmoEventType::Dragging)) {
|
|
process_cut_line(action, mouse_position);
|
|
return true;
|
|
}
|
|
|
|
if (action == SLAGizmoEventType::LeftDown) {
|
|
if (!m_connectors_editing)
|
|
return false;
|
|
|
|
if (m_hover_id != -1) {
|
|
//start_dragging();
|
|
return true;
|
|
}
|
|
|
|
if (shift_down || alt_down) {
|
|
// left down with shift - show the selection rectangle:
|
|
//if (m_hover_id == -1)
|
|
// m_selection_rectangle.start_dragging(mouse_position, shift_down ? GLSelectionRectangle::EState::Select : GLSelectionRectangle::EState::Deselect);
|
|
} else {
|
|
// If there is no selection and no hovering, add new point
|
|
if (m_hover_id == -1 && !shift_down && !alt_down)
|
|
add_connector(connectors, mouse_position);
|
|
//m_ldown_mouse_position = mouse_position;
|
|
}
|
|
return true;
|
|
}
|
|
else if (action == SLAGizmoEventType::LeftUp) {
|
|
if (m_hover_id == -1 && !shift_down && !alt_down)
|
|
unselect_all_connectors();
|
|
|
|
is_selection_changed(alt_down, shift_down);
|
|
return true;
|
|
}
|
|
else if (action == SLAGizmoEventType::RightDown) {
|
|
if (m_hover_id < c_connectors_group_id)
|
|
return false;
|
|
|
|
unselect_all_connectors();
|
|
select_connector(m_hover_id - c_connectors_group_id, true);
|
|
return delete_selected_connectors();
|
|
}
|
|
else if (action == SLAGizmoEventType::RightUp) {
|
|
// catch right click event
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::on_key(wxKeyEvent &evt)
|
|
{
|
|
bool ctrl_down = evt.GetModifiers() & wxMOD_CONTROL;
|
|
|
|
if (evt.GetKeyCode() == WXK_DELETE) {
|
|
return delete_selected_connectors();
|
|
}
|
|
else if (ctrl_down
|
|
&& (evt.GetKeyCode() == 'A' || evt.GetKeyCode() == 'a'))
|
|
{
|
|
select_all_connectors();
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
std::string GLGizmoAdvancedCut::get_tooltip() const
|
|
{
|
|
return "";
|
|
}
|
|
|
|
BoundingBoxf3 GLGizmoAdvancedCut::bounding_box() const
|
|
{
|
|
BoundingBoxf3 ret;
|
|
const Selection & selection = m_parent.get_selection();
|
|
const Selection::IndicesList &idxs = selection.get_volume_idxs();
|
|
for (unsigned int i : idxs) {
|
|
const GLVolume *volume = selection.get_volume(i);
|
|
// respect just to the solid parts for FFF and ignore pad and supports for SLA
|
|
if (!volume->is_modifier && !volume->is_sla_pad() && !volume->is_sla_support()) ret.merge(volume->transformed_convex_hull_bounding_box());
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::is_looking_forward() const
|
|
{
|
|
const Camera &camera = wxGetApp().plater()->get_camera();
|
|
const double dot = camera.get_dir_forward().dot(m_cut_plane_normal);
|
|
return dot < 0.05;
|
|
}
|
|
|
|
// Unprojects the mouse position on the mesh and saves hit point and normal of the facet into pos_and_normal
|
|
// Return false if no intersection was found, true otherwise.
|
|
bool GLGizmoAdvancedCut::unproject_on_cut_plane(const Vec2d &mouse_pos, Vec3d &pos, Vec3d &pos_world)
|
|
{
|
|
const float sla_shift = m_c->selection_info()->get_sla_shift();
|
|
|
|
const ModelObject * mo = m_c->selection_info()->model_object();
|
|
const ModelInstance *mi = mo->instances[m_c->selection_info()->get_active_instance()];
|
|
const Camera & camera = wxGetApp().plater()->get_camera();
|
|
|
|
// Calculate intersection with the clipping plane.
|
|
const ClippingPlane *cp = m_c->object_clipper()->get_clipping_plane();
|
|
Vec3d point;
|
|
Vec3d direction;
|
|
Vec3d hit;
|
|
CameraUtils::ray_from_screen_pos(camera, mouse_pos, point, direction);
|
|
Vec3d normal = -cp->get_normal().cast<double>();
|
|
double den = normal.dot(direction);
|
|
if (den != 0.) {
|
|
double t = (-cp->get_offset() - normal.dot(point)) / den;
|
|
hit = (point + t * direction);
|
|
} else
|
|
return false;
|
|
|
|
if (!m_c->object_clipper()->is_projection_inside_cut(hit))
|
|
return false;
|
|
|
|
// recalculate hit to object's local position
|
|
Vec3d hit_d = hit;
|
|
hit_d -= mi->get_offset();
|
|
hit_d[Z] -= sla_shift;
|
|
|
|
// Return both the point and the facet normal.
|
|
pos = hit_d;
|
|
pos_world = hit;
|
|
|
|
return true;
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::update_plane_points()
|
|
{
|
|
Vec3d plane_center = get_plane_center();
|
|
|
|
std::array<Vec3d, 4> plane_points_rot;
|
|
for (int i = 0; i < plane_points_rot.size(); i++) {
|
|
plane_points_rot[i] = m_cut_plane_points[i] - plane_center;
|
|
}
|
|
|
|
if (m_rotation(0) > EPSILON) {
|
|
rotate_x_3d(plane_points_rot, m_rotation(0));
|
|
m_rotate_cmds.emplace(m_rotate_cmds.begin(), m_rotation(0), X);
|
|
}
|
|
if (m_rotation(1) > EPSILON) {
|
|
rotate_y_3d(plane_points_rot, m_rotation(1));
|
|
m_rotate_cmds.emplace(m_rotate_cmds.begin(), m_rotation(1), Y);
|
|
}
|
|
if (m_rotation(2) > EPSILON) {
|
|
rotate_z_3d(plane_points_rot, m_rotation(2));
|
|
m_rotate_cmds.emplace(m_rotate_cmds.begin(), m_rotation(2), Z);
|
|
}
|
|
|
|
Vec3d plane_normal = calc_plane_normal(plane_points_rot);
|
|
if (m_movement == 0 && m_height_delta != 0)
|
|
m_movement = plane_normal(2) * m_height_delta;// plane_normal.dot(Vec3d(0, 0, m_height_delta))
|
|
for (int i = 0; i < plane_points_rot.size(); i++) {
|
|
m_cut_plane_points[i] = plane_points_rot[i] + plane_center + plane_normal * m_movement;
|
|
}
|
|
|
|
//m_current_base_rotation += m_rotation;
|
|
m_rotation.setZero();
|
|
m_movement = 0.0;
|
|
m_height_delta = 0;
|
|
}
|
|
|
|
std::array<Vec3d, 4> GLGizmoAdvancedCut::get_plane_points() const
|
|
{
|
|
return m_cut_plane_points;
|
|
}
|
|
|
|
std::array<Vec3d, 4> GLGizmoAdvancedCut::get_plane_points_world_coord() const
|
|
{
|
|
std::array<Vec3d, 4> plane_world_coord = m_cut_plane_points;
|
|
|
|
const Selection& selection = m_parent.get_selection();
|
|
const BoundingBoxf3& box = selection.get_bounding_box();
|
|
Vec3d object_offset = box.center();
|
|
|
|
for (Vec3d& point : plane_world_coord) {
|
|
point += object_offset;
|
|
}
|
|
|
|
return plane_world_coord;
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::reset_cut_plane()
|
|
{
|
|
const Selection& selection = m_parent.get_selection();
|
|
const BoundingBoxf3& box = selection.get_bounding_box();
|
|
const float max_x = box.size()(0) / 2.0 + Margin;
|
|
const float min_x = -max_x;
|
|
const float max_y = box.size()(1) / 2.0 + Margin;
|
|
const float min_y = -max_y;
|
|
|
|
m_cut_plane_points[0] = { min_x, min_y, 0 };
|
|
m_cut_plane_points[1] = { max_x, min_y, 0 };
|
|
m_cut_plane_points[2] = { max_x, max_y, 0 };
|
|
m_cut_plane_points[3] = { min_x, max_y, 0 };
|
|
m_movement = 0.0;
|
|
m_height = box.size()[2] / 2.0;
|
|
m_height_delta = 0;
|
|
m_rotation.setZero();
|
|
//m_current_base_rotation.setZero();
|
|
m_rotate_cmds.clear();
|
|
|
|
m_buffered_movement = 0.0;
|
|
m_buffered_height = m_height;
|
|
m_buffered_rotation.setZero();
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::reset_all()
|
|
{
|
|
reset_cut_plane();
|
|
|
|
m_keep_upper = true;
|
|
m_keep_lower = true;
|
|
m_cut_to_parts = false;
|
|
m_place_on_cut_upper = true;
|
|
m_place_on_cut_lower = false;
|
|
m_rotate_upper = false;
|
|
m_rotate_lower = false;
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::on_init()
|
|
{
|
|
if (!GLGizmoRotate3D::on_init())
|
|
return false;
|
|
|
|
m_shortcut_key = WXK_CONTROL_C;
|
|
|
|
// initiate info shortcuts
|
|
const wxString ctrl = GUI::shortkey_ctrl_prefix();
|
|
const wxString alt = GUI::shortkey_alt_prefix();
|
|
const wxString shift = "Shift+";
|
|
|
|
m_shortcuts.push_back(std::make_pair(_L("Left click"), _L("Add connector")));
|
|
m_shortcuts.push_back(std::make_pair(_L("Right click"), _L("Remove connector")));
|
|
m_shortcuts.push_back(std::make_pair(_L("Drag"), _L("Move connector")));
|
|
m_shortcuts.push_back(std::make_pair(shift + _L("Left click"), _L("Add connector to selection")));
|
|
m_shortcuts.push_back(std::make_pair(alt + _L("Left click"), _L("Remove connector from selection")));
|
|
m_shortcuts.push_back(std::make_pair(ctrl + "A", _L("Select all connectors")));
|
|
|
|
init_connector_shapes();
|
|
return true;
|
|
}
|
|
|
|
std::string GLGizmoAdvancedCut::on_get_name() const
|
|
{
|
|
return (_(L("Cut"))).ToUTF8().data();
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::on_load(cereal::BinaryInputArchive &ar)
|
|
{
|
|
ar(m_keep_upper, m_keep_lower, m_rotate_lower, m_rotate_upper, m_connectors_editing,
|
|
m_cut_plane_points[0], m_cut_plane_points[1], m_cut_plane_points[2], m_cut_plane_points[3]);
|
|
|
|
m_parent.request_extra_frame();
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::on_save(cereal::BinaryOutputArchive &ar) const
|
|
{
|
|
ar(m_keep_upper, m_keep_lower, m_rotate_lower, m_rotate_upper, m_connectors_editing,
|
|
m_cut_plane_points[0], m_cut_plane_points[1], m_cut_plane_points[2], m_cut_plane_points[3]);
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::on_set_state()
|
|
{
|
|
GLGizmoRotate3D::on_set_state();
|
|
|
|
// Reset m_cut_z on gizmo activation
|
|
if (get_state() == On) {
|
|
m_connectors_editing = false;
|
|
reset_cut_plane();
|
|
}
|
|
else if (get_state() == Off) {
|
|
clear_selection();
|
|
m_c->object_clipper()->release();
|
|
}
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::on_is_activable() const
|
|
{
|
|
const Selection& selection = m_parent.get_selection();
|
|
return selection.is_single_full_instance() && !selection.is_wipe_tower();
|
|
}
|
|
|
|
CommonGizmosDataID GLGizmoAdvancedCut::on_get_requirements() const
|
|
{
|
|
return CommonGizmosDataID(int(CommonGizmosDataID::SelectionInfo)
|
|
| int(CommonGizmosDataID::InstancesHider)
|
|
| int(CommonGizmosDataID::Raycaster)
|
|
| int(CommonGizmosDataID::ObjectClipper));
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::on_start_dragging()
|
|
{
|
|
if (m_hover_id == X || m_hover_id == Y || m_hover_id == Z) {
|
|
m_gizmos[m_hover_id].start_dragging();
|
|
} else if (m_hover_id == c_connectors_group_id - 1) {
|
|
const Selection& selection = m_parent.get_selection();
|
|
const BoundingBoxf3& box = selection.get_bounding_box();
|
|
m_start_movement = m_movement;
|
|
m_start_height = m_height;
|
|
m_drag_pos = m_move_grabber.center;
|
|
}
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::on_stop_dragging()
|
|
{
|
|
if (m_hover_id == X || m_hover_id == Y || m_hover_id == Z) {
|
|
m_gizmos[m_hover_id].stop_dragging();
|
|
Plater::TakeSnapshot snapshot(wxGetApp().plater(), "Rotate cut plane");
|
|
} else if (m_hover_id == c_connectors_group_id - 1) {
|
|
Plater::TakeSnapshot snapshot(wxGetApp().plater(), "Move cut plane");
|
|
} else if (m_hover_id >= c_connectors_group_id) {
|
|
Plater::TakeSnapshot snapshot(wxGetApp().plater(), "Move connector");
|
|
}
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::on_dragging(const UpdateData &data)
|
|
{
|
|
GLGizmoRotate3D::on_dragging(data);
|
|
|
|
Vec3d rotation;
|
|
for (int i = 0; i < 3; i++)
|
|
{
|
|
rotation(i) = m_gizmos[i].get_angle();
|
|
if (rotation(i) < 0)
|
|
rotation(i) = 2*PI + rotation(i);
|
|
}
|
|
|
|
m_rotation = rotation;
|
|
//m_move_grabber.angles = m_current_base_rotation + m_rotation;
|
|
|
|
if (m_hover_id == m_group_id) {
|
|
double move = calc_projection(data.mouse_ray);
|
|
set_movement(m_start_movement + move);
|
|
Vec3d plane_normal = get_plane_normal();
|
|
m_height = m_start_height + plane_normal(2) * move;
|
|
}
|
|
|
|
// dragging connectors
|
|
if (m_connectors_editing && m_hover_id >= c_connectors_group_id) {
|
|
CutConnectors &connectors = m_c->selection_info()->model_object()->cut_connectors;
|
|
Vec3d pos;
|
|
Vec3d pos_world;
|
|
|
|
if (unproject_on_cut_plane(data.mouse_pos.cast<double>(), pos, pos_world)) {
|
|
connectors[m_hover_id - c_connectors_group_id].pos = pos;
|
|
}
|
|
}
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::on_render()
|
|
{
|
|
update_clipper();
|
|
if (m_connectors_editing) {
|
|
render_connectors();
|
|
}
|
|
|
|
// render_clipper_cut for get the cut plane result
|
|
render_clipper_cut();
|
|
|
|
if(!m_connectors_editing) {
|
|
check_conflict_for_all_connectors();
|
|
render_cut_plane_and_grabbers();
|
|
}
|
|
|
|
render_cut_line();
|
|
}
|
|
/*
|
|
void GLGizmoAdvancedCut::on_render_for_picking()
|
|
{
|
|
GLGizmoRotate3D::on_render_for_picking();
|
|
|
|
glsafe(::glDisable(GL_DEPTH_TEST));
|
|
|
|
BoundingBoxf3 box = m_parent.get_selection().get_bounding_box();
|
|
#if ENABLE_FIXED_GRABBER
|
|
float mean_size = (float)(GLGizmoBase::Grabber::FixedGrabberSize);
|
|
#else
|
|
float mean_size = (float)((box.size().x() + box.size().y() + box.size().z()) / 3.0);
|
|
#endif
|
|
|
|
m_move_grabber.color = picking_color_component(0);
|
|
GLShaderProgram *shader = wxGetApp().get_shader("flat");
|
|
if (shader != nullptr) {
|
|
shader->start_using();
|
|
const Camera &camera = wxGetApp().plater()->get_camera();
|
|
shader->set_uniform("view_model_matrix", camera.get_view_matrix());
|
|
shader->set_uniform("projection_matrix", camera.get_projection_matrix());
|
|
m_move_grabber.render_for_picking(mean_size);
|
|
|
|
shader->stop_using();
|
|
}
|
|
|
|
glsafe(::glEnable(GL_DEPTH_TEST));
|
|
auto inst_id = m_c->selection_info()->get_active_instance();
|
|
if (inst_id < 0)
|
|
return;
|
|
|
|
const ModelObject *mo = m_c->selection_info()->model_object();
|
|
const ModelInstance *mi = mo->instances[inst_id];
|
|
const Vec3d & instance_offset = mi->get_offset();
|
|
const double sla_shift = double(m_c->selection_info()->get_sla_shift());
|
|
|
|
const CutConnectors &connectors = mo->cut_connectors;
|
|
for (int i = 0; i < connectors.size(); ++i) {
|
|
CutConnector connector = connectors[i];
|
|
Vec3d pos = connector.pos + instance_offset + sla_shift * Vec3d::UnitZ();
|
|
float height = connector.height;
|
|
|
|
if (connector.attribs.type == CutConnectorType::Dowel && connector.attribs.style == CutConnectorStyle::Prizm) {
|
|
pos -= height * m_cut_plane_normal;
|
|
height *= 2;
|
|
} else if (!is_looking_forward())
|
|
pos -= 0.05 * m_cut_plane_normal;
|
|
|
|
Transform3d translate_tf = Transform3d::Identity();
|
|
translate_tf.translate(pos);
|
|
|
|
Transform3d scale_tf = Transform3d::Identity();
|
|
scale_tf.scale(Vec3f(connector.radius, connector.radius, height).cast<double>());
|
|
|
|
const Transform3d model_matrix = translate_tf * m_rotate_matrix * scale_tf;
|
|
|
|
ColorRGBA color = picking_color_component(i+1);
|
|
render_connector_model(m_shapes[connectors[i].attribs], color, model_matrix, true);
|
|
}
|
|
}
|
|
*/
|
|
void GLGizmoAdvancedCut::on_render_input_window(float x, float y, float bottom_limit)
|
|
{
|
|
GizmoImguiSetNextWIndowPos(x, y, ImGuiCond_Always, 0.0f, 0.0f);
|
|
ImGuiWrapper::push_toolbar_style(m_parent.get_scale());
|
|
GizmoImguiBegin(on_get_name(),
|
|
ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoTitleBar);
|
|
|
|
if (m_connectors_editing) {
|
|
init_connectors_input_window_data();
|
|
render_connectors_input_window(x, y, bottom_limit);
|
|
}
|
|
else
|
|
render_cut_plane_input_window(x, y, bottom_limit);
|
|
|
|
render_input_window_warning();
|
|
|
|
GizmoImguiEnd();
|
|
ImGuiWrapper::pop_toolbar_style();
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::show_tooltip_information(float x, float y)
|
|
{
|
|
float caption_max = 0.f;
|
|
for (const auto& short_cut : m_shortcuts) {
|
|
caption_max = std::max(caption_max, m_imgui->calc_text_size(short_cut.first).x);
|
|
}
|
|
|
|
ImTextureID normal_id = m_parent.get_gizmos_manager().get_icon_texture_id(GLGizmosManager::MENU_ICON_NAME::IC_TOOLBAR_TOOLTIP);
|
|
ImTextureID hover_id = m_parent.get_gizmos_manager().get_icon_texture_id(GLGizmosManager::MENU_ICON_NAME::IC_TOOLBAR_TOOLTIP_HOVER);
|
|
|
|
caption_max += m_imgui->calc_text_size(": ").x + 35.f;
|
|
|
|
float font_size = ImGui::GetFontSize();
|
|
ImVec2 button_size = ImVec2(font_size * 1.8, font_size * 1.3);
|
|
ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
|
|
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, {0, ImGui::GetStyle().FramePadding.y});
|
|
ImGui::ImageButton3(normal_id, hover_id, button_size);
|
|
|
|
if (ImGui::IsItemHovered()) {
|
|
ImGui::BeginTooltip2(ImVec2(x, y));
|
|
auto draw_text_with_caption = [this, &caption_max](const wxString &caption, const wxString &text) {
|
|
m_imgui->text_colored(ImGuiWrapper::COL_ACTIVE, caption);
|
|
ImGui::SameLine(caption_max);
|
|
m_imgui->text_colored(ImGuiWrapper::COL_WINDOW_BG, text);
|
|
};
|
|
|
|
for (const auto& short_cut : m_shortcuts)
|
|
draw_text_with_caption(short_cut.first + ": ", short_cut.second);
|
|
ImGui::EndTooltip();
|
|
}
|
|
ImGui::PopStyleVar(2);
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::set_movement(double movement) const
|
|
{
|
|
m_movement = movement;
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::perform_cut(const Selection& selection)
|
|
{
|
|
if (!can_perform_cut())
|
|
return;
|
|
|
|
const int instance_idx = selection.get_instance_idx();
|
|
const int object_idx = selection.get_object_idx();
|
|
|
|
wxCHECK_RET(instance_idx >= 0 && object_idx >= 0, "GLGizmoAdvancedCut: Invalid object selection");
|
|
|
|
// m_cut_z is the distance from the bed. Subtract possible SLA elevation.
|
|
const GLVolume* first_glvolume = selection.get_first_volume();
|
|
|
|
// perform cut
|
|
{
|
|
Plater::TakeSnapshot snapshot(wxGetApp().plater(), "Cut by Plane");
|
|
|
|
ModelObject *mo = wxGetApp().plater()->model().objects[object_idx];
|
|
const bool has_connectors = !mo->cut_connectors.empty();
|
|
|
|
bool create_dowels_as_separate_object = false;
|
|
// update connectors pos as offset of its center before cut performing
|
|
apply_connectors_in_model(mo, create_dowels_as_separate_object);
|
|
|
|
apply_connectors_in_model(cut_mo, dowels_count);
|
|
|
|
wxBusyCursor wait;
|
|
|
|
ModelObjectCutAttributes attributes = only_if(has_connectors ? true : m_keep_upper, ModelObjectCutAttribute::KeepUpper) |
|
|
only_if(has_connectors ? true : m_keep_lower, ModelObjectCutAttribute::KeepLower) |
|
|
only_if(has_connectors ? false : m_cut_to_parts, ModelObjectCutAttribute::CutToParts) |
|
|
only_if(m_place_on_cut_upper, ModelObjectCutAttribute::PlaceOnCutUpper) |
|
|
only_if(m_place_on_cut_lower, ModelObjectCutAttribute::PlaceOnCutLower) |
|
|
only_if(m_rotate_upper, ModelObjectCutAttribute::FlipUpper) | only_if(m_rotate_lower, ModelObjectCutAttribute::FlipLower) |
|
|
only_if(dowels_count > 0, ModelObjectCutAttribute::CreateDowels) |
|
|
only_if(!has_connectors && !cut_with_groove && cut_mo->cut_id.id().invalid(), ModelObjectCutAttribute::InvalidateCutInfo);
|
|
|
|
// update cut_id for the cut object in respect to the attributes
|
|
update_object_cut_id(cut_mo->cut_id, attributes, dowels_count);
|
|
|
|
Cut cut(cut_mo, instance_idx, get_cut_matrix(selection), attributes);
|
|
cut.set_offset_for_two_part = true;
|
|
const ModelObjectPtrs &new_objects = cut_by_contour ? cut.perform_by_contour(m_part_selection->get_cut_parts(), dowels_count) :
|
|
cut_with_groove ? cut.perform_with_groove(m_groove, m_rotate_matrix) :
|
|
cut.perform_with_plane();
|
|
// fix_non_manifold_edges
|
|
#ifdef HAS_WIN10SDK
|
|
if (is_windows10()) {
|
|
bool is_showed_dialog = false;
|
|
bool user_fix_model = false;
|
|
for (size_t i = 0; i < new_objects.size(); i++) {
|
|
for (size_t j = 0; j < new_objects[i]->volumes.size(); j++) {
|
|
if (its_num_open_edges(new_objects[i]->volumes[j]->mesh().its) > 0) {
|
|
if (!is_showed_dialog) {
|
|
is_showed_dialog = true;
|
|
MessageDialog dlg(nullptr, _L("non-manifold edges be caused by cut tool, do you want to fix it now?"), "", wxYES | wxCANCEL);
|
|
int ret = dlg.ShowModal();
|
|
if (ret == wxID_YES) {
|
|
user_fix_model = true;
|
|
}
|
|
}
|
|
if (!user_fix_model) {
|
|
break;
|
|
}
|
|
// model_name
|
|
std::vector<std::string> succes_models;
|
|
// model_name failing reason
|
|
std::vector<std::pair<std::string, std::string>> failed_models;
|
|
auto plater = wxGetApp().plater();
|
|
auto fix_and_update_progress = [this, plater](ModelObject *model_object, const int vol_idx, const string &model_name, ProgressDialog &progress_dlg,
|
|
std::vector<std::string> &succes_models, std::vector<std::pair<std::string, std::string>> &failed_models) {
|
|
wxString msg = _L("Repairing model object");
|
|
msg += ": " + from_u8(model_name) + "\n";
|
|
std::string res;
|
|
if (!fix_model_by_win10_sdk_gui(*model_object, vol_idx, progress_dlg, msg, res)) return false;
|
|
return true;
|
|
};
|
|
ProgressDialog progress_dlg(_L("Repairing model object"), "", 100, find_toplevel_parent(plater), wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT, true);
|
|
|
|
auto model_name = new_objects[i]->name;
|
|
if (!fix_and_update_progress(new_objects[i], j, model_name, progress_dlg, succes_models, failed_models)) {
|
|
BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << "run fix_and_update_progress error";
|
|
};
|
|
};
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
// set offset for new_objects
|
|
|
|
// save cut_id to post update synchronization
|
|
const CutObjectBase cut_id = cut_mo->cut_id;
|
|
|
|
// update cut results on plater and in the model
|
|
plater->apply_cut_object_to_model(object_idx, new_objects);
|
|
|
|
}
|
|
}
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::can_perform_cut() const
|
|
{
|
|
if (m_has_invalid_connector || (!m_keep_upper && !m_keep_lower) || m_connectors_editing)
|
|
return false;
|
|
|
|
return true;
|
|
//const auto clipper = m_c->object_clipper();
|
|
//return clipper && clipper->has_valid_contour();
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::apply_connectors_in_model(ModelObject *mo, bool &create_dowels_as_separate_object)
|
|
{
|
|
clear_selection();
|
|
|
|
for (CutConnector &connector : mo->cut_connectors) {
|
|
connector.rotation_m = m_rotate_matrix;
|
|
|
|
if (connector.attribs.type == CutConnectorType::Dowel) {
|
|
if (connector.attribs.style == CutConnectorStyle::Prizm) connector.height *= 2;
|
|
create_dowels_as_separate_object = true;
|
|
} else {
|
|
// culculate shift of the connector center regarding to the position on the cut plane
|
|
Vec3d shifted_center = m_cut_plane_center + Vec3d::UnitZ();
|
|
shifted_center = rotate_vec3d_around_vec3d_with_rotate_matrix(shifted_center, m_cut_plane_center, m_rotate_matrix);
|
|
Vec3d norm = (shifted_center - m_cut_plane_center).normalized();
|
|
connector.pos += norm * 0.5 * double(connector.height);
|
|
}
|
|
}
|
|
|
|
mo->apply_cut_connectors(_u8L("Connector"));
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::is_selection_changed(bool alt_down, bool shift_down)
|
|
{
|
|
if (m_hover_id >= c_connectors_group_id) {
|
|
if (alt_down)
|
|
select_connector(m_hover_id - c_connectors_group_id, false);
|
|
else {
|
|
if (!shift_down) unselect_all_connectors();
|
|
select_connector(m_hover_id - c_connectors_group_id, true);
|
|
}
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::select_connector(int idx, bool select)
|
|
{
|
|
m_selected[idx] = select;
|
|
if (select)
|
|
++m_selected_count;
|
|
else
|
|
--m_selected_count;
|
|
}
|
|
|
|
Vec3d GLGizmoAdvancedCut::calc_plane_normal(const std::array<Vec3d, 4>& plane_points) const
|
|
{
|
|
Vec3d v01 = plane_points[1] - plane_points[0];
|
|
Vec3d v12 = plane_points[2] - plane_points[1];
|
|
|
|
Vec3d plane_normal = v01.cross(v12);
|
|
plane_normal.normalize();
|
|
return plane_normal;
|
|
}
|
|
|
|
Vec3d GLGizmoAdvancedCut::calc_plane_center(const std::array<Vec3d, 4>& plane_points) const
|
|
{
|
|
Vec3d plane_center;
|
|
plane_center.setZero();
|
|
for (const Vec3d& point : plane_points)
|
|
plane_center = plane_center + point;
|
|
|
|
return plane_center / (float)m_cut_plane_points.size();
|
|
}
|
|
|
|
double GLGizmoAdvancedCut::calc_projection(const Linef3& mouse_ray) const
|
|
{
|
|
Vec3d mouse_dir = mouse_ray.unit_vector();
|
|
Vec3d inters = mouse_ray.a + (m_drag_pos - mouse_ray.a).dot(mouse_dir) / mouse_dir.squaredNorm() * mouse_dir;
|
|
Vec3d inters_vec = inters - m_drag_pos;
|
|
|
|
Vec3d plane_normal = get_plane_normal();
|
|
return inters_vec.dot(plane_normal);
|
|
}
|
|
|
|
Vec3d GLGizmoAdvancedCut::get_plane_normal() const
|
|
{
|
|
return calc_plane_normal(m_cut_plane_points);
|
|
}
|
|
|
|
Vec3d GLGizmoAdvancedCut::get_plane_center() const
|
|
{
|
|
return calc_plane_center(m_cut_plane_points);
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::finish_rotation()
|
|
{
|
|
for (int i = 0; i < 3; i++) {
|
|
m_gizmos[i].set_angle(0.);
|
|
}
|
|
|
|
update_plane_points();
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::put_connectors_on_cut_plane(const Vec3d &cp_normal, double cp_offset)
|
|
{
|
|
ModelObject *mo = m_c->selection_info()->model_object();
|
|
if (CutConnectors &connectors = mo->cut_connectors; !connectors.empty()) {
|
|
const float sla_shift = m_c->selection_info()->get_sla_shift();
|
|
const Vec3d &instance_offset = mo->instances[m_c->selection_info()->get_active_instance()]->get_offset();
|
|
|
|
for (auto &connector : connectors) {
|
|
// convert connetor pos to the world coordinates
|
|
Vec3d pos = connector.pos + instance_offset;
|
|
pos[Z] += sla_shift;
|
|
// scalar distance from point to plane along the normal
|
|
double distance = -cp_normal.dot(pos) + cp_offset;
|
|
// move connector
|
|
connector.pos += distance * cp_normal;
|
|
}
|
|
}
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::update_clipper()
|
|
{
|
|
BoundingBoxf3 box = bounding_box();
|
|
double radius = box.radius();
|
|
Vec3d plane_center = m_cut_plane_center;
|
|
|
|
Vec3d begin, end = begin = plane_center;
|
|
begin[Z] = box.center().z() - radius;
|
|
end[Z] = box.center().z() + radius;
|
|
|
|
double phi;
|
|
Vec3d rotation_axis;
|
|
Matrix3d rotation_matrix;
|
|
Geometry::rotation_from_two_vectors(Vec3d::UnitZ(), m_cut_plane_normal, rotation_axis, phi, &rotation_matrix);
|
|
|
|
m_rotate_matrix.setIdentity();
|
|
m_rotate_matrix = rotation_matrix * m_rotate_matrix;
|
|
|
|
begin = rotate_vec3d_around_vec3d_with_rotate_matrix(begin, plane_center, m_rotate_matrix);
|
|
end = rotate_vec3d_around_vec3d_with_rotate_matrix(end, plane_center, m_rotate_matrix);
|
|
|
|
Vec3d normal = end - begin;
|
|
|
|
if (!is_looking_forward()) {
|
|
end = begin = plane_center;
|
|
begin[Z] = box.center().z() + radius;
|
|
end[Z] = box.center().z() - radius;
|
|
|
|
begin = rotate_vec3d_around_vec3d_with_rotate_matrix(begin, plane_center, m_rotate_matrix);
|
|
end = rotate_vec3d_around_vec3d_with_rotate_matrix(end, plane_center, m_rotate_matrix);
|
|
|
|
// recalculate normal for clipping plane, if camera is looking downward to cut plane
|
|
normal = end - begin;
|
|
if (normal == Vec3d::Zero())
|
|
return;
|
|
}
|
|
|
|
// calculate normal and offset for clipping plane
|
|
double dist = (plane_center - begin).norm();
|
|
dist = std::clamp(dist, 0.0001, normal.norm());
|
|
normal.normalize();
|
|
const double offset = normal.dot(begin) + dist;
|
|
|
|
m_c->object_clipper()->set_range_and_pos(normal, offset, dist);
|
|
|
|
put_connectors_on_cut_plane(normal, offset);
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::render_cut_plane_and_grabbers()
|
|
{
|
|
const Selection & selection = m_parent.get_selection();
|
|
const BoundingBoxf3 &box = selection.get_bounding_box();
|
|
// box center is the coord of object in the world coordinate
|
|
Vec3d object_offset = box.center();
|
|
// plane points is in object coordinate
|
|
Vec3d plane_center = get_plane_center();
|
|
|
|
m_cut_plane_center = object_offset + plane_center;
|
|
|
|
// rotate plane
|
|
std::array<Vec3d, 4> plane_points_rot;
|
|
{
|
|
for (int i = 0; i < plane_points_rot.size(); i++) {
|
|
plane_points_rot[i] = m_cut_plane_points[i] - plane_center;
|
|
}
|
|
|
|
if (m_rotation(0) > EPSILON)
|
|
rotate_x_3d(plane_points_rot, m_rotation(0));
|
|
if (m_rotation(1) > EPSILON)
|
|
rotate_y_3d(plane_points_rot, m_rotation(1));
|
|
if (m_rotation(2) > EPSILON)
|
|
rotate_z_3d(plane_points_rot, m_rotation(2));
|
|
|
|
for (int i = 0; i < plane_points_rot.size(); i++) {
|
|
plane_points_rot[i] += plane_center;
|
|
}
|
|
}
|
|
|
|
// move plane
|
|
Vec3d plane_normal_rot = calc_plane_normal(plane_points_rot);
|
|
m_cut_plane_normal = plane_normal_rot;
|
|
for (int i = 0; i < plane_points_rot.size(); i++) {
|
|
plane_points_rot[i] += plane_normal_rot * m_movement;
|
|
}
|
|
|
|
// transfer from object coordindate to the world coordinate
|
|
for (Vec3d& point : plane_points_rot) {
|
|
point += object_offset;
|
|
}
|
|
|
|
glsafe(::glEnable(GL_DEPTH_TEST));
|
|
glsafe(::glDisable(GL_CULL_FACE));
|
|
glsafe(::glEnable(GL_BLEND));
|
|
glsafe(::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
|
|
|
|
GLShaderProgram *shader = wxGetApp().get_shader("flat");
|
|
if (shader != nullptr) {
|
|
shader->start_using();
|
|
|
|
// draw plane
|
|
{
|
|
m_plane.reset();
|
|
|
|
GLModel::Geometry init_data;
|
|
init_data.format = { GLModel::Geometry::EPrimitiveType::Triangles, GLModel::Geometry::EVertexLayout::P3 };
|
|
init_data.color = { 0.8f, 0.8f, 0.8f, 0.5f };
|
|
init_data.reserve_vertices(4);
|
|
init_data.reserve_vertices(6);
|
|
|
|
// vertices
|
|
for (const Vec3d &point : plane_points_rot) {
|
|
init_data.add_vertex((Vec3f)point.cast<float>());
|
|
}
|
|
|
|
// indices
|
|
init_data.add_triangle(0, 1, 2);
|
|
init_data.add_triangle(2, 3, 0);
|
|
|
|
m_plane.init_from(std::move(init_data));
|
|
}
|
|
const Camera &camera = wxGetApp().plater()->get_camera();
|
|
shader->set_uniform("view_model_matrix", camera.get_view_matrix());
|
|
shader->set_uniform("projection_matrix", camera.get_projection_matrix());
|
|
m_plane.render();
|
|
|
|
glsafe(::glEnable(GL_CULL_FACE));
|
|
glsafe(::glDisable(GL_BLEND));
|
|
|
|
// Draw the grabber and the connecting line
|
|
Vec3d plane_center_rot = calc_plane_center(plane_points_rot);
|
|
m_move_grabber.center = plane_center_rot + plane_normal_rot * Offset;
|
|
// m_move_grabber.angles = m_current_base_rotation + m_rotation;
|
|
|
|
{
|
|
m_grabber_connection.reset();
|
|
|
|
GLModel::Geometry init_data;
|
|
init_data.format = { GLModel::Geometry::EPrimitiveType::Lines, GLModel::Geometry::EVertexLayout::P3 };
|
|
init_data.color = ColorRGBA::YELLOW();
|
|
init_data.reserve_vertices(2);
|
|
init_data.reserve_vertices(2);
|
|
|
|
// vertices
|
|
init_data.add_vertex((Vec3f)plane_center_rot.cast<float>());
|
|
init_data.add_vertex((Vec3f)m_move_grabber.center.cast<float>());
|
|
|
|
// indices
|
|
init_data.add_line(0, 1);
|
|
|
|
m_grabber_connection.init_from(std::move(init_data));
|
|
}
|
|
|
|
glsafe(::glDisable(GL_DEPTH_TEST));
|
|
glsafe(::glLineWidth(m_hover_id != -1 ? 2.0f : 1.5f));
|
|
glLineStipple(1, 0x0FFF);
|
|
glEnable(GL_LINE_STIPPLE);
|
|
m_grabber_connection.render();
|
|
glDisable(GL_LINE_STIPPLE);
|
|
|
|
shader->stop_using();
|
|
}
|
|
|
|
{
|
|
GLShaderProgram *shader = wxGetApp().get_shader("gouraud_light");
|
|
if (shader == nullptr)
|
|
return;
|
|
shader->start_using();
|
|
shader->set_uniform("emission_factor", 0.1f);
|
|
// std::copy(std::begin(GrabberColor), std::end(GrabberColor), m_move_grabber.color);
|
|
// m_move_grabber.color = GrabberColor;
|
|
// m_move_grabber.hover_color = GrabberHoverColor;
|
|
// m_move_grabber.render(m_hover_id == get_group_id(), (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0));
|
|
bool hover = (m_hover_id == m_group_id);
|
|
ColorRGBA render_color;
|
|
if (hover) {
|
|
render_color = GrabberHoverColor;
|
|
}
|
|
else
|
|
render_color = GrabberColor;
|
|
|
|
PickingModel &cube = m_move_grabber.get_cube();
|
|
// BBS set to fixed size grabber
|
|
// float fullsize = 2 * (dragging ? get_dragging_half_size(size) : get_half_size(size));
|
|
float fullsize = 8.0f;
|
|
if (GLGizmoBase::INV_ZOOM > 0) {
|
|
fullsize = m_move_grabber.FixedGrabberSize * GLGizmoBase::INV_ZOOM;
|
|
}
|
|
|
|
cube.model.set_color(render_color);
|
|
|
|
const Transform3d trafo_matrix = Geometry::assemble_transform(m_move_grabber.center) * m_rotate_matrix *
|
|
Geometry::assemble_transform(Vec3d::Zero(), Vec3d::Zero(), fullsize * Vec3d::Ones());
|
|
const Camera& camera = wxGetApp().plater()->get_camera();
|
|
const Transform3d& view_matrix = camera.get_view_matrix();
|
|
shader->set_uniform("view_model_matrix", view_matrix * trafo_matrix);
|
|
shader->set_uniform("projection_matrix", camera.get_projection_matrix());
|
|
const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * trafo_matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
|
|
shader->set_uniform("view_normal_matrix", view_normal_matrix);
|
|
cube.model.render();
|
|
shader->stop_using();
|
|
}
|
|
|
|
// Should be placed at last, because GLGizmoRotate3D clears depth buffer
|
|
set_center(m_cut_plane_center);
|
|
GLGizmoRotate3D::on_render();
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::render_connectors()
|
|
{
|
|
::glEnable(GL_DEPTH_TEST);
|
|
|
|
const ModelObject *mo = m_c->selection_info()->model_object();
|
|
auto inst_id = m_c->selection_info()->get_active_instance();
|
|
if (inst_id < 0)
|
|
return;
|
|
|
|
const CutConnectors &connectors = mo->cut_connectors;
|
|
if (connectors.size() != m_selected.size()) {
|
|
clear_selection();
|
|
m_selected.resize(connectors.size(), false);
|
|
}
|
|
|
|
const ModelInstance *mi = mo->instances[inst_id];
|
|
const Vec3d & instance_offset = mi->get_offset();
|
|
const double sla_shift = double(m_c->selection_info()->get_sla_shift());
|
|
|
|
m_has_invalid_connector = false;
|
|
m_info_stats.invalidate();
|
|
|
|
ColorRGBA render_color = CONNECTOR_DEF_COLOR;
|
|
for (size_t i = 0; i < connectors.size(); ++i) {
|
|
const CutConnector &connector = connectors[i];
|
|
|
|
float height = connector.height;
|
|
// recalculate connector position to world position
|
|
Vec3d pos = connector.pos + instance_offset + sla_shift * Vec3d::UnitZ();
|
|
|
|
// First decide about the color of the point.
|
|
const bool conflict_connector = is_conflict_for_connector(i, connectors, pos);
|
|
if (conflict_connector) {
|
|
m_has_invalid_connector = true;
|
|
render_color = CONNECTOR_ERR_COLOR;
|
|
} else // default connector color
|
|
render_color = connector.attribs.type == CutConnectorType::Dowel ? DOWEL_COLOR : PLAG_COLOR;
|
|
|
|
if (!m_connectors_editing)
|
|
render_color = CONNECTOR_ERR_COLOR;
|
|
else if (size_t(m_hover_id - 4) == i)
|
|
render_color = conflict_connector ? HOVERED_ERR_COLOR : connector.attribs.type == CutConnectorType::Dowel ? HOVERED_DOWEL_COLOR : HOVERED_PLAG_COLOR;
|
|
else if (m_selected[i])
|
|
render_color = connector.attribs.type == CutConnectorType::Dowel ? SELECTED_DOWEL_COLOR : SELECTED_PLAG_COLOR;
|
|
|
|
const Camera &camera = wxGetApp().plater()->get_camera();
|
|
if (connector.attribs.type == CutConnectorType::Dowel && connector.attribs.style == CutConnectorStyle::Prizm) {
|
|
pos -= height * m_cut_plane_normal;
|
|
height *= 2;
|
|
} else if (!is_looking_forward())
|
|
pos -= 0.05 * m_cut_plane_normal;
|
|
|
|
Transform3d translate_tf = Transform3d::Identity();
|
|
translate_tf.translate(pos);
|
|
|
|
Transform3d scale_tf = Transform3d::Identity();
|
|
scale_tf.scale(Vec3f(connector.radius, connector.radius, height).cast<double>());
|
|
|
|
const Transform3d model_matrix = translate_tf * m_rotate_matrix * scale_tf;
|
|
|
|
render_connector_model(m_shapes[connector.attribs], render_color, model_matrix);
|
|
}
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::render_clipper_cut()
|
|
{
|
|
glsafe(::glEnable(GL_DEPTH_TEST));
|
|
m_c->object_clipper()->render_cut();
|
|
glsafe(::glDisable(GL_DEPTH_TEST));
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::render_cut_line()
|
|
{
|
|
if (!cut_line_processing() || m_cut_line_end == Vec3d::Zero())
|
|
return;
|
|
|
|
glsafe(::glDisable(GL_DEPTH_TEST));
|
|
|
|
GLShaderProgram *shader = wxGetApp().get_shader("flat");
|
|
if (shader != nullptr) {
|
|
shader->start_using();
|
|
|
|
{
|
|
m_cut_line.reset();
|
|
|
|
GLModel::Geometry init_data;
|
|
init_data.format = {GLModel::Geometry::EPrimitiveType::Lines, GLModel::Geometry::EVertexLayout::P3};
|
|
init_data.color = ColorRGBA::GREEN();
|
|
init_data.reserve_vertices(2);
|
|
init_data.reserve_vertices(2);
|
|
|
|
// vertices
|
|
init_data.add_vertex((Vec3f) m_cut_line_begin.cast<float>());
|
|
init_data.add_vertex((Vec3f) m_cut_line_end.cast<float>());
|
|
|
|
// indices
|
|
init_data.add_line(0, 1);
|
|
|
|
m_cut_line.init_from(std::move(init_data));
|
|
}
|
|
const Camera &camera = wxGetApp().plater()->get_camera();
|
|
shader->set_uniform("view_model_matrix", camera.get_view_matrix());
|
|
shader->set_uniform("projection_matrix", camera.get_projection_matrix());
|
|
|
|
glEnable(GL_LINE_STIPPLE);
|
|
glLineStipple(1, 0x0FFF);
|
|
m_cut_line.render();
|
|
glDisable(GL_LINE_STIPPLE);
|
|
|
|
shader->stop_using();
|
|
}
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::render_connector_model(GLModel &model, const ColorRGBA &color, Transform3d model_matrix, bool for_picking)
|
|
{
|
|
GLShaderProgram *shader = nullptr;
|
|
if (for_picking)
|
|
shader = wxGetApp().get_shader("flat");
|
|
else
|
|
shader = wxGetApp().get_shader("gouraud_light");
|
|
if (shader) {
|
|
shader->start_using();
|
|
|
|
const Camera& camera = wxGetApp().plater()->get_camera();
|
|
const Transform3d& view_matrix = camera.get_view_matrix();
|
|
shader->set_uniform("view_model_matrix", view_matrix * model_matrix);
|
|
shader->set_uniform("projection_matrix", camera.get_projection_matrix());
|
|
const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * model_matrix.matrix().block(0, 0, 3, 3).inverse().transpose();
|
|
shader->set_uniform("view_normal_matrix", view_normal_matrix);
|
|
|
|
model.set_color(color);
|
|
model.render();
|
|
|
|
shader->stop_using();
|
|
}
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::clear_selection()
|
|
{
|
|
m_selected.clear();
|
|
m_selected_count = 0;
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::init_connector_shapes()
|
|
{
|
|
for (const CutConnectorType &type : {CutConnectorType::Dowel, CutConnectorType::Plug})
|
|
for (const CutConnectorStyle &style : {CutConnectorStyle::Frustum, CutConnectorStyle::Prizm})
|
|
for (const CutConnectorShape &shape : {CutConnectorShape::Circle, CutConnectorShape::Hexagon, CutConnectorShape::Square, CutConnectorShape::Triangle}) {
|
|
const CutConnectorAttributes attribs = {type, style, shape};
|
|
const indexed_triangle_set its = ModelObject::get_connector_mesh(attribs);
|
|
m_shapes[attribs].init_from(its);
|
|
}
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::set_connectors_editing(bool connectors_editing)
|
|
{
|
|
m_connectors_editing = connectors_editing;
|
|
// todo: zhimin need a better method
|
|
// after change render mode, need update for scene
|
|
on_render();
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::reset_connectors()
|
|
{
|
|
m_c->selection_info()->model_object()->cut_connectors.clear();
|
|
clear_selection();
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::update_connector_shape()
|
|
{
|
|
CutConnectorAttributes attribs = {m_connector_type, CutConnectorStyle(m_connector_style), CutConnectorShape(m_connector_shape_id)};
|
|
|
|
const indexed_triangle_set its = ModelObject::get_connector_mesh(attribs);
|
|
m_connector_mesh.clear();
|
|
m_connector_mesh = TriangleMesh(its);
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::apply_selected_connectors(std::function<void(size_t idx)> apply_fn)
|
|
{
|
|
for (size_t idx = 0; idx < m_selected.size(); idx++)
|
|
if (m_selected[idx])
|
|
apply_fn(idx);
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::select_all_connectors()
|
|
{
|
|
std::fill(m_selected.begin(), m_selected.end(), true);
|
|
m_selected_count = int(m_selected.size());
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::unselect_all_connectors()
|
|
{
|
|
std::fill(m_selected.begin(), m_selected.end(), false);
|
|
m_selected_count = 0;
|
|
validate_connector_settings();
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::validate_connector_settings()
|
|
{
|
|
if (m_connector_depth_ratio < 0.f)
|
|
m_connector_depth_ratio = 3.f;
|
|
if (m_connector_depth_ratio_tolerance < 0.f)
|
|
m_connector_depth_ratio_tolerance = 0.1f;
|
|
if (m_connector_size < 0.f)
|
|
m_connector_size = 2.5f;
|
|
if (m_connector_size_tolerance < 0.f)
|
|
m_connector_size_tolerance = 0.f;
|
|
|
|
if (m_connector_type == CutConnectorType::Undef)
|
|
m_connector_type = CutConnectorType::Plug;
|
|
if (m_connector_style == size_t(CutConnectorStyle::Undef))
|
|
m_connector_style = size_t(CutConnectorStyle::Prizm);
|
|
if (m_connector_shape_id == size_t(CutConnectorShape::Undef))
|
|
m_connector_shape_id = size_t(CutConnectorShape::Circle);
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::add_connector(CutConnectors &connectors, const Vec2d &mouse_position)
|
|
{
|
|
if (!m_connectors_editing)
|
|
return false;
|
|
|
|
Vec3d pos;
|
|
Vec3d pos_world;
|
|
if (unproject_on_cut_plane(mouse_position.cast<double>(), pos, pos_world)) {
|
|
Plater::TakeSnapshot snapshot(wxGetApp().plater(), "Add connector");
|
|
unselect_all_connectors();
|
|
|
|
connectors.emplace_back(pos, m_rotate_matrix, m_connector_size * 0.5f, m_connector_depth_ratio, m_connector_size_tolerance, m_connector_depth_ratio_tolerance,
|
|
CutConnectorAttributes(CutConnectorType(m_connector_type), CutConnectorStyle(m_connector_style), CutConnectorShape(m_connector_shape_id)));
|
|
m_selected.push_back(true);
|
|
m_selected_count = 1;
|
|
assert(m_selected.size() == connectors.size());
|
|
m_parent.set_as_dirty();
|
|
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::delete_selected_connectors()
|
|
{
|
|
CutConnectors &connectors = m_c->selection_info()->model_object()->cut_connectors;
|
|
if (connectors.empty())
|
|
return false;
|
|
|
|
Plater::TakeSnapshot snapshot(wxGetApp().plater(), "Delete connector");
|
|
|
|
// remove connectors
|
|
for (int i = int(connectors.size()) - 1; i >= 0; i--)
|
|
if (m_selected[i]) connectors.erase(connectors.begin() + i);
|
|
// remove selections
|
|
m_selected.erase(std::remove_if(m_selected.begin(), m_selected.end(),
|
|
[](const auto &selected) {
|
|
return selected;}),
|
|
m_selected.end());
|
|
|
|
m_selected_count = 0;
|
|
|
|
assert(m_selected.size() == connectors.size());
|
|
m_parent.set_as_dirty();
|
|
return true;
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::is_outside_of_cut_contour(size_t idx, const CutConnectors &connectors, const Vec3d cur_pos)
|
|
{
|
|
// check if connector pos is out of clipping plane
|
|
if (m_c->object_clipper() && !m_c->object_clipper()->is_projection_inside_cut(cur_pos)) {
|
|
m_info_stats.outside_cut_contour++;
|
|
return true;
|
|
}
|
|
|
|
// check if connector bottom contour is out of clipping plane
|
|
const CutConnector & cur_connector = connectors[idx];
|
|
const CutConnectorShape shape = CutConnectorShape(cur_connector.attribs.shape);
|
|
const int sectorCount = shape == CutConnectorShape::Triangle ? 3 :
|
|
shape == CutConnectorShape::Square ? 4 :
|
|
shape == CutConnectorShape::Circle ? 60: // supposably, 60 points are enough for conflict detection
|
|
shape == CutConnectorShape::Hexagon ? 6 : 1 ;
|
|
|
|
indexed_triangle_set mesh;
|
|
auto & vertices = mesh.vertices;
|
|
vertices.reserve(sectorCount + 1);
|
|
|
|
float fa = 2 * PI / sectorCount;
|
|
auto vec = Eigen::Vector2f(0, cur_connector.radius);
|
|
for (float angle = 0; angle < 2.f * PI; angle += fa) {
|
|
Vec2f p = Eigen::Rotation2Df(angle) * vec;
|
|
vertices.emplace_back(Vec3f(p(0), p(1), 0.f));
|
|
}
|
|
|
|
Transform3d transform = Transform3d::Identity();
|
|
transform.translate(cur_pos);
|
|
its_transform(mesh, transform * m_rotate_matrix);
|
|
|
|
for (auto vertex : vertices) {
|
|
if (m_c->object_clipper() && !m_c->object_clipper()->is_projection_inside_cut(vertex.cast<double>())) {
|
|
m_info_stats.outside_cut_contour++;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::is_conflict_for_connector(size_t idx, const CutConnectors &connectors, const Vec3d cur_pos)
|
|
{
|
|
if (is_outside_of_cut_contour(idx, connectors, cur_pos))
|
|
return true;
|
|
|
|
const CutConnector &cur_connector = connectors[idx];
|
|
|
|
Transform3d translate_tf = Transform3d::Identity();
|
|
translate_tf.translate(cur_pos);
|
|
Transform3d scale_tf = Transform3d::Identity();
|
|
scale_tf.scale(Vec3f(cur_connector.radius, cur_connector.radius, cur_connector.height).cast<double>());
|
|
const Transform3d matrix = translate_tf * m_rotate_matrix * scale_tf;
|
|
|
|
const BoundingBoxf3 cur_tbb = m_shapes[cur_connector.attribs].get_bounding_box().transformed(matrix);
|
|
|
|
// check if connector's bounding box is inside the object's bounding box
|
|
if (!bounding_box().contains(cur_tbb)) {
|
|
m_info_stats.outside_bb++;
|
|
return true;
|
|
}
|
|
|
|
// check if connectors are overlapping
|
|
for (size_t i = 0; i < connectors.size(); ++i) {
|
|
if (i == idx) continue;
|
|
const CutConnector &connector = connectors[i];
|
|
|
|
if ((connector.pos - cur_connector.pos).norm() < double(connector.radius + cur_connector.radius)) {
|
|
m_info_stats.is_overlap = true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::check_conflict_for_all_connectors()
|
|
{
|
|
const ModelObject *mo = m_c->selection_info()->model_object();
|
|
auto inst_id = m_c->selection_info()->get_active_instance();
|
|
if (inst_id < 0)
|
|
return;
|
|
|
|
const CutConnectors &connectors = mo->cut_connectors;
|
|
const ModelInstance *mi = mo->instances[inst_id];
|
|
const Vec3d & instance_offset = mi->get_offset();
|
|
const double sla_shift = double(m_c->selection_info()->get_sla_shift());
|
|
|
|
m_has_invalid_connector = false;
|
|
m_info_stats.invalidate();
|
|
|
|
for (size_t i = 0; i < connectors.size(); ++i) {
|
|
const CutConnector &connector = connectors[i];
|
|
|
|
Vec3d pos = connector.pos + instance_offset + sla_shift * Vec3d::UnitZ();
|
|
|
|
// First decide about the color of the point.
|
|
const bool conflict_connector = is_conflict_for_connector(i, connectors, pos);
|
|
if (conflict_connector) {
|
|
m_has_invalid_connector = true;
|
|
}
|
|
}
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::render_cut_plane_input_window(float x, float y, float bottom_limit)
|
|
{
|
|
// float unit_size = m_imgui->get_style_scaling() * 48.0f;
|
|
float space_size = m_imgui->get_style_scaling() * 8;
|
|
float movement_cap = m_imgui->calc_text_size(_L("Movement:")).x;
|
|
float rotate_cap = m_imgui->calc_text_size(_L("Rotate")).x;
|
|
float caption_size = std::max(movement_cap, rotate_cap) + 2 * space_size;
|
|
bool imperial_units = wxGetApp().app_config->get("use_inches") == "1";
|
|
unsigned int current_active_id = ImGui::GetActiveID();
|
|
|
|
Vec3d rotation = {Geometry::rad2deg(m_buffered_rotation(0)), Geometry::rad2deg(m_buffered_rotation(1)), Geometry::rad2deg(m_buffered_rotation(2))};
|
|
char buf[3][64];
|
|
float buf_size[3];
|
|
float vec_max = 0, unit_size = 0;
|
|
for (int i = 0; i < 3; i++) {
|
|
ImGui::DataTypeFormatString(buf[i], IM_ARRAYSIZE(buf[i]), ImGuiDataType_Double, (void *) &rotation[i], "%.2f");
|
|
buf_size[i] = ImGui::CalcTextSize(buf[i]).x;
|
|
vec_max = std::max(buf_size[i], vec_max);
|
|
}
|
|
|
|
float buf_size_max = ImGui::CalcTextSize("-100.00").x;
|
|
if (vec_max < buf_size_max) {
|
|
unit_size = buf_size_max + ImGui::GetStyle().FramePadding.x * 2.0f;
|
|
} else {
|
|
unit_size = vec_max + ImGui::GetStyle().FramePadding.x * 2.0f;
|
|
}
|
|
|
|
ImGui::PushItemWidth(caption_size);
|
|
ImGui::Dummy(ImVec2(caption_size, -1));
|
|
ImGui::SameLine(caption_size + 1 * space_size);
|
|
ImGui::PushItemWidth(unit_size);
|
|
ImGui::TextAlignCenter("X");
|
|
ImGui::SameLine(caption_size + 1 * unit_size + 2 * space_size);
|
|
ImGui::PushItemWidth(unit_size);
|
|
ImGui::TextAlignCenter("Y");
|
|
ImGui::SameLine(caption_size + 2 * unit_size + 3 * space_size);
|
|
ImGui::PushItemWidth(unit_size);
|
|
ImGui::TextAlignCenter("Z");
|
|
|
|
ImGui::AlignTextToFramePadding();
|
|
|
|
// Rotation input box
|
|
ImGui::PushItemWidth(caption_size);
|
|
m_imgui->text(_L("Rotation") + " ");
|
|
ImGui::SameLine(caption_size + 1 * space_size);
|
|
ImGui::PushItemWidth(unit_size);
|
|
ImGui::BBLInputDouble("##cut_rotation_x", &rotation[0], 0.0f, 0.0f, "%.2f");
|
|
ImGui::SameLine(caption_size + 1 * unit_size + 2 * space_size);
|
|
ImGui::PushItemWidth(unit_size);
|
|
ImGui::BBLInputDouble("##cut_rotation_y", &rotation[1], 0.0f, 0.0f, "%.2f");
|
|
ImGui::SameLine(caption_size + 2 * unit_size + 3 * space_size);
|
|
ImGui::PushItemWidth(unit_size);
|
|
ImGui::BBLInputDouble("##cut_rotation_z", &rotation[2], 0.0f, 0.0f, "%.2f");
|
|
if (current_active_id != m_last_active_id) {
|
|
if (std::abs(Geometry::rad2deg(m_rotation(0)) - m_buffered_rotation(0)) > EPSILON || std::abs(Geometry::rad2deg(m_rotation(1)) - m_buffered_rotation(1)) > EPSILON ||
|
|
std::abs(Geometry::rad2deg(m_rotation(2)) - m_buffered_rotation(2)) > EPSILON) {
|
|
m_rotation = m_buffered_rotation;
|
|
m_buffered_rotation.setZero();
|
|
update_plane_points();
|
|
m_parent.post_event(SimpleEvent(wxEVT_PAINT));
|
|
}
|
|
} else {
|
|
m_buffered_rotation(0) = Geometry::deg2rad(rotation(0));
|
|
m_buffered_rotation(1) = Geometry::deg2rad(rotation(1));
|
|
m_buffered_rotation(2) = Geometry::deg2rad(rotation(2));
|
|
}
|
|
|
|
ImGui::Separator();
|
|
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(4.0f, 10.0f));
|
|
// Movement input box
|
|
double movement = m_movement;
|
|
ImGui::PushItemWidth(caption_size);
|
|
ImGui::AlignTextToFramePadding();
|
|
m_imgui->text(_L("Movement") + " ");
|
|
ImGui::SameLine(caption_size + 1 * space_size);
|
|
ImGui::PushItemWidth(3 * unit_size + 2 * space_size);
|
|
ImGui::BBLInputDouble("##cut_movement", &movement, 0.0f, 0.0f, "%.2f");
|
|
if (current_active_id != m_last_active_id) {
|
|
if (std::abs(m_buffered_movement - m_movement) > EPSILON) {
|
|
m_movement = m_buffered_movement;
|
|
m_buffered_movement = 0.0;
|
|
|
|
// update absolute height
|
|
Vec3d plane_normal = get_plane_normal();
|
|
m_height_delta = plane_normal(2) * m_movement;
|
|
m_height += m_height_delta;
|
|
m_buffered_height = m_height;
|
|
|
|
update_plane_points();
|
|
m_parent.post_event(SimpleEvent(wxEVT_PAINT));
|
|
}
|
|
} else {
|
|
m_buffered_movement = movement;
|
|
}
|
|
|
|
// height input box
|
|
double height = m_height;
|
|
ImGui::PushItemWidth(caption_size);
|
|
ImGui::AlignTextToFramePadding();
|
|
// only allow setting height when cut plane is horizontal
|
|
Vec3d plane_normal = get_plane_normal();
|
|
m_imgui->disabled_begin(std::abs(plane_normal(0)) > EPSILON || std::abs(plane_normal(1)) > EPSILON);
|
|
m_imgui->text(_L("Height") + " ");
|
|
ImGui::SameLine(caption_size + 1 * space_size);
|
|
ImGui::PushItemWidth(3 * unit_size + 2 * space_size);
|
|
ImGui::BBLInputDouble("##cut_height", &height, 0.0f, 0.0f, "%.2f");
|
|
if (current_active_id != m_last_active_id) {
|
|
if (std::abs(m_buffered_height - m_height) > EPSILON) {
|
|
m_height_delta = m_buffered_height - m_height;
|
|
m_height = m_buffered_height;
|
|
update_plane_points();
|
|
m_parent.post_event(SimpleEvent(wxEVT_PAINT));
|
|
}
|
|
} else {
|
|
m_buffered_height = height;
|
|
}
|
|
ImGui::PopStyleVar(1);
|
|
m_imgui->disabled_end();
|
|
|
|
CutConnectors &connectors = m_c->selection_info()->model_object()->cut_connectors;
|
|
const bool has_connectors = !connectors.empty();
|
|
|
|
m_imgui->disabled_begin(!m_keep_upper || !m_keep_lower || m_cut_to_parts);
|
|
if (m_imgui->button(has_connectors ? _L("Edit connectors") : _L("Add connectors"))) set_connectors_editing(true);
|
|
m_imgui->disabled_end();
|
|
|
|
ImGui::Separator();
|
|
|
|
float label_width = 0;
|
|
for (const wxString& label : {_L("Upper part"), _L("Lower part")}) {
|
|
const float width = m_imgui->calc_text_size(label).x + m_imgui->scaled(1.5f);
|
|
if (label_width < width)
|
|
label_width = width;
|
|
}
|
|
|
|
auto render_part_action_line = [this, label_width, &connectors](const wxString &label, const wxString &suffix, bool &keep_part, bool &place_on_cut_part, bool &rotate_part) {
|
|
bool keep = true;
|
|
ImGui::AlignTextToFramePadding();
|
|
m_imgui->text(label);
|
|
|
|
ImGui::SameLine(label_width);
|
|
|
|
m_imgui->disabled_begin(!connectors.empty() || m_cut_to_parts);
|
|
m_imgui->bbl_checkbox(_L("Keep") + suffix, connectors.empty() ? keep_part : keep);
|
|
m_imgui->disabled_end();
|
|
|
|
ImGui::SameLine();
|
|
|
|
m_imgui->disabled_begin(!keep_part || m_cut_to_parts);
|
|
if (m_imgui->bbl_checkbox(_L("Place on cut") + suffix, place_on_cut_part))
|
|
rotate_part = false;
|
|
ImGui::SameLine();
|
|
if (m_imgui->bbl_checkbox(_L("Flip") + suffix, rotate_part))
|
|
place_on_cut_part = false;
|
|
m_imgui->disabled_end();
|
|
};
|
|
|
|
m_imgui->text(_L("After cut") + ": ");
|
|
render_part_action_line( _L("Upper part"), "##upper", m_keep_upper, m_place_on_cut_upper, m_rotate_upper);
|
|
render_part_action_line( _L("Lower part"), "##lower", m_keep_lower, m_place_on_cut_lower, m_rotate_lower);
|
|
|
|
m_imgui->disabled_begin(has_connectors);
|
|
m_imgui->bbl_checkbox(_L("Cut to parts"), m_cut_to_parts);
|
|
if (m_cut_to_parts) {
|
|
m_keep_upper = true;
|
|
m_keep_lower = true;
|
|
}
|
|
m_imgui->disabled_end();
|
|
|
|
#if 0
|
|
// Auto segment input
|
|
ImGui::PushItemWidth(m_imgui->get_style_scaling() * 150.0);
|
|
m_imgui->checkbox(_L("Auto Segment"), m_do_segment);
|
|
m_imgui->disabled_begin(!m_do_segment);
|
|
ImGui::InputDouble("smoothing_alpha", &m_segment_smoothing_alpha, 0.0f, 0.0f, "%.2f");
|
|
m_segment_smoothing_alpha = std::max(0.1, std::min(100.0, m_segment_smoothing_alpha));
|
|
ImGui::InputInt("segment number", &m_segment_number);
|
|
m_segment_number = std::max(1, m_segment_number);
|
|
m_imgui->disabled_end();
|
|
|
|
ImGui::Separator();
|
|
#endif
|
|
|
|
// Cut button
|
|
m_imgui->disabled_begin(!can_perform_cut());
|
|
if (m_imgui->button(_L("Perform cut")))
|
|
perform_cut(m_parent.get_selection());
|
|
m_imgui->disabled_end();
|
|
ImGui::SameLine();
|
|
const bool reset_clicked = m_imgui->button(_L("Reset"));
|
|
if (reset_clicked) { reset_all(); }
|
|
|
|
m_last_active_id = current_active_id;
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::init_connectors_input_window_data()
|
|
{
|
|
CutConnectors &connectors = m_c->selection_info()->model_object()->cut_connectors;
|
|
|
|
float connectors_cap = m_imgui->calc_text_size(_L("Connectors")).x;
|
|
float type_cap = m_imgui->calc_text_size(_L("Type")).x;
|
|
float style_cap = m_imgui->calc_text_size(_L("Style")).x;
|
|
float shape_cap = m_imgui->calc_text_size(_L("Shape")).x;
|
|
float depth_ratio_cap = m_imgui->calc_text_size(_L("Depth ratio")).x;
|
|
float size_cap = m_imgui->calc_text_size(_L("Size")).x;
|
|
float max_lable_size = std::max(std::max(std::max(connectors_cap, type_cap), std::max(style_cap, shape_cap)), std::max(depth_ratio_cap, size_cap));
|
|
|
|
m_label_width = double(max_lable_size + 3 + ImGui::GetStyle().WindowPadding.x);
|
|
m_control_width = m_imgui->get_font_size() * 9.f;
|
|
|
|
m_editing_window_width = 1.45 * m_control_width + 11;
|
|
|
|
if (m_connectors_editing && m_selected_count > 0) {
|
|
float depth_ratio {UndefFloat};
|
|
float depth_ratio_tolerance {UndefFloat};
|
|
float radius {UndefFloat};
|
|
float radius_tolerance {UndefFloat};
|
|
CutConnectorType type{CutConnectorType::Undef};
|
|
CutConnectorStyle style{CutConnectorStyle::Undef};
|
|
CutConnectorShape shape{CutConnectorShape::Undef};
|
|
|
|
bool is_init = false;
|
|
for (size_t idx = 0; idx < m_selected.size(); idx++)
|
|
if (m_selected[idx]) {
|
|
const CutConnector &connector = connectors[idx];
|
|
if (!is_init) {
|
|
depth_ratio = connector.height;
|
|
depth_ratio_tolerance = connector.height_tolerance;
|
|
radius = connector.radius;
|
|
radius_tolerance = connector.radius_tolerance;
|
|
type = connector.attribs.type;
|
|
style = connector.attribs.style;
|
|
shape = connector.attribs.shape;
|
|
|
|
if (m_selected_count == 1) break;
|
|
is_init = true;
|
|
} else {
|
|
if (!is_approx(depth_ratio, connector.height))
|
|
depth_ratio = UndefFloat;
|
|
if (!is_approx(depth_ratio_tolerance, connector.height_tolerance))
|
|
depth_ratio_tolerance = UndefFloat;
|
|
if (!is_approx(radius, connector.radius))
|
|
radius = UndefFloat;
|
|
if (!is_approx(radius_tolerance, connector.radius_tolerance))
|
|
radius_tolerance = UndefFloat;
|
|
|
|
if (type != connector.attribs.type)
|
|
type = CutConnectorType::Undef;
|
|
if (style != connector.attribs.style)
|
|
style = CutConnectorStyle::Undef;
|
|
if (shape != connector.attribs.shape)
|
|
shape = CutConnectorShape::Undef;
|
|
}
|
|
}
|
|
|
|
m_connector_depth_ratio = depth_ratio;
|
|
m_connector_depth_ratio_tolerance = depth_ratio_tolerance;
|
|
m_connector_size = 2.f * radius;
|
|
m_connector_size_tolerance = radius_tolerance;
|
|
m_connector_type = type;
|
|
m_connector_style = size_t(style);
|
|
m_connector_shape_id = size_t(shape);
|
|
}
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::render_connectors_input_window(float x, float y, float bottom_limit)
|
|
{
|
|
CutConnectors &connectors = m_c->selection_info()->model_object()->cut_connectors;
|
|
|
|
// update when change input window
|
|
m_imgui->set_requires_extra_frame();
|
|
|
|
ImGui::AlignTextToFramePadding();
|
|
m_imgui->text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, _L("Connectors"));
|
|
|
|
m_imgui->disabled_begin(connectors.empty());
|
|
ImGui::SameLine(m_label_width);
|
|
if (render_reset_button("connectors", _u8L("Remove connectors")))
|
|
reset_connectors();
|
|
m_imgui->disabled_end();
|
|
|
|
m_imgui->text(_L("Type"));
|
|
ImGui::PushStyleColor(ImGuiCol_CheckMark, ImVec4(0.00f, 0.00f, 0.00f, 1.00f));
|
|
bool type_changed = render_connect_type_radio_button(CutConnectorType::Plug);
|
|
type_changed |= render_connect_type_radio_button(CutConnectorType::Dowel);
|
|
if (type_changed)
|
|
apply_selected_connectors([this, &connectors](size_t idx) { connectors[idx].attribs.type = CutConnectorType(m_connector_type); });
|
|
ImGui::PopStyleColor(1);
|
|
|
|
std::vector<std::string> connector_styles = {_u8L("Prizm"), _u8L("Frustum")};
|
|
std::vector<std::string> connector_shapes = { _u8L("Triangle"), _u8L("Square"), _u8L("Hexagon"), _u8L("Circle") };
|
|
|
|
m_imgui->disabled_begin(m_connector_type == CutConnectorType::Dowel);
|
|
if (type_changed && m_connector_type == CutConnectorType::Dowel) {
|
|
m_connector_style = size_t(CutConnectorStyle::Prizm);
|
|
apply_selected_connectors([this, &connectors](size_t idx) { connectors[idx].attribs.style = CutConnectorStyle(m_connector_style); });
|
|
}
|
|
|
|
ImGuiWrapper::push_combo_style(m_parent.get_scale());
|
|
if (render_combo(_u8L("Style"), connector_styles, m_connector_style))
|
|
apply_selected_connectors([this, &connectors](size_t idx) { connectors[idx].attribs.style = CutConnectorStyle(m_connector_style); });
|
|
m_imgui->disabled_end();
|
|
ImGuiWrapper::pop_combo_style();
|
|
|
|
ImGuiWrapper::push_combo_style(m_parent.get_scale());
|
|
if (render_combo(_u8L("Shape"), connector_shapes, m_connector_shape_id))
|
|
apply_selected_connectors([this, &connectors](size_t idx) { connectors[idx].attribs.shape = CutConnectorShape(m_connector_shape_id); });
|
|
ImGuiWrapper::pop_combo_style();
|
|
|
|
if (render_slider_double_input(_u8L("Depth ratio"), m_connector_depth_ratio, m_connector_depth_ratio_tolerance))
|
|
apply_selected_connectors([this, &connectors](size_t idx) {
|
|
if (m_connector_depth_ratio > 0)
|
|
connectors[idx].height = m_connector_depth_ratio;
|
|
if (m_connector_depth_ratio_tolerance >= 0)
|
|
connectors[idx].height_tolerance = m_connector_depth_ratio_tolerance;
|
|
});
|
|
|
|
if (render_slider_double_input(_u8L("Size"), m_connector_size, m_connector_size_tolerance))
|
|
apply_selected_connectors([this, &connectors](size_t idx) {
|
|
if (m_connector_size > 0)
|
|
connectors[idx].radius = 0.5f * m_connector_size;
|
|
if (m_connector_size_tolerance >= 0)
|
|
connectors[idx].radius_tolerance = m_connector_size_tolerance;
|
|
});
|
|
|
|
ImGui::Separator();
|
|
|
|
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(6.0f, 10.0f));
|
|
float get_cur_y = ImGui::GetContentRegionMax().y + ImGui::GetFrameHeight() + y;
|
|
show_tooltip_information(x, get_cur_y);
|
|
|
|
float f_scale = m_parent.get_gizmos_manager().get_layout_scale();
|
|
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(6.0f, 4.0f * f_scale));
|
|
|
|
ImGui::SameLine();
|
|
if (m_imgui->button(_L("Confirm connectors"))) {
|
|
unselect_all_connectors();
|
|
set_connectors_editing(false);
|
|
}
|
|
|
|
ImGui::SameLine(m_label_width + m_editing_window_width - m_imgui->calc_text_size(_L("Cancel")).x - m_imgui->get_style_scaling() * 8);
|
|
|
|
if (m_imgui->button(_L("Cancel"))) {
|
|
reset_connectors();
|
|
set_connectors_editing(false);
|
|
}
|
|
|
|
ImGui::PopStyleVar(2);
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::render_input_window_warning() const
|
|
{
|
|
if (m_has_invalid_connector) {
|
|
wxString out = /*wxString(ImGui::WarningMarkerSmall)*/ _L("Warning") + ": " + _L("Invalid connectors detected") + ":";
|
|
if (m_info_stats.outside_cut_contour > size_t(0))
|
|
out += "\n - " + std::to_string(m_info_stats.outside_cut_contour) +
|
|
(m_info_stats.outside_cut_contour == 1 ? _L("connector is out of cut contour") : _L("connectors are out of cut contour"));
|
|
if (m_info_stats.outside_bb > size_t(0))
|
|
out += "\n - " + std::to_string(m_info_stats.outside_bb) +
|
|
(m_info_stats.outside_bb == 1 ? _L("connector is out of object") : _L("connectors is out of object"));
|
|
if (m_info_stats.is_overlap)
|
|
out += "\n - " + _L("Some connectors are overlapped");
|
|
m_imgui->text(out);
|
|
}
|
|
if (!m_keep_upper && !m_keep_lower) m_imgui->text(/*wxString(ImGui::WarningMarkerSmall)*/_L("Warning") + ": " + _L("Invalid state. \nNo one part is selected for keep after cut"));
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::render_reset_button(const std::string &label_id, const std::string &tooltip) const
|
|
{
|
|
const ImGuiStyle &style = ImGui::GetStyle();
|
|
|
|
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, {1, style.ItemSpacing.y});
|
|
|
|
ImGui::PushStyleColor(ImGuiCol_Button, {0.25f, 0.25f, 0.25f, 0.0f});
|
|
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, {0.4f, 0.4f, 0.4f, 1.0f});
|
|
ImGui::PushStyleColor(ImGuiCol_ButtonActive, {0.4f, 0.4f, 0.4f, 1.0f});
|
|
|
|
bool revert = m_imgui->button(wxString(ImGui::RevertBtn));
|
|
|
|
ImGui::PopStyleColor(3);
|
|
|
|
if (ImGui::IsItemHovered())
|
|
m_imgui->tooltip(tooltip.c_str(), ImGui::GetFontSize() * 20.0f);
|
|
|
|
ImGui::PopStyleVar();
|
|
|
|
return revert;
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::render_connect_type_radio_button(CutConnectorType type)
|
|
{
|
|
ImGui::SameLine(type == CutConnectorType::Plug ? m_label_width : 2 * m_label_width);
|
|
ImGui::PushItemWidth(m_control_width);
|
|
|
|
wxString radio_name;
|
|
switch (type) {
|
|
case CutConnectorType::Plug:
|
|
radio_name = _L("Plug");
|
|
break;
|
|
case CutConnectorType::Dowel:
|
|
radio_name = _L("Dowel");
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
if (m_imgui->radio_button(radio_name, m_connector_type == type)) {
|
|
m_connector_type = type;
|
|
update_connector_shape();
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::render_combo(const std::string &label, const std::vector<std::string> &lines, size_t &selection_idx)
|
|
{
|
|
ImGui::AlignTextToFramePadding();
|
|
m_imgui->text(label);
|
|
ImGui::SameLine(m_label_width);
|
|
ImGui::PushItemWidth(m_editing_window_width);
|
|
|
|
size_t selection_out = selection_idx;
|
|
|
|
const char* selected_str = (selection_idx >= 0 && selection_idx < int(lines.size())) ? lines[selection_idx].c_str() : "";
|
|
if (ImGui::BBLBeginCombo(("##" + label).c_str(), selected_str, 0)) {
|
|
for (size_t line_idx = 0; line_idx < lines.size(); ++line_idx) {
|
|
ImGui::PushID(int(line_idx));
|
|
if (ImGui::Selectable("", line_idx == selection_idx))
|
|
selection_out = line_idx;
|
|
|
|
ImGui::SameLine();
|
|
ImGui::Text("%s", lines[line_idx].c_str());
|
|
ImGui::PopID();
|
|
}
|
|
|
|
ImGui::EndCombo();
|
|
}
|
|
|
|
bool is_changed = selection_idx != selection_out;
|
|
selection_idx = selection_out;
|
|
|
|
if (is_changed) update_connector_shape();
|
|
|
|
return is_changed;
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::render_slider_double_input(const std::string &label, float &value_in, float &tolerance_in)
|
|
{
|
|
// -------- [ ] -------- [ ]
|
|
// slider_with + item_in_gap + first_input_width + item_out_gap + slider_with + item_in_gap + second_input_width
|
|
double slider_with = 0.24 * m_editing_window_width; // m_control_width * 0.35;
|
|
double item_in_gap = 0.01 * m_editing_window_width;
|
|
double item_out_gap = 0.04 * m_editing_window_width;
|
|
double first_input_width = 0.37 * m_editing_window_width;
|
|
double second_input_width = 0.37 * m_editing_window_width;
|
|
#ifdef __APPLE__
|
|
first_input_width = 0.5 * m_editing_window_width;
|
|
second_input_width = 0.5 * m_editing_window_width;
|
|
#endif
|
|
ImGui::AlignTextToFramePadding();
|
|
m_imgui->text(label);
|
|
ImGui::SameLine(m_label_width);
|
|
ImGui::PushItemWidth(slider_with);
|
|
|
|
double left_width = m_label_width + slider_with + item_in_gap;
|
|
|
|
bool m_imperial_units = false;
|
|
|
|
float value = value_in;
|
|
if (m_imperial_units) value *= float(units_mm_to_in);
|
|
float old_val = value;
|
|
|
|
constexpr float UndefMinVal = -0.1f;
|
|
|
|
const BoundingBoxf3 bbox = bounding_box();
|
|
float mean_size = float((bbox.size().x() + bbox.size().y() + bbox.size().z()) / 9.0);
|
|
float min_size = value_in < 0.f ? UndefMinVal : 2.f;
|
|
if (m_imperial_units) {
|
|
mean_size *= float(units_mm_to_in);
|
|
min_size *= float(units_mm_to_in);
|
|
}
|
|
std::string format = value_in < 0.f ? " " : m_imperial_units ? "%.4f " + _u8L("in") : "%.2f " + _u8L("mm");
|
|
|
|
m_imgui->bbl_slider_float_style(("##" + label).c_str(), &value, min_size, mean_size, format.c_str());
|
|
|
|
ImGui::SameLine(left_width);
|
|
ImGui::PushItemWidth(first_input_width);
|
|
ImGui::BBLDragFloat(("##input_" + label).c_str(), &value, 0.05f, min_size, mean_size, format.c_str());
|
|
|
|
value_in = value * float(m_imperial_units ? units_in_to_mm : 1.0);
|
|
|
|
left_width += (first_input_width + item_out_gap);
|
|
ImGui::SameLine(left_width);
|
|
ImGui::PushItemWidth(slider_with);
|
|
|
|
float tolerance = tolerance_in;
|
|
if (m_imperial_units)
|
|
tolerance *= float(units_mm_to_in);
|
|
float old_tolerance = tolerance;
|
|
//std::string format_t = tolerance_in < 0.f ? " " : "%.f %%";
|
|
float min_tolerance = tolerance_in < 0.f ? UndefMinVal : 0.f;
|
|
|
|
m_imgui->bbl_slider_float_style(("##tolerance_" + label).c_str(), &tolerance, min_tolerance, 2.f, format.c_str(), 1.f, true, _L("Tolerance"));
|
|
|
|
left_width += (slider_with + item_in_gap);
|
|
ImGui::SameLine(left_width);
|
|
ImGui::PushItemWidth(second_input_width);
|
|
ImGui::BBLDragFloat(("##tolerance_input_" + label).c_str(), &tolerance, 0.05f, min_tolerance, 2.f, format.c_str());
|
|
|
|
tolerance_in = tolerance * float(m_imperial_units ? units_in_to_mm : 1.0);
|
|
|
|
return !is_approx(old_val, value) || !is_approx(old_tolerance, tolerance);
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::cut_line_processing() const
|
|
{
|
|
return m_cut_line_begin != Vec3d::Zero();
|
|
}
|
|
|
|
void GLGizmoAdvancedCut::discard_cut_line_processing()
|
|
{
|
|
m_cut_line_begin = m_cut_line_end = Vec3d::Zero();
|
|
}
|
|
|
|
bool GLGizmoAdvancedCut::process_cut_line(SLAGizmoEventType action, const Vec2d &mouse_position)
|
|
{
|
|
const Camera &camera = wxGetApp().plater()->get_camera();
|
|
|
|
Vec3d pt;
|
|
Vec3d dir;
|
|
CameraUtils::ray_from_screen_pos(camera, mouse_position, pt, dir);
|
|
dir.normalize();
|
|
pt += dir; // Move the pt along dir so it is not clipped.
|
|
|
|
if (action == SLAGizmoEventType::LeftDown && !cut_line_processing()) {
|
|
m_cut_line_begin = pt;
|
|
m_cut_line_end = pt;
|
|
return true;
|
|
}
|
|
|
|
if (cut_line_processing()) {
|
|
m_cut_line_end = pt;
|
|
if (action == SLAGizmoEventType::LeftDown || action == SLAGizmoEventType::LeftUp) {
|
|
Vec3d line_dir = m_cut_line_end - m_cut_line_begin;
|
|
if (line_dir.norm() < 3.0)
|
|
return true;
|
|
Plater::TakeSnapshot snapshot(wxGetApp().plater(), "Cut by line");
|
|
|
|
Vec3d cross_dir = line_dir.cross(dir).normalized();
|
|
Eigen::Quaterniond q;
|
|
Transform3d m = Transform3d::Identity();
|
|
m.matrix().block(0, 0, 3, 3) = q.setFromTwoVectors(m_cut_plane_normal, cross_dir).toRotationMatrix();
|
|
|
|
m_rotate_matrix = m;
|
|
|
|
const ModelObject * mo = m_c->selection_info()->model_object();
|
|
const ModelInstance *mi = mo->instances[m_c->selection_info()->get_active_instance()];
|
|
Vec3d plane_center = get_plane_center();
|
|
|
|
auto update_plane_after_line_cut = [this](const Vec3d &deta_plane_center, const Transform3d& rotate_matrix) {
|
|
Vec3d plane_center = get_plane_center();
|
|
|
|
std::array<Vec3d, 4> plane_points_rot;
|
|
for (int i = 0; i < plane_points_rot.size(); i++) {
|
|
plane_points_rot[i] = m_cut_plane_points[i] - plane_center;
|
|
}
|
|
|
|
for (uint32_t i = 0; i < plane_points_rot.size(); ++i) {
|
|
plane_points_rot[i] = rotate_matrix * plane_points_rot[i];
|
|
}
|
|
|
|
for (int i = 0; i < plane_points_rot.size(); i++) {
|
|
m_cut_plane_points[i] = plane_points_rot[i] + plane_center + deta_plane_center;
|
|
}
|
|
};
|
|
|
|
update_plane_after_line_cut(cross_dir * (cross_dir.dot(pt - m_cut_plane_center)), m_rotate_matrix);
|
|
|
|
discard_cut_line_processing();
|
|
} else if (action == SLAGizmoEventType::Dragging)
|
|
this->set_dirty();
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
} // namespace GUI
|
|
} // namespace Slic3r
|