mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-14 09:02:06 +00: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 JIRA:github:2860 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>
1637 lines
81 KiB
C++
1637 lines
81 KiB
C++
// Polygon offsetting using Voronoi diagram prodiced by boost::polygon.
|
|
|
|
#include "Geometry.hpp"
|
|
#include "VoronoiOffset.hpp"
|
|
#include "libslic3r.h"
|
|
|
|
#include <cmath>
|
|
|
|
// #define VORONOI_DEBUG_OUT
|
|
|
|
#include <boost/polygon/detail/voronoi_ctypes.hpp>
|
|
|
|
#ifdef VORONOI_DEBUG_OUT
|
|
#include <libslic3r/VoronoiVisualUtils.hpp>
|
|
#endif
|
|
|
|
namespace Slic3r {
|
|
namespace Voronoi {
|
|
|
|
namespace detail {
|
|
// Intersect a circle with a ray, return the two parameters.
|
|
// Currently used for unbounded Voronoi edges only.
|
|
double first_circle_segment_intersection_parameter(
|
|
const Vec2d ¢er, const double r, const Vec2d &pt, const Vec2d &v)
|
|
{
|
|
const Vec2d d = pt - center;
|
|
#ifndef NDEBUG
|
|
// Start point should be inside, end point should be outside the circle.
|
|
double d0 = (pt - center).norm();
|
|
double d1 = (pt + v - center).norm();
|
|
assert(d0 < r + SCALED_EPSILON);
|
|
assert(d1 > r - SCALED_EPSILON);
|
|
#endif /* NDEBUG */
|
|
const double a = v.squaredNorm();
|
|
const double b = 2. * d.dot(v);
|
|
const double c = d.squaredNorm() - r * r;
|
|
std::pair<int, std::array<double, 2>> out;
|
|
double u = b * b - 4. * a * c;
|
|
assert(u > - EPSILON);
|
|
double t;
|
|
if (u <= 0) {
|
|
// Degenerate to a single closest point.
|
|
t = - b / (2. * a);
|
|
assert(t >= - EPSILON && t <= 1. + EPSILON);
|
|
return std::clamp(t, 0., 1.);
|
|
} else {
|
|
u = sqrt(u);
|
|
out.first = 2;
|
|
double t0 = (- b - u) / (2. * a);
|
|
double t1 = (- b + u) / (2. * a);
|
|
// One of the intersections shall be found inside the segment.
|
|
assert((t0 >= - EPSILON && t0 <= 1. + EPSILON) || (t1 >= - EPSILON && t1 <= 1. + EPSILON));
|
|
if (t1 < 0.)
|
|
return 0.;
|
|
if (t0 > 1.)
|
|
return 1.;
|
|
return (t0 > 0.) ? t0 : t1;
|
|
}
|
|
}
|
|
|
|
struct Intersections
|
|
{
|
|
int count;
|
|
Vec2d pts[2];
|
|
};
|
|
|
|
// Return maximum two points, that are at distance "d" from both points
|
|
Intersections point_point_equal_distance_points(const Point &pt1, const Point &pt2, const double d)
|
|
{
|
|
// Calculate the two intersection points.
|
|
// With the help of Python package sympy:
|
|
// res = solve([(x - cx)**2 + (y - cy)**2 - d**2, x**2 + y**2 - d**2], [x, y])
|
|
// ccode(cse((res[0][0], res[0][1], res[1][0], res[1][1])))
|
|
// where cx, cy is the center of pt1 relative to pt2,
|
|
// d is distance from the line and the point (0, 0).
|
|
// The result is then shifted to pt2.
|
|
auto cx = double(pt1.x() - pt2.x());
|
|
auto cy = double(pt1.y() - pt2.y());
|
|
double cl = cx * cx + cy * cy;
|
|
double discr = 4. * d * d - cl;
|
|
if (discr < 0.) {
|
|
// No intersection point found, the two circles are too far away.
|
|
return Intersections { 0, { Vec2d(), Vec2d() } };
|
|
}
|
|
// Avoid division by zero if a gets too small.
|
|
bool xy_swapped = std::abs(cx) < std::abs(cy);
|
|
if (xy_swapped)
|
|
std::swap(cx, cy);
|
|
double u;
|
|
int cnt;
|
|
if (discr == 0.) {
|
|
cnt = 1;
|
|
u = 0;
|
|
} else {
|
|
cnt = 2;
|
|
u = 0.5 * cx * sqrt(cl * discr) / cl;
|
|
}
|
|
double v = 0.5 * cy - u;
|
|
double w = 2. * cy;
|
|
double e = 0.5 / cx;
|
|
double f = 0.5 * cy + u;
|
|
Intersections out { cnt, { Vec2d(-e * (v * w - cl), v),
|
|
Vec2d(-e * (w * f - cl), f) } };
|
|
if (xy_swapped) {
|
|
std::swap(out.pts[0].x(), out.pts[0].y());
|
|
std::swap(out.pts[1].x(), out.pts[1].y());
|
|
}
|
|
out.pts[0] += pt2.cast<double>();
|
|
out.pts[1] += pt2.cast<double>();
|
|
|
|
assert(std::abs((out.pts[0] - pt1.cast<double>()).norm() - d) < SCALED_EPSILON);
|
|
assert(std::abs((out.pts[1] - pt1.cast<double>()).norm() - d) < SCALED_EPSILON);
|
|
assert(std::abs((out.pts[0] - pt2.cast<double>()).norm() - d) < SCALED_EPSILON);
|
|
assert(std::abs((out.pts[1] - pt2.cast<double>()).norm() - d) < SCALED_EPSILON);
|
|
return out;
|
|
}
|
|
|
|
// Return maximum two points, that are at distance "d" from both the line and point.
|
|
Intersections line_point_equal_distance_points(const Line &line, const Point &ipt, const double d)
|
|
{
|
|
assert(line.a != ipt && line.b != ipt);
|
|
// Calculating two points of distance "d" to a ray and a point.
|
|
// Point.
|
|
Vec2d pt = ipt.cast<double>();
|
|
Vec2d lv = (line.b - line.a).cast<double>();
|
|
double l2 = lv.squaredNorm();
|
|
Vec2d lpv = (line.a - ipt).cast<double>();
|
|
double c = cross2(lpv, lv);
|
|
if (c < 0) {
|
|
lv = - lv;
|
|
c = - c;
|
|
}
|
|
|
|
// Line equation (ax + by + c - d * sqrt(l2)).
|
|
auto a = - lv.y();
|
|
auto b = lv.x();
|
|
// Line point shifted by -ipt is on the line.
|
|
assert(std::abs(lpv.x() * a + lpv.y() * b + c) < SCALED_EPSILON);
|
|
// Line vector (a, b) points towards ipt.
|
|
assert(a * lpv.x() + b * lpv.y() < - SCALED_EPSILON);
|
|
|
|
#ifndef NDEBUG
|
|
{
|
|
// Foot point of ipt on line.
|
|
Vec2d ft = Geometry::foot_pt(line, ipt);
|
|
// Center point between ipt and line, its distance to both line and ipt is equal.
|
|
Vec2d centerpt = 0.5 * (ft + pt) - pt;
|
|
double dcenter = 0.5 * (ft - pt).norm();
|
|
// Verify that the center point
|
|
assert(std::abs(centerpt.x() * a + centerpt.y() * b + c - dcenter * sqrt(l2)) < SCALED_EPSILON * sqrt(l2));
|
|
}
|
|
#endif // NDEBUG
|
|
|
|
// Calculate the two intersection points.
|
|
// With the help of Python package sympy:
|
|
// res = solve([a * x + b * y + c - d * sqrt(a**2 + b**2), x**2 + y**2 - d**2], [x, y])
|
|
// ccode(cse((res[0][0], res[0][1], res[1][0], res[1][1])))
|
|
// where (a, b, c, d) is the line equation, not normalized (vector a,b is not normalized),
|
|
// d is distance from the line and the point (0, 0).
|
|
// The result is then shifted to ipt.
|
|
|
|
double dscaled = d * sqrt(l2);
|
|
double s = c * (2. * dscaled - c);
|
|
if (s < 0.)
|
|
// Distance of pt from line is bigger than 2 * d.
|
|
return Intersections { 0 };
|
|
double u;
|
|
int cnt;
|
|
// Avoid division by zero if a gets too small.
|
|
bool xy_swapped = std::abs(a) < std::abs(b);
|
|
if (xy_swapped)
|
|
std::swap(a, b);
|
|
if (s == 0.) {
|
|
// Distance of pt from line is 2 * d.
|
|
cnt = 1;
|
|
u = 0.;
|
|
} else {
|
|
// Distance of pt from line is smaller than 2 * d.
|
|
cnt = 2;
|
|
u = a * sqrt(s) / l2;
|
|
}
|
|
double e = dscaled - c;
|
|
double f = b * e / l2;
|
|
double g = f - u;
|
|
double h = f + u;
|
|
Intersections out { cnt, { Vec2d((- b * g + e) / a, g),
|
|
Vec2d((- b * h + e) / a, h) } };
|
|
if (xy_swapped) {
|
|
std::swap(out.pts[0].x(), out.pts[0].y());
|
|
std::swap(out.pts[1].x(), out.pts[1].y());
|
|
}
|
|
out.pts[0] += pt;
|
|
out.pts[1] += pt;
|
|
|
|
assert(std::abs(Geometry::ray_point_distance<Vec2d>(line.a.cast<double>(), (line.b - line.a).cast<double>(), out.pts[0]) - d) < SCALED_EPSILON);
|
|
assert(std::abs(Geometry::ray_point_distance<Vec2d>(line.a.cast<double>(), (line.b - line.a).cast<double>(), out.pts[1]) - d) < SCALED_EPSILON);
|
|
assert(std::abs((out.pts[0] - ipt.cast<double>()).norm() - d) < SCALED_EPSILON);
|
|
assert(std::abs((out.pts[1] - ipt.cast<double>()).norm() - d) < SCALED_EPSILON);
|
|
return out;
|
|
}
|
|
|
|
// Double vertex equal to a coord_t point after conversion to double.
|
|
template<typename VertexType>
|
|
inline bool vertex_equal_to_point(const VertexType &vertex, const Point &ipt)
|
|
{
|
|
// Convert ipt to doubles, force the 80bit FPU temporary to 64bit and then compare.
|
|
// This should work with any settings of math compiler switches and the C++ compiler
|
|
// shall understand the memcpies as type punning and it shall optimize them out.
|
|
#if 1
|
|
using ulp_cmp_type = boost::polygon::detail::ulp_comparison<double>;
|
|
ulp_cmp_type ulp_cmp;
|
|
static constexpr int ULPS = boost::polygon::voronoi_diagram_traits<double>::vertex_equality_predicate_type::ULPS;
|
|
return ulp_cmp(vertex.x(), double(ipt.x()), ULPS) == ulp_cmp_type::EQUAL &&
|
|
ulp_cmp(vertex.y(), double(ipt.y()), ULPS) == ulp_cmp_type::EQUAL;
|
|
#else
|
|
volatile double u = static_cast<double>(ipt.x());
|
|
volatile double v = vertex.x();
|
|
if (u != v)
|
|
return false;
|
|
u = static_cast<double>(ipt.y());
|
|
v = vertex.y();
|
|
return u == v;
|
|
#endif
|
|
};
|
|
bool vertex_equal_to_point(const VD::vertex_type *vertex, const Point &ipt)
|
|
{ return vertex_equal_to_point(*vertex, ipt); }
|
|
|
|
double dist_to_site(const Lines &lines, const VD::cell_type &cell, const Vec2d &point)
|
|
{
|
|
const Line &line = lines[cell.source_index()];
|
|
return cell.contains_point() ?
|
|
(((cell.source_category() == boost::polygon::SOURCE_CATEGORY_SEGMENT_START_POINT) ? line.a : line.b).cast<double>() - point).norm() :
|
|
(Geometry::foot_pt<Vec2d>(line.a.cast<double>(), (line.b - line.a).cast<double>(), point) - point).norm();
|
|
};
|
|
|
|
bool on_site(const Lines &lines, const VD::cell_type &cell, const Vec2d &pt)
|
|
{
|
|
const Line &line = lines[cell.source_index()];
|
|
auto on_contour = [&pt](const Point &ipt) { return detail::vertex_equal_to_point(pt, ipt); };
|
|
if (cell.contains_point()) {
|
|
return on_contour(contour_point(cell, line));
|
|
} else {
|
|
assert(! (on_contour(line.a) && on_contour(line.b)));
|
|
return on_contour(line.a) || on_contour(line.b);
|
|
}
|
|
};
|
|
|
|
// For a Voronoi segment starting with voronoi_point1 and ending with voronoi_point2,
|
|
// defined by a bisector of Voronoi sites pt1_site and pt2_site (line)
|
|
// find two points on the Voronoi bisector, that delimit regions with dr/dl measure
|
|
// lower / higher than threshold_dr_dl.
|
|
//
|
|
// Linear segment from voronoi_point1 to return.first and
|
|
// linear segment from return.second to voronoi_point2 have dr/dl measure
|
|
// higher than threshold_dr_dl.
|
|
// If such respective segment does not exist, then return.first resp. return.second is nan.
|
|
std::pair<Vec2d, Vec2d> point_point_dr_dl_thresholds(
|
|
// Two Voronoi sites
|
|
const Point &pt1_site, const Point &pt2_site,
|
|
// End points of a Voronoi segment
|
|
const Vec2d &voronoi_point1, const Vec2d &voronoi_point2,
|
|
// Threshold of the skeleton function, where alpha is an angle of a sharp convex corner with the same dr/dl.
|
|
const double threshold_tan_alpha_half)
|
|
{
|
|
// sympy code to calculate +-x
|
|
// of a linear bisector of pt1_site, pt2_site parametrized with pt + x * v, |v| = 1
|
|
// where dr/dl = threshold_dr_dl
|
|
// equals d|pt1_site - pt + x * v| / dx = threshold_dr_dl
|
|
//
|
|
// y = sqrt(x^2 + d^2)
|
|
// dy = diff(y, x)
|
|
// solve(dy - c, x)
|
|
//
|
|
// Project voronoi_point1/2 to line_site.
|
|
Vec2d dir_y = (pt2_site - pt1_site).cast<double>();
|
|
Vec2d dir_x = Vec2d(- dir_y.y(), dir_y.x()).normalized();
|
|
Vec2d cntr = 0.5 * (pt1_site.cast<double>() + pt2_site.cast<double>());
|
|
double t1 = (voronoi_point1 - cntr).dot(dir_x);
|
|
double t2 = (voronoi_point2 - cntr).dot(dir_x);
|
|
if (t1 > t2) {
|
|
t1 = -t1;
|
|
t2 = -t2;
|
|
dir_x = - dir_x;
|
|
}
|
|
auto x = 0.5 * dir_y.norm() * threshold_tan_alpha_half;
|
|
static constexpr double nan = std::numeric_limits<double>::quiet_NaN();
|
|
auto out = std::make_pair(Vec2d(nan, nan), Vec2d(nan, nan));
|
|
if (t2 > -x && t1 < x) {
|
|
// Intervals overlap.
|
|
dir_x *= x;
|
|
out.first = (t1 < -x) ? cntr - dir_x : voronoi_point1;
|
|
out.second = (t2 > +x) ? cntr + dir_x : voronoi_point2;
|
|
}
|
|
return out;
|
|
}
|
|
|
|
// For a Voronoi segment starting with voronoi_point1 and ending with voronoi_point2,
|
|
// defined by a bisector of Voronoi sites pt_site and line site (parabolic arc)
|
|
// find two points on the Voronoi parabolic arc, that delimit regions with dr/dl measure
|
|
// lower / higher than threshold_dr_dl.
|
|
//
|
|
// Parabolic arc from voronoi_point1 to return.first and
|
|
// parabolic arc from return.second to voronoi_point2 have dr/dl measure
|
|
// higher than threshold_dr_dl.
|
|
// If such respective segment does not exist, then return.first resp. return.second is nan.
|
|
std::pair<Vec2d, Vec2d> point_segment_dr_dl_thresholds(
|
|
// Two Voronoi sites
|
|
const Point &pt_site, const Line &line_site,
|
|
// End points of a Voronoi segment
|
|
const Vec2d &voronoi_point1, const Vec2d &voronoi_point2,
|
|
// Threshold of the skeleton function, where alpha is an angle of a sharp convex corner with the same dr/dl.
|
|
const double threshold_tan_alpha_half)
|
|
{
|
|
// sympy code to calculate +-x
|
|
// of a parabola y = ax^2 + b
|
|
// where dr/dl = threshold_dr_dl
|
|
//
|
|
// a = 1 / (4 * b)
|
|
// y = a*x**2 + b
|
|
// dy = diff(y, x)
|
|
// solve(dy / sqrt(1 + dy**2) - c, x)
|
|
//
|
|
// Foot point of the point site on the line site.
|
|
Vec2d ft = Geometry::foot_pt(line_site, pt_site);
|
|
// Minimum distance of the bisector (parabolic arc) from the two sites, squared.
|
|
Vec2d dir_pt_ft = pt_site.cast<double>() - ft;
|
|
double b = 0.5 * dir_pt_ft.norm();
|
|
static constexpr double nan = std::numeric_limits<double>::quiet_NaN();
|
|
auto out = std::make_pair(Vec2d(nan, nan), Vec2d(nan, nan));
|
|
{
|
|
// +x, -x are the two parameters along the line_site, where threshold_tan_alpha_half is met.
|
|
double x = 2. * b * threshold_tan_alpha_half;
|
|
// Project voronoi_point1/2 to line_site.
|
|
Vec2d dir_x = (line_site.b - line_site.a).cast<double>().normalized();
|
|
double t1 = (voronoi_point1 - ft).dot(dir_x);
|
|
double t2 = (voronoi_point2 - ft).dot(dir_x);
|
|
if (t1 > t2) {
|
|
t1 = -t1;
|
|
t2 = -t2;
|
|
dir_x = - dir_x;
|
|
}
|
|
if (t2 > -x && t1 < x) {
|
|
// Intervals overlap.
|
|
bool t1_valid = t1 < -x;
|
|
bool t2_valid = t2 > +x;
|
|
// Direction of the Y axis of the parabola.
|
|
Vec2d dir_y(- dir_x.y(), dir_x.x());
|
|
// Orient the Y axis towards the point site.
|
|
if (dir_y.dot(dir_pt_ft) < 0.)
|
|
dir_y = - dir_y;
|
|
// Equation of the parabola: y = b + a * x^2
|
|
double a = 0.25 / b;
|
|
dir_x *= x;
|
|
dir_y *= b + a * x * x;
|
|
out.first = t1_valid ? ft - dir_x + dir_y : voronoi_point1;
|
|
out.second = t2_valid ? ft + dir_x + dir_y : voronoi_point2;
|
|
}
|
|
}
|
|
return out;
|
|
}
|
|
|
|
std::pair<Vec2d, Vec2d> point_point_skeleton_thresholds(
|
|
// Two Voronoi sites
|
|
const Point &pt1_site, const Point &pt2_site,
|
|
// End points of a Voronoi segment
|
|
const Vec2d &voronoi_point1, const Vec2d &voronoi_point2,
|
|
// Threshold of the skeleton function.
|
|
const double tan_alpha_half)
|
|
{
|
|
// Project voronoi_point1/2 to line_site.
|
|
Vec2d dir_y = (pt2_site - pt1_site).cast<double>();
|
|
Vec2d dir_x = Vec2d(- dir_y.y(), dir_y.x()).normalized();
|
|
Vec2d cntr = 0.5 * (pt1_site.cast<double>() + pt2_site.cast<double>());
|
|
double t1 = (voronoi_point1 - cntr).dot(dir_x);
|
|
double t2 = (voronoi_point2 - cntr).dot(dir_x);
|
|
if (t1 > t2) {
|
|
t1 = -t1;
|
|
t2 = -t2;
|
|
dir_x = - dir_x;
|
|
}
|
|
auto x = 0.5 * dir_y.norm() * tan_alpha_half;
|
|
static constexpr double nan = std::numeric_limits<double>::quiet_NaN();
|
|
auto out = std::make_pair(Vec2d(nan, nan), Vec2d(nan, nan));
|
|
if (t2 > -x && t1 < x) {
|
|
// Intervals overlap.
|
|
dir_x *= x;
|
|
out.first = (t1 < -x) ? cntr - dir_x : voronoi_point1;
|
|
out.second = (t2 > +x) ? cntr + dir_x : voronoi_point2;
|
|
}
|
|
return out;
|
|
}
|
|
|
|
std::pair<Vec2d, Vec2d> point_segment_skeleton_thresholds(
|
|
// Two Voronoi sites
|
|
const Point &pt_site, const Line &line_site,
|
|
// End points of a Voronoi segment
|
|
const Vec2d &voronoi_point1, const Vec2d &voronoi_point2,
|
|
// Threshold of the skeleton function.
|
|
const double threshold_cos_alpha)
|
|
{
|
|
// Foot point of the point site on the line site.
|
|
Vec2d ft = Geometry::foot_pt(line_site, pt_site);
|
|
// Minimum distance of the bisector (parabolic arc) from the two sites, squared.
|
|
Vec2d dir_pt_ft = pt_site.cast<double>() - ft;
|
|
// Distance of Voronoi point site from the Voronoi line site.
|
|
double l = dir_pt_ft.norm();
|
|
static constexpr double nan = std::numeric_limits<double>::quiet_NaN();
|
|
auto out = std::make_pair(Vec2d(nan, nan), Vec2d(nan, nan));
|
|
// +x, -x are the two parameters along the line_site, where threshold is met.
|
|
double r = l / (1. + threshold_cos_alpha);
|
|
double x2 = r * r - Slic3r::sqr(l - r);
|
|
double x = sqrt(x2);
|
|
// Project voronoi_point1/2 to line_site.
|
|
Vec2d dir_x = (line_site.b - line_site.a).cast<double>().normalized();
|
|
double t1 = (voronoi_point1 - ft).dot(dir_x);
|
|
double t2 = (voronoi_point2 - ft).dot(dir_x);
|
|
if (t1 > t2) {
|
|
t1 = -t1;
|
|
t2 = -t2;
|
|
dir_x = - dir_x;
|
|
}
|
|
if (t2 > -x && t1 < x) {
|
|
// Intervals overlap.
|
|
bool t1_valid = t1 < -x;
|
|
bool t2_valid = t2 > +x;
|
|
// Direction of the Y axis of the parabola.
|
|
Vec2d dir_y(- dir_x.y(), dir_x.x());
|
|
// Orient the Y axis towards the point site.
|
|
if (dir_y.dot(dir_pt_ft) < 0.)
|
|
dir_y = - dir_y;
|
|
// Equation of the parabola: y = b + a * x^2
|
|
double a = 0.5 / l;
|
|
dir_x *= x;
|
|
dir_y *= 0.5 * l + a * x2;
|
|
out.first = t1_valid ? ft - dir_x + dir_y : voronoi_point1;
|
|
out.second = t2_valid ? ft + dir_x + dir_y : voronoi_point2;
|
|
}
|
|
return out;
|
|
}
|
|
|
|
} // namespace detail
|
|
|
|
#ifndef NDEBUG
|
|
namespace debug
|
|
{
|
|
// Verify that twin halfedges are stored next to the other in vd.
|
|
bool verify_twin_halfedges_successive(const VD &vd, const Lines &lines)
|
|
{
|
|
for (size_t i = 0; i < vd.num_edges(); i += 2) {
|
|
const VD::edge_type &e = vd.edges()[i];
|
|
const VD::edge_type &e2 = vd.edges()[i + 1];
|
|
assert(e.twin() == &e2);
|
|
assert(e2.twin() == &e);
|
|
assert(e.is_secondary() == e2.is_secondary());
|
|
if (e.is_secondary()) {
|
|
assert(e.cell()->contains_point() != e2.cell()->contains_point());
|
|
const VD::edge_type &ex = (e.cell()->contains_point() ? e : e2);
|
|
// Verify that the Point defining the cell left of ex is an end point of a segment
|
|
// defining the cell right of ex.
|
|
const Line &line0 = lines[ex.cell()->source_index()];
|
|
const Line &line1 = lines[ex.twin()->cell()->source_index()];
|
|
const Point &pt = (ex.cell()->source_category() == boost::polygon::SOURCE_CATEGORY_SEGMENT_START_POINT) ? line0.a : line0.b;
|
|
assert(pt == line1.a || pt == line1.b);
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool verify_inside_outside_annotations(const VD &vd)
|
|
{
|
|
// Verify that "Colors" are set at all Voronoi entities.
|
|
for (const VD::vertex_type &v : vd.vertices()) {
|
|
assert(! v.is_degenerate());
|
|
assert(vertex_category(v) != VertexCategory::Unknown);
|
|
}
|
|
for (const VD::edge_type &e : vd.edges())
|
|
assert(edge_category(e) != EdgeCategory::Unknown);
|
|
for (const VD::cell_type &c : vd.cells()) {
|
|
// Unfortunately denegerate cells could be created, which reference a null edge.
|
|
// https://github.com/boostorg/polygon/issues/47
|
|
assert(c.is_degenerate() || cell_category(c) != CellCategory::Unknown);
|
|
}
|
|
|
|
// Verify consistency between markings of Voronoi cells, edges and verticies.
|
|
for (const VD::cell_type &cell : vd.cells()) {
|
|
if (cell.is_degenerate()) {
|
|
// Unfortunately denegerate cells could be created, which reference a null edge.
|
|
// https://github.com/boostorg/polygon/issues/47
|
|
continue;
|
|
}
|
|
const VD::edge_type *first_edge = cell.incident_edge();
|
|
const VD::edge_type *edge = first_edge;
|
|
CellCategory cc = cell_category(cell);
|
|
size_t num_vertices_on_contour = 0;
|
|
size_t num_vertices_inside = 0;
|
|
size_t num_vertices_outside = 0;
|
|
size_t num_edges_point_to_contour = 0;
|
|
size_t num_edges_point_inside = 0;
|
|
size_t num_edges_point_outside = 0;
|
|
do {
|
|
{
|
|
EdgeCategory ec = edge_category(edge);
|
|
switch (ec) {
|
|
case EdgeCategory::PointsInside:
|
|
assert(edge->vertex0() != nullptr && edge->vertex1() != nullptr);
|
|
++ num_edges_point_inside; break;
|
|
case EdgeCategory::PointsOutside:
|
|
// assert(edge->vertex0() != nullptr);
|
|
++ num_edges_point_outside; break;
|
|
case EdgeCategory::PointsToContour:
|
|
assert(edge->vertex1() != nullptr);
|
|
++ num_edges_point_to_contour; break;
|
|
default:
|
|
assert(false);
|
|
}
|
|
}
|
|
{
|
|
VertexCategory vc = (edge->vertex1() == nullptr) ? VertexCategory::Outside : vertex_category(edge->vertex1());
|
|
switch (vc) {
|
|
case VertexCategory::Inside:
|
|
++ num_vertices_inside; break;
|
|
case VertexCategory::Outside:
|
|
++ num_vertices_outside; break;
|
|
case VertexCategory::OnContour:
|
|
++ num_vertices_on_contour; break;
|
|
default:
|
|
assert(false);
|
|
}
|
|
}
|
|
{
|
|
const VD::cell_type *cell_other = edge->twin()->cell();
|
|
const CellCategory cc_other = cell_category(cell_other);
|
|
assert(cc_other != CellCategory::Unknown);
|
|
switch (cc) {
|
|
case CellCategory::Boundary:
|
|
assert(cc_other != CellCategory::Boundary || cell_other->contains_segment());
|
|
break;
|
|
case CellCategory::Inside:
|
|
assert(cc_other == CellCategory::Inside || cc_other ==CellCategory::Boundary);
|
|
break;
|
|
case CellCategory::Outside:
|
|
assert(cc_other == CellCategory::Outside || cc_other == CellCategory::Boundary);
|
|
break;
|
|
default:
|
|
assert(false);
|
|
break;
|
|
}
|
|
}
|
|
edge = edge->next();
|
|
} while (edge != first_edge);
|
|
|
|
switch (cc) {
|
|
case CellCategory::Boundary:
|
|
assert(cell.contains_segment());
|
|
assert(num_edges_point_to_contour == 2);
|
|
assert(num_vertices_on_contour == 2);
|
|
assert(num_vertices_inside > 0);
|
|
assert(num_vertices_outside > 0);
|
|
assert(num_edges_point_inside > 0);
|
|
assert(num_edges_point_outside > 0);
|
|
break;
|
|
case CellCategory::Inside:
|
|
assert(num_vertices_on_contour <= 1);
|
|
assert(num_edges_point_to_contour <= 1);
|
|
assert(num_vertices_inside > 0);
|
|
assert(num_vertices_outside == 0);
|
|
assert(num_edges_point_inside > 0);
|
|
assert(num_edges_point_outside == 0);
|
|
break;
|
|
case CellCategory::Outside:
|
|
assert(num_vertices_on_contour <= 1);
|
|
assert(num_edges_point_to_contour <= 1);
|
|
assert(num_vertices_inside == 0);
|
|
assert(num_vertices_outside > 0);
|
|
assert(num_edges_point_inside == 0);
|
|
assert(num_edges_point_outside > 0);
|
|
break;
|
|
default:
|
|
assert(false);
|
|
break;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool verify_vertices_on_contour(const VD &vd, const Lines &lines)
|
|
{
|
|
for (const VD::edge_type &edge : vd.edges()) {
|
|
const VD::vertex_type *v = edge.vertex0();
|
|
if (v != nullptr) {
|
|
bool on_contour = vertex_category(v) == VertexCategory::OnContour;
|
|
assert(detail::on_site(lines, *edge.cell(), vertex_point(v)) == on_contour);
|
|
assert(detail::on_site(lines, *edge.twin()->cell(), vertex_point(v)) == on_contour);
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool verify_signed_distances(const VD &vd, const Lines &lines, const std::vector<double> &signed_distances)
|
|
{
|
|
for (const VD::edge_type &edge : vd.edges()) {
|
|
const VD::vertex_type *v = edge.vertex0();
|
|
double d = (v == nullptr) ? std::numeric_limits<double>::max() : signed_distances[v - &vd.vertices().front()];
|
|
if (v == nullptr || vertex_category(v) == VertexCategory::Outside)
|
|
assert(d > 0.);
|
|
else if (vertex_category(v) == VertexCategory::OnContour)
|
|
assert(d == 0.);
|
|
else
|
|
assert(d < 0.);
|
|
if (v != nullptr) {
|
|
double err = std::abs(detail::dist_to_site(lines, *edge.cell(), vertex_point(v)) - std::abs(d));
|
|
double err2 = std::abs(detail::dist_to_site(lines, *edge.twin()->cell(), vertex_point(v)) - std::abs(d));
|
|
assert(err < SCALED_EPSILON);
|
|
assert(err2 < SCALED_EPSILON);
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool verify_offset_intersection_points(const VD &vd, const Lines &lines, const double offset_distance, const std::vector<Vec2d> &offset_intersection_points)
|
|
{
|
|
const VD::edge_type *front_edge = &vd.edges().front();
|
|
const double d = std::abs(offset_distance);
|
|
for (const VD::edge_type &edge : vd.edges()) {
|
|
const Vec2d &p = offset_intersection_points[&edge - front_edge];
|
|
if (edge_offset_has_intersection(p)) {
|
|
double err = std::abs(detail::dist_to_site(lines, *edge.cell(), p) - d);
|
|
double err2 = std::abs(detail::dist_to_site(lines, *edge.twin()->cell(), p) - d);
|
|
assert(err < SCALED_EPSILON);
|
|
assert(err2 < SCALED_EPSILON);
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
}
|
|
#endif // NDEBUG
|
|
|
|
void reset_inside_outside_annotations(VD &vd)
|
|
{
|
|
for (const VD::vertex_type &v : vd.vertices())
|
|
set_vertex_category(const_cast<VD::vertex_type&>(v), VertexCategory::Unknown);
|
|
for (const VD::edge_type &e : vd.edges())
|
|
set_edge_category(const_cast<VD::edge_type&>(e), EdgeCategory::Unknown);
|
|
for (const VD::cell_type &c : vd.cells())
|
|
set_cell_category(const_cast<VD::cell_type&>(c), CellCategory::Unknown);
|
|
}
|
|
|
|
void annotate_inside_outside(VD &vd, const Lines &lines)
|
|
{
|
|
assert(debug::verify_twin_halfedges_successive(vd, lines));
|
|
|
|
reset_inside_outside_annotations(vd);
|
|
|
|
#ifdef VORONOI_DEBUG_OUT
|
|
BoundingBox bbox;
|
|
{
|
|
bbox.merge(get_extents(lines));
|
|
bbox.min -= (0.01 * bbox.size().cast<double>()).cast<coord_t>();
|
|
bbox.max += (0.01 * bbox.size().cast<double>()).cast<coord_t>();
|
|
}
|
|
static int irun = 0;
|
|
++ irun;
|
|
dump_voronoi_to_svg(debug_out_path("voronoi-offset-initial-%d.svg", irun).c_str(), vd, Points(), lines);
|
|
#endif // VORONOI_DEBUG_OUT
|
|
|
|
// Set a VertexCategory, verify validity of the operation.
|
|
auto annotate_vertex = [](const VD::vertex_type *vertex, VertexCategory new_vertex_category) {
|
|
#ifndef NDEBUG
|
|
VertexCategory vc = vertex_category(vertex);
|
|
assert(vc == VertexCategory::Unknown || vc == new_vertex_category);
|
|
assert(new_vertex_category == VertexCategory::Inside ||
|
|
new_vertex_category == VertexCategory::Outside ||
|
|
new_vertex_category == VertexCategory::OnContour);
|
|
#endif // NDEBUG
|
|
set_vertex_category(const_cast<VD::vertex_type*>(vertex), new_vertex_category);
|
|
};
|
|
|
|
// Set an EdgeCategory, verify validity of the operation.
|
|
auto annotate_edge = [](const VD::edge_type *edge, EdgeCategory new_edge_category) {
|
|
#ifndef NDEBUG
|
|
EdgeCategory ec = edge_category(edge);
|
|
assert(ec == EdgeCategory::Unknown || ec == new_edge_category);
|
|
switch (new_edge_category) {
|
|
case EdgeCategory::PointsInside:
|
|
assert(edge->vertex0() != nullptr);
|
|
assert(edge->vertex1() != nullptr);
|
|
break;
|
|
case EdgeCategory::PointsOutside:
|
|
// assert(edge->vertex0() != nullptr);
|
|
break;
|
|
case EdgeCategory::PointsToContour:
|
|
assert(edge->vertex1() != nullptr);
|
|
break;
|
|
default:
|
|
assert(false);
|
|
}
|
|
#endif // NDEBUG
|
|
set_edge_category(const_cast<VD::edge_type*>(edge), new_edge_category);
|
|
};
|
|
|
|
// Set a CellCategory, verify validity of the operation.
|
|
// Handle marking of boundary cells (first time the cell is marked as outside, the other time as inside).
|
|
// Returns true if the current cell category was modified.
|
|
auto annotate_cell = [](const VD::cell_type *cell, CellCategory new_cell_category) -> bool {
|
|
CellCategory cc = cell_category(cell);
|
|
assert(cc == CellCategory::Inside || cc == CellCategory::Outside || cc == CellCategory::Boundary || cc == CellCategory::Unknown);
|
|
assert(new_cell_category == CellCategory::Inside || new_cell_category == CellCategory::Outside || new_cell_category == CellCategory::Boundary);
|
|
switch (cc) {
|
|
case CellCategory::Unknown:
|
|
// Old category unknown, just write the new category.
|
|
break;
|
|
case CellCategory::Outside:
|
|
if (new_cell_category == CellCategory::Inside)
|
|
new_cell_category = CellCategory::Boundary;
|
|
break;
|
|
case CellCategory::Inside:
|
|
if (new_cell_category == CellCategory::Outside)
|
|
new_cell_category = CellCategory::Boundary;
|
|
break;
|
|
case CellCategory::Boundary:
|
|
return false;
|
|
}
|
|
if (cc != new_cell_category) {
|
|
set_cell_category(const_cast<VD::cell_type*>(cell), new_cell_category);
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
// The next loop is supposed to annotate the "on input contour" vertices, but due to
|
|
// merging very close Voronoi vertices together by boost::polygon Voronoi generator
|
|
// the condition may not always be met. It should be safe to mark all Voronoi very close
|
|
// to the input contour as on contour.
|
|
for (const VD::edge_type &edge : vd.edges()) {
|
|
const VD::vertex_type *v = edge.vertex0();
|
|
if (v != nullptr) {
|
|
bool on_contour = detail::on_site(lines, *edge.cell(), vertex_point(v));
|
|
#ifndef NDEBUG
|
|
bool on_contour2 = detail::on_site(lines, *edge.twin()->cell(), vertex_point(v));
|
|
assert(on_contour == on_contour2);
|
|
#endif // NDEBUG
|
|
if (on_contour)
|
|
annotate_vertex(v, VertexCategory::OnContour);
|
|
}
|
|
}
|
|
|
|
// One side of a secondary edge is always on the source contour. Mark these vertices as OnContour.
|
|
// See the comment at the loop before, the condition may not always be met.
|
|
for (const VD::edge_type &edge : vd.edges()) {
|
|
if (edge.is_secondary() && edge.vertex0() != nullptr) {
|
|
assert(edge.is_linear());
|
|
assert(edge.cell()->contains_point() != edge.twin()->cell()->contains_point());
|
|
// The point associated with the point site shall be equal with one vertex of this Voronoi edge.
|
|
const Point &pt_on_contour = edge.cell()->contains_point() ? contour_point(*edge.cell(), lines) : contour_point(*edge.twin()->cell(), lines);
|
|
auto on_contour = [&pt_on_contour](const VD::vertex_type *v) { return detail::vertex_equal_to_point(v, pt_on_contour); };
|
|
if (edge.vertex1() == nullptr) {
|
|
assert(on_contour(edge.vertex0()));
|
|
annotate_vertex(edge.vertex0(), VertexCategory::OnContour);
|
|
} else {
|
|
// Only one of the two vertices may lie on input contour.
|
|
const VD::vertex_type *v0 = edge.vertex0();
|
|
const VD::vertex_type *v1 = edge.vertex1();
|
|
#ifndef NDEBUG
|
|
VertexCategory v0_category = vertex_category(v0);
|
|
VertexCategory v1_category = vertex_category(v1);
|
|
assert(v0_category != VertexCategory::OnContour || v1_category != VertexCategory::OnContour);
|
|
assert(! (on_contour(v0) && on_contour(v1)));
|
|
#endif // NDEBUG
|
|
if (on_contour(v0))
|
|
annotate_vertex(v0, VertexCategory::OnContour);
|
|
else {
|
|
assert(on_contour(v1));
|
|
annotate_vertex(v1, VertexCategory::OnContour);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
assert(debug::verify_vertices_on_contour(vd, lines));
|
|
|
|
for (const VD::edge_type &edge : vd.edges())
|
|
if (edge.vertex1() == nullptr) {
|
|
// Infinite Voronoi edge separating two Point sites or a Point site and a Segment site.
|
|
// Infinite edge is always outside and it references at least one valid vertex.
|
|
assert(edge.is_infinite());
|
|
assert(edge.is_linear());
|
|
assert(edge.vertex0() != nullptr);
|
|
const VD::cell_type *cell = edge.cell();
|
|
const VD::cell_type *cell2 = edge.twin()->cell();
|
|
// A Point-Segment secondary Voronoi edge touches the input contour, a Point-Point Voronoi
|
|
// edge does not.
|
|
assert(edge.is_secondary() ? (cell->contains_segment() != cell2->contains_segment()) :
|
|
(cell->contains_point() == cell2->contains_point()));
|
|
annotate_edge(&edge, EdgeCategory::PointsOutside);
|
|
// Opposite edge of an infinite edge is certainly not active.
|
|
annotate_edge(edge.twin(), edge.is_secondary() ? EdgeCategory::PointsToContour : EdgeCategory::PointsOutside);
|
|
annotate_vertex(edge.vertex0(), edge.is_secondary() ? VertexCategory::OnContour : VertexCategory::Outside);
|
|
// edge.vertex1() is null, it is implicitely outside.
|
|
if (cell->contains_segment())
|
|
std::swap(cell, cell2);
|
|
// State of a cell containing a boundary point is certainly outside.
|
|
assert(cell->contains_point());
|
|
annotate_cell(cell, CellCategory::Outside);
|
|
assert(edge.is_secondary() == cell2->contains_segment());
|
|
annotate_cell(cell2, cell2->contains_point() ? CellCategory::Outside : CellCategory::Boundary);
|
|
} else if (edge.vertex0() != nullptr) {
|
|
assert(edge.is_finite());
|
|
const VD::cell_type *cell = edge.cell();
|
|
const Line *line = cell->contains_segment() ? &lines[cell->source_index()] : nullptr;
|
|
if (line == nullptr) {
|
|
cell = edge.twin()->cell();
|
|
line = cell->contains_segment() ? &lines[cell->source_index()] : nullptr;
|
|
}
|
|
// Only one of the two vertices may lie on input contour.
|
|
assert(! edge.is_linear() || vertex_category(edge.vertex0()) != VertexCategory::OnContour || vertex_category(edge.vertex1()) != VertexCategory::OnContour);
|
|
// Now classify the Voronoi vertices and edges as inside outside, if at least one Voronoi
|
|
// site is a Segment site.
|
|
// Inside / outside classification of Point - Point Voronoi edges will be done later
|
|
// by a propagation (seed fill).
|
|
if (line) {
|
|
const VD::vertex_type *v1 = edge.vertex1();
|
|
const VD::cell_type *cell2 = (cell == edge.cell()) ? edge.twin()->cell() : edge.cell();
|
|
assert(v1 != nullptr);
|
|
VertexCategory v0_category = vertex_category(edge.vertex0());
|
|
VertexCategory v1_category = vertex_category(edge.vertex1());
|
|
bool on_contour = v0_category == VertexCategory::OnContour || v1_category == VertexCategory::OnContour;
|
|
#ifndef NDEBUG
|
|
if (! on_contour && cell == edge.cell() && edge.twin()->cell()->contains_segment()) {
|
|
// Constrained bisector of two segments. Vojtech is not quite sure whether the Voronoi generator is robust enough
|
|
// to always connect at least one secondary edge to an input contour point. Catch it here.
|
|
assert(edge.is_linear());
|
|
// OnContour state of this edge is not known yet.
|
|
const Point *pt_on_contour = nullptr;
|
|
// If the two segments share a point, then one end of the current Voronoi edge shares this point as well.
|
|
// A bisector may not necessarily connect to the source contour. Find pt_on_contour if it exists.
|
|
const Line &line2 = lines[cell2->source_index()];
|
|
if (line->a == line2.b)
|
|
pt_on_contour = &line->a;
|
|
else if (line->b == line2.a)
|
|
pt_on_contour = &line->b;
|
|
if (pt_on_contour) {
|
|
const VD::vertex_type *v0 = edge.vertex0();
|
|
auto on_contour = [&pt_on_contour](const VD::vertex_type *v) {
|
|
return std::abs(v->x() - pt_on_contour->x()) < 0.5001 &&
|
|
std::abs(v->y() - pt_on_contour->y()) < 0.5001;
|
|
};
|
|
assert(! on_contour(v0) && ! on_contour(v1));
|
|
}
|
|
}
|
|
#endif // NDEBUG
|
|
if (on_contour && v1_category == VertexCategory::OnContour) {
|
|
// Skip secondary edge pointing to a contour point.
|
|
annotate_edge(&edge, EdgeCategory::PointsToContour);
|
|
} else {
|
|
// v0 is certainly not on the input polygons.
|
|
// Is v1 inside or outside the input polygons?
|
|
// The Voronoi vertex coordinate is in doubles, calculate orientation in doubles.
|
|
Vec2d l0(line->a.cast<double>());
|
|
Vec2d lv((line->b - line->a).cast<double>());
|
|
double side = cross2(Vec2d(v1->x(), v1->y()) - l0, lv);
|
|
// No Voronoi edge could connect two vertices of input polygons.
|
|
assert(side != 0.);
|
|
auto vc = side > 0. ? VertexCategory::Outside : VertexCategory::Inside;
|
|
annotate_vertex(v1, vc);
|
|
auto ec = vc == VertexCategory::Outside ? EdgeCategory::PointsOutside : EdgeCategory::PointsInside;
|
|
annotate_edge(&edge, ec);
|
|
// Annotate the twin edge and its vertex. As the Voronoi edge may never cross the input
|
|
// contour, the twin edge and its vertex will share the property of edge.
|
|
annotate_vertex(edge.vertex0(), on_contour ? VertexCategory::OnContour : vc);
|
|
annotate_edge(edge.twin(), on_contour ? EdgeCategory::PointsToContour : ec);
|
|
assert(cell->contains_segment());
|
|
annotate_cell(cell, on_contour ? CellCategory::Boundary :
|
|
(vc == VertexCategory::Outside ? CellCategory::Outside : CellCategory::Inside));
|
|
annotate_cell(cell2, (on_contour && cell2->contains_segment()) ? CellCategory::Boundary :
|
|
(vc == VertexCategory::Outside ? CellCategory::Outside : CellCategory::Inside));
|
|
}
|
|
}
|
|
}
|
|
|
|
assert(debug::verify_vertices_on_contour(vd, lines));
|
|
|
|
// Now most Voronoi vertices, edges and cells are annotated, with the exception of some
|
|
// edges separating two Point sites, their cells and vertices.
|
|
// Perform one round of expansion marking Voronoi edges and cells next to boundary cells.
|
|
std::vector<const VD::cell_type*> cell_queue;
|
|
for (const VD::edge_type &edge : vd.edges()) {
|
|
assert((edge_category(edge) == EdgeCategory::Unknown) == (edge_category(edge.twin()) == EdgeCategory::Unknown));
|
|
if (edge_category(edge) == EdgeCategory::Unknown) {
|
|
assert(edge.is_finite());
|
|
const VD::cell_type &cell = *edge.cell();
|
|
const VD::cell_type &cell2 = *edge.twin()->cell();
|
|
assert(cell.contains_point() && cell2.contains_point());
|
|
CellCategory cc = cell_category(cell);
|
|
CellCategory cc2 = cell_category(cell2);
|
|
assert(cc != CellCategory::Boundary && cc2 != CellCategory::Boundary);
|
|
CellCategory cc_new = cc;
|
|
if (cc_new == CellCategory::Unknown)
|
|
cc_new = cc2;
|
|
else
|
|
assert(cc2 == CellCategory::Unknown || cc == cc2);
|
|
if (cc_new == CellCategory::Unknown) {
|
|
VertexCategory vc = vertex_category(edge.vertex0());
|
|
assert(vc != VertexCategory::OnContour);
|
|
if (vc != VertexCategory::Unknown)
|
|
cc_new = (vc == VertexCategory::Outside) ? CellCategory::Outside : CellCategory::Inside;
|
|
}
|
|
if (cc_new != CellCategory::Unknown) {
|
|
VertexCategory vc = (cc_new == CellCategory::Outside) ? VertexCategory::Outside : VertexCategory::Inside;
|
|
annotate_vertex(edge.vertex0(), vc);
|
|
annotate_vertex(edge.vertex1(), vc);
|
|
auto ec_new = (cc_new == CellCategory::Outside) ? EdgeCategory::PointsOutside : EdgeCategory::PointsInside;
|
|
annotate_edge(&edge, ec_new);
|
|
annotate_edge(edge.twin(), ec_new);
|
|
if (cc != cc_new) {
|
|
annotate_cell(&cell, cc_new);
|
|
cell_queue.emplace_back(&cell);
|
|
}
|
|
if (cc2 != cc_new) {
|
|
annotate_cell(&cell2, cc_new);
|
|
cell_queue.emplace_back(&cell2);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
assert(debug::verify_vertices_on_contour(vd, lines));
|
|
|
|
// Do a final seed fill over Voronoi cells and unmarked Voronoi edges.
|
|
while (! cell_queue.empty()) {
|
|
const VD::cell_type *cell = cell_queue.back();
|
|
const CellCategory cc = cell_category(cell);
|
|
assert(cc == CellCategory::Outside || cc == CellCategory::Inside);
|
|
cell_queue.pop_back();
|
|
const VD::edge_type *first_edge = cell->incident_edge();
|
|
const VD::edge_type *edge = first_edge;
|
|
const auto ec_new = (cc == CellCategory::Outside) ? EdgeCategory::PointsOutside : EdgeCategory::PointsInside;
|
|
do {
|
|
EdgeCategory ec = edge_category(edge);
|
|
if (ec == EdgeCategory::Unknown) {
|
|
assert(edge->cell()->contains_point() && edge->twin()->cell()->contains_point());
|
|
annotate_edge(edge, ec_new);
|
|
annotate_edge(edge->twin(), ec_new);
|
|
const VD::cell_type *cell2 = edge->twin()->cell();
|
|
CellCategory cc2 = cell_category(cell2);
|
|
assert(cc2 == CellCategory::Unknown || cc2 == cc);
|
|
if (cc2 != cc) {
|
|
annotate_cell(cell2, cc);
|
|
cell_queue.emplace_back(cell2);
|
|
}
|
|
} else {
|
|
assert(edge->vertex0() == nullptr || vertex_category(edge->vertex0()) != VertexCategory::Unknown);
|
|
assert(edge->vertex1() == nullptr || vertex_category(edge->vertex1()) != VertexCategory::Unknown);
|
|
assert(edge_category(edge->twin()) != EdgeCategory::Unknown);
|
|
assert(cell_category(edge->cell()) != CellCategory::Unknown);
|
|
assert(cell_category(edge->twin()->cell()) != CellCategory::Unknown);
|
|
}
|
|
edge = edge->next();
|
|
} while (edge != first_edge);
|
|
}
|
|
|
|
assert(debug::verify_vertices_on_contour(vd, lines));
|
|
assert(debug::verify_inside_outside_annotations(vd));
|
|
}
|
|
|
|
std::vector<double> signed_vertex_distances(const VD &vd, const Lines &lines)
|
|
{
|
|
// vd shall be annotated.
|
|
assert(debug::verify_inside_outside_annotations(vd));
|
|
|
|
std::vector<double> out(vd.vertices().size(), 0.);
|
|
const VD::vertex_type *first_vertex = &vd.vertices().front();
|
|
for (const VD::vertex_type &vertex : vd.vertices()) {
|
|
const VertexCategory vc = vertex_category(vertex);
|
|
double dist;
|
|
if (vc == VertexCategory::OnContour) {
|
|
dist = 0.;
|
|
} else {
|
|
const VD::edge_type *first_edge = vertex.incident_edge();
|
|
const VD::edge_type *edge = first_edge;
|
|
const VD::cell_type *point_cell = nullptr;
|
|
do {
|
|
if (edge->cell()->contains_point()) {
|
|
point_cell = edge->cell();
|
|
break;
|
|
}
|
|
edge = edge->rot_next();
|
|
} while (edge != first_edge);
|
|
if (point_cell == 0) {
|
|
// Project vertex onto a contour segment.
|
|
const Line &line = lines[edge->cell()->source_index()];
|
|
dist = Geometry::ray_point_distance<Vec2d>(
|
|
line.a.cast<double>(), (line.b - line.a).cast<double>(), vertex_point(vertex));
|
|
} else {
|
|
// Distance to a contour point.
|
|
dist = (contour_point(*point_cell, lines).cast<double>() - vertex_point(vertex)).norm();
|
|
}
|
|
if (vc == VertexCategory::Inside)
|
|
dist = - dist;
|
|
}
|
|
out[&vertex - first_vertex] = dist;
|
|
}
|
|
|
|
assert(debug::verify_signed_distances(vd, lines, out));
|
|
|
|
return out;
|
|
}
|
|
|
|
std::vector<Vec2d> edge_offset_contour_intersections(
|
|
const VD &vd,
|
|
const Lines &lines,
|
|
const std::vector<double> &vertex_distances,
|
|
double offset_distance)
|
|
{
|
|
// vd shall be annotated.
|
|
assert(debug::verify_inside_outside_annotations(vd));
|
|
|
|
bool outside = offset_distance > 0;
|
|
if (! outside)
|
|
offset_distance = - offset_distance;
|
|
assert(offset_distance > 0.);
|
|
|
|
const VD::vertex_type *first_vertex = &vd.vertices().front();
|
|
const VD::edge_type *first_edge = &vd.edges().front();
|
|
static constexpr double nan = std::numeric_limits<double>::quiet_NaN();
|
|
// By default none edge has an intersection with the offset curve.
|
|
std::vector<Vec2d> out(vd.num_edges(), Vec2d(nan, 0.));
|
|
|
|
for (const VD::edge_type &edge : vd.edges()) {
|
|
size_t edge_idx = &edge - first_edge;
|
|
if (edge_offset_has_intersection(out[edge_idx]) || out[edge_idx].y() != 0.)
|
|
// This edge was already classified.
|
|
continue;
|
|
|
|
const VD::vertex_type *v0 = edge.vertex0();
|
|
const VD::vertex_type *v1 = edge.vertex1();
|
|
if (v0 == nullptr) {
|
|
assert(vertex_category(v1) == VertexCategory::OnContour || vertex_category(v1) == VertexCategory::Outside);
|
|
continue;
|
|
}
|
|
|
|
double d0 = (v0 == nullptr) ? std::numeric_limits<double>::max() : vertex_distances[v0 - first_vertex];
|
|
double d1 = (v1 == nullptr) ? std::numeric_limits<double>::max() : vertex_distances[v1 - first_vertex];
|
|
assert(d0 * d1 >= 0.);
|
|
if (! outside) {
|
|
d0 = - d0;
|
|
d1 = - d1;
|
|
}
|
|
#ifndef NDEBUG
|
|
{
|
|
double err = std::abs(detail::dist_to_site(lines, *edge.cell(), vertex_point(v0)) - std::abs(d0));
|
|
double err2 = std::abs(detail::dist_to_site(lines, *edge.twin()->cell(), vertex_point(v0)) - std::abs(d0));
|
|
assert(err < SCALED_EPSILON);
|
|
assert(err2 < SCALED_EPSILON);
|
|
if (v1 != nullptr) {
|
|
double err3 = std::abs(detail::dist_to_site(lines, *edge.cell(), vertex_point(v1)) - std::abs(d1));
|
|
double err4 = std::abs(detail::dist_to_site(lines, *edge.twin()->cell(), vertex_point(v1)) - std::abs(d1));
|
|
assert(err3 < SCALED_EPSILON);
|
|
assert(err4 < SCALED_EPSILON);
|
|
}
|
|
}
|
|
#endif // NDEBUG
|
|
double dmin, dmax;
|
|
if (d0 < d1)
|
|
dmin = d0, dmax = d1;
|
|
else
|
|
dmax = d0, dmin = d1;
|
|
// Offset distance may be lower than dmin, but never higher than dmax.
|
|
// Don't intersect an edge at dmax
|
|
// 1) To avoid zero edge length, zero area offset contours.
|
|
// 2) To ensure that the offset contours that cross a Voronoi vertex are traced consistently
|
|
// at one side of the offset curve only.
|
|
if (offset_distance >= dmax)
|
|
continue;
|
|
|
|
// Edge candidate, intersection points were not calculated yet.
|
|
assert(v0 != nullptr);
|
|
const VD::cell_type *cell = edge.cell();
|
|
const VD::cell_type *cell2 = edge.twin()->cell();
|
|
const Line &line0 = lines[cell->source_index()];
|
|
const Line &line1 = lines[cell2->source_index()];
|
|
size_t edge_idx2 = edge.twin() - first_edge;
|
|
if (v1 == nullptr) {
|
|
assert(edge.is_infinite());
|
|
assert(edge.is_linear());
|
|
// Unconstrained edges have always montonous distance.
|
|
assert(d0 != d1);
|
|
if (offset_distance > dmin) {
|
|
// There is certainly an intersection with the offset curve.
|
|
if (cell->contains_point() && cell2->contains_point()) {
|
|
assert(! edge.is_secondary());
|
|
const Point &pt0 = contour_point(*cell, line0);
|
|
const Point &pt1 = contour_point(*cell2, line1);
|
|
// pt is inside the circle (pt0, offset_distance), (pt + dir) is certainly outside the same circle.
|
|
Vec2d dir = Vec2d(double(pt0.y() - pt1.y()), double(pt1.x() - pt0.x())) * (2. * offset_distance);
|
|
Vec2d pt(v0->x(), v0->y());
|
|
double t = detail::first_circle_segment_intersection_parameter(Vec2d(pt0.x(), pt0.y()), offset_distance, pt, dir);
|
|
assert(t > 0.);
|
|
out[edge_idx] = pt + t * dir;
|
|
} else {
|
|
// Infinite edges could not be created by two segment sites.
|
|
assert(cell->contains_point() != cell2->contains_point());
|
|
// Linear edge goes through the endpoint of a segment.
|
|
assert(edge.is_secondary());
|
|
const Point &ipt = cell->contains_segment() ? contour_point(*cell2, line1) : contour_point(*cell, line0);
|
|
#ifndef NDEBUG
|
|
if (cell->contains_segment()) {
|
|
const Point &pt1 = contour_point(*cell2, line1);
|
|
assert(pt1 == line0.a || pt1 == line0.b);
|
|
} else {
|
|
const Point &pt0 = contour_point(*cell, line0);
|
|
assert(pt0 == line1.a || pt0 == line1.b);
|
|
}
|
|
assert((vertex_point(v0) - ipt.cast<double>()).norm() < SCALED_EPSILON);
|
|
#endif /* NDEBUG */
|
|
// Infinite edge starts at an input contour, therefore there is always an intersection with an offset curve.
|
|
const Line &line = cell->contains_segment() ? line0 : line1;
|
|
assert(line.a == ipt || line.b == ipt);
|
|
out[edge_idx] = ipt.cast<double>() + offset_distance * Vec2d(line.b.y() - line.a.y(), line.a.x() - line.b.x()).normalized();
|
|
}
|
|
} else if (offset_distance == dmin)
|
|
out[edge_idx] = vertex_point(v0);
|
|
// The other edge of an unconstrained edge starting with null vertex shall never be intersected. Mark it as visited.
|
|
out[edge_idx2].y() = 1.;
|
|
} else {
|
|
assert(edge.is_finite());
|
|
bool done = false;
|
|
// Bisector of two line segments, distance along the bisector is linear.
|
|
bool bisector = cell->contains_segment() && cell2->contains_segment();
|
|
assert(edge.is_finite());
|
|
// or a secondary line, again the distance along the secondary line is linear and starts at the contour (zero distance).
|
|
if (bisector || edge.is_secondary()) {
|
|
assert(edge.is_linear());
|
|
#ifndef NDEBUG
|
|
if (edge.is_secondary()) {
|
|
assert(cell->contains_point() != cell2->contains_point());
|
|
// One of the vertices is on the input contour.
|
|
assert((vertex_category(edge.vertex0()) == VertexCategory::OnContour) !=
|
|
(vertex_category(edge.vertex1()) == VertexCategory::OnContour));
|
|
assert(dmin == 0.);
|
|
}
|
|
#endif // NDEBUG
|
|
if (! bisector || (dmin != dmax && offset_distance >= dmin)) {
|
|
double t = (offset_distance - dmin) / (dmax - dmin);
|
|
t = std::clamp(t, 0., 1.);
|
|
if (d1 < d0) {
|
|
out[edge_idx2] = Slic3r::lerp(vertex_point(v1), vertex_point(v0), t);
|
|
// mark visited
|
|
out[edge_idx].y() = 1.;
|
|
} else {
|
|
out[edge_idx] = Slic3r::lerp(vertex_point(v0), vertex_point(v1), t);
|
|
// mark visited
|
|
out[edge_idx2].y() = 1.;
|
|
}
|
|
done = true;
|
|
}
|
|
} else {
|
|
// Point - Segment or Point - Point edge, distance along this Voronoi edge may not be monotonous:
|
|
// The distance function along the Voronoi edge may either have one maximum at one vertex and one minimum at the other vertex,
|
|
// or it may have two maxima at the vertices and a minimum somewhere along the Voronoi edge, and this Voronoi edge
|
|
// may be intersected twice by an offset curve.
|
|
//
|
|
// Tracing an offset curve accross Voronoi regions with linear edges of montonously increasing or decrasing distance
|
|
// to a Voronoi region is stable in a sense, that if the distance of Voronoi vertices is calculated correctly, there will
|
|
// be maximum one intersection of an offset curve found at each Voronoi edge and tracing these intersections shall
|
|
// produce a set of closed curves.
|
|
//
|
|
// Having a non-monotonous distance function between the Voronoi edge end points may lead to splitting of offset curves
|
|
// at these Voronoi edges. If a Voronoi edge is classified as having no intersection at all while it has some,
|
|
// the extracted offset curve will contain self intersections at this Voronoi edge.
|
|
//
|
|
// If on the other side the two intersection points are found by a numerical error even though none should be found, then
|
|
// it may happen that it would not be possible to connect these two points into a closed loop, which is likely worse
|
|
// than the issue above.
|
|
//
|
|
// While it is likely not possible to avoid all the numerical issues, one shall strive for the highest numerical robustness.
|
|
assert(cell->contains_point() || cell2->contains_point());
|
|
size_t num_intersections = 0;
|
|
bool point_vs_segment = cell->contains_point() != cell2->contains_point();
|
|
const Point &pt0 = cell->contains_point() ? contour_point(*cell, line0) : contour_point(*cell2, line1);
|
|
// Project p0 to line segment <v0, v1>.
|
|
Vec2d p0(v0->x(), v0->y());
|
|
Vec2d p1(v1->x(), v1->y());
|
|
Vec2d px(pt0.x(), pt0.y());
|
|
const Point *pt1 = nullptr;
|
|
Vec2d dir;
|
|
if (point_vs_segment) {
|
|
const Line &line = cell->contains_segment() ? line0 : line1;
|
|
dir = (line.b - line.a).cast<double>();
|
|
} else {
|
|
pt1 = &contour_point(*cell2, line1);
|
|
// Perpendicular to the (pt1 - pt0) direction.
|
|
dir = Vec2d(double(pt0.y() - pt1->y()), double(pt1->x() - pt0.x()));
|
|
}
|
|
double s0 = (p0 - px).dot(dir);
|
|
double s1 = (p1 - px).dot(dir);
|
|
if (offset_distance >= dmin) {
|
|
// This Voronoi edge is intersected by the offset curve just once.
|
|
// There may be numerical issues if dmin is close to the minimum of the non-monotonous distance function.
|
|
num_intersections = 1;
|
|
} else {
|
|
// This Voronoi edge may not be intersected by the offset curve, or it may split the offset curve
|
|
// into two loops. First classify this edge robustly with regard to the Point-Segment bisector or Point-Point bisector.
|
|
double dmin_new;
|
|
bool found = false;
|
|
if (point_vs_segment) {
|
|
if (s0 * s1 <= 0.) {
|
|
// One end of the Voronoi edge is on one side of the Point-Segment bisector, the other end of the Voronoi
|
|
// edge is on the other side of the bisector, therefore with a high probability we should find a minimum
|
|
// of the distance to a nearest site somewhere inside this Voronoi edge (at the intersection of the bisector
|
|
// and the Voronoi edge.
|
|
const Line &line = cell->contains_segment() ? line0 : line1;
|
|
dmin_new = 0.5 * (Geometry::foot_pt<Vec2d>(line.a.cast<double>(), dir, px) - px).norm();
|
|
found = true;
|
|
}
|
|
} else {
|
|
// Point-Point Voronoi sites.
|
|
if (s0 * s1 <= 0.) {
|
|
// This Voronoi edge intersects connection line of the two Point sites.
|
|
dmin_new = 0.5 * (pt1->cast<double>() - px).norm();
|
|
found = true;
|
|
}
|
|
}
|
|
if (found) {
|
|
assert(dmin_new < dmax + SCALED_EPSILON);
|
|
assert(dmin_new < dmin + SCALED_EPSILON);
|
|
if (dmin_new <= offset_distance) {
|
|
// 1) offset_distance > dmin_new -> two new distinct intersection points are found.
|
|
// 2) offset_distance == dmin_new -> one duplicate point is found.
|
|
// If 2) is ignored, then two tangentially touching offset curves are created.
|
|
// If not ignored, then the two offset curves merge at this double point.
|
|
// We should merge the contours while pushing the the two copies of the tangent point away a bit.
|
|
dmin = dmin_new;
|
|
num_intersections = (offset_distance > dmin) + 1;
|
|
}
|
|
}
|
|
}
|
|
if (num_intersections > 0) {
|
|
detail::Intersections intersections;
|
|
if (point_vs_segment) {
|
|
assert(cell->contains_point() || cell2->contains_point());
|
|
intersections = detail::line_point_equal_distance_points(cell->contains_segment() ? line0 : line1, pt0, offset_distance);
|
|
} else {
|
|
intersections = detail::point_point_equal_distance_points(pt0, *pt1, offset_distance);
|
|
}
|
|
// The functions above perform complex calculations in doubles, therefore the results may not be quite accurate and
|
|
// the number of intersections found may not be in accord to the number of intersections expected from evaluating simpler expressions.
|
|
// Adjust the result to the number of intersection points expected.
|
|
if (num_intersections == 2) {
|
|
switch (intersections.count) {
|
|
case 0:
|
|
// No intersection found even though one or two were expected to be found.
|
|
// Not trying to find the intersection means that we may produce offset curves, that intersect at this Voronoi edge.
|
|
//FIXME We are fine with that for now, but we may try to create artificial split points in further revisions.
|
|
break;
|
|
case 1:
|
|
// Tangential point found.
|
|
//FIXME We are fine with that for now, but we may try to create artificial split points in further revisions.
|
|
break;
|
|
default:
|
|
{
|
|
// Two intersection points found. Sort them.
|
|
assert(intersections.count == 2);
|
|
double q0 = (intersections.pts[0] - px).dot(dir);
|
|
double q1 = (intersections.pts[1] - px).dot(dir);
|
|
// Both Voronoi edge end points and offset contour intersection points should be separated by the bisector.
|
|
assert(q0 * q1 <= 0.);
|
|
assert(s0 * s1 <= 0.);
|
|
// Sort the intersection points by dir.
|
|
if ((q0 < q1) != (s0 < s1))
|
|
std::swap(intersections.pts[0], intersections.pts[1]);
|
|
}
|
|
}
|
|
} else {
|
|
assert(num_intersections == 1);
|
|
switch (intersections.count) {
|
|
case 0:
|
|
// No intersection found. This should not happen.
|
|
// Create one artificial intersection point by repeating the dmin point, which is supposed to be
|
|
// close to the minimum.
|
|
intersections.pts[0] = (dmin == d0) ? p0 : p1;
|
|
intersections.count = 1;
|
|
break;
|
|
case 1:
|
|
// One intersection found. This is a tangential point. Use it.
|
|
break;
|
|
default:
|
|
// Two intersections found.
|
|
// Now decide which of the point fall on this Voronoi edge.
|
|
assert(intersections.count == 2);
|
|
double q0 = (intersections.pts[0] - px).dot(dir);
|
|
double q1 = (intersections.pts[1] - px).dot(dir);
|
|
// Offset contour intersection points should be separated by the bisector.
|
|
assert(q0 * q1 <= 0);
|
|
double s = (dmax == d0) ? s0 : s1;
|
|
bool take_2nd = (s > 0.) ? q1 > q0 : q1 < q0;
|
|
if (take_2nd)
|
|
intersections.pts[0] = intersections.pts[1];
|
|
-- intersections.count;
|
|
}
|
|
}
|
|
assert(intersections.count > 0);
|
|
if (intersections.count == 2) {
|
|
out[edge_idx] = intersections.pts[1];
|
|
out[edge_idx2] = intersections.pts[0];
|
|
done = true;
|
|
} else if (intersections.count == 1) {
|
|
if (d1 < d0)
|
|
std::swap(edge_idx, edge_idx2);
|
|
out[edge_idx] = intersections.pts[0];
|
|
out[edge_idx2].y() = 1.;
|
|
done = true;
|
|
}
|
|
}
|
|
}
|
|
if (! done)
|
|
out[edge_idx].y() = out[edge_idx2].y() = 1.;
|
|
}
|
|
}
|
|
|
|
assert(debug::verify_offset_intersection_points(vd, lines, offset_distance, out));
|
|
|
|
return out;
|
|
}
|
|
|
|
Polygons offset(
|
|
const Geometry::VoronoiDiagram &vd,
|
|
const Lines &lines,
|
|
const std::vector<double> &signed_vertex_distances,
|
|
double offset_distance,
|
|
double discretization_error)
|
|
{
|
|
#ifdef VORONOI_DEBUG_OUT
|
|
BoundingBox bbox;
|
|
{
|
|
bbox.merge(get_extents(lines));
|
|
bbox.min -= (0.01 * bbox.size().cast<double>()).cast<coord_t>();
|
|
bbox.max += (0.01 * bbox.size().cast<double>()).cast<coord_t>();
|
|
}
|
|
static int irun = 0;
|
|
++ irun;
|
|
{
|
|
Lines helper_lines;
|
|
for (const VD::edge_type &edge : vd.edges())
|
|
if (edge_category(edge) == (offset_distance > 0 ? EdgeCategory::PointsOutside : EdgeCategory::PointsInside) &&
|
|
edge.vertex0() != nullptr) {
|
|
const VD::vertex_type *v0 = edge.vertex0();
|
|
const VD::vertex_type *v1 = edge.vertex1();
|
|
Vec2d pt1(v0->x(), v0->y());
|
|
Vec2d pt2;
|
|
if (v1 == nullptr) {
|
|
// Unconstrained edge. Calculate a trimmed position.
|
|
assert(edge.is_linear());
|
|
const VD::cell_type *cell = edge.cell();
|
|
const VD::cell_type *cell2 = edge.twin()->cell();
|
|
const Line &line0 = lines[cell->source_index()];
|
|
const Line &line1 = lines[cell2->source_index()];
|
|
if (cell->contains_point() && cell2->contains_point()) {
|
|
const Point &pt0 = (cell->source_category() == boost::polygon::SOURCE_CATEGORY_SEGMENT_START_POINT) ? line0.a : line0.b;
|
|
const Point &pt1 = (cell2->source_category() == boost::polygon::SOURCE_CATEGORY_SEGMENT_START_POINT) ? line1.a : line1.b;
|
|
// Direction vector of this unconstrained Voronoi edge.
|
|
Vec2d dir(double(pt0.y() - pt1.y()), double(pt1.x() - pt0.x()));
|
|
pt2 = Vec2d(v0->x(), v0->y()) + dir.normalized() * scale_(10.);
|
|
} else {
|
|
// Infinite edges could not be created by two segment sites.
|
|
assert(cell->contains_point() != cell2->contains_point());
|
|
// Linear edge goes through the endpoint of a segment.
|
|
assert(edge.is_secondary());
|
|
const Point &ipt = cell->contains_segment() ?
|
|
((cell2->source_category() == boost::polygon::SOURCE_CATEGORY_SEGMENT_START_POINT) ? line1.a : line1.b) :
|
|
((cell->source_category() == boost::polygon::SOURCE_CATEGORY_SEGMENT_START_POINT) ? line0.a : line0.b);
|
|
// Infinite edge starts at an input contour, therefore there is always an intersection with an offset curve.
|
|
const Line &line = cell->contains_segment() ? line0 : line1;
|
|
assert(line.a == ipt || line.b == ipt);
|
|
// dir is perpendicular to line.
|
|
Vec2d dir(line.a.y() - line.b.y(), line.b.x() - line.a.x());
|
|
assert(dir.norm() > 0.);
|
|
if (((line.a == ipt) == cell->contains_point()) == (v0 == nullptr))
|
|
dir = - dir;
|
|
pt2 = ipt.cast<double>() + dir.normalized() * scale_(10.);
|
|
}
|
|
} else {
|
|
pt2 = Vec2d(v1->x(), v1->y());
|
|
// Clip the line by the bounding box, so that the coloring of the line will be visible.
|
|
Geometry::liang_barsky_line_clipping(pt1, pt2, BoundingBoxf(bbox.min.cast<double>(), bbox.max.cast<double>()));
|
|
}
|
|
helper_lines.emplace_back(Line(Point(pt1.cast<coord_t>()), Point(((pt1 + pt2) * 0.5).cast<coord_t>())));
|
|
}
|
|
dump_voronoi_to_svg(debug_out_path("voronoi-offset-candidates1-%d.svg", irun).c_str(), vd, Points(), lines, Polygons(), helper_lines);
|
|
}
|
|
#endif // VORONOI_DEBUG_OUT
|
|
|
|
std::vector<Vec2d> edge_points = edge_offset_contour_intersections(vd, lines, signed_vertex_distances, offset_distance);
|
|
const VD::edge_type *front_edge = &vd.edges().front();
|
|
|
|
#ifdef VORONOI_DEBUG_OUT
|
|
Lines helper_lines;
|
|
{
|
|
for (const VD::edge_type &edge : vd.edges())
|
|
if (edge_offset_has_intersection(edge_points[&edge - front_edge]))
|
|
helper_lines.emplace_back(Line(Point(edge.vertex0()->x(), edge.vertex0()->y()), Point(edge_points[&edge - front_edge].cast<coord_t>())));
|
|
dump_voronoi_to_svg(debug_out_path("voronoi-offset-candidates2-%d.svg", irun).c_str(), vd, Points(), lines, Polygons(), helper_lines);
|
|
}
|
|
#endif // VORONOI_DEBUG_OUT
|
|
|
|
auto next_offset_edge = [&edge_points, front_edge](const VD::edge_type *start_edge) -> const VD::edge_type* {
|
|
for (const VD::edge_type *edge = start_edge->next(); edge != start_edge; edge = edge->next())
|
|
if (edge_offset_has_intersection(edge_points[edge->twin() - front_edge]))
|
|
return edge->twin();
|
|
// assert(false);
|
|
return nullptr;
|
|
};
|
|
|
|
const bool inside_offset = offset_distance < 0.;
|
|
if (inside_offset)
|
|
offset_distance = - offset_distance;
|
|
|
|
// Track the offset curves.
|
|
Polygons out;
|
|
double angle_step = 2. * acos((offset_distance - discretization_error) / offset_distance);
|
|
double cos_threshold = cos(angle_step);
|
|
static constexpr double nan = std::numeric_limits<double>::quiet_NaN();
|
|
for (size_t seed_edge_idx = 0; seed_edge_idx < vd.num_edges(); ++ seed_edge_idx) {
|
|
Vec2d last_pt = edge_points[seed_edge_idx];
|
|
if (edge_offset_has_intersection(last_pt)) {
|
|
const VD::edge_type *start_edge = &vd.edges()[seed_edge_idx];
|
|
const VD::edge_type *edge = start_edge;
|
|
Polygon poly;
|
|
do {
|
|
// find the next edge
|
|
const VD::edge_type *next_edge = next_offset_edge(edge);
|
|
#ifdef VORONOI_DEBUG_OUT
|
|
if (next_edge == nullptr) {
|
|
Lines hl = helper_lines;
|
|
append(hl, to_lines(Polyline(poly.points)));
|
|
dump_voronoi_to_svg(debug_out_path("voronoi-offset-open-loop-%d.svg", irun).c_str(), vd, Points(), lines, Polygons(), hl);
|
|
}
|
|
#endif // VORONOI_DEBUG_OUT
|
|
assert(next_edge);
|
|
//std::cout << "offset-output: "; print_edge(edge); std::cout << " to "; print_edge(next_edge); std::cout << "\n";
|
|
// Interpolate a circular segment or insert a linear segment between edge and next_edge.
|
|
const VD::cell_type *cell = edge->cell();
|
|
// Mark the edge / offset curve intersection point as consumed.
|
|
Vec2d p1 = last_pt;
|
|
Vec2d p2 = edge_points[next_edge - front_edge];
|
|
edge_points[next_edge - front_edge].x() = nan;
|
|
#ifndef NDEBUG
|
|
{
|
|
double err = detail::dist_to_site(lines, *cell, p1) - offset_distance;
|
|
double err2 = detail::dist_to_site(lines, *cell, p2) - offset_distance;
|
|
#ifdef VORONOI_DEBUG_OUT
|
|
if (std::max(err, err2) >= SCALED_EPSILON) {
|
|
Lines helper_lines;
|
|
dump_voronoi_to_svg(debug_out_path("voronoi-offset-incorrect_pt-%d.svg", irun).c_str(), vd, Points(), lines, Polygons(), to_lines(poly));
|
|
}
|
|
#endif // VORONOI_DEBUG_OUT
|
|
assert(std::abs(err) < SCALED_EPSILON);
|
|
assert(std::abs(err2) < SCALED_EPSILON);
|
|
}
|
|
#endif /* NDEBUG */
|
|
if (cell->contains_point()) {
|
|
// Discretize an arc from p1 to p2 with radius = offset_distance and discretization_error.
|
|
// The extracted contour is CCW oriented, extracted holes are CW oriented.
|
|
// The extracted arc will have the same orientation. As the Voronoi regions are convex, the angle covered by the arc will be convex as well.
|
|
const Line &line0 = lines[cell->source_index()];
|
|
const Vec2d ¢er = ((cell->source_category() == boost::polygon::SOURCE_CATEGORY_SEGMENT_START_POINT) ? line0.a : line0.b).cast<double>();
|
|
const Vec2d v1 = p1 - center;
|
|
const Vec2d v2 = p2 - center;
|
|
bool ccw = cross2(v1, v2) > 0;
|
|
double cos_a = v1.dot(v2);
|
|
double norm = v1.norm() * v2.norm();
|
|
assert(norm > 0.);
|
|
if (cos_a < cos_threshold * norm) {
|
|
// Angle is bigger than the threshold, therefore the arc will be discretized.
|
|
cos_a /= norm;
|
|
assert(cos_a > -1. - EPSILON && cos_a < 1. + EPSILON);
|
|
double angle = acos(std::max(-1., std::min(1., cos_a)));
|
|
size_t n_steps = size_t(ceil(angle / angle_step));
|
|
double astep = angle / n_steps;
|
|
if (! ccw)
|
|
astep *= -1.;
|
|
double a = astep;
|
|
for (size_t i = 1; i < n_steps; ++ i, a += astep) {
|
|
double c = cos(a);
|
|
double s = sin(a);
|
|
Vec2d p = center + Vec2d(c * v1.x() - s * v1.y(), s * v1.x() + c * v1.y());
|
|
poly.points.emplace_back(Point(coord_t(p.x()), coord_t(p.y())));
|
|
}
|
|
}
|
|
}
|
|
{
|
|
Point pt_last(coord_t(p2.x()), coord_t(p2.y()));
|
|
if (poly.empty() || poly.points.back() != pt_last)
|
|
poly.points.emplace_back(pt_last);
|
|
}
|
|
edge = next_edge;
|
|
last_pt = p2;
|
|
} while (edge != start_edge);
|
|
|
|
while (! poly.empty() && poly.points.front() == poly.points.back())
|
|
poly.points.pop_back();
|
|
if (poly.size() >= 3)
|
|
out.emplace_back(std::move(poly));
|
|
}
|
|
}
|
|
|
|
return out;
|
|
}
|
|
|
|
Polygons offset(
|
|
const VD &vd,
|
|
const Lines &lines,
|
|
double offset_distance,
|
|
double discretization_error)
|
|
{
|
|
annotate_inside_outside(const_cast<VD&>(vd), lines);
|
|
std::vector<double> dist = signed_vertex_distances(vd, lines);
|
|
return offset(vd, lines, dist, offset_distance, discretization_error);
|
|
}
|
|
|
|
// Produce a list of start positions of a skeleton segment at a halfedge.
|
|
// If the whole Voronoi edge is part of the skeleton, then zero start positions are assigned
|
|
// to both ends of the edge. Position "1" shall never be assigned to a halfedge.
|
|
//
|
|
// Skeleton edges must be inside a closed polygon, therefore these edges are finite.
|
|
// A Voronoi Edge-Edge bisector is either completely part of a skeleton, or not at all.
|
|
// An infinite Voronoi Edge-Point (parabola) or Point-Point (line) bisector is split into
|
|
// a center part close to the Voronoi sites (not skeleton) and the ends (skeleton),
|
|
// though either part could be clipped by the Voronoi segment.
|
|
//
|
|
// Further filtering of the skeleton may be necessary.
|
|
std::vector<Vec2d> skeleton_edges_rough(
|
|
const VD &vd,
|
|
const Lines &lines,
|
|
// Angle threshold at a sharp convex corner, which is marked for a gap fill.
|
|
const double threshold_alpha)
|
|
{
|
|
// vd shall be annotated.
|
|
assert(debug::verify_inside_outside_annotations(vd));
|
|
|
|
const VD::edge_type *first_edge = &vd.edges().front();
|
|
static constexpr double nan = std::numeric_limits<double>::quiet_NaN();
|
|
// By default no edge is annotated as being part of the skeleton.
|
|
std::vector<Vec2d> out(vd.num_edges(), Vec2d(nan, nan));
|
|
// Threshold at a sharp corner, derived from a dot product of the sharp corner edges.
|
|
const double threshold_cos_alpha = cos(threshold_alpha);
|
|
// For sharp corners, dr/dl = sin(alpha/2). Substituting the dr/dl threshold with tan(alpha/2) threshold
|
|
// in Voronoi point - point and Voronoi point - line site functions.
|
|
const double threshold_tan_alpha_half = tan(0.5 * threshold_alpha);
|
|
|
|
for (const VD::edge_type &edge : vd.edges()) {
|
|
size_t edge_idx = &edge - first_edge;
|
|
if (
|
|
// Ignore secondary and unbounded edges, they shall never be part of the skeleton.
|
|
edge.is_secondary() || edge.is_infinite() ||
|
|
// Skip the twin edge of an edge, that has already been processed.
|
|
&edge > edge.twin() ||
|
|
// Ignore outer edges.
|
|
(edge_category(edge) != EdgeCategory::PointsInside && edge_category(edge.twin()) != EdgeCategory::PointsInside))
|
|
continue;
|
|
const VD::vertex_type *v0 = edge.vertex0();
|
|
const VD::vertex_type *v1 = edge.vertex1();
|
|
const VD::cell_type *cell = edge.cell();
|
|
const VD::cell_type *cell2 = edge.twin()->cell();
|
|
const Line &line0 = lines[cell->source_index()];
|
|
const Line &line1 = lines[cell2->source_index()];
|
|
size_t edge_idx2 = edge.twin() - first_edge;
|
|
if (cell->contains_segment() && cell2->contains_segment()) {
|
|
// Bisector of two line segments, distance along the bisector is linear,
|
|
// dr/dl is constant.
|
|
// using trigonometric identity sin^2(a) = (1-cos(2a))/2
|
|
Vec2d lv0 = (line0.b - line0.a).cast<double>();
|
|
Vec2d lv1 = (line1.b - line1.a).cast<double>();
|
|
double d = lv0.dot(lv1);
|
|
if (d < 0.) {
|
|
double cos_alpha = - d / (lv0.norm() * lv1.norm());
|
|
if (cos_alpha > threshold_cos_alpha) {
|
|
// The whole bisector is a skeleton segment.
|
|
out[edge_idx] = vertex_point(v0);
|
|
out[edge_idx2] = vertex_point(v1);
|
|
}
|
|
}
|
|
} else {
|
|
// An infinite Voronoi Edge-Point (parabola) or Point-Point (line) bisector, clipped to a finite Voronoi segment.
|
|
// The infinite bisector has a distance (skeleton radius) minimum, which is also a minimum
|
|
// of the skeleton function dr / dt.
|
|
assert(cell->contains_point() || cell2->contains_point());
|
|
if (cell->contains_point() != cell2->contains_point()) {
|
|
// Point - Segment
|
|
const Point &pt0 = cell->contains_point() ? contour_point(*cell, line0) : contour_point(*cell2, line1);
|
|
const Line &line = cell->contains_segment() ? line0 : line1;
|
|
std::tie(out[edge_idx], out[edge_idx2]) = detail::point_segment_dr_dl_thresholds(
|
|
pt0, line, vertex_point(v0), vertex_point(v1), threshold_tan_alpha_half);
|
|
} else {
|
|
// Point - Point
|
|
const Point &pt0 = contour_point(*cell, line0);
|
|
const Point &pt1 = contour_point(*cell2, line1);
|
|
std::tie(out[edge_idx], out[edge_idx2]) = detail::point_point_dr_dl_thresholds(
|
|
pt0, pt1, vertex_point(v0), vertex_point(v1), threshold_tan_alpha_half);
|
|
}
|
|
}
|
|
}
|
|
|
|
#ifdef VORONOI_DEBUG_OUT
|
|
{
|
|
static int irun = 0;
|
|
++ irun;
|
|
Lines helper_lines;
|
|
for (const VD::edge_type &edge : vd.edges())
|
|
if (&edge < edge.twin() && edge.is_finite()) {
|
|
const Vec2d &skeleton_pt = out[&edge - first_edge];
|
|
const Vec2d &skeleton_pt2 = out[edge.twin() - first_edge];
|
|
bool has_skeleton_pt = ! std::isnan(skeleton_pt.x());
|
|
bool has_skeleton_pt2 = ! std::isnan(skeleton_pt2.x());
|
|
const Vec2d &vertex_pt = vertex_point(edge.vertex0());
|
|
const Vec2d &vertex_pt2 = vertex_point(edge.vertex1());
|
|
if (has_skeleton_pt && has_skeleton_pt2) {
|
|
// Complete edge is part of the skeleton.
|
|
helper_lines.emplace_back(Line(Point(vertex_pt.x(), vertex_pt.y()), Point(vertex_pt2.x(), vertex_pt2.y())));
|
|
} else {
|
|
if (has_skeleton_pt)
|
|
helper_lines.emplace_back(Line(Point(vertex_pt2.x(), vertex_pt2.y()), Point(skeleton_pt.x(), skeleton_pt.y())));
|
|
if (has_skeleton_pt2)
|
|
helper_lines.emplace_back(Line(Point(vertex_pt.x(), vertex_pt.y()), Point(skeleton_pt2.x(), skeleton_pt2.y())));
|
|
}
|
|
}
|
|
dump_voronoi_to_svg(debug_out_path("voronoi-skeleton-edges-%d.svg", irun).c_str(), vd, Points(), lines, Polygons(), helper_lines);
|
|
}
|
|
#endif // VORONOI_DEBUG_OUT
|
|
|
|
return out;
|
|
}
|
|
|
|
} // namespace Voronoi
|
|
} // namespace Slic3r
|