From 0558b53493a77bae44831cf87bb0f59359828ef5 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Wed, 19 Sep 2018 11:02:24 +0200 Subject: [PATCH] WIP: Moved sources int src/, separated most of the source code from Perl. The XS was left only for the unit / integration tests, and it links libslic3r only. No wxWidgets are allowed to be used from Perl starting from now. --- CMakeLists.txt | 198 +- resources/localization/CMakeLists.txt | 8 + src/CMakeLists.txt | 65 + src/Shiny/CMakeLists.txt | 25 + {xs/src => src}/Shiny/Shiny.h | 0 {xs/src => src}/Shiny/ShinyConfig.h | 0 {xs/src => src}/Shiny/ShinyData.h | 0 {xs/src => src}/Shiny/ShinyMacros.h | 0 {xs/src => src}/Shiny/ShinyManager.c | 0 {xs/src => src}/Shiny/ShinyManager.h | 0 {xs/src => src}/Shiny/ShinyNode.c | 0 {xs/src => src}/Shiny/ShinyNode.h | 0 {xs/src => src}/Shiny/ShinyNodePool.c | 0 {xs/src => src}/Shiny/ShinyNodePool.h | 0 {xs/src => src}/Shiny/ShinyNodeState.c | 0 {xs/src => src}/Shiny/ShinyNodeState.h | 0 {xs/src => src}/Shiny/ShinyOutput.c | 0 {xs/src => src}/Shiny/ShinyOutput.h | 0 {xs/src => src}/Shiny/ShinyPrereqs.h | 0 {xs/src => src}/Shiny/ShinyTools.c | 0 {xs/src => src}/Shiny/ShinyTools.h | 0 {xs/src => src}/Shiny/ShinyVersion.h | 0 {xs/src => src}/Shiny/ShinyZone.c | 0 {xs/src => src}/Shiny/ShinyZone.h | 0 src/admesh/CMakeLists.txt | 12 + {xs/src => src}/admesh/connect.cpp | 0 {xs/src => src}/admesh/normals.cpp | 0 {xs/src => src}/admesh/shared.cpp | 0 {xs/src => src}/admesh/stl.h | 0 {xs/src => src}/admesh/stl_io.cpp | 0 {xs/src => src}/admesh/stlinit.cpp | 0 {xs/src => src}/admesh/util.cpp | 0 {xs/src => src}/agg/AUTHORS | 0 {xs/src => src}/agg/VERSION | 0 {xs/src => src}/agg/agg_array.h | 0 {xs/src => src}/agg/agg_basics.h | 0 {xs/src => src}/agg/agg_bezier_arc.h | 0 {xs/src => src}/agg/agg_clip_liang_barsky.h | 0 {xs/src => src}/agg/agg_color_gray.h | 0 {xs/src => src}/agg/agg_color_rgba.h | 0 {xs/src => src}/agg/agg_config.h | 0 {xs/src => src}/agg/agg_conv_transform.h | 0 {xs/src => src}/agg/agg_gamma_functions.h | 0 {xs/src => src}/agg/agg_gamma_lut.h | 0 {xs/src => src}/agg/agg_math.h | 0 {xs/src => src}/agg/agg_path_storage.h | 0 {xs/src => src}/agg/agg_pixfmt_base.h | 0 {xs/src => src}/agg/agg_pixfmt_gray.h | 0 {xs/src => src}/agg/agg_pixfmt_rgb.h | 0 {xs/src => src}/agg/agg_rasterizer_cells_aa.h | 0 .../agg/agg_rasterizer_scanline_aa.h | 0 .../agg/agg_rasterizer_scanline_aa_nogamma.h | 0 {xs/src => src}/agg/agg_rasterizer_sl_clip.h | 0 {xs/src => src}/agg/agg_renderer_base.h | 0 {xs/src => src}/agg/agg_renderer_scanline.h | 0 {xs/src => src}/agg/agg_rendering_buffer.h | 0 {xs/src => src}/agg/agg_scanline_p.h | 0 {xs/src => src}/agg/agg_trans_affine.h | 0 {xs/src => src}/agg/copying | 0 {xs/src => src}/avrdude/AUTHORS | 0 {xs/src => src}/avrdude/BUILD-FROM-SVN | 0 {xs/src => src}/avrdude/CMakeLists.txt | 0 {xs/src => src}/avrdude/COPYING | 0 {xs/src => src}/avrdude/ChangeLog | 0 {xs/src => src}/avrdude/ChangeLog-2001 | 0 {xs/src => src}/avrdude/ChangeLog-2002 | 0 {xs/src => src}/avrdude/ChangeLog-2003 | 0 {xs/src => src}/avrdude/ChangeLog-2004-2006 | 0 {xs/src => src}/avrdude/ChangeLog-2007 | 0 {xs/src => src}/avrdude/ChangeLog-2008 | 0 {xs/src => src}/avrdude/ChangeLog-2009 | 0 {xs/src => src}/avrdude/ChangeLog-2010 | 0 {xs/src => src}/avrdude/ChangeLog-2011 | 0 {xs/src => src}/avrdude/ChangeLog-2012 | 0 {xs/src => src}/avrdude/ChangeLog-2013 | 0 {xs/src => src}/avrdude/ChangeLog-2014 | 0 {xs/src => src}/avrdude/ChangeLog-2015 | 0 {xs/src => src}/avrdude/Makefile.am | 0 {xs/src => src}/avrdude/Makefile.standalone | 0 {xs/src => src}/avrdude/NEWS | 0 {xs/src => src}/avrdude/README | 0 {xs/src => src}/avrdude/ac_cfg.h | 0 {xs/src => src}/avrdude/ac_cfg.h.in | 0 {xs/src => src}/avrdude/arduino.c | 0 {xs/src => src}/avrdude/arduino.h | 0 {xs/src => src}/avrdude/atmel-docs/AVR109.pdf | Bin {xs/src => src}/avrdude/atmel-docs/AVR910.pdf | Bin .../avrdude/atmel-docs/AVRISPmkII-AVR069.pdf | Bin .../atmel-docs/EDBG/common/browserDetect.js | 0 .../atmel-docs/EDBG/common/css/960.css | 0 .../atmel-docs/EDBG/common/css/docbook.css | 0 .../atmel-docs/EDBG/common/css/fluid_grid.css | 0 .../atmel-docs/EDBG/common/css/index.css | 0 .../EDBG/common/css/positioning.css | 0 .../atmel-docs/EDBG/common/css/print.css | 0 .../atmel-docs/EDBG/common/css/reset.css | 0 .../atmel-docs/EDBG/common/css/text.css | 0 .../EDBG/common/fonts/DroidSansMono.eot | Bin .../EDBG/common/fonts/DroidSansMono.ttf | Bin .../EDBG/common/images/Book_Closed.png | Bin .../EDBG/common/images/Book_Open.png | Bin .../EDBG/common/images/Document_Text.png | Bin .../atmel-docs/EDBG/common/images/Library.png | Bin .../EDBG/common/images/external_link.gif | Bin .../atmel-docs/EDBG/common/images/loading.gif | Bin .../atmel-docs/EDBG/common/images/logo.png | Bin .../atmel-docs/EDBG/common/images/minus.png | Bin .../EDBG/common/images/next-arrow.png | Bin .../atmel-docs/EDBG/common/images/plus.png | Bin .../EDBG/common/images/previous-arrow.png | Bin .../EDBG/common/images/search-icon.png | Bin .../atmel-docs/EDBG/common/images/sidebar.png | Bin .../EDBG/common/images/starsSmall.png | Bin .../EDBG/common/images/toc-icon.png | Bin .../common/images/ui-icons_217bc0_256x240.png | Bin .../EDBG/common/jquery/jquery-1.7.2.min.js | 0 .../EDBG/common/jquery/jquery.cookie.js | 0 .../EDBG/common/jquery/jquery.ui.all.js | 0 .../common/jquery/layout/jquery.layout.js | 0 .../images/ui-anim_basic_16x16.gif | Bin .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../images/ui-bg_flat_55_fbec88_40x100.png | Bin .../images/ui-bg_glass_75_d0e5f5_1x400.png | Bin .../images/ui-bg_glass_85_dfeffc_1x400.png | Bin .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin .../ui-bg_gloss-wave_55_5c9ccc_500x100.png | Bin .../ui-bg_inset-hard_100_f5f8f9_1x100.png | Bin .../ui-bg_inset-hard_100_fcfdfd_1x100.png | Bin .../images/ui-icons_217bc0_256x240.png | Bin .../images/ui-icons_2e83ff_256x240.png | Bin .../images/ui-icons_469bdd_256x240.png | Bin .../images/ui-icons_6da8d5_256x240.png | Bin .../images/ui-icons_cd0a0a_256x240.png | Bin .../images/ui-icons_d8e7f3_256x240.png | Bin .../images/ui-icons_f9bd01_256x240.png | Bin .../theme-redmond/jquery-ui-1.8.2.custom.css | 0 .../common/jquery/treeview/images/file.gif | Bin .../jquery/treeview/images/folder-closed.gif | Bin .../common/jquery/treeview/images/folder.gif | Bin .../treeview/images/treeview-black-line.gif | Bin .../jquery/treeview/images/treeview-black.gif | Bin .../treeview/images/treeview-default-line.gif | Bin .../treeview/images/treeview-default.gif | Bin .../images/treeview-famfamfam-line.gif | Bin .../treeview/images/treeview-famfamfam.gif | Bin .../treeview/images/treeview-gray-line.gif | Bin .../jquery/treeview/images/treeview-gray.gif | Bin .../treeview/images/treeview-red-line.gif | Bin .../jquery/treeview/images/treeview-red.gif | Bin .../jquery/treeview/jquery.treeview.css | 0 .../jquery/treeview/jquery.treeview.min.js | 0 .../avrdude/atmel-docs/EDBG/common/main.js | 0 .../atmel-docs/EDBG/common/splitterInit.js | 0 .../atmel-docs/EDBG/protocoldocs/ch01s01.html | 0 .../atmel-docs/EDBG/protocoldocs/ch01s02.html | 0 .../atmel-docs/EDBG/protocoldocs/ch02s01.html | 0 .../atmel-docs/EDBG/protocoldocs/ch02s02.html | 0 .../EDBG/protocoldocs/ch02s02s01.html | 0 .../EDBG/protocoldocs/ch02s02s02.html | 0 .../EDBG/protocoldocs/ch02s02s02s01.html | 0 .../EDBG/protocoldocs/ch02s02s02s02.html | 0 .../EDBG/protocoldocs/ch02s02s03.html | 0 .../EDBG/protocoldocs/ch02s02s03s01.html | 0 .../EDBG/protocoldocs/ch02s02s03s02.html | 0 .../EDBG/protocoldocs/ch02s02s03s03.html | 0 .../EDBG/protocoldocs/ch02s02s03s04.html | 0 .../EDBG/protocoldocs/ch02s03s01.html | 0 .../EDBG/protocoldocs/ch02s03s02.html | 0 .../EDBG/protocoldocs/ch02s03s03.html | 0 .../EDBG/protocoldocs/ch02s03s04.html | 0 .../EDBG/protocoldocs/ch02s03s05.html | 0 .../EDBG/protocoldocs/ch02s03s06.html | 0 .../EDBG/protocoldocs/ch02s03s07.html | 0 .../EDBG/protocoldocs/ch02s03s08.html | 0 .../EDBG/protocoldocs/ch02s03s09.html | 0 .../atmel-docs/EDBG/protocoldocs/ch02s04.html | 0 .../EDBG/protocoldocs/ch02s04s01.html | 0 .../EDBG/protocoldocs/ch02s04s02.html | 0 .../EDBG/protocoldocs/ch02s04s03.html | 0 .../atmel-docs/EDBG/protocoldocs/ch03s01.html | 0 .../EDBG/protocoldocs/ch03s01s01.html | 0 .../EDBG/protocoldocs/ch03s01s02.html | 0 .../EDBG/protocoldocs/ch03s01s03.html | 0 .../EDBG/protocoldocs/ch03s01s03s01.html | 0 .../atmel-docs/EDBG/protocoldocs/ch03s02.html | 0 .../EDBG/protocoldocs/ch03s02s01.html | 0 .../EDBG/protocoldocs/ch03s02s02.html | 0 .../EDBG/protocoldocs/ch03s02s03.html | 0 .../EDBG/protocoldocs/ch03s02s04.html | 0 .../atmel-docs/EDBG/protocoldocs/ch04s01.html | 0 .../atmel-docs/EDBG/protocoldocs/ch04s02.html | 0 .../atmel-docs/EDBG/protocoldocs/ch04s03.html | 0 .../atmel-docs/EDBG/protocoldocs/ch04s04.html | 0 .../EDBG/protocoldocs/ch04s04s01.html | 0 .../EDBG/protocoldocs/ch04s04s03.html | 0 .../EDBG/protocoldocs/ch04s04s04.html | 0 .../EDBG/protocoldocs/ch04s04s05.html | 0 .../atmel-docs/EDBG/protocoldocs/ch04s05.html | 0 .../EDBG/protocoldocs/ch04s05s01.html | 0 .../EDBG/protocoldocs/ch04s05s03.html | 0 .../EDBG/protocoldocs/ch04s05s04.html | 0 .../EDBG/protocoldocs/ch04s05s06.html | 0 .../EDBG/protocoldocs/ch04s05s06s02.html | 0 .../EDBG/protocoldocs/ch04s05s06s03.html | 0 .../EDBG/protocoldocs/ch04s05s06s04.html | 0 .../EDBG/protocoldocs/ch04s05s06s05.html | 0 .../EDBG/protocoldocs/ch04s05s07.html | 0 .../EDBG/protocoldocs/ch04s05s07s01.html | 0 .../EDBG/protocoldocs/ch04s05s07s02.html | 0 .../EDBG/protocoldocs/ch04s05s07s03.html | 0 .../EDBG/protocoldocs/ch04s05s07s04.html | 0 .../EDBG/protocoldocs/ch04s05s08.html | 0 .../EDBG/protocoldocs/ch04s05s08s01.html | 0 .../EDBG/protocoldocs/ch04s05s08s02.html | 0 .../EDBG/protocoldocs/ch04s05s08s03.html | 0 .../EDBG/protocoldocs/ch04s05s09.html | 0 .../EDBG/protocoldocs/ch04s05s10.html | 0 .../atmel-docs/EDBG/protocoldocs/ch05s01.html | 0 .../EDBG/protocoldocs/ch05s01s01.html | 0 .../EDBG/protocoldocs/ch05s01s02.html | 0 .../EDBG/protocoldocs/ch05s01s03.html | 0 .../EDBG/protocoldocs/ch05s01s04.html | 0 .../EDBG/protocoldocs/ch05s01s05.html | 0 .../EDBG/protocoldocs/ch05s01s06.html | 0 .../EDBG/protocoldocs/ch05s01s07.html | 0 .../EDBG/protocoldocs/ch05s01s08.html | 0 .../EDBG/protocoldocs/ch05s01s09.html | 0 .../EDBG/protocoldocs/ch05s01s10.html | 0 .../EDBG/protocoldocs/ch05s01s11.html | 0 .../EDBG/protocoldocs/ch05s01s12.html | 0 .../EDBG/protocoldocs/ch05s01s13.html | 0 .../EDBG/protocoldocs/ch05s01s14.html | 0 .../EDBG/protocoldocs/ch05s01s15.html | 0 .../atmel-docs/EDBG/protocoldocs/ch05s02.html | 0 .../EDBG/protocoldocs/ch05s02s01.html | 0 .../EDBG/protocoldocs/ch05s02s02.html | 0 .../EDBG/protocoldocs/ch05s02s03.html | 0 .../EDBG/protocoldocs/ch05s02s04.html | 0 .../EDBG/protocoldocs/ch05s02s05.html | 0 .../EDBG/protocoldocs/ch05s02s06.html | 0 .../atmel-docs/EDBG/protocoldocs/ch05s03.html | 0 .../EDBG/protocoldocs/ch05s03s01.html | 0 .../EDBG/protocoldocs/ch05s03s02.html | 0 .../EDBG/protocoldocs/ch05s03s03.html | 0 .../atmel-docs/EDBG/protocoldocs/ch05s04.html | 0 .../atmel-docs/EDBG/protocoldocs/ch06s01.html | 0 .../EDBG/protocoldocs/ch06s01s01.html | 0 .../EDBG/protocoldocs/ch06s01s02.html | 0 .../EDBG/protocoldocs/ch06s01s03.html | 0 .../EDBG/protocoldocs/ch06s01s04.html | 0 .../EDBG/protocoldocs/ch06s01s05.html | 0 .../EDBG/protocoldocs/ch06s01s06.html | 0 .../EDBG/protocoldocs/ch06s01s07.html | 0 .../EDBG/protocoldocs/ch06s01s08.html | 0 .../EDBG/protocoldocs/ch06s01s09.html | 0 .../EDBG/protocoldocs/ch06s01s10.html | 0 .../EDBG/protocoldocs/ch06s01s11.html | 0 .../EDBG/protocoldocs/ch06s01s12.html | 0 .../EDBG/protocoldocs/ch06s01s13.html | 0 .../EDBG/protocoldocs/ch06s01s14.html | 0 .../EDBG/protocoldocs/ch06s01s15.html | 0 .../EDBG/protocoldocs/ch06s01s16.html | 0 .../EDBG/protocoldocs/ch06s01s17.html | 0 .../EDBG/protocoldocs/ch06s01s18.html | 0 .../EDBG/protocoldocs/ch06s01s19.html | 0 .../EDBG/protocoldocs/ch06s01s20.html | 0 .../EDBG/protocoldocs/ch06s01s21.html | 0 .../EDBG/protocoldocs/ch06s01s22.html | 0 .../EDBG/protocoldocs/ch06s01s23.html | 0 .../EDBG/protocoldocs/ch06s01s24.html | 0 .../EDBG/protocoldocs/ch06s01s25.html | 0 .../EDBG/protocoldocs/ch06s01s26.html | 0 .../EDBG/protocoldocs/ch06s01s27.html | 0 .../EDBG/protocoldocs/ch06s01s28.html | 0 .../EDBG/protocoldocs/ch06s01s29.html | 0 .../atmel-docs/EDBG/protocoldocs/ch06s02.html | 0 .../EDBG/protocoldocs/ch06s02s01.html | 0 .../EDBG/protocoldocs/ch06s02s02.html | 0 .../EDBG/protocoldocs/ch06s02s03.html | 0 .../EDBG/protocoldocs/ch06s02s04.html | 0 .../EDBG/protocoldocs/ch06s02s05.html | 0 .../atmel-docs/EDBG/protocoldocs/ch06s03.html | 0 .../EDBG/protocoldocs/ch06s03s01.html | 0 .../EDBG/protocoldocs/ch06s03s02.html | 0 .../EDBG/protocoldocs/ch06s04s01.html | 0 .../EDBG/protocoldocs/ch06s04s02.html | 0 .../EDBG/protocoldocs/ch06s04s03.html | 0 .../atmel-docs/EDBG/protocoldocs/ch06s05.html | 0 .../EDBG/protocoldocs/ch06s05s01.html | 0 .../EDBG/protocoldocs/ch06s05s02.html | 0 .../EDBG/protocoldocs/ch06s05s03.html | 0 .../EDBG/protocoldocs/ch06s05s04.html | 0 .../EDBG/protocoldocs/ch06s05s05.html | 0 .../atmel-docs/EDBG/protocoldocs/ch06s06.html | 0 .../atmel-docs/EDBG/protocoldocs/ch07s01.html | 0 .../EDBG/protocoldocs/ch07s01s01.html | 0 .../EDBG/protocoldocs/ch07s01s02.html | 0 .../EDBG/protocoldocs/ch07s01s03.html | 0 .../EDBG/protocoldocs/ch07s01s04.html | 0 .../EDBG/protocoldocs/ch07s01s05.html | 0 .../EDBG/protocoldocs/ch07s01s06.html | 0 .../EDBG/protocoldocs/ch07s01s07.html | 0 .../EDBG/protocoldocs/ch07s01s08.html | 0 .../EDBG/protocoldocs/ch07s01s09.html | 0 .../EDBG/protocoldocs/ch07s01s10.html | 0 .../EDBG/protocoldocs/ch07s01s11.html | 0 .../EDBG/protocoldocs/ch07s01s12.html | 0 .../EDBG/protocoldocs/ch07s01s13.html | 0 .../EDBG/protocoldocs/ch07s01s14.html | 0 .../EDBG/protocoldocs/ch07s01s15.html | 0 .../EDBG/protocoldocs/ch07s01s16.html | 0 .../EDBG/protocoldocs/ch07s01s17.html | 0 .../atmel-docs/EDBG/protocoldocs/ch07s02.html | 0 .../atmel-docs/EDBG/protocoldocs/ch07s03.html | 0 .../atmel-docs/EDBG/protocoldocs/ch08s01.html | 0 .../EDBG/protocoldocs/ch08s01s01.html | 0 .../EDBG/protocoldocs/ch08s01s02.html | 0 .../EDBG/protocoldocs/ch08s01s03.html | 0 .../EDBG/protocoldocs/ch08s01s04.html | 0 .../EDBG/protocoldocs/ch08s01s05.html | 0 .../EDBG/protocoldocs/ch08s01s06.html | 0 .../atmel-docs/EDBG/protocoldocs/ch08s02.html | 0 .../atmel-docs/EDBG/protocoldocs/ch08s03.html | 0 .../EDBG/protocoldocs/document.revisions.html | 0 .../atmel-docs/EDBG/protocoldocs/index.html | 0 .../atmel-docs/EDBG/protocoldocs/pr01.html | 0 .../protocoldocs.Introduction.html | 0 .../protocoldocs.avr32protocol.html | 0 .../protocoldocs.avr8protocol.html | 0 .../protocoldocs.avrispprotocol.html | 0 .../protocoldocs.avrprotocol.Overview.html | 0 .../protocoldocs/protocoldocs.cmsis_dap.html | 0 .../protocoldocs.edbg_ctrl_protocol.html | 0 .../protocoldocs.tpiprotocol.html | 0 .../protocoldocs/search/htmlFileInfoList.js | 0 .../EDBG/protocoldocs/search/index-1.js | 0 .../EDBG/protocoldocs/search/index-2.js | 0 .../EDBG/protocoldocs/search/index-3.js | 0 .../EDBG/protocoldocs/search/l10n.js | 0 .../EDBG/protocoldocs/search/nwSearchFnt.js | 0 .../search/stemmers/en_stemmer.js | 0 .../protocoldocs/section_avr32_memtypes.html | 0 .../section_avr32_setget_params.html | 0 .../protocoldocs/section_avr8_memtypes.html | 0 .../section_avr8_query_contexts.html | 0 .../section_avr8_setget_params.html | 0 .../section_edbg_ctrl_setget_params.html | 0 .../section_edbg_query_contexts.html | 0 .../section_housekeeping_start_session.html | 0 .../EDBG/protocoldocs/section_i5v_3yz_rl.html | 0 .../EDBG/protocoldocs/section_jdx_m11_sl.html | 0 .../EDBG/protocoldocs/section_qhb_x1c_sl.html | 0 .../protocoldocs/section_serial_trace.html | 0 .../EDBG/protocoldocs/section_t1f_hb1_sl.html | 0 .../avrdude/atmel-docs/JTAGICE-AVR060.pdf | Bin .../avrdude/atmel-docs/JTAGICEmkII-AVR067.pdf | Bin .../avrdude/atmel-docs/STK500-AVR061.pdf | Bin .../avrdude/atmel-docs/STK500v2-AVR068.pdf | Bin {xs/src => src}/avrdude/avr.c | 0 {xs/src => src}/avrdude/avr910.c | 0 {xs/src => src}/avrdude/avr910.h | 0 {xs/src => src}/avrdude/avrdude-slic3r.cpp | 0 {xs/src => src}/avrdude/avrdude-slic3r.hpp | 0 {xs/src => src}/avrdude/avrdude.1 | 0 {xs/src => src}/avrdude/avrdude.conf | 0 {xs/src => src}/avrdude/avrdude.conf.in | 0 {xs/src => src}/avrdude/avrdude.conf.tmp | 0 {xs/src => src}/avrdude/avrdude.h | 0 {xs/src => src}/avrdude/avrdude.spec.in | 0 {xs/src => src}/avrdude/avrftdi.c | 0 {xs/src => src}/avrdude/avrftdi.h | 0 {xs/src => src}/avrdude/avrftdi_private.h | 0 {xs/src => src}/avrdude/avrftdi_tpi.c | 0 {xs/src => src}/avrdude/avrftdi_tpi.h | 0 {xs/src => src}/avrdude/avrpart.c | 0 {xs/src => src}/avrdude/bitbang.c | 0 {xs/src => src}/avrdude/bitbang.h | 0 {xs/src => src}/avrdude/bootstrap | 0 {xs/src => src}/avrdude/buspirate.c | 0 {xs/src => src}/avrdude/buspirate.h | 0 {xs/src => src}/avrdude/butterfly.c | 0 {xs/src => src}/avrdude/butterfly.h | 0 {xs/src => src}/avrdude/config.c | 0 {xs/src => src}/avrdude/config.h | 0 {xs/src => src}/avrdude/config_gram.c | 0 {xs/src => src}/avrdude/config_gram.h | 0 {xs/src => src}/avrdude/config_gram.y | 0 {xs/src => src}/avrdude/configure.ac | 0 {xs/src => src}/avrdude/confwin.c | 0 {xs/src => src}/avrdude/crc16.c | 0 {xs/src => src}/avrdude/crc16.h | 0 {xs/src => src}/avrdude/dfu.c | 0 {xs/src => src}/avrdude/dfu.h | 0 {xs/src => src}/avrdude/doc/.cvsignore | 0 {xs/src => src}/avrdude/doc/Makefile.am | 0 {xs/src => src}/avrdude/doc/TODO | 0 {xs/src => src}/avrdude/doc/avrdude.texi | 0 .../avrdude/doc/parts_comments.txt | 0 {xs/src => src}/avrdude/fileio.c | 0 {xs/src => src}/avrdude/flip1.c | 0 {xs/src => src}/avrdude/flip1.h | 0 {xs/src => src}/avrdude/flip2.c | 0 {xs/src => src}/avrdude/flip2.h | 0 {xs/src => src}/avrdude/freebsd_ppi.h | 0 {xs/src => src}/avrdude/ft245r.c | 0 {xs/src => src}/avrdude/ft245r.h | 0 {xs/src => src}/avrdude/jtag3.c | 0 {xs/src => src}/avrdude/jtag3.h | 0 {xs/src => src}/avrdude/jtag3_private.h | 0 {xs/src => src}/avrdude/jtagmkI.c | 0 {xs/src => src}/avrdude/jtagmkI.h | 0 {xs/src => src}/avrdude/jtagmkII.c | 0 {xs/src => src}/avrdude/jtagmkII.h | 0 {xs/src => src}/avrdude/jtagmkII_private.h | 0 {xs/src => src}/avrdude/jtagmkI_private.h | 0 {xs/src => src}/avrdude/lexer.c | 0 {xs/src => src}/avrdude/lexer.l | 0 {xs/src => src}/avrdude/libavrdude.h | 0 {xs/src => src}/avrdude/linux_ppdev.h | 0 {xs/src => src}/avrdude/linuxgpio.c | 0 {xs/src => src}/avrdude/linuxgpio.h | 0 {xs/src => src}/avrdude/lists.c | 0 {xs/src => src}/avrdude/main-standalone.c | 0 {xs/src => src}/avrdude/main.c | 0 {xs/src => src}/avrdude/my_ddk_hidsdi.h | 0 {xs/src => src}/avrdude/par.c | 0 {xs/src => src}/avrdude/par.h | 0 {xs/src => src}/avrdude/pgm.c | 0 {xs/src => src}/avrdude/pgm_type.c | 0 {xs/src => src}/avrdude/pickit2.c | 0 {xs/src => src}/avrdude/pickit2.h | 0 {xs/src => src}/avrdude/pindefs.c | 0 {xs/src => src}/avrdude/ppi.c | 0 {xs/src => src}/avrdude/ppi.h | 0 {xs/src => src}/avrdude/ppiwin.c | 0 {xs/src => src}/avrdude/safemode.c | 0 {xs/src => src}/avrdude/ser_avrdoper.c | 0 {xs/src => src}/avrdude/ser_posix.c | 0 {xs/src => src}/avrdude/ser_win32.c | 0 {xs/src => src}/avrdude/serbb.h | 0 {xs/src => src}/avrdude/serbb_posix.c | 0 {xs/src => src}/avrdude/serbb_win32.c | 0 {xs/src => src}/avrdude/solaris_ecpp.h | 0 {xs/src => src}/avrdude/stk500.c | 0 {xs/src => src}/avrdude/stk500.h | 0 {xs/src => src}/avrdude/stk500_private.h | 0 {xs/src => src}/avrdude/stk500generic.c | 0 {xs/src => src}/avrdude/stk500generic.h | 0 {xs/src => src}/avrdude/stk500v2.c | 0 {xs/src => src}/avrdude/stk500v2.h | 0 {xs/src => src}/avrdude/stk500v2_private.h | 0 {xs/src => src}/avrdude/term.c | 0 {xs/src => src}/avrdude/term.h | 0 .../avrdude/tools/build-mingw32.sh | 0 .../avrdude/tools/get-dw-params.xsl | 0 .../avrdude/tools/get-hv-params.xsl | 0 .../avrdude/tools/get-stk600-cards.xsl | 0 .../avrdude/tools/get-stk600-devices.xsl | 0 {xs/src => src}/avrdude/tpi.h | 0 {xs/src => src}/avrdude/update.c | 0 {xs/src => src}/avrdude/usb_hidapi.c | 0 {xs/src => src}/avrdude/usb_libusb.c | 0 {xs/src => src}/avrdude/usbasp.c | 0 {xs/src => src}/avrdude/usbasp.h | 0 {xs/src => src}/avrdude/usbdevs.h | 0 {xs/src => src}/avrdude/usbtiny.c | 0 {xs/src => src}/avrdude/usbtiny.h | 0 {xs/src => src}/avrdude/windows/.cvsignore | 0 {xs/src => src}/avrdude/windows/Makefile.am | 0 {xs/src => src}/avrdude/windows/getopt.c | 0 {xs/src => src}/avrdude/windows/getopt.h | 0 {xs/src => src}/avrdude/windows/giveio.c | 0 {xs/src => src}/avrdude/windows/giveio.sys | Bin .../avrdude/windows/install_giveio.bat | 0 {xs/src => src}/avrdude/windows/loaddrv.c | 0 {xs/src => src}/avrdude/windows/loaddrv.h | 0 .../avrdude/windows/remove_giveio.bat | 0 .../avrdude/windows/status_giveio.bat | 0 {xs/src => src}/avrdude/windows/unistd.cpp | 0 {xs/src => src}/avrdude/windows/unistd.h | 0 {xs/src => src}/avrdude/wiring.c | 0 {xs/src => src}/avrdude/wiring.h | 0 src/boost/CMakeLists.txt | 20 + {xs/src => src}/boost/nowide/args.hpp | 0 {xs/src => src}/boost/nowide/cenv.hpp | 0 {xs/src => src}/boost/nowide/config.hpp | 0 {xs/src => src}/boost/nowide/convert.hpp | 0 {xs/src => src}/boost/nowide/cstdio.hpp | 0 {xs/src => src}/boost/nowide/cstdlib.hpp | 0 {xs/src => src}/boost/nowide/filebuf.hpp | 0 {xs/src => src}/boost/nowide/fstream.hpp | 0 .../boost/nowide/integration/filesystem.hpp | 0 {xs/src => src}/boost/nowide/iostream.cpp | 0 {xs/src => src}/boost/nowide/iostream.hpp | 0 {xs/src => src}/boost/nowide/stackstring.hpp | 0 {xs/src => src}/boost/nowide/system.hpp | 0 {xs/src => src}/boost/nowide/utf8_codecvt.hpp | 0 {xs/src => src}/boost/nowide/windows.hpp | 0 src/clipper/CMakeLists.txt | 7 + {xs/src => src/clipper}/clipper.cpp | 8360 ++++++++--------- {xs/src => src/clipper}/clipper.hpp | 974 +- {xs/src => src}/eigen/COPYING.README | 0 {xs/src => src}/eigen/Eigen/CMakeLists.txt | 0 {xs/src => src}/eigen/Eigen/Cholesky | 0 {xs/src => src}/eigen/Eigen/CholmodSupport | 0 {xs/src => src}/eigen/Eigen/Core | 0 {xs/src => src}/eigen/Eigen/Dense | 0 {xs/src => src}/eigen/Eigen/Eigen | 0 {xs/src => src}/eigen/Eigen/Eigenvalues | 0 {xs/src => src}/eigen/Eigen/Geometry | 0 {xs/src => src}/eigen/Eigen/Householder | 0 .../eigen/Eigen/IterativeLinearSolvers | 0 {xs/src => src}/eigen/Eigen/Jacobi | 0 {xs/src => src}/eigen/Eigen/LU | 0 {xs/src => src}/eigen/Eigen/MetisSupport | 0 {xs/src => src}/eigen/Eigen/OrderingMethods | 0 {xs/src => src}/eigen/Eigen/PaStiXSupport | 0 {xs/src => src}/eigen/Eigen/PardisoSupport | 0 {xs/src => src}/eigen/Eigen/QR | 0 {xs/src => src}/eigen/Eigen/QtAlignedMalloc | 0 {xs/src => src}/eigen/Eigen/SPQRSupport | 0 {xs/src => src}/eigen/Eigen/SVD | 0 {xs/src => src}/eigen/Eigen/Sparse | 0 {xs/src => src}/eigen/Eigen/SparseCholesky | 0 {xs/src => src}/eigen/Eigen/SparseCore | 0 {xs/src => src}/eigen/Eigen/SparseLU | 0 {xs/src => src}/eigen/Eigen/SparseQR | 0 {xs/src => src}/eigen/Eigen/StdDeque | 0 {xs/src => src}/eigen/Eigen/StdList | 0 {xs/src => src}/eigen/Eigen/StdVector | 0 {xs/src => src}/eigen/Eigen/SuperLUSupport | 0 {xs/src => src}/eigen/Eigen/UmfPackSupport | 0 .../eigen/Eigen/src/Cholesky/LDLT.h | 0 .../eigen/Eigen/src/Cholesky/LLT.h | 0 .../eigen/Eigen/src/Cholesky/LLT_LAPACKE.h | 0 .../Eigen/src/CholmodSupport/CholmodSupport.h | 0 {xs/src => src}/eigen/Eigen/src/Core/Array.h | 0 .../eigen/Eigen/src/Core/ArrayBase.h | 0 .../eigen/Eigen/src/Core/ArrayWrapper.h | 0 {xs/src => src}/eigen/Eigen/src/Core/Assign.h | 0 .../eigen/Eigen/src/Core/AssignEvaluator.h | 0 .../eigen/Eigen/src/Core/Assign_MKL.h | 0 .../eigen/Eigen/src/Core/BandMatrix.h | 0 {xs/src => src}/eigen/Eigen/src/Core/Block.h | 0 .../eigen/Eigen/src/Core/BooleanRedux.h | 0 .../eigen/Eigen/src/Core/CommaInitializer.h | 0 .../eigen/Eigen/src/Core/ConditionEstimator.h | 0 .../eigen/Eigen/src/Core/CoreEvaluators.h | 0 .../eigen/Eigen/src/Core/CoreIterators.h | 0 .../eigen/Eigen/src/Core/CwiseBinaryOp.h | 0 .../eigen/Eigen/src/Core/CwiseNullaryOp.h | 0 .../eigen/Eigen/src/Core/CwiseTernaryOp.h | 0 .../eigen/Eigen/src/Core/CwiseUnaryOp.h | 0 .../eigen/Eigen/src/Core/CwiseUnaryView.h | 0 .../eigen/Eigen/src/Core/DenseBase.h | 0 .../eigen/Eigen/src/Core/DenseCoeffsBase.h | 0 .../eigen/Eigen/src/Core/DenseStorage.h | 0 .../eigen/Eigen/src/Core/Diagonal.h | 0 .../eigen/Eigen/src/Core/DiagonalMatrix.h | 0 .../eigen/Eigen/src/Core/DiagonalProduct.h | 0 {xs/src => src}/eigen/Eigen/src/Core/Dot.h | 0 .../eigen/Eigen/src/Core/EigenBase.h | 0 .../eigen/Eigen/src/Core/ForceAlignedAccess.h | 0 {xs/src => src}/eigen/Eigen/src/Core/Fuzzy.h | 0 .../eigen/Eigen/src/Core/GeneralProduct.h | 0 .../eigen/Eigen/src/Core/GenericPacketMath.h | 0 .../eigen/Eigen/src/Core/GlobalFunctions.h | 0 {xs/src => src}/eigen/Eigen/src/Core/IO.h | 0 .../eigen/Eigen/src/Core/Inverse.h | 0 {xs/src => src}/eigen/Eigen/src/Core/Map.h | 0 .../eigen/Eigen/src/Core/MapBase.h | 0 .../eigen/Eigen/src/Core/MathFunctions.h | 0 .../eigen/Eigen/src/Core/MathFunctionsImpl.h | 0 {xs/src => src}/eigen/Eigen/src/Core/Matrix.h | 0 .../eigen/Eigen/src/Core/MatrixBase.h | 0 .../eigen/Eigen/src/Core/NestByValue.h | 0 .../eigen/Eigen/src/Core/NoAlias.h | 0 .../eigen/Eigen/src/Core/NumTraits.h | 0 .../eigen/Eigen/src/Core/PermutationMatrix.h | 0 .../eigen/Eigen/src/Core/PlainObjectBase.h | 0 .../eigen/Eigen/src/Core/Product.h | 0 .../eigen/Eigen/src/Core/ProductEvaluators.h | 0 {xs/src => src}/eigen/Eigen/src/Core/Random.h | 0 {xs/src => src}/eigen/Eigen/src/Core/Redux.h | 0 {xs/src => src}/eigen/Eigen/src/Core/Ref.h | 0 .../eigen/Eigen/src/Core/Replicate.h | 0 .../eigen/Eigen/src/Core/ReturnByValue.h | 0 .../eigen/Eigen/src/Core/Reverse.h | 0 {xs/src => src}/eigen/Eigen/src/Core/Select.h | 0 .../eigen/Eigen/src/Core/SelfAdjointView.h | 0 .../eigen/Eigen/src/Core/SelfCwiseBinaryOp.h | 0 {xs/src => src}/eigen/Eigen/src/Core/Solve.h | 0 .../eigen/Eigen/src/Core/SolveTriangular.h | 0 .../eigen/Eigen/src/Core/SolverBase.h | 0 .../eigen/Eigen/src/Core/StableNorm.h | 0 {xs/src => src}/eigen/Eigen/src/Core/Stride.h | 0 {xs/src => src}/eigen/Eigen/src/Core/Swap.h | 0 .../eigen/Eigen/src/Core/Transpose.h | 0 .../eigen/Eigen/src/Core/Transpositions.h | 0 .../eigen/Eigen/src/Core/TriangularMatrix.h | 0 .../eigen/Eigen/src/Core/VectorBlock.h | 0 .../eigen/Eigen/src/Core/VectorwiseOp.h | 0 .../eigen/Eigen/src/Core/Visitor.h | 0 .../eigen/Eigen/src/Core/arch/AVX/Complex.h | 0 .../Eigen/src/Core/arch/AVX/MathFunctions.h | 0 .../Eigen/src/Core/arch/AVX/PacketMath.h | 0 .../Eigen/src/Core/arch/AVX/TypeCasting.h | 0 .../src/Core/arch/AVX512/MathFunctions.h | 0 .../Eigen/src/Core/arch/AVX512/PacketMath.h | 0 .../Eigen/src/Core/arch/AltiVec/Complex.h | 0 .../src/Core/arch/AltiVec/MathFunctions.h | 0 .../Eigen/src/Core/arch/AltiVec/PacketMath.h | 0 .../eigen/Eigen/src/Core/arch/CUDA/Complex.h | 0 .../eigen/Eigen/src/Core/arch/CUDA/Half.h | 0 .../Eigen/src/Core/arch/CUDA/MathFunctions.h | 0 .../Eigen/src/Core/arch/CUDA/PacketMath.h | 0 .../Eigen/src/Core/arch/CUDA/PacketMathHalf.h | 0 .../Eigen/src/Core/arch/CUDA/TypeCasting.h | 0 .../Eigen/src/Core/arch/Default/ConjHelper.h | 0 .../Eigen/src/Core/arch/Default/Settings.h | 0 .../eigen/Eigen/src/Core/arch/NEON/Complex.h | 0 .../Eigen/src/Core/arch/NEON/MathFunctions.h | 0 .../Eigen/src/Core/arch/NEON/PacketMath.h | 0 .../eigen/Eigen/src/Core/arch/SSE/Complex.h | 0 .../Eigen/src/Core/arch/SSE/MathFunctions.h | 0 .../Eigen/src/Core/arch/SSE/PacketMath.h | 0 .../Eigen/src/Core/arch/SSE/TypeCasting.h | 0 .../Eigen/src/Core/arch/ZVector/Complex.h | 0 .../src/Core/arch/ZVector/MathFunctions.h | 0 .../Eigen/src/Core/arch/ZVector/PacketMath.h | 0 .../src/Core/functors/AssignmentFunctors.h | 0 .../Eigen/src/Core/functors/BinaryFunctors.h | 0 .../Eigen/src/Core/functors/NullaryFunctors.h | 0 .../Eigen/src/Core/functors/StlFunctors.h | 0 .../Eigen/src/Core/functors/TernaryFunctors.h | 0 .../Eigen/src/Core/functors/UnaryFunctors.h | 0 .../Core/products/GeneralBlockPanelKernel.h | 0 .../src/Core/products/GeneralMatrixMatrix.h | 0 .../products/GeneralMatrixMatrixTriangular.h | 0 .../GeneralMatrixMatrixTriangular_BLAS.h | 0 .../Core/products/GeneralMatrixMatrix_BLAS.h | 0 .../src/Core/products/GeneralMatrixVector.h | 0 .../Core/products/GeneralMatrixVector_BLAS.h | 0 .../Eigen/src/Core/products/Parallelizer.h | 0 .../Core/products/SelfadjointMatrixMatrix.h | 0 .../products/SelfadjointMatrixMatrix_BLAS.h | 0 .../Core/products/SelfadjointMatrixVector.h | 0 .../products/SelfadjointMatrixVector_BLAS.h | 0 .../src/Core/products/SelfadjointProduct.h | 0 .../Core/products/SelfadjointRank2Update.h | 0 .../Core/products/TriangularMatrixMatrix.h | 0 .../products/TriangularMatrixMatrix_BLAS.h | 0 .../Core/products/TriangularMatrixVector.h | 0 .../products/TriangularMatrixVector_BLAS.h | 0 .../Core/products/TriangularSolverMatrix.h | 0 .../products/TriangularSolverMatrix_BLAS.h | 0 .../Core/products/TriangularSolverVector.h | 0 .../eigen/Eigen/src/Core/util/BlasUtil.h | 0 .../eigen/Eigen/src/Core/util/Constants.h | 0 .../src/Core/util/DisableStupidWarnings.h | 0 .../Eigen/src/Core/util/ForwardDeclarations.h | 0 .../eigen/Eigen/src/Core/util/MKL_support.h | 0 .../eigen/Eigen/src/Core/util/Macros.h | 0 .../eigen/Eigen/src/Core/util/Memory.h | 0 .../eigen/Eigen/src/Core/util/Meta.h | 0 .../eigen/Eigen/src/Core/util/NonMPL2.h | 0 .../src/Core/util/ReenableStupidWarnings.h | 0 .../eigen/Eigen/src/Core/util/StaticAssert.h | 0 .../eigen/Eigen/src/Core/util/XprHelper.h | 0 .../src/Eigenvalues/ComplexEigenSolver.h | 0 .../Eigen/src/Eigenvalues/ComplexSchur.h | 0 .../src/Eigenvalues/ComplexSchur_LAPACKE.h | 0 .../eigen/Eigen/src/Eigenvalues/EigenSolver.h | 0 .../src/Eigenvalues/GeneralizedEigenSolver.h | 0 .../GeneralizedSelfAdjointEigenSolver.h | 0 .../src/Eigenvalues/HessenbergDecomposition.h | 0 .../src/Eigenvalues/MatrixBaseEigenvalues.h | 0 .../eigen/Eigen/src/Eigenvalues/RealQZ.h | 0 .../eigen/Eigen/src/Eigenvalues/RealSchur.h | 0 .../Eigen/src/Eigenvalues/RealSchur_LAPACKE.h | 0 .../src/Eigenvalues/SelfAdjointEigenSolver.h | 0 .../SelfAdjointEigenSolver_LAPACKE.h | 0 .../src/Eigenvalues/Tridiagonalization.h | 0 .../eigen/Eigen/src/Geometry/AlignedBox.h | 0 .../eigen/Eigen/src/Geometry/AngleAxis.h | 0 .../eigen/Eigen/src/Geometry/EulerAngles.h | 0 .../eigen/Eigen/src/Geometry/Homogeneous.h | 0 .../eigen/Eigen/src/Geometry/Hyperplane.h | 0 .../eigen/Eigen/src/Geometry/OrthoMethods.h | 0 .../Eigen/src/Geometry/ParametrizedLine.h | 0 .../eigen/Eigen/src/Geometry/Quaternion.h | 0 .../eigen/Eigen/src/Geometry/Rotation2D.h | 0 .../eigen/Eigen/src/Geometry/RotationBase.h | 0 .../eigen/Eigen/src/Geometry/Scaling.h | 0 .../eigen/Eigen/src/Geometry/Transform.h | 0 .../eigen/Eigen/src/Geometry/Translation.h | 0 .../eigen/Eigen/src/Geometry/Umeyama.h | 0 .../Eigen/src/Geometry/arch/Geometry_SSE.h | 0 .../Eigen/src/Householder/BlockHouseholder.h | 0 .../eigen/Eigen/src/Householder/Householder.h | 0 .../src/Householder/HouseholderSequence.h | 0 .../BasicPreconditioners.h | 0 .../src/IterativeLinearSolvers/BiCGSTAB.h | 0 .../ConjugateGradient.h | 0 .../IncompleteCholesky.h | 0 .../IterativeLinearSolvers/IncompleteLUT.h | 0 .../IterativeSolverBase.h | 0 .../LeastSquareConjugateGradient.h | 0 .../IterativeLinearSolvers/SolveWithGuess.h | 0 .../eigen/Eigen/src/Jacobi/Jacobi.h | 0 .../eigen/Eigen/src/LU/Determinant.h | 0 .../eigen/Eigen/src/LU/FullPivLU.h | 0 .../eigen/Eigen/src/LU/InverseImpl.h | 0 .../eigen/Eigen/src/LU/PartialPivLU.h | 0 .../eigen/Eigen/src/LU/PartialPivLU_LAPACKE.h | 0 .../eigen/Eigen/src/LU/arch/Inverse_SSE.h | 0 .../Eigen/src/MetisSupport/MetisSupport.h | 0 .../eigen/Eigen/src/OrderingMethods/Amd.h | 0 .../Eigen/src/OrderingMethods/Eigen_Colamd.h | 0 .../Eigen/src/OrderingMethods/Ordering.h | 0 .../Eigen/src/PaStiXSupport/PaStiXSupport.h | 0 .../Eigen/src/PardisoSupport/PardisoSupport.h | 0 .../eigen/Eigen/src/QR/ColPivHouseholderQR.h | 0 .../src/QR/ColPivHouseholderQR_LAPACKE.h | 0 .../src/QR/CompleteOrthogonalDecomposition.h | 0 .../eigen/Eigen/src/QR/FullPivHouseholderQR.h | 0 .../eigen/Eigen/src/QR/HouseholderQR.h | 0 .../Eigen/src/QR/HouseholderQR_LAPACKE.h | 0 .../src/SPQRSupport/SuiteSparseQRSupport.h | 0 {xs/src => src}/eigen/Eigen/src/SVD/BDCSVD.h | 0 .../eigen/Eigen/src/SVD/JacobiSVD.h | 0 .../eigen/Eigen/src/SVD/JacobiSVD_LAPACKE.h | 0 {xs/src => src}/eigen/Eigen/src/SVD/SVDBase.h | 0 .../Eigen/src/SVD/UpperBidiagonalization.h | 0 .../src/SparseCholesky/SimplicialCholesky.h | 0 .../SparseCholesky/SimplicialCholesky_impl.h | 0 .../eigen/Eigen/src/SparseCore/AmbiVector.h | 0 .../Eigen/src/SparseCore/CompressedStorage.h | 0 .../ConservativeSparseSparseProduct.h | 0 .../Eigen/src/SparseCore/MappedSparseMatrix.h | 0 .../eigen/Eigen/src/SparseCore/SparseAssign.h | 0 .../eigen/Eigen/src/SparseCore/SparseBlock.h | 0 .../Eigen/src/SparseCore/SparseColEtree.h | 0 .../src/SparseCore/SparseCompressedBase.h | 0 .../src/SparseCore/SparseCwiseBinaryOp.h | 0 .../Eigen/src/SparseCore/SparseCwiseUnaryOp.h | 0 .../Eigen/src/SparseCore/SparseDenseProduct.h | 0 .../src/SparseCore/SparseDiagonalProduct.h | 0 .../eigen/Eigen/src/SparseCore/SparseDot.h | 0 .../eigen/Eigen/src/SparseCore/SparseFuzzy.h | 0 .../eigen/Eigen/src/SparseCore/SparseMap.h | 0 .../eigen/Eigen/src/SparseCore/SparseMatrix.h | 0 .../Eigen/src/SparseCore/SparseMatrixBase.h | 0 .../Eigen/src/SparseCore/SparsePermutation.h | 0 .../Eigen/src/SparseCore/SparseProduct.h | 0 .../eigen/Eigen/src/SparseCore/SparseRedux.h | 0 .../eigen/Eigen/src/SparseCore/SparseRef.h | 0 .../src/SparseCore/SparseSelfAdjointView.h | 0 .../Eigen/src/SparseCore/SparseSolverBase.h | 0 .../SparseSparseProductWithPruning.h | 0 .../Eigen/src/SparseCore/SparseTranspose.h | 0 .../src/SparseCore/SparseTriangularView.h | 0 .../eigen/Eigen/src/SparseCore/SparseUtil.h | 0 .../eigen/Eigen/src/SparseCore/SparseVector.h | 0 .../eigen/Eigen/src/SparseCore/SparseView.h | 0 .../Eigen/src/SparseCore/TriangularSolver.h | 0 .../eigen/Eigen/src/SparseLU/SparseLU.h | 0 .../eigen/Eigen/src/SparseLU/SparseLUImpl.h | 0 .../Eigen/src/SparseLU/SparseLU_Memory.h | 0 .../Eigen/src/SparseLU/SparseLU_Structs.h | 0 .../src/SparseLU/SparseLU_SupernodalMatrix.h | 0 .../eigen/Eigen/src/SparseLU/SparseLU_Utils.h | 0 .../Eigen/src/SparseLU/SparseLU_column_bmod.h | 0 .../Eigen/src/SparseLU/SparseLU_column_dfs.h | 0 .../src/SparseLU/SparseLU_copy_to_ucol.h | 0 .../Eigen/src/SparseLU/SparseLU_gemm_kernel.h | 0 .../src/SparseLU/SparseLU_heap_relax_snode.h | 0 .../Eigen/src/SparseLU/SparseLU_kernel_bmod.h | 0 .../Eigen/src/SparseLU/SparseLU_panel_bmod.h | 0 .../Eigen/src/SparseLU/SparseLU_panel_dfs.h | 0 .../Eigen/src/SparseLU/SparseLU_pivotL.h | 0 .../Eigen/src/SparseLU/SparseLU_pruneL.h | 0 .../Eigen/src/SparseLU/SparseLU_relax_snode.h | 0 .../eigen/Eigen/src/SparseQR/SparseQR.h | 0 .../eigen/Eigen/src/StlSupport/StdDeque.h | 0 .../eigen/Eigen/src/StlSupport/StdList.h | 0 .../eigen/Eigen/src/StlSupport/StdVector.h | 0 .../eigen/Eigen/src/StlSupport/details.h | 0 .../Eigen/src/SuperLUSupport/SuperLUSupport.h | 0 .../Eigen/src/UmfPackSupport/UmfPackSupport.h | 0 {xs/src => src}/eigen/Eigen/src/misc/Image.h | 0 {xs/src => src}/eigen/Eigen/src/misc/Kernel.h | 0 .../eigen/Eigen/src/misc/RealSvd2x2.h | 0 {xs/src => src}/eigen/Eigen/src/misc/blas.h | 0 {xs/src => src}/eigen/Eigen/src/misc/lapack.h | 0 .../eigen/Eigen/src/misc/lapacke.h | 0 .../eigen/Eigen/src/misc/lapacke_mangling.h | 0 .../Eigen/src/plugins/ArrayCwiseBinaryOps.h | 0 .../Eigen/src/plugins/ArrayCwiseUnaryOps.h | 0 .../eigen/Eigen/src/plugins/BlockMethods.h | 0 .../Eigen/src/plugins/CommonCwiseBinaryOps.h | 0 .../Eigen/src/plugins/CommonCwiseUnaryOps.h | 0 .../Eigen/src/plugins/MatrixCwiseBinaryOps.h | 0 .../Eigen/src/plugins/MatrixCwiseUnaryOps.h | 0 {xs/src => src}/eigen/README.md | 0 {xs/src => src}/expat/COPYING | 0 {xs/src => src}/expat/README | 0 {xs/src => src}/expat/ascii.h | 0 {xs/src => src}/expat/asciitab.h | 0 {xs/src => src}/expat/expat.h | 0 {xs/src => src}/expat/expat_config.h | 0 {xs/src => src}/expat/expat_external.h | 0 {xs/src => src}/expat/iasciitab.h | 0 {xs/src => src}/expat/internal.h | 0 {xs/src => src}/expat/latin1tab.h | 0 {xs/src => src}/expat/nametab.h | 0 {xs/src => src}/expat/utf8tab.h | 0 {xs/src => src}/expat/xmlparse.c | 0 {xs/src => src}/expat/xmlrole.c | 0 {xs/src => src}/expat/xmlrole.h | 0 {xs/src => src}/expat/xmltok.c | 0 {xs/src => src}/expat/xmltok.h | 0 {xs/src => src}/expat/xmltok_impl.h | 0 {xs/src => src}/expat/xmltok_impl.inc | 0 {xs/src => src}/expat/xmltok_ns.inc | 0 {xs/src => src}/glew/LICENSE.txt | 0 {xs/src => src}/glew/README.md | 0 {xs/src => src}/glew/include/GL/glew.h | 0 {xs/src => src}/glew/include/GL/glxew.h | 0 {xs/src => src}/glew/include/GL/wglew.h | 0 {xs/src => src}/glew/src/glew.c | 0 {xs/src => src}/libnest2d/CMakeLists.txt | 0 {xs/src => src}/libnest2d/LICENSE.txt | 0 {xs/src => src}/libnest2d/README.md | 0 .../cmake_modules/DownloadNLopt.cmake | 0 .../DownloadProject.CMakeLists.cmake.in | 0 .../cmake_modules/DownloadProject.cmake | 0 .../libnest2d/cmake_modules/FindClipper.cmake | 0 .../libnest2d/cmake_modules/FindNLopt.cmake | 0 .../libnest2d/cmake_modules/FindTBB.cmake | 0 {xs/src => src}/libnest2d/examples/main.cpp | 0 {xs/src => src}/libnest2d/libnest2d.h | 0 .../libnest2d/libnest2d/boost_alg.hpp | 0 .../libnest2d/clipper_backend/CMakeLists.txt | 0 .../clipper_backend/clipper_backend.hpp | 0 .../libnest2d/libnest2d/common.hpp | 0 .../libnest2d/libnest2d/geometry_traits.hpp | 0 .../libnest2d/geometry_traits_nfp.hpp | 0 .../libnest2d/libnest2d/libnest2d.hpp | 0 .../libnest2d/libnest2d/metaloop.hpp | 0 .../libnest2d/libnest2d/optimizer.hpp | 0 .../libnest2d/optimizers/genetic.hpp | 0 .../optimizers/nlopt_boilerplate.hpp | 0 .../libnest2d/optimizers/simplex.hpp | 0 .../libnest2d/optimizers/subplex.hpp | 0 .../libnest2d/placers/bottomleftplacer.hpp | 0 .../libnest2d/libnest2d/placers/nfpplacer.hpp | 0 .../libnest2d/placers/placer_boilerplate.hpp | 0 .../libnest2d/libnest2d/rotfinder.hpp | 0 .../libnest2d/selections/djd_heuristic.hpp | 0 .../libnest2d/libnest2d/selections/filler.hpp | 0 .../libnest2d/selections/firstfit.hpp | 0 .../selections/selection_boilerplate.hpp | 0 .../libnest2d/tests/CMakeLists.txt | 0 .../libnest2d/tests/printer_parts.cpp | 0 .../libnest2d/tests/printer_parts.h | 0 {xs/src => src}/libnest2d/tests/test.cpp | 0 {xs/src => src/libnest2d/tools}/benchmark.h | 0 .../libnest2d/tools/libnfpglue.cpp | 0 .../libnest2d/tools/libnfpglue.hpp | 0 .../libnest2d/tools/libnfporb/LICENSE | 0 .../libnest2d/tools/libnfporb/ORIGIN | 0 .../libnest2d/tools/libnfporb/README.md | 0 .../libnest2d/tools/libnfporb/libnfporb.hpp | 0 .../libnest2d/tools/nfp_svgnest.hpp | 0 .../libnest2d/tools/nfp_svgnest_glue.hpp | 0 {xs/src => src}/libnest2d/tools/svgtools.hpp | 0 {xs/src => src}/libslic3r/BoundingBox.cpp | 0 {xs/src => src}/libslic3r/BoundingBox.hpp | 0 {xs/src => src}/libslic3r/BridgeDetector.cpp | 0 {xs/src => src}/libslic3r/BridgeDetector.hpp | 0 src/libslic3r/CMakeLists.txt | 173 + {xs/src => src}/libslic3r/ClipperUtils.cpp | 0 {xs/src => src}/libslic3r/ClipperUtils.hpp | 0 {xs/src => src}/libslic3r/Config.cpp | 0 {xs/src => src}/libslic3r/Config.hpp | 0 {xs/src => src}/libslic3r/EdgeGrid.cpp | 0 {xs/src => src}/libslic3r/EdgeGrid.hpp | 0 {xs/src => src}/libslic3r/ExPolygon.cpp | 0 {xs/src => src}/libslic3r/ExPolygon.hpp | 0 .../libslic3r/ExPolygonCollection.cpp | 0 .../libslic3r/ExPolygonCollection.hpp | 0 {xs/src => src}/libslic3r/Extruder.cpp | 0 {xs/src => src}/libslic3r/Extruder.hpp | 0 {xs/src => src}/libslic3r/ExtrusionEntity.cpp | 0 {xs/src => src}/libslic3r/ExtrusionEntity.hpp | 0 .../libslic3r/ExtrusionEntityCollection.cpp | 0 .../libslic3r/ExtrusionEntityCollection.hpp | 0 .../libslic3r/ExtrusionSimulator.cpp | 0 .../libslic3r/ExtrusionSimulator.hpp | 0 {xs/src => src}/libslic3r/FileParserError.hpp | 0 {xs/src => src}/libslic3r/Fill/Fill.cpp | 0 {xs/src => src}/libslic3r/Fill/Fill.hpp | 0 .../libslic3r/Fill/Fill3DHoneycomb.cpp | 0 .../libslic3r/Fill/Fill3DHoneycomb.hpp | 0 {xs/src => src}/libslic3r/Fill/FillBase.cpp | 0 {xs/src => src}/libslic3r/Fill/FillBase.hpp | 0 .../libslic3r/Fill/FillConcentric.cpp | 0 .../libslic3r/Fill/FillConcentric.hpp | 0 {xs/src => src}/libslic3r/Fill/FillGyroid.cpp | 0 {xs/src => src}/libslic3r/Fill/FillGyroid.hpp | 0 .../libslic3r/Fill/FillHoneycomb.cpp | 0 .../libslic3r/Fill/FillHoneycomb.hpp | 0 .../libslic3r/Fill/FillPlanePath.cpp | 0 .../libslic3r/Fill/FillPlanePath.hpp | 0 .../libslic3r/Fill/FillRectilinear.cpp | 0 .../libslic3r/Fill/FillRectilinear.hpp | 0 .../libslic3r/Fill/FillRectilinear2.cpp | 0 .../libslic3r/Fill/FillRectilinear2.hpp | 0 .../libslic3r/Fill/FillRectilinear3.cpp | 0 .../libslic3r/Fill/FillRectilinear3.hpp | 0 {xs/src => src}/libslic3r/Flow.cpp | 0 {xs/src => src}/libslic3r/Flow.hpp | 0 {xs/src => src}/libslic3r/Format/3mf.cpp | 0 {xs/src => src}/libslic3r/Format/3mf.hpp | 0 {xs/src => src}/libslic3r/Format/AMF.cpp | 0 {xs/src => src}/libslic3r/Format/AMF.hpp | 0 {xs/src => src}/libslic3r/Format/OBJ.cpp | 0 {xs/src => src}/libslic3r/Format/OBJ.hpp | 0 {xs/src => src}/libslic3r/Format/PRUS.cpp | 0 {xs/src => src}/libslic3r/Format/PRUS.hpp | 0 {xs/src => src}/libslic3r/Format/STL.cpp | 0 {xs/src => src}/libslic3r/Format/STL.hpp | 0 .../libslic3r/Format/objparser.cpp | 0 .../libslic3r/Format/objparser.hpp | 0 {xs/src => src}/libslic3r/GCode.cpp | 0 {xs/src => src}/libslic3r/GCode.hpp | 0 {xs/src => src}/libslic3r/GCode/Analyzer.cpp | 0 {xs/src => src}/libslic3r/GCode/Analyzer.hpp | 0 .../libslic3r/GCode/CoolingBuffer.cpp | 0 .../libslic3r/GCode/CoolingBuffer.hpp | 0 .../libslic3r/GCode/PostProcessor.cpp | 0 .../libslic3r/GCode/PostProcessor.hpp | 0 .../libslic3r/GCode/PressureEqualizer.cpp | 0 .../libslic3r/GCode/PressureEqualizer.hpp | 0 .../libslic3r/GCode/PreviewData.cpp | 0 .../libslic3r/GCode/PreviewData.hpp | 0 .../libslic3r/GCode/PrintExtents.cpp | 0 .../libslic3r/GCode/PrintExtents.hpp | 0 .../libslic3r/GCode/SpiralVase.cpp | 0 .../libslic3r/GCode/SpiralVase.hpp | 0 .../libslic3r/GCode/ToolOrdering.cpp | 0 .../libslic3r/GCode/ToolOrdering.hpp | 0 {xs/src => src}/libslic3r/GCode/WipeTower.hpp | 0 .../libslic3r/GCode/WipeTowerPrusaMM.cpp | 0 .../libslic3r/GCode/WipeTowerPrusaMM.hpp | 0 {xs/src => src}/libslic3r/GCodeReader.cpp | 0 {xs/src => src}/libslic3r/GCodeReader.hpp | 0 {xs/src => src}/libslic3r/GCodeSender.cpp | 0 {xs/src => src}/libslic3r/GCodeSender.hpp | 0 .../libslic3r/GCodeTimeEstimator.cpp | 0 .../libslic3r/GCodeTimeEstimator.hpp | 0 {xs/src => src}/libslic3r/GCodeWriter.cpp | 0 {xs/src => src}/libslic3r/GCodeWriter.hpp | 0 {xs/src => src}/libslic3r/Geometry.cpp | 0 {xs/src => src}/libslic3r/Geometry.hpp | 0 {xs/src => src}/libslic3r/I18N.hpp | 0 {xs/src => src}/libslic3r/Int128.hpp | 0 {xs/src => src}/libslic3r/Layer.cpp | 0 {xs/src => src}/libslic3r/Layer.hpp | 0 {xs/src => src}/libslic3r/LayerRegion.cpp | 0 {xs/src => src}/libslic3r/Line.cpp | 0 {xs/src => src}/libslic3r/Line.hpp | 0 {xs/src => src}/libslic3r/Model.cpp | 0 {xs/src => src}/libslic3r/Model.hpp | 0 {xs/src => src}/libslic3r/ModelArrange.hpp | 0 {xs/src => src}/libslic3r/MotionPlanner.cpp | 0 {xs/src => src}/libslic3r/MotionPlanner.hpp | 0 {xs/src => src}/libslic3r/MultiPoint.cpp | 0 {xs/src => src}/libslic3r/MultiPoint.hpp | 0 .../libslic3r/MutablePriorityQueue.hpp | 0 .../libslic3r/PerimeterGenerator.cpp | 0 .../libslic3r/PerimeterGenerator.hpp | 0 .../libslic3r/PlaceholderParser.cpp | 0 .../libslic3r/PlaceholderParser.hpp | 0 {xs/src => src}/libslic3r/Point.cpp | 0 {xs/src => src}/libslic3r/Point.hpp | 0 {xs/src => src}/libslic3r/Polygon.cpp | 0 {xs/src => src}/libslic3r/Polygon.hpp | 0 {xs/src => src}/libslic3r/Polyline.cpp | 0 {xs/src => src}/libslic3r/Polyline.hpp | 0 .../libslic3r/PolylineCollection.cpp | 0 .../libslic3r/PolylineCollection.hpp | 0 {xs/src => src}/libslic3r/Print.cpp | 32 +- {xs/src => src}/libslic3r/Print.hpp | 0 {xs/src => src}/libslic3r/PrintConfig.cpp | 0 {xs/src => src}/libslic3r/PrintConfig.hpp | 0 {xs/src => src}/libslic3r/PrintExport.hpp | 0 {xs/src => src}/libslic3r/PrintObject.cpp | 0 {xs/src => src}/libslic3r/PrintRegion.cpp | 0 .../libslic3r/Rasterizer/Rasterizer.cpp | 0 .../libslic3r/Rasterizer/Rasterizer.hpp | 0 {xs/src => src}/libslic3r/SLABasePool.cpp | 0 {xs/src => src}/libslic3r/SLABasePool.hpp | 0 {xs/src => src}/libslic3r/SVG.cpp | 0 {xs/src => src}/libslic3r/SVG.hpp | 0 {xs/src => src}/libslic3r/Slicing.cpp | 0 {xs/src => src}/libslic3r/Slicing.hpp | 0 {xs/src => src}/libslic3r/SlicingAdaptive.cpp | 0 {xs/src => src}/libslic3r/SlicingAdaptive.hpp | 0 {xs/src => src}/libslic3r/SupportMaterial.cpp | 0 {xs/src => src}/libslic3r/SupportMaterial.hpp | 0 {xs/src => src}/libslic3r/Surface.cpp | 0 {xs/src => src}/libslic3r/Surface.hpp | 0 .../libslic3r/SurfaceCollection.cpp | 0 .../libslic3r/SurfaceCollection.hpp | 0 {xs/src => src}/libslic3r/Technologies.hpp | 0 {xs/src => src}/libslic3r/TriangleMesh.cpp | 0 {xs/src => src}/libslic3r/TriangleMesh.hpp | 0 {xs/src => src}/libslic3r/Utils.hpp | 0 {xs/src => src}/libslic3r/libslic3r.h | 0 {xs/src => src}/libslic3r/utils.cpp | 0 src/miniz/CMakeLists.txt | 14 + {xs/src => src}/miniz/miniz.cpp | 0 {xs/src => src}/miniz/miniz.h | 0 {xs/src => src}/miniz/miniz_common.h | 0 {xs/src => src}/miniz/miniz_tdef.cpp | 0 {xs/src => src}/miniz/miniz_tdef.h | 0 {xs/src => src}/miniz/miniz_tinfl.cpp | 0 {xs/src => src}/miniz/miniz_tinfl.h | 0 {xs/src => src}/miniz/miniz_zip.cpp | 0 {xs/src => src}/miniz/miniz_zip.h | 0 {xs/src => src}/png/AUTHORS | 0 {xs/src => src}/png/COPYING | 0 {xs/src => src}/png/NEWS | 0 {xs/src => src}/png/color.hpp | 0 {xs/src => src}/png/end_info.hpp | 0 {xs/src => src}/png/error.hpp | 0 {xs/src => src}/png/image_info.hpp | 0 {xs/src => src}/png/info.hpp | 0 {xs/src => src}/png/info_base.hpp | 0 {xs/src => src}/png/io_base.hpp | 0 {xs/src => src}/png/libpng/ANNOUNCE | 0 {xs/src => src}/png/libpng/CMakeLists.txt | 26 +- {xs/src => src}/png/libpng/LICENSE | 0 {xs/src => src}/png/libpng/arm/arm_init.c | 0 {xs/src => src}/png/libpng/arm/filter_neon.S | 0 .../png/libpng/arm/filter_neon_intrinsics.c | 0 .../png/libpng/intel/filter_sse2_intrinsics.c | 0 {xs/src => src}/png/libpng/intel/intel_init.c | 0 {xs/src => src}/png/libpng/libpng-config.in | 0 {xs/src => src}/png/libpng/libpng.pc.in | 0 .../png/libpng/mips/filter_msa_intrinsics.c | 0 {xs/src => src}/png/libpng/mips/mips_init.c | 0 {xs/src => src}/png/libpng/png.c | 0 {xs/src => src}/png/libpng/png.h | 0 {xs/src => src}/png/libpng/pngconf.h | 0 {xs/src => src}/png/libpng/pngdebug.h | 0 {xs/src => src}/png/libpng/pngerror.c | 0 {xs/src => src}/png/libpng/pngget.c | 0 {xs/src => src}/png/libpng/pnginfo.h | 0 {xs/src => src}/png/libpng/pngmem.c | 0 {xs/src => src}/png/libpng/pngpread.c | 0 {xs/src => src}/png/libpng/pngpriv.h | 0 {xs/src => src}/png/libpng/pngread.c | 0 {xs/src => src}/png/libpng/pngrio.c | 0 {xs/src => src}/png/libpng/pngrtran.c | 0 {xs/src => src}/png/libpng/pngrutil.c | 0 {xs/src => src}/png/libpng/pngset.c | 0 {xs/src => src}/png/libpng/pngstruct.h | 0 {xs/src => src}/png/libpng/pngtest.c | 0 {xs/src => src}/png/libpng/pngtrans.c | 0 {xs/src => src}/png/libpng/pngusr.dfa | 0 {xs/src => src}/png/libpng/pngwio.c | 0 {xs/src => src}/png/libpng/pngwrite.c | 0 {xs/src => src}/png/libpng/pngwtran.c | 0 {xs/src => src}/png/libpng/pngwutil.c | 0 .../libpng/powerpc/filter_vsx_intrinsics.c | 0 .../png/libpng/powerpc/powerpc_init.c | 0 .../png/libpng/scripts/checksym.awk | 0 {xs/src => src}/png/libpng/scripts/def.c | 0 {xs/src => src}/png/libpng/scripts/dfn.awk | 0 .../png/libpng/scripts/genchk.cmake.in | 0 .../png/libpng/scripts/genout.cmake.in | 0 .../png/libpng/scripts/gensrc.cmake.in | 0 .../png/libpng/scripts/intprefix.c | 0 .../png/libpng/scripts/libpng-config-body.in | 0 .../png/libpng/scripts/libpng-config-head.in | 0 .../png/libpng/scripts/libpng.pc.in | 0 .../png/libpng/scripts/options.awk | 0 .../png/libpng/scripts/pnglibconf.dfa | 0 .../png/libpng/scripts/pnglibconf.h.prebuilt | 0 {xs/src => src}/png/libpng/scripts/prefix.c | 0 {xs/src => src}/png/libpng/scripts/sym.c | 0 {xs/src => src}/png/libpng/scripts/symbols.c | 0 .../png/libpng/scripts/symbols.def | 0 .../png/libpng/scripts/test.cmake.in | 0 {xs/src => src}/png/libpng/scripts/vers.c | 0 {xs/src => src}/png/palette.hpp | 0 {xs/src => src}/png/pixel_traits.hpp | 0 {xs/src => src}/png/tRNS.hpp | 0 {xs/src => src}/png/types.hpp | 0 {xs/src => src}/png/writer.hpp | 0 {xs/src => src}/png/zlib/CMakeLists.txt | 0 {xs/src => src}/png/zlib/ChangeLog | 0 {xs/src => src}/png/zlib/FAQ | 0 {xs/src => src}/png/zlib/INDEX | 0 {xs/src => src}/png/zlib/Makefile | 0 {xs/src => src}/png/zlib/Makefile.in | 0 {xs/src => src}/png/zlib/README | 0 {xs/src => src}/png/zlib/adler32.c | 0 {xs/src => src}/png/zlib/amiga/Makefile.pup | 0 {xs/src => src}/png/zlib/amiga/Makefile.sas | 0 {xs/src => src}/png/zlib/compress.c | 0 {xs/src => src}/png/zlib/configure | 0 .../png/zlib/contrib/README.contrib | 0 .../png/zlib/contrib/ada/buffer_demo.adb | 0 .../png/zlib/contrib/ada/mtest.adb | 0 {xs/src => src}/png/zlib/contrib/ada/read.adb | 0 .../png/zlib/contrib/ada/readme.txt | 0 {xs/src => src}/png/zlib/contrib/ada/test.adb | 0 .../png/zlib/contrib/ada/zlib-streams.adb | 0 .../png/zlib/contrib/ada/zlib-streams.ads | 0 .../png/zlib/contrib/ada/zlib-thin.adb | 0 .../png/zlib/contrib/ada/zlib-thin.ads | 0 {xs/src => src}/png/zlib/contrib/ada/zlib.adb | 0 {xs/src => src}/png/zlib/contrib/ada/zlib.ads | 0 {xs/src => src}/png/zlib/contrib/ada/zlib.gpr | 0 .../png/zlib/contrib/amd64/amd64-match.S | 0 .../png/zlib/contrib/asm686/README.686 | 0 .../png/zlib/contrib/asm686/match.S | 0 .../png/zlib/contrib/blast/Makefile | 0 {xs/src => src}/png/zlib/contrib/blast/README | 0 .../png/zlib/contrib/blast/blast.c | 0 .../png/zlib/contrib/blast/blast.h | 0 .../png/zlib/contrib/blast/test.pk | Bin .../png/zlib/contrib/blast/test.txt | 0 .../png/zlib/contrib/delphi/ZLib.pas | 0 .../png/zlib/contrib/delphi/ZLibConst.pas | 0 .../png/zlib/contrib/delphi/readme.txt | 0 .../png/zlib/contrib/delphi/zlibd32.mak | 0 .../png/zlib/contrib/dotzlib/DotZLib.build | 0 .../png/zlib/contrib/dotzlib/DotZLib.chm | Bin .../png/zlib/contrib/dotzlib/DotZLib.sln | 0 .../contrib/dotzlib/DotZLib/AssemblyInfo.cs | 0 .../contrib/dotzlib/DotZLib/ChecksumImpl.cs | 0 .../contrib/dotzlib/DotZLib/CircularBuffer.cs | 0 .../zlib/contrib/dotzlib/DotZLib/CodecBase.cs | 0 .../zlib/contrib/dotzlib/DotZLib/Deflater.cs | 0 .../zlib/contrib/dotzlib/DotZLib/DotZLib.cs | 0 .../contrib/dotzlib/DotZLib/DotZLib.csproj | 0 .../contrib/dotzlib/DotZLib/GZipStream.cs | 0 .../zlib/contrib/dotzlib/DotZLib/Inflater.cs | 0 .../zlib/contrib/dotzlib/DotZLib/UnitTests.cs | 0 .../png/zlib/contrib/dotzlib/LICENSE_1_0.txt | 0 .../png/zlib/contrib/dotzlib/readme.txt | 0 .../png/zlib/contrib/gcc_gvmat64/gvmat64.S | 0 .../png/zlib/contrib/infback9/README | 0 .../png/zlib/contrib/infback9/infback9.c | 0 .../png/zlib/contrib/infback9/infback9.h | 0 .../png/zlib/contrib/infback9/inffix9.h | 0 .../png/zlib/contrib/infback9/inflate9.h | 0 .../png/zlib/contrib/infback9/inftree9.c | 0 .../png/zlib/contrib/infback9/inftree9.h | 0 .../png/zlib/contrib/inflate86/inffas86.c | 0 .../png/zlib/contrib/inflate86/inffast.S | 0 .../png/zlib/contrib/iostream/test.cpp | 0 .../png/zlib/contrib/iostream/zfstream.cpp | 0 .../png/zlib/contrib/iostream/zfstream.h | 0 .../png/zlib/contrib/iostream2/zstream.h | 0 .../zlib/contrib/iostream2/zstream_test.cpp | 0 .../png/zlib/contrib/iostream3/README | 0 .../png/zlib/contrib/iostream3/TODO | 0 .../png/zlib/contrib/iostream3/test.cc | 0 .../png/zlib/contrib/iostream3/zfstream.cc | 0 .../png/zlib/contrib/iostream3/zfstream.h | 0 .../png/zlib/contrib/masmx64/bld_ml64.bat | 0 .../png/zlib/contrib/masmx64/gvmat64.asm | 0 .../png/zlib/contrib/masmx64/inffas8664.c | 0 .../png/zlib/contrib/masmx64/inffasx64.asm | 0 .../png/zlib/contrib/masmx64/readme.txt | 0 .../png/zlib/contrib/masmx86/bld_ml32.bat | 0 .../png/zlib/contrib/masmx86/inffas32.asm | 0 .../png/zlib/contrib/masmx86/match686.asm | 0 .../png/zlib/contrib/masmx86/readme.txt | 0 .../png/zlib/contrib/minizip/Makefile | 0 .../png/zlib/contrib/minizip/Makefile.am | 0 .../contrib/minizip/MiniZip64_Changes.txt | 0 .../zlib/contrib/minizip/MiniZip64_info.txt | 0 .../png/zlib/contrib/minizip/configure.ac | 0 .../png/zlib/contrib/minizip/crypt.h | 0 .../png/zlib/contrib/minizip/ioapi.c | 0 .../png/zlib/contrib/minizip/ioapi.h | 0 .../png/zlib/contrib/minizip/iowin32.c | 0 .../png/zlib/contrib/minizip/iowin32.h | 0 .../png/zlib/contrib/minizip/make_vms.com | 0 .../png/zlib/contrib/minizip/miniunz.c | 0 .../png/zlib/contrib/minizip/miniunzip.1 | 0 .../png/zlib/contrib/minizip/minizip.1 | 0 .../png/zlib/contrib/minizip/minizip.c | 0 .../png/zlib/contrib/minizip/minizip.pc.in | 0 .../png/zlib/contrib/minizip/mztools.c | 0 .../png/zlib/contrib/minizip/mztools.h | 0 .../png/zlib/contrib/minizip/unzip.c | 0 .../png/zlib/contrib/minizip/unzip.h | 0 .../png/zlib/contrib/minizip/zip.c | 0 .../png/zlib/contrib/minizip/zip.h | 0 .../png/zlib/contrib/pascal/example.pas | 0 .../png/zlib/contrib/pascal/readme.txt | 0 .../png/zlib/contrib/pascal/zlibd32.mak | 0 .../png/zlib/contrib/pascal/zlibpas.pas | 0 .../png/zlib/contrib/puff/Makefile | 0 {xs/src => src}/png/zlib/contrib/puff/README | 0 {xs/src => src}/png/zlib/contrib/puff/puff.c | 0 {xs/src => src}/png/zlib/contrib/puff/puff.h | 0 .../png/zlib/contrib/puff/pufftest.c | 0 .../png/zlib/contrib/puff/zeros.raw | Bin .../png/zlib/contrib/testzlib/testzlib.c | 0 .../png/zlib/contrib/testzlib/testzlib.txt | 0 .../png/zlib/contrib/untgz/Makefile | 0 .../png/zlib/contrib/untgz/Makefile.msc | 0 .../png/zlib/contrib/untgz/untgz.c | 0 .../png/zlib/contrib/vstudio/readme.txt | 0 .../zlib/contrib/vstudio/vc10/miniunz.vcxproj | 0 .../vstudio/vc10/miniunz.vcxproj.filters | 0 .../zlib/contrib/vstudio/vc10/minizip.vcxproj | 0 .../vstudio/vc10/minizip.vcxproj.filters | 0 .../contrib/vstudio/vc10/testzlib.vcxproj | 0 .../vstudio/vc10/testzlib.vcxproj.filters | 0 .../contrib/vstudio/vc10/testzlibdll.vcxproj | 0 .../vstudio/vc10/testzlibdll.vcxproj.filters | 0 .../png/zlib/contrib/vstudio/vc10/zlib.rc | 0 .../contrib/vstudio/vc10/zlibstat.vcxproj | 0 .../vstudio/vc10/zlibstat.vcxproj.filters | 0 .../png/zlib/contrib/vstudio/vc10/zlibvc.def | 0 .../png/zlib/contrib/vstudio/vc10/zlibvc.sln | 0 .../zlib/contrib/vstudio/vc10/zlibvc.vcxproj | 0 .../vstudio/vc10/zlibvc.vcxproj.filters | 0 .../zlib/contrib/vstudio/vc11/miniunz.vcxproj | 0 .../zlib/contrib/vstudio/vc11/minizip.vcxproj | 0 .../contrib/vstudio/vc11/testzlib.vcxproj | 0 .../contrib/vstudio/vc11/testzlibdll.vcxproj | 0 .../png/zlib/contrib/vstudio/vc11/zlib.rc | 0 .../contrib/vstudio/vc11/zlibstat.vcxproj | 0 .../png/zlib/contrib/vstudio/vc11/zlibvc.def | 0 .../png/zlib/contrib/vstudio/vc11/zlibvc.sln | 0 .../zlib/contrib/vstudio/vc11/zlibvc.vcxproj | 0 .../zlib/contrib/vstudio/vc12/miniunz.vcxproj | 0 .../zlib/contrib/vstudio/vc12/minizip.vcxproj | 0 .../contrib/vstudio/vc12/testzlib.vcxproj | 0 .../contrib/vstudio/vc12/testzlibdll.vcxproj | 0 .../png/zlib/contrib/vstudio/vc12/zlib.rc | 0 .../contrib/vstudio/vc12/zlibstat.vcxproj | 0 .../png/zlib/contrib/vstudio/vc12/zlibvc.def | 0 .../png/zlib/contrib/vstudio/vc12/zlibvc.sln | 0 .../zlib/contrib/vstudio/vc12/zlibvc.vcxproj | 0 .../zlib/contrib/vstudio/vc14/miniunz.vcxproj | 0 .../zlib/contrib/vstudio/vc14/minizip.vcxproj | 0 .../contrib/vstudio/vc14/testzlib.vcxproj | 0 .../contrib/vstudio/vc14/testzlibdll.vcxproj | 0 .../png/zlib/contrib/vstudio/vc14/zlib.rc | 0 .../contrib/vstudio/vc14/zlibstat.vcxproj | 0 .../png/zlib/contrib/vstudio/vc14/zlibvc.def | 0 .../png/zlib/contrib/vstudio/vc14/zlibvc.sln | 0 .../zlib/contrib/vstudio/vc14/zlibvc.vcxproj | 0 .../zlib/contrib/vstudio/vc9/miniunz.vcproj | 0 .../zlib/contrib/vstudio/vc9/minizip.vcproj | 0 .../zlib/contrib/vstudio/vc9/testzlib.vcproj | 0 .../contrib/vstudio/vc9/testzlibdll.vcproj | 0 .../png/zlib/contrib/vstudio/vc9/zlib.rc | 0 .../zlib/contrib/vstudio/vc9/zlibstat.vcproj | 0 .../png/zlib/contrib/vstudio/vc9/zlibvc.def | 0 .../png/zlib/contrib/vstudio/vc9/zlibvc.sln | 0 .../zlib/contrib/vstudio/vc9/zlibvc.vcproj | 0 {xs/src => src}/png/zlib/crc32.c | 0 {xs/src => src}/png/zlib/crc32.h | 0 {xs/src => src}/png/zlib/deflate.c | 0 {xs/src => src}/png/zlib/deflate.h | 0 {xs/src => src}/png/zlib/gzclose.c | 0 {xs/src => src}/png/zlib/gzguts.h | 0 {xs/src => src}/png/zlib/gzlib.c | 0 {xs/src => src}/png/zlib/gzread.c | 0 {xs/src => src}/png/zlib/gzwrite.c | 0 {xs/src => src}/png/zlib/infback.c | 0 {xs/src => src}/png/zlib/inffast.c | 0 {xs/src => src}/png/zlib/inffast.h | 0 {xs/src => src}/png/zlib/inffixed.h | 0 {xs/src => src}/png/zlib/inflate.c | 0 {xs/src => src}/png/zlib/inflate.h | 0 {xs/src => src}/png/zlib/inftrees.c | 0 {xs/src => src}/png/zlib/inftrees.h | 0 {xs/src => src}/png/zlib/make_vms.com | 0 {xs/src => src}/png/zlib/msdos/Makefile.bor | 0 {xs/src => src}/png/zlib/msdos/Makefile.dj2 | 0 {xs/src => src}/png/zlib/msdos/Makefile.emx | 0 {xs/src => src}/png/zlib/msdos/Makefile.msc | 0 {xs/src => src}/png/zlib/msdos/Makefile.tc | 0 {xs/src => src}/png/zlib/nintendods/Makefile | 0 {xs/src => src}/png/zlib/nintendods/README | 0 {xs/src => src}/png/zlib/old/Makefile.emx | 0 {xs/src => src}/png/zlib/old/Makefile.riscos | 0 {xs/src => src}/png/zlib/old/README | 0 {xs/src => src}/png/zlib/old/descrip.mms | 0 {xs/src => src}/png/zlib/old/os2/Makefile.os2 | 0 {xs/src => src}/png/zlib/old/os2/zlib.def | 0 {xs/src => src}/png/zlib/old/visual-basic.txt | 0 {xs/src => src}/png/zlib/os400/README400 | 0 {xs/src => src}/png/zlib/os400/bndsrc | 0 {xs/src => src}/png/zlib/os400/make.sh | 0 {xs/src => src}/png/zlib/os400/zlib.inc | 0 {xs/src => src}/png/zlib/qnx/package.qpg | 0 {xs/src => src}/png/zlib/treebuild.xml | 0 {xs/src => src}/png/zlib/trees.c | 0 {xs/src => src}/png/zlib/trees.h | 0 {xs/src => src}/png/zlib/uncompr.c | 0 {xs/src => src}/png/zlib/watcom/watcom_f.mak | 0 {xs/src => src}/png/zlib/watcom/watcom_l.mak | 0 {xs/src => src}/png/zlib/win32/DLL_FAQ.txt | 0 {xs/src => src}/png/zlib/win32/Makefile.bor | 0 {xs/src => src}/png/zlib/win32/Makefile.gcc | 0 {xs/src => src}/png/zlib/win32/Makefile.msc | 0 .../png/zlib/win32/README-WIN32.txt | 0 {xs/src => src}/png/zlib/win32/VisualC.txt | 0 {xs/src => src}/png/zlib/win32/zlib.def | 0 {xs/src => src}/png/zlib/win32/zlib1.rc | 0 {xs/src => src}/png/zlib/zconf.h.cmakein | 0 {xs/src => src}/png/zlib/zconf.h.in | 0 {xs/src => src}/png/zlib/zconf.h.included | 0 {xs/src => src}/png/zlib/zlib.3 | 0 {xs/src => src}/png/zlib/zlib.3.pdf | Bin {xs/src => src}/png/zlib/zlib.h | 0 {xs/src => src}/png/zlib/zlib.map | 0 {xs/src => src}/png/zlib/zlib.pc.cmakein | 0 {xs/src => src}/png/zlib/zlib.pc.in | 0 {xs/src => src}/png/zlib/zlib2ansi | 0 {xs/src => src}/png/zlib/zutil.c | 0 {xs/src => src}/png/zlib/zutil.h | 0 src/poly2tri/CMakeLists.txt | 17 + {xs/src => src}/poly2tri/common/shapes.cc | 0 {xs/src => src}/poly2tri/common/shapes.h | 0 {xs/src => src}/poly2tri/common/utils.h | 0 {xs/src => src}/poly2tri/poly2tri.h | 0 .../poly2tri/sweep/advancing_front.cc | 0 .../poly2tri/sweep/advancing_front.h | 0 {xs/src => src}/poly2tri/sweep/cdt.cc | 0 {xs/src => src}/poly2tri/sweep/cdt.h | 0 {xs/src => src}/poly2tri/sweep/sweep.cc | 0 {xs/src => src}/poly2tri/sweep/sweep.h | 0 .../poly2tri/sweep/sweep_context.cc | 0 .../poly2tri/sweep/sweep_context.h | 0 src/polypartition/CMakeLists.txt | 7 + .../polypartition}/polypartition.cpp | 3126 +++--- {xs/src => src/polypartition}/polypartition.h | 686 +- {xs/src => src}/qhull/Announce.txt | 0 {xs/src => src}/qhull/CMakeLists.txt | 0 {xs/src => src}/qhull/COPYING.txt | 0 {xs/src => src}/qhull/README.txt | 0 {xs/src => src}/qhull/REGISTER.txt | 0 {xs/src => src}/qhull/html/index.htm | 0 .../html/normal_voronoi_knauss_oesterle.jpg | Bin {xs/src => src}/qhull/html/qconvex.htm | 0 {xs/src => src}/qhull/html/qdelau_f.htm | 0 {xs/src => src}/qhull/html/qdelaun.htm | 0 {xs/src => src}/qhull/html/qh--4d.gif | Bin {xs/src => src}/qhull/html/qh--cone.gif | Bin {xs/src => src}/qhull/html/qh--dt.gif | Bin {xs/src => src}/qhull/html/qh--geom.gif | Bin {xs/src => src}/qhull/html/qh--half.gif | Bin {xs/src => src}/qhull/html/qh--rand.gif | Bin {xs/src => src}/qhull/html/qh-code.htm | 0 {xs/src => src}/qhull/html/qh-eg.htm | 0 {xs/src => src}/qhull/html/qh-faq.htm | 0 {xs/src => src}/qhull/html/qh-get.htm | 0 {xs/src => src}/qhull/html/qh-impre.htm | 0 {xs/src => src}/qhull/html/qh-optc.htm | 0 {xs/src => src}/qhull/html/qh-optf.htm | 0 {xs/src => src}/qhull/html/qh-optg.htm | 0 {xs/src => src}/qhull/html/qh-opto.htm | 0 {xs/src => src}/qhull/html/qh-optp.htm | 0 {xs/src => src}/qhull/html/qh-optq.htm | 0 {xs/src => src}/qhull/html/qh-optt.htm | 0 {xs/src => src}/qhull/html/qh-quick.htm | 0 {xs/src => src}/qhull/html/qhalf.htm | 0 {xs/src => src}/qhull/html/qhull-cpp.xml | 0 {xs/src => src}/qhull/html/qhull.htm | 0 {xs/src => src}/qhull/html/qhull.man | 0 {xs/src => src}/qhull/html/qhull.txt | 0 {xs/src => src}/qhull/html/qvoron_f.htm | 0 {xs/src => src}/qhull/html/qvoronoi.htm | 0 {xs/src => src}/qhull/html/rbox.htm | 0 {xs/src => src}/qhull/html/rbox.man | 0 {xs/src => src}/qhull/html/rbox.txt | 0 {xs/src => src}/qhull/index.htm | 0 {xs/src => src}/qhull/origCMakeLists.txt | 0 {xs/src => src}/qhull/src/Changes.txt | 0 .../qhull/src/libqhull/DEPRECATED.txt | 0 {xs/src => src}/qhull/src/libqhull/Makefile | 0 {xs/src => src}/qhull/src/libqhull/Mborland | 0 {xs/src => src}/qhull/src/libqhull/geom.c | 0 {xs/src => src}/qhull/src/libqhull/geom.h | 0 {xs/src => src}/qhull/src/libqhull/geom2.c | 0 {xs/src => src}/qhull/src/libqhull/global.c | 0 {xs/src => src}/qhull/src/libqhull/index.htm | 0 {xs/src => src}/qhull/src/libqhull/io.c | 0 {xs/src => src}/qhull/src/libqhull/io.h | 0 {xs/src => src}/qhull/src/libqhull/libqhull.c | 0 {xs/src => src}/qhull/src/libqhull/libqhull.h | 0 .../qhull/src/libqhull/libqhull.pro | 0 {xs/src => src}/qhull/src/libqhull/mem.c | 0 {xs/src => src}/qhull/src/libqhull/mem.h | 0 {xs/src => src}/qhull/src/libqhull/merge.c | 0 {xs/src => src}/qhull/src/libqhull/merge.h | 0 {xs/src => src}/qhull/src/libqhull/poly.c | 0 {xs/src => src}/qhull/src/libqhull/poly.h | 0 {xs/src => src}/qhull/src/libqhull/poly2.c | 0 .../qhull/src/libqhull/qh-geom.htm | 0 .../qhull/src/libqhull/qh-globa.htm | 0 {xs/src => src}/qhull/src/libqhull/qh-io.htm | 0 {xs/src => src}/qhull/src/libqhull/qh-mem.htm | 0 .../qhull/src/libqhull/qh-merge.htm | 0 .../qhull/src/libqhull/qh-poly.htm | 0 .../qhull/src/libqhull/qh-qhull.htm | 0 {xs/src => src}/qhull/src/libqhull/qh-set.htm | 0 .../qhull/src/libqhull/qh-stat.htm | 0 .../qhull/src/libqhull/qh-user.htm | 0 .../qhull/src/libqhull/qhull-exports.def | 0 {xs/src => src}/qhull/src/libqhull/qhull_a.h | 0 .../qhull/src/libqhull/qhull_p-exports.def | 0 {xs/src => src}/qhull/src/libqhull/qset.c | 0 {xs/src => src}/qhull/src/libqhull/qset.h | 0 {xs/src => src}/qhull/src/libqhull/random.c | 0 {xs/src => src}/qhull/src/libqhull/random.h | 0 {xs/src => src}/qhull/src/libqhull/rboxlib.c | 0 {xs/src => src}/qhull/src/libqhull/stat.c | 0 {xs/src => src}/qhull/src/libqhull/stat.h | 0 {xs/src => src}/qhull/src/libqhull/user.c | 0 {xs/src => src}/qhull/src/libqhull/user.h | 0 {xs/src => src}/qhull/src/libqhull/usermem.c | 0 .../qhull/src/libqhull/userprintf.c | 0 .../qhull/src/libqhull/userprintf_rbox.c | 0 {xs/src => src}/qhull/src/libqhull_r/Makefile | 0 .../qhull/src/libqhull_r/geom2_r.c | 0 {xs/src => src}/qhull/src/libqhull_r/geom_r.c | 0 {xs/src => src}/qhull/src/libqhull_r/geom_r.h | 0 .../qhull/src/libqhull_r/global_r.c | 0 .../qhull/src/libqhull_r/index.htm | 0 {xs/src => src}/qhull/src/libqhull_r/io_r.c | 0 {xs/src => src}/qhull/src/libqhull_r/io_r.h | 0 .../qhull/src/libqhull_r/libqhull_r.c | 0 .../qhull/src/libqhull_r/libqhull_r.h | 0 .../qhull/src/libqhull_r/libqhull_r.pro | 0 {xs/src => src}/qhull/src/libqhull_r/mem_r.c | 0 {xs/src => src}/qhull/src/libqhull_r/mem_r.h | 0 .../qhull/src/libqhull_r/merge_r.c | 0 .../qhull/src/libqhull_r/merge_r.h | 0 .../qhull/src/libqhull_r/poly2_r.c | 0 {xs/src => src}/qhull/src/libqhull_r/poly_r.c | 0 {xs/src => src}/qhull/src/libqhull_r/poly_r.h | 0 .../qhull/src/libqhull_r/qh-geom_r.htm | 0 .../qhull/src/libqhull_r/qh-globa_r.htm | 0 .../qhull/src/libqhull_r/qh-io_r.htm | 0 .../qhull/src/libqhull_r/qh-mem_r.htm | 0 .../qhull/src/libqhull_r/qh-merge_r.htm | 0 .../qhull/src/libqhull_r/qh-poly_r.htm | 0 .../qhull/src/libqhull_r/qh-qhull_r.htm | 0 .../qhull/src/libqhull_r/qh-set_r.htm | 0 .../qhull/src/libqhull_r/qh-stat_r.htm | 0 .../qhull/src/libqhull_r/qh-user_r.htm | 0 .../qhull/src/libqhull_r/qhull_r-exports.def | 0 .../qhull/src/libqhull_r/qhull_ra.h | 0 {xs/src => src}/qhull/src/libqhull_r/qset_r.c | 0 {xs/src => src}/qhull/src/libqhull_r/qset_r.h | 0 .../qhull/src/libqhull_r/random_r.c | 0 .../qhull/src/libqhull_r/random_r.h | 0 .../qhull/src/libqhull_r/rboxlib_r.c | 0 {xs/src => src}/qhull/src/libqhull_r/stat_r.c | 0 {xs/src => src}/qhull/src/libqhull_r/stat_r.h | 0 {xs/src => src}/qhull/src/libqhull_r/user_r.c | 0 {xs/src => src}/qhull/src/libqhull_r/user_r.h | 0 .../qhull/src/libqhull_r/usermem_r.c | 0 .../qhull/src/libqhull_r/userprintf_r.c | 0 .../qhull/src/libqhull_r/userprintf_rbox_r.c | 0 .../qhull/src/libqhullcpp/Coordinates.cpp | 0 .../qhull/src/libqhullcpp/Coordinates.h | 0 .../src/libqhullcpp/PointCoordinates.cpp | 0 .../qhull/src/libqhullcpp/PointCoordinates.h | 0 .../qhull/src/libqhullcpp/Qhull.cpp | 0 {xs/src => src}/qhull/src/libqhullcpp/Qhull.h | 0 .../qhull/src/libqhullcpp/QhullError.h | 0 .../qhull/src/libqhullcpp/QhullFacet.cpp | 0 .../qhull/src/libqhullcpp/QhullFacet.h | 0 .../qhull/src/libqhullcpp/QhullFacetList.cpp | 0 .../qhull/src/libqhullcpp/QhullFacetList.h | 0 .../qhull/src/libqhullcpp/QhullFacetSet.cpp | 0 .../qhull/src/libqhullcpp/QhullFacetSet.h | 0 .../qhull/src/libqhullcpp/QhullHyperplane.cpp | 0 .../qhull/src/libqhullcpp/QhullHyperplane.h | 0 .../qhull/src/libqhullcpp/QhullIterator.h | 0 .../qhull/src/libqhullcpp/QhullLinkedList.h | 0 .../qhull/src/libqhullcpp/QhullPoint.cpp | 0 .../qhull/src/libqhullcpp/QhullPoint.h | 0 .../qhull/src/libqhullcpp/QhullPointSet.cpp | 0 .../qhull/src/libqhullcpp/QhullPointSet.h | 0 .../qhull/src/libqhullcpp/QhullPoints.cpp | 0 .../qhull/src/libqhullcpp/QhullPoints.h | 0 .../qhull/src/libqhullcpp/QhullQh.cpp | 0 .../qhull/src/libqhullcpp/QhullQh.h | 0 .../qhull/src/libqhullcpp/QhullRidge.cpp | 0 .../qhull/src/libqhullcpp/QhullRidge.h | 0 .../qhull/src/libqhullcpp/QhullSet.cpp | 0 .../qhull/src/libqhullcpp/QhullSet.h | 0 .../qhull/src/libqhullcpp/QhullSets.h | 0 .../qhull/src/libqhullcpp/QhullStat.cpp | 0 .../qhull/src/libqhullcpp/QhullStat.h | 0 .../qhull/src/libqhullcpp/QhullVertex.cpp | 0 .../qhull/src/libqhullcpp/QhullVertex.h | 0 .../qhull/src/libqhullcpp/QhullVertexSet.cpp | 0 .../qhull/src/libqhullcpp/QhullVertexSet.h | 0 .../qhull/src/libqhullcpp/RboxPoints.cpp | 0 .../qhull/src/libqhullcpp/RboxPoints.h | 0 .../qhull/src/libqhullcpp/RoadError.cpp | 0 .../qhull/src/libqhullcpp/RoadError.h | 0 .../qhull/src/libqhullcpp/RoadLogEvent.cpp | 0 .../qhull/src/libqhullcpp/RoadLogEvent.h | 0 .../qhull/src/libqhullcpp/functionObjects.h | 0 .../qhull/src/libqhullcpp/libqhullcpp.pro | 0 .../qhull/src/libqhullcpp/qt-qhull.cpp | 0 .../qhull/src/libqhullcpp/usermem_r-cpp.cpp | 0 .../src/libqhullstatic/libqhullstatic.pro | 0 .../src/libqhullstatic_r/libqhullstatic_r.pro | 0 {xs/src => src}/qhull/src/qconvex/qconvex.c | 0 {xs/src => src}/qhull/src/qconvex/qconvex.pro | 0 {xs/src => src}/qhull/src/qconvex/qconvex_r.c | 0 {xs/src => src}/qhull/src/qdelaunay/qdelaun.c | 0 .../qhull/src/qdelaunay/qdelaun_r.c | 0 .../qhull/src/qdelaunay/qdelaunay.pro | 0 {xs/src => src}/qhull/src/qhalf/qhalf.c | 0 {xs/src => src}/qhull/src/qhalf/qhalf.pro | 0 {xs/src => src}/qhull/src/qhalf/qhalf_r.c | 0 {xs/src => src}/qhull/src/qhull-all.pro | 0 {xs/src => src}/qhull/src/qhull-app-c.pri | 0 {xs/src => src}/qhull/src/qhull-app-c_r.pri | 0 {xs/src => src}/qhull/src/qhull-app-cpp.pri | 0 .../qhull/src/qhull-app-shared.pri | 0 .../qhull/src/qhull-app-shared_r.pri | 0 .../qhull/src/qhull-libqhull-src.pri | 0 .../qhull/src/qhull-libqhull-src_r.pri | 0 {xs/src => src}/qhull/src/qhull-warn.pri | 0 {xs/src => src}/qhull/src/qhull/qhull.pro | 0 {xs/src => src}/qhull/src/qhull/unix.c | 0 {xs/src => src}/qhull/src/qhull/unix_r.c | 0 .../qhull/src/qhulltest/Coordinates_test.cpp | 0 .../src/qhulltest/PointCoordinates_test.cpp | 0 .../src/qhulltest/QhullFacetList_test.cpp | 0 .../src/qhulltest/QhullFacetSet_test.cpp | 0 .../qhull/src/qhulltest/QhullFacet_test.cpp | 0 .../src/qhulltest/QhullHyperplane_test.cpp | 0 .../src/qhulltest/QhullLinkedList_test.cpp | 0 .../src/qhulltest/QhullPointSet_test.cpp | 0 .../qhull/src/qhulltest/QhullPoint_test.cpp | 0 .../qhull/src/qhulltest/QhullPoints_test.cpp | 0 .../qhull/src/qhulltest/QhullRidge_test.cpp | 0 .../qhull/src/qhulltest/QhullSet_test.cpp | 0 .../src/qhulltest/QhullVertexSet_test.cpp | 0 .../qhull/src/qhulltest/QhullVertex_test.cpp | 0 .../qhull/src/qhulltest/Qhull_test.cpp | 0 .../qhull/src/qhulltest/RboxPoints_test.cpp | 0 .../qhull/src/qhulltest/RoadTest.cpp | 0 .../qhull/src/qhulltest/RoadTest.h | 0 .../qhull/src/qhulltest/qhulltest.cpp | 0 .../qhull/src/qhulltest/qhulltest.pro | 0 {xs/src => src}/qhull/src/qvoronoi/qvoronoi.c | 0 .../qhull/src/qvoronoi/qvoronoi.pro | 0 .../qhull/src/qvoronoi/qvoronoi_r.c | 0 {xs/src => src}/qhull/src/rbox/rbox.c | 0 {xs/src => src}/qhull/src/rbox/rbox.pro | 0 {xs/src => src}/qhull/src/rbox/rbox_r.c | 0 {xs/src => src}/qhull/src/testqset/testqset.c | 0 .../qhull/src/testqset/testqset.pro | 0 .../qhull/src/testqset_r/testqset_r.c | 0 .../qhull/src/testqset_r/testqset_r.pro | 0 {xs/src => src}/qhull/src/user_eg/user_eg.c | 0 {xs/src => src}/qhull/src/user_eg/user_eg.pro | 0 {xs/src => src}/qhull/src/user_eg/user_eg_r.c | 0 {xs/src => src}/qhull/src/user_eg2/user_eg2.c | 0 .../qhull/src/user_eg2/user_eg2.pro | 0 .../qhull/src/user_eg2/user_eg2_r.c | 0 .../qhull/src/user_eg3/user_eg3.pro | 0 .../qhull/src/user_eg3/user_eg3_r.cpp | 0 src/semver/CMakeLists.txt | 7 + {xs/src => src}/semver/semver.c | 0 {xs/src => src}/semver/semver.h | 0 src/slic3r.cpp | 81 + {xs/src => src}/slic3r/AppController.cpp | 0 {xs/src => src}/slic3r/AppController.hpp | 0 {xs/src => src}/slic3r/AppControllerWx.cpp | 0 src/slic3r/CMakeLists.txt | 106 + {xs/src => src}/slic3r/Config/Snapshot.cpp | 0 {xs/src => src}/slic3r/Config/Snapshot.hpp | 0 {xs/src => src}/slic3r/Config/Version.cpp | 0 {xs/src => src}/slic3r/Config/Version.hpp | 0 {xs/src => src}/slic3r/GUI/2DBed.cpp | 0 {xs/src => src}/slic3r/GUI/2DBed.hpp | 0 {xs/src => src}/slic3r/GUI/3DScene.cpp | 0 {xs/src => src}/slic3r/GUI/3DScene.hpp | 0 {xs/src => src}/slic3r/GUI/AboutDialog.cpp | 0 {xs/src => src}/slic3r/GUI/AboutDialog.hpp | 0 {xs/src => src}/slic3r/GUI/AppConfig.cpp | 0 {xs/src => src}/slic3r/GUI/AppConfig.hpp | 0 .../slic3r/GUI/BackgroundSlicingProcess.cpp | 0 .../slic3r/GUI/BackgroundSlicingProcess.hpp | 0 {xs/src => src}/slic3r/GUI/BedShapeDialog.cpp | 0 {xs/src => src}/slic3r/GUI/BedShapeDialog.hpp | 0 {xs/src => src}/slic3r/GUI/BitmapCache.cpp | 0 {xs/src => src}/slic3r/GUI/BitmapCache.hpp | 0 {xs/src => src}/slic3r/GUI/BonjourDialog.cpp | 0 {xs/src => src}/slic3r/GUI/BonjourDialog.hpp | 0 .../slic3r/GUI/ButtonsDescription.cpp | 0 .../slic3r/GUI/ButtonsDescription.hpp | 0 .../slic3r/GUI/ConfigExceptions.hpp | 0 .../slic3r/GUI/ConfigSnapshotDialog.cpp | 0 .../slic3r/GUI/ConfigSnapshotDialog.hpp | 0 {xs/src => src}/slic3r/GUI/ConfigWizard.cpp | 0 {xs/src => src}/slic3r/GUI/ConfigWizard.hpp | 0 .../slic3r/GUI/ConfigWizard_private.hpp | 0 {xs/src => src}/slic3r/GUI/Field.cpp | 0 {xs/src => src}/slic3r/GUI/Field.hpp | 0 {xs/src => src}/slic3r/GUI/FirmwareDialog.cpp | 0 {xs/src => src}/slic3r/GUI/FirmwareDialog.hpp | 0 {xs/src => src}/slic3r/GUI/GLCanvas3D.cpp | 0 {xs/src => src}/slic3r/GUI/GLCanvas3D.hpp | 0 .../slic3r/GUI/GLCanvas3DManager.cpp | 0 .../slic3r/GUI/GLCanvas3DManager.hpp | 0 {xs/src => src}/slic3r/GUI/GLGizmo.cpp | 0 {xs/src => src}/slic3r/GUI/GLGizmo.hpp | 0 {xs/src => src}/slic3r/GUI/GLShader.cpp | 0 {xs/src => src}/slic3r/GUI/GLShader.hpp | 0 {xs/src => src}/slic3r/GUI/GLTexture.cpp | 0 {xs/src => src}/slic3r/GUI/GLTexture.hpp | 0 {xs/src => src}/slic3r/GUI/GLToolbar.cpp | 0 {xs/src => src}/slic3r/GUI/GLToolbar.hpp | 0 {xs/src => src}/slic3r/GUI/GUI.cpp | 15 + {xs/src => src}/slic3r/GUI/GUI.hpp | 5 + .../slic3r/GUI/GUI_ObjectParts.cpp | 0 .../slic3r/GUI/GUI_ObjectParts.hpp | 0 .../slic3r/GUI/LambdaObjectDialog.cpp | 0 .../slic3r/GUI/LambdaObjectDialog.hpp | 0 {xs/src => src}/slic3r/GUI/MsgDialog.cpp | 0 {xs/src => src}/slic3r/GUI/MsgDialog.hpp | 0 {xs/src => src}/slic3r/GUI/OptionsGroup.cpp | 0 {xs/src => src}/slic3r/GUI/OptionsGroup.hpp | 0 {xs/src => src}/slic3r/GUI/Preferences.cpp | 0 {xs/src => src}/slic3r/GUI/Preferences.hpp | 0 {xs/src => src}/slic3r/GUI/Preset.cpp | 0 {xs/src => src}/slic3r/GUI/Preset.hpp | 0 {xs/src => src}/slic3r/GUI/PresetBundle.cpp | 0 {xs/src => src}/slic3r/GUI/PresetBundle.hpp | 0 {xs/src => src}/slic3r/GUI/PresetHints.cpp | 0 {xs/src => src}/slic3r/GUI/PresetHints.hpp | 0 .../slic3r/GUI/ProgressIndicator.hpp | 0 .../slic3r/GUI/ProgressStatusBar.cpp | 0 .../slic3r/GUI/ProgressStatusBar.hpp | 2 +- {xs/src => src}/slic3r/GUI/RammingChart.cpp | 0 {xs/src => src}/slic3r/GUI/RammingChart.hpp | 0 {xs/src => src}/slic3r/GUI/Tab.cpp | 0 {xs/src => src}/slic3r/GUI/Tab.hpp | 0 {xs/src => src}/slic3r/GUI/TabIface.cpp | 0 {xs/src => src}/slic3r/GUI/TabIface.hpp | 0 {xs/src => src}/slic3r/GUI/UpdateDialogs.cpp | 0 {xs/src => src}/slic3r/GUI/UpdateDialogs.hpp | 0 {xs/src => src}/slic3r/GUI/Widget.hpp | 0 .../slic3r/GUI/WipeTowerDialog.cpp | 0 .../slic3r/GUI/WipeTowerDialog.hpp | 0 src/slic3r/GUI/callback.hpp | 30 + {xs/src => src}/slic3r/GUI/wxExtensions.cpp | 0 {xs/src => src}/slic3r/GUI/wxExtensions.hpp | 0 {xs/src => src}/slic3r/GUI/wxinit.h | 0 {xs/src => src}/slic3r/Utils/ASCIIFolding.cpp | 0 {xs/src => src}/slic3r/Utils/ASCIIFolding.hpp | 0 {xs/src => src}/slic3r/Utils/Bonjour.cpp | 0 {xs/src => src}/slic3r/Utils/Bonjour.hpp | 0 {xs/src => src}/slic3r/Utils/Duet.cpp | 0 {xs/src => src}/slic3r/Utils/Duet.hpp | 0 .../slic3r/Utils/FixModelByWin10.cpp | 0 .../slic3r/Utils/FixModelByWin10.hpp | 0 {xs/src => src}/slic3r/Utils/HexFile.cpp | 0 {xs/src => src}/slic3r/Utils/HexFile.hpp | 0 {xs/src => src}/slic3r/Utils/Http.cpp | 0 {xs/src => src}/slic3r/Utils/Http.hpp | 0 {xs/src => src}/slic3r/Utils/OctoPrint.cpp | 0 {xs/src => src}/slic3r/Utils/OctoPrint.hpp | 0 .../slic3r/Utils/PresetUpdater.cpp | 0 .../slic3r/Utils/PresetUpdater.hpp | 0 {xs/src => src}/slic3r/Utils/PrintHost.cpp | 0 {xs/src => src}/slic3r/Utils/PrintHost.hpp | 0 .../slic3r/Utils/PrintHostSendDialog.cpp | 0 .../slic3r/Utils/PrintHostSendDialog.hpp | 0 {xs/src => src}/slic3r/Utils/Semver.hpp | 0 {xs/src => src}/slic3r/Utils/Serial.cpp | 0 {xs/src => src}/slic3r/Utils/Serial.hpp | 0 {xs/src => src}/slic3r/Utils/Time.cpp | 0 {xs/src => src}/slic3r/Utils/Time.hpp | 0 xs/CMakeLists.txt | 685 +- .../EDBG/protocoldocs/ch03s01s01.html~ | 215 - xs/src/libnest2d/tools/benchmark.h | 58 - xs/src/slic3r/GUI/wxPerlIface.cpp | 97 - 1706 files changed, 7413 insertions(+), 7638 deletions(-) create mode 100644 resources/localization/CMakeLists.txt create mode 100644 src/CMakeLists.txt create mode 100644 src/Shiny/CMakeLists.txt rename {xs/src => src}/Shiny/Shiny.h (100%) rename {xs/src => src}/Shiny/ShinyConfig.h (100%) rename {xs/src => src}/Shiny/ShinyData.h (100%) rename {xs/src => src}/Shiny/ShinyMacros.h (100%) rename {xs/src => src}/Shiny/ShinyManager.c (100%) rename {xs/src => src}/Shiny/ShinyManager.h (100%) rename {xs/src => src}/Shiny/ShinyNode.c (100%) rename {xs/src => src}/Shiny/ShinyNode.h (100%) rename {xs/src => src}/Shiny/ShinyNodePool.c (100%) rename {xs/src => src}/Shiny/ShinyNodePool.h (100%) rename {xs/src => src}/Shiny/ShinyNodeState.c (100%) rename {xs/src => src}/Shiny/ShinyNodeState.h (100%) rename {xs/src => src}/Shiny/ShinyOutput.c (100%) rename {xs/src => src}/Shiny/ShinyOutput.h (100%) rename {xs/src => src}/Shiny/ShinyPrereqs.h (100%) rename {xs/src => src}/Shiny/ShinyTools.c (100%) rename {xs/src => src}/Shiny/ShinyTools.h (100%) rename {xs/src => src}/Shiny/ShinyVersion.h (100%) rename {xs/src => src}/Shiny/ShinyZone.c (100%) rename {xs/src => src}/Shiny/ShinyZone.h (100%) create mode 100644 src/admesh/CMakeLists.txt rename {xs/src => src}/admesh/connect.cpp (100%) rename {xs/src => src}/admesh/normals.cpp (100%) rename {xs/src => src}/admesh/shared.cpp (100%) rename {xs/src => src}/admesh/stl.h (100%) rename {xs/src => src}/admesh/stl_io.cpp (100%) rename {xs/src => src}/admesh/stlinit.cpp (100%) rename {xs/src => src}/admesh/util.cpp (100%) rename {xs/src => src}/agg/AUTHORS (100%) rename {xs/src => src}/agg/VERSION (100%) rename {xs/src => src}/agg/agg_array.h (100%) rename {xs/src => src}/agg/agg_basics.h (100%) rename {xs/src => src}/agg/agg_bezier_arc.h (100%) rename {xs/src => src}/agg/agg_clip_liang_barsky.h (100%) rename {xs/src => src}/agg/agg_color_gray.h (100%) rename {xs/src => src}/agg/agg_color_rgba.h (100%) rename {xs/src => src}/agg/agg_config.h (100%) rename {xs/src => src}/agg/agg_conv_transform.h (100%) rename {xs/src => src}/agg/agg_gamma_functions.h (100%) rename {xs/src => src}/agg/agg_gamma_lut.h (100%) rename {xs/src => src}/agg/agg_math.h (100%) rename {xs/src => src}/agg/agg_path_storage.h (100%) rename {xs/src => src}/agg/agg_pixfmt_base.h (100%) rename {xs/src => src}/agg/agg_pixfmt_gray.h (100%) rename {xs/src => src}/agg/agg_pixfmt_rgb.h (100%) rename {xs/src => src}/agg/agg_rasterizer_cells_aa.h (100%) rename {xs/src => src}/agg/agg_rasterizer_scanline_aa.h (100%) rename {xs/src => src}/agg/agg_rasterizer_scanline_aa_nogamma.h (100%) rename {xs/src => src}/agg/agg_rasterizer_sl_clip.h (100%) rename {xs/src => src}/agg/agg_renderer_base.h (100%) rename {xs/src => src}/agg/agg_renderer_scanline.h (100%) rename {xs/src => src}/agg/agg_rendering_buffer.h (100%) rename {xs/src => src}/agg/agg_scanline_p.h (100%) rename {xs/src => src}/agg/agg_trans_affine.h (100%) rename {xs/src => src}/agg/copying (100%) rename {xs/src => src}/avrdude/AUTHORS (100%) rename {xs/src => src}/avrdude/BUILD-FROM-SVN (100%) rename {xs/src => src}/avrdude/CMakeLists.txt (100%) rename {xs/src => src}/avrdude/COPYING (100%) rename {xs/src => src}/avrdude/ChangeLog (100%) rename {xs/src => src}/avrdude/ChangeLog-2001 (100%) rename {xs/src => src}/avrdude/ChangeLog-2002 (100%) rename {xs/src => src}/avrdude/ChangeLog-2003 (100%) rename {xs/src => src}/avrdude/ChangeLog-2004-2006 (100%) rename {xs/src => src}/avrdude/ChangeLog-2007 (100%) rename {xs/src => src}/avrdude/ChangeLog-2008 (100%) rename {xs/src => src}/avrdude/ChangeLog-2009 (100%) rename {xs/src => src}/avrdude/ChangeLog-2010 (100%) rename {xs/src => src}/avrdude/ChangeLog-2011 (100%) rename {xs/src => src}/avrdude/ChangeLog-2012 (100%) rename {xs/src => src}/avrdude/ChangeLog-2013 (100%) rename {xs/src => src}/avrdude/ChangeLog-2014 (100%) rename {xs/src => src}/avrdude/ChangeLog-2015 (100%) rename {xs/src => src}/avrdude/Makefile.am (100%) rename {xs/src => src}/avrdude/Makefile.standalone (100%) rename {xs/src => src}/avrdude/NEWS (100%) rename {xs/src => src}/avrdude/README (100%) rename {xs/src => src}/avrdude/ac_cfg.h (100%) rename {xs/src => src}/avrdude/ac_cfg.h.in (100%) rename {xs/src => src}/avrdude/arduino.c (100%) rename {xs/src => src}/avrdude/arduino.h (100%) rename {xs/src => src}/avrdude/atmel-docs/AVR109.pdf (100%) rename {xs/src => src}/avrdude/atmel-docs/AVR910.pdf (100%) rename {xs/src => src}/avrdude/atmel-docs/AVRISPmkII-AVR069.pdf (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/browserDetect.js (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/css/960.css (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/css/docbook.css (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/css/fluid_grid.css (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/css/index.css (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/css/positioning.css (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/css/print.css (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/css/reset.css (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/css/text.css (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/fonts/DroidSansMono.eot (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/fonts/DroidSansMono.ttf (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/images/Book_Closed.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/images/Book_Open.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/images/Document_Text.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/images/Library.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/images/external_link.gif (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/images/loading.gif (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/images/logo.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/images/minus.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/images/next-arrow.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/images/plus.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/images/previous-arrow.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/images/search-icon.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/images/sidebar.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/images/starsSmall.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/images/toc-icon.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/images/ui-icons_217bc0_256x240.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/jquery-1.7.2.min.js (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/jquery.cookie.js (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/jquery.ui.all.js (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/layout/jquery.layout.js (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-anim_basic_16x16.gif (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_flat_55_fbec88_40x100.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_glass_75_d0e5f5_1x400.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_glass_85_dfeffc_1x400.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_glass_95_fef1ec_1x400.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_217bc0_256x240.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_2e83ff_256x240.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_469bdd_256x240.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_6da8d5_256x240.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_cd0a0a_256x240.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_d8e7f3_256x240.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_f9bd01_256x240.png (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/file.gif (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/folder-closed.gif (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/folder.gif (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-black-line.gif (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-black.gif (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-default-line.gif (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-default.gif (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-famfamfam-line.gif (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-famfamfam.gif (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-gray-line.gif (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-gray.gif (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-red-line.gif (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-red.gif (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/treeview/jquery.treeview.css (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/jquery/treeview/jquery.treeview.min.js (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/main.js (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/common/splitterInit.js (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch01s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch01s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s02s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s02s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s05.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s06.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s07.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s08.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s09.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s03s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s05.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s05.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s09.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s10.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s05.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s06.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s07.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s08.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s09.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s10.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s11.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s12.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s13.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s14.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s15.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s05.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s06.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch05s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s05.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s06.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s07.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s08.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s09.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s10.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s11.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s12.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s13.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s14.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s15.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s16.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s17.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s18.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s19.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s20.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s21.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s22.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s23.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s24.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s25.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s26.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s27.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s28.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s29.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s05.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s03s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s03s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s04s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s04s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s04s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s05.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch06s06.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s05.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s06.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s07.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s08.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s09.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s10.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s11.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s12.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s13.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s14.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s15.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s16.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s17.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch07s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s04.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s05.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s06.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch08s02.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/ch08s03.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/document.revisions.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/index.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/pr01.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.Introduction.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avr32protocol.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avr8protocol.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avrispprotocol.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avrprotocol.Overview.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.cmsis_dap.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.edbg_ctrl_protocol.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.tpiprotocol.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/search/htmlFileInfoList.js (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/search/index-1.js (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/search/index-2.js (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/search/index-3.js (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/search/l10n.js (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/search/nwSearchFnt.js (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/search/stemmers/en_stemmer.js (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/section_avr32_memtypes.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/section_avr32_setget_params.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/section_avr8_memtypes.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/section_avr8_query_contexts.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/section_avr8_setget_params.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/section_edbg_ctrl_setget_params.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/section_edbg_query_contexts.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/section_housekeeping_start_session.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/section_i5v_3yz_rl.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/section_jdx_m11_sl.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/section_qhb_x1c_sl.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/section_serial_trace.html (100%) rename {xs/src => src}/avrdude/atmel-docs/EDBG/protocoldocs/section_t1f_hb1_sl.html (100%) rename {xs/src => src}/avrdude/atmel-docs/JTAGICE-AVR060.pdf (100%) rename {xs/src => src}/avrdude/atmel-docs/JTAGICEmkII-AVR067.pdf (100%) rename {xs/src => src}/avrdude/atmel-docs/STK500-AVR061.pdf (100%) rename {xs/src => src}/avrdude/atmel-docs/STK500v2-AVR068.pdf (100%) rename {xs/src => src}/avrdude/avr.c (100%) rename {xs/src => src}/avrdude/avr910.c (100%) rename {xs/src => src}/avrdude/avr910.h (100%) rename {xs/src => src}/avrdude/avrdude-slic3r.cpp (100%) rename {xs/src => src}/avrdude/avrdude-slic3r.hpp (100%) rename {xs/src => src}/avrdude/avrdude.1 (100%) rename {xs/src => src}/avrdude/avrdude.conf (100%) rename {xs/src => src}/avrdude/avrdude.conf.in (100%) rename {xs/src => src}/avrdude/avrdude.conf.tmp (100%) rename {xs/src => src}/avrdude/avrdude.h (100%) rename {xs/src => src}/avrdude/avrdude.spec.in (100%) rename {xs/src => src}/avrdude/avrftdi.c (100%) rename {xs/src => src}/avrdude/avrftdi.h (100%) rename {xs/src => src}/avrdude/avrftdi_private.h (100%) rename {xs/src => src}/avrdude/avrftdi_tpi.c (100%) rename {xs/src => src}/avrdude/avrftdi_tpi.h (100%) rename {xs/src => src}/avrdude/avrpart.c (100%) rename {xs/src => src}/avrdude/bitbang.c (100%) rename {xs/src => src}/avrdude/bitbang.h (100%) rename {xs/src => src}/avrdude/bootstrap (100%) mode change 100755 => 100644 rename {xs/src => src}/avrdude/buspirate.c (100%) rename {xs/src => src}/avrdude/buspirate.h (100%) rename {xs/src => src}/avrdude/butterfly.c (100%) rename {xs/src => src}/avrdude/butterfly.h (100%) rename {xs/src => src}/avrdude/config.c (100%) rename {xs/src => src}/avrdude/config.h (100%) rename {xs/src => src}/avrdude/config_gram.c (100%) rename {xs/src => src}/avrdude/config_gram.h (100%) rename {xs/src => src}/avrdude/config_gram.y (100%) rename {xs/src => src}/avrdude/configure.ac (100%) rename {xs/src => src}/avrdude/confwin.c (100%) rename {xs/src => src}/avrdude/crc16.c (100%) rename {xs/src => src}/avrdude/crc16.h (100%) rename {xs/src => src}/avrdude/dfu.c (100%) rename {xs/src => src}/avrdude/dfu.h (100%) rename {xs/src => src}/avrdude/doc/.cvsignore (100%) rename {xs/src => src}/avrdude/doc/Makefile.am (100%) rename {xs/src => src}/avrdude/doc/TODO (100%) rename {xs/src => src}/avrdude/doc/avrdude.texi (100%) rename {xs/src => src}/avrdude/doc/parts_comments.txt (100%) rename {xs/src => src}/avrdude/fileio.c (100%) rename {xs/src => src}/avrdude/flip1.c (100%) rename {xs/src => src}/avrdude/flip1.h (100%) rename {xs/src => src}/avrdude/flip2.c (100%) rename {xs/src => src}/avrdude/flip2.h (100%) rename {xs/src => src}/avrdude/freebsd_ppi.h (100%) rename {xs/src => src}/avrdude/ft245r.c (100%) rename {xs/src => src}/avrdude/ft245r.h (100%) rename {xs/src => src}/avrdude/jtag3.c (100%) rename {xs/src => src}/avrdude/jtag3.h (100%) rename {xs/src => src}/avrdude/jtag3_private.h (100%) rename {xs/src => src}/avrdude/jtagmkI.c (100%) rename {xs/src => src}/avrdude/jtagmkI.h (100%) rename {xs/src => src}/avrdude/jtagmkII.c (100%) rename {xs/src => src}/avrdude/jtagmkII.h (100%) rename {xs/src => src}/avrdude/jtagmkII_private.h (100%) rename {xs/src => src}/avrdude/jtagmkI_private.h (100%) rename {xs/src => src}/avrdude/lexer.c (100%) rename {xs/src => src}/avrdude/lexer.l (100%) rename {xs/src => src}/avrdude/libavrdude.h (100%) rename {xs/src => src}/avrdude/linux_ppdev.h (100%) rename {xs/src => src}/avrdude/linuxgpio.c (100%) rename {xs/src => src}/avrdude/linuxgpio.h (100%) rename {xs/src => src}/avrdude/lists.c (100%) rename {xs/src => src}/avrdude/main-standalone.c (100%) rename {xs/src => src}/avrdude/main.c (100%) rename {xs/src => src}/avrdude/my_ddk_hidsdi.h (100%) rename {xs/src => src}/avrdude/par.c (100%) rename {xs/src => src}/avrdude/par.h (100%) rename {xs/src => src}/avrdude/pgm.c (100%) rename {xs/src => src}/avrdude/pgm_type.c (100%) rename {xs/src => src}/avrdude/pickit2.c (100%) rename {xs/src => src}/avrdude/pickit2.h (100%) rename {xs/src => src}/avrdude/pindefs.c (100%) rename {xs/src => src}/avrdude/ppi.c (100%) rename {xs/src => src}/avrdude/ppi.h (100%) rename {xs/src => src}/avrdude/ppiwin.c (100%) rename {xs/src => src}/avrdude/safemode.c (100%) rename {xs/src => src}/avrdude/ser_avrdoper.c (100%) rename {xs/src => src}/avrdude/ser_posix.c (100%) rename {xs/src => src}/avrdude/ser_win32.c (100%) rename {xs/src => src}/avrdude/serbb.h (100%) rename {xs/src => src}/avrdude/serbb_posix.c (100%) rename {xs/src => src}/avrdude/serbb_win32.c (100%) rename {xs/src => src}/avrdude/solaris_ecpp.h (100%) rename {xs/src => src}/avrdude/stk500.c (100%) rename {xs/src => src}/avrdude/stk500.h (100%) rename {xs/src => src}/avrdude/stk500_private.h (100%) rename {xs/src => src}/avrdude/stk500generic.c (100%) rename {xs/src => src}/avrdude/stk500generic.h (100%) rename {xs/src => src}/avrdude/stk500v2.c (100%) rename {xs/src => src}/avrdude/stk500v2.h (100%) rename {xs/src => src}/avrdude/stk500v2_private.h (100%) rename {xs/src => src}/avrdude/term.c (100%) rename {xs/src => src}/avrdude/term.h (100%) rename {xs/src => src}/avrdude/tools/build-mingw32.sh (100%) mode change 100755 => 100644 rename {xs/src => src}/avrdude/tools/get-dw-params.xsl (100%) rename {xs/src => src}/avrdude/tools/get-hv-params.xsl (100%) rename {xs/src => src}/avrdude/tools/get-stk600-cards.xsl (100%) rename {xs/src => src}/avrdude/tools/get-stk600-devices.xsl (100%) rename {xs/src => src}/avrdude/tpi.h (100%) rename {xs/src => src}/avrdude/update.c (100%) rename {xs/src => src}/avrdude/usb_hidapi.c (100%) rename {xs/src => src}/avrdude/usb_libusb.c (100%) rename {xs/src => src}/avrdude/usbasp.c (100%) rename {xs/src => src}/avrdude/usbasp.h (100%) rename {xs/src => src}/avrdude/usbdevs.h (100%) rename {xs/src => src}/avrdude/usbtiny.c (100%) rename {xs/src => src}/avrdude/usbtiny.h (100%) rename {xs/src => src}/avrdude/windows/.cvsignore (100%) rename {xs/src => src}/avrdude/windows/Makefile.am (100%) rename {xs/src => src}/avrdude/windows/getopt.c (100%) rename {xs/src => src}/avrdude/windows/getopt.h (100%) rename {xs/src => src}/avrdude/windows/giveio.c (100%) rename {xs/src => src}/avrdude/windows/giveio.sys (100%) rename {xs/src => src}/avrdude/windows/install_giveio.bat (100%) mode change 100755 => 100644 rename {xs/src => src}/avrdude/windows/loaddrv.c (100%) rename {xs/src => src}/avrdude/windows/loaddrv.h (100%) rename {xs/src => src}/avrdude/windows/remove_giveio.bat (100%) mode change 100755 => 100644 rename {xs/src => src}/avrdude/windows/status_giveio.bat (100%) mode change 100755 => 100644 rename {xs/src => src}/avrdude/windows/unistd.cpp (100%) rename {xs/src => src}/avrdude/windows/unistd.h (100%) rename {xs/src => src}/avrdude/wiring.c (100%) rename {xs/src => src}/avrdude/wiring.h (100%) create mode 100644 src/boost/CMakeLists.txt rename {xs/src => src}/boost/nowide/args.hpp (100%) rename {xs/src => src}/boost/nowide/cenv.hpp (100%) rename {xs/src => src}/boost/nowide/config.hpp (100%) rename {xs/src => src}/boost/nowide/convert.hpp (100%) rename {xs/src => src}/boost/nowide/cstdio.hpp (100%) rename {xs/src => src}/boost/nowide/cstdlib.hpp (100%) rename {xs/src => src}/boost/nowide/filebuf.hpp (100%) rename {xs/src => src}/boost/nowide/fstream.hpp (100%) rename {xs/src => src}/boost/nowide/integration/filesystem.hpp (100%) rename {xs/src => src}/boost/nowide/iostream.cpp (100%) rename {xs/src => src}/boost/nowide/iostream.hpp (100%) rename {xs/src => src}/boost/nowide/stackstring.hpp (100%) rename {xs/src => src}/boost/nowide/system.hpp (100%) rename {xs/src => src}/boost/nowide/utf8_codecvt.hpp (100%) rename {xs/src => src}/boost/nowide/windows.hpp (100%) create mode 100644 src/clipper/CMakeLists.txt rename {xs/src => src/clipper}/clipper.cpp (96%) rename {xs/src => src/clipper}/clipper.hpp (97%) rename {xs/src => src}/eigen/COPYING.README (100%) rename {xs/src => src}/eigen/Eigen/CMakeLists.txt (100%) rename {xs/src => src}/eigen/Eigen/Cholesky (100%) rename {xs/src => src}/eigen/Eigen/CholmodSupport (100%) rename {xs/src => src}/eigen/Eigen/Core (100%) rename {xs/src => src}/eigen/Eigen/Dense (100%) rename {xs/src => src}/eigen/Eigen/Eigen (100%) rename {xs/src => src}/eigen/Eigen/Eigenvalues (100%) rename {xs/src => src}/eigen/Eigen/Geometry (100%) rename {xs/src => src}/eigen/Eigen/Householder (100%) rename {xs/src => src}/eigen/Eigen/IterativeLinearSolvers (100%) rename {xs/src => src}/eigen/Eigen/Jacobi (100%) rename {xs/src => src}/eigen/Eigen/LU (100%) rename {xs/src => src}/eigen/Eigen/MetisSupport (100%) rename {xs/src => src}/eigen/Eigen/OrderingMethods (100%) rename {xs/src => src}/eigen/Eigen/PaStiXSupport (100%) rename {xs/src => src}/eigen/Eigen/PardisoSupport (100%) rename {xs/src => src}/eigen/Eigen/QR (100%) rename {xs/src => src}/eigen/Eigen/QtAlignedMalloc (100%) rename {xs/src => src}/eigen/Eigen/SPQRSupport (100%) rename {xs/src => src}/eigen/Eigen/SVD (100%) rename {xs/src => src}/eigen/Eigen/Sparse (100%) rename {xs/src => src}/eigen/Eigen/SparseCholesky (100%) rename {xs/src => src}/eigen/Eigen/SparseCore (100%) rename {xs/src => src}/eigen/Eigen/SparseLU (100%) rename {xs/src => src}/eigen/Eigen/SparseQR (100%) rename {xs/src => src}/eigen/Eigen/StdDeque (100%) rename {xs/src => src}/eigen/Eigen/StdList (100%) rename {xs/src => src}/eigen/Eigen/StdVector (100%) rename {xs/src => src}/eigen/Eigen/SuperLUSupport (100%) rename {xs/src => src}/eigen/Eigen/UmfPackSupport (100%) rename {xs/src => src}/eigen/Eigen/src/Cholesky/LDLT.h (100%) rename {xs/src => src}/eigen/Eigen/src/Cholesky/LLT.h (100%) rename {xs/src => src}/eigen/Eigen/src/Cholesky/LLT_LAPACKE.h (100%) rename {xs/src => src}/eigen/Eigen/src/CholmodSupport/CholmodSupport.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Array.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/ArrayBase.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/ArrayWrapper.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Assign.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/AssignEvaluator.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Assign_MKL.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/BandMatrix.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Block.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/BooleanRedux.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/CommaInitializer.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/ConditionEstimator.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/CoreEvaluators.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/CoreIterators.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/CwiseBinaryOp.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/CwiseNullaryOp.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/CwiseTernaryOp.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/CwiseUnaryOp.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/CwiseUnaryView.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/DenseBase.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/DenseCoeffsBase.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/DenseStorage.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Diagonal.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/DiagonalMatrix.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/DiagonalProduct.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Dot.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/EigenBase.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/ForceAlignedAccess.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Fuzzy.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/GeneralProduct.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/GenericPacketMath.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/GlobalFunctions.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/IO.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Inverse.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Map.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/MapBase.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/MathFunctions.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/MathFunctionsImpl.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Matrix.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/MatrixBase.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/NestByValue.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/NoAlias.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/NumTraits.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/PermutationMatrix.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/PlainObjectBase.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Product.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/ProductEvaluators.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Random.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Redux.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Ref.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Replicate.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/ReturnByValue.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Reverse.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Select.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/SelfAdjointView.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/SelfCwiseBinaryOp.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Solve.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/SolveTriangular.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/SolverBase.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/StableNorm.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Stride.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Swap.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Transpose.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Transpositions.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/TriangularMatrix.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/VectorBlock.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/VectorwiseOp.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/Visitor.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/AVX/Complex.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/AVX/MathFunctions.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/AVX/PacketMath.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/AVX/TypeCasting.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/AVX512/MathFunctions.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/AVX512/PacketMath.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/AltiVec/Complex.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/AltiVec/MathFunctions.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/AltiVec/PacketMath.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/CUDA/Complex.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/CUDA/Half.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/CUDA/MathFunctions.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/CUDA/PacketMath.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/CUDA/PacketMathHalf.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/CUDA/TypeCasting.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/Default/ConjHelper.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/Default/Settings.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/NEON/Complex.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/NEON/MathFunctions.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/NEON/PacketMath.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/SSE/Complex.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/SSE/MathFunctions.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/SSE/PacketMath.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/SSE/TypeCasting.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/ZVector/Complex.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/ZVector/MathFunctions.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/arch/ZVector/PacketMath.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/functors/AssignmentFunctors.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/functors/BinaryFunctors.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/functors/NullaryFunctors.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/functors/StlFunctors.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/functors/TernaryFunctors.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/functors/UnaryFunctors.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/GeneralBlockPanelKernel.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/GeneralMatrixMatrix.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_BLAS.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/GeneralMatrixMatrix_BLAS.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/GeneralMatrixVector.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/GeneralMatrixVector_BLAS.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/Parallelizer.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/SelfadjointMatrixMatrix.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/SelfadjointMatrixMatrix_BLAS.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/SelfadjointMatrixVector.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/SelfadjointMatrixVector_BLAS.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/SelfadjointProduct.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/SelfadjointRank2Update.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/TriangularMatrixMatrix.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/TriangularMatrixMatrix_BLAS.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/TriangularMatrixVector.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/TriangularMatrixVector_BLAS.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/TriangularSolverMatrix.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/TriangularSolverMatrix_BLAS.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/products/TriangularSolverVector.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/util/BlasUtil.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/util/Constants.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/util/DisableStupidWarnings.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/util/ForwardDeclarations.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/util/MKL_support.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/util/Macros.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/util/Memory.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/util/Meta.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/util/NonMPL2.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/util/ReenableStupidWarnings.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/util/StaticAssert.h (100%) rename {xs/src => src}/eigen/Eigen/src/Core/util/XprHelper.h (100%) rename {xs/src => src}/eigen/Eigen/src/Eigenvalues/ComplexEigenSolver.h (100%) rename {xs/src => src}/eigen/Eigen/src/Eigenvalues/ComplexSchur.h (100%) rename {xs/src => src}/eigen/Eigen/src/Eigenvalues/ComplexSchur_LAPACKE.h (100%) rename {xs/src => src}/eigen/Eigen/src/Eigenvalues/EigenSolver.h (100%) rename {xs/src => src}/eigen/Eigen/src/Eigenvalues/GeneralizedEigenSolver.h (100%) rename {xs/src => src}/eigen/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h (100%) rename {xs/src => src}/eigen/Eigen/src/Eigenvalues/HessenbergDecomposition.h (100%) rename {xs/src => src}/eigen/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h (100%) rename {xs/src => src}/eigen/Eigen/src/Eigenvalues/RealQZ.h (100%) rename {xs/src => src}/eigen/Eigen/src/Eigenvalues/RealSchur.h (100%) rename {xs/src => src}/eigen/Eigen/src/Eigenvalues/RealSchur_LAPACKE.h (100%) rename {xs/src => src}/eigen/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h (100%) rename {xs/src => src}/eigen/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_LAPACKE.h (100%) rename {xs/src => src}/eigen/Eigen/src/Eigenvalues/Tridiagonalization.h (100%) rename {xs/src => src}/eigen/Eigen/src/Geometry/AlignedBox.h (100%) rename {xs/src => src}/eigen/Eigen/src/Geometry/AngleAxis.h (100%) rename {xs/src => src}/eigen/Eigen/src/Geometry/EulerAngles.h (100%) rename {xs/src => src}/eigen/Eigen/src/Geometry/Homogeneous.h (100%) rename {xs/src => src}/eigen/Eigen/src/Geometry/Hyperplane.h (100%) rename {xs/src => src}/eigen/Eigen/src/Geometry/OrthoMethods.h (100%) rename {xs/src => src}/eigen/Eigen/src/Geometry/ParametrizedLine.h (100%) rename {xs/src => src}/eigen/Eigen/src/Geometry/Quaternion.h (100%) rename {xs/src => src}/eigen/Eigen/src/Geometry/Rotation2D.h (100%) rename {xs/src => src}/eigen/Eigen/src/Geometry/RotationBase.h (100%) rename {xs/src => src}/eigen/Eigen/src/Geometry/Scaling.h (100%) rename {xs/src => src}/eigen/Eigen/src/Geometry/Transform.h (100%) rename {xs/src => src}/eigen/Eigen/src/Geometry/Translation.h (100%) rename {xs/src => src}/eigen/Eigen/src/Geometry/Umeyama.h (100%) rename {xs/src => src}/eigen/Eigen/src/Geometry/arch/Geometry_SSE.h (100%) rename {xs/src => src}/eigen/Eigen/src/Householder/BlockHouseholder.h (100%) rename {xs/src => src}/eigen/Eigen/src/Householder/Householder.h (100%) rename {xs/src => src}/eigen/Eigen/src/Householder/HouseholderSequence.h (100%) rename {xs/src => src}/eigen/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h (100%) rename {xs/src => src}/eigen/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h (100%) rename {xs/src => src}/eigen/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h (100%) rename {xs/src => src}/eigen/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h (100%) rename {xs/src => src}/eigen/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h (100%) rename {xs/src => src}/eigen/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h (100%) rename {xs/src => src}/eigen/Eigen/src/IterativeLinearSolvers/LeastSquareConjugateGradient.h (100%) rename {xs/src => src}/eigen/Eigen/src/IterativeLinearSolvers/SolveWithGuess.h (100%) rename {xs/src => src}/eigen/Eigen/src/Jacobi/Jacobi.h (100%) rename {xs/src => src}/eigen/Eigen/src/LU/Determinant.h (100%) rename {xs/src => src}/eigen/Eigen/src/LU/FullPivLU.h (100%) rename {xs/src => src}/eigen/Eigen/src/LU/InverseImpl.h (100%) rename {xs/src => src}/eigen/Eigen/src/LU/PartialPivLU.h (100%) rename {xs/src => src}/eigen/Eigen/src/LU/PartialPivLU_LAPACKE.h (100%) rename {xs/src => src}/eigen/Eigen/src/LU/arch/Inverse_SSE.h (100%) rename {xs/src => src}/eigen/Eigen/src/MetisSupport/MetisSupport.h (100%) rename {xs/src => src}/eigen/Eigen/src/OrderingMethods/Amd.h (100%) rename {xs/src => src}/eigen/Eigen/src/OrderingMethods/Eigen_Colamd.h (100%) rename {xs/src => src}/eigen/Eigen/src/OrderingMethods/Ordering.h (100%) rename {xs/src => src}/eigen/Eigen/src/PaStiXSupport/PaStiXSupport.h (100%) rename {xs/src => src}/eigen/Eigen/src/PardisoSupport/PardisoSupport.h (100%) rename {xs/src => src}/eigen/Eigen/src/QR/ColPivHouseholderQR.h (100%) rename {xs/src => src}/eigen/Eigen/src/QR/ColPivHouseholderQR_LAPACKE.h (100%) rename {xs/src => src}/eigen/Eigen/src/QR/CompleteOrthogonalDecomposition.h (100%) rename {xs/src => src}/eigen/Eigen/src/QR/FullPivHouseholderQR.h (100%) rename {xs/src => src}/eigen/Eigen/src/QR/HouseholderQR.h (100%) rename {xs/src => src}/eigen/Eigen/src/QR/HouseholderQR_LAPACKE.h (100%) rename {xs/src => src}/eigen/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h (100%) rename {xs/src => src}/eigen/Eigen/src/SVD/BDCSVD.h (100%) rename {xs/src => src}/eigen/Eigen/src/SVD/JacobiSVD.h (100%) rename {xs/src => src}/eigen/Eigen/src/SVD/JacobiSVD_LAPACKE.h (100%) rename {xs/src => src}/eigen/Eigen/src/SVD/SVDBase.h (100%) rename {xs/src => src}/eigen/Eigen/src/SVD/UpperBidiagonalization.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCholesky/SimplicialCholesky.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCholesky/SimplicialCholesky_impl.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/AmbiVector.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/CompressedStorage.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/MappedSparseMatrix.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseAssign.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseBlock.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseColEtree.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseCompressedBase.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseCwiseBinaryOp.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseCwiseUnaryOp.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseDenseProduct.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseDiagonalProduct.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseDot.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseFuzzy.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseMap.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseMatrix.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseMatrixBase.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparsePermutation.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseProduct.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseRedux.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseRef.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseSelfAdjointView.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseSolverBase.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseSparseProductWithPruning.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseTranspose.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseTriangularView.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseUtil.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseVector.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/SparseView.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseCore/TriangularSolver.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLU.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLUImpl.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLU_Memory.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLU_Structs.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLU_Utils.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLU_column_bmod.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLU_column_dfs.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLU_copy_to_ucol.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLU_gemm_kernel.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLU_heap_relax_snode.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLU_kernel_bmod.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLU_panel_bmod.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLU_panel_dfs.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLU_pivotL.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLU_pruneL.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseLU/SparseLU_relax_snode.h (100%) rename {xs/src => src}/eigen/Eigen/src/SparseQR/SparseQR.h (100%) rename {xs/src => src}/eigen/Eigen/src/StlSupport/StdDeque.h (100%) rename {xs/src => src}/eigen/Eigen/src/StlSupport/StdList.h (100%) rename {xs/src => src}/eigen/Eigen/src/StlSupport/StdVector.h (100%) rename {xs/src => src}/eigen/Eigen/src/StlSupport/details.h (100%) rename {xs/src => src}/eigen/Eigen/src/SuperLUSupport/SuperLUSupport.h (100%) rename {xs/src => src}/eigen/Eigen/src/UmfPackSupport/UmfPackSupport.h (100%) rename {xs/src => src}/eigen/Eigen/src/misc/Image.h (100%) rename {xs/src => src}/eigen/Eigen/src/misc/Kernel.h (100%) rename {xs/src => src}/eigen/Eigen/src/misc/RealSvd2x2.h (100%) rename {xs/src => src}/eigen/Eigen/src/misc/blas.h (100%) rename {xs/src => src}/eigen/Eigen/src/misc/lapack.h (100%) rename {xs/src => src}/eigen/Eigen/src/misc/lapacke.h (100%) rename {xs/src => src}/eigen/Eigen/src/misc/lapacke_mangling.h (100%) rename {xs/src => src}/eigen/Eigen/src/plugins/ArrayCwiseBinaryOps.h (100%) rename {xs/src => src}/eigen/Eigen/src/plugins/ArrayCwiseUnaryOps.h (100%) rename {xs/src => src}/eigen/Eigen/src/plugins/BlockMethods.h (100%) rename {xs/src => src}/eigen/Eigen/src/plugins/CommonCwiseBinaryOps.h (100%) rename {xs/src => src}/eigen/Eigen/src/plugins/CommonCwiseUnaryOps.h (100%) rename {xs/src => src}/eigen/Eigen/src/plugins/MatrixCwiseBinaryOps.h (100%) rename {xs/src => src}/eigen/Eigen/src/plugins/MatrixCwiseUnaryOps.h (100%) rename {xs/src => src}/eigen/README.md (100%) rename {xs/src => src}/expat/COPYING (100%) rename {xs/src => src}/expat/README (100%) rename {xs/src => src}/expat/ascii.h (100%) rename {xs/src => src}/expat/asciitab.h (100%) rename {xs/src => src}/expat/expat.h (100%) rename {xs/src => src}/expat/expat_config.h (100%) rename {xs/src => src}/expat/expat_external.h (100%) rename {xs/src => src}/expat/iasciitab.h (100%) rename {xs/src => src}/expat/internal.h (100%) rename {xs/src => src}/expat/latin1tab.h (100%) rename {xs/src => src}/expat/nametab.h (100%) rename {xs/src => src}/expat/utf8tab.h (100%) rename {xs/src => src}/expat/xmlparse.c (100%) rename {xs/src => src}/expat/xmlrole.c (100%) rename {xs/src => src}/expat/xmlrole.h (100%) rename {xs/src => src}/expat/xmltok.c (100%) rename {xs/src => src}/expat/xmltok.h (100%) rename {xs/src => src}/expat/xmltok_impl.h (100%) rename {xs/src => src}/expat/xmltok_impl.inc (100%) rename {xs/src => src}/expat/xmltok_ns.inc (100%) rename {xs/src => src}/glew/LICENSE.txt (100%) rename {xs/src => src}/glew/README.md (100%) rename {xs/src => src}/glew/include/GL/glew.h (100%) rename {xs/src => src}/glew/include/GL/glxew.h (100%) rename {xs/src => src}/glew/include/GL/wglew.h (100%) rename {xs/src => src}/glew/src/glew.c (100%) rename {xs/src => src}/libnest2d/CMakeLists.txt (100%) rename {xs/src => src}/libnest2d/LICENSE.txt (100%) rename {xs/src => src}/libnest2d/README.md (100%) rename {xs/src => src}/libnest2d/cmake_modules/DownloadNLopt.cmake (100%) rename {xs/src => src}/libnest2d/cmake_modules/DownloadProject.CMakeLists.cmake.in (100%) rename {xs/src => src}/libnest2d/cmake_modules/DownloadProject.cmake (100%) rename {xs/src => src}/libnest2d/cmake_modules/FindClipper.cmake (100%) rename {xs/src => src}/libnest2d/cmake_modules/FindNLopt.cmake (100%) rename {xs/src => src}/libnest2d/cmake_modules/FindTBB.cmake (100%) rename {xs/src => src}/libnest2d/examples/main.cpp (100%) rename {xs/src => src}/libnest2d/libnest2d.h (100%) rename {xs/src => src}/libnest2d/libnest2d/boost_alg.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/clipper_backend/CMakeLists.txt (100%) rename {xs/src => src}/libnest2d/libnest2d/clipper_backend/clipper_backend.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/common.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/geometry_traits.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/geometry_traits_nfp.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/libnest2d.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/metaloop.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/optimizer.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/optimizers/genetic.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/optimizers/nlopt_boilerplate.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/optimizers/simplex.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/optimizers/subplex.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/placers/bottomleftplacer.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/placers/nfpplacer.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/placers/placer_boilerplate.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/rotfinder.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/selections/djd_heuristic.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/selections/filler.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/selections/firstfit.hpp (100%) rename {xs/src => src}/libnest2d/libnest2d/selections/selection_boilerplate.hpp (100%) rename {xs/src => src}/libnest2d/tests/CMakeLists.txt (100%) rename {xs/src => src}/libnest2d/tests/printer_parts.cpp (100%) rename {xs/src => src}/libnest2d/tests/printer_parts.h (100%) rename {xs/src => src}/libnest2d/tests/test.cpp (100%) rename {xs/src => src/libnest2d/tools}/benchmark.h (100%) rename {xs/src => src}/libnest2d/tools/libnfpglue.cpp (100%) rename {xs/src => src}/libnest2d/tools/libnfpglue.hpp (100%) rename {xs/src => src}/libnest2d/tools/libnfporb/LICENSE (100%) rename {xs/src => src}/libnest2d/tools/libnfporb/ORIGIN (100%) rename {xs/src => src}/libnest2d/tools/libnfporb/README.md (100%) rename {xs/src => src}/libnest2d/tools/libnfporb/libnfporb.hpp (100%) rename {xs/src => src}/libnest2d/tools/nfp_svgnest.hpp (100%) rename {xs/src => src}/libnest2d/tools/nfp_svgnest_glue.hpp (100%) rename {xs/src => src}/libnest2d/tools/svgtools.hpp (100%) rename {xs/src => src}/libslic3r/BoundingBox.cpp (100%) rename {xs/src => src}/libslic3r/BoundingBox.hpp (100%) rename {xs/src => src}/libslic3r/BridgeDetector.cpp (100%) rename {xs/src => src}/libslic3r/BridgeDetector.hpp (100%) create mode 100644 src/libslic3r/CMakeLists.txt rename {xs/src => src}/libslic3r/ClipperUtils.cpp (100%) rename {xs/src => src}/libslic3r/ClipperUtils.hpp (100%) rename {xs/src => src}/libslic3r/Config.cpp (100%) rename {xs/src => src}/libslic3r/Config.hpp (100%) rename {xs/src => src}/libslic3r/EdgeGrid.cpp (100%) rename {xs/src => src}/libslic3r/EdgeGrid.hpp (100%) rename {xs/src => src}/libslic3r/ExPolygon.cpp (100%) rename {xs/src => src}/libslic3r/ExPolygon.hpp (100%) rename {xs/src => src}/libslic3r/ExPolygonCollection.cpp (100%) rename {xs/src => src}/libslic3r/ExPolygonCollection.hpp (100%) rename {xs/src => src}/libslic3r/Extruder.cpp (100%) rename {xs/src => src}/libslic3r/Extruder.hpp (100%) rename {xs/src => src}/libslic3r/ExtrusionEntity.cpp (100%) rename {xs/src => src}/libslic3r/ExtrusionEntity.hpp (100%) rename {xs/src => src}/libslic3r/ExtrusionEntityCollection.cpp (100%) rename {xs/src => src}/libslic3r/ExtrusionEntityCollection.hpp (100%) rename {xs/src => src}/libslic3r/ExtrusionSimulator.cpp (100%) rename {xs/src => src}/libslic3r/ExtrusionSimulator.hpp (100%) rename {xs/src => src}/libslic3r/FileParserError.hpp (100%) rename {xs/src => src}/libslic3r/Fill/Fill.cpp (100%) rename {xs/src => src}/libslic3r/Fill/Fill.hpp (100%) rename {xs/src => src}/libslic3r/Fill/Fill3DHoneycomb.cpp (100%) rename {xs/src => src}/libslic3r/Fill/Fill3DHoneycomb.hpp (100%) rename {xs/src => src}/libslic3r/Fill/FillBase.cpp (100%) rename {xs/src => src}/libslic3r/Fill/FillBase.hpp (100%) rename {xs/src => src}/libslic3r/Fill/FillConcentric.cpp (100%) rename {xs/src => src}/libslic3r/Fill/FillConcentric.hpp (100%) rename {xs/src => src}/libslic3r/Fill/FillGyroid.cpp (100%) rename {xs/src => src}/libslic3r/Fill/FillGyroid.hpp (100%) rename {xs/src => src}/libslic3r/Fill/FillHoneycomb.cpp (100%) rename {xs/src => src}/libslic3r/Fill/FillHoneycomb.hpp (100%) rename {xs/src => src}/libslic3r/Fill/FillPlanePath.cpp (100%) rename {xs/src => src}/libslic3r/Fill/FillPlanePath.hpp (100%) rename {xs/src => src}/libslic3r/Fill/FillRectilinear.cpp (100%) rename {xs/src => src}/libslic3r/Fill/FillRectilinear.hpp (100%) rename {xs/src => src}/libslic3r/Fill/FillRectilinear2.cpp (100%) rename {xs/src => src}/libslic3r/Fill/FillRectilinear2.hpp (100%) rename {xs/src => src}/libslic3r/Fill/FillRectilinear3.cpp (100%) rename {xs/src => src}/libslic3r/Fill/FillRectilinear3.hpp (100%) rename {xs/src => src}/libslic3r/Flow.cpp (100%) rename {xs/src => src}/libslic3r/Flow.hpp (100%) rename {xs/src => src}/libslic3r/Format/3mf.cpp (100%) rename {xs/src => src}/libslic3r/Format/3mf.hpp (100%) rename {xs/src => src}/libslic3r/Format/AMF.cpp (100%) rename {xs/src => src}/libslic3r/Format/AMF.hpp (100%) rename {xs/src => src}/libslic3r/Format/OBJ.cpp (100%) rename {xs/src => src}/libslic3r/Format/OBJ.hpp (100%) rename {xs/src => src}/libslic3r/Format/PRUS.cpp (100%) rename {xs/src => src}/libslic3r/Format/PRUS.hpp (100%) rename {xs/src => src}/libslic3r/Format/STL.cpp (100%) rename {xs/src => src}/libslic3r/Format/STL.hpp (100%) rename {xs/src => src}/libslic3r/Format/objparser.cpp (100%) rename {xs/src => src}/libslic3r/Format/objparser.hpp (100%) rename {xs/src => src}/libslic3r/GCode.cpp (100%) rename {xs/src => src}/libslic3r/GCode.hpp (100%) rename {xs/src => src}/libslic3r/GCode/Analyzer.cpp (100%) rename {xs/src => src}/libslic3r/GCode/Analyzer.hpp (100%) rename {xs/src => src}/libslic3r/GCode/CoolingBuffer.cpp (100%) rename {xs/src => src}/libslic3r/GCode/CoolingBuffer.hpp (100%) rename {xs/src => src}/libslic3r/GCode/PostProcessor.cpp (100%) rename {xs/src => src}/libslic3r/GCode/PostProcessor.hpp (100%) rename {xs/src => src}/libslic3r/GCode/PressureEqualizer.cpp (100%) rename {xs/src => src}/libslic3r/GCode/PressureEqualizer.hpp (100%) rename {xs/src => src}/libslic3r/GCode/PreviewData.cpp (100%) rename {xs/src => src}/libslic3r/GCode/PreviewData.hpp (100%) rename {xs/src => src}/libslic3r/GCode/PrintExtents.cpp (100%) rename {xs/src => src}/libslic3r/GCode/PrintExtents.hpp (100%) rename {xs/src => src}/libslic3r/GCode/SpiralVase.cpp (100%) rename {xs/src => src}/libslic3r/GCode/SpiralVase.hpp (100%) rename {xs/src => src}/libslic3r/GCode/ToolOrdering.cpp (100%) rename {xs/src => src}/libslic3r/GCode/ToolOrdering.hpp (100%) rename {xs/src => src}/libslic3r/GCode/WipeTower.hpp (100%) rename {xs/src => src}/libslic3r/GCode/WipeTowerPrusaMM.cpp (100%) rename {xs/src => src}/libslic3r/GCode/WipeTowerPrusaMM.hpp (100%) rename {xs/src => src}/libslic3r/GCodeReader.cpp (100%) rename {xs/src => src}/libslic3r/GCodeReader.hpp (100%) rename {xs/src => src}/libslic3r/GCodeSender.cpp (100%) rename {xs/src => src}/libslic3r/GCodeSender.hpp (100%) rename {xs/src => src}/libslic3r/GCodeTimeEstimator.cpp (100%) rename {xs/src => src}/libslic3r/GCodeTimeEstimator.hpp (100%) rename {xs/src => src}/libslic3r/GCodeWriter.cpp (100%) rename {xs/src => src}/libslic3r/GCodeWriter.hpp (100%) rename {xs/src => src}/libslic3r/Geometry.cpp (100%) rename {xs/src => src}/libslic3r/Geometry.hpp (100%) rename {xs/src => src}/libslic3r/I18N.hpp (100%) rename {xs/src => src}/libslic3r/Int128.hpp (100%) rename {xs/src => src}/libslic3r/Layer.cpp (100%) rename {xs/src => src}/libslic3r/Layer.hpp (100%) rename {xs/src => src}/libslic3r/LayerRegion.cpp (100%) rename {xs/src => src}/libslic3r/Line.cpp (100%) rename {xs/src => src}/libslic3r/Line.hpp (100%) rename {xs/src => src}/libslic3r/Model.cpp (100%) rename {xs/src => src}/libslic3r/Model.hpp (100%) rename {xs/src => src}/libslic3r/ModelArrange.hpp (100%) rename {xs/src => src}/libslic3r/MotionPlanner.cpp (100%) rename {xs/src => src}/libslic3r/MotionPlanner.hpp (100%) rename {xs/src => src}/libslic3r/MultiPoint.cpp (100%) rename {xs/src => src}/libslic3r/MultiPoint.hpp (100%) rename {xs/src => src}/libslic3r/MutablePriorityQueue.hpp (100%) rename {xs/src => src}/libslic3r/PerimeterGenerator.cpp (100%) rename {xs/src => src}/libslic3r/PerimeterGenerator.hpp (100%) rename {xs/src => src}/libslic3r/PlaceholderParser.cpp (100%) rename {xs/src => src}/libslic3r/PlaceholderParser.hpp (100%) rename {xs/src => src}/libslic3r/Point.cpp (100%) rename {xs/src => src}/libslic3r/Point.hpp (100%) rename {xs/src => src}/libslic3r/Polygon.cpp (100%) rename {xs/src => src}/libslic3r/Polygon.hpp (100%) rename {xs/src => src}/libslic3r/Polyline.cpp (100%) rename {xs/src => src}/libslic3r/Polyline.hpp (100%) rename {xs/src => src}/libslic3r/PolylineCollection.cpp (100%) rename {xs/src => src}/libslic3r/PolylineCollection.hpp (100%) rename {xs/src => src}/libslic3r/Print.cpp (98%) rename {xs/src => src}/libslic3r/Print.hpp (100%) rename {xs/src => src}/libslic3r/PrintConfig.cpp (100%) rename {xs/src => src}/libslic3r/PrintConfig.hpp (100%) rename {xs/src => src}/libslic3r/PrintExport.hpp (100%) rename {xs/src => src}/libslic3r/PrintObject.cpp (100%) rename {xs/src => src}/libslic3r/PrintRegion.cpp (100%) rename {xs/src => src}/libslic3r/Rasterizer/Rasterizer.cpp (100%) rename {xs/src => src}/libslic3r/Rasterizer/Rasterizer.hpp (100%) rename {xs/src => src}/libslic3r/SLABasePool.cpp (100%) rename {xs/src => src}/libslic3r/SLABasePool.hpp (100%) rename {xs/src => src}/libslic3r/SVG.cpp (100%) rename {xs/src => src}/libslic3r/SVG.hpp (100%) rename {xs/src => src}/libslic3r/Slicing.cpp (100%) rename {xs/src => src}/libslic3r/Slicing.hpp (100%) rename {xs/src => src}/libslic3r/SlicingAdaptive.cpp (100%) rename {xs/src => src}/libslic3r/SlicingAdaptive.hpp (100%) rename {xs/src => src}/libslic3r/SupportMaterial.cpp (100%) rename {xs/src => src}/libslic3r/SupportMaterial.hpp (100%) rename {xs/src => src}/libslic3r/Surface.cpp (100%) rename {xs/src => src}/libslic3r/Surface.hpp (100%) rename {xs/src => src}/libslic3r/SurfaceCollection.cpp (100%) rename {xs/src => src}/libslic3r/SurfaceCollection.hpp (100%) rename {xs/src => src}/libslic3r/Technologies.hpp (100%) rename {xs/src => src}/libslic3r/TriangleMesh.cpp (100%) rename {xs/src => src}/libslic3r/TriangleMesh.hpp (100%) rename {xs/src => src}/libslic3r/Utils.hpp (100%) rename {xs/src => src}/libslic3r/libslic3r.h (100%) rename {xs/src => src}/libslic3r/utils.cpp (100%) create mode 100644 src/miniz/CMakeLists.txt rename {xs/src => src}/miniz/miniz.cpp (100%) rename {xs/src => src}/miniz/miniz.h (100%) rename {xs/src => src}/miniz/miniz_common.h (100%) rename {xs/src => src}/miniz/miniz_tdef.cpp (100%) rename {xs/src => src}/miniz/miniz_tdef.h (100%) rename {xs/src => src}/miniz/miniz_tinfl.cpp (100%) rename {xs/src => src}/miniz/miniz_tinfl.h (100%) rename {xs/src => src}/miniz/miniz_zip.cpp (100%) rename {xs/src => src}/miniz/miniz_zip.h (100%) rename {xs/src => src}/png/AUTHORS (100%) rename {xs/src => src}/png/COPYING (100%) rename {xs/src => src}/png/NEWS (100%) rename {xs/src => src}/png/color.hpp (100%) rename {xs/src => src}/png/end_info.hpp (100%) rename {xs/src => src}/png/error.hpp (100%) rename {xs/src => src}/png/image_info.hpp (100%) rename {xs/src => src}/png/info.hpp (100%) rename {xs/src => src}/png/info_base.hpp (100%) rename {xs/src => src}/png/io_base.hpp (100%) rename {xs/src => src}/png/libpng/ANNOUNCE (100%) rename {xs/src => src}/png/libpng/CMakeLists.txt (98%) rename {xs/src => src}/png/libpng/LICENSE (100%) rename {xs/src => src}/png/libpng/arm/arm_init.c (100%) rename {xs/src => src}/png/libpng/arm/filter_neon.S (100%) rename {xs/src => src}/png/libpng/arm/filter_neon_intrinsics.c (100%) rename {xs/src => src}/png/libpng/intel/filter_sse2_intrinsics.c (100%) rename {xs/src => src}/png/libpng/intel/intel_init.c (100%) rename {xs/src => src}/png/libpng/libpng-config.in (100%) rename {xs/src => src}/png/libpng/libpng.pc.in (100%) rename {xs/src => src}/png/libpng/mips/filter_msa_intrinsics.c (100%) rename {xs/src => src}/png/libpng/mips/mips_init.c (100%) rename {xs/src => src}/png/libpng/png.c (100%) rename {xs/src => src}/png/libpng/png.h (100%) rename {xs/src => src}/png/libpng/pngconf.h (100%) rename {xs/src => src}/png/libpng/pngdebug.h (100%) rename {xs/src => src}/png/libpng/pngerror.c (100%) rename {xs/src => src}/png/libpng/pngget.c (100%) rename {xs/src => src}/png/libpng/pnginfo.h (100%) rename {xs/src => src}/png/libpng/pngmem.c (100%) rename {xs/src => src}/png/libpng/pngpread.c (100%) rename {xs/src => src}/png/libpng/pngpriv.h (100%) rename {xs/src => src}/png/libpng/pngread.c (100%) rename {xs/src => src}/png/libpng/pngrio.c (100%) rename {xs/src => src}/png/libpng/pngrtran.c (100%) rename {xs/src => src}/png/libpng/pngrutil.c (100%) rename {xs/src => src}/png/libpng/pngset.c (100%) rename {xs/src => src}/png/libpng/pngstruct.h (100%) rename {xs/src => src}/png/libpng/pngtest.c (100%) rename {xs/src => src}/png/libpng/pngtrans.c (100%) rename {xs/src => src}/png/libpng/pngusr.dfa (100%) rename {xs/src => src}/png/libpng/pngwio.c (100%) rename {xs/src => src}/png/libpng/pngwrite.c (100%) rename {xs/src => src}/png/libpng/pngwtran.c (100%) rename {xs/src => src}/png/libpng/pngwutil.c (100%) rename {xs/src => src}/png/libpng/powerpc/filter_vsx_intrinsics.c (100%) rename {xs/src => src}/png/libpng/powerpc/powerpc_init.c (100%) rename {xs/src => src}/png/libpng/scripts/checksym.awk (100%) mode change 100755 => 100644 rename {xs/src => src}/png/libpng/scripts/def.c (100%) rename {xs/src => src}/png/libpng/scripts/dfn.awk (100%) mode change 100755 => 100644 rename {xs/src => src}/png/libpng/scripts/genchk.cmake.in (100%) rename {xs/src => src}/png/libpng/scripts/genout.cmake.in (100%) rename {xs/src => src}/png/libpng/scripts/gensrc.cmake.in (100%) rename {xs/src => src}/png/libpng/scripts/intprefix.c (100%) rename {xs/src => src}/png/libpng/scripts/libpng-config-body.in (100%) rename {xs/src => src}/png/libpng/scripts/libpng-config-head.in (100%) rename {xs/src => src}/png/libpng/scripts/libpng.pc.in (100%) rename {xs/src => src}/png/libpng/scripts/options.awk (100%) mode change 100755 => 100644 rename {xs/src => src}/png/libpng/scripts/pnglibconf.dfa (100%) rename {xs/src => src}/png/libpng/scripts/pnglibconf.h.prebuilt (100%) rename {xs/src => src}/png/libpng/scripts/prefix.c (100%) rename {xs/src => src}/png/libpng/scripts/sym.c (100%) rename {xs/src => src}/png/libpng/scripts/symbols.c (100%) rename {xs/src => src}/png/libpng/scripts/symbols.def (100%) rename {xs/src => src}/png/libpng/scripts/test.cmake.in (100%) rename {xs/src => src}/png/libpng/scripts/vers.c (100%) rename {xs/src => src}/png/palette.hpp (100%) rename {xs/src => src}/png/pixel_traits.hpp (100%) rename {xs/src => src}/png/tRNS.hpp (100%) rename {xs/src => src}/png/types.hpp (100%) rename {xs/src => src}/png/writer.hpp (100%) rename {xs/src => src}/png/zlib/CMakeLists.txt (100%) rename {xs/src => src}/png/zlib/ChangeLog (100%) rename {xs/src => src}/png/zlib/FAQ (100%) rename {xs/src => src}/png/zlib/INDEX (100%) rename {xs/src => src}/png/zlib/Makefile (100%) rename {xs/src => src}/png/zlib/Makefile.in (100%) rename {xs/src => src}/png/zlib/README (100%) rename {xs/src => src}/png/zlib/adler32.c (100%) rename {xs/src => src}/png/zlib/amiga/Makefile.pup (100%) rename {xs/src => src}/png/zlib/amiga/Makefile.sas (100%) rename {xs/src => src}/png/zlib/compress.c (100%) rename {xs/src => src}/png/zlib/configure (100%) rename {xs/src => src}/png/zlib/contrib/README.contrib (100%) rename {xs/src => src}/png/zlib/contrib/ada/buffer_demo.adb (100%) rename {xs/src => src}/png/zlib/contrib/ada/mtest.adb (100%) rename {xs/src => src}/png/zlib/contrib/ada/read.adb (100%) rename {xs/src => src}/png/zlib/contrib/ada/readme.txt (100%) rename {xs/src => src}/png/zlib/contrib/ada/test.adb (100%) rename {xs/src => src}/png/zlib/contrib/ada/zlib-streams.adb (100%) rename {xs/src => src}/png/zlib/contrib/ada/zlib-streams.ads (100%) rename {xs/src => src}/png/zlib/contrib/ada/zlib-thin.adb (100%) rename {xs/src => src}/png/zlib/contrib/ada/zlib-thin.ads (100%) rename {xs/src => src}/png/zlib/contrib/ada/zlib.adb (100%) rename {xs/src => src}/png/zlib/contrib/ada/zlib.ads (100%) rename {xs/src => src}/png/zlib/contrib/ada/zlib.gpr (100%) rename {xs/src => src}/png/zlib/contrib/amd64/amd64-match.S (100%) rename {xs/src => src}/png/zlib/contrib/asm686/README.686 (100%) rename {xs/src => src}/png/zlib/contrib/asm686/match.S (100%) rename {xs/src => src}/png/zlib/contrib/blast/Makefile (100%) rename {xs/src => src}/png/zlib/contrib/blast/README (100%) rename {xs/src => src}/png/zlib/contrib/blast/blast.c (100%) rename {xs/src => src}/png/zlib/contrib/blast/blast.h (100%) rename {xs/src => src}/png/zlib/contrib/blast/test.pk (100%) rename {xs/src => src}/png/zlib/contrib/blast/test.txt (100%) rename {xs/src => src}/png/zlib/contrib/delphi/ZLib.pas (100%) rename {xs/src => src}/png/zlib/contrib/delphi/ZLibConst.pas (100%) rename {xs/src => src}/png/zlib/contrib/delphi/readme.txt (100%) rename {xs/src => src}/png/zlib/contrib/delphi/zlibd32.mak (100%) rename {xs/src => src}/png/zlib/contrib/dotzlib/DotZLib.build (100%) rename {xs/src => src}/png/zlib/contrib/dotzlib/DotZLib.chm (100%) rename {xs/src => src}/png/zlib/contrib/dotzlib/DotZLib.sln (100%) rename {xs/src => src}/png/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs (100%) rename {xs/src => src}/png/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs (100%) rename {xs/src => src}/png/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs (100%) rename {xs/src => src}/png/zlib/contrib/dotzlib/DotZLib/CodecBase.cs (100%) rename {xs/src => src}/png/zlib/contrib/dotzlib/DotZLib/Deflater.cs (100%) rename {xs/src => src}/png/zlib/contrib/dotzlib/DotZLib/DotZLib.cs (100%) rename {xs/src => src}/png/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj (100%) rename {xs/src => src}/png/zlib/contrib/dotzlib/DotZLib/GZipStream.cs (100%) rename {xs/src => src}/png/zlib/contrib/dotzlib/DotZLib/Inflater.cs (100%) rename {xs/src => src}/png/zlib/contrib/dotzlib/DotZLib/UnitTests.cs (100%) rename {xs/src => src}/png/zlib/contrib/dotzlib/LICENSE_1_0.txt (100%) rename {xs/src => src}/png/zlib/contrib/dotzlib/readme.txt (100%) rename {xs/src => src}/png/zlib/contrib/gcc_gvmat64/gvmat64.S (100%) rename {xs/src => src}/png/zlib/contrib/infback9/README (100%) rename {xs/src => src}/png/zlib/contrib/infback9/infback9.c (100%) rename {xs/src => src}/png/zlib/contrib/infback9/infback9.h (100%) rename {xs/src => src}/png/zlib/contrib/infback9/inffix9.h (100%) rename {xs/src => src}/png/zlib/contrib/infback9/inflate9.h (100%) rename {xs/src => src}/png/zlib/contrib/infback9/inftree9.c (100%) rename {xs/src => src}/png/zlib/contrib/infback9/inftree9.h (100%) rename {xs/src => src}/png/zlib/contrib/inflate86/inffas86.c (100%) rename {xs/src => src}/png/zlib/contrib/inflate86/inffast.S (100%) rename {xs/src => src}/png/zlib/contrib/iostream/test.cpp (100%) rename {xs/src => src}/png/zlib/contrib/iostream/zfstream.cpp (100%) rename {xs/src => src}/png/zlib/contrib/iostream/zfstream.h (100%) rename {xs/src => src}/png/zlib/contrib/iostream2/zstream.h (100%) rename {xs/src => src}/png/zlib/contrib/iostream2/zstream_test.cpp (100%) rename {xs/src => src}/png/zlib/contrib/iostream3/README (100%) rename {xs/src => src}/png/zlib/contrib/iostream3/TODO (100%) rename {xs/src => src}/png/zlib/contrib/iostream3/test.cc (100%) rename {xs/src => src}/png/zlib/contrib/iostream3/zfstream.cc (100%) rename {xs/src => src}/png/zlib/contrib/iostream3/zfstream.h (100%) rename {xs/src => src}/png/zlib/contrib/masmx64/bld_ml64.bat (100%) rename {xs/src => src}/png/zlib/contrib/masmx64/gvmat64.asm (100%) rename {xs/src => src}/png/zlib/contrib/masmx64/inffas8664.c (100%) rename {xs/src => src}/png/zlib/contrib/masmx64/inffasx64.asm (100%) rename {xs/src => src}/png/zlib/contrib/masmx64/readme.txt (100%) rename {xs/src => src}/png/zlib/contrib/masmx86/bld_ml32.bat (100%) rename {xs/src => src}/png/zlib/contrib/masmx86/inffas32.asm (100%) rename {xs/src => src}/png/zlib/contrib/masmx86/match686.asm (100%) rename {xs/src => src}/png/zlib/contrib/masmx86/readme.txt (100%) rename {xs/src => src}/png/zlib/contrib/minizip/Makefile (100%) rename {xs/src => src}/png/zlib/contrib/minizip/Makefile.am (100%) rename {xs/src => src}/png/zlib/contrib/minizip/MiniZip64_Changes.txt (100%) rename {xs/src => src}/png/zlib/contrib/minizip/MiniZip64_info.txt (100%) rename {xs/src => src}/png/zlib/contrib/minizip/configure.ac (100%) rename {xs/src => src}/png/zlib/contrib/minizip/crypt.h (100%) rename {xs/src => src}/png/zlib/contrib/minizip/ioapi.c (100%) rename {xs/src => src}/png/zlib/contrib/minizip/ioapi.h (100%) rename {xs/src => src}/png/zlib/contrib/minizip/iowin32.c (100%) rename {xs/src => src}/png/zlib/contrib/minizip/iowin32.h (100%) rename {xs/src => src}/png/zlib/contrib/minizip/make_vms.com (100%) rename {xs/src => src}/png/zlib/contrib/minizip/miniunz.c (100%) rename {xs/src => src}/png/zlib/contrib/minizip/miniunzip.1 (100%) rename {xs/src => src}/png/zlib/contrib/minizip/minizip.1 (100%) rename {xs/src => src}/png/zlib/contrib/minizip/minizip.c (100%) rename {xs/src => src}/png/zlib/contrib/minizip/minizip.pc.in (100%) rename {xs/src => src}/png/zlib/contrib/minizip/mztools.c (100%) rename {xs/src => src}/png/zlib/contrib/minizip/mztools.h (100%) rename {xs/src => src}/png/zlib/contrib/minizip/unzip.c (100%) rename {xs/src => src}/png/zlib/contrib/minizip/unzip.h (100%) rename {xs/src => src}/png/zlib/contrib/minizip/zip.c (100%) rename {xs/src => src}/png/zlib/contrib/minizip/zip.h (100%) rename {xs/src => src}/png/zlib/contrib/pascal/example.pas (100%) rename {xs/src => src}/png/zlib/contrib/pascal/readme.txt (100%) rename {xs/src => src}/png/zlib/contrib/pascal/zlibd32.mak (100%) rename {xs/src => src}/png/zlib/contrib/pascal/zlibpas.pas (100%) rename {xs/src => src}/png/zlib/contrib/puff/Makefile (100%) rename {xs/src => src}/png/zlib/contrib/puff/README (100%) rename {xs/src => src}/png/zlib/contrib/puff/puff.c (100%) rename {xs/src => src}/png/zlib/contrib/puff/puff.h (100%) rename {xs/src => src}/png/zlib/contrib/puff/pufftest.c (100%) rename {xs/src => src}/png/zlib/contrib/puff/zeros.raw (100%) rename {xs/src => src}/png/zlib/contrib/testzlib/testzlib.c (100%) rename {xs/src => src}/png/zlib/contrib/testzlib/testzlib.txt (100%) rename {xs/src => src}/png/zlib/contrib/untgz/Makefile (100%) rename {xs/src => src}/png/zlib/contrib/untgz/Makefile.msc (100%) rename {xs/src => src}/png/zlib/contrib/untgz/untgz.c (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/readme.txt (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc10/miniunz.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc10/minizip.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc10/testzlib.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc10/zlib.rc (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc10/zlibstat.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc10/zlibvc.def (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc10/zlibvc.sln (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc10/zlibvc.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc11/miniunz.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc11/minizip.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc11/testzlib.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc11/zlib.rc (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc11/zlibstat.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc11/zlibvc.def (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc11/zlibvc.sln (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc11/zlibvc.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc12/miniunz.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc12/minizip.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc12/testzlib.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc12/zlib.rc (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc12/zlibstat.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc12/zlibvc.def (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc12/zlibvc.sln (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc12/zlibvc.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc14/miniunz.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc14/minizip.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc14/testzlib.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc14/zlib.rc (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc14/zlibstat.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc14/zlibvc.def (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc14/zlibvc.sln (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc14/zlibvc.vcxproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc9/miniunz.vcproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc9/minizip.vcproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc9/testzlib.vcproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc9/testzlibdll.vcproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc9/zlib.rc (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc9/zlibstat.vcproj (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc9/zlibvc.def (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc9/zlibvc.sln (100%) rename {xs/src => src}/png/zlib/contrib/vstudio/vc9/zlibvc.vcproj (100%) rename {xs/src => src}/png/zlib/crc32.c (100%) rename {xs/src => src}/png/zlib/crc32.h (100%) rename {xs/src => src}/png/zlib/deflate.c (100%) rename {xs/src => src}/png/zlib/deflate.h (100%) rename {xs/src => src}/png/zlib/gzclose.c (100%) rename {xs/src => src}/png/zlib/gzguts.h (100%) rename {xs/src => src}/png/zlib/gzlib.c (100%) rename {xs/src => src}/png/zlib/gzread.c (100%) rename {xs/src => src}/png/zlib/gzwrite.c (100%) rename {xs/src => src}/png/zlib/infback.c (100%) rename {xs/src => src}/png/zlib/inffast.c (100%) rename {xs/src => src}/png/zlib/inffast.h (100%) rename {xs/src => src}/png/zlib/inffixed.h (100%) rename {xs/src => src}/png/zlib/inflate.c (100%) rename {xs/src => src}/png/zlib/inflate.h (100%) rename {xs/src => src}/png/zlib/inftrees.c (100%) rename {xs/src => src}/png/zlib/inftrees.h (100%) rename {xs/src => src}/png/zlib/make_vms.com (100%) rename {xs/src => src}/png/zlib/msdos/Makefile.bor (100%) rename {xs/src => src}/png/zlib/msdos/Makefile.dj2 (100%) rename {xs/src => src}/png/zlib/msdos/Makefile.emx (100%) rename {xs/src => src}/png/zlib/msdos/Makefile.msc (100%) rename {xs/src => src}/png/zlib/msdos/Makefile.tc (100%) rename {xs/src => src}/png/zlib/nintendods/Makefile (100%) rename {xs/src => src}/png/zlib/nintendods/README (100%) rename {xs/src => src}/png/zlib/old/Makefile.emx (100%) rename {xs/src => src}/png/zlib/old/Makefile.riscos (100%) rename {xs/src => src}/png/zlib/old/README (100%) rename {xs/src => src}/png/zlib/old/descrip.mms (100%) rename {xs/src => src}/png/zlib/old/os2/Makefile.os2 (100%) rename {xs/src => src}/png/zlib/old/os2/zlib.def (100%) rename {xs/src => src}/png/zlib/old/visual-basic.txt (100%) rename {xs/src => src}/png/zlib/os400/README400 (100%) rename {xs/src => src}/png/zlib/os400/bndsrc (100%) rename {xs/src => src}/png/zlib/os400/make.sh (100%) rename {xs/src => src}/png/zlib/os400/zlib.inc (100%) rename {xs/src => src}/png/zlib/qnx/package.qpg (100%) rename {xs/src => src}/png/zlib/treebuild.xml (100%) rename {xs/src => src}/png/zlib/trees.c (100%) rename {xs/src => src}/png/zlib/trees.h (100%) rename {xs/src => src}/png/zlib/uncompr.c (100%) rename {xs/src => src}/png/zlib/watcom/watcom_f.mak (100%) rename {xs/src => src}/png/zlib/watcom/watcom_l.mak (100%) rename {xs/src => src}/png/zlib/win32/DLL_FAQ.txt (100%) rename {xs/src => src}/png/zlib/win32/Makefile.bor (100%) rename {xs/src => src}/png/zlib/win32/Makefile.gcc (100%) rename {xs/src => src}/png/zlib/win32/Makefile.msc (100%) rename {xs/src => src}/png/zlib/win32/README-WIN32.txt (100%) rename {xs/src => src}/png/zlib/win32/VisualC.txt (100%) rename {xs/src => src}/png/zlib/win32/zlib.def (100%) rename {xs/src => src}/png/zlib/win32/zlib1.rc (100%) rename {xs/src => src}/png/zlib/zconf.h.cmakein (100%) rename {xs/src => src}/png/zlib/zconf.h.in (100%) rename {xs/src => src}/png/zlib/zconf.h.included (100%) rename {xs/src => src}/png/zlib/zlib.3 (100%) rename {xs/src => src}/png/zlib/zlib.3.pdf (100%) rename {xs/src => src}/png/zlib/zlib.h (100%) rename {xs/src => src}/png/zlib/zlib.map (100%) rename {xs/src => src}/png/zlib/zlib.pc.cmakein (100%) rename {xs/src => src}/png/zlib/zlib.pc.in (100%) rename {xs/src => src}/png/zlib/zlib2ansi (100%) rename {xs/src => src}/png/zlib/zutil.c (100%) rename {xs/src => src}/png/zlib/zutil.h (100%) create mode 100644 src/poly2tri/CMakeLists.txt rename {xs/src => src}/poly2tri/common/shapes.cc (100%) rename {xs/src => src}/poly2tri/common/shapes.h (100%) rename {xs/src => src}/poly2tri/common/utils.h (100%) rename {xs/src => src}/poly2tri/poly2tri.h (100%) rename {xs/src => src}/poly2tri/sweep/advancing_front.cc (100%) rename {xs/src => src}/poly2tri/sweep/advancing_front.h (100%) rename {xs/src => src}/poly2tri/sweep/cdt.cc (100%) rename {xs/src => src}/poly2tri/sweep/cdt.h (100%) rename {xs/src => src}/poly2tri/sweep/sweep.cc (100%) rename {xs/src => src}/poly2tri/sweep/sweep.h (100%) rename {xs/src => src}/poly2tri/sweep/sweep_context.cc (100%) rename {xs/src => src}/poly2tri/sweep/sweep_context.h (100%) create mode 100644 src/polypartition/CMakeLists.txt rename {xs/src => src/polypartition}/polypartition.cpp (96%) rename {xs/src => src/polypartition}/polypartition.h (97%) rename {xs/src => src}/qhull/Announce.txt (100%) rename {xs/src => src}/qhull/CMakeLists.txt (100%) rename {xs/src => src}/qhull/COPYING.txt (100%) rename {xs/src => src}/qhull/README.txt (100%) rename {xs/src => src}/qhull/REGISTER.txt (100%) rename {xs/src => src}/qhull/html/index.htm (100%) rename {xs/src => src}/qhull/html/normal_voronoi_knauss_oesterle.jpg (100%) rename {xs/src => src}/qhull/html/qconvex.htm (100%) rename {xs/src => src}/qhull/html/qdelau_f.htm (100%) rename {xs/src => src}/qhull/html/qdelaun.htm (100%) rename {xs/src => src}/qhull/html/qh--4d.gif (100%) rename {xs/src => src}/qhull/html/qh--cone.gif (100%) rename {xs/src => src}/qhull/html/qh--dt.gif (100%) rename {xs/src => src}/qhull/html/qh--geom.gif (100%) rename {xs/src => src}/qhull/html/qh--half.gif (100%) rename {xs/src => src}/qhull/html/qh--rand.gif (100%) rename {xs/src => src}/qhull/html/qh-code.htm (100%) rename {xs/src => src}/qhull/html/qh-eg.htm (100%) rename {xs/src => src}/qhull/html/qh-faq.htm (100%) rename {xs/src => src}/qhull/html/qh-get.htm (100%) rename {xs/src => src}/qhull/html/qh-impre.htm (100%) rename {xs/src => src}/qhull/html/qh-optc.htm (100%) rename {xs/src => src}/qhull/html/qh-optf.htm (100%) rename {xs/src => src}/qhull/html/qh-optg.htm (100%) rename {xs/src => src}/qhull/html/qh-opto.htm (100%) rename {xs/src => src}/qhull/html/qh-optp.htm (100%) rename {xs/src => src}/qhull/html/qh-optq.htm (100%) rename {xs/src => src}/qhull/html/qh-optt.htm (100%) rename {xs/src => src}/qhull/html/qh-quick.htm (100%) rename {xs/src => src}/qhull/html/qhalf.htm (100%) rename {xs/src => src}/qhull/html/qhull-cpp.xml (100%) rename {xs/src => src}/qhull/html/qhull.htm (100%) rename {xs/src => src}/qhull/html/qhull.man (100%) rename {xs/src => src}/qhull/html/qhull.txt (100%) rename {xs/src => src}/qhull/html/qvoron_f.htm (100%) rename {xs/src => src}/qhull/html/qvoronoi.htm (100%) rename {xs/src => src}/qhull/html/rbox.htm (100%) rename {xs/src => src}/qhull/html/rbox.man (100%) rename {xs/src => src}/qhull/html/rbox.txt (100%) rename {xs/src => src}/qhull/index.htm (100%) rename {xs/src => src}/qhull/origCMakeLists.txt (100%) rename {xs/src => src}/qhull/src/Changes.txt (100%) rename {xs/src => src}/qhull/src/libqhull/DEPRECATED.txt (100%) rename {xs/src => src}/qhull/src/libqhull/Makefile (100%) rename {xs/src => src}/qhull/src/libqhull/Mborland (100%) rename {xs/src => src}/qhull/src/libqhull/geom.c (100%) rename {xs/src => src}/qhull/src/libqhull/geom.h (100%) rename {xs/src => src}/qhull/src/libqhull/geom2.c (100%) rename {xs/src => src}/qhull/src/libqhull/global.c (100%) rename {xs/src => src}/qhull/src/libqhull/index.htm (100%) rename {xs/src => src}/qhull/src/libqhull/io.c (100%) rename {xs/src => src}/qhull/src/libqhull/io.h (100%) rename {xs/src => src}/qhull/src/libqhull/libqhull.c (100%) rename {xs/src => src}/qhull/src/libqhull/libqhull.h (100%) rename {xs/src => src}/qhull/src/libqhull/libqhull.pro (100%) rename {xs/src => src}/qhull/src/libqhull/mem.c (100%) rename {xs/src => src}/qhull/src/libqhull/mem.h (100%) rename {xs/src => src}/qhull/src/libqhull/merge.c (100%) rename {xs/src => src}/qhull/src/libqhull/merge.h (100%) rename {xs/src => src}/qhull/src/libqhull/poly.c (100%) rename {xs/src => src}/qhull/src/libqhull/poly.h (100%) rename {xs/src => src}/qhull/src/libqhull/poly2.c (100%) rename {xs/src => src}/qhull/src/libqhull/qh-geom.htm (100%) rename {xs/src => src}/qhull/src/libqhull/qh-globa.htm (100%) rename {xs/src => src}/qhull/src/libqhull/qh-io.htm (100%) rename {xs/src => src}/qhull/src/libqhull/qh-mem.htm (100%) rename {xs/src => src}/qhull/src/libqhull/qh-merge.htm (100%) rename {xs/src => src}/qhull/src/libqhull/qh-poly.htm (100%) rename {xs/src => src}/qhull/src/libqhull/qh-qhull.htm (100%) rename {xs/src => src}/qhull/src/libqhull/qh-set.htm (100%) rename {xs/src => src}/qhull/src/libqhull/qh-stat.htm (100%) rename {xs/src => src}/qhull/src/libqhull/qh-user.htm (100%) rename {xs/src => src}/qhull/src/libqhull/qhull-exports.def (100%) rename {xs/src => src}/qhull/src/libqhull/qhull_a.h (100%) rename {xs/src => src}/qhull/src/libqhull/qhull_p-exports.def (100%) rename {xs/src => src}/qhull/src/libqhull/qset.c (100%) rename {xs/src => src}/qhull/src/libqhull/qset.h (100%) rename {xs/src => src}/qhull/src/libqhull/random.c (100%) rename {xs/src => src}/qhull/src/libqhull/random.h (100%) rename {xs/src => src}/qhull/src/libqhull/rboxlib.c (100%) rename {xs/src => src}/qhull/src/libqhull/stat.c (100%) rename {xs/src => src}/qhull/src/libqhull/stat.h (100%) rename {xs/src => src}/qhull/src/libqhull/user.c (100%) rename {xs/src => src}/qhull/src/libqhull/user.h (100%) rename {xs/src => src}/qhull/src/libqhull/usermem.c (100%) rename {xs/src => src}/qhull/src/libqhull/userprintf.c (100%) rename {xs/src => src}/qhull/src/libqhull/userprintf_rbox.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/Makefile (100%) rename {xs/src => src}/qhull/src/libqhull_r/geom2_r.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/geom_r.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/geom_r.h (100%) rename {xs/src => src}/qhull/src/libqhull_r/global_r.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/index.htm (100%) rename {xs/src => src}/qhull/src/libqhull_r/io_r.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/io_r.h (100%) rename {xs/src => src}/qhull/src/libqhull_r/libqhull_r.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/libqhull_r.h (100%) rename {xs/src => src}/qhull/src/libqhull_r/libqhull_r.pro (100%) rename {xs/src => src}/qhull/src/libqhull_r/mem_r.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/mem_r.h (100%) rename {xs/src => src}/qhull/src/libqhull_r/merge_r.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/merge_r.h (100%) rename {xs/src => src}/qhull/src/libqhull_r/poly2_r.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/poly_r.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/poly_r.h (100%) rename {xs/src => src}/qhull/src/libqhull_r/qh-geom_r.htm (100%) rename {xs/src => src}/qhull/src/libqhull_r/qh-globa_r.htm (100%) rename {xs/src => src}/qhull/src/libqhull_r/qh-io_r.htm (100%) rename {xs/src => src}/qhull/src/libqhull_r/qh-mem_r.htm (100%) rename {xs/src => src}/qhull/src/libqhull_r/qh-merge_r.htm (100%) rename {xs/src => src}/qhull/src/libqhull_r/qh-poly_r.htm (100%) rename {xs/src => src}/qhull/src/libqhull_r/qh-qhull_r.htm (100%) rename {xs/src => src}/qhull/src/libqhull_r/qh-set_r.htm (100%) rename {xs/src => src}/qhull/src/libqhull_r/qh-stat_r.htm (100%) rename {xs/src => src}/qhull/src/libqhull_r/qh-user_r.htm (100%) rename {xs/src => src}/qhull/src/libqhull_r/qhull_r-exports.def (100%) rename {xs/src => src}/qhull/src/libqhull_r/qhull_ra.h (100%) rename {xs/src => src}/qhull/src/libqhull_r/qset_r.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/qset_r.h (100%) rename {xs/src => src}/qhull/src/libqhull_r/random_r.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/random_r.h (100%) rename {xs/src => src}/qhull/src/libqhull_r/rboxlib_r.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/stat_r.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/stat_r.h (100%) rename {xs/src => src}/qhull/src/libqhull_r/user_r.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/user_r.h (100%) rename {xs/src => src}/qhull/src/libqhull_r/usermem_r.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/userprintf_r.c (100%) rename {xs/src => src}/qhull/src/libqhull_r/userprintf_rbox_r.c (100%) rename {xs/src => src}/qhull/src/libqhullcpp/Coordinates.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/Coordinates.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/PointCoordinates.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/PointCoordinates.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/Qhull.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/Qhull.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullError.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullFacet.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullFacet.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullFacetList.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullFacetList.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullFacetSet.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullFacetSet.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullHyperplane.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullHyperplane.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullIterator.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullLinkedList.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullPoint.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullPoint.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullPointSet.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullPointSet.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullPoints.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullPoints.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullQh.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullQh.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullRidge.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullRidge.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullSet.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullSet.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullSets.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullStat.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullStat.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullVertex.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullVertex.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullVertexSet.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/QhullVertexSet.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/RboxPoints.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/RboxPoints.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/RoadError.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/RoadError.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/RoadLogEvent.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/RoadLogEvent.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/functionObjects.h (100%) rename {xs/src => src}/qhull/src/libqhullcpp/libqhullcpp.pro (100%) rename {xs/src => src}/qhull/src/libqhullcpp/qt-qhull.cpp (100%) rename {xs/src => src}/qhull/src/libqhullcpp/usermem_r-cpp.cpp (100%) rename {xs/src => src}/qhull/src/libqhullstatic/libqhullstatic.pro (100%) rename {xs/src => src}/qhull/src/libqhullstatic_r/libqhullstatic_r.pro (100%) rename {xs/src => src}/qhull/src/qconvex/qconvex.c (100%) rename {xs/src => src}/qhull/src/qconvex/qconvex.pro (100%) rename {xs/src => src}/qhull/src/qconvex/qconvex_r.c (100%) rename {xs/src => src}/qhull/src/qdelaunay/qdelaun.c (100%) rename {xs/src => src}/qhull/src/qdelaunay/qdelaun_r.c (100%) rename {xs/src => src}/qhull/src/qdelaunay/qdelaunay.pro (100%) rename {xs/src => src}/qhull/src/qhalf/qhalf.c (100%) rename {xs/src => src}/qhull/src/qhalf/qhalf.pro (100%) rename {xs/src => src}/qhull/src/qhalf/qhalf_r.c (100%) rename {xs/src => src}/qhull/src/qhull-all.pro (100%) rename {xs/src => src}/qhull/src/qhull-app-c.pri (100%) rename {xs/src => src}/qhull/src/qhull-app-c_r.pri (100%) rename {xs/src => src}/qhull/src/qhull-app-cpp.pri (100%) rename {xs/src => src}/qhull/src/qhull-app-shared.pri (100%) rename {xs/src => src}/qhull/src/qhull-app-shared_r.pri (100%) rename {xs/src => src}/qhull/src/qhull-libqhull-src.pri (100%) rename {xs/src => src}/qhull/src/qhull-libqhull-src_r.pri (100%) rename {xs/src => src}/qhull/src/qhull-warn.pri (100%) rename {xs/src => src}/qhull/src/qhull/qhull.pro (100%) rename {xs/src => src}/qhull/src/qhull/unix.c (100%) rename {xs/src => src}/qhull/src/qhull/unix_r.c (100%) rename {xs/src => src}/qhull/src/qhulltest/Coordinates_test.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/PointCoordinates_test.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/QhullFacetList_test.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/QhullFacetSet_test.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/QhullFacet_test.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/QhullHyperplane_test.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/QhullLinkedList_test.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/QhullPointSet_test.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/QhullPoint_test.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/QhullPoints_test.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/QhullRidge_test.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/QhullSet_test.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/QhullVertexSet_test.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/QhullVertex_test.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/Qhull_test.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/RboxPoints_test.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/RoadTest.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/RoadTest.h (100%) rename {xs/src => src}/qhull/src/qhulltest/qhulltest.cpp (100%) rename {xs/src => src}/qhull/src/qhulltest/qhulltest.pro (100%) rename {xs/src => src}/qhull/src/qvoronoi/qvoronoi.c (100%) rename {xs/src => src}/qhull/src/qvoronoi/qvoronoi.pro (100%) rename {xs/src => src}/qhull/src/qvoronoi/qvoronoi_r.c (100%) rename {xs/src => src}/qhull/src/rbox/rbox.c (100%) rename {xs/src => src}/qhull/src/rbox/rbox.pro (100%) rename {xs/src => src}/qhull/src/rbox/rbox_r.c (100%) rename {xs/src => src}/qhull/src/testqset/testqset.c (100%) rename {xs/src => src}/qhull/src/testqset/testqset.pro (100%) rename {xs/src => src}/qhull/src/testqset_r/testqset_r.c (100%) rename {xs/src => src}/qhull/src/testqset_r/testqset_r.pro (100%) rename {xs/src => src}/qhull/src/user_eg/user_eg.c (100%) rename {xs/src => src}/qhull/src/user_eg/user_eg.pro (100%) rename {xs/src => src}/qhull/src/user_eg/user_eg_r.c (100%) rename {xs/src => src}/qhull/src/user_eg2/user_eg2.c (100%) rename {xs/src => src}/qhull/src/user_eg2/user_eg2.pro (100%) rename {xs/src => src}/qhull/src/user_eg2/user_eg2_r.c (100%) rename {xs/src => src}/qhull/src/user_eg3/user_eg3.pro (100%) rename {xs/src => src}/qhull/src/user_eg3/user_eg3_r.cpp (100%) create mode 100644 src/semver/CMakeLists.txt rename {xs/src => src}/semver/semver.c (100%) rename {xs/src => src}/semver/semver.h (100%) rename {xs/src => src}/slic3r/AppController.cpp (100%) rename {xs/src => src}/slic3r/AppController.hpp (100%) rename {xs/src => src}/slic3r/AppControllerWx.cpp (100%) create mode 100644 src/slic3r/CMakeLists.txt rename {xs/src => src}/slic3r/Config/Snapshot.cpp (100%) rename {xs/src => src}/slic3r/Config/Snapshot.hpp (100%) rename {xs/src => src}/slic3r/Config/Version.cpp (100%) rename {xs/src => src}/slic3r/Config/Version.hpp (100%) rename {xs/src => src}/slic3r/GUI/2DBed.cpp (100%) rename {xs/src => src}/slic3r/GUI/2DBed.hpp (100%) rename {xs/src => src}/slic3r/GUI/3DScene.cpp (100%) rename {xs/src => src}/slic3r/GUI/3DScene.hpp (100%) rename {xs/src => src}/slic3r/GUI/AboutDialog.cpp (100%) rename {xs/src => src}/slic3r/GUI/AboutDialog.hpp (100%) rename {xs/src => src}/slic3r/GUI/AppConfig.cpp (100%) rename {xs/src => src}/slic3r/GUI/AppConfig.hpp (100%) rename {xs/src => src}/slic3r/GUI/BackgroundSlicingProcess.cpp (100%) rename {xs/src => src}/slic3r/GUI/BackgroundSlicingProcess.hpp (100%) rename {xs/src => src}/slic3r/GUI/BedShapeDialog.cpp (100%) rename {xs/src => src}/slic3r/GUI/BedShapeDialog.hpp (100%) rename {xs/src => src}/slic3r/GUI/BitmapCache.cpp (100%) rename {xs/src => src}/slic3r/GUI/BitmapCache.hpp (100%) rename {xs/src => src}/slic3r/GUI/BonjourDialog.cpp (100%) rename {xs/src => src}/slic3r/GUI/BonjourDialog.hpp (100%) rename {xs/src => src}/slic3r/GUI/ButtonsDescription.cpp (100%) rename {xs/src => src}/slic3r/GUI/ButtonsDescription.hpp (100%) rename {xs/src => src}/slic3r/GUI/ConfigExceptions.hpp (100%) rename {xs/src => src}/slic3r/GUI/ConfigSnapshotDialog.cpp (100%) rename {xs/src => src}/slic3r/GUI/ConfigSnapshotDialog.hpp (100%) rename {xs/src => src}/slic3r/GUI/ConfigWizard.cpp (100%) rename {xs/src => src}/slic3r/GUI/ConfigWizard.hpp (100%) rename {xs/src => src}/slic3r/GUI/ConfigWizard_private.hpp (100%) rename {xs/src => src}/slic3r/GUI/Field.cpp (100%) rename {xs/src => src}/slic3r/GUI/Field.hpp (100%) rename {xs/src => src}/slic3r/GUI/FirmwareDialog.cpp (100%) rename {xs/src => src}/slic3r/GUI/FirmwareDialog.hpp (100%) rename {xs/src => src}/slic3r/GUI/GLCanvas3D.cpp (100%) rename {xs/src => src}/slic3r/GUI/GLCanvas3D.hpp (100%) rename {xs/src => src}/slic3r/GUI/GLCanvas3DManager.cpp (100%) rename {xs/src => src}/slic3r/GUI/GLCanvas3DManager.hpp (100%) rename {xs/src => src}/slic3r/GUI/GLGizmo.cpp (100%) rename {xs/src => src}/slic3r/GUI/GLGizmo.hpp (100%) rename {xs/src => src}/slic3r/GUI/GLShader.cpp (100%) rename {xs/src => src}/slic3r/GUI/GLShader.hpp (100%) rename {xs/src => src}/slic3r/GUI/GLTexture.cpp (100%) rename {xs/src => src}/slic3r/GUI/GLTexture.hpp (100%) rename {xs/src => src}/slic3r/GUI/GLToolbar.cpp (100%) rename {xs/src => src}/slic3r/GUI/GLToolbar.hpp (100%) rename {xs/src => src}/slic3r/GUI/GUI.cpp (99%) rename {xs/src => src}/slic3r/GUI/GUI.hpp (97%) rename {xs/src => src}/slic3r/GUI/GUI_ObjectParts.cpp (100%) rename {xs/src => src}/slic3r/GUI/GUI_ObjectParts.hpp (100%) rename {xs/src => src}/slic3r/GUI/LambdaObjectDialog.cpp (100%) rename {xs/src => src}/slic3r/GUI/LambdaObjectDialog.hpp (100%) rename {xs/src => src}/slic3r/GUI/MsgDialog.cpp (100%) rename {xs/src => src}/slic3r/GUI/MsgDialog.hpp (100%) rename {xs/src => src}/slic3r/GUI/OptionsGroup.cpp (100%) rename {xs/src => src}/slic3r/GUI/OptionsGroup.hpp (100%) rename {xs/src => src}/slic3r/GUI/Preferences.cpp (100%) rename {xs/src => src}/slic3r/GUI/Preferences.hpp (100%) rename {xs/src => src}/slic3r/GUI/Preset.cpp (100%) rename {xs/src => src}/slic3r/GUI/Preset.hpp (100%) rename {xs/src => src}/slic3r/GUI/PresetBundle.cpp (100%) rename {xs/src => src}/slic3r/GUI/PresetBundle.hpp (100%) rename {xs/src => src}/slic3r/GUI/PresetHints.cpp (100%) rename {xs/src => src}/slic3r/GUI/PresetHints.hpp (100%) rename {xs/src => src}/slic3r/GUI/ProgressIndicator.hpp (100%) rename {xs/src => src}/slic3r/GUI/ProgressStatusBar.cpp (100%) rename {xs/src => src}/slic3r/GUI/ProgressStatusBar.hpp (98%) rename {xs/src => src}/slic3r/GUI/RammingChart.cpp (100%) rename {xs/src => src}/slic3r/GUI/RammingChart.hpp (100%) rename {xs/src => src}/slic3r/GUI/Tab.cpp (100%) rename {xs/src => src}/slic3r/GUI/Tab.hpp (100%) rename {xs/src => src}/slic3r/GUI/TabIface.cpp (100%) rename {xs/src => src}/slic3r/GUI/TabIface.hpp (100%) rename {xs/src => src}/slic3r/GUI/UpdateDialogs.cpp (100%) rename {xs/src => src}/slic3r/GUI/UpdateDialogs.hpp (100%) rename {xs/src => src}/slic3r/GUI/Widget.hpp (100%) rename {xs/src => src}/slic3r/GUI/WipeTowerDialog.cpp (100%) rename {xs/src => src}/slic3r/GUI/WipeTowerDialog.hpp (100%) create mode 100644 src/slic3r/GUI/callback.hpp rename {xs/src => src}/slic3r/GUI/wxExtensions.cpp (100%) rename {xs/src => src}/slic3r/GUI/wxExtensions.hpp (100%) rename {xs/src => src}/slic3r/GUI/wxinit.h (100%) rename {xs/src => src}/slic3r/Utils/ASCIIFolding.cpp (100%) rename {xs/src => src}/slic3r/Utils/ASCIIFolding.hpp (100%) rename {xs/src => src}/slic3r/Utils/Bonjour.cpp (100%) rename {xs/src => src}/slic3r/Utils/Bonjour.hpp (100%) rename {xs/src => src}/slic3r/Utils/Duet.cpp (100%) rename {xs/src => src}/slic3r/Utils/Duet.hpp (100%) rename {xs/src => src}/slic3r/Utils/FixModelByWin10.cpp (100%) rename {xs/src => src}/slic3r/Utils/FixModelByWin10.hpp (100%) rename {xs/src => src}/slic3r/Utils/HexFile.cpp (100%) rename {xs/src => src}/slic3r/Utils/HexFile.hpp (100%) rename {xs/src => src}/slic3r/Utils/Http.cpp (100%) rename {xs/src => src}/slic3r/Utils/Http.hpp (100%) rename {xs/src => src}/slic3r/Utils/OctoPrint.cpp (100%) rename {xs/src => src}/slic3r/Utils/OctoPrint.hpp (100%) rename {xs/src => src}/slic3r/Utils/PresetUpdater.cpp (100%) rename {xs/src => src}/slic3r/Utils/PresetUpdater.hpp (100%) rename {xs/src => src}/slic3r/Utils/PrintHost.cpp (100%) rename {xs/src => src}/slic3r/Utils/PrintHost.hpp (100%) rename {xs/src => src}/slic3r/Utils/PrintHostSendDialog.cpp (100%) rename {xs/src => src}/slic3r/Utils/PrintHostSendDialog.hpp (100%) rename {xs/src => src}/slic3r/Utils/Semver.hpp (100%) rename {xs/src => src}/slic3r/Utils/Serial.cpp (100%) rename {xs/src => src}/slic3r/Utils/Serial.hpp (100%) rename {xs/src => src}/slic3r/Utils/Time.cpp (100%) rename {xs/src => src}/slic3r/Utils/Time.hpp (100%) delete mode 100644 xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s01.html~ delete mode 100644 xs/src/libnest2d/tools/benchmark.h delete mode 100644 xs/src/slic3r/GUI/wxPerlIface.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e3d8ad4df..1e1817f542 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,5 @@ -cmake_minimum_required(VERSION 3.2) - project(Slic3r) +cmake_minimum_required(VERSION 3.2) if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) message(STATUS "No build type selected, default to Release") @@ -48,7 +47,6 @@ else() set(PERL5LIB_ENV_CMD ${CMAKE_COMMAND} -E env PERL5LIB=${PERL_INCLUDE}) endif() - # CMAKE_PREFIX_PATH is used to point CMake to the remaining dependencies (Boost, TBB, ...) # We pick it from environment if it is not defined in another way if(NOT DEFINED CMAKE_PREFIX_PATH) @@ -57,8 +55,19 @@ if(NOT DEFINED CMAKE_PREFIX_PATH) endif() endif() +# Add our own cmake module path. +list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules/) + enable_testing () +# Enable C++11 language standard. +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +# Enable C11 language standard. +set(CMAKE_C_STANDARD 11) +set(CMAKE_C_STANDARD_REQUIRED ON) + # WIN10SDK_PATH is used to point CMake to the WIN10 SDK installation directory. # We pick it from environment if it is not defined in another way if(WIN32) @@ -75,6 +84,187 @@ if(WIN32) endif() endif() +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") + # Workaround for an old CMake, which does not understand CMAKE_CXX_STANDARD. + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wno-reorder" ) + find_package(PkgConfig REQUIRED) +endif() + +if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUXX) + # Adding -fext-numeric-literals to enable GCC extensions on definitions of quad float literals, which are required by Boost. + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals" ) +endif() + +# Where all the bundled libraries reside? +set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/src/) +# For the bundled boost libraries (boost::nowide) +include_directories(${LIBDIR}) +# For libslic3r.h +include_directories(${LIBDIR}/libslic3r ${LIBDIR}/clipper ${LIBDIR}/polypartition) +#set(CMAKE_INCLUDE_CURRENT_DIR ON) + +if(WIN32) + # BOOST_ALL_NO_LIB: Avoid the automatic linking of Boost libraries on Windows. Rather rely on explicit linking. + add_definitions(-D_USE_MATH_DEFINES -D_WIN32 -DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x601) +endif() + +add_definitions(-DwxUSE_UNICODE -D_UNICODE -DUNICODE -DWXINTL_NO_GETTEXT_MACRO) + +if (SLIC3R_PROFILE) + message("Slic3r will be built with a Shiny invasive profiler") + add_definitions(-DSLIC3R_PROFILE) +endif () + +# Perl specific stuff +find_package(PerlLibs REQUIRED) +set(PerlEmbed_DEBUG 1) +find_package(PerlEmbed REQUIRED) +# If the Perl is compiled with optimization off, disable optimization over the whole project. +if (WIN32 AND ";${PerlEmbed_CCFLAGS};" MATCHES ";[-/]Od;") + message(STATUS "Perl compiled without optimization. Disabling optimization for the Slic3r build.") + message("Old CMAKE_CXX_FLAGS_RELEASE: ${CMAKE_CXX_FLAGS_RELEASE}") + message("Old CMAKE_CXX_FLAGS_RELWITHDEBINFO: ${CMAKE_CXX_FLAGS_RELEASE}") + message("Old CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS_RELEASE}") + set(CMAKE_CXX_FLAGS_RELEASE "/MD /Od /Zi /EHsc /DNDEBUG /DWIN32 /DTBB_USE_ASSERT") + set(CMAKE_C_FLAGS_RELEASE "/MD /Od /Zi /DNDEBUG /DWIN32 /DTBB_USE_ASSERT") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /Od /Zi /EHsc /DNDEBUG /DWIN32 /DTBB_USE_ASSERT") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "/MD /Od /Zi /DNDEBUG /DWIN32 /DTBB_USE_ASSERT") + set(CMAKE_CXX_FLAGS "/MD /Od /Zi /EHsc /DNDEBUG /DWIN32 /DTBB_USE_ASSERT") + set(CMAKE_C_FLAGS "/MD /Od /Zi /DNDEBUG /DWIN32 /DTBB_USE_ASSERT") +endif() +# The following line will add -fPIC on Linux to make the XS.so rellocable. +add_definitions(${PerlEmbed_CCCDLFLAGS}) + +# Find and configure boost +if(SLIC3R_STATIC) + # Use static boost libraries. + set(Boost_USE_STATIC_LIBS ON) + # Use boost libraries linked statically to the C++ runtime. + # set(Boost_USE_STATIC_RUNTIME ON) +endif() +#set(Boost_DEBUG ON) +find_package(Boost REQUIRED COMPONENTS system filesystem thread log locale regex) +if(Boost_FOUND) + include_directories(${Boost_INCLUDE_DIRS}) + if (APPLE) + # BOOST_ASIO_DISABLE_KQUEUE : prevents a Boost ASIO bug on OS X: https://svn.boost.org/trac/boost/ticket/5339 + add_definitions(-DBOOST_ASIO_DISABLE_KQUEUE) + endif() + if(NOT SLIC3R_STATIC) + add_definitions(-DBOOST_LOG_DYN_LINK) + endif() +endif() + +# Find and configure intel-tbb +if(SLIC3R_STATIC) + set(TBB_STATIC 1) +endif() +set(TBB_DEBUG 1) +find_package(TBB REQUIRED) +include_directories(${TBB_INCLUDE_DIRS}) +add_definitions(${TBB_DEFINITIONS}) +if(MSVC) + # Suppress implicit linking of the TBB libraries by the Visual Studio compiler. + add_definitions(-D__TBB_NO_IMPLICIT_LINKAGE) +endif() +# The Intel TBB library will use the std::exception_ptr feature of C++11. +add_definitions(-DTBB_USE_CAPTURED_EXCEPTION=0) + +# Find and configure wxWidgets +if (SLIC3R_PRUSACONTROL) + set(wxWidgets_UseAlienWx 1) + if (wxWidgets_UseAlienWx) + set(AlienWx_DEBUG 1) + find_package(AlienWx REQUIRED COMPONENTS base core adv html gl) + include_directories(${AlienWx_INCLUDE_DIRS}) + #add_compile_options(${AlienWx_CXX_FLAGS}) + add_definitions(${AlienWx_DEFINITIONS}) + set(wxWidgets_LIBRARIES ${AlienWx_LIBRARIES}) + # On Linux / gtk, we need to have a direct access to gtk+ for some workarounds. + if (AlienWx_GUI_TOOLKIT STREQUAL "gtk2") + pkg_check_modules(GTK2 gtk+-2.0) + include_directories(${GTK2_INCLUDE_DIRS}) + endif() + if (AlienWx_GUI_TOOLKIT STREQUAL "gtk3") + pkg_check_modules(GTK3 gtk+-3.0) + include_directories(${GTK3_INCLUDE_DIRS}) + endif() + else () + find_package(wxWidgets REQUIRED COMPONENTS base core adv html gl) + include(${wxWidgets_USE_FILE}) + endif () +#FIXME rewrite the PRUS format to miniz! +# add_definitions(-DSLIC3R_GUI -DSLIC3R_PRUS) +endif() + +find_package(CURL REQUIRED) +include_directories(${CURL_INCLUDE_DIRS}) + +if (SLIC3R_STATIC) + if (NOT APPLE) + # libcurl is always linked dynamically to the system libcurl on OSX. + # On other systems, libcurl is linked statically if SLIC3R_STATIC is set. + add_definitions(-DCURL_STATICLIB) + endif() + if (CMAKE_SYSTEM_NAME STREQUAL "Linux") + # As of now, our build system produces a statically linked libcurl, + # which links the OpenSSL library dynamically. + find_package(OpenSSL REQUIRED) + message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}") + message("OpenSSL libraries: ${OPENSSL_LIBRARIES}") + include_directories(${OPENSSL_INCLUDE_DIR}) + endif() +endif() + +## OPTIONAL packages + +# Find eigen3 or use bundled version +if (NOT SLIC3R_STATIC) + find_package(Eigen3) +endif () +if (NOT Eigen3_FOUND) + set(Eigen3_FOUND 1) + set(EIGEN3_INCLUDE_DIR ${LIBDIR}/eigen/) +endif () +include_directories(${EIGEN3_INCLUDE_DIR}) + +# Find expat or use bundled version +# Always use the system libexpat on Linux. +if (NOT SLIC3R_STATIC OR CMAKE_SYSTEM_NAME STREQUAL "Linux") + find_package(EXPAT) +endif () +if (NOT EXPAT_FOUND) + add_library(expat STATIC + ${LIBDIR}/expat/xmlparse.c + ${LIBDIR}/expat/xmlrole.c + ${LIBDIR}/expat/xmltok.c + ) + set(EXPAT_FOUND 1) + set(EXPAT_INCLUDE_DIRS ${LIBDIR}/expat/) + set(EXPAT_LIBRARIES expat) +endif () +include_directories(${EXPAT_INCLUDE_DIRS}) + +# Find glew or use bundled version +if (NOT SLIC3R_STATIC) + find_package(GLEW) +endif () +if (NOT GLEW_FOUND) + add_library(glew STATIC ${LIBDIR}/glew/src/glew.c) + set(GLEW_FOUND 1) + set(GLEW_INCLUDE_DIRS ${LIBDIR}/glew/include/) + set(GLEW_LIBRARIES glew) + add_definitions(-DGLEW_STATIC) +endif () +include_directories(${GLEW_INCLUDE_DIRS}) + +# l10n +add_subdirectory(resources/localization) + +# libslic3r, Slic3r GUI and the slic3r executable. +add_subdirectory(src) + +# Perl bindings, currently only used for the unit / integration tests of libslic3r. add_subdirectory(xs) get_filename_component(PERL_BIN_PATH "${PERL_EXECUTABLE}" DIRECTORY) @@ -92,7 +282,7 @@ endif () add_test (NAME xs COMMAND "${PERL_EXECUTABLE}" ${PERL_PROVE} -I ${PROJECT_SOURCE_DIR}/local-lib/lib/perl5 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/xs) add_test (NAME integration COMMAND "${PERL_EXECUTABLE}" ${PERL_PROVE} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) -install(PROGRAMS slic3r.pl DESTINATION bin RENAME slic3r-prusa3d) +#install(PROGRAMS slic3r.pl DESTINATION bin RENAME slic3r-prusa3d) file(GLOB MyVar var/*.png) install(FILES ${MyVar} DESTINATION share/slic3r-prusa3d) diff --git a/resources/localization/CMakeLists.txt b/resources/localization/CMakeLists.txt new file mode 100644 index 0000000000..8a7fba068f --- /dev/null +++ b/resources/localization/CMakeLists.txt @@ -0,0 +1,8 @@ +set(L10N_DIR "${PROJECT_SOURCE_DIR}/resources/localization") +add_custom_target(pot + COMMAND xgettext --keyword=L --from-code=UTF-8 --debug + -f "${L10N_DIR}/list.txt" + -o "${L10N_DIR}/Slic3rPE.pot" + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + COMMENT "Generate pot file from strings in the source tree" +) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000000..d0c0082937 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,65 @@ +project(Slic3r-native) + +add_subdirectory(admesh) +add_subdirectory(avrdude) +# boost/nowide +add_subdirectory(boost) +add_subdirectory(clipper) +add_subdirectory(miniz) +add_subdirectory(polypartition) +add_subdirectory(poly2tri) +add_subdirectory(qhull) +add_subdirectory(Shiny) +add_subdirectory(semver) + +# Adding libnest2d project for bin packing... +set(LIBNEST2D_UNITTESTS ON CACHE BOOL "Force generating unittests for libnest2d") +add_subdirectory(libnest2d) + +include_directories(${LIBDIR}/qhull/src) +#message(STATUS ${LIBDIR}/qhull/src) + + +# ############################################################################## +# Configure rasterizer target +# ############################################################################## + +find_package(PNG QUIET) + +option(RASTERIZER_FORCE_BUILTIN_LIBPNG "Force the usage of builting libpng instead of the system version." OFF) + +if(PNG_FOUND AND NOT RASTERIZER_FORCE_BUILTIN_LIBPNG) + message(STATUS "Using system libpng.") +else() + set(ZLIB_LIBRARY "") + message(WARNING "Using builtin libpng. This can cause crashes on some platforms.") + add_subdirectory(png/zlib) + set(ZLIB_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/png/zlib ${CMAKE_CURRENT_BINARY_DIR}/png/zlib) + include_directories(${ZLIB_INCLUDE_DIR}) + message(STATUS "ZLIB_INCLUDE_DIR ${ZLIB_INCLUDE_DIR}") + add_subdirectory(png/libpng) + set_target_properties(zlibstatic PROPERTIES POSITION_INDEPENDENT_CODE ON) + set_target_properties(png_static PROPERTIES POSITION_INDEPENDENT_CODE ON) +# target_include_directories(png_static PRIVATE ${ZLIB_INCLUDE_DIR}) + set(PNG_LIBRARIES png_static zlibstatic) + set(PNG_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/png/libpng ${CMAKE_CURRENT_BINARY_DIR}/png/libpng) +endif() + +add_subdirectory(libslic3r) +add_subdirectory(slic3r) + +# Create a slic3r executable +add_executable(slic3r slic3r.cpp) +target_link_libraries(slic3r libslic3r libslic3r_gui ${wxWidgets_LIBRARIES} ${CURL_LIBRARIES}) +# Add the OpenGL and GLU libraries. +if (SLIC3R_GUI) + if (MSVC) + target_link_libraries(slic3r user32.lib Setupapi.lib OpenGL32.Lib GlU32.Lib) + elseif (MINGW) + target_link_libraries(slic3r -lopengl32) + elseif (APPLE) + target_link_libraries(slic3r "-framework OpenGL") + else () + target_link_libraries(slic3r -lGL -lGLU) + endif () +endif () diff --git a/src/Shiny/CMakeLists.txt b/src/Shiny/CMakeLists.txt new file mode 100644 index 0000000000..8be7592ae5 --- /dev/null +++ b/src/Shiny/CMakeLists.txt @@ -0,0 +1,25 @@ +project(Shiny) +cmake_minimum_required(VERSION 2.6) + +add_library(Shiny STATIC + Shiny.h + ShinyConfig.h + ShinyData.h + ShinyMacros.h + ShinyManager.c + ShinyManager.h + ShinyNode.c + ShinyNode.h + ShinyNodePool.c + ShinyNodePool.h + ShinyNodeState.c + ShinyNodeState.h + ShinyOutput.c + ShinyOutput.h + ShinyPrereqs.h + ShinyTools.c + ShinyTools.h + ShinyVersion.h + ShinyZone.c + ShinyZone.h +) diff --git a/xs/src/Shiny/Shiny.h b/src/Shiny/Shiny.h similarity index 100% rename from xs/src/Shiny/Shiny.h rename to src/Shiny/Shiny.h diff --git a/xs/src/Shiny/ShinyConfig.h b/src/Shiny/ShinyConfig.h similarity index 100% rename from xs/src/Shiny/ShinyConfig.h rename to src/Shiny/ShinyConfig.h diff --git a/xs/src/Shiny/ShinyData.h b/src/Shiny/ShinyData.h similarity index 100% rename from xs/src/Shiny/ShinyData.h rename to src/Shiny/ShinyData.h diff --git a/xs/src/Shiny/ShinyMacros.h b/src/Shiny/ShinyMacros.h similarity index 100% rename from xs/src/Shiny/ShinyMacros.h rename to src/Shiny/ShinyMacros.h diff --git a/xs/src/Shiny/ShinyManager.c b/src/Shiny/ShinyManager.c similarity index 100% rename from xs/src/Shiny/ShinyManager.c rename to src/Shiny/ShinyManager.c diff --git a/xs/src/Shiny/ShinyManager.h b/src/Shiny/ShinyManager.h similarity index 100% rename from xs/src/Shiny/ShinyManager.h rename to src/Shiny/ShinyManager.h diff --git a/xs/src/Shiny/ShinyNode.c b/src/Shiny/ShinyNode.c similarity index 100% rename from xs/src/Shiny/ShinyNode.c rename to src/Shiny/ShinyNode.c diff --git a/xs/src/Shiny/ShinyNode.h b/src/Shiny/ShinyNode.h similarity index 100% rename from xs/src/Shiny/ShinyNode.h rename to src/Shiny/ShinyNode.h diff --git a/xs/src/Shiny/ShinyNodePool.c b/src/Shiny/ShinyNodePool.c similarity index 100% rename from xs/src/Shiny/ShinyNodePool.c rename to src/Shiny/ShinyNodePool.c diff --git a/xs/src/Shiny/ShinyNodePool.h b/src/Shiny/ShinyNodePool.h similarity index 100% rename from xs/src/Shiny/ShinyNodePool.h rename to src/Shiny/ShinyNodePool.h diff --git a/xs/src/Shiny/ShinyNodeState.c b/src/Shiny/ShinyNodeState.c similarity index 100% rename from xs/src/Shiny/ShinyNodeState.c rename to src/Shiny/ShinyNodeState.c diff --git a/xs/src/Shiny/ShinyNodeState.h b/src/Shiny/ShinyNodeState.h similarity index 100% rename from xs/src/Shiny/ShinyNodeState.h rename to src/Shiny/ShinyNodeState.h diff --git a/xs/src/Shiny/ShinyOutput.c b/src/Shiny/ShinyOutput.c similarity index 100% rename from xs/src/Shiny/ShinyOutput.c rename to src/Shiny/ShinyOutput.c diff --git a/xs/src/Shiny/ShinyOutput.h b/src/Shiny/ShinyOutput.h similarity index 100% rename from xs/src/Shiny/ShinyOutput.h rename to src/Shiny/ShinyOutput.h diff --git a/xs/src/Shiny/ShinyPrereqs.h b/src/Shiny/ShinyPrereqs.h similarity index 100% rename from xs/src/Shiny/ShinyPrereqs.h rename to src/Shiny/ShinyPrereqs.h diff --git a/xs/src/Shiny/ShinyTools.c b/src/Shiny/ShinyTools.c similarity index 100% rename from xs/src/Shiny/ShinyTools.c rename to src/Shiny/ShinyTools.c diff --git a/xs/src/Shiny/ShinyTools.h b/src/Shiny/ShinyTools.h similarity index 100% rename from xs/src/Shiny/ShinyTools.h rename to src/Shiny/ShinyTools.h diff --git a/xs/src/Shiny/ShinyVersion.h b/src/Shiny/ShinyVersion.h similarity index 100% rename from xs/src/Shiny/ShinyVersion.h rename to src/Shiny/ShinyVersion.h diff --git a/xs/src/Shiny/ShinyZone.c b/src/Shiny/ShinyZone.c similarity index 100% rename from xs/src/Shiny/ShinyZone.c rename to src/Shiny/ShinyZone.c diff --git a/xs/src/Shiny/ShinyZone.h b/src/Shiny/ShinyZone.h similarity index 100% rename from xs/src/Shiny/ShinyZone.h rename to src/Shiny/ShinyZone.h diff --git a/src/admesh/CMakeLists.txt b/src/admesh/CMakeLists.txt new file mode 100644 index 0000000000..44c97c3f1b --- /dev/null +++ b/src/admesh/CMakeLists.txt @@ -0,0 +1,12 @@ +project(admesh) +cmake_minimum_required(VERSION 2.6) + +add_library(admesh STATIC + connect.cpp + normals.cpp + shared.cpp + stl.h + stl_io.cpp + stlinit.cpp + util.cpp +) diff --git a/xs/src/admesh/connect.cpp b/src/admesh/connect.cpp similarity index 100% rename from xs/src/admesh/connect.cpp rename to src/admesh/connect.cpp diff --git a/xs/src/admesh/normals.cpp b/src/admesh/normals.cpp similarity index 100% rename from xs/src/admesh/normals.cpp rename to src/admesh/normals.cpp diff --git a/xs/src/admesh/shared.cpp b/src/admesh/shared.cpp similarity index 100% rename from xs/src/admesh/shared.cpp rename to src/admesh/shared.cpp diff --git a/xs/src/admesh/stl.h b/src/admesh/stl.h similarity index 100% rename from xs/src/admesh/stl.h rename to src/admesh/stl.h diff --git a/xs/src/admesh/stl_io.cpp b/src/admesh/stl_io.cpp similarity index 100% rename from xs/src/admesh/stl_io.cpp rename to src/admesh/stl_io.cpp diff --git a/xs/src/admesh/stlinit.cpp b/src/admesh/stlinit.cpp similarity index 100% rename from xs/src/admesh/stlinit.cpp rename to src/admesh/stlinit.cpp diff --git a/xs/src/admesh/util.cpp b/src/admesh/util.cpp similarity index 100% rename from xs/src/admesh/util.cpp rename to src/admesh/util.cpp diff --git a/xs/src/agg/AUTHORS b/src/agg/AUTHORS similarity index 100% rename from xs/src/agg/AUTHORS rename to src/agg/AUTHORS diff --git a/xs/src/agg/VERSION b/src/agg/VERSION similarity index 100% rename from xs/src/agg/VERSION rename to src/agg/VERSION diff --git a/xs/src/agg/agg_array.h b/src/agg/agg_array.h similarity index 100% rename from xs/src/agg/agg_array.h rename to src/agg/agg_array.h diff --git a/xs/src/agg/agg_basics.h b/src/agg/agg_basics.h similarity index 100% rename from xs/src/agg/agg_basics.h rename to src/agg/agg_basics.h diff --git a/xs/src/agg/agg_bezier_arc.h b/src/agg/agg_bezier_arc.h similarity index 100% rename from xs/src/agg/agg_bezier_arc.h rename to src/agg/agg_bezier_arc.h diff --git a/xs/src/agg/agg_clip_liang_barsky.h b/src/agg/agg_clip_liang_barsky.h similarity index 100% rename from xs/src/agg/agg_clip_liang_barsky.h rename to src/agg/agg_clip_liang_barsky.h diff --git a/xs/src/agg/agg_color_gray.h b/src/agg/agg_color_gray.h similarity index 100% rename from xs/src/agg/agg_color_gray.h rename to src/agg/agg_color_gray.h diff --git a/xs/src/agg/agg_color_rgba.h b/src/agg/agg_color_rgba.h similarity index 100% rename from xs/src/agg/agg_color_rgba.h rename to src/agg/agg_color_rgba.h diff --git a/xs/src/agg/agg_config.h b/src/agg/agg_config.h similarity index 100% rename from xs/src/agg/agg_config.h rename to src/agg/agg_config.h diff --git a/xs/src/agg/agg_conv_transform.h b/src/agg/agg_conv_transform.h similarity index 100% rename from xs/src/agg/agg_conv_transform.h rename to src/agg/agg_conv_transform.h diff --git a/xs/src/agg/agg_gamma_functions.h b/src/agg/agg_gamma_functions.h similarity index 100% rename from xs/src/agg/agg_gamma_functions.h rename to src/agg/agg_gamma_functions.h diff --git a/xs/src/agg/agg_gamma_lut.h b/src/agg/agg_gamma_lut.h similarity index 100% rename from xs/src/agg/agg_gamma_lut.h rename to src/agg/agg_gamma_lut.h diff --git a/xs/src/agg/agg_math.h b/src/agg/agg_math.h similarity index 100% rename from xs/src/agg/agg_math.h rename to src/agg/agg_math.h diff --git a/xs/src/agg/agg_path_storage.h b/src/agg/agg_path_storage.h similarity index 100% rename from xs/src/agg/agg_path_storage.h rename to src/agg/agg_path_storage.h diff --git a/xs/src/agg/agg_pixfmt_base.h b/src/agg/agg_pixfmt_base.h similarity index 100% rename from xs/src/agg/agg_pixfmt_base.h rename to src/agg/agg_pixfmt_base.h diff --git a/xs/src/agg/agg_pixfmt_gray.h b/src/agg/agg_pixfmt_gray.h similarity index 100% rename from xs/src/agg/agg_pixfmt_gray.h rename to src/agg/agg_pixfmt_gray.h diff --git a/xs/src/agg/agg_pixfmt_rgb.h b/src/agg/agg_pixfmt_rgb.h similarity index 100% rename from xs/src/agg/agg_pixfmt_rgb.h rename to src/agg/agg_pixfmt_rgb.h diff --git a/xs/src/agg/agg_rasterizer_cells_aa.h b/src/agg/agg_rasterizer_cells_aa.h similarity index 100% rename from xs/src/agg/agg_rasterizer_cells_aa.h rename to src/agg/agg_rasterizer_cells_aa.h diff --git a/xs/src/agg/agg_rasterizer_scanline_aa.h b/src/agg/agg_rasterizer_scanline_aa.h similarity index 100% rename from xs/src/agg/agg_rasterizer_scanline_aa.h rename to src/agg/agg_rasterizer_scanline_aa.h diff --git a/xs/src/agg/agg_rasterizer_scanline_aa_nogamma.h b/src/agg/agg_rasterizer_scanline_aa_nogamma.h similarity index 100% rename from xs/src/agg/agg_rasterizer_scanline_aa_nogamma.h rename to src/agg/agg_rasterizer_scanline_aa_nogamma.h diff --git a/xs/src/agg/agg_rasterizer_sl_clip.h b/src/agg/agg_rasterizer_sl_clip.h similarity index 100% rename from xs/src/agg/agg_rasterizer_sl_clip.h rename to src/agg/agg_rasterizer_sl_clip.h diff --git a/xs/src/agg/agg_renderer_base.h b/src/agg/agg_renderer_base.h similarity index 100% rename from xs/src/agg/agg_renderer_base.h rename to src/agg/agg_renderer_base.h diff --git a/xs/src/agg/agg_renderer_scanline.h b/src/agg/agg_renderer_scanline.h similarity index 100% rename from xs/src/agg/agg_renderer_scanline.h rename to src/agg/agg_renderer_scanline.h diff --git a/xs/src/agg/agg_rendering_buffer.h b/src/agg/agg_rendering_buffer.h similarity index 100% rename from xs/src/agg/agg_rendering_buffer.h rename to src/agg/agg_rendering_buffer.h diff --git a/xs/src/agg/agg_scanline_p.h b/src/agg/agg_scanline_p.h similarity index 100% rename from xs/src/agg/agg_scanline_p.h rename to src/agg/agg_scanline_p.h diff --git a/xs/src/agg/agg_trans_affine.h b/src/agg/agg_trans_affine.h similarity index 100% rename from xs/src/agg/agg_trans_affine.h rename to src/agg/agg_trans_affine.h diff --git a/xs/src/agg/copying b/src/agg/copying similarity index 100% rename from xs/src/agg/copying rename to src/agg/copying diff --git a/xs/src/avrdude/AUTHORS b/src/avrdude/AUTHORS similarity index 100% rename from xs/src/avrdude/AUTHORS rename to src/avrdude/AUTHORS diff --git a/xs/src/avrdude/BUILD-FROM-SVN b/src/avrdude/BUILD-FROM-SVN similarity index 100% rename from xs/src/avrdude/BUILD-FROM-SVN rename to src/avrdude/BUILD-FROM-SVN diff --git a/xs/src/avrdude/CMakeLists.txt b/src/avrdude/CMakeLists.txt similarity index 100% rename from xs/src/avrdude/CMakeLists.txt rename to src/avrdude/CMakeLists.txt diff --git a/xs/src/avrdude/COPYING b/src/avrdude/COPYING similarity index 100% rename from xs/src/avrdude/COPYING rename to src/avrdude/COPYING diff --git a/xs/src/avrdude/ChangeLog b/src/avrdude/ChangeLog similarity index 100% rename from xs/src/avrdude/ChangeLog rename to src/avrdude/ChangeLog diff --git a/xs/src/avrdude/ChangeLog-2001 b/src/avrdude/ChangeLog-2001 similarity index 100% rename from xs/src/avrdude/ChangeLog-2001 rename to src/avrdude/ChangeLog-2001 diff --git a/xs/src/avrdude/ChangeLog-2002 b/src/avrdude/ChangeLog-2002 similarity index 100% rename from xs/src/avrdude/ChangeLog-2002 rename to src/avrdude/ChangeLog-2002 diff --git a/xs/src/avrdude/ChangeLog-2003 b/src/avrdude/ChangeLog-2003 similarity index 100% rename from xs/src/avrdude/ChangeLog-2003 rename to src/avrdude/ChangeLog-2003 diff --git a/xs/src/avrdude/ChangeLog-2004-2006 b/src/avrdude/ChangeLog-2004-2006 similarity index 100% rename from xs/src/avrdude/ChangeLog-2004-2006 rename to src/avrdude/ChangeLog-2004-2006 diff --git a/xs/src/avrdude/ChangeLog-2007 b/src/avrdude/ChangeLog-2007 similarity index 100% rename from xs/src/avrdude/ChangeLog-2007 rename to src/avrdude/ChangeLog-2007 diff --git a/xs/src/avrdude/ChangeLog-2008 b/src/avrdude/ChangeLog-2008 similarity index 100% rename from xs/src/avrdude/ChangeLog-2008 rename to src/avrdude/ChangeLog-2008 diff --git a/xs/src/avrdude/ChangeLog-2009 b/src/avrdude/ChangeLog-2009 similarity index 100% rename from xs/src/avrdude/ChangeLog-2009 rename to src/avrdude/ChangeLog-2009 diff --git a/xs/src/avrdude/ChangeLog-2010 b/src/avrdude/ChangeLog-2010 similarity index 100% rename from xs/src/avrdude/ChangeLog-2010 rename to src/avrdude/ChangeLog-2010 diff --git a/xs/src/avrdude/ChangeLog-2011 b/src/avrdude/ChangeLog-2011 similarity index 100% rename from xs/src/avrdude/ChangeLog-2011 rename to src/avrdude/ChangeLog-2011 diff --git a/xs/src/avrdude/ChangeLog-2012 b/src/avrdude/ChangeLog-2012 similarity index 100% rename from xs/src/avrdude/ChangeLog-2012 rename to src/avrdude/ChangeLog-2012 diff --git a/xs/src/avrdude/ChangeLog-2013 b/src/avrdude/ChangeLog-2013 similarity index 100% rename from xs/src/avrdude/ChangeLog-2013 rename to src/avrdude/ChangeLog-2013 diff --git a/xs/src/avrdude/ChangeLog-2014 b/src/avrdude/ChangeLog-2014 similarity index 100% rename from xs/src/avrdude/ChangeLog-2014 rename to src/avrdude/ChangeLog-2014 diff --git a/xs/src/avrdude/ChangeLog-2015 b/src/avrdude/ChangeLog-2015 similarity index 100% rename from xs/src/avrdude/ChangeLog-2015 rename to src/avrdude/ChangeLog-2015 diff --git a/xs/src/avrdude/Makefile.am b/src/avrdude/Makefile.am similarity index 100% rename from xs/src/avrdude/Makefile.am rename to src/avrdude/Makefile.am diff --git a/xs/src/avrdude/Makefile.standalone b/src/avrdude/Makefile.standalone similarity index 100% rename from xs/src/avrdude/Makefile.standalone rename to src/avrdude/Makefile.standalone diff --git a/xs/src/avrdude/NEWS b/src/avrdude/NEWS similarity index 100% rename from xs/src/avrdude/NEWS rename to src/avrdude/NEWS diff --git a/xs/src/avrdude/README b/src/avrdude/README similarity index 100% rename from xs/src/avrdude/README rename to src/avrdude/README diff --git a/xs/src/avrdude/ac_cfg.h b/src/avrdude/ac_cfg.h similarity index 100% rename from xs/src/avrdude/ac_cfg.h rename to src/avrdude/ac_cfg.h diff --git a/xs/src/avrdude/ac_cfg.h.in b/src/avrdude/ac_cfg.h.in similarity index 100% rename from xs/src/avrdude/ac_cfg.h.in rename to src/avrdude/ac_cfg.h.in diff --git a/xs/src/avrdude/arduino.c b/src/avrdude/arduino.c similarity index 100% rename from xs/src/avrdude/arduino.c rename to src/avrdude/arduino.c diff --git a/xs/src/avrdude/arduino.h b/src/avrdude/arduino.h similarity index 100% rename from xs/src/avrdude/arduino.h rename to src/avrdude/arduino.h diff --git a/xs/src/avrdude/atmel-docs/AVR109.pdf b/src/avrdude/atmel-docs/AVR109.pdf similarity index 100% rename from xs/src/avrdude/atmel-docs/AVR109.pdf rename to src/avrdude/atmel-docs/AVR109.pdf diff --git a/xs/src/avrdude/atmel-docs/AVR910.pdf b/src/avrdude/atmel-docs/AVR910.pdf similarity index 100% rename from xs/src/avrdude/atmel-docs/AVR910.pdf rename to src/avrdude/atmel-docs/AVR910.pdf diff --git a/xs/src/avrdude/atmel-docs/AVRISPmkII-AVR069.pdf b/src/avrdude/atmel-docs/AVRISPmkII-AVR069.pdf similarity index 100% rename from xs/src/avrdude/atmel-docs/AVRISPmkII-AVR069.pdf rename to src/avrdude/atmel-docs/AVRISPmkII-AVR069.pdf diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/browserDetect.js b/src/avrdude/atmel-docs/EDBG/common/browserDetect.js similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/browserDetect.js rename to src/avrdude/atmel-docs/EDBG/common/browserDetect.js diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/css/960.css b/src/avrdude/atmel-docs/EDBG/common/css/960.css similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/css/960.css rename to src/avrdude/atmel-docs/EDBG/common/css/960.css diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/css/docbook.css b/src/avrdude/atmel-docs/EDBG/common/css/docbook.css similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/css/docbook.css rename to src/avrdude/atmel-docs/EDBG/common/css/docbook.css diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/css/fluid_grid.css b/src/avrdude/atmel-docs/EDBG/common/css/fluid_grid.css similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/css/fluid_grid.css rename to src/avrdude/atmel-docs/EDBG/common/css/fluid_grid.css diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/css/index.css b/src/avrdude/atmel-docs/EDBG/common/css/index.css similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/css/index.css rename to src/avrdude/atmel-docs/EDBG/common/css/index.css diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/css/positioning.css b/src/avrdude/atmel-docs/EDBG/common/css/positioning.css similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/css/positioning.css rename to src/avrdude/atmel-docs/EDBG/common/css/positioning.css diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/css/print.css b/src/avrdude/atmel-docs/EDBG/common/css/print.css similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/css/print.css rename to src/avrdude/atmel-docs/EDBG/common/css/print.css diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/css/reset.css b/src/avrdude/atmel-docs/EDBG/common/css/reset.css similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/css/reset.css rename to src/avrdude/atmel-docs/EDBG/common/css/reset.css diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/css/text.css b/src/avrdude/atmel-docs/EDBG/common/css/text.css similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/css/text.css rename to src/avrdude/atmel-docs/EDBG/common/css/text.css diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/fonts/DroidSansMono.eot b/src/avrdude/atmel-docs/EDBG/common/fonts/DroidSansMono.eot similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/fonts/DroidSansMono.eot rename to src/avrdude/atmel-docs/EDBG/common/fonts/DroidSansMono.eot diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/fonts/DroidSansMono.ttf b/src/avrdude/atmel-docs/EDBG/common/fonts/DroidSansMono.ttf similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/fonts/DroidSansMono.ttf rename to src/avrdude/atmel-docs/EDBG/common/fonts/DroidSansMono.ttf diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/images/Book_Closed.png b/src/avrdude/atmel-docs/EDBG/common/images/Book_Closed.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/images/Book_Closed.png rename to src/avrdude/atmel-docs/EDBG/common/images/Book_Closed.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/images/Book_Open.png b/src/avrdude/atmel-docs/EDBG/common/images/Book_Open.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/images/Book_Open.png rename to src/avrdude/atmel-docs/EDBG/common/images/Book_Open.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/images/Document_Text.png b/src/avrdude/atmel-docs/EDBG/common/images/Document_Text.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/images/Document_Text.png rename to src/avrdude/atmel-docs/EDBG/common/images/Document_Text.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/images/Library.png b/src/avrdude/atmel-docs/EDBG/common/images/Library.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/images/Library.png rename to src/avrdude/atmel-docs/EDBG/common/images/Library.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/images/external_link.gif b/src/avrdude/atmel-docs/EDBG/common/images/external_link.gif similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/images/external_link.gif rename to src/avrdude/atmel-docs/EDBG/common/images/external_link.gif diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/images/loading.gif b/src/avrdude/atmel-docs/EDBG/common/images/loading.gif similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/images/loading.gif rename to src/avrdude/atmel-docs/EDBG/common/images/loading.gif diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/images/logo.png b/src/avrdude/atmel-docs/EDBG/common/images/logo.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/images/logo.png rename to src/avrdude/atmel-docs/EDBG/common/images/logo.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/images/minus.png b/src/avrdude/atmel-docs/EDBG/common/images/minus.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/images/minus.png rename to src/avrdude/atmel-docs/EDBG/common/images/minus.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/images/next-arrow.png b/src/avrdude/atmel-docs/EDBG/common/images/next-arrow.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/images/next-arrow.png rename to src/avrdude/atmel-docs/EDBG/common/images/next-arrow.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/images/plus.png b/src/avrdude/atmel-docs/EDBG/common/images/plus.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/images/plus.png rename to src/avrdude/atmel-docs/EDBG/common/images/plus.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/images/previous-arrow.png b/src/avrdude/atmel-docs/EDBG/common/images/previous-arrow.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/images/previous-arrow.png rename to src/avrdude/atmel-docs/EDBG/common/images/previous-arrow.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/images/search-icon.png b/src/avrdude/atmel-docs/EDBG/common/images/search-icon.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/images/search-icon.png rename to src/avrdude/atmel-docs/EDBG/common/images/search-icon.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/images/sidebar.png b/src/avrdude/atmel-docs/EDBG/common/images/sidebar.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/images/sidebar.png rename to src/avrdude/atmel-docs/EDBG/common/images/sidebar.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/images/starsSmall.png b/src/avrdude/atmel-docs/EDBG/common/images/starsSmall.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/images/starsSmall.png rename to src/avrdude/atmel-docs/EDBG/common/images/starsSmall.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/images/toc-icon.png b/src/avrdude/atmel-docs/EDBG/common/images/toc-icon.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/images/toc-icon.png rename to src/avrdude/atmel-docs/EDBG/common/images/toc-icon.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/images/ui-icons_217bc0_256x240.png b/src/avrdude/atmel-docs/EDBG/common/images/ui-icons_217bc0_256x240.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/images/ui-icons_217bc0_256x240.png rename to src/avrdude/atmel-docs/EDBG/common/images/ui-icons_217bc0_256x240.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/jquery-1.7.2.min.js b/src/avrdude/atmel-docs/EDBG/common/jquery/jquery-1.7.2.min.js similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/jquery-1.7.2.min.js rename to src/avrdude/atmel-docs/EDBG/common/jquery/jquery-1.7.2.min.js diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/jquery.cookie.js b/src/avrdude/atmel-docs/EDBG/common/jquery/jquery.cookie.js similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/jquery.cookie.js rename to src/avrdude/atmel-docs/EDBG/common/jquery/jquery.cookie.js diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/jquery.ui.all.js b/src/avrdude/atmel-docs/EDBG/common/jquery/jquery.ui.all.js similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/jquery.ui.all.js rename to src/avrdude/atmel-docs/EDBG/common/jquery/jquery.ui.all.js diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/layout/jquery.layout.js b/src/avrdude/atmel-docs/EDBG/common/jquery/layout/jquery.layout.js similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/layout/jquery.layout.js rename to src/avrdude/atmel-docs/EDBG/common/jquery/layout/jquery.layout.js diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-anim_basic_16x16.gif b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-anim_basic_16x16.gif similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-anim_basic_16x16.gif rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-anim_basic_16x16.gif diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_flat_55_fbec88_40x100.png b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_flat_55_fbec88_40x100.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_flat_55_fbec88_40x100.png rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_flat_55_fbec88_40x100.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_glass_75_d0e5f5_1x400.png b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_glass_75_d0e5f5_1x400.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_glass_75_d0e5f5_1x400.png rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_glass_75_d0e5f5_1x400.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_glass_85_dfeffc_1x400.png b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_glass_85_dfeffc_1x400.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_glass_85_dfeffc_1x400.png rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_glass_85_dfeffc_1x400.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_glass_95_fef1ec_1x400.png b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_glass_95_fef1ec_1x400.png rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_217bc0_256x240.png b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_217bc0_256x240.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_217bc0_256x240.png rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_217bc0_256x240.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_2e83ff_256x240.png b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_2e83ff_256x240.png rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_2e83ff_256x240.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_469bdd_256x240.png b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_469bdd_256x240.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_469bdd_256x240.png rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_469bdd_256x240.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_6da8d5_256x240.png b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_6da8d5_256x240.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_6da8d5_256x240.png rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_6da8d5_256x240.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_cd0a0a_256x240.png b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_cd0a0a_256x240.png rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_cd0a0a_256x240.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_d8e7f3_256x240.png b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_d8e7f3_256x240.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_d8e7f3_256x240.png rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_d8e7f3_256x240.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_f9bd01_256x240.png b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_f9bd01_256x240.png similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_f9bd01_256x240.png rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/images/ui-icons_f9bd01_256x240.png diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css b/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css rename to src/avrdude/atmel-docs/EDBG/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/file.gif b/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/file.gif similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/file.gif rename to src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/file.gif diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/folder-closed.gif b/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/folder-closed.gif similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/folder-closed.gif rename to src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/folder-closed.gif diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/folder.gif b/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/folder.gif similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/folder.gif rename to src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/folder.gif diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-black-line.gif b/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-black-line.gif similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-black-line.gif rename to src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-black-line.gif diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-black.gif b/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-black.gif similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-black.gif rename to src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-black.gif diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-default-line.gif b/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-default-line.gif similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-default-line.gif rename to src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-default-line.gif diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-default.gif b/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-default.gif similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-default.gif rename to src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-default.gif diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-famfamfam-line.gif b/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-famfamfam-line.gif similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-famfamfam-line.gif rename to src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-famfamfam-line.gif diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-famfamfam.gif b/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-famfamfam.gif similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-famfamfam.gif rename to src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-famfamfam.gif diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-gray-line.gif b/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-gray-line.gif similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-gray-line.gif rename to src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-gray-line.gif diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-gray.gif b/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-gray.gif similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-gray.gif rename to src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-gray.gif diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-red-line.gif b/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-red-line.gif similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-red-line.gif rename to src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-red-line.gif diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-red.gif b/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-red.gif similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-red.gif rename to src/avrdude/atmel-docs/EDBG/common/jquery/treeview/images/treeview-red.gif diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/jquery.treeview.css b/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/jquery.treeview.css similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/jquery.treeview.css rename to src/avrdude/atmel-docs/EDBG/common/jquery/treeview/jquery.treeview.css diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/jquery.treeview.min.js b/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/jquery.treeview.min.js similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/jquery/treeview/jquery.treeview.min.js rename to src/avrdude/atmel-docs/EDBG/common/jquery/treeview/jquery.treeview.min.js diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/main.js b/src/avrdude/atmel-docs/EDBG/common/main.js similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/main.js rename to src/avrdude/atmel-docs/EDBG/common/main.js diff --git a/xs/src/avrdude/atmel-docs/EDBG/common/splitterInit.js b/src/avrdude/atmel-docs/EDBG/common/splitterInit.js similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/common/splitterInit.js rename to src/avrdude/atmel-docs/EDBG/common/splitterInit.js diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch01s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch01s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch01s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch01s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch01s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch01s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch01s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch01s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s02s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s02s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s02s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s02s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s02s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s02s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s02s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s02s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s02s03s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s05.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s05.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s05.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s05.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s06.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s06.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s06.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s06.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s07.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s07.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s07.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s07.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s08.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s08.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s08.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s08.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s09.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s09.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s09.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s03s09.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch02s04s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s03s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s03s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s03s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s03s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s02s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s05.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s05.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s05.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s04s05.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s05.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s05.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s05.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s06s05.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s07s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s08s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s09.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s09.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s09.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s09.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s10.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s10.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s10.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch04s05s10.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s05.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s05.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s05.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s05.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s06.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s06.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s06.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s06.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s07.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s07.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s07.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s07.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s08.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s08.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s08.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s08.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s09.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s09.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s09.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s09.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s10.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s10.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s10.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s10.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s11.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s11.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s11.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s11.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s12.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s12.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s12.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s12.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s13.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s13.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s13.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s13.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s14.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s14.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s14.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s14.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s15.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s15.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s15.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s01s15.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s05.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s05.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s05.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s05.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s06.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s06.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s06.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s02s06.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s03s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch05s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s05.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s05.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s05.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s05.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s06.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s06.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s06.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s06.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s07.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s07.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s07.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s07.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s08.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s08.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s08.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s08.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s09.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s09.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s09.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s09.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s10.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s10.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s10.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s10.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s11.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s11.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s11.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s11.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s12.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s12.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s12.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s12.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s13.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s13.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s13.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s13.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s14.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s14.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s14.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s14.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s15.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s15.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s15.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s15.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s16.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s16.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s16.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s16.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s17.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s17.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s17.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s17.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s18.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s18.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s18.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s18.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s19.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s19.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s19.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s19.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s20.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s20.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s20.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s20.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s21.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s21.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s21.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s21.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s22.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s22.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s22.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s22.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s23.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s23.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s23.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s23.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s24.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s24.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s24.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s24.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s25.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s25.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s25.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s25.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s26.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s26.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s26.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s26.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s27.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s27.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s27.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s27.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s28.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s28.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s28.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s28.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s29.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s29.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s29.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s01s29.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s05.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s05.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s05.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s02s05.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s03s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s03s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s03s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s03s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s03s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s03s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s03s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s03s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s04s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s04s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s04s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s04s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s04s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s04s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s04s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s04s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s04s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s04s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s04s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s04s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s05.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s05.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s05.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s05s05.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s06.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s06.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s06.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch06s06.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s05.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s05.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s05.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s05.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s06.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s06.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s06.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s06.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s07.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s07.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s07.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s07.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s08.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s08.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s08.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s08.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s09.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s09.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s09.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s09.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s10.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s10.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s10.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s10.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s11.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s11.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s11.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s11.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s12.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s12.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s12.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s12.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s13.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s13.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s13.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s13.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s14.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s14.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s14.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s14.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s15.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s15.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s15.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s15.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s16.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s16.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s16.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s16.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s17.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s17.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s17.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s01s17.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch07s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s04.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s04.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s04.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s04.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s05.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s05.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s05.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s05.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s06.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s06.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s06.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s01s06.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s02.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s02.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s02.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s02.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s03.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s03.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s03.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/ch08s03.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/document.revisions.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/document.revisions.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/document.revisions.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/document.revisions.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/index.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/index.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/index.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/index.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/pr01.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/pr01.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/pr01.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/pr01.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.Introduction.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.Introduction.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.Introduction.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.Introduction.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avr32protocol.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avr32protocol.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avr32protocol.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avr32protocol.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avr8protocol.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avr8protocol.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avr8protocol.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avr8protocol.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avrispprotocol.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avrispprotocol.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avrispprotocol.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avrispprotocol.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avrprotocol.Overview.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avrprotocol.Overview.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avrprotocol.Overview.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.avrprotocol.Overview.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.cmsis_dap.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.cmsis_dap.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.cmsis_dap.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.cmsis_dap.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.edbg_ctrl_protocol.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.edbg_ctrl_protocol.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.edbg_ctrl_protocol.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.edbg_ctrl_protocol.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.tpiprotocol.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.tpiprotocol.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.tpiprotocol.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/protocoldocs.tpiprotocol.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/search/htmlFileInfoList.js b/src/avrdude/atmel-docs/EDBG/protocoldocs/search/htmlFileInfoList.js similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/search/htmlFileInfoList.js rename to src/avrdude/atmel-docs/EDBG/protocoldocs/search/htmlFileInfoList.js diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/search/index-1.js b/src/avrdude/atmel-docs/EDBG/protocoldocs/search/index-1.js similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/search/index-1.js rename to src/avrdude/atmel-docs/EDBG/protocoldocs/search/index-1.js diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/search/index-2.js b/src/avrdude/atmel-docs/EDBG/protocoldocs/search/index-2.js similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/search/index-2.js rename to src/avrdude/atmel-docs/EDBG/protocoldocs/search/index-2.js diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/search/index-3.js b/src/avrdude/atmel-docs/EDBG/protocoldocs/search/index-3.js similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/search/index-3.js rename to src/avrdude/atmel-docs/EDBG/protocoldocs/search/index-3.js diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/search/l10n.js b/src/avrdude/atmel-docs/EDBG/protocoldocs/search/l10n.js similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/search/l10n.js rename to src/avrdude/atmel-docs/EDBG/protocoldocs/search/l10n.js diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/search/nwSearchFnt.js b/src/avrdude/atmel-docs/EDBG/protocoldocs/search/nwSearchFnt.js similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/search/nwSearchFnt.js rename to src/avrdude/atmel-docs/EDBG/protocoldocs/search/nwSearchFnt.js diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/search/stemmers/en_stemmer.js b/src/avrdude/atmel-docs/EDBG/protocoldocs/search/stemmers/en_stemmer.js similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/search/stemmers/en_stemmer.js rename to src/avrdude/atmel-docs/EDBG/protocoldocs/search/stemmers/en_stemmer.js diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr32_memtypes.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr32_memtypes.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr32_memtypes.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr32_memtypes.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr32_setget_params.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr32_setget_params.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr32_setget_params.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr32_setget_params.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr8_memtypes.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr8_memtypes.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr8_memtypes.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr8_memtypes.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr8_query_contexts.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr8_query_contexts.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr8_query_contexts.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr8_query_contexts.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr8_setget_params.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr8_setget_params.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr8_setget_params.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/section_avr8_setget_params.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_edbg_ctrl_setget_params.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/section_edbg_ctrl_setget_params.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_edbg_ctrl_setget_params.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/section_edbg_ctrl_setget_params.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_edbg_query_contexts.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/section_edbg_query_contexts.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_edbg_query_contexts.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/section_edbg_query_contexts.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_housekeeping_start_session.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/section_housekeeping_start_session.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_housekeeping_start_session.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/section_housekeeping_start_session.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_i5v_3yz_rl.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/section_i5v_3yz_rl.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_i5v_3yz_rl.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/section_i5v_3yz_rl.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_jdx_m11_sl.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/section_jdx_m11_sl.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_jdx_m11_sl.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/section_jdx_m11_sl.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_qhb_x1c_sl.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/section_qhb_x1c_sl.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_qhb_x1c_sl.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/section_qhb_x1c_sl.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_serial_trace.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/section_serial_trace.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_serial_trace.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/section_serial_trace.html diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_t1f_hb1_sl.html b/src/avrdude/atmel-docs/EDBG/protocoldocs/section_t1f_hb1_sl.html similarity index 100% rename from xs/src/avrdude/atmel-docs/EDBG/protocoldocs/section_t1f_hb1_sl.html rename to src/avrdude/atmel-docs/EDBG/protocoldocs/section_t1f_hb1_sl.html diff --git a/xs/src/avrdude/atmel-docs/JTAGICE-AVR060.pdf b/src/avrdude/atmel-docs/JTAGICE-AVR060.pdf similarity index 100% rename from xs/src/avrdude/atmel-docs/JTAGICE-AVR060.pdf rename to src/avrdude/atmel-docs/JTAGICE-AVR060.pdf diff --git a/xs/src/avrdude/atmel-docs/JTAGICEmkII-AVR067.pdf b/src/avrdude/atmel-docs/JTAGICEmkII-AVR067.pdf similarity index 100% rename from xs/src/avrdude/atmel-docs/JTAGICEmkII-AVR067.pdf rename to src/avrdude/atmel-docs/JTAGICEmkII-AVR067.pdf diff --git a/xs/src/avrdude/atmel-docs/STK500-AVR061.pdf b/src/avrdude/atmel-docs/STK500-AVR061.pdf similarity index 100% rename from xs/src/avrdude/atmel-docs/STK500-AVR061.pdf rename to src/avrdude/atmel-docs/STK500-AVR061.pdf diff --git a/xs/src/avrdude/atmel-docs/STK500v2-AVR068.pdf b/src/avrdude/atmel-docs/STK500v2-AVR068.pdf similarity index 100% rename from xs/src/avrdude/atmel-docs/STK500v2-AVR068.pdf rename to src/avrdude/atmel-docs/STK500v2-AVR068.pdf diff --git a/xs/src/avrdude/avr.c b/src/avrdude/avr.c similarity index 100% rename from xs/src/avrdude/avr.c rename to src/avrdude/avr.c diff --git a/xs/src/avrdude/avr910.c b/src/avrdude/avr910.c similarity index 100% rename from xs/src/avrdude/avr910.c rename to src/avrdude/avr910.c diff --git a/xs/src/avrdude/avr910.h b/src/avrdude/avr910.h similarity index 100% rename from xs/src/avrdude/avr910.h rename to src/avrdude/avr910.h diff --git a/xs/src/avrdude/avrdude-slic3r.cpp b/src/avrdude/avrdude-slic3r.cpp similarity index 100% rename from xs/src/avrdude/avrdude-slic3r.cpp rename to src/avrdude/avrdude-slic3r.cpp diff --git a/xs/src/avrdude/avrdude-slic3r.hpp b/src/avrdude/avrdude-slic3r.hpp similarity index 100% rename from xs/src/avrdude/avrdude-slic3r.hpp rename to src/avrdude/avrdude-slic3r.hpp diff --git a/xs/src/avrdude/avrdude.1 b/src/avrdude/avrdude.1 similarity index 100% rename from xs/src/avrdude/avrdude.1 rename to src/avrdude/avrdude.1 diff --git a/xs/src/avrdude/avrdude.conf b/src/avrdude/avrdude.conf similarity index 100% rename from xs/src/avrdude/avrdude.conf rename to src/avrdude/avrdude.conf diff --git a/xs/src/avrdude/avrdude.conf.in b/src/avrdude/avrdude.conf.in similarity index 100% rename from xs/src/avrdude/avrdude.conf.in rename to src/avrdude/avrdude.conf.in diff --git a/xs/src/avrdude/avrdude.conf.tmp b/src/avrdude/avrdude.conf.tmp similarity index 100% rename from xs/src/avrdude/avrdude.conf.tmp rename to src/avrdude/avrdude.conf.tmp diff --git a/xs/src/avrdude/avrdude.h b/src/avrdude/avrdude.h similarity index 100% rename from xs/src/avrdude/avrdude.h rename to src/avrdude/avrdude.h diff --git a/xs/src/avrdude/avrdude.spec.in b/src/avrdude/avrdude.spec.in similarity index 100% rename from xs/src/avrdude/avrdude.spec.in rename to src/avrdude/avrdude.spec.in diff --git a/xs/src/avrdude/avrftdi.c b/src/avrdude/avrftdi.c similarity index 100% rename from xs/src/avrdude/avrftdi.c rename to src/avrdude/avrftdi.c diff --git a/xs/src/avrdude/avrftdi.h b/src/avrdude/avrftdi.h similarity index 100% rename from xs/src/avrdude/avrftdi.h rename to src/avrdude/avrftdi.h diff --git a/xs/src/avrdude/avrftdi_private.h b/src/avrdude/avrftdi_private.h similarity index 100% rename from xs/src/avrdude/avrftdi_private.h rename to src/avrdude/avrftdi_private.h diff --git a/xs/src/avrdude/avrftdi_tpi.c b/src/avrdude/avrftdi_tpi.c similarity index 100% rename from xs/src/avrdude/avrftdi_tpi.c rename to src/avrdude/avrftdi_tpi.c diff --git a/xs/src/avrdude/avrftdi_tpi.h b/src/avrdude/avrftdi_tpi.h similarity index 100% rename from xs/src/avrdude/avrftdi_tpi.h rename to src/avrdude/avrftdi_tpi.h diff --git a/xs/src/avrdude/avrpart.c b/src/avrdude/avrpart.c similarity index 100% rename from xs/src/avrdude/avrpart.c rename to src/avrdude/avrpart.c diff --git a/xs/src/avrdude/bitbang.c b/src/avrdude/bitbang.c similarity index 100% rename from xs/src/avrdude/bitbang.c rename to src/avrdude/bitbang.c diff --git a/xs/src/avrdude/bitbang.h b/src/avrdude/bitbang.h similarity index 100% rename from xs/src/avrdude/bitbang.h rename to src/avrdude/bitbang.h diff --git a/xs/src/avrdude/bootstrap b/src/avrdude/bootstrap old mode 100755 new mode 100644 similarity index 100% rename from xs/src/avrdude/bootstrap rename to src/avrdude/bootstrap diff --git a/xs/src/avrdude/buspirate.c b/src/avrdude/buspirate.c similarity index 100% rename from xs/src/avrdude/buspirate.c rename to src/avrdude/buspirate.c diff --git a/xs/src/avrdude/buspirate.h b/src/avrdude/buspirate.h similarity index 100% rename from xs/src/avrdude/buspirate.h rename to src/avrdude/buspirate.h diff --git a/xs/src/avrdude/butterfly.c b/src/avrdude/butterfly.c similarity index 100% rename from xs/src/avrdude/butterfly.c rename to src/avrdude/butterfly.c diff --git a/xs/src/avrdude/butterfly.h b/src/avrdude/butterfly.h similarity index 100% rename from xs/src/avrdude/butterfly.h rename to src/avrdude/butterfly.h diff --git a/xs/src/avrdude/config.c b/src/avrdude/config.c similarity index 100% rename from xs/src/avrdude/config.c rename to src/avrdude/config.c diff --git a/xs/src/avrdude/config.h b/src/avrdude/config.h similarity index 100% rename from xs/src/avrdude/config.h rename to src/avrdude/config.h diff --git a/xs/src/avrdude/config_gram.c b/src/avrdude/config_gram.c similarity index 100% rename from xs/src/avrdude/config_gram.c rename to src/avrdude/config_gram.c diff --git a/xs/src/avrdude/config_gram.h b/src/avrdude/config_gram.h similarity index 100% rename from xs/src/avrdude/config_gram.h rename to src/avrdude/config_gram.h diff --git a/xs/src/avrdude/config_gram.y b/src/avrdude/config_gram.y similarity index 100% rename from xs/src/avrdude/config_gram.y rename to src/avrdude/config_gram.y diff --git a/xs/src/avrdude/configure.ac b/src/avrdude/configure.ac similarity index 100% rename from xs/src/avrdude/configure.ac rename to src/avrdude/configure.ac diff --git a/xs/src/avrdude/confwin.c b/src/avrdude/confwin.c similarity index 100% rename from xs/src/avrdude/confwin.c rename to src/avrdude/confwin.c diff --git a/xs/src/avrdude/crc16.c b/src/avrdude/crc16.c similarity index 100% rename from xs/src/avrdude/crc16.c rename to src/avrdude/crc16.c diff --git a/xs/src/avrdude/crc16.h b/src/avrdude/crc16.h similarity index 100% rename from xs/src/avrdude/crc16.h rename to src/avrdude/crc16.h diff --git a/xs/src/avrdude/dfu.c b/src/avrdude/dfu.c similarity index 100% rename from xs/src/avrdude/dfu.c rename to src/avrdude/dfu.c diff --git a/xs/src/avrdude/dfu.h b/src/avrdude/dfu.h similarity index 100% rename from xs/src/avrdude/dfu.h rename to src/avrdude/dfu.h diff --git a/xs/src/avrdude/doc/.cvsignore b/src/avrdude/doc/.cvsignore similarity index 100% rename from xs/src/avrdude/doc/.cvsignore rename to src/avrdude/doc/.cvsignore diff --git a/xs/src/avrdude/doc/Makefile.am b/src/avrdude/doc/Makefile.am similarity index 100% rename from xs/src/avrdude/doc/Makefile.am rename to src/avrdude/doc/Makefile.am diff --git a/xs/src/avrdude/doc/TODO b/src/avrdude/doc/TODO similarity index 100% rename from xs/src/avrdude/doc/TODO rename to src/avrdude/doc/TODO diff --git a/xs/src/avrdude/doc/avrdude.texi b/src/avrdude/doc/avrdude.texi similarity index 100% rename from xs/src/avrdude/doc/avrdude.texi rename to src/avrdude/doc/avrdude.texi diff --git a/xs/src/avrdude/doc/parts_comments.txt b/src/avrdude/doc/parts_comments.txt similarity index 100% rename from xs/src/avrdude/doc/parts_comments.txt rename to src/avrdude/doc/parts_comments.txt diff --git a/xs/src/avrdude/fileio.c b/src/avrdude/fileio.c similarity index 100% rename from xs/src/avrdude/fileio.c rename to src/avrdude/fileio.c diff --git a/xs/src/avrdude/flip1.c b/src/avrdude/flip1.c similarity index 100% rename from xs/src/avrdude/flip1.c rename to src/avrdude/flip1.c diff --git a/xs/src/avrdude/flip1.h b/src/avrdude/flip1.h similarity index 100% rename from xs/src/avrdude/flip1.h rename to src/avrdude/flip1.h diff --git a/xs/src/avrdude/flip2.c b/src/avrdude/flip2.c similarity index 100% rename from xs/src/avrdude/flip2.c rename to src/avrdude/flip2.c diff --git a/xs/src/avrdude/flip2.h b/src/avrdude/flip2.h similarity index 100% rename from xs/src/avrdude/flip2.h rename to src/avrdude/flip2.h diff --git a/xs/src/avrdude/freebsd_ppi.h b/src/avrdude/freebsd_ppi.h similarity index 100% rename from xs/src/avrdude/freebsd_ppi.h rename to src/avrdude/freebsd_ppi.h diff --git a/xs/src/avrdude/ft245r.c b/src/avrdude/ft245r.c similarity index 100% rename from xs/src/avrdude/ft245r.c rename to src/avrdude/ft245r.c diff --git a/xs/src/avrdude/ft245r.h b/src/avrdude/ft245r.h similarity index 100% rename from xs/src/avrdude/ft245r.h rename to src/avrdude/ft245r.h diff --git a/xs/src/avrdude/jtag3.c b/src/avrdude/jtag3.c similarity index 100% rename from xs/src/avrdude/jtag3.c rename to src/avrdude/jtag3.c diff --git a/xs/src/avrdude/jtag3.h b/src/avrdude/jtag3.h similarity index 100% rename from xs/src/avrdude/jtag3.h rename to src/avrdude/jtag3.h diff --git a/xs/src/avrdude/jtag3_private.h b/src/avrdude/jtag3_private.h similarity index 100% rename from xs/src/avrdude/jtag3_private.h rename to src/avrdude/jtag3_private.h diff --git a/xs/src/avrdude/jtagmkI.c b/src/avrdude/jtagmkI.c similarity index 100% rename from xs/src/avrdude/jtagmkI.c rename to src/avrdude/jtagmkI.c diff --git a/xs/src/avrdude/jtagmkI.h b/src/avrdude/jtagmkI.h similarity index 100% rename from xs/src/avrdude/jtagmkI.h rename to src/avrdude/jtagmkI.h diff --git a/xs/src/avrdude/jtagmkII.c b/src/avrdude/jtagmkII.c similarity index 100% rename from xs/src/avrdude/jtagmkII.c rename to src/avrdude/jtagmkII.c diff --git a/xs/src/avrdude/jtagmkII.h b/src/avrdude/jtagmkII.h similarity index 100% rename from xs/src/avrdude/jtagmkII.h rename to src/avrdude/jtagmkII.h diff --git a/xs/src/avrdude/jtagmkII_private.h b/src/avrdude/jtagmkII_private.h similarity index 100% rename from xs/src/avrdude/jtagmkII_private.h rename to src/avrdude/jtagmkII_private.h diff --git a/xs/src/avrdude/jtagmkI_private.h b/src/avrdude/jtagmkI_private.h similarity index 100% rename from xs/src/avrdude/jtagmkI_private.h rename to src/avrdude/jtagmkI_private.h diff --git a/xs/src/avrdude/lexer.c b/src/avrdude/lexer.c similarity index 100% rename from xs/src/avrdude/lexer.c rename to src/avrdude/lexer.c diff --git a/xs/src/avrdude/lexer.l b/src/avrdude/lexer.l similarity index 100% rename from xs/src/avrdude/lexer.l rename to src/avrdude/lexer.l diff --git a/xs/src/avrdude/libavrdude.h b/src/avrdude/libavrdude.h similarity index 100% rename from xs/src/avrdude/libavrdude.h rename to src/avrdude/libavrdude.h diff --git a/xs/src/avrdude/linux_ppdev.h b/src/avrdude/linux_ppdev.h similarity index 100% rename from xs/src/avrdude/linux_ppdev.h rename to src/avrdude/linux_ppdev.h diff --git a/xs/src/avrdude/linuxgpio.c b/src/avrdude/linuxgpio.c similarity index 100% rename from xs/src/avrdude/linuxgpio.c rename to src/avrdude/linuxgpio.c diff --git a/xs/src/avrdude/linuxgpio.h b/src/avrdude/linuxgpio.h similarity index 100% rename from xs/src/avrdude/linuxgpio.h rename to src/avrdude/linuxgpio.h diff --git a/xs/src/avrdude/lists.c b/src/avrdude/lists.c similarity index 100% rename from xs/src/avrdude/lists.c rename to src/avrdude/lists.c diff --git a/xs/src/avrdude/main-standalone.c b/src/avrdude/main-standalone.c similarity index 100% rename from xs/src/avrdude/main-standalone.c rename to src/avrdude/main-standalone.c diff --git a/xs/src/avrdude/main.c b/src/avrdude/main.c similarity index 100% rename from xs/src/avrdude/main.c rename to src/avrdude/main.c diff --git a/xs/src/avrdude/my_ddk_hidsdi.h b/src/avrdude/my_ddk_hidsdi.h similarity index 100% rename from xs/src/avrdude/my_ddk_hidsdi.h rename to src/avrdude/my_ddk_hidsdi.h diff --git a/xs/src/avrdude/par.c b/src/avrdude/par.c similarity index 100% rename from xs/src/avrdude/par.c rename to src/avrdude/par.c diff --git a/xs/src/avrdude/par.h b/src/avrdude/par.h similarity index 100% rename from xs/src/avrdude/par.h rename to src/avrdude/par.h diff --git a/xs/src/avrdude/pgm.c b/src/avrdude/pgm.c similarity index 100% rename from xs/src/avrdude/pgm.c rename to src/avrdude/pgm.c diff --git a/xs/src/avrdude/pgm_type.c b/src/avrdude/pgm_type.c similarity index 100% rename from xs/src/avrdude/pgm_type.c rename to src/avrdude/pgm_type.c diff --git a/xs/src/avrdude/pickit2.c b/src/avrdude/pickit2.c similarity index 100% rename from xs/src/avrdude/pickit2.c rename to src/avrdude/pickit2.c diff --git a/xs/src/avrdude/pickit2.h b/src/avrdude/pickit2.h similarity index 100% rename from xs/src/avrdude/pickit2.h rename to src/avrdude/pickit2.h diff --git a/xs/src/avrdude/pindefs.c b/src/avrdude/pindefs.c similarity index 100% rename from xs/src/avrdude/pindefs.c rename to src/avrdude/pindefs.c diff --git a/xs/src/avrdude/ppi.c b/src/avrdude/ppi.c similarity index 100% rename from xs/src/avrdude/ppi.c rename to src/avrdude/ppi.c diff --git a/xs/src/avrdude/ppi.h b/src/avrdude/ppi.h similarity index 100% rename from xs/src/avrdude/ppi.h rename to src/avrdude/ppi.h diff --git a/xs/src/avrdude/ppiwin.c b/src/avrdude/ppiwin.c similarity index 100% rename from xs/src/avrdude/ppiwin.c rename to src/avrdude/ppiwin.c diff --git a/xs/src/avrdude/safemode.c b/src/avrdude/safemode.c similarity index 100% rename from xs/src/avrdude/safemode.c rename to src/avrdude/safemode.c diff --git a/xs/src/avrdude/ser_avrdoper.c b/src/avrdude/ser_avrdoper.c similarity index 100% rename from xs/src/avrdude/ser_avrdoper.c rename to src/avrdude/ser_avrdoper.c diff --git a/xs/src/avrdude/ser_posix.c b/src/avrdude/ser_posix.c similarity index 100% rename from xs/src/avrdude/ser_posix.c rename to src/avrdude/ser_posix.c diff --git a/xs/src/avrdude/ser_win32.c b/src/avrdude/ser_win32.c similarity index 100% rename from xs/src/avrdude/ser_win32.c rename to src/avrdude/ser_win32.c diff --git a/xs/src/avrdude/serbb.h b/src/avrdude/serbb.h similarity index 100% rename from xs/src/avrdude/serbb.h rename to src/avrdude/serbb.h diff --git a/xs/src/avrdude/serbb_posix.c b/src/avrdude/serbb_posix.c similarity index 100% rename from xs/src/avrdude/serbb_posix.c rename to src/avrdude/serbb_posix.c diff --git a/xs/src/avrdude/serbb_win32.c b/src/avrdude/serbb_win32.c similarity index 100% rename from xs/src/avrdude/serbb_win32.c rename to src/avrdude/serbb_win32.c diff --git a/xs/src/avrdude/solaris_ecpp.h b/src/avrdude/solaris_ecpp.h similarity index 100% rename from xs/src/avrdude/solaris_ecpp.h rename to src/avrdude/solaris_ecpp.h diff --git a/xs/src/avrdude/stk500.c b/src/avrdude/stk500.c similarity index 100% rename from xs/src/avrdude/stk500.c rename to src/avrdude/stk500.c diff --git a/xs/src/avrdude/stk500.h b/src/avrdude/stk500.h similarity index 100% rename from xs/src/avrdude/stk500.h rename to src/avrdude/stk500.h diff --git a/xs/src/avrdude/stk500_private.h b/src/avrdude/stk500_private.h similarity index 100% rename from xs/src/avrdude/stk500_private.h rename to src/avrdude/stk500_private.h diff --git a/xs/src/avrdude/stk500generic.c b/src/avrdude/stk500generic.c similarity index 100% rename from xs/src/avrdude/stk500generic.c rename to src/avrdude/stk500generic.c diff --git a/xs/src/avrdude/stk500generic.h b/src/avrdude/stk500generic.h similarity index 100% rename from xs/src/avrdude/stk500generic.h rename to src/avrdude/stk500generic.h diff --git a/xs/src/avrdude/stk500v2.c b/src/avrdude/stk500v2.c similarity index 100% rename from xs/src/avrdude/stk500v2.c rename to src/avrdude/stk500v2.c diff --git a/xs/src/avrdude/stk500v2.h b/src/avrdude/stk500v2.h similarity index 100% rename from xs/src/avrdude/stk500v2.h rename to src/avrdude/stk500v2.h diff --git a/xs/src/avrdude/stk500v2_private.h b/src/avrdude/stk500v2_private.h similarity index 100% rename from xs/src/avrdude/stk500v2_private.h rename to src/avrdude/stk500v2_private.h diff --git a/xs/src/avrdude/term.c b/src/avrdude/term.c similarity index 100% rename from xs/src/avrdude/term.c rename to src/avrdude/term.c diff --git a/xs/src/avrdude/term.h b/src/avrdude/term.h similarity index 100% rename from xs/src/avrdude/term.h rename to src/avrdude/term.h diff --git a/xs/src/avrdude/tools/build-mingw32.sh b/src/avrdude/tools/build-mingw32.sh old mode 100755 new mode 100644 similarity index 100% rename from xs/src/avrdude/tools/build-mingw32.sh rename to src/avrdude/tools/build-mingw32.sh diff --git a/xs/src/avrdude/tools/get-dw-params.xsl b/src/avrdude/tools/get-dw-params.xsl similarity index 100% rename from xs/src/avrdude/tools/get-dw-params.xsl rename to src/avrdude/tools/get-dw-params.xsl diff --git a/xs/src/avrdude/tools/get-hv-params.xsl b/src/avrdude/tools/get-hv-params.xsl similarity index 100% rename from xs/src/avrdude/tools/get-hv-params.xsl rename to src/avrdude/tools/get-hv-params.xsl diff --git a/xs/src/avrdude/tools/get-stk600-cards.xsl b/src/avrdude/tools/get-stk600-cards.xsl similarity index 100% rename from xs/src/avrdude/tools/get-stk600-cards.xsl rename to src/avrdude/tools/get-stk600-cards.xsl diff --git a/xs/src/avrdude/tools/get-stk600-devices.xsl b/src/avrdude/tools/get-stk600-devices.xsl similarity index 100% rename from xs/src/avrdude/tools/get-stk600-devices.xsl rename to src/avrdude/tools/get-stk600-devices.xsl diff --git a/xs/src/avrdude/tpi.h b/src/avrdude/tpi.h similarity index 100% rename from xs/src/avrdude/tpi.h rename to src/avrdude/tpi.h diff --git a/xs/src/avrdude/update.c b/src/avrdude/update.c similarity index 100% rename from xs/src/avrdude/update.c rename to src/avrdude/update.c diff --git a/xs/src/avrdude/usb_hidapi.c b/src/avrdude/usb_hidapi.c similarity index 100% rename from xs/src/avrdude/usb_hidapi.c rename to src/avrdude/usb_hidapi.c diff --git a/xs/src/avrdude/usb_libusb.c b/src/avrdude/usb_libusb.c similarity index 100% rename from xs/src/avrdude/usb_libusb.c rename to src/avrdude/usb_libusb.c diff --git a/xs/src/avrdude/usbasp.c b/src/avrdude/usbasp.c similarity index 100% rename from xs/src/avrdude/usbasp.c rename to src/avrdude/usbasp.c diff --git a/xs/src/avrdude/usbasp.h b/src/avrdude/usbasp.h similarity index 100% rename from xs/src/avrdude/usbasp.h rename to src/avrdude/usbasp.h diff --git a/xs/src/avrdude/usbdevs.h b/src/avrdude/usbdevs.h similarity index 100% rename from xs/src/avrdude/usbdevs.h rename to src/avrdude/usbdevs.h diff --git a/xs/src/avrdude/usbtiny.c b/src/avrdude/usbtiny.c similarity index 100% rename from xs/src/avrdude/usbtiny.c rename to src/avrdude/usbtiny.c diff --git a/xs/src/avrdude/usbtiny.h b/src/avrdude/usbtiny.h similarity index 100% rename from xs/src/avrdude/usbtiny.h rename to src/avrdude/usbtiny.h diff --git a/xs/src/avrdude/windows/.cvsignore b/src/avrdude/windows/.cvsignore similarity index 100% rename from xs/src/avrdude/windows/.cvsignore rename to src/avrdude/windows/.cvsignore diff --git a/xs/src/avrdude/windows/Makefile.am b/src/avrdude/windows/Makefile.am similarity index 100% rename from xs/src/avrdude/windows/Makefile.am rename to src/avrdude/windows/Makefile.am diff --git a/xs/src/avrdude/windows/getopt.c b/src/avrdude/windows/getopt.c similarity index 100% rename from xs/src/avrdude/windows/getopt.c rename to src/avrdude/windows/getopt.c diff --git a/xs/src/avrdude/windows/getopt.h b/src/avrdude/windows/getopt.h similarity index 100% rename from xs/src/avrdude/windows/getopt.h rename to src/avrdude/windows/getopt.h diff --git a/xs/src/avrdude/windows/giveio.c b/src/avrdude/windows/giveio.c similarity index 100% rename from xs/src/avrdude/windows/giveio.c rename to src/avrdude/windows/giveio.c diff --git a/xs/src/avrdude/windows/giveio.sys b/src/avrdude/windows/giveio.sys similarity index 100% rename from xs/src/avrdude/windows/giveio.sys rename to src/avrdude/windows/giveio.sys diff --git a/xs/src/avrdude/windows/install_giveio.bat b/src/avrdude/windows/install_giveio.bat old mode 100755 new mode 100644 similarity index 100% rename from xs/src/avrdude/windows/install_giveio.bat rename to src/avrdude/windows/install_giveio.bat diff --git a/xs/src/avrdude/windows/loaddrv.c b/src/avrdude/windows/loaddrv.c similarity index 100% rename from xs/src/avrdude/windows/loaddrv.c rename to src/avrdude/windows/loaddrv.c diff --git a/xs/src/avrdude/windows/loaddrv.h b/src/avrdude/windows/loaddrv.h similarity index 100% rename from xs/src/avrdude/windows/loaddrv.h rename to src/avrdude/windows/loaddrv.h diff --git a/xs/src/avrdude/windows/remove_giveio.bat b/src/avrdude/windows/remove_giveio.bat old mode 100755 new mode 100644 similarity index 100% rename from xs/src/avrdude/windows/remove_giveio.bat rename to src/avrdude/windows/remove_giveio.bat diff --git a/xs/src/avrdude/windows/status_giveio.bat b/src/avrdude/windows/status_giveio.bat old mode 100755 new mode 100644 similarity index 100% rename from xs/src/avrdude/windows/status_giveio.bat rename to src/avrdude/windows/status_giveio.bat diff --git a/xs/src/avrdude/windows/unistd.cpp b/src/avrdude/windows/unistd.cpp similarity index 100% rename from xs/src/avrdude/windows/unistd.cpp rename to src/avrdude/windows/unistd.cpp diff --git a/xs/src/avrdude/windows/unistd.h b/src/avrdude/windows/unistd.h similarity index 100% rename from xs/src/avrdude/windows/unistd.h rename to src/avrdude/windows/unistd.h diff --git a/xs/src/avrdude/wiring.c b/src/avrdude/wiring.c similarity index 100% rename from xs/src/avrdude/wiring.c rename to src/avrdude/wiring.c diff --git a/xs/src/avrdude/wiring.h b/src/avrdude/wiring.h similarity index 100% rename from xs/src/avrdude/wiring.h rename to src/avrdude/wiring.h diff --git a/src/boost/CMakeLists.txt b/src/boost/CMakeLists.txt new file mode 100644 index 0000000000..2b23ec3b20 --- /dev/null +++ b/src/boost/CMakeLists.txt @@ -0,0 +1,20 @@ +project(nowide) +cmake_minimum_required(VERSION 2.6) + +add_library(nowide STATIC + nowide/args.hpp + nowide/cenv.hpp + nowide/config.hpp + nowide/convert.hpp + nowide/cstdio.hpp + nowide/cstdlib.hpp + nowide/filebuf.hpp + nowide/fstream.hpp + nowide/integration/filesystem.hpp + nowide/iostream.cpp + nowide/iostream.hpp + nowide/stackstring.hpp + nowide/system.hpp + nowide/utf8_codecvt.hpp + nowide/windows.hpp +) diff --git a/xs/src/boost/nowide/args.hpp b/src/boost/nowide/args.hpp similarity index 100% rename from xs/src/boost/nowide/args.hpp rename to src/boost/nowide/args.hpp diff --git a/xs/src/boost/nowide/cenv.hpp b/src/boost/nowide/cenv.hpp similarity index 100% rename from xs/src/boost/nowide/cenv.hpp rename to src/boost/nowide/cenv.hpp diff --git a/xs/src/boost/nowide/config.hpp b/src/boost/nowide/config.hpp similarity index 100% rename from xs/src/boost/nowide/config.hpp rename to src/boost/nowide/config.hpp diff --git a/xs/src/boost/nowide/convert.hpp b/src/boost/nowide/convert.hpp similarity index 100% rename from xs/src/boost/nowide/convert.hpp rename to src/boost/nowide/convert.hpp diff --git a/xs/src/boost/nowide/cstdio.hpp b/src/boost/nowide/cstdio.hpp similarity index 100% rename from xs/src/boost/nowide/cstdio.hpp rename to src/boost/nowide/cstdio.hpp diff --git a/xs/src/boost/nowide/cstdlib.hpp b/src/boost/nowide/cstdlib.hpp similarity index 100% rename from xs/src/boost/nowide/cstdlib.hpp rename to src/boost/nowide/cstdlib.hpp diff --git a/xs/src/boost/nowide/filebuf.hpp b/src/boost/nowide/filebuf.hpp similarity index 100% rename from xs/src/boost/nowide/filebuf.hpp rename to src/boost/nowide/filebuf.hpp diff --git a/xs/src/boost/nowide/fstream.hpp b/src/boost/nowide/fstream.hpp similarity index 100% rename from xs/src/boost/nowide/fstream.hpp rename to src/boost/nowide/fstream.hpp diff --git a/xs/src/boost/nowide/integration/filesystem.hpp b/src/boost/nowide/integration/filesystem.hpp similarity index 100% rename from xs/src/boost/nowide/integration/filesystem.hpp rename to src/boost/nowide/integration/filesystem.hpp diff --git a/xs/src/boost/nowide/iostream.cpp b/src/boost/nowide/iostream.cpp similarity index 100% rename from xs/src/boost/nowide/iostream.cpp rename to src/boost/nowide/iostream.cpp diff --git a/xs/src/boost/nowide/iostream.hpp b/src/boost/nowide/iostream.hpp similarity index 100% rename from xs/src/boost/nowide/iostream.hpp rename to src/boost/nowide/iostream.hpp diff --git a/xs/src/boost/nowide/stackstring.hpp b/src/boost/nowide/stackstring.hpp similarity index 100% rename from xs/src/boost/nowide/stackstring.hpp rename to src/boost/nowide/stackstring.hpp diff --git a/xs/src/boost/nowide/system.hpp b/src/boost/nowide/system.hpp similarity index 100% rename from xs/src/boost/nowide/system.hpp rename to src/boost/nowide/system.hpp diff --git a/xs/src/boost/nowide/utf8_codecvt.hpp b/src/boost/nowide/utf8_codecvt.hpp similarity index 100% rename from xs/src/boost/nowide/utf8_codecvt.hpp rename to src/boost/nowide/utf8_codecvt.hpp diff --git a/xs/src/boost/nowide/windows.hpp b/src/boost/nowide/windows.hpp similarity index 100% rename from xs/src/boost/nowide/windows.hpp rename to src/boost/nowide/windows.hpp diff --git a/src/clipper/CMakeLists.txt b/src/clipper/CMakeLists.txt new file mode 100644 index 0000000000..d6f3861dce --- /dev/null +++ b/src/clipper/CMakeLists.txt @@ -0,0 +1,7 @@ +project(clipper) +cmake_minimum_required(VERSION 2.6) + +add_library(clipper STATIC + clipper.cpp + clipper.hpp +) diff --git a/xs/src/clipper.cpp b/src/clipper/clipper.cpp similarity index 96% rename from xs/src/clipper.cpp rename to src/clipper/clipper.cpp index e865288fb1..228e0c6ef6 100644 --- a/xs/src/clipper.cpp +++ b/src/clipper/clipper.cpp @@ -1,4180 +1,4180 @@ -/******************************************************************************* -* * -* Author : Angus Johnson * -* Version : 6.2.9 * -* Date : 16 February 2015 * -* Website : http://www.angusj.com * -* Copyright : Angus Johnson 2010-2015 * -* * -* License: * -* Use, modification & distribution is subject to Boost Software License Ver 1. * -* http://www.boost.org/LICENSE_1_0.txt * -* * -* Attributions: * -* The code in this library is an extension of Bala Vatti's clipping algorithm: * -* "A generic solution to polygon clipping" * -* Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63. * -* http://portal.acm.org/citation.cfm?id=129906 * -* * -* Computer graphics and geometric modeling: implementation and algorithms * -* By Max K. Agoston * -* Springer; 1 edition (January 4, 2005) * -* http://books.google.com/books?q=vatti+clipping+agoston * -* * -* See also: * -* "Polygon Offsetting by Computing Winding Numbers" * -* Paper no. DETC2005-85513 pp. 565-575 * -* ASME 2005 International Design Engineering Technical Conferences * -* and Computers and Information in Engineering Conference (IDETC/CIE2005) * -* September 24-28, 2005 , Long Beach, California, USA * -* http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf * -* * -*******************************************************************************/ - -/******************************************************************************* -* * -* This is a translation of the Delphi Clipper library and the naming style * -* used has retained a Delphi flavour. * -* * -*******************************************************************************/ - -#include "clipper.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace ClipperLib { - -static double const pi = 3.141592653589793238; -static double const two_pi = pi *2; -static double const def_arc_tolerance = 0.25; - -enum Direction { dRightToLeft, dLeftToRight }; - -static int const Unassigned = -1; //edge not currently 'owning' a solution -static int const Skip = -2; //edge that would otherwise close a path - -#define HORIZONTAL (-1.0E+40) -#define TOLERANCE (1.0e-20) -#define NEAR_ZERO(val) (((val) > -TOLERANCE) && ((val) < TOLERANCE)) - -// Output polygon. -struct OutRec { - int Idx; - bool IsHole; - bool IsOpen; - //The 'FirstLeft' field points to another OutRec that contains or is the - //'parent' of OutRec. It is 'first left' because the ActiveEdgeList (AEL) is - //parsed left from the current edge (owning OutRec) until the owner OutRec - //is found. This field simplifies sorting the polygons into a tree structure - //which reflects the parent/child relationships of all polygons. - //This field should be renamed Parent, and will be later. - OutRec *FirstLeft; - // Used only by void Clipper::BuildResult2(PolyTree& polytree) - PolyNode *PolyNd; - // Linked list of output points, dynamically allocated. - OutPt *Pts; - OutPt *BottomPt; -}; - -//------------------------------------------------------------------------------ - -inline cInt Round(double val) -{ - return static_cast((val < 0) ? (val - 0.5) : (val + 0.5)); -} - -//------------------------------------------------------------------------------ -// PolyTree methods ... -//------------------------------------------------------------------------------ - -int PolyTree::Total() const -{ - int result = (int)AllNodes.size(); - //with negative offsets, ignore the hidden outer polygon ... - if (result > 0 && Childs.front() != &AllNodes.front()) result--; - return result; -} - -//------------------------------------------------------------------------------ -// PolyNode methods ... -//------------------------------------------------------------------------------ - -void PolyNode::AddChild(PolyNode& child) -{ - unsigned cnt = (unsigned)Childs.size(); - Childs.push_back(&child); - child.Parent = this; - child.Index = cnt; -} -//------------------------------------------------------------------------------ - -// Edge delimits a hole if it has an odd number of parent loops. -bool PolyNode::IsHole() const -{ - bool result = true; - PolyNode* node = Parent; - while (node) - { - result = !result; - node = node->Parent; - } - return result; -} - -//------------------------------------------------------------------------------ -// Miscellaneous global functions -//------------------------------------------------------------------------------ - -double Area(const Path &poly) -{ - int size = (int)poly.size(); - if (size < 3) return 0; - - double a = 0; - for (int i = 0, j = size -1; i < size; ++i) - { - a += ((double)poly[j].X + poly[i].X) * ((double)poly[j].Y - poly[i].Y); - j = i; - } - return -a * 0.5; -} -//------------------------------------------------------------------------------ - -double Area(const OutRec &outRec) -{ - OutPt *op = outRec.Pts; - if (!op) return 0; - double a = 0; - do { - a += (double)(op->Prev->Pt.X + op->Pt.X) * (double)(op->Prev->Pt.Y - op->Pt.Y); - op = op->Next; - } while (op != outRec.Pts); - return a * 0.5; -} -//------------------------------------------------------------------------------ - -bool PointIsVertex(const IntPoint &Pt, OutPt *pp) -{ - OutPt *pp2 = pp; - do - { - if (pp2->Pt == Pt) return true; - pp2 = pp2->Next; - } - while (pp2 != pp); - return false; -} -//------------------------------------------------------------------------------ - -//See "The Point in Polygon Problem for Arbitrary Polygons" by Hormann & Agathos -//http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.88.5498&rep=rep1&type=pdf -int PointInPolygon(const IntPoint &pt, const Path &path) -{ - //returns 0 if false, +1 if true, -1 if pt ON polygon boundary - int result = 0; - size_t cnt = path.size(); - if (cnt < 3) return 0; - IntPoint ip = path[0]; - for(size_t i = 1; i <= cnt; ++i) - { - IntPoint ipNext = (i == cnt ? path[0] : path[i]); - if (ipNext.Y == pt.Y && ((ipNext.X == pt.X) || (ip.Y == pt.Y && ((ipNext.X > pt.X) == (ip.X < pt.X))))) - return -1; - if ((ip.Y < pt.Y) != (ipNext.Y < pt.Y)) - { - if (ip.X >= pt.X) - { - if (ipNext.X > pt.X) result = 1 - result; - else - { - double d = (double)(ip.X - pt.X) * (ipNext.Y - pt.Y) - (double)(ipNext.X - pt.X) * (ip.Y - pt.Y); - if (!d) return -1; - if ((d > 0) == (ipNext.Y > ip.Y)) result = 1 - result; - } - } else - { - if (ipNext.X > pt.X) - { - double d = (double)(ip.X - pt.X) * (ipNext.Y - pt.Y) - (double)(ipNext.X - pt.X) * (ip.Y - pt.Y); - if (!d) return -1; - if ((d > 0) == (ipNext.Y > ip.Y)) result = 1 - result; - } - } - } - ip = ipNext; - } - return result; -} -//------------------------------------------------------------------------------ - -// Called by Poly2ContainsPoly1() -int PointInPolygon (const IntPoint &pt, OutPt *op) -{ - //returns 0 if false, +1 if true, -1 if pt ON polygon boundary - int result = 0; - OutPt* startOp = op; - do - { - if (op->Next->Pt.Y == pt.Y) - { - if ((op->Next->Pt.X == pt.X) || (op->Pt.Y == pt.Y && - ((op->Next->Pt.X > pt.X) == (op->Pt.X < pt.X)))) return -1; - } - if ((op->Pt.Y < pt.Y) != (op->Next->Pt.Y < pt.Y)) - { - if (op->Pt.X >= pt.X) - { - if (op->Next->Pt.X > pt.X) result = 1 - result; - else - { - double d = (double)(op->Pt.X - pt.X) * (op->Next->Pt.Y - pt.Y) - (double)(op->Next->Pt.X - pt.X) * (op->Pt.Y - pt.Y); - if (!d) return -1; - if ((d > 0) == (op->Next->Pt.Y > op->Pt.Y)) result = 1 - result; - } - } else - { - if (op->Next->Pt.X > pt.X) - { - double d = (double)(op->Pt.X - pt.X) * (op->Next->Pt.Y - pt.Y) - (double)(op->Next->Pt.X - pt.X) * (op->Pt.Y - pt.Y); - if (!d) return -1; - if ((d > 0) == (op->Next->Pt.Y > op->Pt.Y)) result = 1 - result; - } - } - } - op = op->Next; - } while (startOp != op); - return result; -} -//------------------------------------------------------------------------------ - -// This is potentially very expensive! O(n^2)! -bool Poly2ContainsPoly1(OutPt *OutPt1, OutPt *OutPt2) -{ - PROFILE_FUNC(); - OutPt* op = OutPt1; - do - { - //nb: PointInPolygon returns 0 if false, +1 if true, -1 if pt on polygon - int res = PointInPolygon(op->Pt, OutPt2); - if (res >= 0) return res > 0; - op = op->Next; - } - while (op != OutPt1); - return true; -} -//---------------------------------------------------------------------- - -inline bool SlopesEqual(const cInt dx1, const cInt dy1, const cInt dx2, const cInt dy2, bool UseFullInt64Range) { - return (UseFullInt64Range) ? - // |dx1| < 2^63, |dx2| < 2^63 etc, - Int128::sign_determinant_2x2_filtered(dx1, dy1, dx2, dy2) == 0 : -// Int128::sign_determinant_2x2(dx1, dy1, dx2, dy2) == 0 : - // |dx1| < 2^31, |dx2| < 2^31 etc, - // therefore the following computation could be done with 64bit arithmetics. - dy1 * dx2 == dx1 * dy2; -} -inline bool SlopesEqual(const TEdge &e1, const TEdge &e2, bool UseFullInt64Range) - { return SlopesEqual(e1.Delta.X, e1.Delta.Y, e2.Delta.X, e2.Delta.Y, UseFullInt64Range); } -inline bool SlopesEqual(const IntPoint &pt1, const IntPoint &pt2, const IntPoint &pt3, bool UseFullInt64Range) - { return SlopesEqual(pt1.X-pt2.X, pt1.Y-pt2.Y, pt2.X-pt3.X, pt2.Y-pt3.Y, UseFullInt64Range); } -inline bool SlopesEqual(const IntPoint &pt1, const IntPoint &pt2, const IntPoint &pt3, const IntPoint &pt4, bool UseFullInt64Range) - { return SlopesEqual(pt1.X-pt2.X, pt1.Y-pt2.Y, pt3.X-pt4.X, pt3.Y-pt4.Y, UseFullInt64Range); } - -//------------------------------------------------------------------------------ - -inline bool IsHorizontal(TEdge &e) -{ - return e.Delta.Y == 0; -} -//------------------------------------------------------------------------------ - -inline double GetDx(const IntPoint &pt1, const IntPoint &pt2) -{ - return (pt1.Y == pt2.Y) ? - HORIZONTAL : (double)(pt2.X - pt1.X) / (pt2.Y - pt1.Y); -} -//--------------------------------------------------------------------------- - -inline cInt TopX(TEdge &edge, const cInt currentY) -{ - return (currentY == edge.Top.Y) ? - edge.Top.X : - edge.Bot.X + Round(edge.Dx *(currentY - edge.Bot.Y)); -} -//------------------------------------------------------------------------------ - -void IntersectPoint(TEdge &Edge1, TEdge &Edge2, IntPoint &ip) -{ -#ifdef use_xyz - ip.Z = 0; -#endif - - double b1, b2; - if (Edge1.Dx == Edge2.Dx) - { - ip.Y = Edge1.Curr.Y; - ip.X = TopX(Edge1, ip.Y); - return; - } - else if (Edge1.Delta.X == 0) - { - ip.X = Edge1.Bot.X; - if (IsHorizontal(Edge2)) - ip.Y = Edge2.Bot.Y; - else - { - b2 = Edge2.Bot.Y - (Edge2.Bot.X / Edge2.Dx); - ip.Y = Round(ip.X / Edge2.Dx + b2); - } - } - else if (Edge2.Delta.X == 0) - { - ip.X = Edge2.Bot.X; - if (IsHorizontal(Edge1)) - ip.Y = Edge1.Bot.Y; - else - { - b1 = Edge1.Bot.Y - (Edge1.Bot.X / Edge1.Dx); - ip.Y = Round(ip.X / Edge1.Dx + b1); - } - } - else - { - b1 = Edge1.Bot.X - Edge1.Bot.Y * Edge1.Dx; - b2 = Edge2.Bot.X - Edge2.Bot.Y * Edge2.Dx; - double q = (b2-b1) / (Edge1.Dx - Edge2.Dx); - ip.Y = Round(q); - ip.X = (std::fabs(Edge1.Dx) < std::fabs(Edge2.Dx)) ? - Round(Edge1.Dx * q + b1) : - Round(Edge2.Dx * q + b2); - } - - if (ip.Y < Edge1.Top.Y || ip.Y < Edge2.Top.Y) - { - if (Edge1.Top.Y > Edge2.Top.Y) - ip.Y = Edge1.Top.Y; - else - ip.Y = Edge2.Top.Y; - if (std::fabs(Edge1.Dx) < std::fabs(Edge2.Dx)) - ip.X = TopX(Edge1, ip.Y); - else - ip.X = TopX(Edge2, ip.Y); - } - //finally, don't allow 'ip' to be BELOW curr.Y (ie bottom of scanbeam) ... - if (ip.Y > Edge1.Curr.Y) - { - ip.Y = Edge1.Curr.Y; - //use the more vertical edge to derive X ... - if (std::fabs(Edge1.Dx) > std::fabs(Edge2.Dx)) - ip.X = TopX(Edge2, ip.Y); else - ip.X = TopX(Edge1, ip.Y); - } -} -//------------------------------------------------------------------------------ - -// Reverse a linked loop of points representing a closed polygon. -// This has a time complexity of O(n) -void ReversePolyPtLinks(OutPt *pp) -{ - if (!pp) return; - OutPt *pp1 = pp; - do { - OutPt *pp2 = pp1->Next; - pp1->Next = pp1->Prev; - pp1->Prev = pp2; - pp1 = pp2; - } while( pp1 != pp ); -} -//------------------------------------------------------------------------------ - -inline void InitEdge(TEdge* e, TEdge* eNext, TEdge* ePrev, const IntPoint& Pt) -{ - std::memset(e, 0, sizeof(TEdge)); - e->Next = eNext; - e->Prev = ePrev; - e->Curr = Pt; - e->OutIdx = Unassigned; -} -//------------------------------------------------------------------------------ - -void InitEdge2(TEdge& e, PolyType Pt) -{ - if (e.Curr.Y >= e.Next->Curr.Y) - { - e.Bot = e.Curr; - e.Top = e.Next->Curr; - } else - { - e.Top = e.Curr; - e.Bot = e.Next->Curr; - } - - e.Delta.X = (e.Top.X - e.Bot.X); - e.Delta.Y = (e.Top.Y - e.Bot.Y); - - if (e.Delta.Y == 0) e.Dx = HORIZONTAL; - else e.Dx = (double)(e.Delta.X) / e.Delta.Y; - - e.PolyTyp = Pt; -} -//------------------------------------------------------------------------------ - -// Called from ClipperBase::AddPathInternal() to remove collinear and duplicate points. -inline TEdge* RemoveEdge(TEdge* e) -{ - //removes e from double_linked_list (but without removing from memory) - e->Prev->Next = e->Next; - e->Next->Prev = e->Prev; - TEdge* result = e->Next; - e->Prev = 0; //flag as removed (see ClipperBase.Clear) - return result; -} -//------------------------------------------------------------------------------ - -inline void ReverseHorizontal(TEdge &e) -{ - //swap horizontal edges' Top and Bottom x's so they follow the natural - //progression of the bounds - ie so their xbots will align with the - //adjoining lower edge. [Helpful in the ProcessHorizontal() method.] - std::swap(e.Top.X, e.Bot.X); -#ifdef use_xyz - std::swap(e.Top.Z, e.Bot.Z); -#endif -} -//------------------------------------------------------------------------------ - -bool GetOverlapSegment(IntPoint pt1a, IntPoint pt1b, IntPoint pt2a, - IntPoint pt2b, IntPoint &pt1, IntPoint &pt2) -{ - //precondition: segments are Collinear. - if (std::abs(pt1a.X - pt1b.X) > std::abs(pt1a.Y - pt1b.Y)) - { - if (pt1a.X > pt1b.X) std::swap(pt1a, pt1b); - if (pt2a.X > pt2b.X) std::swap(pt2a, pt2b); - if (pt1a.X > pt2a.X) pt1 = pt1a; else pt1 = pt2a; - if (pt1b.X < pt2b.X) pt2 = pt1b; else pt2 = pt2b; - return pt1.X < pt2.X; - } else - { - if (pt1a.Y < pt1b.Y) std::swap(pt1a, pt1b); - if (pt2a.Y < pt2b.Y) std::swap(pt2a, pt2b); - if (pt1a.Y < pt2a.Y) pt1 = pt1a; else pt1 = pt2a; - if (pt1b.Y > pt2b.Y) pt2 = pt1b; else pt2 = pt2b; - return pt1.Y > pt2.Y; - } -} -//------------------------------------------------------------------------------ - -bool FirstIsBottomPt(const OutPt* btmPt1, const OutPt* btmPt2) -{ - OutPt *p = btmPt1->Prev; - while ((p->Pt == btmPt1->Pt) && (p != btmPt1)) p = p->Prev; - double dx1p = std::fabs(GetDx(btmPt1->Pt, p->Pt)); - p = btmPt1->Next; - while ((p->Pt == btmPt1->Pt) && (p != btmPt1)) p = p->Next; - double dx1n = std::fabs(GetDx(btmPt1->Pt, p->Pt)); - - p = btmPt2->Prev; - while ((p->Pt == btmPt2->Pt) && (p != btmPt2)) p = p->Prev; - double dx2p = std::fabs(GetDx(btmPt2->Pt, p->Pt)); - p = btmPt2->Next; - while ((p->Pt == btmPt2->Pt) && (p != btmPt2)) p = p->Next; - double dx2n = std::fabs(GetDx(btmPt2->Pt, p->Pt)); - return (dx1p >= dx2p && dx1p >= dx2n) || (dx1n >= dx2p && dx1n >= dx2n); -} -//------------------------------------------------------------------------------ - -// Called by GetLowermostRec() -OutPt* GetBottomPt(OutPt *pp) -{ - OutPt* dups = 0; - OutPt* p = pp->Next; - while (p != pp) - { - if (p->Pt.Y > pp->Pt.Y) - { - pp = p; - dups = 0; - } - else if (p->Pt.Y == pp->Pt.Y && p->Pt.X <= pp->Pt.X) - { - if (p->Pt.X < pp->Pt.X) - { - dups = 0; - pp = p; - } else - { - if (p->Next != pp && p->Prev != pp) dups = p; - } - } - p = p->Next; - } - if (dups) - { - //there appears to be at least 2 vertices at BottomPt so ... - while (dups != p) - { - if (!FirstIsBottomPt(p, dups)) pp = dups; - dups = dups->Next; - while (dups->Pt != pp->Pt) dups = dups->Next; - } - } - return pp; -} -//------------------------------------------------------------------------------ - -bool Pt2IsBetweenPt1AndPt3(const IntPoint &pt1, - const IntPoint &pt2, const IntPoint &pt3) -{ - if ((pt1 == pt3) || (pt1 == pt2) || (pt3 == pt2)) - return false; - else if (pt1.X != pt3.X) - return (pt2.X > pt1.X) == (pt2.X < pt3.X); - else - return (pt2.Y > pt1.Y) == (pt2.Y < pt3.Y); -} -//------------------------------------------------------------------------------ - -bool HorzSegmentsOverlap(cInt seg1a, cInt seg1b, cInt seg2a, cInt seg2b) -{ - if (seg1a > seg1b) std::swap(seg1a, seg1b); - if (seg2a > seg2b) std::swap(seg2a, seg2b); - return (seg1a < seg2b) && (seg2a < seg1b); -} - -//------------------------------------------------------------------------------ -// ClipperBase class methods ... -//------------------------------------------------------------------------------ - -// Called from ClipperBase::AddPath() to verify the scale of the input polygon coordinates. -inline void RangeTest(const IntPoint& Pt, bool& useFullRange) -{ - if (useFullRange) - { - if (Pt.X > hiRange || Pt.Y > hiRange || -Pt.X > hiRange || -Pt.Y > hiRange) - throw clipperException("Coordinate outside allowed range"); - } - else if (Pt.X > loRange|| Pt.Y > loRange || -Pt.X > loRange || -Pt.Y > loRange) - { - useFullRange = true; - RangeTest(Pt, useFullRange); - } -} -//------------------------------------------------------------------------------ - -// Called from ClipperBase::AddPath() to construct the Local Minima List. -// Find a local minimum edge on the path starting with E. -inline TEdge* FindNextLocMin(TEdge* E) -{ - for (;;) - { - while (E->Bot != E->Prev->Bot || E->Curr == E->Top) E = E->Next; - if (!IsHorizontal(*E) && !IsHorizontal(*E->Prev)) break; - while (IsHorizontal(*E->Prev)) E = E->Prev; - TEdge* E2 = E; - while (IsHorizontal(*E)) E = E->Next; - if (E->Top.Y == E->Prev->Bot.Y) continue; //ie just an intermediate horz. - if (E2->Prev->Bot.X < E->Bot.X) E = E2; - break; - } - return E; -} -//------------------------------------------------------------------------------ - -// Called from ClipperBase::AddPath(). -TEdge* ClipperBase::ProcessBound(TEdge* E, bool NextIsForward) -{ - TEdge *Result = E; - TEdge *Horz = 0; - - if (E->OutIdx == Skip) - { - //if edges still remain in the current bound beyond the skip edge then - //create another LocMin and call ProcessBound once more - if (NextIsForward) - { - while (E->Top.Y == E->Next->Bot.Y) E = E->Next; - //don't include top horizontals when parsing a bound a second time, - //they will be contained in the opposite bound ... - while (E != Result && IsHorizontal(*E)) E = E->Prev; - } - else - { - while (E->Top.Y == E->Prev->Bot.Y) E = E->Prev; - while (E != Result && IsHorizontal(*E)) E = E->Next; - } - - if (E == Result) - { - if (NextIsForward) Result = E->Next; - else Result = E->Prev; - } - else - { - //there are more edges in the bound beyond result starting with E - if (NextIsForward) - E = Result->Next; - else - E = Result->Prev; - LocalMinimum locMin; - locMin.Y = E->Bot.Y; - locMin.LeftBound = 0; - locMin.RightBound = E; - E->WindDelta = 0; - Result = ProcessBound(E, NextIsForward); - m_MinimaList.push_back(locMin); - } - return Result; - } - - TEdge *EStart; - - if (IsHorizontal(*E)) - { - //We need to be careful with open paths because this may not be a - //true local minima (ie E may be following a skip edge). - //Also, consecutive horz. edges may start heading left before going right. - if (NextIsForward) - EStart = E->Prev; - else - EStart = E->Next; - if (IsHorizontal(*EStart)) //ie an adjoining horizontal skip edge - { - if (EStart->Bot.X != E->Bot.X && EStart->Top.X != E->Bot.X) - ReverseHorizontal(*E); - } - else if (EStart->Bot.X != E->Bot.X) - ReverseHorizontal(*E); - } - - EStart = E; - if (NextIsForward) - { - while (Result->Top.Y == Result->Next->Bot.Y && Result->Next->OutIdx != Skip) - Result = Result->Next; - if (IsHorizontal(*Result) && Result->Next->OutIdx != Skip) - { - //nb: at the top of a bound, horizontals are added to the bound - //only when the preceding edge attaches to the horizontal's left vertex - //unless a Skip edge is encountered when that becomes the top divide - Horz = Result; - while (IsHorizontal(*Horz->Prev)) Horz = Horz->Prev; - if (Horz->Prev->Top.X > Result->Next->Top.X) Result = Horz->Prev; - } - while (E != Result) - { - E->NextInLML = E->Next; - if (IsHorizontal(*E) && E != EStart && - E->Bot.X != E->Prev->Top.X) ReverseHorizontal(*E); - E = E->Next; - } - if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Prev->Top.X) - ReverseHorizontal(*E); - Result = Result->Next; //move to the edge just beyond current bound - } else - { - while (Result->Top.Y == Result->Prev->Bot.Y && Result->Prev->OutIdx != Skip) - Result = Result->Prev; - if (IsHorizontal(*Result) && Result->Prev->OutIdx != Skip) - { - Horz = Result; - while (IsHorizontal(*Horz->Next)) Horz = Horz->Next; - if (Horz->Next->Top.X == Result->Prev->Top.X || - Horz->Next->Top.X > Result->Prev->Top.X) Result = Horz->Next; - } - - while (E != Result) - { - E->NextInLML = E->Prev; - if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Next->Top.X) - ReverseHorizontal(*E); - E = E->Prev; - } - if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Next->Top.X) - ReverseHorizontal(*E); - Result = Result->Prev; //move to the edge just beyond current bound - } - - return Result; -} -//------------------------------------------------------------------------------ - -bool ClipperBase::AddPath(const Path &pg, PolyType PolyTyp, bool Closed) -{ - PROFILE_FUNC(); - // Remove duplicate end point from a closed input path. - // Remove duplicate points from the end of the input path. - int highI = (int)pg.size() -1; - if (Closed) - while (highI > 0 && (pg[highI] == pg[0])) - --highI; - while (highI > 0 && (pg[highI] == pg[highI -1])) - --highI; - if ((Closed && highI < 2) || (!Closed && highI < 1)) - return false; - - // Allocate a new edge array. - std::vector edges(highI + 1); - // Fill in the edge array. - bool result = AddPathInternal(pg, highI, PolyTyp, Closed, edges.data()); - if (result) - // Success, remember the edge array. - m_edges.emplace_back(std::move(edges)); - return result; -} - -bool ClipperBase::AddPaths(const Paths &ppg, PolyType PolyTyp, bool Closed) -{ - PROFILE_FUNC(); - std::vector num_edges(ppg.size(), 0); - int num_edges_total = 0; - for (size_t i = 0; i < ppg.size(); ++ i) { - const Path &pg = ppg[i]; - // Remove duplicate end point from a closed input path. - // Remove duplicate points from the end of the input path. - int highI = (int)pg.size() -1; - if (Closed) - while (highI > 0 && (pg[highI] == pg[0])) - --highI; - while (highI > 0 && (pg[highI] == pg[highI -1])) - --highI; - if ((Closed && highI < 2) || (!Closed && highI < 1)) - highI = -1; - num_edges[i] = highI + 1; - num_edges_total += highI + 1; - } - if (num_edges_total == 0) - return false; - - // Allocate a new edge array. - std::vector edges(num_edges_total); - // Fill in the edge array. - bool result = false; - TEdge *p_edge = edges.data(); - for (Paths::size_type i = 0; i < ppg.size(); ++i) - if (num_edges[i]) { - bool res = AddPathInternal(ppg[i], num_edges[i] - 1, PolyTyp, Closed, p_edge); - if (res) { - p_edge += num_edges[i]; - result = true; - } - } - if (result) - // At least some edges were generated. Remember the edge array. - m_edges.emplace_back(std::move(edges)); - return result; -} - -bool ClipperBase::AddPathInternal(const Path &pg, int highI, PolyType PolyTyp, bool Closed, TEdge* edges) -{ - PROFILE_FUNC(); -#ifdef use_lines - if (!Closed && PolyTyp == ptClip) - throw clipperException("AddPath: Open paths must be subject."); -#else - if (!Closed) - throw clipperException("AddPath: Open paths have been disabled."); -#endif - - assert(highI >= 0 && highI < pg.size()); - - //1. Basic (first) edge initialization ... - try - { - edges[1].Curr = pg[1]; - RangeTest(pg[0], m_UseFullRange); - RangeTest(pg[highI], m_UseFullRange); - InitEdge(&edges[0], &edges[1], &edges[highI], pg[0]); - InitEdge(&edges[highI], &edges[0], &edges[highI-1], pg[highI]); - for (int i = highI - 1; i >= 1; --i) - { - RangeTest(pg[i], m_UseFullRange); - InitEdge(&edges[i], &edges[i+1], &edges[i-1], pg[i]); - } - } - catch(...) - { - throw; //range test fails - } - TEdge *eStart = &edges[0]; - - //2. Remove duplicate vertices, and (when closed) collinear edges ... - TEdge *E = eStart, *eLoopStop = eStart; - for (;;) - { - //nb: allows matching start and end points when not Closed ... - if (E->Curr == E->Next->Curr && (Closed || E->Next != eStart)) - { - if (E == E->Next) break; - if (E == eStart) eStart = E->Next; - E = RemoveEdge(E); - eLoopStop = E; - continue; - } - if (E->Prev == E->Next) - break; //only two vertices - else if (Closed && - SlopesEqual(E->Prev->Curr, E->Curr, E->Next->Curr, m_UseFullRange) && - (!m_PreserveCollinear || - !Pt2IsBetweenPt1AndPt3(E->Prev->Curr, E->Curr, E->Next->Curr))) - { - //Collinear edges are allowed for open paths but in closed paths - //the default is to merge adjacent collinear edges into a single edge. - //However, if the PreserveCollinear property is enabled, only overlapping - //collinear edges (ie spikes) will be removed from closed paths. - if (E == eStart) eStart = E->Next; - E = RemoveEdge(E); - E = E->Prev; - eLoopStop = E; - continue; - } - E = E->Next; - if ((E == eLoopStop) || (!Closed && E->Next == eStart)) break; - } - - if ((!Closed && (E == E->Next)) || (Closed && (E->Prev == E->Next))) - { - return false; - } - - if (!Closed) - { - m_HasOpenPaths = true; - eStart->Prev->OutIdx = Skip; - } - - //3. Do second stage of edge initialization ... - // IsFlat means all vertices have the same Y coordinate. - bool IsFlat = true; - E = eStart; - do - { - InitEdge2(*E, PolyTyp); - E = E->Next; - if (IsFlat && E->Curr.Y != eStart->Curr.Y) IsFlat = false; - } - while (E != eStart); - - //4. Finally, add edge bounds to LocalMinima list ... - - //Totally flat paths must be handled differently when adding them - //to LocalMinima list to avoid endless loops etc ... - if (IsFlat) - { - if (Closed) - { - return false; - } - E->Prev->OutIdx = Skip; - LocalMinimum locMin; - locMin.Y = E->Bot.Y; - locMin.LeftBound = 0; - locMin.RightBound = E; - locMin.RightBound->Side = esRight; - locMin.RightBound->WindDelta = 0; - for (;;) - { - if (E->Bot.X != E->Prev->Top.X) ReverseHorizontal(*E); - if (E->Next->OutIdx == Skip) break; - E->NextInLML = E->Next; - E = E->Next; - } - m_MinimaList.push_back(locMin); - return true; - } - - bool leftBoundIsForward; - TEdge* EMin = 0; - - //workaround to avoid an endless loop in the while loop below when - //open paths have matching start and end points ... - if (E->Prev->Bot == E->Prev->Top) E = E->Next; - - // Find local minima and store them into a Local Minima List. - // Multiple Local Minima could be created for a single path. - for (;;) - { - E = FindNextLocMin(E); - if (E == EMin) break; - else if (!EMin) EMin = E; - - //E and E.Prev now share a local minima (left aligned if horizontal). - //Compare their slopes to find which starts which bound ... - LocalMinimum locMin; - locMin.Y = E->Bot.Y; - if (E->Dx < E->Prev->Dx) - { - locMin.LeftBound = E->Prev; - locMin.RightBound = E; - leftBoundIsForward = false; //Q.nextInLML = Q.prev - } else - { - locMin.LeftBound = E; - locMin.RightBound = E->Prev; - leftBoundIsForward = true; //Q.nextInLML = Q.next - } - locMin.LeftBound->Side = esLeft; - locMin.RightBound->Side = esRight; - - if (!Closed) locMin.LeftBound->WindDelta = 0; - else if (locMin.LeftBound->Next == locMin.RightBound) - locMin.LeftBound->WindDelta = -1; - else locMin.LeftBound->WindDelta = 1; - locMin.RightBound->WindDelta = -locMin.LeftBound->WindDelta; - - E = ProcessBound(locMin.LeftBound, leftBoundIsForward); - if (E->OutIdx == Skip) E = ProcessBound(E, leftBoundIsForward); - - TEdge* E2 = ProcessBound(locMin.RightBound, !leftBoundIsForward); - if (E2->OutIdx == Skip) E2 = ProcessBound(E2, !leftBoundIsForward); - - if (locMin.LeftBound->OutIdx == Skip) - locMin.LeftBound = 0; - else if (locMin.RightBound->OutIdx == Skip) - locMin.RightBound = 0; - m_MinimaList.push_back(locMin); - if (!leftBoundIsForward) E = E2; - } - return true; -} -//------------------------------------------------------------------------------ - -void ClipperBase::Clear() -{ - PROFILE_FUNC(); - m_MinimaList.clear(); - m_edges.clear(); - m_UseFullRange = false; - m_HasOpenPaths = false; -} -//------------------------------------------------------------------------------ - -// Initialize the Local Minima List: -// Sort the LML entries, initialize the left / right bound edges of each Local Minima. -void ClipperBase::Reset() -{ - PROFILE_FUNC(); - if (m_MinimaList.empty()) return; //ie nothing to process - std::sort(m_MinimaList.begin(), m_MinimaList.end(), [](const LocalMinimum& lm1, const LocalMinimum& lm2){ return lm1.Y < lm2.Y; }); - - //reset all edges ... - for (LocalMinimum &lm : m_MinimaList) { - TEdge* e = lm.LeftBound; - if (e) - { - e->Curr = e->Bot; - e->Side = esLeft; - e->OutIdx = Unassigned; - } - - e = lm.RightBound; - if (e) - { - e->Curr = e->Bot; - e->Side = esRight; - e->OutIdx = Unassigned; - } - } -} -//------------------------------------------------------------------------------ - -// Get bounds of the edges referenced by the Local Minima List. -// Returns (0,0,0,0) for an empty rectangle. -IntRect ClipperBase::GetBounds() -{ - PROFILE_FUNC(); - IntRect result; - auto lm = m_MinimaList.begin(); - if (lm == m_MinimaList.end()) - { - result.left = result.top = result.right = result.bottom = 0; - return result; - } - result.left = lm->LeftBound->Bot.X; - result.top = lm->LeftBound->Bot.Y; - result.right = lm->LeftBound->Bot.X; - result.bottom = lm->LeftBound->Bot.Y; - while (lm != m_MinimaList.end()) - { - result.bottom = std::max(result.bottom, lm->LeftBound->Bot.Y); - TEdge* e = lm->LeftBound; - for (;;) { - TEdge* bottomE = e; - while (e->NextInLML) - { - if (e->Bot.X < result.left) result.left = e->Bot.X; - if (e->Bot.X > result.right) result.right = e->Bot.X; - e = e->NextInLML; - } - result.left = std::min(result.left, e->Bot.X); - result.right = std::max(result.right, e->Bot.X); - result.left = std::min(result.left, e->Top.X); - result.right = std::max(result.right, e->Top.X); - result.top = std::min(result.top, e->Top.Y); - if (bottomE == lm->LeftBound) e = lm->RightBound; - else break; - } - ++lm; - } - return result; -} - -//------------------------------------------------------------------------------ -// TClipper methods ... -//------------------------------------------------------------------------------ - -Clipper::Clipper(int initOptions) : - ClipperBase(), - m_OutPtsFree(nullptr), - m_OutPtsChunkSize(32), - m_OutPtsChunkLast(32), - m_ActiveEdges(nullptr), - m_SortedEdges(nullptr) -{ - m_ReverseOutput = ((initOptions & ioReverseSolution) != 0); - m_StrictSimple = ((initOptions & ioStrictlySimple) != 0); - m_PreserveCollinear = ((initOptions & ioPreserveCollinear) != 0); - m_HasOpenPaths = false; -#ifdef use_xyz - m_ZFill = 0; -#endif -} -//------------------------------------------------------------------------------ - -void Clipper::Reset() -{ - PROFILE_FUNC(); - ClipperBase::Reset(); - m_Scanbeam = std::priority_queue(); - m_Maxima.clear(); - m_ActiveEdges = 0; - m_SortedEdges = 0; - for (auto lm = m_MinimaList.rbegin(); lm != m_MinimaList.rend(); ++lm) - m_Scanbeam.push(lm->Y); -} - -//------------------------------------------------------------------------------ - -bool Clipper::Execute(ClipType clipType, Paths &solution, - PolyFillType subjFillType, PolyFillType clipFillType) -{ - PROFILE_FUNC(); - if (m_HasOpenPaths) - throw clipperException("Error: PolyTree struct is needed for open path clipping."); - solution.resize(0); - m_SubjFillType = subjFillType; - m_ClipFillType = clipFillType; - m_ClipType = clipType; - m_UsingPolyTree = false; - bool succeeded = ExecuteInternal(); - if (succeeded) BuildResult(solution); - DisposeAllOutRecs(); - return succeeded; -} -//------------------------------------------------------------------------------ - -bool Clipper::Execute(ClipType clipType, PolyTree& polytree, - PolyFillType subjFillType, PolyFillType clipFillType) -{ - PROFILE_FUNC(); - m_SubjFillType = subjFillType; - m_ClipFillType = clipFillType; - m_ClipType = clipType; - m_UsingPolyTree = true; - bool succeeded = ExecuteInternal(); - if (succeeded) BuildResult2(polytree); - DisposeAllOutRecs(); - return succeeded; -} -//------------------------------------------------------------------------------ - -bool Clipper::ExecuteInternal() -{ - PROFILE_FUNC(); - bool succeeded = true; - try { - PROFILE_BLOCK(Clipper_ExecuteInternal_Process); - Reset(); - if (m_MinimaList.empty()) return true; - cInt botY = m_Scanbeam.top(); - do { m_Scanbeam.pop(); } while (! m_Scanbeam.empty() && botY == m_Scanbeam.top()); - do { - InsertLocalMinimaIntoAEL(botY); - ProcessHorizontals(); - m_GhostJoins.clear(); - if (m_Scanbeam.empty()) break; - cInt topY = m_Scanbeam.top(); - do { m_Scanbeam.pop(); } while (! m_Scanbeam.empty() && topY == m_Scanbeam.top()); - succeeded = ProcessIntersections(topY); - if (!succeeded) break; - ProcessEdgesAtTopOfScanbeam(topY); - botY = topY; - } while (!m_Scanbeam.empty() || !m_MinimaList.empty()); - } - catch(...) - { - succeeded = false; - } - - if (succeeded) - { - PROFILE_BLOCK(Clipper_ExecuteInternal_Fix); - - //fix orientations ... - //FIXME Vojtech: Does it not invalidate the loop hierarchy maintained as OutRec::FirstLeft pointers? - //FIXME Vojtech: The area is calculated with floats, it may not be numerically stable! - { - PROFILE_BLOCK(Clipper_ExecuteInternal_Fix_orientations); - for (OutRec *outRec : m_PolyOuts) - if (outRec->Pts && !outRec->IsOpen && (outRec->IsHole ^ m_ReverseOutput) == (Area(*outRec) > 0)) - ReversePolyPtLinks(outRec->Pts); - } - - JoinCommonEdges(); - - //unfortunately FixupOutPolygon() must be done after JoinCommonEdges() - { - PROFILE_BLOCK(Clipper_ExecuteInternal_Fix_fixup); - for (OutRec *outRec : m_PolyOuts) - if (outRec->Pts) { - if (outRec->IsOpen) - // Removes duplicate points. - FixupOutPolyline(*outRec); - else - // Removes duplicate points and simplifies consecutive parallel edges by removing the middle vertex. - FixupOutPolygon(*outRec); - } - } - // For each polygon, search for exactly duplicate non-successive points. - // If such a point is found, the loop is split into two pieces. - // Search for the duplicate points is O(n^2)! - // http://www.angusj.com/delphi/clipper/documentation/Docs/Units/ClipperLib/Classes/Clipper/Properties/StrictlySimple.htm - if (m_StrictSimple) DoSimplePolygons(); - } - - m_Joins.clear(); - m_GhostJoins.clear(); - return succeeded; -} -//------------------------------------------------------------------------------ - -OutPt* Clipper::AllocateOutPt() -{ - OutPt *pt; - if (m_OutPtsFree) { - // Recycle some of the already released points. - pt = m_OutPtsFree; - m_OutPtsFree = pt->Next; - } else if (m_OutPtsChunkLast < m_OutPtsChunkSize) { - // Get a point from the last chunk. - pt = m_OutPts.back() + (m_OutPtsChunkLast ++); - } else { - // The last chunk is full. Allocate a new one. - m_OutPts.push_back(new OutPt[m_OutPtsChunkSize]); - m_OutPtsChunkLast = 1; - pt = m_OutPts.back(); - } - return pt; -} - -void Clipper::DisposeAllOutRecs() -{ - for (OutPt *pts : m_OutPts) - delete[] pts; - for (OutRec *rec : m_PolyOuts) - delete rec; - m_OutPts.clear(); - m_OutPtsFree = nullptr; - m_OutPtsChunkLast = m_OutPtsChunkSize; - m_PolyOuts.clear(); -} -//------------------------------------------------------------------------------ - -void Clipper::SetWindingCount(TEdge &edge) const -{ - TEdge *e = edge.PrevInAEL; - //find the edge of the same polytype that immediately preceeds 'edge' in AEL - while (e && ((e->PolyTyp != edge.PolyTyp) || (e->WindDelta == 0))) e = e->PrevInAEL; - if (!e) - { - edge.WindCnt = (edge.WindDelta == 0 ? 1 : edge.WindDelta); - edge.WindCnt2 = 0; - e = m_ActiveEdges; //ie get ready to calc WindCnt2 - } - else if (edge.WindDelta == 0 && m_ClipType != ctUnion) - { - edge.WindCnt = 1; - edge.WindCnt2 = e->WindCnt2; - e = e->NextInAEL; //ie get ready to calc WindCnt2 - } - else if (IsEvenOddFillType(edge)) - { - //EvenOdd filling ... - if (edge.WindDelta == 0) - { - //are we inside a subj polygon ... - bool Inside = true; - TEdge *e2 = e->PrevInAEL; - while (e2) - { - if (e2->PolyTyp == e->PolyTyp && e2->WindDelta != 0) - Inside = !Inside; - e2 = e2->PrevInAEL; - } - edge.WindCnt = (Inside ? 0 : 1); - } - else - { - edge.WindCnt = edge.WindDelta; - } - edge.WindCnt2 = e->WindCnt2; - e = e->NextInAEL; //ie get ready to calc WindCnt2 - } - else - { - //nonZero, Positive or Negative filling ... - if (e->WindCnt * e->WindDelta < 0) - { - //prev edge is 'decreasing' WindCount (WC) toward zero - //so we're outside the previous polygon ... - if (std::abs(e->WindCnt) > 1) - { - //outside prev poly but still inside another. - //when reversing direction of prev poly use the same WC - if (e->WindDelta * edge.WindDelta < 0) edge.WindCnt = e->WindCnt; - //otherwise continue to 'decrease' WC ... - else edge.WindCnt = e->WindCnt + edge.WindDelta; - } - else - //now outside all polys of same polytype so set own WC ... - edge.WindCnt = (edge.WindDelta == 0 ? 1 : edge.WindDelta); - } else - { - //prev edge is 'increasing' WindCount (WC) away from zero - //so we're inside the previous polygon ... - if (edge.WindDelta == 0) - edge.WindCnt = (e->WindCnt < 0 ? e->WindCnt - 1 : e->WindCnt + 1); - //if wind direction is reversing prev then use same WC - else if (e->WindDelta * edge.WindDelta < 0) edge.WindCnt = e->WindCnt; - //otherwise add to WC ... - else edge.WindCnt = e->WindCnt + edge.WindDelta; - } - edge.WindCnt2 = e->WindCnt2; - e = e->NextInAEL; //ie get ready to calc WindCnt2 - } - - //update WindCnt2 ... - if (IsEvenOddAltFillType(edge)) - { - //EvenOdd filling ... - while (e != &edge) - { - if (e->WindDelta != 0) - edge.WindCnt2 = (edge.WindCnt2 == 0 ? 1 : 0); - e = e->NextInAEL; - } - } else - { - //nonZero, Positive or Negative filling ... - while ( e != &edge ) - { - edge.WindCnt2 += e->WindDelta; - e = e->NextInAEL; - } - } -} -//------------------------------------------------------------------------------ - -bool Clipper::IsContributing(const TEdge& edge) const -{ - PolyFillType pft, pft2; - if (edge.PolyTyp == ptSubject) - { - pft = m_SubjFillType; - pft2 = m_ClipFillType; - } else - { - pft = m_ClipFillType; - pft2 = m_SubjFillType; - } - - switch(pft) - { - case pftEvenOdd: - //return false if a subj line has been flagged as inside a subj polygon - if (edge.WindDelta == 0 && edge.WindCnt != 1) return false; - break; - case pftNonZero: - if (std::abs(edge.WindCnt) != 1) return false; - break; - case pftPositive: - if (edge.WindCnt != 1) return false; - break; - default: //pftNegative - if (edge.WindCnt != -1) return false; - } - - switch(m_ClipType) - { - case ctIntersection: - switch(pft2) - { - case pftEvenOdd: - case pftNonZero: - return (edge.WindCnt2 != 0); - case pftPositive: - return (edge.WindCnt2 > 0); - default: - return (edge.WindCnt2 < 0); - } - break; - case ctUnion: - switch(pft2) - { - case pftEvenOdd: - case pftNonZero: - return (edge.WindCnt2 == 0); - case pftPositive: - return (edge.WindCnt2 <= 0); - default: - return (edge.WindCnt2 >= 0); - } - break; - case ctDifference: - if (edge.PolyTyp == ptSubject) - switch(pft2) - { - case pftEvenOdd: - case pftNonZero: - return (edge.WindCnt2 == 0); - case pftPositive: - return (edge.WindCnt2 <= 0); - default: - return (edge.WindCnt2 >= 0); - } - else - switch(pft2) - { - case pftEvenOdd: - case pftNonZero: - return (edge.WindCnt2 != 0); - case pftPositive: - return (edge.WindCnt2 > 0); - default: - return (edge.WindCnt2 < 0); - } - break; - case ctXor: - if (edge.WindDelta == 0) //XOr always contributing unless open - switch(pft2) - { - case pftEvenOdd: - case pftNonZero: - return (edge.WindCnt2 == 0); - case pftPositive: - return (edge.WindCnt2 <= 0); - default: - return (edge.WindCnt2 >= 0); - } - else - return true; - break; - default: - return true; - } -} -//------------------------------------------------------------------------------ - -// Called from Clipper::InsertLocalMinimaIntoAEL() and Clipper::IntersectEdges(). -OutPt* Clipper::AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &Pt) -{ - PROFILE_FUNC(); - OutPt* result; - TEdge *e, *prevE; - if (IsHorizontal(*e2) || ( e1->Dx > e2->Dx )) - { - result = AddOutPt(e1, Pt); - e2->OutIdx = e1->OutIdx; - e1->Side = esLeft; - e2->Side = esRight; - e = e1; - if (e->PrevInAEL == e2) - prevE = e2->PrevInAEL; - else - prevE = e->PrevInAEL; - } else - { - result = AddOutPt(e2, Pt); - e1->OutIdx = e2->OutIdx; - e1->Side = esRight; - e2->Side = esLeft; - e = e2; - if (e->PrevInAEL == e1) - prevE = e1->PrevInAEL; - else - prevE = e->PrevInAEL; - } - - if (prevE && prevE->OutIdx >= 0 && - (TopX(*prevE, Pt.Y) == TopX(*e, Pt.Y)) && - SlopesEqual(*e, *prevE, m_UseFullRange) && - (e->WindDelta != 0) && (prevE->WindDelta != 0)) - { - OutPt* outPt = AddOutPt(prevE, Pt); - m_Joins.emplace_back(Join(result, outPt, e->Top)); - } - return result; -} -//------------------------------------------------------------------------------ - -void Clipper::AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &Pt) -{ - AddOutPt( e1, Pt ); - if (e2->WindDelta == 0) AddOutPt(e2, Pt); - if( e1->OutIdx == e2->OutIdx ) - { - e1->OutIdx = Unassigned; - e2->OutIdx = Unassigned; - } - else if (e1->OutIdx < e2->OutIdx) - AppendPolygon(e1, e2); - else - AppendPolygon(e2, e1); -} -//------------------------------------------------------------------------------ - -void Clipper::AddEdgeToSEL(TEdge *edge) -{ - //SEL pointers in PEdge are reused to build a list of horizontal edges. - //However, we don't need to worry about order with horizontal edge processing. - if( !m_SortedEdges ) - { - m_SortedEdges = edge; - edge->PrevInSEL = 0; - edge->NextInSEL = 0; - } - else - { - edge->NextInSEL = m_SortedEdges; - edge->PrevInSEL = 0; - m_SortedEdges->PrevInSEL = edge; - m_SortedEdges = edge; - } -} -//------------------------------------------------------------------------------ - -void Clipper::CopyAELToSEL() -{ - TEdge* e = m_ActiveEdges; - m_SortedEdges = e; - while ( e ) - { - e->PrevInSEL = e->PrevInAEL; - e->NextInSEL = e->NextInAEL; - e = e->NextInAEL; - } -} - -//------------------------------------------------------------------------------ - -// Called from Clipper::ExecuteInternal() -void Clipper::InsertLocalMinimaIntoAEL(const cInt botY) -{ - PROFILE_FUNC(); - while (!m_MinimaList.empty() && m_MinimaList.back().Y == botY) - { - TEdge* lb = m_MinimaList.back().LeftBound; - TEdge* rb = m_MinimaList.back().RightBound; - m_MinimaList.pop_back(); - - OutPt *Op1 = 0; - if (!lb) - { - //nb: don't insert LB into either AEL or SEL - InsertEdgeIntoAEL(rb, 0); - SetWindingCount(*rb); - if (IsContributing(*rb)) - Op1 = AddOutPt(rb, rb->Bot); - } - else if (!rb) - { - InsertEdgeIntoAEL(lb, 0); - SetWindingCount(*lb); - if (IsContributing(*lb)) - Op1 = AddOutPt(lb, lb->Bot); - m_Scanbeam.push(lb->Top.Y); - } - else - { - InsertEdgeIntoAEL(lb, 0); - InsertEdgeIntoAEL(rb, lb); - SetWindingCount( *lb ); - rb->WindCnt = lb->WindCnt; - rb->WindCnt2 = lb->WindCnt2; - if (IsContributing(*lb)) - Op1 = AddLocalMinPoly(lb, rb, lb->Bot); - m_Scanbeam.push(lb->Top.Y); - } - - if (rb) - { - if(IsHorizontal(*rb)) AddEdgeToSEL(rb); - else m_Scanbeam.push(rb->Top.Y); - } - - if (!lb || !rb) continue; - - //if any output polygons share an edge, they'll need joining later ... - if (Op1 && IsHorizontal(*rb) && - m_GhostJoins.size() > 0 && (rb->WindDelta != 0)) - { - for (Join &jr : m_GhostJoins) - //if the horizontal Rb and a 'ghost' horizontal overlap, then convert - //the 'ghost' join to a real join ready for later ... - if (HorzSegmentsOverlap(jr.OutPt1->Pt.X, jr.OffPt.X, rb->Bot.X, rb->Top.X)) - m_Joins.emplace_back(Join(jr.OutPt1, Op1, jr.OffPt)); - } - - if (lb->OutIdx >= 0 && lb->PrevInAEL && - lb->PrevInAEL->Curr.X == lb->Bot.X && - lb->PrevInAEL->OutIdx >= 0 && - SlopesEqual(*lb->PrevInAEL, *lb, m_UseFullRange) && - (lb->WindDelta != 0) && (lb->PrevInAEL->WindDelta != 0)) - { - OutPt *Op2 = AddOutPt(lb->PrevInAEL, lb->Bot); - m_Joins.emplace_back(Join(Op1, Op2, lb->Top)); - } - - if(lb->NextInAEL != rb) - { - - if (rb->OutIdx >= 0 && rb->PrevInAEL->OutIdx >= 0 && - SlopesEqual(*rb->PrevInAEL, *rb, m_UseFullRange) && - (rb->WindDelta != 0) && (rb->PrevInAEL->WindDelta != 0)) - { - OutPt *Op2 = AddOutPt(rb->PrevInAEL, rb->Bot); - m_Joins.emplace_back(Join(Op1, Op2, rb->Top)); - } - - TEdge* e = lb->NextInAEL; - if (e) - { - while( e != rb ) - { - //nb: For calculating winding counts etc, IntersectEdges() assumes - //that param1 will be to the Right of param2 ABOVE the intersection ... - IntersectEdges(rb , e , lb->Curr); //order important here - e = e->NextInAEL; - } - } - } - - } -} -//------------------------------------------------------------------------------ - -void Clipper::DeleteFromAEL(TEdge *e) -{ - TEdge* AelPrev = e->PrevInAEL; - TEdge* AelNext = e->NextInAEL; - if( !AelPrev && !AelNext && (e != m_ActiveEdges) ) return; //already deleted - if( AelPrev ) AelPrev->NextInAEL = AelNext; - else m_ActiveEdges = AelNext; - if( AelNext ) AelNext->PrevInAEL = AelPrev; - e->NextInAEL = 0; - e->PrevInAEL = 0; -} -//------------------------------------------------------------------------------ - -void Clipper::DeleteFromSEL(TEdge *e) -{ - TEdge* SelPrev = e->PrevInSEL; - TEdge* SelNext = e->NextInSEL; - if( !SelPrev && !SelNext && (e != m_SortedEdges) ) return; //already deleted - if( SelPrev ) SelPrev->NextInSEL = SelNext; - else m_SortedEdges = SelNext; - if( SelNext ) SelNext->PrevInSEL = SelPrev; - e->NextInSEL = 0; - e->PrevInSEL = 0; -} -//------------------------------------------------------------------------------ - -#ifdef use_xyz -void Clipper::SetZ(IntPoint& pt, TEdge& e1, TEdge& e2) -{ - if (pt.Z != 0 || !m_ZFill) return; - else if (pt == e1.Bot) pt.Z = e1.Bot.Z; - else if (pt == e1.Top) pt.Z = e1.Top.Z; - else if (pt == e2.Bot) pt.Z = e2.Bot.Z; - else if (pt == e2.Top) pt.Z = e2.Top.Z; - else (*m_ZFill)(e1.Bot, e1.Top, e2.Bot, e2.Top, pt); -} -//------------------------------------------------------------------------------ -#endif - -void Clipper::IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &Pt) -{ - bool e1Contributing = ( e1->OutIdx >= 0 ); - bool e2Contributing = ( e2->OutIdx >= 0 ); - -#ifdef use_xyz - SetZ(Pt, *e1, *e2); -#endif - -#ifdef use_lines - //if either edge is on an OPEN path ... - if (e1->WindDelta == 0 || e2->WindDelta == 0) - { - //ignore subject-subject open path intersections UNLESS they - //are both open paths, AND they are both 'contributing maximas' ... - if (e1->WindDelta == 0 && e2->WindDelta == 0) return; - - //if intersecting a subj line with a subj poly ... - else if (e1->PolyTyp == e2->PolyTyp && - e1->WindDelta != e2->WindDelta && m_ClipType == ctUnion) - { - if (e1->WindDelta == 0) - { - if (e2Contributing) - { - AddOutPt(e1, Pt); - if (e1Contributing) e1->OutIdx = Unassigned; - } - } - else - { - if (e1Contributing) - { - AddOutPt(e2, Pt); - if (e2Contributing) e2->OutIdx = Unassigned; - } - } - } - else if (e1->PolyTyp != e2->PolyTyp) - { - //toggle subj open path OutIdx on/off when Abs(clip.WndCnt) == 1 ... - if ((e1->WindDelta == 0) && std::abs(e2->WindCnt) == 1 && - (m_ClipType != ctUnion || e2->WindCnt2 == 0)) - { - AddOutPt(e1, Pt); - if (e1Contributing) e1->OutIdx = Unassigned; - } - else if ((e2->WindDelta == 0) && (std::abs(e1->WindCnt) == 1) && - (m_ClipType != ctUnion || e1->WindCnt2 == 0)) - { - AddOutPt(e2, Pt); - if (e2Contributing) e2->OutIdx = Unassigned; - } - } - return; - } -#endif - - //update winding counts... - //assumes that e1 will be to the Right of e2 ABOVE the intersection - if ( e1->PolyTyp == e2->PolyTyp ) - { - if ( IsEvenOddFillType( *e1) ) - { - int oldE1WindCnt = e1->WindCnt; - e1->WindCnt = e2->WindCnt; - e2->WindCnt = oldE1WindCnt; - } else - { - if (e1->WindCnt + e2->WindDelta == 0 ) e1->WindCnt = -e1->WindCnt; - else e1->WindCnt += e2->WindDelta; - if ( e2->WindCnt - e1->WindDelta == 0 ) e2->WindCnt = -e2->WindCnt; - else e2->WindCnt -= e1->WindDelta; - } - } else - { - if (!IsEvenOddFillType(*e2)) e1->WindCnt2 += e2->WindDelta; - else e1->WindCnt2 = ( e1->WindCnt2 == 0 ) ? 1 : 0; - if (!IsEvenOddFillType(*e1)) e2->WindCnt2 -= e1->WindDelta; - else e2->WindCnt2 = ( e2->WindCnt2 == 0 ) ? 1 : 0; - } - - PolyFillType e1FillType, e2FillType, e1FillType2, e2FillType2; - if (e1->PolyTyp == ptSubject) - { - e1FillType = m_SubjFillType; - e1FillType2 = m_ClipFillType; - } else - { - e1FillType = m_ClipFillType; - e1FillType2 = m_SubjFillType; - } - if (e2->PolyTyp == ptSubject) - { - e2FillType = m_SubjFillType; - e2FillType2 = m_ClipFillType; - } else - { - e2FillType = m_ClipFillType; - e2FillType2 = m_SubjFillType; - } - - cInt e1Wc, e2Wc; - switch (e1FillType) - { - case pftPositive: e1Wc = e1->WindCnt; break; - case pftNegative: e1Wc = -e1->WindCnt; break; - default: e1Wc = std::abs(e1->WindCnt); - } - switch(e2FillType) - { - case pftPositive: e2Wc = e2->WindCnt; break; - case pftNegative: e2Wc = -e2->WindCnt; break; - default: e2Wc = std::abs(e2->WindCnt); - } - - if ( e1Contributing && e2Contributing ) - { - if ((e1Wc != 0 && e1Wc != 1) || (e2Wc != 0 && e2Wc != 1) || - (e1->PolyTyp != e2->PolyTyp && m_ClipType != ctXor) ) - { - AddLocalMaxPoly(e1, e2, Pt); - } - else - { - AddOutPt(e1, Pt); - AddOutPt(e2, Pt); - std::swap(e1->Side, e2->Side); - std::swap(e1->OutIdx, e2->OutIdx); - } - } - else if ( e1Contributing ) - { - if (e2Wc == 0 || e2Wc == 1) - { - AddOutPt(e1, Pt); - std::swap(e1->Side, e2->Side); - std::swap(e1->OutIdx, e2->OutIdx); - } - } - else if ( e2Contributing ) - { - if (e1Wc == 0 || e1Wc == 1) - { - AddOutPt(e2, Pt); - std::swap(e1->Side, e2->Side); - std::swap(e1->OutIdx, e2->OutIdx); - } - } - else if ( (e1Wc == 0 || e1Wc == 1) && (e2Wc == 0 || e2Wc == 1)) - { - //neither edge is currently contributing ... - - cInt e1Wc2, e2Wc2; - switch (e1FillType2) - { - case pftPositive: e1Wc2 = e1->WindCnt2; break; - case pftNegative : e1Wc2 = -e1->WindCnt2; break; - default: e1Wc2 = std::abs(e1->WindCnt2); - } - switch (e2FillType2) - { - case pftPositive: e2Wc2 = e2->WindCnt2; break; - case pftNegative: e2Wc2 = -e2->WindCnt2; break; - default: e2Wc2 = std::abs(e2->WindCnt2); - } - - if (e1->PolyTyp != e2->PolyTyp) - { - AddLocalMinPoly(e1, e2, Pt); - } - else if (e1Wc == 1 && e2Wc == 1) - switch( m_ClipType ) { - case ctIntersection: - if (e1Wc2 > 0 && e2Wc2 > 0) - AddLocalMinPoly(e1, e2, Pt); - break; - case ctUnion: - if ( e1Wc2 <= 0 && e2Wc2 <= 0 ) - AddLocalMinPoly(e1, e2, Pt); - break; - case ctDifference: - if (((e1->PolyTyp == ptClip) && (e1Wc2 > 0) && (e2Wc2 > 0)) || - ((e1->PolyTyp == ptSubject) && (e1Wc2 <= 0) && (e2Wc2 <= 0))) - AddLocalMinPoly(e1, e2, Pt); - break; - case ctXor: - AddLocalMinPoly(e1, e2, Pt); - } - else - std::swap(e1->Side, e2->Side); - } -} -//------------------------------------------------------------------------------ - -void Clipper::SetHoleState(TEdge *e, OutRec *outrec) const -{ - bool IsHole = false; - TEdge *e2 = e->PrevInAEL; - while (e2) - { - if (e2->OutIdx >= 0 && e2->WindDelta != 0) - { - IsHole = !IsHole; - if (! outrec->FirstLeft) - outrec->FirstLeft = m_PolyOuts[e2->OutIdx]; - } - e2 = e2->PrevInAEL; - } - if (IsHole) outrec->IsHole = true; -} -//------------------------------------------------------------------------------ - -OutRec* GetLowermostRec(OutRec *outRec1, OutRec *outRec2) -{ - //work out which polygon fragment has the correct hole state ... - if (!outRec1->BottomPt) - outRec1->BottomPt = GetBottomPt(outRec1->Pts); - if (!outRec2->BottomPt) - outRec2->BottomPt = GetBottomPt(outRec2->Pts); - OutPt *OutPt1 = outRec1->BottomPt; - OutPt *OutPt2 = outRec2->BottomPt; - if (OutPt1->Pt.Y > OutPt2->Pt.Y) return outRec1; - else if (OutPt1->Pt.Y < OutPt2->Pt.Y) return outRec2; - else if (OutPt1->Pt.X < OutPt2->Pt.X) return outRec1; - else if (OutPt1->Pt.X > OutPt2->Pt.X) return outRec2; - else if (OutPt1->Next == OutPt1) return outRec2; - else if (OutPt2->Next == OutPt2) return outRec1; - else if (FirstIsBottomPt(OutPt1, OutPt2)) return outRec1; - else return outRec2; -} -//------------------------------------------------------------------------------ - -bool Param1RightOfParam2(OutRec* outRec1, OutRec* outRec2) -{ - do - { - outRec1 = outRec1->FirstLeft; - if (outRec1 == outRec2) return true; - } while (outRec1); - return false; -} -//------------------------------------------------------------------------------ - -OutRec* Clipper::GetOutRec(int Idx) -{ - OutRec* outrec = m_PolyOuts[Idx]; - while (outrec != m_PolyOuts[outrec->Idx]) - outrec = m_PolyOuts[outrec->Idx]; - return outrec; -} -//------------------------------------------------------------------------------ - -void Clipper::AppendPolygon(TEdge *e1, TEdge *e2) const -{ - //get the start and ends of both output polygons ... - OutRec *outRec1 = m_PolyOuts[e1->OutIdx]; - OutRec *outRec2 = m_PolyOuts[e2->OutIdx]; - - OutRec *holeStateRec; - if (Param1RightOfParam2(outRec1, outRec2)) - holeStateRec = outRec2; - else if (Param1RightOfParam2(outRec2, outRec1)) - holeStateRec = outRec1; - else - holeStateRec = GetLowermostRec(outRec1, outRec2); - - //get the start and ends of both output polygons and - //join e2 poly onto e1 poly and delete pointers to e2 ... - - OutPt* p1_lft = outRec1->Pts; - OutPt* p1_rt = p1_lft->Prev; - OutPt* p2_lft = outRec2->Pts; - OutPt* p2_rt = p2_lft->Prev; - - EdgeSide Side; - //join e2 poly onto e1 poly and delete pointers to e2 ... - if( e1->Side == esLeft ) - { - if( e2->Side == esLeft ) - { - //z y x a b c - ReversePolyPtLinks(p2_lft); - p2_lft->Next = p1_lft; - p1_lft->Prev = p2_lft; - p1_rt->Next = p2_rt; - p2_rt->Prev = p1_rt; - outRec1->Pts = p2_rt; - } else - { - //x y z a b c - p2_rt->Next = p1_lft; - p1_lft->Prev = p2_rt; - p2_lft->Prev = p1_rt; - p1_rt->Next = p2_lft; - outRec1->Pts = p2_lft; - } - Side = esLeft; - } else - { - if( e2->Side == esRight ) - { - //a b c z y x - ReversePolyPtLinks(p2_lft); - p1_rt->Next = p2_rt; - p2_rt->Prev = p1_rt; - p2_lft->Next = p1_lft; - p1_lft->Prev = p2_lft; - } else - { - //a b c x y z - p1_rt->Next = p2_lft; - p2_lft->Prev = p1_rt; - p1_lft->Prev = p2_rt; - p2_rt->Next = p1_lft; - } - Side = esRight; - } - - outRec1->BottomPt = 0; - if (holeStateRec == outRec2) - { - if (outRec2->FirstLeft != outRec1) - outRec1->FirstLeft = outRec2->FirstLeft; - outRec1->IsHole = outRec2->IsHole; - } - outRec2->Pts = 0; - outRec2->BottomPt = 0; - outRec2->FirstLeft = outRec1; - - int OKIdx = e1->OutIdx; - int ObsoleteIdx = e2->OutIdx; - - e1->OutIdx = Unassigned; //nb: safe because we only get here via AddLocalMaxPoly - e2->OutIdx = Unassigned; - - TEdge* e = m_ActiveEdges; - while( e ) - { - if( e->OutIdx == ObsoleteIdx ) - { - e->OutIdx = OKIdx; - e->Side = Side; - break; - } - e = e->NextInAEL; - } - - outRec2->Idx = outRec1->Idx; -} -//------------------------------------------------------------------------------ - -OutRec* Clipper::CreateOutRec() -{ - OutRec* result = new OutRec; - result->IsHole = false; - result->IsOpen = false; - result->FirstLeft = 0; - result->Pts = 0; - result->BottomPt = 0; - result->PolyNd = 0; - m_PolyOuts.push_back(result); - result->Idx = (int)m_PolyOuts.size()-1; - return result; -} -//------------------------------------------------------------------------------ - -OutPt* Clipper::AddOutPt(TEdge *e, const IntPoint &pt) -{ - if( e->OutIdx < 0 ) - { - OutRec *outRec = CreateOutRec(); - outRec->IsOpen = (e->WindDelta == 0); - OutPt* newOp = this->AllocateOutPt(); - outRec->Pts = newOp; - newOp->Idx = outRec->Idx; - newOp->Pt = pt; - newOp->Next = newOp; - newOp->Prev = newOp; - if (!outRec->IsOpen) - SetHoleState(e, outRec); - e->OutIdx = outRec->Idx; - return newOp; - } else - { - OutRec *outRec = m_PolyOuts[e->OutIdx]; - //OutRec.Pts is the 'Left-most' point & OutRec.Pts.Prev is the 'Right-most' - OutPt* op = outRec->Pts; - - bool ToFront = (e->Side == esLeft); - if (ToFront && (pt == op->Pt)) return op; - else if (!ToFront && (pt == op->Prev->Pt)) return op->Prev; - - OutPt* newOp = this->AllocateOutPt(); - newOp->Idx = outRec->Idx; - newOp->Pt = pt; - newOp->Next = op; - newOp->Prev = op->Prev; - newOp->Prev->Next = newOp; - op->Prev = newOp; - if (ToFront) outRec->Pts = newOp; - return newOp; - } -} -//------------------------------------------------------------------------------ - -OutPt* Clipper::GetLastOutPt(TEdge *e) -{ - OutRec *outRec = m_PolyOuts[e->OutIdx]; - if (e->Side == esLeft) - return outRec->Pts; - else - return outRec->Pts->Prev; -} -//------------------------------------------------------------------------------ - -void Clipper::ProcessHorizontals() -{ - PROFILE_FUNC(); - TEdge* horzEdge = m_SortedEdges; - while(horzEdge) - { - DeleteFromSEL(horzEdge); - ProcessHorizontal(horzEdge); - horzEdge = m_SortedEdges; - } -} -//------------------------------------------------------------------------------ - -inline bool IsMaxima(TEdge *e, const cInt Y) -{ - return e && e->Top.Y == Y && !e->NextInLML; -} -//------------------------------------------------------------------------------ - -inline bool IsIntermediate(TEdge *e, const cInt Y) -{ - return e->Top.Y == Y && e->NextInLML; -} -//------------------------------------------------------------------------------ - -inline TEdge *GetMaximaPair(TEdge *e) -{ - TEdge* result = 0; - if ((e->Next->Top == e->Top) && !e->Next->NextInLML) - result = e->Next; - else if ((e->Prev->Top == e->Top) && !e->Prev->NextInLML) - result = e->Prev; - - if (result && (result->OutIdx == Skip || - //result is false if both NextInAEL & PrevInAEL are nil & not horizontal ... - (result->NextInAEL == result->PrevInAEL && !IsHorizontal(*result)))) - return 0; - return result; -} -//------------------------------------------------------------------------------ - -void Clipper::SwapPositionsInAEL(TEdge *Edge1, TEdge *Edge2) -{ - //check that one or other edge hasn't already been removed from AEL ... - if (Edge1->NextInAEL == Edge1->PrevInAEL || - Edge2->NextInAEL == Edge2->PrevInAEL) return; - - if( Edge1->NextInAEL == Edge2 ) - { - TEdge* Next = Edge2->NextInAEL; - if( Next ) Next->PrevInAEL = Edge1; - TEdge* Prev = Edge1->PrevInAEL; - if( Prev ) Prev->NextInAEL = Edge2; - Edge2->PrevInAEL = Prev; - Edge2->NextInAEL = Edge1; - Edge1->PrevInAEL = Edge2; - Edge1->NextInAEL = Next; - } - else if( Edge2->NextInAEL == Edge1 ) - { - TEdge* Next = Edge1->NextInAEL; - if( Next ) Next->PrevInAEL = Edge2; - TEdge* Prev = Edge2->PrevInAEL; - if( Prev ) Prev->NextInAEL = Edge1; - Edge1->PrevInAEL = Prev; - Edge1->NextInAEL = Edge2; - Edge2->PrevInAEL = Edge1; - Edge2->NextInAEL = Next; - } - else - { - TEdge* Next = Edge1->NextInAEL; - TEdge* Prev = Edge1->PrevInAEL; - Edge1->NextInAEL = Edge2->NextInAEL; - if( Edge1->NextInAEL ) Edge1->NextInAEL->PrevInAEL = Edge1; - Edge1->PrevInAEL = Edge2->PrevInAEL; - if( Edge1->PrevInAEL ) Edge1->PrevInAEL->NextInAEL = Edge1; - Edge2->NextInAEL = Next; - if( Edge2->NextInAEL ) Edge2->NextInAEL->PrevInAEL = Edge2; - Edge2->PrevInAEL = Prev; - if( Edge2->PrevInAEL ) Edge2->PrevInAEL->NextInAEL = Edge2; - } - - if( !Edge1->PrevInAEL ) m_ActiveEdges = Edge1; - else if( !Edge2->PrevInAEL ) m_ActiveEdges = Edge2; -} -//------------------------------------------------------------------------------ - -void Clipper::SwapPositionsInSEL(TEdge *Edge1, TEdge *Edge2) -{ - if( !( Edge1->NextInSEL ) && !( Edge1->PrevInSEL ) ) return; - if( !( Edge2->NextInSEL ) && !( Edge2->PrevInSEL ) ) return; - - if( Edge1->NextInSEL == Edge2 ) - { - TEdge* Next = Edge2->NextInSEL; - if( Next ) Next->PrevInSEL = Edge1; - TEdge* Prev = Edge1->PrevInSEL; - if( Prev ) Prev->NextInSEL = Edge2; - Edge2->PrevInSEL = Prev; - Edge2->NextInSEL = Edge1; - Edge1->PrevInSEL = Edge2; - Edge1->NextInSEL = Next; - } - else if( Edge2->NextInSEL == Edge1 ) - { - TEdge* Next = Edge1->NextInSEL; - if( Next ) Next->PrevInSEL = Edge2; - TEdge* Prev = Edge2->PrevInSEL; - if( Prev ) Prev->NextInSEL = Edge1; - Edge1->PrevInSEL = Prev; - Edge1->NextInSEL = Edge2; - Edge2->PrevInSEL = Edge1; - Edge2->NextInSEL = Next; - } - else - { - TEdge* Next = Edge1->NextInSEL; - TEdge* Prev = Edge1->PrevInSEL; - Edge1->NextInSEL = Edge2->NextInSEL; - if( Edge1->NextInSEL ) Edge1->NextInSEL->PrevInSEL = Edge1; - Edge1->PrevInSEL = Edge2->PrevInSEL; - if( Edge1->PrevInSEL ) Edge1->PrevInSEL->NextInSEL = Edge1; - Edge2->NextInSEL = Next; - if( Edge2->NextInSEL ) Edge2->NextInSEL->PrevInSEL = Edge2; - Edge2->PrevInSEL = Prev; - if( Edge2->PrevInSEL ) Edge2->PrevInSEL->NextInSEL = Edge2; - } - - if( !Edge1->PrevInSEL ) m_SortedEdges = Edge1; - else if( !Edge2->PrevInSEL ) m_SortedEdges = Edge2; -} -//------------------------------------------------------------------------------ - -inline void GetHorzDirection(TEdge& HorzEdge, Direction& Dir, cInt& Left, cInt& Right) -{ - if (HorzEdge.Bot.X < HorzEdge.Top.X) - { - Left = HorzEdge.Bot.X; - Right = HorzEdge.Top.X; - Dir = dLeftToRight; - } else - { - Left = HorzEdge.Top.X; - Right = HorzEdge.Bot.X; - Dir = dRightToLeft; - } -} -//------------------------------------------------------------------------ - -/******************************************************************************* -* Notes: Horizontal edges (HEs) at scanline intersections (ie at the Top or * -* Bottom of a scanbeam) are processed as if layered. The order in which HEs * -* are processed doesn't matter. HEs intersect with other HE Bot.Xs only [#] * -* (or they could intersect with Top.Xs only, ie EITHER Bot.Xs OR Top.Xs), * -* and with other non-horizontal edges [*]. Once these intersections are * -* processed, intermediate HEs then 'promote' the Edge above (NextInLML) into * -* the AEL. These 'promoted' edges may in turn intersect [%] with other HEs. * -*******************************************************************************/ - -void Clipper::ProcessHorizontal(TEdge *horzEdge) -{ - Direction dir; - cInt horzLeft, horzRight; - bool IsOpen = (horzEdge->OutIdx >= 0 && m_PolyOuts[horzEdge->OutIdx]->IsOpen); - - GetHorzDirection(*horzEdge, dir, horzLeft, horzRight); - - TEdge* eLastHorz = horzEdge, *eMaxPair = 0; - while (eLastHorz->NextInLML && IsHorizontal(*eLastHorz->NextInLML)) - eLastHorz = eLastHorz->NextInLML; - if (!eLastHorz->NextInLML) - eMaxPair = GetMaximaPair(eLastHorz); - - std::vector::const_iterator maxIt; - std::vector::const_reverse_iterator maxRit; - if (!m_Maxima.empty()) - { - //get the first maxima in range (X) ... - if (dir == dLeftToRight) - { - maxIt = m_Maxima.begin(); - while (maxIt != m_Maxima.end() && *maxIt <= horzEdge->Bot.X) ++maxIt; - if (maxIt != m_Maxima.end() && *maxIt >= eLastHorz->Top.X) - maxIt = m_Maxima.end(); - } - else - { - maxRit = m_Maxima.rbegin(); - while (maxRit != m_Maxima.rend() && *maxRit > horzEdge->Bot.X) ++maxRit; - if (maxRit != m_Maxima.rend() && *maxRit <= eLastHorz->Top.X) - maxRit = m_Maxima.rend(); - } - } - - OutPt* op1 = 0; - - for (;;) //loop through consec. horizontal edges - { - - bool IsLastHorz = (horzEdge == eLastHorz); - TEdge* e = (dir == dLeftToRight) ? horzEdge->NextInAEL : horzEdge->PrevInAEL; - while(e) - { - - //this code block inserts extra coords into horizontal edges (in output - //polygons) whereever maxima touch these horizontal edges. This helps - //'simplifying' polygons (ie if the Simplify property is set). - if (!m_Maxima.empty()) - { - if (dir == dLeftToRight) - { - while (maxIt != m_Maxima.end() && *maxIt < e->Curr.X) - { - if (horzEdge->OutIdx >= 0 && !IsOpen) - AddOutPt(horzEdge, IntPoint(*maxIt, horzEdge->Bot.Y)); - ++maxIt; - } - } - else - { - while (maxRit != m_Maxima.rend() && *maxRit > e->Curr.X) - { - if (horzEdge->OutIdx >= 0 && !IsOpen) - AddOutPt(horzEdge, IntPoint(*maxRit, horzEdge->Bot.Y)); - ++maxRit; - } - } - }; - - if ((dir == dLeftToRight && e->Curr.X > horzRight) || - (dir == dRightToLeft && e->Curr.X < horzLeft)) break; - - //Also break if we've got to the end of an intermediate horizontal edge ... - //nb: Smaller Dx's are to the right of larger Dx's ABOVE the horizontal. - if (e->Curr.X == horzEdge->Top.X && horzEdge->NextInLML && - e->Dx < horzEdge->NextInLML->Dx) break; - - if (horzEdge->OutIdx >= 0 && !IsOpen) //note: may be done multiple times - { - op1 = AddOutPt(horzEdge, e->Curr); - TEdge* eNextHorz = m_SortedEdges; - while (eNextHorz) - { - if (eNextHorz->OutIdx >= 0 && - HorzSegmentsOverlap(horzEdge->Bot.X, - horzEdge->Top.X, eNextHorz->Bot.X, eNextHorz->Top.X)) - { - OutPt* op2 = GetLastOutPt(eNextHorz); - m_Joins.emplace_back(Join(op2, op1, eNextHorz->Top)); - } - eNextHorz = eNextHorz->NextInSEL; - } - m_GhostJoins.emplace_back(Join(op1, 0, horzEdge->Bot)); - } - - //OK, so far we're still in range of the horizontal Edge but make sure - //we're at the last of consec. horizontals when matching with eMaxPair - if(e == eMaxPair && IsLastHorz) - { - if (horzEdge->OutIdx >= 0) - AddLocalMaxPoly(horzEdge, eMaxPair, horzEdge->Top); - DeleteFromAEL(horzEdge); - DeleteFromAEL(eMaxPair); - return; - } - - if(dir == dLeftToRight) - { - IntPoint Pt = IntPoint(e->Curr.X, horzEdge->Curr.Y); - IntersectEdges(horzEdge, e, Pt); - } - else - { - IntPoint Pt = IntPoint(e->Curr.X, horzEdge->Curr.Y); - IntersectEdges( e, horzEdge, Pt); - } - TEdge* eNext = (dir == dLeftToRight) ? e->NextInAEL : e->PrevInAEL; - SwapPositionsInAEL( horzEdge, e ); - e = eNext; - } //end while(e) - - //Break out of loop if HorzEdge.NextInLML is not also horizontal ... - if (!horzEdge->NextInLML || !IsHorizontal(*horzEdge->NextInLML)) break; - - UpdateEdgeIntoAEL(horzEdge); - if (horzEdge->OutIdx >= 0) AddOutPt(horzEdge, horzEdge->Bot); - GetHorzDirection(*horzEdge, dir, horzLeft, horzRight); - - } //end for (;;) - - if (horzEdge->OutIdx >= 0 && !op1) - { - op1 = GetLastOutPt(horzEdge); - TEdge* eNextHorz = m_SortedEdges; - while (eNextHorz) - { - if (eNextHorz->OutIdx >= 0 && - HorzSegmentsOverlap(horzEdge->Bot.X, - horzEdge->Top.X, eNextHorz->Bot.X, eNextHorz->Top.X)) - { - OutPt* op2 = GetLastOutPt(eNextHorz); - m_Joins.emplace_back(Join(op2, op1, eNextHorz->Top)); - } - eNextHorz = eNextHorz->NextInSEL; - } - m_GhostJoins.emplace_back(Join(op1, 0, horzEdge->Top)); - } - - if (horzEdge->NextInLML) - { - if(horzEdge->OutIdx >= 0) - { - op1 = AddOutPt( horzEdge, horzEdge->Top); - UpdateEdgeIntoAEL(horzEdge); - if (horzEdge->WindDelta == 0) return; - //nb: HorzEdge is no longer horizontal here - TEdge* ePrev = horzEdge->PrevInAEL; - TEdge* eNext = horzEdge->NextInAEL; - if (ePrev && ePrev->Curr.X == horzEdge->Bot.X && - ePrev->Curr.Y == horzEdge->Bot.Y && ePrev->WindDelta != 0 && - (ePrev->OutIdx >= 0 && ePrev->Curr.Y > ePrev->Top.Y && - SlopesEqual(*horzEdge, *ePrev, m_UseFullRange))) - { - OutPt* op2 = AddOutPt(ePrev, horzEdge->Bot); - m_Joins.emplace_back(Join(op1, op2, horzEdge->Top)); - } - else if (eNext && eNext->Curr.X == horzEdge->Bot.X && - eNext->Curr.Y == horzEdge->Bot.Y && eNext->WindDelta != 0 && - eNext->OutIdx >= 0 && eNext->Curr.Y > eNext->Top.Y && - SlopesEqual(*horzEdge, *eNext, m_UseFullRange)) - { - OutPt* op2 = AddOutPt(eNext, horzEdge->Bot); - m_Joins.emplace_back(Join(op1, op2, horzEdge->Top)); - } - } - else - UpdateEdgeIntoAEL(horzEdge); - } - else - { - if (horzEdge->OutIdx >= 0) AddOutPt(horzEdge, horzEdge->Top); - DeleteFromAEL(horzEdge); - } -} -//------------------------------------------------------------------------------ - -void Clipper::UpdateEdgeIntoAEL(TEdge *&e) -{ - if( !e->NextInLML ) - throw clipperException("UpdateEdgeIntoAEL: invalid call"); - - e->NextInLML->OutIdx = e->OutIdx; - TEdge* AelPrev = e->PrevInAEL; - TEdge* AelNext = e->NextInAEL; - if (AelPrev) AelPrev->NextInAEL = e->NextInLML; - else m_ActiveEdges = e->NextInLML; - if (AelNext) AelNext->PrevInAEL = e->NextInLML; - e->NextInLML->Side = e->Side; - e->NextInLML->WindDelta = e->WindDelta; - e->NextInLML->WindCnt = e->WindCnt; - e->NextInLML->WindCnt2 = e->WindCnt2; - e = e->NextInLML; - e->Curr = e->Bot; - e->PrevInAEL = AelPrev; - e->NextInAEL = AelNext; - if (!IsHorizontal(*e)) - m_Scanbeam.push(e->Top.Y); -} -//------------------------------------------------------------------------------ - -bool Clipper::ProcessIntersections(const cInt topY) -{ - PROFILE_FUNC(); - if( !m_ActiveEdges ) return true; - try { - BuildIntersectList(topY); - size_t IlSize = m_IntersectList.size(); - if (IlSize == 0) return true; - if (IlSize == 1 || FixupIntersectionOrder()) { - for (IntersectNode &iNode : m_IntersectList) { - IntersectEdges( iNode.Edge1, iNode.Edge2, iNode.Pt); - SwapPositionsInAEL( iNode.Edge1 , iNode.Edge2 ); - } - m_IntersectList.clear(); - } - else return false; - } - catch(...) - { - m_SortedEdges = 0; - m_IntersectList.clear(); - throw clipperException("ProcessIntersections error"); - } - m_SortedEdges = 0; - return true; -} -//------------------------------------------------------------------------------ - -void Clipper::BuildIntersectList(const cInt topY) -{ - if ( !m_ActiveEdges ) return; - - //prepare for sorting ... - TEdge* e = m_ActiveEdges; - m_SortedEdges = e; - while( e ) - { - e->PrevInSEL = e->PrevInAEL; - e->NextInSEL = e->NextInAEL; - e->Curr.X = TopX( *e, topY ); - e = e->NextInAEL; - } - - //bubblesort ... - bool isModified; - do - { - isModified = false; - e = m_SortedEdges; - while( e->NextInSEL ) - { - TEdge *eNext = e->NextInSEL; - IntPoint Pt; - if(e->Curr.X > eNext->Curr.X) - { - IntersectPoint(*e, *eNext, Pt); - m_IntersectList.emplace_back(IntersectNode(e, eNext, Pt)); - SwapPositionsInSEL(e, eNext); - isModified = true; - } - else - e = eNext; - } - if( e->PrevInSEL ) e->PrevInSEL->NextInSEL = 0; - else break; - } - while ( isModified ); - m_SortedEdges = 0; //important -} -//------------------------------------------------------------------------------ - - -inline bool EdgesAdjacent(const IntersectNode &inode) -{ - return (inode.Edge1->NextInSEL == inode.Edge2) || - (inode.Edge1->PrevInSEL == inode.Edge2); -} -//------------------------------------------------------------------------------ - -bool Clipper::FixupIntersectionOrder() -{ - //pre-condition: intersections are sorted Bottom-most first. - //Now it's crucial that intersections are made only between adjacent edges, - //so to ensure this the order of intersections may need adjusting ... - CopyAELToSEL(); - std::sort(m_IntersectList.begin(), m_IntersectList.end(), [](const IntersectNode &node1, const IntersectNode &node2) { return node2.Pt.Y < node1.Pt.Y; }); - - size_t cnt = m_IntersectList.size(); - for (size_t i = 0; i < cnt; ++i) - { - if (!EdgesAdjacent(m_IntersectList[i])) - { - size_t j = i + 1; - while (j < cnt && !EdgesAdjacent(m_IntersectList[j])) j++; - if (j == cnt) return false; - std::swap(m_IntersectList[i], m_IntersectList[j]); - } - SwapPositionsInSEL(m_IntersectList[i].Edge1, m_IntersectList[i].Edge2); - } - return true; -} -//------------------------------------------------------------------------------ - -void Clipper::DoMaxima(TEdge *e) -{ - TEdge* eMaxPair = GetMaximaPair(e); - if (!eMaxPair) - { - if (e->OutIdx >= 0) - AddOutPt(e, e->Top); - DeleteFromAEL(e); - return; - } - - TEdge* eNext = e->NextInAEL; - while(eNext && eNext != eMaxPair) - { - IntersectEdges(e, eNext, e->Top); - SwapPositionsInAEL(e, eNext); - eNext = e->NextInAEL; - } - - if(e->OutIdx == Unassigned && eMaxPair->OutIdx == Unassigned) - { - DeleteFromAEL(e); - DeleteFromAEL(eMaxPair); - } - else if( e->OutIdx >= 0 && eMaxPair->OutIdx >= 0 ) - { - if (e->OutIdx >= 0) AddLocalMaxPoly(e, eMaxPair, e->Top); - DeleteFromAEL(e); - DeleteFromAEL(eMaxPair); - } -#ifdef use_lines - else if (e->WindDelta == 0) - { - if (e->OutIdx >= 0) - { - AddOutPt(e, e->Top); - e->OutIdx = Unassigned; - } - DeleteFromAEL(e); - - if (eMaxPair->OutIdx >= 0) - { - AddOutPt(eMaxPair, e->Top); - eMaxPair->OutIdx = Unassigned; - } - DeleteFromAEL(eMaxPair); - } -#endif - else throw clipperException("DoMaxima error"); -} -//------------------------------------------------------------------------------ - -void Clipper::ProcessEdgesAtTopOfScanbeam(const cInt topY) -{ - PROFILE_FUNC(); - TEdge* e = m_ActiveEdges; - while( e ) - { - //1. process maxima, treating them as if they're 'bent' horizontal edges, - // but exclude maxima with horizontal edges. nb: e can't be a horizontal. - bool IsMaximaEdge = IsMaxima(e, topY); - - if(IsMaximaEdge) - { - TEdge* eMaxPair = GetMaximaPair(e); - IsMaximaEdge = (!eMaxPair || !IsHorizontal(*eMaxPair)); - } - - if(IsMaximaEdge) - { - if (m_StrictSimple) m_Maxima.push_back(e->Top.X); - TEdge* ePrev = e->PrevInAEL; - DoMaxima(e); - if( !ePrev ) e = m_ActiveEdges; - else e = ePrev->NextInAEL; - } - else - { - //2. promote horizontal edges, otherwise update Curr.X and Curr.Y ... - if (IsIntermediate(e, topY) && IsHorizontal(*e->NextInLML)) - { - UpdateEdgeIntoAEL(e); - if (e->OutIdx >= 0) - AddOutPt(e, e->Bot); - AddEdgeToSEL(e); - } - else - { - e->Curr.X = TopX( *e, topY ); - e->Curr.Y = topY; - } - - //When StrictlySimple and 'e' is being touched by another edge, then - //make sure both edges have a vertex here ... - if (m_StrictSimple) - { - TEdge* ePrev = e->PrevInAEL; - if ((e->OutIdx >= 0) && (e->WindDelta != 0) && ePrev && (ePrev->OutIdx >= 0) && - (ePrev->Curr.X == e->Curr.X) && (ePrev->WindDelta != 0)) - { - IntPoint pt = e->Curr; -#ifdef use_xyz - SetZ(pt, *ePrev, *e); -#endif - OutPt* op = AddOutPt(ePrev, pt); - OutPt* op2 = AddOutPt(e, pt); - m_Joins.emplace_back(Join(op, op2, pt)); //StrictlySimple (type-3) join - } - } - - e = e->NextInAEL; - } - } - - //3. Process horizontals at the Top of the scanbeam ... - std::sort(m_Maxima.begin(), m_Maxima.end()); - ProcessHorizontals(); - m_Maxima.clear(); - - //4. Promote intermediate vertices ... - e = m_ActiveEdges; - while(e) - { - if(IsIntermediate(e, topY)) - { - OutPt* op = 0; - if( e->OutIdx >= 0 ) - op = AddOutPt(e, e->Top); - UpdateEdgeIntoAEL(e); - - //if output polygons share an edge, they'll need joining later ... - TEdge* ePrev = e->PrevInAEL; - TEdge* eNext = e->NextInAEL; - if (ePrev && ePrev->Curr.X == e->Bot.X && - ePrev->Curr.Y == e->Bot.Y && op && - ePrev->OutIdx >= 0 && ePrev->Curr.Y > ePrev->Top.Y && - SlopesEqual(*e, *ePrev, m_UseFullRange) && - (e->WindDelta != 0) && (ePrev->WindDelta != 0)) - { - OutPt* op2 = AddOutPt(ePrev, e->Bot); - m_Joins.emplace_back(Join(op, op2, e->Top)); - } - else if (eNext && eNext->Curr.X == e->Bot.X && - eNext->Curr.Y == e->Bot.Y && op && - eNext->OutIdx >= 0 && eNext->Curr.Y > eNext->Top.Y && - SlopesEqual(*e, *eNext, m_UseFullRange) && - (e->WindDelta != 0) && (eNext->WindDelta != 0)) - { - OutPt* op2 = AddOutPt(eNext, e->Bot); - m_Joins.emplace_back(Join(op, op2, e->Top)); - } - } - e = e->NextInAEL; - } -} -//------------------------------------------------------------------------------ - -void Clipper::FixupOutPolyline(OutRec &outrec) -{ - OutPt *pp = outrec.Pts; - OutPt *lastPP = pp->Prev; - while (pp != lastPP) - { - pp = pp->Next; - if (pp->Pt == pp->Prev->Pt) - { - if (pp == lastPP) lastPP = pp->Prev; - OutPt *tmpPP = pp->Prev; - tmpPP->Next = pp->Next; - pp->Next->Prev = tmpPP; - this->DisposeOutPt(pp); - pp = tmpPP; - } - } - - if (pp == pp->Prev) - { - this->DisposeOutPts(pp); - outrec.Pts = 0; - return; - } -} -//------------------------------------------------------------------------------ - -void Clipper::FixupOutPolygon(OutRec &outrec) -{ - //FixupOutPolygon() - removes duplicate points and simplifies consecutive - //parallel edges by removing the middle vertex. - OutPt *lastOK = nullptr; - outrec.BottomPt = nullptr; - OutPt *pp = outrec.Pts; - bool preserveCol = m_PreserveCollinear || m_StrictSimple; - - for (;;) - { - if (pp->Prev == pp || pp->Prev == pp->Next) - { - // Empty loop or a stick. Release the polygon. - this->DisposeOutPts(pp); - outrec.Pts = nullptr; - return; - } - - //test for duplicate points and collinear edges ... - if ((pp->Pt == pp->Next->Pt) || (pp->Pt == pp->Prev->Pt) || - (SlopesEqual(pp->Prev->Pt, pp->Pt, pp->Next->Pt, m_UseFullRange) && - (!preserveCol || !Pt2IsBetweenPt1AndPt3(pp->Prev->Pt, pp->Pt, pp->Next->Pt)))) - { - lastOK = nullptr; - OutPt *tmp = pp; - pp->Prev->Next = pp->Next; - pp->Next->Prev = pp->Prev; - pp = pp->Prev; - this->DisposeOutPt(tmp); - } - else if (pp == lastOK) break; - else - { - if (!lastOK) lastOK = pp; - pp = pp->Next; - } - } - outrec.Pts = pp; -} -//------------------------------------------------------------------------------ - -// Count the number of points in a closed linked loop starting with Pts. -int PointCount(OutPt *Pts) -{ - if (!Pts) return 0; - int result = 0; - OutPt* p = Pts; - do - { - result++; - p = p->Next; - } - while (p != Pts); - return result; -} -//------------------------------------------------------------------------------ - -void Clipper::BuildResult(Paths &polys) -{ - polys.reserve(m_PolyOuts.size()); - for (OutRec* outRec : m_PolyOuts) - { - assert(! outRec->IsOpen); - if (!outRec->Pts) continue; - Path pg; - OutPt* p = outRec->Pts->Prev; - int cnt = PointCount(p); - if (cnt < 2) continue; - pg.reserve(cnt); - for (int i = 0; i < cnt; ++i) - { - pg.emplace_back(p->Pt); - p = p->Prev; - } - polys.emplace_back(std::move(pg)); - } -} -//------------------------------------------------------------------------------ - -void Clipper::BuildResult2(PolyTree& polytree) -{ - polytree.Clear(); - polytree.AllNodes.reserve(m_PolyOuts.size()); - //add each output polygon/contour to polytree ... - for (OutRec* outRec : m_PolyOuts) - { - int cnt = PointCount(outRec->Pts); - if ((outRec->IsOpen && cnt < 2) || (!outRec->IsOpen && cnt < 3)) - // Ignore an invalid output loop or a polyline. - continue; - - //skip OutRecs that (a) contain outermost polygons or - //(b) already have the correct owner/child linkage ... - if (outRec->FirstLeft && - (outRec->IsHole == outRec->FirstLeft->IsHole || ! outRec->FirstLeft->Pts)) { - OutRec* orfl = outRec->FirstLeft; - while (orfl && ((orfl->IsHole == outRec->IsHole) || !orfl->Pts)) - orfl = orfl->FirstLeft; - outRec->FirstLeft = orfl; - } - - //nb: polytree takes ownership of all the PolyNodes - polytree.AllNodes.emplace_back(PolyNode()); - PolyNode* pn = &polytree.AllNodes.back(); - outRec->PolyNd = pn; - pn->Parent = 0; - pn->Index = 0; - pn->Contour.reserve(cnt); - OutPt *op = outRec->Pts->Prev; - for (int j = 0; j < cnt; j++) - { - pn->Contour.emplace_back(op->Pt); - op = op->Prev; - } - } - - //fixup PolyNode links etc ... - polytree.Childs.reserve(m_PolyOuts.size()); - for (OutRec* outRec : m_PolyOuts) - { - if (!outRec->PolyNd) continue; - if (outRec->IsOpen) - { - outRec->PolyNd->m_IsOpen = true; - polytree.AddChild(*outRec->PolyNd); - } - else if (outRec->FirstLeft && outRec->FirstLeft->PolyNd) - outRec->FirstLeft->PolyNd->AddChild(*outRec->PolyNd); - else - polytree.AddChild(*outRec->PolyNd); - } -} -//------------------------------------------------------------------------------ - -inline bool E2InsertsBeforeE1(TEdge &e1, TEdge &e2) -{ - if (e2.Curr.X == e1.Curr.X) - { - if (e2.Top.Y > e1.Top.Y) - return e2.Top.X < TopX(e1, e2.Top.Y); - else return e1.Top.X > TopX(e2, e1.Top.Y); - } - else return e2.Curr.X < e1.Curr.X; -} -//------------------------------------------------------------------------------ - -bool GetOverlap(const cInt a1, const cInt a2, const cInt b1, const cInt b2, - cInt& Left, cInt& Right) -{ - if (a1 < a2) - { - if (b1 < b2) {Left = std::max(a1,b1); Right = std::min(a2,b2);} - else {Left = std::max(a1,b2); Right = std::min(a2,b1);} - } - else - { - if (b1 < b2) {Left = std::max(a2,b1); Right = std::min(a1,b2);} - else {Left = std::max(a2,b2); Right = std::min(a1,b1);} - } - return Left < Right; -} -//------------------------------------------------------------------------------ - -// Make all points of outrec point to outrec.Idx -inline void UpdateOutPtIdxs(OutRec& outrec) -{ - OutPt* op = outrec.Pts; - do - { - op->Idx = outrec.Idx; - op = op->Prev; - } - while(op != outrec.Pts); -} -//------------------------------------------------------------------------------ - -void Clipper::InsertEdgeIntoAEL(TEdge *edge, TEdge* startEdge) -{ - if(!m_ActiveEdges) - { - edge->PrevInAEL = 0; - edge->NextInAEL = 0; - m_ActiveEdges = edge; - } - else if(!startEdge && E2InsertsBeforeE1(*m_ActiveEdges, *edge)) - { - edge->PrevInAEL = 0; - edge->NextInAEL = m_ActiveEdges; - m_ActiveEdges->PrevInAEL = edge; - m_ActiveEdges = edge; - } - else - { - if(!startEdge) startEdge = m_ActiveEdges; - while(startEdge->NextInAEL && - !E2InsertsBeforeE1(*startEdge->NextInAEL , *edge)) - startEdge = startEdge->NextInAEL; - edge->NextInAEL = startEdge->NextInAEL; - if(startEdge->NextInAEL) startEdge->NextInAEL->PrevInAEL = edge; - edge->PrevInAEL = startEdge; - startEdge->NextInAEL = edge; - } -} -//---------------------------------------------------------------------- - -OutPt* Clipper::DupOutPt(OutPt* outPt, bool InsertAfter) -{ - OutPt* result = this->AllocateOutPt(); - result->Pt = outPt->Pt; - result->Idx = outPt->Idx; - if (InsertAfter) - { - result->Next = outPt->Next; - result->Prev = outPt; - outPt->Next->Prev = result; - outPt->Next = result; - } - else - { - result->Prev = outPt->Prev; - result->Next = outPt; - outPt->Prev->Next = result; - outPt->Prev = result; - } - return result; -} -//------------------------------------------------------------------------------ - -bool Clipper::JoinHorz(OutPt* op1, OutPt* op1b, OutPt* op2, OutPt* op2b, - const IntPoint &Pt, bool DiscardLeft) -{ - Direction Dir1 = (op1->Pt.X > op1b->Pt.X ? dRightToLeft : dLeftToRight); - Direction Dir2 = (op2->Pt.X > op2b->Pt.X ? dRightToLeft : dLeftToRight); - if (Dir1 == Dir2) return false; - - //When DiscardLeft, we want Op1b to be on the Left of Op1, otherwise we - //want Op1b to be on the Right. (And likewise with Op2 and Op2b.) - //So, to facilitate this while inserting Op1b and Op2b ... - //when DiscardLeft, make sure we're AT or RIGHT of Pt before adding Op1b, - //otherwise make sure we're AT or LEFT of Pt. (Likewise with Op2b.) - if (Dir1 == dLeftToRight) - { - while (op1->Next->Pt.X <= Pt.X && - op1->Next->Pt.X >= op1->Pt.X && op1->Next->Pt.Y == Pt.Y) - op1 = op1->Next; - if (DiscardLeft && (op1->Pt.X != Pt.X)) op1 = op1->Next; - op1b = this->DupOutPt(op1, !DiscardLeft); - if (op1b->Pt != Pt) - { - op1 = op1b; - op1->Pt = Pt; - op1b = this->DupOutPt(op1, !DiscardLeft); - } - } - else - { - while (op1->Next->Pt.X >= Pt.X && - op1->Next->Pt.X <= op1->Pt.X && op1->Next->Pt.Y == Pt.Y) - op1 = op1->Next; - if (!DiscardLeft && (op1->Pt.X != Pt.X)) op1 = op1->Next; - op1b = this->DupOutPt(op1, DiscardLeft); - if (op1b->Pt != Pt) - { - op1 = op1b; - op1->Pt = Pt; - op1b = this->DupOutPt(op1, DiscardLeft); - } - } - - if (Dir2 == dLeftToRight) - { - while (op2->Next->Pt.X <= Pt.X && - op2->Next->Pt.X >= op2->Pt.X && op2->Next->Pt.Y == Pt.Y) - op2 = op2->Next; - if (DiscardLeft && (op2->Pt.X != Pt.X)) op2 = op2->Next; - op2b = this->DupOutPt(op2, !DiscardLeft); - if (op2b->Pt != Pt) - { - op2 = op2b; - op2->Pt = Pt; - op2b = this->DupOutPt(op2, !DiscardLeft); - }; - } else - { - while (op2->Next->Pt.X >= Pt.X && - op2->Next->Pt.X <= op2->Pt.X && op2->Next->Pt.Y == Pt.Y) - op2 = op2->Next; - if (!DiscardLeft && (op2->Pt.X != Pt.X)) op2 = op2->Next; - op2b = this->DupOutPt(op2, DiscardLeft); - if (op2b->Pt != Pt) - { - op2 = op2b; - op2->Pt = Pt; - op2b = this->DupOutPt(op2, DiscardLeft); - }; - }; - - if ((Dir1 == dLeftToRight) == DiscardLeft) - { - op1->Prev = op2; - op2->Next = op1; - op1b->Next = op2b; - op2b->Prev = op1b; - } - else - { - op1->Next = op2; - op2->Prev = op1; - op1b->Prev = op2b; - op2b->Next = op1b; - } - return true; -} -//------------------------------------------------------------------------------ - -bool Clipper::JoinPoints(Join *j, OutRec* outRec1, OutRec* outRec2) -{ - OutPt *op1 = j->OutPt1, *op1b; - OutPt *op2 = j->OutPt2, *op2b; - - //There are 3 kinds of joins for output polygons ... - //1. Horizontal joins where Join.OutPt1 & Join.OutPt2 are vertices anywhere - //along (horizontal) collinear edges (& Join.OffPt is on the same horizontal). - //2. Non-horizontal joins where Join.OutPt1 & Join.OutPt2 are at the same - //location at the Bottom of the overlapping segment (& Join.OffPt is above). - //3. StrictSimple joins where edges touch but are not collinear and where - //Join.OutPt1, Join.OutPt2 & Join.OffPt all share the same point. - bool isHorizontal = (j->OutPt1->Pt.Y == j->OffPt.Y); - - if (isHorizontal && (j->OffPt == j->OutPt1->Pt) && - (j->OffPt == j->OutPt2->Pt)) - { - //Strictly Simple join ... - if (outRec1 != outRec2) return false; - op1b = j->OutPt1->Next; - while (op1b != op1 && (op1b->Pt == j->OffPt)) - op1b = op1b->Next; - bool reverse1 = (op1b->Pt.Y > j->OffPt.Y); - op2b = j->OutPt2->Next; - while (op2b != op2 && (op2b->Pt == j->OffPt)) - op2b = op2b->Next; - bool reverse2 = (op2b->Pt.Y > j->OffPt.Y); - if (reverse1 == reverse2) return false; - if (reverse1) - { - op1b = this->DupOutPt(op1, false); - op2b = this->DupOutPt(op2, true); - op1->Prev = op2; - op2->Next = op1; - op1b->Next = op2b; - op2b->Prev = op1b; - j->OutPt1 = op1; - j->OutPt2 = op1b; - return true; - } else - { - op1b = this->DupOutPt(op1, true); - op2b = this->DupOutPt(op2, false); - op1->Next = op2; - op2->Prev = op1; - op1b->Prev = op2b; - op2b->Next = op1b; - j->OutPt1 = op1; - j->OutPt2 = op1b; - return true; - } - } - else if (isHorizontal) - { - //treat horizontal joins differently to non-horizontal joins since with - //them we're not yet sure where the overlapping is. OutPt1.Pt & OutPt2.Pt - //may be anywhere along the horizontal edge. - op1b = op1; - while (op1->Prev->Pt.Y == op1->Pt.Y && op1->Prev != op1b && op1->Prev != op2) - op1 = op1->Prev; - while (op1b->Next->Pt.Y == op1b->Pt.Y && op1b->Next != op1 && op1b->Next != op2) - op1b = op1b->Next; - if (op1b->Next == op1 || op1b->Next == op2) return false; //a flat 'polygon' - - op2b = op2; - while (op2->Prev->Pt.Y == op2->Pt.Y && op2->Prev != op2b && op2->Prev != op1b) - op2 = op2->Prev; - while (op2b->Next->Pt.Y == op2b->Pt.Y && op2b->Next != op2 && op2b->Next != op1) - op2b = op2b->Next; - if (op2b->Next == op2 || op2b->Next == op1) return false; //a flat 'polygon' - - cInt Left, Right; - //Op1 --> Op1b & Op2 --> Op2b are the extremites of the horizontal edges - if (!GetOverlap(op1->Pt.X, op1b->Pt.X, op2->Pt.X, op2b->Pt.X, Left, Right)) - return false; - - //DiscardLeftSide: when overlapping edges are joined, a spike will created - //which needs to be cleaned up. However, we don't want Op1 or Op2 caught up - //on the discard Side as either may still be needed for other joins ... - IntPoint Pt; - bool DiscardLeftSide; - if (op1->Pt.X >= Left && op1->Pt.X <= Right) - { - Pt = op1->Pt; DiscardLeftSide = (op1->Pt.X > op1b->Pt.X); - } - else if (op2->Pt.X >= Left&& op2->Pt.X <= Right) - { - Pt = op2->Pt; DiscardLeftSide = (op2->Pt.X > op2b->Pt.X); - } - else if (op1b->Pt.X >= Left && op1b->Pt.X <= Right) - { - Pt = op1b->Pt; DiscardLeftSide = op1b->Pt.X > op1->Pt.X; - } - else - { - Pt = op2b->Pt; DiscardLeftSide = (op2b->Pt.X > op2->Pt.X); - } - j->OutPt1 = op1; j->OutPt2 = op2; - return JoinHorz(op1, op1b, op2, op2b, Pt, DiscardLeftSide); - } else - { - //nb: For non-horizontal joins ... - // 1. Jr.OutPt1.Pt.Y == Jr.OutPt2.Pt.Y - // 2. Jr.OutPt1.Pt > Jr.OffPt.Y - - //make sure the polygons are correctly oriented ... - op1b = op1->Next; - while ((op1b->Pt == op1->Pt) && (op1b != op1)) op1b = op1b->Next; - bool Reverse1 = ((op1b->Pt.Y > op1->Pt.Y) || - !SlopesEqual(op1->Pt, op1b->Pt, j->OffPt, m_UseFullRange)); - if (Reverse1) - { - op1b = op1->Prev; - while ((op1b->Pt == op1->Pt) && (op1b != op1)) op1b = op1b->Prev; - if ((op1b->Pt.Y > op1->Pt.Y) || - !SlopesEqual(op1->Pt, op1b->Pt, j->OffPt, m_UseFullRange)) return false; - }; - op2b = op2->Next; - while ((op2b->Pt == op2->Pt) && (op2b != op2))op2b = op2b->Next; - bool Reverse2 = ((op2b->Pt.Y > op2->Pt.Y) || - !SlopesEqual(op2->Pt, op2b->Pt, j->OffPt, m_UseFullRange)); - if (Reverse2) - { - op2b = op2->Prev; - while ((op2b->Pt == op2->Pt) && (op2b != op2)) op2b = op2b->Prev; - if ((op2b->Pt.Y > op2->Pt.Y) || - !SlopesEqual(op2->Pt, op2b->Pt, j->OffPt, m_UseFullRange)) return false; - } - - if ((op1b == op1) || (op2b == op2) || (op1b == op2b) || - ((outRec1 == outRec2) && (Reverse1 == Reverse2))) return false; - - if (Reverse1) - { - op1b = this->DupOutPt(op1, false); - op2b = this->DupOutPt(op2, true); - op1->Prev = op2; - op2->Next = op1; - op1b->Next = op2b; - op2b->Prev = op1b; - j->OutPt1 = op1; - j->OutPt2 = op1b; - return true; - } else - { - op1b = this->DupOutPt(op1, true); - op2b = this->DupOutPt(op2, false); - op1->Next = op2; - op2->Prev = op1; - op1b->Prev = op2b; - op2b->Next = op1b; - j->OutPt1 = op1; - j->OutPt2 = op1b; - return true; - } - } -} -//---------------------------------------------------------------------- - -// This is potentially very expensive! O(n^3)! -void Clipper::FixupFirstLefts1(OutRec* OldOutRec, OutRec* NewOutRec) const -{ - PROFILE_FUNC(); - //tests if NewOutRec contains the polygon before reassigning FirstLeft - for (OutRec *outRec : m_PolyOuts) - { - if (!outRec->Pts || !outRec->FirstLeft) continue; - OutRec* firstLeft = outRec->FirstLeft; - // Skip empty polygons. - while (firstLeft && !firstLeft->Pts) firstLeft = firstLeft->FirstLeft; - if (firstLeft == OldOutRec && Poly2ContainsPoly1(outRec->Pts, NewOutRec->Pts)) - outRec->FirstLeft = NewOutRec; - } -} -//---------------------------------------------------------------------- - -void Clipper::FixupFirstLefts2(OutRec* OldOutRec, OutRec* NewOutRec) const -{ - //reassigns FirstLeft WITHOUT testing if NewOutRec contains the polygon - for (OutRec *outRec : m_PolyOuts) - if (outRec->FirstLeft == OldOutRec) outRec->FirstLeft = NewOutRec; -} -//---------------------------------------------------------------------- - -void Clipper::JoinCommonEdges() -{ - PROFILE_FUNC(); - for (Join &join : m_Joins) - { - OutRec *outRec1 = GetOutRec(join.OutPt1->Idx); - OutRec *outRec2 = GetOutRec(join.OutPt2->Idx); - - if (!outRec1->Pts || !outRec2->Pts) continue; - if (outRec1->IsOpen || outRec2->IsOpen) continue; - - //get the polygon fragment with the correct hole state (FirstLeft) - //before calling JoinPoints() ... - OutRec *holeStateRec; - if (outRec1 == outRec2) holeStateRec = outRec1; - else if (Param1RightOfParam2(outRec1, outRec2)) holeStateRec = outRec2; - else if (Param1RightOfParam2(outRec2, outRec1)) holeStateRec = outRec1; - else holeStateRec = GetLowermostRec(outRec1, outRec2); - - if (!JoinPoints(&join, outRec1, outRec2)) continue; - - if (outRec1 == outRec2) - { - //instead of joining two polygons, we've just created a new one by - //splitting one polygon into two. - outRec1->Pts = join.OutPt1; - outRec1->BottomPt = 0; - outRec2 = CreateOutRec(); - outRec2->Pts = join.OutPt2; - - //update all OutRec2.Pts Idx's ... - UpdateOutPtIdxs(*outRec2); - - //We now need to check every OutRec.FirstLeft pointer. If it points - //to OutRec1 it may need to point to OutRec2 instead ... - if (m_UsingPolyTree) - for (size_t j = 0; j < m_PolyOuts.size() - 1; j++) - { - OutRec* oRec = m_PolyOuts[j]; - OutRec* firstLeft = oRec->FirstLeft; - while (firstLeft && !firstLeft->Pts) firstLeft = firstLeft->FirstLeft; - if (!oRec->Pts || firstLeft != outRec1 || - oRec->IsHole == outRec1->IsHole) continue; - if (Poly2ContainsPoly1(oRec->Pts, join.OutPt2)) - oRec->FirstLeft = outRec2; - } - - if (Poly2ContainsPoly1(outRec2->Pts, outRec1->Pts)) - { - //outRec2 is contained by outRec1 ... - outRec2->IsHole = !outRec1->IsHole; - outRec2->FirstLeft = outRec1; - - // For each m_PolyOuts, replace FirstLeft from outRec2 to outRec1. - if (m_UsingPolyTree) FixupFirstLefts2(outRec2, outRec1); - - if ((outRec2->IsHole ^ m_ReverseOutput) == (Area(*outRec2) > 0)) - ReversePolyPtLinks(outRec2->Pts); - - } else if (Poly2ContainsPoly1(outRec1->Pts, outRec2->Pts)) - { - //outRec1 is contained by outRec2 ... - outRec2->IsHole = outRec1->IsHole; - outRec1->IsHole = !outRec2->IsHole; - outRec2->FirstLeft = outRec1->FirstLeft; - outRec1->FirstLeft = outRec2; - - // For each m_PolyOuts, replace FirstLeft from outRec1 to outRec2. - if (m_UsingPolyTree) FixupFirstLefts2(outRec1, outRec2); - - if ((outRec1->IsHole ^ m_ReverseOutput) == (Area(*outRec1) > 0)) - ReversePolyPtLinks(outRec1->Pts); - } - else - { - //the 2 polygons are completely separate ... - outRec2->IsHole = outRec1->IsHole; - outRec2->FirstLeft = outRec1->FirstLeft; - - //fixup FirstLeft pointers that may need reassigning to OutRec2 - // For each polygon of m_PolyOuts, replace FirstLeft from outRec1 to outRec2 if the polygon is inside outRec2. - //FIXME This is potentially very expensive! O(n^3)! - if (m_UsingPolyTree) FixupFirstLefts1(outRec1, outRec2); - } - - } else - { - //joined 2 polygons together ... - - outRec2->Pts = 0; - outRec2->BottomPt = 0; - outRec2->Idx = outRec1->Idx; - - outRec1->IsHole = holeStateRec->IsHole; - if (holeStateRec == outRec2) - outRec1->FirstLeft = outRec2->FirstLeft; - outRec2->FirstLeft = outRec1; - - // For each m_PolyOuts, replace FirstLeft from outRec2 to outRec1. - if (m_UsingPolyTree) FixupFirstLefts2(outRec2, outRec1); - } - } -} - -//------------------------------------------------------------------------------ -// ClipperOffset support functions ... -//------------------------------------------------------------------------------ - -DoublePoint GetUnitNormal(const IntPoint &pt1, const IntPoint &pt2) -{ - if(pt2.X == pt1.X && pt2.Y == pt1.Y) - return DoublePoint(0, 0); - - double Dx = (double)(pt2.X - pt1.X); - double dy = (double)(pt2.Y - pt1.Y); - double f = 1 *1.0/ std::sqrt( Dx*Dx + dy*dy ); - Dx *= f; - dy *= f; - return DoublePoint(dy, -Dx); -} - -//------------------------------------------------------------------------------ -// ClipperOffset class -//------------------------------------------------------------------------------ - -void ClipperOffset::Clear() -{ - for (int i = 0; i < m_polyNodes.ChildCount(); ++i) - delete m_polyNodes.Childs[i]; - m_polyNodes.Childs.clear(); - m_lowest.X = -1; -} -//------------------------------------------------------------------------------ - -void ClipperOffset::AddPath(const Path& path, JoinType joinType, EndType endType) -{ - int highI = (int)path.size() - 1; - if (highI < 0) return; - PolyNode* newNode = new PolyNode(); - newNode->m_jointype = joinType; - newNode->m_endtype = endType; - - //strip duplicate points from path and also get index to the lowest point ... - bool has_shortest_edge_length = ShortestEdgeLength > 0.; - double shortest_edge_length2 = has_shortest_edge_length ? ShortestEdgeLength * ShortestEdgeLength : 0.; - if (endType == etClosedLine || endType == etClosedPolygon) - for (; highI > 0; -- highI) { - bool same = false; - if (has_shortest_edge_length) { - double dx = double(path[highI].X - path[0].X); - double dy = double(path[highI].Y - path[0].Y); - same = dx*dx + dy*dy < shortest_edge_length2; - } else - same = path[0] == path[highI]; - if (! same) - break; - } - newNode->Contour.reserve(highI + 1); - newNode->Contour.push_back(path[0]); - int j = 0, k = 0; - for (int i = 1; i <= highI; i++) { - bool same = false; - if (has_shortest_edge_length) { - double dx = double(path[i].X - newNode->Contour[j].X); - double dy = double(path[i].Y - newNode->Contour[j].Y); - same = dx*dx + dy*dy < shortest_edge_length2; - } else - same = newNode->Contour[j] == path[i]; - if (same) - continue; - j++; - newNode->Contour.push_back(path[i]); - if (path[i].Y > newNode->Contour[k].Y || - (path[i].Y == newNode->Contour[k].Y && - path[i].X < newNode->Contour[k].X)) k = j; - } - if (endType == etClosedPolygon && j < 2) - { - delete newNode; - return; - } - m_polyNodes.AddChild(*newNode); - - //if this path's lowest pt is lower than all the others then update m_lowest - if (endType != etClosedPolygon) return; - if (m_lowest.X < 0) - m_lowest = IntPoint(m_polyNodes.ChildCount() - 1, k); - else - { - IntPoint ip = m_polyNodes.Childs[(int)m_lowest.X]->Contour[(int)m_lowest.Y]; - if (newNode->Contour[k].Y > ip.Y || - (newNode->Contour[k].Y == ip.Y && - newNode->Contour[k].X < ip.X)) - m_lowest = IntPoint(m_polyNodes.ChildCount() - 1, k); - } -} -//------------------------------------------------------------------------------ - -void ClipperOffset::AddPaths(const Paths& paths, JoinType joinType, EndType endType) -{ - for (const Path &path : paths) - AddPath(path, joinType, endType); -} -//------------------------------------------------------------------------------ - -void ClipperOffset::FixOrientations() -{ - //fixup orientations of all closed paths if the orientation of the - //closed path with the lowermost vertex is wrong ... - if (m_lowest.X >= 0 && - !Orientation(m_polyNodes.Childs[(int)m_lowest.X]->Contour)) - { - for (int i = 0; i < m_polyNodes.ChildCount(); ++i) - { - PolyNode& node = *m_polyNodes.Childs[i]; - if (node.m_endtype == etClosedPolygon || - (node.m_endtype == etClosedLine && Orientation(node.Contour))) - ReversePath(node.Contour); - } - } else - { - for (int i = 0; i < m_polyNodes.ChildCount(); ++i) - { - PolyNode& node = *m_polyNodes.Childs[i]; - if (node.m_endtype == etClosedLine && !Orientation(node.Contour)) - ReversePath(node.Contour); - } - } -} -//------------------------------------------------------------------------------ - -void ClipperOffset::Execute(Paths& solution, double delta) -{ - solution.clear(); - FixOrientations(); - DoOffset(delta); - - //now clean up 'corners' ... - Clipper clpr; - clpr.AddPaths(m_destPolys, ptSubject, true); - if (delta > 0) - { - clpr.Execute(ctUnion, solution, pftPositive, pftPositive); - } - else - { - IntRect r = clpr.GetBounds(); - Path outer(4); - outer[0] = IntPoint(r.left - 10, r.bottom + 10); - outer[1] = IntPoint(r.right + 10, r.bottom + 10); - outer[2] = IntPoint(r.right + 10, r.top - 10); - outer[3] = IntPoint(r.left - 10, r.top - 10); - - clpr.AddPath(outer, ptSubject, true); - clpr.ReverseSolution(true); - clpr.Execute(ctUnion, solution, pftNegative, pftNegative); - if (solution.size() > 0) solution.erase(solution.begin()); - } -} -//------------------------------------------------------------------------------ - -void ClipperOffset::Execute(PolyTree& solution, double delta) -{ - solution.Clear(); - FixOrientations(); - DoOffset(delta); - - //now clean up 'corners' ... - Clipper clpr; - clpr.AddPaths(m_destPolys, ptSubject, true); - if (delta > 0) - { - clpr.Execute(ctUnion, solution, pftPositive, pftPositive); - } - else - { - IntRect r = clpr.GetBounds(); - Path outer(4); - outer[0] = IntPoint(r.left - 10, r.bottom + 10); - outer[1] = IntPoint(r.right + 10, r.bottom + 10); - outer[2] = IntPoint(r.right + 10, r.top - 10); - outer[3] = IntPoint(r.left - 10, r.top - 10); - - clpr.AddPath(outer, ptSubject, true); - clpr.ReverseSolution(true); - clpr.Execute(ctUnion, solution, pftNegative, pftNegative); - //remove the outer PolyNode rectangle ... - if (solution.ChildCount() == 1 && solution.Childs[0]->ChildCount() > 0) - { - PolyNode* outerNode = solution.Childs[0]; - solution.Childs.reserve(outerNode->ChildCount()); - solution.Childs[0] = outerNode->Childs[0]; - solution.Childs[0]->Parent = outerNode->Parent; - for (int i = 1; i < outerNode->ChildCount(); ++i) - solution.AddChild(*outerNode->Childs[i]); - } - else - solution.Clear(); - } -} -//------------------------------------------------------------------------------ - -void ClipperOffset::DoOffset(double delta) -{ - m_destPolys.clear(); - m_delta = delta; - - //if Zero offset, just copy any CLOSED polygons to m_p and return ... - if (NEAR_ZERO(delta)) - { - m_destPolys.reserve(m_polyNodes.ChildCount()); - for (int i = 0; i < m_polyNodes.ChildCount(); i++) - { - PolyNode& node = *m_polyNodes.Childs[i]; - if (node.m_endtype == etClosedPolygon) - m_destPolys.push_back(node.Contour); - } - return; - } - - //see offset_triginometry3.svg in the documentation folder ... - if (MiterLimit > 2) m_miterLim = 2/(MiterLimit * MiterLimit); - else m_miterLim = 0.5; - - double y; - if (ArcTolerance <= 0.0) y = def_arc_tolerance; - else if (ArcTolerance > std::fabs(delta) * def_arc_tolerance) - y = std::fabs(delta) * def_arc_tolerance; - else y = ArcTolerance; - //see offset_triginometry2.svg in the documentation folder ... - double steps = pi / std::acos(1 - y / std::fabs(delta)); - if (steps > std::fabs(delta) * pi) - steps = std::fabs(delta) * pi; //ie excessive precision check - m_sin = std::sin(two_pi / steps); - m_cos = std::cos(two_pi / steps); - m_StepsPerRad = steps / two_pi; - if (delta < 0.0) m_sin = -m_sin; - - m_destPolys.reserve(m_polyNodes.ChildCount() * 2); - for (int i = 0; i < m_polyNodes.ChildCount(); i++) - { - PolyNode& node = *m_polyNodes.Childs[i]; - m_srcPoly = node.Contour; - - int len = (int)m_srcPoly.size(); - if (len == 0 || (delta <= 0 && (len < 3 || node.m_endtype != etClosedPolygon))) - continue; - - m_destPoly.clear(); - if (len == 1) - { - if (node.m_jointype == jtRound) - { - double X = 1.0, Y = 0.0; - for (cInt j = 1; j <= steps; j++) - { - m_destPoly.push_back(IntPoint( - Round(m_srcPoly[0].X + X * delta), - Round(m_srcPoly[0].Y + Y * delta))); - double X2 = X; - X = X * m_cos - m_sin * Y; - Y = X2 * m_sin + Y * m_cos; - } - } - else - { - double X = -1.0, Y = -1.0; - for (int j = 0; j < 4; ++j) - { - m_destPoly.push_back(IntPoint( - Round(m_srcPoly[0].X + X * delta), - Round(m_srcPoly[0].Y + Y * delta))); - if (X < 0) X = 1; - else if (Y < 0) Y = 1; - else X = -1; - } - } - m_destPolys.push_back(m_destPoly); - continue; - } - //build m_normals ... - m_normals.clear(); - m_normals.reserve(len); - for (int j = 0; j < len - 1; ++j) - m_normals.push_back(GetUnitNormal(m_srcPoly[j], m_srcPoly[j + 1])); - if (node.m_endtype == etClosedLine || node.m_endtype == etClosedPolygon) - m_normals.push_back(GetUnitNormal(m_srcPoly[len - 1], m_srcPoly[0])); - else - m_normals.push_back(DoublePoint(m_normals[len - 2])); - - if (node.m_endtype == etClosedPolygon) - { - int k = len - 1; - for (int j = 0; j < len; ++j) - OffsetPoint(j, k, node.m_jointype); - m_destPolys.push_back(m_destPoly); - } - else if (node.m_endtype == etClosedLine) - { - int k = len - 1; - for (int j = 0; j < len; ++j) - OffsetPoint(j, k, node.m_jointype); - m_destPolys.push_back(m_destPoly); - m_destPoly.clear(); - //re-build m_normals ... - DoublePoint n = m_normals[len -1]; - for (int j = len - 1; j > 0; j--) - m_normals[j] = DoublePoint(-m_normals[j - 1].X, -m_normals[j - 1].Y); - m_normals[0] = DoublePoint(-n.X, -n.Y); - k = 0; - for (int j = len - 1; j >= 0; j--) - OffsetPoint(j, k, node.m_jointype); - m_destPolys.push_back(m_destPoly); - } - else - { - int k = 0; - for (int j = 1; j < len - 1; ++j) - OffsetPoint(j, k, node.m_jointype); - - IntPoint pt1; - if (node.m_endtype == etOpenButt) - { - int j = len - 1; - pt1 = IntPoint(Round(m_srcPoly[j].X + m_normals[j].X * - delta), Round(m_srcPoly[j].Y + m_normals[j].Y * delta)); - m_destPoly.push_back(pt1); - pt1 = IntPoint(Round(m_srcPoly[j].X - m_normals[j].X * - delta), Round(m_srcPoly[j].Y - m_normals[j].Y * delta)); - m_destPoly.push_back(pt1); - } - else - { - int j = len - 1; - k = len - 2; - m_sinA = 0; - m_normals[j] = DoublePoint(-m_normals[j].X, -m_normals[j].Y); - if (node.m_endtype == etOpenSquare) - DoSquare(j, k); - else - DoRound(j, k); - } - - //re-build m_normals ... - for (int j = len - 1; j > 0; j--) - m_normals[j] = DoublePoint(-m_normals[j - 1].X, -m_normals[j - 1].Y); - m_normals[0] = DoublePoint(-m_normals[1].X, -m_normals[1].Y); - - k = len - 1; - for (int j = k - 1; j > 0; --j) OffsetPoint(j, k, node.m_jointype); - - if (node.m_endtype == etOpenButt) - { - pt1 = IntPoint(Round(m_srcPoly[0].X - m_normals[0].X * delta), - Round(m_srcPoly[0].Y - m_normals[0].Y * delta)); - m_destPoly.push_back(pt1); - pt1 = IntPoint(Round(m_srcPoly[0].X + m_normals[0].X * delta), - Round(m_srcPoly[0].Y + m_normals[0].Y * delta)); - m_destPoly.push_back(pt1); - } - else - { - k = 1; - m_sinA = 0; - if (node.m_endtype == etOpenSquare) - DoSquare(0, 1); - else - DoRound(0, 1); - } - m_destPolys.push_back(m_destPoly); - } - } -} -//------------------------------------------------------------------------------ - -void ClipperOffset::OffsetPoint(int j, int& k, JoinType jointype) -{ - //cross product ... - m_sinA = (m_normals[k].X * m_normals[j].Y - m_normals[j].X * m_normals[k].Y); - if (std::fabs(m_sinA * m_delta) < 1.0) - { - //dot product ... - double cosA = (m_normals[k].X * m_normals[j].X + m_normals[j].Y * m_normals[k].Y ); - if (cosA > 0) // angle => 0 degrees - { - m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].X + m_normals[k].X * m_delta), - Round(m_srcPoly[j].Y + m_normals[k].Y * m_delta))); - return; - } - //else angle => 180 degrees - } - else if (m_sinA > 1.0) m_sinA = 1.0; - else if (m_sinA < -1.0) m_sinA = -1.0; - - if (m_sinA * m_delta < 0) - { - m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].X + m_normals[k].X * m_delta), - Round(m_srcPoly[j].Y + m_normals[k].Y * m_delta))); - m_destPoly.push_back(m_srcPoly[j]); - m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].X + m_normals[j].X * m_delta), - Round(m_srcPoly[j].Y + m_normals[j].Y * m_delta))); - } - else - switch (jointype) - { - case jtMiter: - { - double r = 1 + (m_normals[j].X * m_normals[k].X + - m_normals[j].Y * m_normals[k].Y); - if (r >= m_miterLim) DoMiter(j, k, r); else DoSquare(j, k); - break; - } - case jtSquare: DoSquare(j, k); break; - case jtRound: DoRound(j, k); break; - } - k = j; -} -//------------------------------------------------------------------------------ - -void ClipperOffset::DoSquare(int j, int k) -{ - double dx = std::tan(std::atan2(m_sinA, - m_normals[k].X * m_normals[j].X + m_normals[k].Y * m_normals[j].Y) / 4); - m_destPoly.push_back(IntPoint( - Round(m_srcPoly[j].X + m_delta * (m_normals[k].X - m_normals[k].Y * dx)), - Round(m_srcPoly[j].Y + m_delta * (m_normals[k].Y + m_normals[k].X * dx)))); - m_destPoly.push_back(IntPoint( - Round(m_srcPoly[j].X + m_delta * (m_normals[j].X + m_normals[j].Y * dx)), - Round(m_srcPoly[j].Y + m_delta * (m_normals[j].Y - m_normals[j].X * dx)))); -} -//------------------------------------------------------------------------------ - -void ClipperOffset::DoMiter(int j, int k, double r) -{ - double q = m_delta / r; - m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].X + (m_normals[k].X + m_normals[j].X) * q), - Round(m_srcPoly[j].Y + (m_normals[k].Y + m_normals[j].Y) * q))); -} -//------------------------------------------------------------------------------ - -void ClipperOffset::DoRound(int j, int k) -{ - double a = std::atan2(m_sinA, - m_normals[k].X * m_normals[j].X + m_normals[k].Y * m_normals[j].Y); - int steps = std::max((int)Round(m_StepsPerRad * std::fabs(a)), 1); - - double X = m_normals[k].X, Y = m_normals[k].Y, X2; - for (int i = 0; i < steps; ++i) - { - m_destPoly.push_back(IntPoint( - Round(m_srcPoly[j].X + X * m_delta), - Round(m_srcPoly[j].Y + Y * m_delta))); - X2 = X; - X = X * m_cos - m_sin * Y; - Y = X2 * m_sin + Y * m_cos; - } - m_destPoly.push_back(IntPoint( - Round(m_srcPoly[j].X + m_normals[j].X * m_delta), - Round(m_srcPoly[j].Y + m_normals[j].Y * m_delta))); -} - -//------------------------------------------------------------------------------ -// Miscellaneous public functions -//------------------------------------------------------------------------------ - -// Called by Clipper::ExecuteInternal() -// For each polygon, search for exactly duplicate non-successive points. -// If such a point is found, the loop is split into two pieces. -// Search for the duplicate points is O(n^2)! -// http://www.angusj.com/delphi/clipper/documentation/Docs/Units/ClipperLib/Classes/Clipper/Properties/StrictlySimple.htm -void Clipper::DoSimplePolygons() -{ - PROFILE_FUNC(); - size_t i = 0; - while (i < m_PolyOuts.size()) - { - OutRec* outrec = m_PolyOuts[i++]; - OutPt* op = outrec->Pts; - if (!op || outrec->IsOpen) continue; - do //for each Pt in Polygon until duplicate found do ... - { - OutPt* op2 = op->Next; - while (op2 != outrec->Pts) - { - if ((op->Pt == op2->Pt) && op2->Next != op && op2->Prev != op) - { - //split the polygon into two ... - OutPt* op3 = op->Prev; - OutPt* op4 = op2->Prev; - op->Prev = op4; - op4->Next = op; - op2->Prev = op3; - op3->Next = op2; - - outrec->Pts = op; - OutRec* outrec2 = CreateOutRec(); - outrec2->Pts = op2; - UpdateOutPtIdxs(*outrec2); - if (Poly2ContainsPoly1(outrec2->Pts, outrec->Pts)) - { - //OutRec2 is contained by OutRec1 ... - outrec2->IsHole = !outrec->IsHole; - outrec2->FirstLeft = outrec; - // For each m_PolyOuts, replace FirstLeft from outRec2 to outrec. - if (m_UsingPolyTree) FixupFirstLefts2(outrec2, outrec); - } - else - if (Poly2ContainsPoly1(outrec->Pts, outrec2->Pts)) - { - //OutRec1 is contained by OutRec2 ... - outrec2->IsHole = outrec->IsHole; - outrec->IsHole = !outrec2->IsHole; - outrec2->FirstLeft = outrec->FirstLeft; - outrec->FirstLeft = outrec2; - // For each m_PolyOuts, replace FirstLeft from outrec to outrec2. - if (m_UsingPolyTree) FixupFirstLefts2(outrec, outrec2); - } - else - { - //the 2 polygons are separate ... - outrec2->IsHole = outrec->IsHole; - outrec2->FirstLeft = outrec->FirstLeft; - // For each polygon of m_PolyOuts, replace FirstLeft from outrec to outrec2 if the polygon is inside outRec2. - //FIXME This is potentially very expensive! O(n^3)! - if (m_UsingPolyTree) FixupFirstLefts1(outrec, outrec2); - } - op2 = op; //ie get ready for the Next iteration - } - op2 = op2->Next; - } - op = op->Next; - } - while (op != outrec->Pts); - } -} -//------------------------------------------------------------------------------ - -void ReversePath(Path& p) -{ - std::reverse(p.begin(), p.end()); -} -//------------------------------------------------------------------------------ - -void ReversePaths(Paths& p) -{ - for (Paths::size_type i = 0; i < p.size(); ++i) - ReversePath(p[i]); -} -//------------------------------------------------------------------------------ - -void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType) -{ - Clipper c; - c.StrictlySimple(true); - c.AddPath(in_poly, ptSubject, true); - c.Execute(ctUnion, out_polys, fillType, fillType); -} -//------------------------------------------------------------------------------ - -void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType) -{ - Clipper c; - c.StrictlySimple(true); - c.AddPaths(in_polys, ptSubject, true); - c.Execute(ctUnion, out_polys, fillType, fillType); -} -//------------------------------------------------------------------------------ - -void SimplifyPolygons(Paths &polys, PolyFillType fillType) -{ - SimplifyPolygons(polys, polys, fillType); -} -//------------------------------------------------------------------------------ - -inline double DistanceSqrd(const IntPoint& pt1, const IntPoint& pt2) -{ - double Dx = ((double)pt1.X - pt2.X); - double dy = ((double)pt1.Y - pt2.Y); - return (Dx*Dx + dy*dy); -} -//------------------------------------------------------------------------------ - -double DistanceFromLineSqrd( - const IntPoint& pt, const IntPoint& ln1, const IntPoint& ln2) -{ - //The equation of a line in general form (Ax + By + C = 0) - //given 2 points (x¹,y¹) & (x²,y²) is ... - //(y¹ - y²)x + (x² - x¹)y + (y² - y¹)x¹ - (x² - x¹)y¹ = 0 - //A = (y¹ - y²); B = (x² - x¹); C = (y² - y¹)x¹ - (x² - x¹)y¹ - //perpendicular distance of point (x³,y³) = (Ax³ + By³ + C)/Sqrt(A² + B²) - //see http://en.wikipedia.org/wiki/Perpendicular_distance - double A = double(ln1.Y - ln2.Y); - double B = double(ln2.X - ln1.X); - double C = A * ln1.X + B * ln1.Y; - C = A * pt.X + B * pt.Y - C; - return (C * C) / (A * A + B * B); -} -//--------------------------------------------------------------------------- - -bool SlopesNearCollinear(const IntPoint& pt1, - const IntPoint& pt2, const IntPoint& pt3, double distSqrd) -{ - //this function is more accurate when the point that's geometrically - //between the other 2 points is the one that's tested for distance. - //ie makes it more likely to pick up 'spikes' ... - if (std::abs(pt1.X - pt2.X) > std::abs(pt1.Y - pt2.Y)) - { - if ((pt1.X > pt2.X) == (pt1.X < pt3.X)) - return DistanceFromLineSqrd(pt1, pt2, pt3) < distSqrd; - else if ((pt2.X > pt1.X) == (pt2.X < pt3.X)) - return DistanceFromLineSqrd(pt2, pt1, pt3) < distSqrd; - else - return DistanceFromLineSqrd(pt3, pt1, pt2) < distSqrd; - } - else - { - if ((pt1.Y > pt2.Y) == (pt1.Y < pt3.Y)) - return DistanceFromLineSqrd(pt1, pt2, pt3) < distSqrd; - else if ((pt2.Y > pt1.Y) == (pt2.Y < pt3.Y)) - return DistanceFromLineSqrd(pt2, pt1, pt3) < distSqrd; - else - return DistanceFromLineSqrd(pt3, pt1, pt2) < distSqrd; - } -} -//------------------------------------------------------------------------------ - -bool PointsAreClose(IntPoint pt1, IntPoint pt2, double distSqrd) -{ - double Dx = (double)pt1.X - pt2.X; - double dy = (double)pt1.Y - pt2.Y; - return ((Dx * Dx) + (dy * dy) <= distSqrd); -} -//------------------------------------------------------------------------------ - -OutPt* ExcludeOp(OutPt* op) -{ - OutPt* result = op->Prev; - result->Next = op->Next; - op->Next->Prev = result; - result->Idx = 0; - return result; -} -//------------------------------------------------------------------------------ - -// Simplify a polygon using a linked list of points. -void CleanPolygon(const Path& in_poly, Path& out_poly, double distance) -{ - //distance = proximity in units/pixels below which vertices - //will be stripped. Default ~= sqrt(2). - - size_t size = in_poly.size(); - - if (size == 0) - { - out_poly.clear(); - return; - } - - std::vector outPts(size); - for (size_t i = 0; i < size; ++i) - { - outPts[i].Pt = in_poly[i]; - outPts[i].Next = &outPts[(i + 1) % size]; - outPts[i].Next->Prev = &outPts[i]; - outPts[i].Idx = 0; - } - - double distSqrd = distance * distance; - OutPt* op = &outPts[0]; - while (op->Idx == 0 && op->Next != op->Prev) - { - if (PointsAreClose(op->Pt, op->Prev->Pt, distSqrd)) - { - op = ExcludeOp(op); - size--; - } - else if (PointsAreClose(op->Prev->Pt, op->Next->Pt, distSqrd)) - { - ExcludeOp(op->Next); - op = ExcludeOp(op); - size -= 2; - } - else if (SlopesNearCollinear(op->Prev->Pt, op->Pt, op->Next->Pt, distSqrd)) - { - op = ExcludeOp(op); - size--; - } - else - { - op->Idx = 1; - op = op->Next; - } - } - - if (size < 3) size = 0; - out_poly.resize(size); - for (size_t i = 0; i < size; ++i) - { - out_poly[i] = op->Pt; - op = op->Next; - } -} -//------------------------------------------------------------------------------ - -void CleanPolygon(Path& poly, double distance) -{ - CleanPolygon(poly, poly, distance); -} -//------------------------------------------------------------------------------ - -void CleanPolygons(const Paths& in_polys, Paths& out_polys, double distance) -{ - for (Paths::size_type i = 0; i < in_polys.size(); ++i) - CleanPolygon(in_polys[i], out_polys[i], distance); -} -//------------------------------------------------------------------------------ - -void CleanPolygons(Paths& polys, double distance) -{ - CleanPolygons(polys, polys, distance); -} -//------------------------------------------------------------------------------ - -void Minkowski(const Path& poly, const Path& path, - Paths& solution, bool isSum, bool isClosed) -{ - int delta = (isClosed ? 1 : 0); - size_t polyCnt = poly.size(); - size_t pathCnt = path.size(); - Paths pp; - pp.reserve(pathCnt); - if (isSum) - for (size_t i = 0; i < pathCnt; ++i) - { - Path p; - p.reserve(polyCnt); - for (size_t j = 0; j < poly.size(); ++j) - p.push_back(IntPoint(path[i].X + poly[j].X, path[i].Y + poly[j].Y)); - pp.push_back(p); - } - else - for (size_t i = 0; i < pathCnt; ++i) - { - Path p; - p.reserve(polyCnt); - for (size_t j = 0; j < poly.size(); ++j) - p.push_back(IntPoint(path[i].X - poly[j].X, path[i].Y - poly[j].Y)); - pp.push_back(p); - } - - solution.clear(); - solution.reserve((pathCnt + delta) * (polyCnt + 1)); - for (size_t i = 0; i < pathCnt - 1 + delta; ++i) - for (size_t j = 0; j < polyCnt; ++j) - { - Path quad; - quad.reserve(4); - quad.push_back(pp[i % pathCnt][j % polyCnt]); - quad.push_back(pp[(i + 1) % pathCnt][j % polyCnt]); - quad.push_back(pp[(i + 1) % pathCnt][(j + 1) % polyCnt]); - quad.push_back(pp[i % pathCnt][(j + 1) % polyCnt]); - if (!Orientation(quad)) ReversePath(quad); - solution.push_back(quad); - } -} -//------------------------------------------------------------------------------ - -void MinkowskiSum(const Path& pattern, const Path& path, Paths& solution, bool pathIsClosed) -{ - Minkowski(pattern, path, solution, true, pathIsClosed); - Clipper c; - c.AddPaths(solution, ptSubject, true); - c.Execute(ctUnion, solution, pftNonZero, pftNonZero); -} -//------------------------------------------------------------------------------ - -void TranslatePath(const Path& input, Path& output, const IntPoint& delta) -{ - //precondition: input != output - output.resize(input.size()); - for (size_t i = 0; i < input.size(); ++i) - output[i] = IntPoint(input[i].X + delta.X, input[i].Y + delta.Y); -} -//------------------------------------------------------------------------------ - -void MinkowskiSum(const Path& pattern, const Paths& paths, Paths& solution, bool pathIsClosed) -{ - Clipper c; - for (size_t i = 0; i < paths.size(); ++i) - { - Paths tmp; - Minkowski(pattern, paths[i], tmp, true, pathIsClosed); - c.AddPaths(tmp, ptSubject, true); - if (pathIsClosed) - { - Path tmp2; - TranslatePath(paths[i], tmp2, pattern[0]); - c.AddPath(tmp2, ptClip, true); - } - } - c.Execute(ctUnion, solution, pftNonZero, pftNonZero); -} -//------------------------------------------------------------------------------ - -void MinkowskiDiff(const Path& poly1, const Path& poly2, Paths& solution) -{ - Minkowski(poly1, poly2, solution, false, true); - Clipper c; - c.AddPaths(solution, ptSubject, true); - c.Execute(ctUnion, solution, pftNonZero, pftNonZero); -} -//------------------------------------------------------------------------------ - -enum NodeType {ntAny, ntOpen, ntClosed}; - -void AddPolyNodeToPaths(const PolyNode& polynode, NodeType nodetype, Paths& paths) -{ - bool match = true; - if (nodetype == ntClosed) match = !polynode.IsOpen(); - else if (nodetype == ntOpen) return; - - if (!polynode.Contour.empty() && match) - paths.push_back(polynode.Contour); - for (int i = 0; i < polynode.ChildCount(); ++i) - AddPolyNodeToPaths(*polynode.Childs[i], nodetype, paths); -} -//------------------------------------------------------------------------------ - -void PolyTreeToPaths(const PolyTree& polytree, Paths& paths) -{ - paths.resize(0); - paths.reserve(polytree.Total()); - AddPolyNodeToPaths(polytree, ntAny, paths); -} -//------------------------------------------------------------------------------ - -void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths) -{ - paths.resize(0); - paths.reserve(polytree.Total()); - AddPolyNodeToPaths(polytree, ntClosed, paths); -} -//------------------------------------------------------------------------------ - -void OpenPathsFromPolyTree(PolyTree& polytree, Paths& paths) -{ - paths.resize(0); - paths.reserve(polytree.Total()); - //Open paths are top level only, so ... - for (int i = 0; i < polytree.ChildCount(); ++i) - if (polytree.Childs[i]->IsOpen()) - paths.push_back(polytree.Childs[i]->Contour); -} -//------------------------------------------------------------------------------ - -std::ostream& operator <<(std::ostream &s, const IntPoint &p) -{ - s << "(" << p.X << "," << p.Y << ")"; - return s; -} -//------------------------------------------------------------------------------ - -std::ostream& operator <<(std::ostream &s, const Path &p) -{ - if (p.empty()) return s; - Path::size_type last = p.size() -1; - for (Path::size_type i = 0; i < last; i++) - s << "(" << p[i].X << "," << p[i].Y << "), "; - s << "(" << p[last].X << "," << p[last].Y << ")\n"; - return s; -} -//------------------------------------------------------------------------------ - -std::ostream& operator <<(std::ostream &s, const Paths &p) -{ - for (Paths::size_type i = 0; i < p.size(); i++) - s << p[i]; - s << "\n"; - return s; -} -//------------------------------------------------------------------------------ - -} //ClipperLib namespace +/******************************************************************************* +* * +* Author : Angus Johnson * +* Version : 6.2.9 * +* Date : 16 February 2015 * +* Website : http://www.angusj.com * +* Copyright : Angus Johnson 2010-2015 * +* * +* License: * +* Use, modification & distribution is subject to Boost Software License Ver 1. * +* http://www.boost.org/LICENSE_1_0.txt * +* * +* Attributions: * +* The code in this library is an extension of Bala Vatti's clipping algorithm: * +* "A generic solution to polygon clipping" * +* Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63. * +* http://portal.acm.org/citation.cfm?id=129906 * +* * +* Computer graphics and geometric modeling: implementation and algorithms * +* By Max K. Agoston * +* Springer; 1 edition (January 4, 2005) * +* http://books.google.com/books?q=vatti+clipping+agoston * +* * +* See also: * +* "Polygon Offsetting by Computing Winding Numbers" * +* Paper no. DETC2005-85513 pp. 565-575 * +* ASME 2005 International Design Engineering Technical Conferences * +* and Computers and Information in Engineering Conference (IDETC/CIE2005) * +* September 24-28, 2005 , Long Beach, California, USA * +* http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf * +* * +*******************************************************************************/ + +/******************************************************************************* +* * +* This is a translation of the Delphi Clipper library and the naming style * +* used has retained a Delphi flavour. * +* * +*******************************************************************************/ + +#include "clipper.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace ClipperLib { + +static double const pi = 3.141592653589793238; +static double const two_pi = pi *2; +static double const def_arc_tolerance = 0.25; + +enum Direction { dRightToLeft, dLeftToRight }; + +static int const Unassigned = -1; //edge not currently 'owning' a solution +static int const Skip = -2; //edge that would otherwise close a path + +#define HORIZONTAL (-1.0E+40) +#define TOLERANCE (1.0e-20) +#define NEAR_ZERO(val) (((val) > -TOLERANCE) && ((val) < TOLERANCE)) + +// Output polygon. +struct OutRec { + int Idx; + bool IsHole; + bool IsOpen; + //The 'FirstLeft' field points to another OutRec that contains or is the + //'parent' of OutRec. It is 'first left' because the ActiveEdgeList (AEL) is + //parsed left from the current edge (owning OutRec) until the owner OutRec + //is found. This field simplifies sorting the polygons into a tree structure + //which reflects the parent/child relationships of all polygons. + //This field should be renamed Parent, and will be later. + OutRec *FirstLeft; + // Used only by void Clipper::BuildResult2(PolyTree& polytree) + PolyNode *PolyNd; + // Linked list of output points, dynamically allocated. + OutPt *Pts; + OutPt *BottomPt; +}; + +//------------------------------------------------------------------------------ + +inline cInt Round(double val) +{ + return static_cast((val < 0) ? (val - 0.5) : (val + 0.5)); +} + +//------------------------------------------------------------------------------ +// PolyTree methods ... +//------------------------------------------------------------------------------ + +int PolyTree::Total() const +{ + int result = (int)AllNodes.size(); + //with negative offsets, ignore the hidden outer polygon ... + if (result > 0 && Childs.front() != &AllNodes.front()) result--; + return result; +} + +//------------------------------------------------------------------------------ +// PolyNode methods ... +//------------------------------------------------------------------------------ + +void PolyNode::AddChild(PolyNode& child) +{ + unsigned cnt = (unsigned)Childs.size(); + Childs.push_back(&child); + child.Parent = this; + child.Index = cnt; +} +//------------------------------------------------------------------------------ + +// Edge delimits a hole if it has an odd number of parent loops. +bool PolyNode::IsHole() const +{ + bool result = true; + PolyNode* node = Parent; + while (node) + { + result = !result; + node = node->Parent; + } + return result; +} + +//------------------------------------------------------------------------------ +// Miscellaneous global functions +//------------------------------------------------------------------------------ + +double Area(const Path &poly) +{ + int size = (int)poly.size(); + if (size < 3) return 0; + + double a = 0; + for (int i = 0, j = size -1; i < size; ++i) + { + a += ((double)poly[j].X + poly[i].X) * ((double)poly[j].Y - poly[i].Y); + j = i; + } + return -a * 0.5; +} +//------------------------------------------------------------------------------ + +double Area(const OutRec &outRec) +{ + OutPt *op = outRec.Pts; + if (!op) return 0; + double a = 0; + do { + a += (double)(op->Prev->Pt.X + op->Pt.X) * (double)(op->Prev->Pt.Y - op->Pt.Y); + op = op->Next; + } while (op != outRec.Pts); + return a * 0.5; +} +//------------------------------------------------------------------------------ + +bool PointIsVertex(const IntPoint &Pt, OutPt *pp) +{ + OutPt *pp2 = pp; + do + { + if (pp2->Pt == Pt) return true; + pp2 = pp2->Next; + } + while (pp2 != pp); + return false; +} +//------------------------------------------------------------------------------ + +//See "The Point in Polygon Problem for Arbitrary Polygons" by Hormann & Agathos +//http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.88.5498&rep=rep1&type=pdf +int PointInPolygon(const IntPoint &pt, const Path &path) +{ + //returns 0 if false, +1 if true, -1 if pt ON polygon boundary + int result = 0; + size_t cnt = path.size(); + if (cnt < 3) return 0; + IntPoint ip = path[0]; + for(size_t i = 1; i <= cnt; ++i) + { + IntPoint ipNext = (i == cnt ? path[0] : path[i]); + if (ipNext.Y == pt.Y && ((ipNext.X == pt.X) || (ip.Y == pt.Y && ((ipNext.X > pt.X) == (ip.X < pt.X))))) + return -1; + if ((ip.Y < pt.Y) != (ipNext.Y < pt.Y)) + { + if (ip.X >= pt.X) + { + if (ipNext.X > pt.X) result = 1 - result; + else + { + double d = (double)(ip.X - pt.X) * (ipNext.Y - pt.Y) - (double)(ipNext.X - pt.X) * (ip.Y - pt.Y); + if (!d) return -1; + if ((d > 0) == (ipNext.Y > ip.Y)) result = 1 - result; + } + } else + { + if (ipNext.X > pt.X) + { + double d = (double)(ip.X - pt.X) * (ipNext.Y - pt.Y) - (double)(ipNext.X - pt.X) * (ip.Y - pt.Y); + if (!d) return -1; + if ((d > 0) == (ipNext.Y > ip.Y)) result = 1 - result; + } + } + } + ip = ipNext; + } + return result; +} +//------------------------------------------------------------------------------ + +// Called by Poly2ContainsPoly1() +int PointInPolygon (const IntPoint &pt, OutPt *op) +{ + //returns 0 if false, +1 if true, -1 if pt ON polygon boundary + int result = 0; + OutPt* startOp = op; + do + { + if (op->Next->Pt.Y == pt.Y) + { + if ((op->Next->Pt.X == pt.X) || (op->Pt.Y == pt.Y && + ((op->Next->Pt.X > pt.X) == (op->Pt.X < pt.X)))) return -1; + } + if ((op->Pt.Y < pt.Y) != (op->Next->Pt.Y < pt.Y)) + { + if (op->Pt.X >= pt.X) + { + if (op->Next->Pt.X > pt.X) result = 1 - result; + else + { + double d = (double)(op->Pt.X - pt.X) * (op->Next->Pt.Y - pt.Y) - (double)(op->Next->Pt.X - pt.X) * (op->Pt.Y - pt.Y); + if (!d) return -1; + if ((d > 0) == (op->Next->Pt.Y > op->Pt.Y)) result = 1 - result; + } + } else + { + if (op->Next->Pt.X > pt.X) + { + double d = (double)(op->Pt.X - pt.X) * (op->Next->Pt.Y - pt.Y) - (double)(op->Next->Pt.X - pt.X) * (op->Pt.Y - pt.Y); + if (!d) return -1; + if ((d > 0) == (op->Next->Pt.Y > op->Pt.Y)) result = 1 - result; + } + } + } + op = op->Next; + } while (startOp != op); + return result; +} +//------------------------------------------------------------------------------ + +// This is potentially very expensive! O(n^2)! +bool Poly2ContainsPoly1(OutPt *OutPt1, OutPt *OutPt2) +{ + PROFILE_FUNC(); + OutPt* op = OutPt1; + do + { + //nb: PointInPolygon returns 0 if false, +1 if true, -1 if pt on polygon + int res = PointInPolygon(op->Pt, OutPt2); + if (res >= 0) return res > 0; + op = op->Next; + } + while (op != OutPt1); + return true; +} +//---------------------------------------------------------------------- + +inline bool SlopesEqual(const cInt dx1, const cInt dy1, const cInt dx2, const cInt dy2, bool UseFullInt64Range) { + return (UseFullInt64Range) ? + // |dx1| < 2^63, |dx2| < 2^63 etc, + Int128::sign_determinant_2x2_filtered(dx1, dy1, dx2, dy2) == 0 : +// Int128::sign_determinant_2x2(dx1, dy1, dx2, dy2) == 0 : + // |dx1| < 2^31, |dx2| < 2^31 etc, + // therefore the following computation could be done with 64bit arithmetics. + dy1 * dx2 == dx1 * dy2; +} +inline bool SlopesEqual(const TEdge &e1, const TEdge &e2, bool UseFullInt64Range) + { return SlopesEqual(e1.Delta.X, e1.Delta.Y, e2.Delta.X, e2.Delta.Y, UseFullInt64Range); } +inline bool SlopesEqual(const IntPoint &pt1, const IntPoint &pt2, const IntPoint &pt3, bool UseFullInt64Range) + { return SlopesEqual(pt1.X-pt2.X, pt1.Y-pt2.Y, pt2.X-pt3.X, pt2.Y-pt3.Y, UseFullInt64Range); } +inline bool SlopesEqual(const IntPoint &pt1, const IntPoint &pt2, const IntPoint &pt3, const IntPoint &pt4, bool UseFullInt64Range) + { return SlopesEqual(pt1.X-pt2.X, pt1.Y-pt2.Y, pt3.X-pt4.X, pt3.Y-pt4.Y, UseFullInt64Range); } + +//------------------------------------------------------------------------------ + +inline bool IsHorizontal(TEdge &e) +{ + return e.Delta.Y == 0; +} +//------------------------------------------------------------------------------ + +inline double GetDx(const IntPoint &pt1, const IntPoint &pt2) +{ + return (pt1.Y == pt2.Y) ? + HORIZONTAL : (double)(pt2.X - pt1.X) / (pt2.Y - pt1.Y); +} +//--------------------------------------------------------------------------- + +inline cInt TopX(TEdge &edge, const cInt currentY) +{ + return (currentY == edge.Top.Y) ? + edge.Top.X : + edge.Bot.X + Round(edge.Dx *(currentY - edge.Bot.Y)); +} +//------------------------------------------------------------------------------ + +void IntersectPoint(TEdge &Edge1, TEdge &Edge2, IntPoint &ip) +{ +#ifdef use_xyz + ip.Z = 0; +#endif + + double b1, b2; + if (Edge1.Dx == Edge2.Dx) + { + ip.Y = Edge1.Curr.Y; + ip.X = TopX(Edge1, ip.Y); + return; + } + else if (Edge1.Delta.X == 0) + { + ip.X = Edge1.Bot.X; + if (IsHorizontal(Edge2)) + ip.Y = Edge2.Bot.Y; + else + { + b2 = Edge2.Bot.Y - (Edge2.Bot.X / Edge2.Dx); + ip.Y = Round(ip.X / Edge2.Dx + b2); + } + } + else if (Edge2.Delta.X == 0) + { + ip.X = Edge2.Bot.X; + if (IsHorizontal(Edge1)) + ip.Y = Edge1.Bot.Y; + else + { + b1 = Edge1.Bot.Y - (Edge1.Bot.X / Edge1.Dx); + ip.Y = Round(ip.X / Edge1.Dx + b1); + } + } + else + { + b1 = Edge1.Bot.X - Edge1.Bot.Y * Edge1.Dx; + b2 = Edge2.Bot.X - Edge2.Bot.Y * Edge2.Dx; + double q = (b2-b1) / (Edge1.Dx - Edge2.Dx); + ip.Y = Round(q); + ip.X = (std::fabs(Edge1.Dx) < std::fabs(Edge2.Dx)) ? + Round(Edge1.Dx * q + b1) : + Round(Edge2.Dx * q + b2); + } + + if (ip.Y < Edge1.Top.Y || ip.Y < Edge2.Top.Y) + { + if (Edge1.Top.Y > Edge2.Top.Y) + ip.Y = Edge1.Top.Y; + else + ip.Y = Edge2.Top.Y; + if (std::fabs(Edge1.Dx) < std::fabs(Edge2.Dx)) + ip.X = TopX(Edge1, ip.Y); + else + ip.X = TopX(Edge2, ip.Y); + } + //finally, don't allow 'ip' to be BELOW curr.Y (ie bottom of scanbeam) ... + if (ip.Y > Edge1.Curr.Y) + { + ip.Y = Edge1.Curr.Y; + //use the more vertical edge to derive X ... + if (std::fabs(Edge1.Dx) > std::fabs(Edge2.Dx)) + ip.X = TopX(Edge2, ip.Y); else + ip.X = TopX(Edge1, ip.Y); + } +} +//------------------------------------------------------------------------------ + +// Reverse a linked loop of points representing a closed polygon. +// This has a time complexity of O(n) +void ReversePolyPtLinks(OutPt *pp) +{ + if (!pp) return; + OutPt *pp1 = pp; + do { + OutPt *pp2 = pp1->Next; + pp1->Next = pp1->Prev; + pp1->Prev = pp2; + pp1 = pp2; + } while( pp1 != pp ); +} +//------------------------------------------------------------------------------ + +inline void InitEdge(TEdge* e, TEdge* eNext, TEdge* ePrev, const IntPoint& Pt) +{ + std::memset(e, 0, sizeof(TEdge)); + e->Next = eNext; + e->Prev = ePrev; + e->Curr = Pt; + e->OutIdx = Unassigned; +} +//------------------------------------------------------------------------------ + +void InitEdge2(TEdge& e, PolyType Pt) +{ + if (e.Curr.Y >= e.Next->Curr.Y) + { + e.Bot = e.Curr; + e.Top = e.Next->Curr; + } else + { + e.Top = e.Curr; + e.Bot = e.Next->Curr; + } + + e.Delta.X = (e.Top.X - e.Bot.X); + e.Delta.Y = (e.Top.Y - e.Bot.Y); + + if (e.Delta.Y == 0) e.Dx = HORIZONTAL; + else e.Dx = (double)(e.Delta.X) / e.Delta.Y; + + e.PolyTyp = Pt; +} +//------------------------------------------------------------------------------ + +// Called from ClipperBase::AddPathInternal() to remove collinear and duplicate points. +inline TEdge* RemoveEdge(TEdge* e) +{ + //removes e from double_linked_list (but without removing from memory) + e->Prev->Next = e->Next; + e->Next->Prev = e->Prev; + TEdge* result = e->Next; + e->Prev = 0; //flag as removed (see ClipperBase.Clear) + return result; +} +//------------------------------------------------------------------------------ + +inline void ReverseHorizontal(TEdge &e) +{ + //swap horizontal edges' Top and Bottom x's so they follow the natural + //progression of the bounds - ie so their xbots will align with the + //adjoining lower edge. [Helpful in the ProcessHorizontal() method.] + std::swap(e.Top.X, e.Bot.X); +#ifdef use_xyz + std::swap(e.Top.Z, e.Bot.Z); +#endif +} +//------------------------------------------------------------------------------ + +bool GetOverlapSegment(IntPoint pt1a, IntPoint pt1b, IntPoint pt2a, + IntPoint pt2b, IntPoint &pt1, IntPoint &pt2) +{ + //precondition: segments are Collinear. + if (std::abs(pt1a.X - pt1b.X) > std::abs(pt1a.Y - pt1b.Y)) + { + if (pt1a.X > pt1b.X) std::swap(pt1a, pt1b); + if (pt2a.X > pt2b.X) std::swap(pt2a, pt2b); + if (pt1a.X > pt2a.X) pt1 = pt1a; else pt1 = pt2a; + if (pt1b.X < pt2b.X) pt2 = pt1b; else pt2 = pt2b; + return pt1.X < pt2.X; + } else + { + if (pt1a.Y < pt1b.Y) std::swap(pt1a, pt1b); + if (pt2a.Y < pt2b.Y) std::swap(pt2a, pt2b); + if (pt1a.Y < pt2a.Y) pt1 = pt1a; else pt1 = pt2a; + if (pt1b.Y > pt2b.Y) pt2 = pt1b; else pt2 = pt2b; + return pt1.Y > pt2.Y; + } +} +//------------------------------------------------------------------------------ + +bool FirstIsBottomPt(const OutPt* btmPt1, const OutPt* btmPt2) +{ + OutPt *p = btmPt1->Prev; + while ((p->Pt == btmPt1->Pt) && (p != btmPt1)) p = p->Prev; + double dx1p = std::fabs(GetDx(btmPt1->Pt, p->Pt)); + p = btmPt1->Next; + while ((p->Pt == btmPt1->Pt) && (p != btmPt1)) p = p->Next; + double dx1n = std::fabs(GetDx(btmPt1->Pt, p->Pt)); + + p = btmPt2->Prev; + while ((p->Pt == btmPt2->Pt) && (p != btmPt2)) p = p->Prev; + double dx2p = std::fabs(GetDx(btmPt2->Pt, p->Pt)); + p = btmPt2->Next; + while ((p->Pt == btmPt2->Pt) && (p != btmPt2)) p = p->Next; + double dx2n = std::fabs(GetDx(btmPt2->Pt, p->Pt)); + return (dx1p >= dx2p && dx1p >= dx2n) || (dx1n >= dx2p && dx1n >= dx2n); +} +//------------------------------------------------------------------------------ + +// Called by GetLowermostRec() +OutPt* GetBottomPt(OutPt *pp) +{ + OutPt* dups = 0; + OutPt* p = pp->Next; + while (p != pp) + { + if (p->Pt.Y > pp->Pt.Y) + { + pp = p; + dups = 0; + } + else if (p->Pt.Y == pp->Pt.Y && p->Pt.X <= pp->Pt.X) + { + if (p->Pt.X < pp->Pt.X) + { + dups = 0; + pp = p; + } else + { + if (p->Next != pp && p->Prev != pp) dups = p; + } + } + p = p->Next; + } + if (dups) + { + //there appears to be at least 2 vertices at BottomPt so ... + while (dups != p) + { + if (!FirstIsBottomPt(p, dups)) pp = dups; + dups = dups->Next; + while (dups->Pt != pp->Pt) dups = dups->Next; + } + } + return pp; +} +//------------------------------------------------------------------------------ + +bool Pt2IsBetweenPt1AndPt3(const IntPoint &pt1, + const IntPoint &pt2, const IntPoint &pt3) +{ + if ((pt1 == pt3) || (pt1 == pt2) || (pt3 == pt2)) + return false; + else if (pt1.X != pt3.X) + return (pt2.X > pt1.X) == (pt2.X < pt3.X); + else + return (pt2.Y > pt1.Y) == (pt2.Y < pt3.Y); +} +//------------------------------------------------------------------------------ + +bool HorzSegmentsOverlap(cInt seg1a, cInt seg1b, cInt seg2a, cInt seg2b) +{ + if (seg1a > seg1b) std::swap(seg1a, seg1b); + if (seg2a > seg2b) std::swap(seg2a, seg2b); + return (seg1a < seg2b) && (seg2a < seg1b); +} + +//------------------------------------------------------------------------------ +// ClipperBase class methods ... +//------------------------------------------------------------------------------ + +// Called from ClipperBase::AddPath() to verify the scale of the input polygon coordinates. +inline void RangeTest(const IntPoint& Pt, bool& useFullRange) +{ + if (useFullRange) + { + if (Pt.X > hiRange || Pt.Y > hiRange || -Pt.X > hiRange || -Pt.Y > hiRange) + throw clipperException("Coordinate outside allowed range"); + } + else if (Pt.X > loRange|| Pt.Y > loRange || -Pt.X > loRange || -Pt.Y > loRange) + { + useFullRange = true; + RangeTest(Pt, useFullRange); + } +} +//------------------------------------------------------------------------------ + +// Called from ClipperBase::AddPath() to construct the Local Minima List. +// Find a local minimum edge on the path starting with E. +inline TEdge* FindNextLocMin(TEdge* E) +{ + for (;;) + { + while (E->Bot != E->Prev->Bot || E->Curr == E->Top) E = E->Next; + if (!IsHorizontal(*E) && !IsHorizontal(*E->Prev)) break; + while (IsHorizontal(*E->Prev)) E = E->Prev; + TEdge* E2 = E; + while (IsHorizontal(*E)) E = E->Next; + if (E->Top.Y == E->Prev->Bot.Y) continue; //ie just an intermediate horz. + if (E2->Prev->Bot.X < E->Bot.X) E = E2; + break; + } + return E; +} +//------------------------------------------------------------------------------ + +// Called from ClipperBase::AddPath(). +TEdge* ClipperBase::ProcessBound(TEdge* E, bool NextIsForward) +{ + TEdge *Result = E; + TEdge *Horz = 0; + + if (E->OutIdx == Skip) + { + //if edges still remain in the current bound beyond the skip edge then + //create another LocMin and call ProcessBound once more + if (NextIsForward) + { + while (E->Top.Y == E->Next->Bot.Y) E = E->Next; + //don't include top horizontals when parsing a bound a second time, + //they will be contained in the opposite bound ... + while (E != Result && IsHorizontal(*E)) E = E->Prev; + } + else + { + while (E->Top.Y == E->Prev->Bot.Y) E = E->Prev; + while (E != Result && IsHorizontal(*E)) E = E->Next; + } + + if (E == Result) + { + if (NextIsForward) Result = E->Next; + else Result = E->Prev; + } + else + { + //there are more edges in the bound beyond result starting with E + if (NextIsForward) + E = Result->Next; + else + E = Result->Prev; + LocalMinimum locMin; + locMin.Y = E->Bot.Y; + locMin.LeftBound = 0; + locMin.RightBound = E; + E->WindDelta = 0; + Result = ProcessBound(E, NextIsForward); + m_MinimaList.push_back(locMin); + } + return Result; + } + + TEdge *EStart; + + if (IsHorizontal(*E)) + { + //We need to be careful with open paths because this may not be a + //true local minima (ie E may be following a skip edge). + //Also, consecutive horz. edges may start heading left before going right. + if (NextIsForward) + EStart = E->Prev; + else + EStart = E->Next; + if (IsHorizontal(*EStart)) //ie an adjoining horizontal skip edge + { + if (EStart->Bot.X != E->Bot.X && EStart->Top.X != E->Bot.X) + ReverseHorizontal(*E); + } + else if (EStart->Bot.X != E->Bot.X) + ReverseHorizontal(*E); + } + + EStart = E; + if (NextIsForward) + { + while (Result->Top.Y == Result->Next->Bot.Y && Result->Next->OutIdx != Skip) + Result = Result->Next; + if (IsHorizontal(*Result) && Result->Next->OutIdx != Skip) + { + //nb: at the top of a bound, horizontals are added to the bound + //only when the preceding edge attaches to the horizontal's left vertex + //unless a Skip edge is encountered when that becomes the top divide + Horz = Result; + while (IsHorizontal(*Horz->Prev)) Horz = Horz->Prev; + if (Horz->Prev->Top.X > Result->Next->Top.X) Result = Horz->Prev; + } + while (E != Result) + { + E->NextInLML = E->Next; + if (IsHorizontal(*E) && E != EStart && + E->Bot.X != E->Prev->Top.X) ReverseHorizontal(*E); + E = E->Next; + } + if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Prev->Top.X) + ReverseHorizontal(*E); + Result = Result->Next; //move to the edge just beyond current bound + } else + { + while (Result->Top.Y == Result->Prev->Bot.Y && Result->Prev->OutIdx != Skip) + Result = Result->Prev; + if (IsHorizontal(*Result) && Result->Prev->OutIdx != Skip) + { + Horz = Result; + while (IsHorizontal(*Horz->Next)) Horz = Horz->Next; + if (Horz->Next->Top.X == Result->Prev->Top.X || + Horz->Next->Top.X > Result->Prev->Top.X) Result = Horz->Next; + } + + while (E != Result) + { + E->NextInLML = E->Prev; + if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Next->Top.X) + ReverseHorizontal(*E); + E = E->Prev; + } + if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Next->Top.X) + ReverseHorizontal(*E); + Result = Result->Prev; //move to the edge just beyond current bound + } + + return Result; +} +//------------------------------------------------------------------------------ + +bool ClipperBase::AddPath(const Path &pg, PolyType PolyTyp, bool Closed) +{ + PROFILE_FUNC(); + // Remove duplicate end point from a closed input path. + // Remove duplicate points from the end of the input path. + int highI = (int)pg.size() -1; + if (Closed) + while (highI > 0 && (pg[highI] == pg[0])) + --highI; + while (highI > 0 && (pg[highI] == pg[highI -1])) + --highI; + if ((Closed && highI < 2) || (!Closed && highI < 1)) + return false; + + // Allocate a new edge array. + std::vector edges(highI + 1); + // Fill in the edge array. + bool result = AddPathInternal(pg, highI, PolyTyp, Closed, edges.data()); + if (result) + // Success, remember the edge array. + m_edges.emplace_back(std::move(edges)); + return result; +} + +bool ClipperBase::AddPaths(const Paths &ppg, PolyType PolyTyp, bool Closed) +{ + PROFILE_FUNC(); + std::vector num_edges(ppg.size(), 0); + int num_edges_total = 0; + for (size_t i = 0; i < ppg.size(); ++ i) { + const Path &pg = ppg[i]; + // Remove duplicate end point from a closed input path. + // Remove duplicate points from the end of the input path. + int highI = (int)pg.size() -1; + if (Closed) + while (highI > 0 && (pg[highI] == pg[0])) + --highI; + while (highI > 0 && (pg[highI] == pg[highI -1])) + --highI; + if ((Closed && highI < 2) || (!Closed && highI < 1)) + highI = -1; + num_edges[i] = highI + 1; + num_edges_total += highI + 1; + } + if (num_edges_total == 0) + return false; + + // Allocate a new edge array. + std::vector edges(num_edges_total); + // Fill in the edge array. + bool result = false; + TEdge *p_edge = edges.data(); + for (Paths::size_type i = 0; i < ppg.size(); ++i) + if (num_edges[i]) { + bool res = AddPathInternal(ppg[i], num_edges[i] - 1, PolyTyp, Closed, p_edge); + if (res) { + p_edge += num_edges[i]; + result = true; + } + } + if (result) + // At least some edges were generated. Remember the edge array. + m_edges.emplace_back(std::move(edges)); + return result; +} + +bool ClipperBase::AddPathInternal(const Path &pg, int highI, PolyType PolyTyp, bool Closed, TEdge* edges) +{ + PROFILE_FUNC(); +#ifdef use_lines + if (!Closed && PolyTyp == ptClip) + throw clipperException("AddPath: Open paths must be subject."); +#else + if (!Closed) + throw clipperException("AddPath: Open paths have been disabled."); +#endif + + assert(highI >= 0 && highI < pg.size()); + + //1. Basic (first) edge initialization ... + try + { + edges[1].Curr = pg[1]; + RangeTest(pg[0], m_UseFullRange); + RangeTest(pg[highI], m_UseFullRange); + InitEdge(&edges[0], &edges[1], &edges[highI], pg[0]); + InitEdge(&edges[highI], &edges[0], &edges[highI-1], pg[highI]); + for (int i = highI - 1; i >= 1; --i) + { + RangeTest(pg[i], m_UseFullRange); + InitEdge(&edges[i], &edges[i+1], &edges[i-1], pg[i]); + } + } + catch(...) + { + throw; //range test fails + } + TEdge *eStart = &edges[0]; + + //2. Remove duplicate vertices, and (when closed) collinear edges ... + TEdge *E = eStart, *eLoopStop = eStart; + for (;;) + { + //nb: allows matching start and end points when not Closed ... + if (E->Curr == E->Next->Curr && (Closed || E->Next != eStart)) + { + if (E == E->Next) break; + if (E == eStart) eStart = E->Next; + E = RemoveEdge(E); + eLoopStop = E; + continue; + } + if (E->Prev == E->Next) + break; //only two vertices + else if (Closed && + SlopesEqual(E->Prev->Curr, E->Curr, E->Next->Curr, m_UseFullRange) && + (!m_PreserveCollinear || + !Pt2IsBetweenPt1AndPt3(E->Prev->Curr, E->Curr, E->Next->Curr))) + { + //Collinear edges are allowed for open paths but in closed paths + //the default is to merge adjacent collinear edges into a single edge. + //However, if the PreserveCollinear property is enabled, only overlapping + //collinear edges (ie spikes) will be removed from closed paths. + if (E == eStart) eStart = E->Next; + E = RemoveEdge(E); + E = E->Prev; + eLoopStop = E; + continue; + } + E = E->Next; + if ((E == eLoopStop) || (!Closed && E->Next == eStart)) break; + } + + if ((!Closed && (E == E->Next)) || (Closed && (E->Prev == E->Next))) + { + return false; + } + + if (!Closed) + { + m_HasOpenPaths = true; + eStart->Prev->OutIdx = Skip; + } + + //3. Do second stage of edge initialization ... + // IsFlat means all vertices have the same Y coordinate. + bool IsFlat = true; + E = eStart; + do + { + InitEdge2(*E, PolyTyp); + E = E->Next; + if (IsFlat && E->Curr.Y != eStart->Curr.Y) IsFlat = false; + } + while (E != eStart); + + //4. Finally, add edge bounds to LocalMinima list ... + + //Totally flat paths must be handled differently when adding them + //to LocalMinima list to avoid endless loops etc ... + if (IsFlat) + { + if (Closed) + { + return false; + } + E->Prev->OutIdx = Skip; + LocalMinimum locMin; + locMin.Y = E->Bot.Y; + locMin.LeftBound = 0; + locMin.RightBound = E; + locMin.RightBound->Side = esRight; + locMin.RightBound->WindDelta = 0; + for (;;) + { + if (E->Bot.X != E->Prev->Top.X) ReverseHorizontal(*E); + if (E->Next->OutIdx == Skip) break; + E->NextInLML = E->Next; + E = E->Next; + } + m_MinimaList.push_back(locMin); + return true; + } + + bool leftBoundIsForward; + TEdge* EMin = 0; + + //workaround to avoid an endless loop in the while loop below when + //open paths have matching start and end points ... + if (E->Prev->Bot == E->Prev->Top) E = E->Next; + + // Find local minima and store them into a Local Minima List. + // Multiple Local Minima could be created for a single path. + for (;;) + { + E = FindNextLocMin(E); + if (E == EMin) break; + else if (!EMin) EMin = E; + + //E and E.Prev now share a local minima (left aligned if horizontal). + //Compare their slopes to find which starts which bound ... + LocalMinimum locMin; + locMin.Y = E->Bot.Y; + if (E->Dx < E->Prev->Dx) + { + locMin.LeftBound = E->Prev; + locMin.RightBound = E; + leftBoundIsForward = false; //Q.nextInLML = Q.prev + } else + { + locMin.LeftBound = E; + locMin.RightBound = E->Prev; + leftBoundIsForward = true; //Q.nextInLML = Q.next + } + locMin.LeftBound->Side = esLeft; + locMin.RightBound->Side = esRight; + + if (!Closed) locMin.LeftBound->WindDelta = 0; + else if (locMin.LeftBound->Next == locMin.RightBound) + locMin.LeftBound->WindDelta = -1; + else locMin.LeftBound->WindDelta = 1; + locMin.RightBound->WindDelta = -locMin.LeftBound->WindDelta; + + E = ProcessBound(locMin.LeftBound, leftBoundIsForward); + if (E->OutIdx == Skip) E = ProcessBound(E, leftBoundIsForward); + + TEdge* E2 = ProcessBound(locMin.RightBound, !leftBoundIsForward); + if (E2->OutIdx == Skip) E2 = ProcessBound(E2, !leftBoundIsForward); + + if (locMin.LeftBound->OutIdx == Skip) + locMin.LeftBound = 0; + else if (locMin.RightBound->OutIdx == Skip) + locMin.RightBound = 0; + m_MinimaList.push_back(locMin); + if (!leftBoundIsForward) E = E2; + } + return true; +} +//------------------------------------------------------------------------------ + +void ClipperBase::Clear() +{ + PROFILE_FUNC(); + m_MinimaList.clear(); + m_edges.clear(); + m_UseFullRange = false; + m_HasOpenPaths = false; +} +//------------------------------------------------------------------------------ + +// Initialize the Local Minima List: +// Sort the LML entries, initialize the left / right bound edges of each Local Minima. +void ClipperBase::Reset() +{ + PROFILE_FUNC(); + if (m_MinimaList.empty()) return; //ie nothing to process + std::sort(m_MinimaList.begin(), m_MinimaList.end(), [](const LocalMinimum& lm1, const LocalMinimum& lm2){ return lm1.Y < lm2.Y; }); + + //reset all edges ... + for (LocalMinimum &lm : m_MinimaList) { + TEdge* e = lm.LeftBound; + if (e) + { + e->Curr = e->Bot; + e->Side = esLeft; + e->OutIdx = Unassigned; + } + + e = lm.RightBound; + if (e) + { + e->Curr = e->Bot; + e->Side = esRight; + e->OutIdx = Unassigned; + } + } +} +//------------------------------------------------------------------------------ + +// Get bounds of the edges referenced by the Local Minima List. +// Returns (0,0,0,0) for an empty rectangle. +IntRect ClipperBase::GetBounds() +{ + PROFILE_FUNC(); + IntRect result; + auto lm = m_MinimaList.begin(); + if (lm == m_MinimaList.end()) + { + result.left = result.top = result.right = result.bottom = 0; + return result; + } + result.left = lm->LeftBound->Bot.X; + result.top = lm->LeftBound->Bot.Y; + result.right = lm->LeftBound->Bot.X; + result.bottom = lm->LeftBound->Bot.Y; + while (lm != m_MinimaList.end()) + { + result.bottom = std::max(result.bottom, lm->LeftBound->Bot.Y); + TEdge* e = lm->LeftBound; + for (;;) { + TEdge* bottomE = e; + while (e->NextInLML) + { + if (e->Bot.X < result.left) result.left = e->Bot.X; + if (e->Bot.X > result.right) result.right = e->Bot.X; + e = e->NextInLML; + } + result.left = std::min(result.left, e->Bot.X); + result.right = std::max(result.right, e->Bot.X); + result.left = std::min(result.left, e->Top.X); + result.right = std::max(result.right, e->Top.X); + result.top = std::min(result.top, e->Top.Y); + if (bottomE == lm->LeftBound) e = lm->RightBound; + else break; + } + ++lm; + } + return result; +} + +//------------------------------------------------------------------------------ +// TClipper methods ... +//------------------------------------------------------------------------------ + +Clipper::Clipper(int initOptions) : + ClipperBase(), + m_OutPtsFree(nullptr), + m_OutPtsChunkSize(32), + m_OutPtsChunkLast(32), + m_ActiveEdges(nullptr), + m_SortedEdges(nullptr) +{ + m_ReverseOutput = ((initOptions & ioReverseSolution) != 0); + m_StrictSimple = ((initOptions & ioStrictlySimple) != 0); + m_PreserveCollinear = ((initOptions & ioPreserveCollinear) != 0); + m_HasOpenPaths = false; +#ifdef use_xyz + m_ZFill = 0; +#endif +} +//------------------------------------------------------------------------------ + +void Clipper::Reset() +{ + PROFILE_FUNC(); + ClipperBase::Reset(); + m_Scanbeam = std::priority_queue(); + m_Maxima.clear(); + m_ActiveEdges = 0; + m_SortedEdges = 0; + for (auto lm = m_MinimaList.rbegin(); lm != m_MinimaList.rend(); ++lm) + m_Scanbeam.push(lm->Y); +} + +//------------------------------------------------------------------------------ + +bool Clipper::Execute(ClipType clipType, Paths &solution, + PolyFillType subjFillType, PolyFillType clipFillType) +{ + PROFILE_FUNC(); + if (m_HasOpenPaths) + throw clipperException("Error: PolyTree struct is needed for open path clipping."); + solution.resize(0); + m_SubjFillType = subjFillType; + m_ClipFillType = clipFillType; + m_ClipType = clipType; + m_UsingPolyTree = false; + bool succeeded = ExecuteInternal(); + if (succeeded) BuildResult(solution); + DisposeAllOutRecs(); + return succeeded; +} +//------------------------------------------------------------------------------ + +bool Clipper::Execute(ClipType clipType, PolyTree& polytree, + PolyFillType subjFillType, PolyFillType clipFillType) +{ + PROFILE_FUNC(); + m_SubjFillType = subjFillType; + m_ClipFillType = clipFillType; + m_ClipType = clipType; + m_UsingPolyTree = true; + bool succeeded = ExecuteInternal(); + if (succeeded) BuildResult2(polytree); + DisposeAllOutRecs(); + return succeeded; +} +//------------------------------------------------------------------------------ + +bool Clipper::ExecuteInternal() +{ + PROFILE_FUNC(); + bool succeeded = true; + try { + PROFILE_BLOCK(Clipper_ExecuteInternal_Process); + Reset(); + if (m_MinimaList.empty()) return true; + cInt botY = m_Scanbeam.top(); + do { m_Scanbeam.pop(); } while (! m_Scanbeam.empty() && botY == m_Scanbeam.top()); + do { + InsertLocalMinimaIntoAEL(botY); + ProcessHorizontals(); + m_GhostJoins.clear(); + if (m_Scanbeam.empty()) break; + cInt topY = m_Scanbeam.top(); + do { m_Scanbeam.pop(); } while (! m_Scanbeam.empty() && topY == m_Scanbeam.top()); + succeeded = ProcessIntersections(topY); + if (!succeeded) break; + ProcessEdgesAtTopOfScanbeam(topY); + botY = topY; + } while (!m_Scanbeam.empty() || !m_MinimaList.empty()); + } + catch(...) + { + succeeded = false; + } + + if (succeeded) + { + PROFILE_BLOCK(Clipper_ExecuteInternal_Fix); + + //fix orientations ... + //FIXME Vojtech: Does it not invalidate the loop hierarchy maintained as OutRec::FirstLeft pointers? + //FIXME Vojtech: The area is calculated with floats, it may not be numerically stable! + { + PROFILE_BLOCK(Clipper_ExecuteInternal_Fix_orientations); + for (OutRec *outRec : m_PolyOuts) + if (outRec->Pts && !outRec->IsOpen && (outRec->IsHole ^ m_ReverseOutput) == (Area(*outRec) > 0)) + ReversePolyPtLinks(outRec->Pts); + } + + JoinCommonEdges(); + + //unfortunately FixupOutPolygon() must be done after JoinCommonEdges() + { + PROFILE_BLOCK(Clipper_ExecuteInternal_Fix_fixup); + for (OutRec *outRec : m_PolyOuts) + if (outRec->Pts) { + if (outRec->IsOpen) + // Removes duplicate points. + FixupOutPolyline(*outRec); + else + // Removes duplicate points and simplifies consecutive parallel edges by removing the middle vertex. + FixupOutPolygon(*outRec); + } + } + // For each polygon, search for exactly duplicate non-successive points. + // If such a point is found, the loop is split into two pieces. + // Search for the duplicate points is O(n^2)! + // http://www.angusj.com/delphi/clipper/documentation/Docs/Units/ClipperLib/Classes/Clipper/Properties/StrictlySimple.htm + if (m_StrictSimple) DoSimplePolygons(); + } + + m_Joins.clear(); + m_GhostJoins.clear(); + return succeeded; +} +//------------------------------------------------------------------------------ + +OutPt* Clipper::AllocateOutPt() +{ + OutPt *pt; + if (m_OutPtsFree) { + // Recycle some of the already released points. + pt = m_OutPtsFree; + m_OutPtsFree = pt->Next; + } else if (m_OutPtsChunkLast < m_OutPtsChunkSize) { + // Get a point from the last chunk. + pt = m_OutPts.back() + (m_OutPtsChunkLast ++); + } else { + // The last chunk is full. Allocate a new one. + m_OutPts.push_back(new OutPt[m_OutPtsChunkSize]); + m_OutPtsChunkLast = 1; + pt = m_OutPts.back(); + } + return pt; +} + +void Clipper::DisposeAllOutRecs() +{ + for (OutPt *pts : m_OutPts) + delete[] pts; + for (OutRec *rec : m_PolyOuts) + delete rec; + m_OutPts.clear(); + m_OutPtsFree = nullptr; + m_OutPtsChunkLast = m_OutPtsChunkSize; + m_PolyOuts.clear(); +} +//------------------------------------------------------------------------------ + +void Clipper::SetWindingCount(TEdge &edge) const +{ + TEdge *e = edge.PrevInAEL; + //find the edge of the same polytype that immediately preceeds 'edge' in AEL + while (e && ((e->PolyTyp != edge.PolyTyp) || (e->WindDelta == 0))) e = e->PrevInAEL; + if (!e) + { + edge.WindCnt = (edge.WindDelta == 0 ? 1 : edge.WindDelta); + edge.WindCnt2 = 0; + e = m_ActiveEdges; //ie get ready to calc WindCnt2 + } + else if (edge.WindDelta == 0 && m_ClipType != ctUnion) + { + edge.WindCnt = 1; + edge.WindCnt2 = e->WindCnt2; + e = e->NextInAEL; //ie get ready to calc WindCnt2 + } + else if (IsEvenOddFillType(edge)) + { + //EvenOdd filling ... + if (edge.WindDelta == 0) + { + //are we inside a subj polygon ... + bool Inside = true; + TEdge *e2 = e->PrevInAEL; + while (e2) + { + if (e2->PolyTyp == e->PolyTyp && e2->WindDelta != 0) + Inside = !Inside; + e2 = e2->PrevInAEL; + } + edge.WindCnt = (Inside ? 0 : 1); + } + else + { + edge.WindCnt = edge.WindDelta; + } + edge.WindCnt2 = e->WindCnt2; + e = e->NextInAEL; //ie get ready to calc WindCnt2 + } + else + { + //nonZero, Positive or Negative filling ... + if (e->WindCnt * e->WindDelta < 0) + { + //prev edge is 'decreasing' WindCount (WC) toward zero + //so we're outside the previous polygon ... + if (std::abs(e->WindCnt) > 1) + { + //outside prev poly but still inside another. + //when reversing direction of prev poly use the same WC + if (e->WindDelta * edge.WindDelta < 0) edge.WindCnt = e->WindCnt; + //otherwise continue to 'decrease' WC ... + else edge.WindCnt = e->WindCnt + edge.WindDelta; + } + else + //now outside all polys of same polytype so set own WC ... + edge.WindCnt = (edge.WindDelta == 0 ? 1 : edge.WindDelta); + } else + { + //prev edge is 'increasing' WindCount (WC) away from zero + //so we're inside the previous polygon ... + if (edge.WindDelta == 0) + edge.WindCnt = (e->WindCnt < 0 ? e->WindCnt - 1 : e->WindCnt + 1); + //if wind direction is reversing prev then use same WC + else if (e->WindDelta * edge.WindDelta < 0) edge.WindCnt = e->WindCnt; + //otherwise add to WC ... + else edge.WindCnt = e->WindCnt + edge.WindDelta; + } + edge.WindCnt2 = e->WindCnt2; + e = e->NextInAEL; //ie get ready to calc WindCnt2 + } + + //update WindCnt2 ... + if (IsEvenOddAltFillType(edge)) + { + //EvenOdd filling ... + while (e != &edge) + { + if (e->WindDelta != 0) + edge.WindCnt2 = (edge.WindCnt2 == 0 ? 1 : 0); + e = e->NextInAEL; + } + } else + { + //nonZero, Positive or Negative filling ... + while ( e != &edge ) + { + edge.WindCnt2 += e->WindDelta; + e = e->NextInAEL; + } + } +} +//------------------------------------------------------------------------------ + +bool Clipper::IsContributing(const TEdge& edge) const +{ + PolyFillType pft, pft2; + if (edge.PolyTyp == ptSubject) + { + pft = m_SubjFillType; + pft2 = m_ClipFillType; + } else + { + pft = m_ClipFillType; + pft2 = m_SubjFillType; + } + + switch(pft) + { + case pftEvenOdd: + //return false if a subj line has been flagged as inside a subj polygon + if (edge.WindDelta == 0 && edge.WindCnt != 1) return false; + break; + case pftNonZero: + if (std::abs(edge.WindCnt) != 1) return false; + break; + case pftPositive: + if (edge.WindCnt != 1) return false; + break; + default: //pftNegative + if (edge.WindCnt != -1) return false; + } + + switch(m_ClipType) + { + case ctIntersection: + switch(pft2) + { + case pftEvenOdd: + case pftNonZero: + return (edge.WindCnt2 != 0); + case pftPositive: + return (edge.WindCnt2 > 0); + default: + return (edge.WindCnt2 < 0); + } + break; + case ctUnion: + switch(pft2) + { + case pftEvenOdd: + case pftNonZero: + return (edge.WindCnt2 == 0); + case pftPositive: + return (edge.WindCnt2 <= 0); + default: + return (edge.WindCnt2 >= 0); + } + break; + case ctDifference: + if (edge.PolyTyp == ptSubject) + switch(pft2) + { + case pftEvenOdd: + case pftNonZero: + return (edge.WindCnt2 == 0); + case pftPositive: + return (edge.WindCnt2 <= 0); + default: + return (edge.WindCnt2 >= 0); + } + else + switch(pft2) + { + case pftEvenOdd: + case pftNonZero: + return (edge.WindCnt2 != 0); + case pftPositive: + return (edge.WindCnt2 > 0); + default: + return (edge.WindCnt2 < 0); + } + break; + case ctXor: + if (edge.WindDelta == 0) //XOr always contributing unless open + switch(pft2) + { + case pftEvenOdd: + case pftNonZero: + return (edge.WindCnt2 == 0); + case pftPositive: + return (edge.WindCnt2 <= 0); + default: + return (edge.WindCnt2 >= 0); + } + else + return true; + break; + default: + return true; + } +} +//------------------------------------------------------------------------------ + +// Called from Clipper::InsertLocalMinimaIntoAEL() and Clipper::IntersectEdges(). +OutPt* Clipper::AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &Pt) +{ + PROFILE_FUNC(); + OutPt* result; + TEdge *e, *prevE; + if (IsHorizontal(*e2) || ( e1->Dx > e2->Dx )) + { + result = AddOutPt(e1, Pt); + e2->OutIdx = e1->OutIdx; + e1->Side = esLeft; + e2->Side = esRight; + e = e1; + if (e->PrevInAEL == e2) + prevE = e2->PrevInAEL; + else + prevE = e->PrevInAEL; + } else + { + result = AddOutPt(e2, Pt); + e1->OutIdx = e2->OutIdx; + e1->Side = esRight; + e2->Side = esLeft; + e = e2; + if (e->PrevInAEL == e1) + prevE = e1->PrevInAEL; + else + prevE = e->PrevInAEL; + } + + if (prevE && prevE->OutIdx >= 0 && + (TopX(*prevE, Pt.Y) == TopX(*e, Pt.Y)) && + SlopesEqual(*e, *prevE, m_UseFullRange) && + (e->WindDelta != 0) && (prevE->WindDelta != 0)) + { + OutPt* outPt = AddOutPt(prevE, Pt); + m_Joins.emplace_back(Join(result, outPt, e->Top)); + } + return result; +} +//------------------------------------------------------------------------------ + +void Clipper::AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &Pt) +{ + AddOutPt( e1, Pt ); + if (e2->WindDelta == 0) AddOutPt(e2, Pt); + if( e1->OutIdx == e2->OutIdx ) + { + e1->OutIdx = Unassigned; + e2->OutIdx = Unassigned; + } + else if (e1->OutIdx < e2->OutIdx) + AppendPolygon(e1, e2); + else + AppendPolygon(e2, e1); +} +//------------------------------------------------------------------------------ + +void Clipper::AddEdgeToSEL(TEdge *edge) +{ + //SEL pointers in PEdge are reused to build a list of horizontal edges. + //However, we don't need to worry about order with horizontal edge processing. + if( !m_SortedEdges ) + { + m_SortedEdges = edge; + edge->PrevInSEL = 0; + edge->NextInSEL = 0; + } + else + { + edge->NextInSEL = m_SortedEdges; + edge->PrevInSEL = 0; + m_SortedEdges->PrevInSEL = edge; + m_SortedEdges = edge; + } +} +//------------------------------------------------------------------------------ + +void Clipper::CopyAELToSEL() +{ + TEdge* e = m_ActiveEdges; + m_SortedEdges = e; + while ( e ) + { + e->PrevInSEL = e->PrevInAEL; + e->NextInSEL = e->NextInAEL; + e = e->NextInAEL; + } +} + +//------------------------------------------------------------------------------ + +// Called from Clipper::ExecuteInternal() +void Clipper::InsertLocalMinimaIntoAEL(const cInt botY) +{ + PROFILE_FUNC(); + while (!m_MinimaList.empty() && m_MinimaList.back().Y == botY) + { + TEdge* lb = m_MinimaList.back().LeftBound; + TEdge* rb = m_MinimaList.back().RightBound; + m_MinimaList.pop_back(); + + OutPt *Op1 = 0; + if (!lb) + { + //nb: don't insert LB into either AEL or SEL + InsertEdgeIntoAEL(rb, 0); + SetWindingCount(*rb); + if (IsContributing(*rb)) + Op1 = AddOutPt(rb, rb->Bot); + } + else if (!rb) + { + InsertEdgeIntoAEL(lb, 0); + SetWindingCount(*lb); + if (IsContributing(*lb)) + Op1 = AddOutPt(lb, lb->Bot); + m_Scanbeam.push(lb->Top.Y); + } + else + { + InsertEdgeIntoAEL(lb, 0); + InsertEdgeIntoAEL(rb, lb); + SetWindingCount( *lb ); + rb->WindCnt = lb->WindCnt; + rb->WindCnt2 = lb->WindCnt2; + if (IsContributing(*lb)) + Op1 = AddLocalMinPoly(lb, rb, lb->Bot); + m_Scanbeam.push(lb->Top.Y); + } + + if (rb) + { + if(IsHorizontal(*rb)) AddEdgeToSEL(rb); + else m_Scanbeam.push(rb->Top.Y); + } + + if (!lb || !rb) continue; + + //if any output polygons share an edge, they'll need joining later ... + if (Op1 && IsHorizontal(*rb) && + m_GhostJoins.size() > 0 && (rb->WindDelta != 0)) + { + for (Join &jr : m_GhostJoins) + //if the horizontal Rb and a 'ghost' horizontal overlap, then convert + //the 'ghost' join to a real join ready for later ... + if (HorzSegmentsOverlap(jr.OutPt1->Pt.X, jr.OffPt.X, rb->Bot.X, rb->Top.X)) + m_Joins.emplace_back(Join(jr.OutPt1, Op1, jr.OffPt)); + } + + if (lb->OutIdx >= 0 && lb->PrevInAEL && + lb->PrevInAEL->Curr.X == lb->Bot.X && + lb->PrevInAEL->OutIdx >= 0 && + SlopesEqual(*lb->PrevInAEL, *lb, m_UseFullRange) && + (lb->WindDelta != 0) && (lb->PrevInAEL->WindDelta != 0)) + { + OutPt *Op2 = AddOutPt(lb->PrevInAEL, lb->Bot); + m_Joins.emplace_back(Join(Op1, Op2, lb->Top)); + } + + if(lb->NextInAEL != rb) + { + + if (rb->OutIdx >= 0 && rb->PrevInAEL->OutIdx >= 0 && + SlopesEqual(*rb->PrevInAEL, *rb, m_UseFullRange) && + (rb->WindDelta != 0) && (rb->PrevInAEL->WindDelta != 0)) + { + OutPt *Op2 = AddOutPt(rb->PrevInAEL, rb->Bot); + m_Joins.emplace_back(Join(Op1, Op2, rb->Top)); + } + + TEdge* e = lb->NextInAEL; + if (e) + { + while( e != rb ) + { + //nb: For calculating winding counts etc, IntersectEdges() assumes + //that param1 will be to the Right of param2 ABOVE the intersection ... + IntersectEdges(rb , e , lb->Curr); //order important here + e = e->NextInAEL; + } + } + } + + } +} +//------------------------------------------------------------------------------ + +void Clipper::DeleteFromAEL(TEdge *e) +{ + TEdge* AelPrev = e->PrevInAEL; + TEdge* AelNext = e->NextInAEL; + if( !AelPrev && !AelNext && (e != m_ActiveEdges) ) return; //already deleted + if( AelPrev ) AelPrev->NextInAEL = AelNext; + else m_ActiveEdges = AelNext; + if( AelNext ) AelNext->PrevInAEL = AelPrev; + e->NextInAEL = 0; + e->PrevInAEL = 0; +} +//------------------------------------------------------------------------------ + +void Clipper::DeleteFromSEL(TEdge *e) +{ + TEdge* SelPrev = e->PrevInSEL; + TEdge* SelNext = e->NextInSEL; + if( !SelPrev && !SelNext && (e != m_SortedEdges) ) return; //already deleted + if( SelPrev ) SelPrev->NextInSEL = SelNext; + else m_SortedEdges = SelNext; + if( SelNext ) SelNext->PrevInSEL = SelPrev; + e->NextInSEL = 0; + e->PrevInSEL = 0; +} +//------------------------------------------------------------------------------ + +#ifdef use_xyz +void Clipper::SetZ(IntPoint& pt, TEdge& e1, TEdge& e2) +{ + if (pt.Z != 0 || !m_ZFill) return; + else if (pt == e1.Bot) pt.Z = e1.Bot.Z; + else if (pt == e1.Top) pt.Z = e1.Top.Z; + else if (pt == e2.Bot) pt.Z = e2.Bot.Z; + else if (pt == e2.Top) pt.Z = e2.Top.Z; + else (*m_ZFill)(e1.Bot, e1.Top, e2.Bot, e2.Top, pt); +} +//------------------------------------------------------------------------------ +#endif + +void Clipper::IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &Pt) +{ + bool e1Contributing = ( e1->OutIdx >= 0 ); + bool e2Contributing = ( e2->OutIdx >= 0 ); + +#ifdef use_xyz + SetZ(Pt, *e1, *e2); +#endif + +#ifdef use_lines + //if either edge is on an OPEN path ... + if (e1->WindDelta == 0 || e2->WindDelta == 0) + { + //ignore subject-subject open path intersections UNLESS they + //are both open paths, AND they are both 'contributing maximas' ... + if (e1->WindDelta == 0 && e2->WindDelta == 0) return; + + //if intersecting a subj line with a subj poly ... + else if (e1->PolyTyp == e2->PolyTyp && + e1->WindDelta != e2->WindDelta && m_ClipType == ctUnion) + { + if (e1->WindDelta == 0) + { + if (e2Contributing) + { + AddOutPt(e1, Pt); + if (e1Contributing) e1->OutIdx = Unassigned; + } + } + else + { + if (e1Contributing) + { + AddOutPt(e2, Pt); + if (e2Contributing) e2->OutIdx = Unassigned; + } + } + } + else if (e1->PolyTyp != e2->PolyTyp) + { + //toggle subj open path OutIdx on/off when Abs(clip.WndCnt) == 1 ... + if ((e1->WindDelta == 0) && std::abs(e2->WindCnt) == 1 && + (m_ClipType != ctUnion || e2->WindCnt2 == 0)) + { + AddOutPt(e1, Pt); + if (e1Contributing) e1->OutIdx = Unassigned; + } + else if ((e2->WindDelta == 0) && (std::abs(e1->WindCnt) == 1) && + (m_ClipType != ctUnion || e1->WindCnt2 == 0)) + { + AddOutPt(e2, Pt); + if (e2Contributing) e2->OutIdx = Unassigned; + } + } + return; + } +#endif + + //update winding counts... + //assumes that e1 will be to the Right of e2 ABOVE the intersection + if ( e1->PolyTyp == e2->PolyTyp ) + { + if ( IsEvenOddFillType( *e1) ) + { + int oldE1WindCnt = e1->WindCnt; + e1->WindCnt = e2->WindCnt; + e2->WindCnt = oldE1WindCnt; + } else + { + if (e1->WindCnt + e2->WindDelta == 0 ) e1->WindCnt = -e1->WindCnt; + else e1->WindCnt += e2->WindDelta; + if ( e2->WindCnt - e1->WindDelta == 0 ) e2->WindCnt = -e2->WindCnt; + else e2->WindCnt -= e1->WindDelta; + } + } else + { + if (!IsEvenOddFillType(*e2)) e1->WindCnt2 += e2->WindDelta; + else e1->WindCnt2 = ( e1->WindCnt2 == 0 ) ? 1 : 0; + if (!IsEvenOddFillType(*e1)) e2->WindCnt2 -= e1->WindDelta; + else e2->WindCnt2 = ( e2->WindCnt2 == 0 ) ? 1 : 0; + } + + PolyFillType e1FillType, e2FillType, e1FillType2, e2FillType2; + if (e1->PolyTyp == ptSubject) + { + e1FillType = m_SubjFillType; + e1FillType2 = m_ClipFillType; + } else + { + e1FillType = m_ClipFillType; + e1FillType2 = m_SubjFillType; + } + if (e2->PolyTyp == ptSubject) + { + e2FillType = m_SubjFillType; + e2FillType2 = m_ClipFillType; + } else + { + e2FillType = m_ClipFillType; + e2FillType2 = m_SubjFillType; + } + + cInt e1Wc, e2Wc; + switch (e1FillType) + { + case pftPositive: e1Wc = e1->WindCnt; break; + case pftNegative: e1Wc = -e1->WindCnt; break; + default: e1Wc = std::abs(e1->WindCnt); + } + switch(e2FillType) + { + case pftPositive: e2Wc = e2->WindCnt; break; + case pftNegative: e2Wc = -e2->WindCnt; break; + default: e2Wc = std::abs(e2->WindCnt); + } + + if ( e1Contributing && e2Contributing ) + { + if ((e1Wc != 0 && e1Wc != 1) || (e2Wc != 0 && e2Wc != 1) || + (e1->PolyTyp != e2->PolyTyp && m_ClipType != ctXor) ) + { + AddLocalMaxPoly(e1, e2, Pt); + } + else + { + AddOutPt(e1, Pt); + AddOutPt(e2, Pt); + std::swap(e1->Side, e2->Side); + std::swap(e1->OutIdx, e2->OutIdx); + } + } + else if ( e1Contributing ) + { + if (e2Wc == 0 || e2Wc == 1) + { + AddOutPt(e1, Pt); + std::swap(e1->Side, e2->Side); + std::swap(e1->OutIdx, e2->OutIdx); + } + } + else if ( e2Contributing ) + { + if (e1Wc == 0 || e1Wc == 1) + { + AddOutPt(e2, Pt); + std::swap(e1->Side, e2->Side); + std::swap(e1->OutIdx, e2->OutIdx); + } + } + else if ( (e1Wc == 0 || e1Wc == 1) && (e2Wc == 0 || e2Wc == 1)) + { + //neither edge is currently contributing ... + + cInt e1Wc2, e2Wc2; + switch (e1FillType2) + { + case pftPositive: e1Wc2 = e1->WindCnt2; break; + case pftNegative : e1Wc2 = -e1->WindCnt2; break; + default: e1Wc2 = std::abs(e1->WindCnt2); + } + switch (e2FillType2) + { + case pftPositive: e2Wc2 = e2->WindCnt2; break; + case pftNegative: e2Wc2 = -e2->WindCnt2; break; + default: e2Wc2 = std::abs(e2->WindCnt2); + } + + if (e1->PolyTyp != e2->PolyTyp) + { + AddLocalMinPoly(e1, e2, Pt); + } + else if (e1Wc == 1 && e2Wc == 1) + switch( m_ClipType ) { + case ctIntersection: + if (e1Wc2 > 0 && e2Wc2 > 0) + AddLocalMinPoly(e1, e2, Pt); + break; + case ctUnion: + if ( e1Wc2 <= 0 && e2Wc2 <= 0 ) + AddLocalMinPoly(e1, e2, Pt); + break; + case ctDifference: + if (((e1->PolyTyp == ptClip) && (e1Wc2 > 0) && (e2Wc2 > 0)) || + ((e1->PolyTyp == ptSubject) && (e1Wc2 <= 0) && (e2Wc2 <= 0))) + AddLocalMinPoly(e1, e2, Pt); + break; + case ctXor: + AddLocalMinPoly(e1, e2, Pt); + } + else + std::swap(e1->Side, e2->Side); + } +} +//------------------------------------------------------------------------------ + +void Clipper::SetHoleState(TEdge *e, OutRec *outrec) const +{ + bool IsHole = false; + TEdge *e2 = e->PrevInAEL; + while (e2) + { + if (e2->OutIdx >= 0 && e2->WindDelta != 0) + { + IsHole = !IsHole; + if (! outrec->FirstLeft) + outrec->FirstLeft = m_PolyOuts[e2->OutIdx]; + } + e2 = e2->PrevInAEL; + } + if (IsHole) outrec->IsHole = true; +} +//------------------------------------------------------------------------------ + +OutRec* GetLowermostRec(OutRec *outRec1, OutRec *outRec2) +{ + //work out which polygon fragment has the correct hole state ... + if (!outRec1->BottomPt) + outRec1->BottomPt = GetBottomPt(outRec1->Pts); + if (!outRec2->BottomPt) + outRec2->BottomPt = GetBottomPt(outRec2->Pts); + OutPt *OutPt1 = outRec1->BottomPt; + OutPt *OutPt2 = outRec2->BottomPt; + if (OutPt1->Pt.Y > OutPt2->Pt.Y) return outRec1; + else if (OutPt1->Pt.Y < OutPt2->Pt.Y) return outRec2; + else if (OutPt1->Pt.X < OutPt2->Pt.X) return outRec1; + else if (OutPt1->Pt.X > OutPt2->Pt.X) return outRec2; + else if (OutPt1->Next == OutPt1) return outRec2; + else if (OutPt2->Next == OutPt2) return outRec1; + else if (FirstIsBottomPt(OutPt1, OutPt2)) return outRec1; + else return outRec2; +} +//------------------------------------------------------------------------------ + +bool Param1RightOfParam2(OutRec* outRec1, OutRec* outRec2) +{ + do + { + outRec1 = outRec1->FirstLeft; + if (outRec1 == outRec2) return true; + } while (outRec1); + return false; +} +//------------------------------------------------------------------------------ + +OutRec* Clipper::GetOutRec(int Idx) +{ + OutRec* outrec = m_PolyOuts[Idx]; + while (outrec != m_PolyOuts[outrec->Idx]) + outrec = m_PolyOuts[outrec->Idx]; + return outrec; +} +//------------------------------------------------------------------------------ + +void Clipper::AppendPolygon(TEdge *e1, TEdge *e2) const +{ + //get the start and ends of both output polygons ... + OutRec *outRec1 = m_PolyOuts[e1->OutIdx]; + OutRec *outRec2 = m_PolyOuts[e2->OutIdx]; + + OutRec *holeStateRec; + if (Param1RightOfParam2(outRec1, outRec2)) + holeStateRec = outRec2; + else if (Param1RightOfParam2(outRec2, outRec1)) + holeStateRec = outRec1; + else + holeStateRec = GetLowermostRec(outRec1, outRec2); + + //get the start and ends of both output polygons and + //join e2 poly onto e1 poly and delete pointers to e2 ... + + OutPt* p1_lft = outRec1->Pts; + OutPt* p1_rt = p1_lft->Prev; + OutPt* p2_lft = outRec2->Pts; + OutPt* p2_rt = p2_lft->Prev; + + EdgeSide Side; + //join e2 poly onto e1 poly and delete pointers to e2 ... + if( e1->Side == esLeft ) + { + if( e2->Side == esLeft ) + { + //z y x a b c + ReversePolyPtLinks(p2_lft); + p2_lft->Next = p1_lft; + p1_lft->Prev = p2_lft; + p1_rt->Next = p2_rt; + p2_rt->Prev = p1_rt; + outRec1->Pts = p2_rt; + } else + { + //x y z a b c + p2_rt->Next = p1_lft; + p1_lft->Prev = p2_rt; + p2_lft->Prev = p1_rt; + p1_rt->Next = p2_lft; + outRec1->Pts = p2_lft; + } + Side = esLeft; + } else + { + if( e2->Side == esRight ) + { + //a b c z y x + ReversePolyPtLinks(p2_lft); + p1_rt->Next = p2_rt; + p2_rt->Prev = p1_rt; + p2_lft->Next = p1_lft; + p1_lft->Prev = p2_lft; + } else + { + //a b c x y z + p1_rt->Next = p2_lft; + p2_lft->Prev = p1_rt; + p1_lft->Prev = p2_rt; + p2_rt->Next = p1_lft; + } + Side = esRight; + } + + outRec1->BottomPt = 0; + if (holeStateRec == outRec2) + { + if (outRec2->FirstLeft != outRec1) + outRec1->FirstLeft = outRec2->FirstLeft; + outRec1->IsHole = outRec2->IsHole; + } + outRec2->Pts = 0; + outRec2->BottomPt = 0; + outRec2->FirstLeft = outRec1; + + int OKIdx = e1->OutIdx; + int ObsoleteIdx = e2->OutIdx; + + e1->OutIdx = Unassigned; //nb: safe because we only get here via AddLocalMaxPoly + e2->OutIdx = Unassigned; + + TEdge* e = m_ActiveEdges; + while( e ) + { + if( e->OutIdx == ObsoleteIdx ) + { + e->OutIdx = OKIdx; + e->Side = Side; + break; + } + e = e->NextInAEL; + } + + outRec2->Idx = outRec1->Idx; +} +//------------------------------------------------------------------------------ + +OutRec* Clipper::CreateOutRec() +{ + OutRec* result = new OutRec; + result->IsHole = false; + result->IsOpen = false; + result->FirstLeft = 0; + result->Pts = 0; + result->BottomPt = 0; + result->PolyNd = 0; + m_PolyOuts.push_back(result); + result->Idx = (int)m_PolyOuts.size()-1; + return result; +} +//------------------------------------------------------------------------------ + +OutPt* Clipper::AddOutPt(TEdge *e, const IntPoint &pt) +{ + if( e->OutIdx < 0 ) + { + OutRec *outRec = CreateOutRec(); + outRec->IsOpen = (e->WindDelta == 0); + OutPt* newOp = this->AllocateOutPt(); + outRec->Pts = newOp; + newOp->Idx = outRec->Idx; + newOp->Pt = pt; + newOp->Next = newOp; + newOp->Prev = newOp; + if (!outRec->IsOpen) + SetHoleState(e, outRec); + e->OutIdx = outRec->Idx; + return newOp; + } else + { + OutRec *outRec = m_PolyOuts[e->OutIdx]; + //OutRec.Pts is the 'Left-most' point & OutRec.Pts.Prev is the 'Right-most' + OutPt* op = outRec->Pts; + + bool ToFront = (e->Side == esLeft); + if (ToFront && (pt == op->Pt)) return op; + else if (!ToFront && (pt == op->Prev->Pt)) return op->Prev; + + OutPt* newOp = this->AllocateOutPt(); + newOp->Idx = outRec->Idx; + newOp->Pt = pt; + newOp->Next = op; + newOp->Prev = op->Prev; + newOp->Prev->Next = newOp; + op->Prev = newOp; + if (ToFront) outRec->Pts = newOp; + return newOp; + } +} +//------------------------------------------------------------------------------ + +OutPt* Clipper::GetLastOutPt(TEdge *e) +{ + OutRec *outRec = m_PolyOuts[e->OutIdx]; + if (e->Side == esLeft) + return outRec->Pts; + else + return outRec->Pts->Prev; +} +//------------------------------------------------------------------------------ + +void Clipper::ProcessHorizontals() +{ + PROFILE_FUNC(); + TEdge* horzEdge = m_SortedEdges; + while(horzEdge) + { + DeleteFromSEL(horzEdge); + ProcessHorizontal(horzEdge); + horzEdge = m_SortedEdges; + } +} +//------------------------------------------------------------------------------ + +inline bool IsMaxima(TEdge *e, const cInt Y) +{ + return e && e->Top.Y == Y && !e->NextInLML; +} +//------------------------------------------------------------------------------ + +inline bool IsIntermediate(TEdge *e, const cInt Y) +{ + return e->Top.Y == Y && e->NextInLML; +} +//------------------------------------------------------------------------------ + +inline TEdge *GetMaximaPair(TEdge *e) +{ + TEdge* result = 0; + if ((e->Next->Top == e->Top) && !e->Next->NextInLML) + result = e->Next; + else if ((e->Prev->Top == e->Top) && !e->Prev->NextInLML) + result = e->Prev; + + if (result && (result->OutIdx == Skip || + //result is false if both NextInAEL & PrevInAEL are nil & not horizontal ... + (result->NextInAEL == result->PrevInAEL && !IsHorizontal(*result)))) + return 0; + return result; +} +//------------------------------------------------------------------------------ + +void Clipper::SwapPositionsInAEL(TEdge *Edge1, TEdge *Edge2) +{ + //check that one or other edge hasn't already been removed from AEL ... + if (Edge1->NextInAEL == Edge1->PrevInAEL || + Edge2->NextInAEL == Edge2->PrevInAEL) return; + + if( Edge1->NextInAEL == Edge2 ) + { + TEdge* Next = Edge2->NextInAEL; + if( Next ) Next->PrevInAEL = Edge1; + TEdge* Prev = Edge1->PrevInAEL; + if( Prev ) Prev->NextInAEL = Edge2; + Edge2->PrevInAEL = Prev; + Edge2->NextInAEL = Edge1; + Edge1->PrevInAEL = Edge2; + Edge1->NextInAEL = Next; + } + else if( Edge2->NextInAEL == Edge1 ) + { + TEdge* Next = Edge1->NextInAEL; + if( Next ) Next->PrevInAEL = Edge2; + TEdge* Prev = Edge2->PrevInAEL; + if( Prev ) Prev->NextInAEL = Edge1; + Edge1->PrevInAEL = Prev; + Edge1->NextInAEL = Edge2; + Edge2->PrevInAEL = Edge1; + Edge2->NextInAEL = Next; + } + else + { + TEdge* Next = Edge1->NextInAEL; + TEdge* Prev = Edge1->PrevInAEL; + Edge1->NextInAEL = Edge2->NextInAEL; + if( Edge1->NextInAEL ) Edge1->NextInAEL->PrevInAEL = Edge1; + Edge1->PrevInAEL = Edge2->PrevInAEL; + if( Edge1->PrevInAEL ) Edge1->PrevInAEL->NextInAEL = Edge1; + Edge2->NextInAEL = Next; + if( Edge2->NextInAEL ) Edge2->NextInAEL->PrevInAEL = Edge2; + Edge2->PrevInAEL = Prev; + if( Edge2->PrevInAEL ) Edge2->PrevInAEL->NextInAEL = Edge2; + } + + if( !Edge1->PrevInAEL ) m_ActiveEdges = Edge1; + else if( !Edge2->PrevInAEL ) m_ActiveEdges = Edge2; +} +//------------------------------------------------------------------------------ + +void Clipper::SwapPositionsInSEL(TEdge *Edge1, TEdge *Edge2) +{ + if( !( Edge1->NextInSEL ) && !( Edge1->PrevInSEL ) ) return; + if( !( Edge2->NextInSEL ) && !( Edge2->PrevInSEL ) ) return; + + if( Edge1->NextInSEL == Edge2 ) + { + TEdge* Next = Edge2->NextInSEL; + if( Next ) Next->PrevInSEL = Edge1; + TEdge* Prev = Edge1->PrevInSEL; + if( Prev ) Prev->NextInSEL = Edge2; + Edge2->PrevInSEL = Prev; + Edge2->NextInSEL = Edge1; + Edge1->PrevInSEL = Edge2; + Edge1->NextInSEL = Next; + } + else if( Edge2->NextInSEL == Edge1 ) + { + TEdge* Next = Edge1->NextInSEL; + if( Next ) Next->PrevInSEL = Edge2; + TEdge* Prev = Edge2->PrevInSEL; + if( Prev ) Prev->NextInSEL = Edge1; + Edge1->PrevInSEL = Prev; + Edge1->NextInSEL = Edge2; + Edge2->PrevInSEL = Edge1; + Edge2->NextInSEL = Next; + } + else + { + TEdge* Next = Edge1->NextInSEL; + TEdge* Prev = Edge1->PrevInSEL; + Edge1->NextInSEL = Edge2->NextInSEL; + if( Edge1->NextInSEL ) Edge1->NextInSEL->PrevInSEL = Edge1; + Edge1->PrevInSEL = Edge2->PrevInSEL; + if( Edge1->PrevInSEL ) Edge1->PrevInSEL->NextInSEL = Edge1; + Edge2->NextInSEL = Next; + if( Edge2->NextInSEL ) Edge2->NextInSEL->PrevInSEL = Edge2; + Edge2->PrevInSEL = Prev; + if( Edge2->PrevInSEL ) Edge2->PrevInSEL->NextInSEL = Edge2; + } + + if( !Edge1->PrevInSEL ) m_SortedEdges = Edge1; + else if( !Edge2->PrevInSEL ) m_SortedEdges = Edge2; +} +//------------------------------------------------------------------------------ + +inline void GetHorzDirection(TEdge& HorzEdge, Direction& Dir, cInt& Left, cInt& Right) +{ + if (HorzEdge.Bot.X < HorzEdge.Top.X) + { + Left = HorzEdge.Bot.X; + Right = HorzEdge.Top.X; + Dir = dLeftToRight; + } else + { + Left = HorzEdge.Top.X; + Right = HorzEdge.Bot.X; + Dir = dRightToLeft; + } +} +//------------------------------------------------------------------------ + +/******************************************************************************* +* Notes: Horizontal edges (HEs) at scanline intersections (ie at the Top or * +* Bottom of a scanbeam) are processed as if layered. The order in which HEs * +* are processed doesn't matter. HEs intersect with other HE Bot.Xs only [#] * +* (or they could intersect with Top.Xs only, ie EITHER Bot.Xs OR Top.Xs), * +* and with other non-horizontal edges [*]. Once these intersections are * +* processed, intermediate HEs then 'promote' the Edge above (NextInLML) into * +* the AEL. These 'promoted' edges may in turn intersect [%] with other HEs. * +*******************************************************************************/ + +void Clipper::ProcessHorizontal(TEdge *horzEdge) +{ + Direction dir; + cInt horzLeft, horzRight; + bool IsOpen = (horzEdge->OutIdx >= 0 && m_PolyOuts[horzEdge->OutIdx]->IsOpen); + + GetHorzDirection(*horzEdge, dir, horzLeft, horzRight); + + TEdge* eLastHorz = horzEdge, *eMaxPair = 0; + while (eLastHorz->NextInLML && IsHorizontal(*eLastHorz->NextInLML)) + eLastHorz = eLastHorz->NextInLML; + if (!eLastHorz->NextInLML) + eMaxPair = GetMaximaPair(eLastHorz); + + std::vector::const_iterator maxIt; + std::vector::const_reverse_iterator maxRit; + if (!m_Maxima.empty()) + { + //get the first maxima in range (X) ... + if (dir == dLeftToRight) + { + maxIt = m_Maxima.begin(); + while (maxIt != m_Maxima.end() && *maxIt <= horzEdge->Bot.X) ++maxIt; + if (maxIt != m_Maxima.end() && *maxIt >= eLastHorz->Top.X) + maxIt = m_Maxima.end(); + } + else + { + maxRit = m_Maxima.rbegin(); + while (maxRit != m_Maxima.rend() && *maxRit > horzEdge->Bot.X) ++maxRit; + if (maxRit != m_Maxima.rend() && *maxRit <= eLastHorz->Top.X) + maxRit = m_Maxima.rend(); + } + } + + OutPt* op1 = 0; + + for (;;) //loop through consec. horizontal edges + { + + bool IsLastHorz = (horzEdge == eLastHorz); + TEdge* e = (dir == dLeftToRight) ? horzEdge->NextInAEL : horzEdge->PrevInAEL; + while(e) + { + + //this code block inserts extra coords into horizontal edges (in output + //polygons) whereever maxima touch these horizontal edges. This helps + //'simplifying' polygons (ie if the Simplify property is set). + if (!m_Maxima.empty()) + { + if (dir == dLeftToRight) + { + while (maxIt != m_Maxima.end() && *maxIt < e->Curr.X) + { + if (horzEdge->OutIdx >= 0 && !IsOpen) + AddOutPt(horzEdge, IntPoint(*maxIt, horzEdge->Bot.Y)); + ++maxIt; + } + } + else + { + while (maxRit != m_Maxima.rend() && *maxRit > e->Curr.X) + { + if (horzEdge->OutIdx >= 0 && !IsOpen) + AddOutPt(horzEdge, IntPoint(*maxRit, horzEdge->Bot.Y)); + ++maxRit; + } + } + }; + + if ((dir == dLeftToRight && e->Curr.X > horzRight) || + (dir == dRightToLeft && e->Curr.X < horzLeft)) break; + + //Also break if we've got to the end of an intermediate horizontal edge ... + //nb: Smaller Dx's are to the right of larger Dx's ABOVE the horizontal. + if (e->Curr.X == horzEdge->Top.X && horzEdge->NextInLML && + e->Dx < horzEdge->NextInLML->Dx) break; + + if (horzEdge->OutIdx >= 0 && !IsOpen) //note: may be done multiple times + { + op1 = AddOutPt(horzEdge, e->Curr); + TEdge* eNextHorz = m_SortedEdges; + while (eNextHorz) + { + if (eNextHorz->OutIdx >= 0 && + HorzSegmentsOverlap(horzEdge->Bot.X, + horzEdge->Top.X, eNextHorz->Bot.X, eNextHorz->Top.X)) + { + OutPt* op2 = GetLastOutPt(eNextHorz); + m_Joins.emplace_back(Join(op2, op1, eNextHorz->Top)); + } + eNextHorz = eNextHorz->NextInSEL; + } + m_GhostJoins.emplace_back(Join(op1, 0, horzEdge->Bot)); + } + + //OK, so far we're still in range of the horizontal Edge but make sure + //we're at the last of consec. horizontals when matching with eMaxPair + if(e == eMaxPair && IsLastHorz) + { + if (horzEdge->OutIdx >= 0) + AddLocalMaxPoly(horzEdge, eMaxPair, horzEdge->Top); + DeleteFromAEL(horzEdge); + DeleteFromAEL(eMaxPair); + return; + } + + if(dir == dLeftToRight) + { + IntPoint Pt = IntPoint(e->Curr.X, horzEdge->Curr.Y); + IntersectEdges(horzEdge, e, Pt); + } + else + { + IntPoint Pt = IntPoint(e->Curr.X, horzEdge->Curr.Y); + IntersectEdges( e, horzEdge, Pt); + } + TEdge* eNext = (dir == dLeftToRight) ? e->NextInAEL : e->PrevInAEL; + SwapPositionsInAEL( horzEdge, e ); + e = eNext; + } //end while(e) + + //Break out of loop if HorzEdge.NextInLML is not also horizontal ... + if (!horzEdge->NextInLML || !IsHorizontal(*horzEdge->NextInLML)) break; + + UpdateEdgeIntoAEL(horzEdge); + if (horzEdge->OutIdx >= 0) AddOutPt(horzEdge, horzEdge->Bot); + GetHorzDirection(*horzEdge, dir, horzLeft, horzRight); + + } //end for (;;) + + if (horzEdge->OutIdx >= 0 && !op1) + { + op1 = GetLastOutPt(horzEdge); + TEdge* eNextHorz = m_SortedEdges; + while (eNextHorz) + { + if (eNextHorz->OutIdx >= 0 && + HorzSegmentsOverlap(horzEdge->Bot.X, + horzEdge->Top.X, eNextHorz->Bot.X, eNextHorz->Top.X)) + { + OutPt* op2 = GetLastOutPt(eNextHorz); + m_Joins.emplace_back(Join(op2, op1, eNextHorz->Top)); + } + eNextHorz = eNextHorz->NextInSEL; + } + m_GhostJoins.emplace_back(Join(op1, 0, horzEdge->Top)); + } + + if (horzEdge->NextInLML) + { + if(horzEdge->OutIdx >= 0) + { + op1 = AddOutPt( horzEdge, horzEdge->Top); + UpdateEdgeIntoAEL(horzEdge); + if (horzEdge->WindDelta == 0) return; + //nb: HorzEdge is no longer horizontal here + TEdge* ePrev = horzEdge->PrevInAEL; + TEdge* eNext = horzEdge->NextInAEL; + if (ePrev && ePrev->Curr.X == horzEdge->Bot.X && + ePrev->Curr.Y == horzEdge->Bot.Y && ePrev->WindDelta != 0 && + (ePrev->OutIdx >= 0 && ePrev->Curr.Y > ePrev->Top.Y && + SlopesEqual(*horzEdge, *ePrev, m_UseFullRange))) + { + OutPt* op2 = AddOutPt(ePrev, horzEdge->Bot); + m_Joins.emplace_back(Join(op1, op2, horzEdge->Top)); + } + else if (eNext && eNext->Curr.X == horzEdge->Bot.X && + eNext->Curr.Y == horzEdge->Bot.Y && eNext->WindDelta != 0 && + eNext->OutIdx >= 0 && eNext->Curr.Y > eNext->Top.Y && + SlopesEqual(*horzEdge, *eNext, m_UseFullRange)) + { + OutPt* op2 = AddOutPt(eNext, horzEdge->Bot); + m_Joins.emplace_back(Join(op1, op2, horzEdge->Top)); + } + } + else + UpdateEdgeIntoAEL(horzEdge); + } + else + { + if (horzEdge->OutIdx >= 0) AddOutPt(horzEdge, horzEdge->Top); + DeleteFromAEL(horzEdge); + } +} +//------------------------------------------------------------------------------ + +void Clipper::UpdateEdgeIntoAEL(TEdge *&e) +{ + if( !e->NextInLML ) + throw clipperException("UpdateEdgeIntoAEL: invalid call"); + + e->NextInLML->OutIdx = e->OutIdx; + TEdge* AelPrev = e->PrevInAEL; + TEdge* AelNext = e->NextInAEL; + if (AelPrev) AelPrev->NextInAEL = e->NextInLML; + else m_ActiveEdges = e->NextInLML; + if (AelNext) AelNext->PrevInAEL = e->NextInLML; + e->NextInLML->Side = e->Side; + e->NextInLML->WindDelta = e->WindDelta; + e->NextInLML->WindCnt = e->WindCnt; + e->NextInLML->WindCnt2 = e->WindCnt2; + e = e->NextInLML; + e->Curr = e->Bot; + e->PrevInAEL = AelPrev; + e->NextInAEL = AelNext; + if (!IsHorizontal(*e)) + m_Scanbeam.push(e->Top.Y); +} +//------------------------------------------------------------------------------ + +bool Clipper::ProcessIntersections(const cInt topY) +{ + PROFILE_FUNC(); + if( !m_ActiveEdges ) return true; + try { + BuildIntersectList(topY); + size_t IlSize = m_IntersectList.size(); + if (IlSize == 0) return true; + if (IlSize == 1 || FixupIntersectionOrder()) { + for (IntersectNode &iNode : m_IntersectList) { + IntersectEdges( iNode.Edge1, iNode.Edge2, iNode.Pt); + SwapPositionsInAEL( iNode.Edge1 , iNode.Edge2 ); + } + m_IntersectList.clear(); + } + else return false; + } + catch(...) + { + m_SortedEdges = 0; + m_IntersectList.clear(); + throw clipperException("ProcessIntersections error"); + } + m_SortedEdges = 0; + return true; +} +//------------------------------------------------------------------------------ + +void Clipper::BuildIntersectList(const cInt topY) +{ + if ( !m_ActiveEdges ) return; + + //prepare for sorting ... + TEdge* e = m_ActiveEdges; + m_SortedEdges = e; + while( e ) + { + e->PrevInSEL = e->PrevInAEL; + e->NextInSEL = e->NextInAEL; + e->Curr.X = TopX( *e, topY ); + e = e->NextInAEL; + } + + //bubblesort ... + bool isModified; + do + { + isModified = false; + e = m_SortedEdges; + while( e->NextInSEL ) + { + TEdge *eNext = e->NextInSEL; + IntPoint Pt; + if(e->Curr.X > eNext->Curr.X) + { + IntersectPoint(*e, *eNext, Pt); + m_IntersectList.emplace_back(IntersectNode(e, eNext, Pt)); + SwapPositionsInSEL(e, eNext); + isModified = true; + } + else + e = eNext; + } + if( e->PrevInSEL ) e->PrevInSEL->NextInSEL = 0; + else break; + } + while ( isModified ); + m_SortedEdges = 0; //important +} +//------------------------------------------------------------------------------ + + +inline bool EdgesAdjacent(const IntersectNode &inode) +{ + return (inode.Edge1->NextInSEL == inode.Edge2) || + (inode.Edge1->PrevInSEL == inode.Edge2); +} +//------------------------------------------------------------------------------ + +bool Clipper::FixupIntersectionOrder() +{ + //pre-condition: intersections are sorted Bottom-most first. + //Now it's crucial that intersections are made only between adjacent edges, + //so to ensure this the order of intersections may need adjusting ... + CopyAELToSEL(); + std::sort(m_IntersectList.begin(), m_IntersectList.end(), [](const IntersectNode &node1, const IntersectNode &node2) { return node2.Pt.Y < node1.Pt.Y; }); + + size_t cnt = m_IntersectList.size(); + for (size_t i = 0; i < cnt; ++i) + { + if (!EdgesAdjacent(m_IntersectList[i])) + { + size_t j = i + 1; + while (j < cnt && !EdgesAdjacent(m_IntersectList[j])) j++; + if (j == cnt) return false; + std::swap(m_IntersectList[i], m_IntersectList[j]); + } + SwapPositionsInSEL(m_IntersectList[i].Edge1, m_IntersectList[i].Edge2); + } + return true; +} +//------------------------------------------------------------------------------ + +void Clipper::DoMaxima(TEdge *e) +{ + TEdge* eMaxPair = GetMaximaPair(e); + if (!eMaxPair) + { + if (e->OutIdx >= 0) + AddOutPt(e, e->Top); + DeleteFromAEL(e); + return; + } + + TEdge* eNext = e->NextInAEL; + while(eNext && eNext != eMaxPair) + { + IntersectEdges(e, eNext, e->Top); + SwapPositionsInAEL(e, eNext); + eNext = e->NextInAEL; + } + + if(e->OutIdx == Unassigned && eMaxPair->OutIdx == Unassigned) + { + DeleteFromAEL(e); + DeleteFromAEL(eMaxPair); + } + else if( e->OutIdx >= 0 && eMaxPair->OutIdx >= 0 ) + { + if (e->OutIdx >= 0) AddLocalMaxPoly(e, eMaxPair, e->Top); + DeleteFromAEL(e); + DeleteFromAEL(eMaxPair); + } +#ifdef use_lines + else if (e->WindDelta == 0) + { + if (e->OutIdx >= 0) + { + AddOutPt(e, e->Top); + e->OutIdx = Unassigned; + } + DeleteFromAEL(e); + + if (eMaxPair->OutIdx >= 0) + { + AddOutPt(eMaxPair, e->Top); + eMaxPair->OutIdx = Unassigned; + } + DeleteFromAEL(eMaxPair); + } +#endif + else throw clipperException("DoMaxima error"); +} +//------------------------------------------------------------------------------ + +void Clipper::ProcessEdgesAtTopOfScanbeam(const cInt topY) +{ + PROFILE_FUNC(); + TEdge* e = m_ActiveEdges; + while( e ) + { + //1. process maxima, treating them as if they're 'bent' horizontal edges, + // but exclude maxima with horizontal edges. nb: e can't be a horizontal. + bool IsMaximaEdge = IsMaxima(e, topY); + + if(IsMaximaEdge) + { + TEdge* eMaxPair = GetMaximaPair(e); + IsMaximaEdge = (!eMaxPair || !IsHorizontal(*eMaxPair)); + } + + if(IsMaximaEdge) + { + if (m_StrictSimple) m_Maxima.push_back(e->Top.X); + TEdge* ePrev = e->PrevInAEL; + DoMaxima(e); + if( !ePrev ) e = m_ActiveEdges; + else e = ePrev->NextInAEL; + } + else + { + //2. promote horizontal edges, otherwise update Curr.X and Curr.Y ... + if (IsIntermediate(e, topY) && IsHorizontal(*e->NextInLML)) + { + UpdateEdgeIntoAEL(e); + if (e->OutIdx >= 0) + AddOutPt(e, e->Bot); + AddEdgeToSEL(e); + } + else + { + e->Curr.X = TopX( *e, topY ); + e->Curr.Y = topY; + } + + //When StrictlySimple and 'e' is being touched by another edge, then + //make sure both edges have a vertex here ... + if (m_StrictSimple) + { + TEdge* ePrev = e->PrevInAEL; + if ((e->OutIdx >= 0) && (e->WindDelta != 0) && ePrev && (ePrev->OutIdx >= 0) && + (ePrev->Curr.X == e->Curr.X) && (ePrev->WindDelta != 0)) + { + IntPoint pt = e->Curr; +#ifdef use_xyz + SetZ(pt, *ePrev, *e); +#endif + OutPt* op = AddOutPt(ePrev, pt); + OutPt* op2 = AddOutPt(e, pt); + m_Joins.emplace_back(Join(op, op2, pt)); //StrictlySimple (type-3) join + } + } + + e = e->NextInAEL; + } + } + + //3. Process horizontals at the Top of the scanbeam ... + std::sort(m_Maxima.begin(), m_Maxima.end()); + ProcessHorizontals(); + m_Maxima.clear(); + + //4. Promote intermediate vertices ... + e = m_ActiveEdges; + while(e) + { + if(IsIntermediate(e, topY)) + { + OutPt* op = 0; + if( e->OutIdx >= 0 ) + op = AddOutPt(e, e->Top); + UpdateEdgeIntoAEL(e); + + //if output polygons share an edge, they'll need joining later ... + TEdge* ePrev = e->PrevInAEL; + TEdge* eNext = e->NextInAEL; + if (ePrev && ePrev->Curr.X == e->Bot.X && + ePrev->Curr.Y == e->Bot.Y && op && + ePrev->OutIdx >= 0 && ePrev->Curr.Y > ePrev->Top.Y && + SlopesEqual(*e, *ePrev, m_UseFullRange) && + (e->WindDelta != 0) && (ePrev->WindDelta != 0)) + { + OutPt* op2 = AddOutPt(ePrev, e->Bot); + m_Joins.emplace_back(Join(op, op2, e->Top)); + } + else if (eNext && eNext->Curr.X == e->Bot.X && + eNext->Curr.Y == e->Bot.Y && op && + eNext->OutIdx >= 0 && eNext->Curr.Y > eNext->Top.Y && + SlopesEqual(*e, *eNext, m_UseFullRange) && + (e->WindDelta != 0) && (eNext->WindDelta != 0)) + { + OutPt* op2 = AddOutPt(eNext, e->Bot); + m_Joins.emplace_back(Join(op, op2, e->Top)); + } + } + e = e->NextInAEL; + } +} +//------------------------------------------------------------------------------ + +void Clipper::FixupOutPolyline(OutRec &outrec) +{ + OutPt *pp = outrec.Pts; + OutPt *lastPP = pp->Prev; + while (pp != lastPP) + { + pp = pp->Next; + if (pp->Pt == pp->Prev->Pt) + { + if (pp == lastPP) lastPP = pp->Prev; + OutPt *tmpPP = pp->Prev; + tmpPP->Next = pp->Next; + pp->Next->Prev = tmpPP; + this->DisposeOutPt(pp); + pp = tmpPP; + } + } + + if (pp == pp->Prev) + { + this->DisposeOutPts(pp); + outrec.Pts = 0; + return; + } +} +//------------------------------------------------------------------------------ + +void Clipper::FixupOutPolygon(OutRec &outrec) +{ + //FixupOutPolygon() - removes duplicate points and simplifies consecutive + //parallel edges by removing the middle vertex. + OutPt *lastOK = nullptr; + outrec.BottomPt = nullptr; + OutPt *pp = outrec.Pts; + bool preserveCol = m_PreserveCollinear || m_StrictSimple; + + for (;;) + { + if (pp->Prev == pp || pp->Prev == pp->Next) + { + // Empty loop or a stick. Release the polygon. + this->DisposeOutPts(pp); + outrec.Pts = nullptr; + return; + } + + //test for duplicate points and collinear edges ... + if ((pp->Pt == pp->Next->Pt) || (pp->Pt == pp->Prev->Pt) || + (SlopesEqual(pp->Prev->Pt, pp->Pt, pp->Next->Pt, m_UseFullRange) && + (!preserveCol || !Pt2IsBetweenPt1AndPt3(pp->Prev->Pt, pp->Pt, pp->Next->Pt)))) + { + lastOK = nullptr; + OutPt *tmp = pp; + pp->Prev->Next = pp->Next; + pp->Next->Prev = pp->Prev; + pp = pp->Prev; + this->DisposeOutPt(tmp); + } + else if (pp == lastOK) break; + else + { + if (!lastOK) lastOK = pp; + pp = pp->Next; + } + } + outrec.Pts = pp; +} +//------------------------------------------------------------------------------ + +// Count the number of points in a closed linked loop starting with Pts. +int PointCount(OutPt *Pts) +{ + if (!Pts) return 0; + int result = 0; + OutPt* p = Pts; + do + { + result++; + p = p->Next; + } + while (p != Pts); + return result; +} +//------------------------------------------------------------------------------ + +void Clipper::BuildResult(Paths &polys) +{ + polys.reserve(m_PolyOuts.size()); + for (OutRec* outRec : m_PolyOuts) + { + assert(! outRec->IsOpen); + if (!outRec->Pts) continue; + Path pg; + OutPt* p = outRec->Pts->Prev; + int cnt = PointCount(p); + if (cnt < 2) continue; + pg.reserve(cnt); + for (int i = 0; i < cnt; ++i) + { + pg.emplace_back(p->Pt); + p = p->Prev; + } + polys.emplace_back(std::move(pg)); + } +} +//------------------------------------------------------------------------------ + +void Clipper::BuildResult2(PolyTree& polytree) +{ + polytree.Clear(); + polytree.AllNodes.reserve(m_PolyOuts.size()); + //add each output polygon/contour to polytree ... + for (OutRec* outRec : m_PolyOuts) + { + int cnt = PointCount(outRec->Pts); + if ((outRec->IsOpen && cnt < 2) || (!outRec->IsOpen && cnt < 3)) + // Ignore an invalid output loop or a polyline. + continue; + + //skip OutRecs that (a) contain outermost polygons or + //(b) already have the correct owner/child linkage ... + if (outRec->FirstLeft && + (outRec->IsHole == outRec->FirstLeft->IsHole || ! outRec->FirstLeft->Pts)) { + OutRec* orfl = outRec->FirstLeft; + while (orfl && ((orfl->IsHole == outRec->IsHole) || !orfl->Pts)) + orfl = orfl->FirstLeft; + outRec->FirstLeft = orfl; + } + + //nb: polytree takes ownership of all the PolyNodes + polytree.AllNodes.emplace_back(PolyNode()); + PolyNode* pn = &polytree.AllNodes.back(); + outRec->PolyNd = pn; + pn->Parent = 0; + pn->Index = 0; + pn->Contour.reserve(cnt); + OutPt *op = outRec->Pts->Prev; + for (int j = 0; j < cnt; j++) + { + pn->Contour.emplace_back(op->Pt); + op = op->Prev; + } + } + + //fixup PolyNode links etc ... + polytree.Childs.reserve(m_PolyOuts.size()); + for (OutRec* outRec : m_PolyOuts) + { + if (!outRec->PolyNd) continue; + if (outRec->IsOpen) + { + outRec->PolyNd->m_IsOpen = true; + polytree.AddChild(*outRec->PolyNd); + } + else if (outRec->FirstLeft && outRec->FirstLeft->PolyNd) + outRec->FirstLeft->PolyNd->AddChild(*outRec->PolyNd); + else + polytree.AddChild(*outRec->PolyNd); + } +} +//------------------------------------------------------------------------------ + +inline bool E2InsertsBeforeE1(TEdge &e1, TEdge &e2) +{ + if (e2.Curr.X == e1.Curr.X) + { + if (e2.Top.Y > e1.Top.Y) + return e2.Top.X < TopX(e1, e2.Top.Y); + else return e1.Top.X > TopX(e2, e1.Top.Y); + } + else return e2.Curr.X < e1.Curr.X; +} +//------------------------------------------------------------------------------ + +bool GetOverlap(const cInt a1, const cInt a2, const cInt b1, const cInt b2, + cInt& Left, cInt& Right) +{ + if (a1 < a2) + { + if (b1 < b2) {Left = std::max(a1,b1); Right = std::min(a2,b2);} + else {Left = std::max(a1,b2); Right = std::min(a2,b1);} + } + else + { + if (b1 < b2) {Left = std::max(a2,b1); Right = std::min(a1,b2);} + else {Left = std::max(a2,b2); Right = std::min(a1,b1);} + } + return Left < Right; +} +//------------------------------------------------------------------------------ + +// Make all points of outrec point to outrec.Idx +inline void UpdateOutPtIdxs(OutRec& outrec) +{ + OutPt* op = outrec.Pts; + do + { + op->Idx = outrec.Idx; + op = op->Prev; + } + while(op != outrec.Pts); +} +//------------------------------------------------------------------------------ + +void Clipper::InsertEdgeIntoAEL(TEdge *edge, TEdge* startEdge) +{ + if(!m_ActiveEdges) + { + edge->PrevInAEL = 0; + edge->NextInAEL = 0; + m_ActiveEdges = edge; + } + else if(!startEdge && E2InsertsBeforeE1(*m_ActiveEdges, *edge)) + { + edge->PrevInAEL = 0; + edge->NextInAEL = m_ActiveEdges; + m_ActiveEdges->PrevInAEL = edge; + m_ActiveEdges = edge; + } + else + { + if(!startEdge) startEdge = m_ActiveEdges; + while(startEdge->NextInAEL && + !E2InsertsBeforeE1(*startEdge->NextInAEL , *edge)) + startEdge = startEdge->NextInAEL; + edge->NextInAEL = startEdge->NextInAEL; + if(startEdge->NextInAEL) startEdge->NextInAEL->PrevInAEL = edge; + edge->PrevInAEL = startEdge; + startEdge->NextInAEL = edge; + } +} +//---------------------------------------------------------------------- + +OutPt* Clipper::DupOutPt(OutPt* outPt, bool InsertAfter) +{ + OutPt* result = this->AllocateOutPt(); + result->Pt = outPt->Pt; + result->Idx = outPt->Idx; + if (InsertAfter) + { + result->Next = outPt->Next; + result->Prev = outPt; + outPt->Next->Prev = result; + outPt->Next = result; + } + else + { + result->Prev = outPt->Prev; + result->Next = outPt; + outPt->Prev->Next = result; + outPt->Prev = result; + } + return result; +} +//------------------------------------------------------------------------------ + +bool Clipper::JoinHorz(OutPt* op1, OutPt* op1b, OutPt* op2, OutPt* op2b, + const IntPoint &Pt, bool DiscardLeft) +{ + Direction Dir1 = (op1->Pt.X > op1b->Pt.X ? dRightToLeft : dLeftToRight); + Direction Dir2 = (op2->Pt.X > op2b->Pt.X ? dRightToLeft : dLeftToRight); + if (Dir1 == Dir2) return false; + + //When DiscardLeft, we want Op1b to be on the Left of Op1, otherwise we + //want Op1b to be on the Right. (And likewise with Op2 and Op2b.) + //So, to facilitate this while inserting Op1b and Op2b ... + //when DiscardLeft, make sure we're AT or RIGHT of Pt before adding Op1b, + //otherwise make sure we're AT or LEFT of Pt. (Likewise with Op2b.) + if (Dir1 == dLeftToRight) + { + while (op1->Next->Pt.X <= Pt.X && + op1->Next->Pt.X >= op1->Pt.X && op1->Next->Pt.Y == Pt.Y) + op1 = op1->Next; + if (DiscardLeft && (op1->Pt.X != Pt.X)) op1 = op1->Next; + op1b = this->DupOutPt(op1, !DiscardLeft); + if (op1b->Pt != Pt) + { + op1 = op1b; + op1->Pt = Pt; + op1b = this->DupOutPt(op1, !DiscardLeft); + } + } + else + { + while (op1->Next->Pt.X >= Pt.X && + op1->Next->Pt.X <= op1->Pt.X && op1->Next->Pt.Y == Pt.Y) + op1 = op1->Next; + if (!DiscardLeft && (op1->Pt.X != Pt.X)) op1 = op1->Next; + op1b = this->DupOutPt(op1, DiscardLeft); + if (op1b->Pt != Pt) + { + op1 = op1b; + op1->Pt = Pt; + op1b = this->DupOutPt(op1, DiscardLeft); + } + } + + if (Dir2 == dLeftToRight) + { + while (op2->Next->Pt.X <= Pt.X && + op2->Next->Pt.X >= op2->Pt.X && op2->Next->Pt.Y == Pt.Y) + op2 = op2->Next; + if (DiscardLeft && (op2->Pt.X != Pt.X)) op2 = op2->Next; + op2b = this->DupOutPt(op2, !DiscardLeft); + if (op2b->Pt != Pt) + { + op2 = op2b; + op2->Pt = Pt; + op2b = this->DupOutPt(op2, !DiscardLeft); + }; + } else + { + while (op2->Next->Pt.X >= Pt.X && + op2->Next->Pt.X <= op2->Pt.X && op2->Next->Pt.Y == Pt.Y) + op2 = op2->Next; + if (!DiscardLeft && (op2->Pt.X != Pt.X)) op2 = op2->Next; + op2b = this->DupOutPt(op2, DiscardLeft); + if (op2b->Pt != Pt) + { + op2 = op2b; + op2->Pt = Pt; + op2b = this->DupOutPt(op2, DiscardLeft); + }; + }; + + if ((Dir1 == dLeftToRight) == DiscardLeft) + { + op1->Prev = op2; + op2->Next = op1; + op1b->Next = op2b; + op2b->Prev = op1b; + } + else + { + op1->Next = op2; + op2->Prev = op1; + op1b->Prev = op2b; + op2b->Next = op1b; + } + return true; +} +//------------------------------------------------------------------------------ + +bool Clipper::JoinPoints(Join *j, OutRec* outRec1, OutRec* outRec2) +{ + OutPt *op1 = j->OutPt1, *op1b; + OutPt *op2 = j->OutPt2, *op2b; + + //There are 3 kinds of joins for output polygons ... + //1. Horizontal joins where Join.OutPt1 & Join.OutPt2 are vertices anywhere + //along (horizontal) collinear edges (& Join.OffPt is on the same horizontal). + //2. Non-horizontal joins where Join.OutPt1 & Join.OutPt2 are at the same + //location at the Bottom of the overlapping segment (& Join.OffPt is above). + //3. StrictSimple joins where edges touch but are not collinear and where + //Join.OutPt1, Join.OutPt2 & Join.OffPt all share the same point. + bool isHorizontal = (j->OutPt1->Pt.Y == j->OffPt.Y); + + if (isHorizontal && (j->OffPt == j->OutPt1->Pt) && + (j->OffPt == j->OutPt2->Pt)) + { + //Strictly Simple join ... + if (outRec1 != outRec2) return false; + op1b = j->OutPt1->Next; + while (op1b != op1 && (op1b->Pt == j->OffPt)) + op1b = op1b->Next; + bool reverse1 = (op1b->Pt.Y > j->OffPt.Y); + op2b = j->OutPt2->Next; + while (op2b != op2 && (op2b->Pt == j->OffPt)) + op2b = op2b->Next; + bool reverse2 = (op2b->Pt.Y > j->OffPt.Y); + if (reverse1 == reverse2) return false; + if (reverse1) + { + op1b = this->DupOutPt(op1, false); + op2b = this->DupOutPt(op2, true); + op1->Prev = op2; + op2->Next = op1; + op1b->Next = op2b; + op2b->Prev = op1b; + j->OutPt1 = op1; + j->OutPt2 = op1b; + return true; + } else + { + op1b = this->DupOutPt(op1, true); + op2b = this->DupOutPt(op2, false); + op1->Next = op2; + op2->Prev = op1; + op1b->Prev = op2b; + op2b->Next = op1b; + j->OutPt1 = op1; + j->OutPt2 = op1b; + return true; + } + } + else if (isHorizontal) + { + //treat horizontal joins differently to non-horizontal joins since with + //them we're not yet sure where the overlapping is. OutPt1.Pt & OutPt2.Pt + //may be anywhere along the horizontal edge. + op1b = op1; + while (op1->Prev->Pt.Y == op1->Pt.Y && op1->Prev != op1b && op1->Prev != op2) + op1 = op1->Prev; + while (op1b->Next->Pt.Y == op1b->Pt.Y && op1b->Next != op1 && op1b->Next != op2) + op1b = op1b->Next; + if (op1b->Next == op1 || op1b->Next == op2) return false; //a flat 'polygon' + + op2b = op2; + while (op2->Prev->Pt.Y == op2->Pt.Y && op2->Prev != op2b && op2->Prev != op1b) + op2 = op2->Prev; + while (op2b->Next->Pt.Y == op2b->Pt.Y && op2b->Next != op2 && op2b->Next != op1) + op2b = op2b->Next; + if (op2b->Next == op2 || op2b->Next == op1) return false; //a flat 'polygon' + + cInt Left, Right; + //Op1 --> Op1b & Op2 --> Op2b are the extremites of the horizontal edges + if (!GetOverlap(op1->Pt.X, op1b->Pt.X, op2->Pt.X, op2b->Pt.X, Left, Right)) + return false; + + //DiscardLeftSide: when overlapping edges are joined, a spike will created + //which needs to be cleaned up. However, we don't want Op1 or Op2 caught up + //on the discard Side as either may still be needed for other joins ... + IntPoint Pt; + bool DiscardLeftSide; + if (op1->Pt.X >= Left && op1->Pt.X <= Right) + { + Pt = op1->Pt; DiscardLeftSide = (op1->Pt.X > op1b->Pt.X); + } + else if (op2->Pt.X >= Left&& op2->Pt.X <= Right) + { + Pt = op2->Pt; DiscardLeftSide = (op2->Pt.X > op2b->Pt.X); + } + else if (op1b->Pt.X >= Left && op1b->Pt.X <= Right) + { + Pt = op1b->Pt; DiscardLeftSide = op1b->Pt.X > op1->Pt.X; + } + else + { + Pt = op2b->Pt; DiscardLeftSide = (op2b->Pt.X > op2->Pt.X); + } + j->OutPt1 = op1; j->OutPt2 = op2; + return JoinHorz(op1, op1b, op2, op2b, Pt, DiscardLeftSide); + } else + { + //nb: For non-horizontal joins ... + // 1. Jr.OutPt1.Pt.Y == Jr.OutPt2.Pt.Y + // 2. Jr.OutPt1.Pt > Jr.OffPt.Y + + //make sure the polygons are correctly oriented ... + op1b = op1->Next; + while ((op1b->Pt == op1->Pt) && (op1b != op1)) op1b = op1b->Next; + bool Reverse1 = ((op1b->Pt.Y > op1->Pt.Y) || + !SlopesEqual(op1->Pt, op1b->Pt, j->OffPt, m_UseFullRange)); + if (Reverse1) + { + op1b = op1->Prev; + while ((op1b->Pt == op1->Pt) && (op1b != op1)) op1b = op1b->Prev; + if ((op1b->Pt.Y > op1->Pt.Y) || + !SlopesEqual(op1->Pt, op1b->Pt, j->OffPt, m_UseFullRange)) return false; + }; + op2b = op2->Next; + while ((op2b->Pt == op2->Pt) && (op2b != op2))op2b = op2b->Next; + bool Reverse2 = ((op2b->Pt.Y > op2->Pt.Y) || + !SlopesEqual(op2->Pt, op2b->Pt, j->OffPt, m_UseFullRange)); + if (Reverse2) + { + op2b = op2->Prev; + while ((op2b->Pt == op2->Pt) && (op2b != op2)) op2b = op2b->Prev; + if ((op2b->Pt.Y > op2->Pt.Y) || + !SlopesEqual(op2->Pt, op2b->Pt, j->OffPt, m_UseFullRange)) return false; + } + + if ((op1b == op1) || (op2b == op2) || (op1b == op2b) || + ((outRec1 == outRec2) && (Reverse1 == Reverse2))) return false; + + if (Reverse1) + { + op1b = this->DupOutPt(op1, false); + op2b = this->DupOutPt(op2, true); + op1->Prev = op2; + op2->Next = op1; + op1b->Next = op2b; + op2b->Prev = op1b; + j->OutPt1 = op1; + j->OutPt2 = op1b; + return true; + } else + { + op1b = this->DupOutPt(op1, true); + op2b = this->DupOutPt(op2, false); + op1->Next = op2; + op2->Prev = op1; + op1b->Prev = op2b; + op2b->Next = op1b; + j->OutPt1 = op1; + j->OutPt2 = op1b; + return true; + } + } +} +//---------------------------------------------------------------------- + +// This is potentially very expensive! O(n^3)! +void Clipper::FixupFirstLefts1(OutRec* OldOutRec, OutRec* NewOutRec) const +{ + PROFILE_FUNC(); + //tests if NewOutRec contains the polygon before reassigning FirstLeft + for (OutRec *outRec : m_PolyOuts) + { + if (!outRec->Pts || !outRec->FirstLeft) continue; + OutRec* firstLeft = outRec->FirstLeft; + // Skip empty polygons. + while (firstLeft && !firstLeft->Pts) firstLeft = firstLeft->FirstLeft; + if (firstLeft == OldOutRec && Poly2ContainsPoly1(outRec->Pts, NewOutRec->Pts)) + outRec->FirstLeft = NewOutRec; + } +} +//---------------------------------------------------------------------- + +void Clipper::FixupFirstLefts2(OutRec* OldOutRec, OutRec* NewOutRec) const +{ + //reassigns FirstLeft WITHOUT testing if NewOutRec contains the polygon + for (OutRec *outRec : m_PolyOuts) + if (outRec->FirstLeft == OldOutRec) outRec->FirstLeft = NewOutRec; +} +//---------------------------------------------------------------------- + +void Clipper::JoinCommonEdges() +{ + PROFILE_FUNC(); + for (Join &join : m_Joins) + { + OutRec *outRec1 = GetOutRec(join.OutPt1->Idx); + OutRec *outRec2 = GetOutRec(join.OutPt2->Idx); + + if (!outRec1->Pts || !outRec2->Pts) continue; + if (outRec1->IsOpen || outRec2->IsOpen) continue; + + //get the polygon fragment with the correct hole state (FirstLeft) + //before calling JoinPoints() ... + OutRec *holeStateRec; + if (outRec1 == outRec2) holeStateRec = outRec1; + else if (Param1RightOfParam2(outRec1, outRec2)) holeStateRec = outRec2; + else if (Param1RightOfParam2(outRec2, outRec1)) holeStateRec = outRec1; + else holeStateRec = GetLowermostRec(outRec1, outRec2); + + if (!JoinPoints(&join, outRec1, outRec2)) continue; + + if (outRec1 == outRec2) + { + //instead of joining two polygons, we've just created a new one by + //splitting one polygon into two. + outRec1->Pts = join.OutPt1; + outRec1->BottomPt = 0; + outRec2 = CreateOutRec(); + outRec2->Pts = join.OutPt2; + + //update all OutRec2.Pts Idx's ... + UpdateOutPtIdxs(*outRec2); + + //We now need to check every OutRec.FirstLeft pointer. If it points + //to OutRec1 it may need to point to OutRec2 instead ... + if (m_UsingPolyTree) + for (size_t j = 0; j < m_PolyOuts.size() - 1; j++) + { + OutRec* oRec = m_PolyOuts[j]; + OutRec* firstLeft = oRec->FirstLeft; + while (firstLeft && !firstLeft->Pts) firstLeft = firstLeft->FirstLeft; + if (!oRec->Pts || firstLeft != outRec1 || + oRec->IsHole == outRec1->IsHole) continue; + if (Poly2ContainsPoly1(oRec->Pts, join.OutPt2)) + oRec->FirstLeft = outRec2; + } + + if (Poly2ContainsPoly1(outRec2->Pts, outRec1->Pts)) + { + //outRec2 is contained by outRec1 ... + outRec2->IsHole = !outRec1->IsHole; + outRec2->FirstLeft = outRec1; + + // For each m_PolyOuts, replace FirstLeft from outRec2 to outRec1. + if (m_UsingPolyTree) FixupFirstLefts2(outRec2, outRec1); + + if ((outRec2->IsHole ^ m_ReverseOutput) == (Area(*outRec2) > 0)) + ReversePolyPtLinks(outRec2->Pts); + + } else if (Poly2ContainsPoly1(outRec1->Pts, outRec2->Pts)) + { + //outRec1 is contained by outRec2 ... + outRec2->IsHole = outRec1->IsHole; + outRec1->IsHole = !outRec2->IsHole; + outRec2->FirstLeft = outRec1->FirstLeft; + outRec1->FirstLeft = outRec2; + + // For each m_PolyOuts, replace FirstLeft from outRec1 to outRec2. + if (m_UsingPolyTree) FixupFirstLefts2(outRec1, outRec2); + + if ((outRec1->IsHole ^ m_ReverseOutput) == (Area(*outRec1) > 0)) + ReversePolyPtLinks(outRec1->Pts); + } + else + { + //the 2 polygons are completely separate ... + outRec2->IsHole = outRec1->IsHole; + outRec2->FirstLeft = outRec1->FirstLeft; + + //fixup FirstLeft pointers that may need reassigning to OutRec2 + // For each polygon of m_PolyOuts, replace FirstLeft from outRec1 to outRec2 if the polygon is inside outRec2. + //FIXME This is potentially very expensive! O(n^3)! + if (m_UsingPolyTree) FixupFirstLefts1(outRec1, outRec2); + } + + } else + { + //joined 2 polygons together ... + + outRec2->Pts = 0; + outRec2->BottomPt = 0; + outRec2->Idx = outRec1->Idx; + + outRec1->IsHole = holeStateRec->IsHole; + if (holeStateRec == outRec2) + outRec1->FirstLeft = outRec2->FirstLeft; + outRec2->FirstLeft = outRec1; + + // For each m_PolyOuts, replace FirstLeft from outRec2 to outRec1. + if (m_UsingPolyTree) FixupFirstLefts2(outRec2, outRec1); + } + } +} + +//------------------------------------------------------------------------------ +// ClipperOffset support functions ... +//------------------------------------------------------------------------------ + +DoublePoint GetUnitNormal(const IntPoint &pt1, const IntPoint &pt2) +{ + if(pt2.X == pt1.X && pt2.Y == pt1.Y) + return DoublePoint(0, 0); + + double Dx = (double)(pt2.X - pt1.X); + double dy = (double)(pt2.Y - pt1.Y); + double f = 1 *1.0/ std::sqrt( Dx*Dx + dy*dy ); + Dx *= f; + dy *= f; + return DoublePoint(dy, -Dx); +} + +//------------------------------------------------------------------------------ +// ClipperOffset class +//------------------------------------------------------------------------------ + +void ClipperOffset::Clear() +{ + for (int i = 0; i < m_polyNodes.ChildCount(); ++i) + delete m_polyNodes.Childs[i]; + m_polyNodes.Childs.clear(); + m_lowest.X = -1; +} +//------------------------------------------------------------------------------ + +void ClipperOffset::AddPath(const Path& path, JoinType joinType, EndType endType) +{ + int highI = (int)path.size() - 1; + if (highI < 0) return; + PolyNode* newNode = new PolyNode(); + newNode->m_jointype = joinType; + newNode->m_endtype = endType; + + //strip duplicate points from path and also get index to the lowest point ... + bool has_shortest_edge_length = ShortestEdgeLength > 0.; + double shortest_edge_length2 = has_shortest_edge_length ? ShortestEdgeLength * ShortestEdgeLength : 0.; + if (endType == etClosedLine || endType == etClosedPolygon) + for (; highI > 0; -- highI) { + bool same = false; + if (has_shortest_edge_length) { + double dx = double(path[highI].X - path[0].X); + double dy = double(path[highI].Y - path[0].Y); + same = dx*dx + dy*dy < shortest_edge_length2; + } else + same = path[0] == path[highI]; + if (! same) + break; + } + newNode->Contour.reserve(highI + 1); + newNode->Contour.push_back(path[0]); + int j = 0, k = 0; + for (int i = 1; i <= highI; i++) { + bool same = false; + if (has_shortest_edge_length) { + double dx = double(path[i].X - newNode->Contour[j].X); + double dy = double(path[i].Y - newNode->Contour[j].Y); + same = dx*dx + dy*dy < shortest_edge_length2; + } else + same = newNode->Contour[j] == path[i]; + if (same) + continue; + j++; + newNode->Contour.push_back(path[i]); + if (path[i].Y > newNode->Contour[k].Y || + (path[i].Y == newNode->Contour[k].Y && + path[i].X < newNode->Contour[k].X)) k = j; + } + if (endType == etClosedPolygon && j < 2) + { + delete newNode; + return; + } + m_polyNodes.AddChild(*newNode); + + //if this path's lowest pt is lower than all the others then update m_lowest + if (endType != etClosedPolygon) return; + if (m_lowest.X < 0) + m_lowest = IntPoint(m_polyNodes.ChildCount() - 1, k); + else + { + IntPoint ip = m_polyNodes.Childs[(int)m_lowest.X]->Contour[(int)m_lowest.Y]; + if (newNode->Contour[k].Y > ip.Y || + (newNode->Contour[k].Y == ip.Y && + newNode->Contour[k].X < ip.X)) + m_lowest = IntPoint(m_polyNodes.ChildCount() - 1, k); + } +} +//------------------------------------------------------------------------------ + +void ClipperOffset::AddPaths(const Paths& paths, JoinType joinType, EndType endType) +{ + for (const Path &path : paths) + AddPath(path, joinType, endType); +} +//------------------------------------------------------------------------------ + +void ClipperOffset::FixOrientations() +{ + //fixup orientations of all closed paths if the orientation of the + //closed path with the lowermost vertex is wrong ... + if (m_lowest.X >= 0 && + !Orientation(m_polyNodes.Childs[(int)m_lowest.X]->Contour)) + { + for (int i = 0; i < m_polyNodes.ChildCount(); ++i) + { + PolyNode& node = *m_polyNodes.Childs[i]; + if (node.m_endtype == etClosedPolygon || + (node.m_endtype == etClosedLine && Orientation(node.Contour))) + ReversePath(node.Contour); + } + } else + { + for (int i = 0; i < m_polyNodes.ChildCount(); ++i) + { + PolyNode& node = *m_polyNodes.Childs[i]; + if (node.m_endtype == etClosedLine && !Orientation(node.Contour)) + ReversePath(node.Contour); + } + } +} +//------------------------------------------------------------------------------ + +void ClipperOffset::Execute(Paths& solution, double delta) +{ + solution.clear(); + FixOrientations(); + DoOffset(delta); + + //now clean up 'corners' ... + Clipper clpr; + clpr.AddPaths(m_destPolys, ptSubject, true); + if (delta > 0) + { + clpr.Execute(ctUnion, solution, pftPositive, pftPositive); + } + else + { + IntRect r = clpr.GetBounds(); + Path outer(4); + outer[0] = IntPoint(r.left - 10, r.bottom + 10); + outer[1] = IntPoint(r.right + 10, r.bottom + 10); + outer[2] = IntPoint(r.right + 10, r.top - 10); + outer[3] = IntPoint(r.left - 10, r.top - 10); + + clpr.AddPath(outer, ptSubject, true); + clpr.ReverseSolution(true); + clpr.Execute(ctUnion, solution, pftNegative, pftNegative); + if (solution.size() > 0) solution.erase(solution.begin()); + } +} +//------------------------------------------------------------------------------ + +void ClipperOffset::Execute(PolyTree& solution, double delta) +{ + solution.Clear(); + FixOrientations(); + DoOffset(delta); + + //now clean up 'corners' ... + Clipper clpr; + clpr.AddPaths(m_destPolys, ptSubject, true); + if (delta > 0) + { + clpr.Execute(ctUnion, solution, pftPositive, pftPositive); + } + else + { + IntRect r = clpr.GetBounds(); + Path outer(4); + outer[0] = IntPoint(r.left - 10, r.bottom + 10); + outer[1] = IntPoint(r.right + 10, r.bottom + 10); + outer[2] = IntPoint(r.right + 10, r.top - 10); + outer[3] = IntPoint(r.left - 10, r.top - 10); + + clpr.AddPath(outer, ptSubject, true); + clpr.ReverseSolution(true); + clpr.Execute(ctUnion, solution, pftNegative, pftNegative); + //remove the outer PolyNode rectangle ... + if (solution.ChildCount() == 1 && solution.Childs[0]->ChildCount() > 0) + { + PolyNode* outerNode = solution.Childs[0]; + solution.Childs.reserve(outerNode->ChildCount()); + solution.Childs[0] = outerNode->Childs[0]; + solution.Childs[0]->Parent = outerNode->Parent; + for (int i = 1; i < outerNode->ChildCount(); ++i) + solution.AddChild(*outerNode->Childs[i]); + } + else + solution.Clear(); + } +} +//------------------------------------------------------------------------------ + +void ClipperOffset::DoOffset(double delta) +{ + m_destPolys.clear(); + m_delta = delta; + + //if Zero offset, just copy any CLOSED polygons to m_p and return ... + if (NEAR_ZERO(delta)) + { + m_destPolys.reserve(m_polyNodes.ChildCount()); + for (int i = 0; i < m_polyNodes.ChildCount(); i++) + { + PolyNode& node = *m_polyNodes.Childs[i]; + if (node.m_endtype == etClosedPolygon) + m_destPolys.push_back(node.Contour); + } + return; + } + + //see offset_triginometry3.svg in the documentation folder ... + if (MiterLimit > 2) m_miterLim = 2/(MiterLimit * MiterLimit); + else m_miterLim = 0.5; + + double y; + if (ArcTolerance <= 0.0) y = def_arc_tolerance; + else if (ArcTolerance > std::fabs(delta) * def_arc_tolerance) + y = std::fabs(delta) * def_arc_tolerance; + else y = ArcTolerance; + //see offset_triginometry2.svg in the documentation folder ... + double steps = pi / std::acos(1 - y / std::fabs(delta)); + if (steps > std::fabs(delta) * pi) + steps = std::fabs(delta) * pi; //ie excessive precision check + m_sin = std::sin(two_pi / steps); + m_cos = std::cos(two_pi / steps); + m_StepsPerRad = steps / two_pi; + if (delta < 0.0) m_sin = -m_sin; + + m_destPolys.reserve(m_polyNodes.ChildCount() * 2); + for (int i = 0; i < m_polyNodes.ChildCount(); i++) + { + PolyNode& node = *m_polyNodes.Childs[i]; + m_srcPoly = node.Contour; + + int len = (int)m_srcPoly.size(); + if (len == 0 || (delta <= 0 && (len < 3 || node.m_endtype != etClosedPolygon))) + continue; + + m_destPoly.clear(); + if (len == 1) + { + if (node.m_jointype == jtRound) + { + double X = 1.0, Y = 0.0; + for (cInt j = 1; j <= steps; j++) + { + m_destPoly.push_back(IntPoint( + Round(m_srcPoly[0].X + X * delta), + Round(m_srcPoly[0].Y + Y * delta))); + double X2 = X; + X = X * m_cos - m_sin * Y; + Y = X2 * m_sin + Y * m_cos; + } + } + else + { + double X = -1.0, Y = -1.0; + for (int j = 0; j < 4; ++j) + { + m_destPoly.push_back(IntPoint( + Round(m_srcPoly[0].X + X * delta), + Round(m_srcPoly[0].Y + Y * delta))); + if (X < 0) X = 1; + else if (Y < 0) Y = 1; + else X = -1; + } + } + m_destPolys.push_back(m_destPoly); + continue; + } + //build m_normals ... + m_normals.clear(); + m_normals.reserve(len); + for (int j = 0; j < len - 1; ++j) + m_normals.push_back(GetUnitNormal(m_srcPoly[j], m_srcPoly[j + 1])); + if (node.m_endtype == etClosedLine || node.m_endtype == etClosedPolygon) + m_normals.push_back(GetUnitNormal(m_srcPoly[len - 1], m_srcPoly[0])); + else + m_normals.push_back(DoublePoint(m_normals[len - 2])); + + if (node.m_endtype == etClosedPolygon) + { + int k = len - 1; + for (int j = 0; j < len; ++j) + OffsetPoint(j, k, node.m_jointype); + m_destPolys.push_back(m_destPoly); + } + else if (node.m_endtype == etClosedLine) + { + int k = len - 1; + for (int j = 0; j < len; ++j) + OffsetPoint(j, k, node.m_jointype); + m_destPolys.push_back(m_destPoly); + m_destPoly.clear(); + //re-build m_normals ... + DoublePoint n = m_normals[len -1]; + for (int j = len - 1; j > 0; j--) + m_normals[j] = DoublePoint(-m_normals[j - 1].X, -m_normals[j - 1].Y); + m_normals[0] = DoublePoint(-n.X, -n.Y); + k = 0; + for (int j = len - 1; j >= 0; j--) + OffsetPoint(j, k, node.m_jointype); + m_destPolys.push_back(m_destPoly); + } + else + { + int k = 0; + for (int j = 1; j < len - 1; ++j) + OffsetPoint(j, k, node.m_jointype); + + IntPoint pt1; + if (node.m_endtype == etOpenButt) + { + int j = len - 1; + pt1 = IntPoint(Round(m_srcPoly[j].X + m_normals[j].X * + delta), Round(m_srcPoly[j].Y + m_normals[j].Y * delta)); + m_destPoly.push_back(pt1); + pt1 = IntPoint(Round(m_srcPoly[j].X - m_normals[j].X * + delta), Round(m_srcPoly[j].Y - m_normals[j].Y * delta)); + m_destPoly.push_back(pt1); + } + else + { + int j = len - 1; + k = len - 2; + m_sinA = 0; + m_normals[j] = DoublePoint(-m_normals[j].X, -m_normals[j].Y); + if (node.m_endtype == etOpenSquare) + DoSquare(j, k); + else + DoRound(j, k); + } + + //re-build m_normals ... + for (int j = len - 1; j > 0; j--) + m_normals[j] = DoublePoint(-m_normals[j - 1].X, -m_normals[j - 1].Y); + m_normals[0] = DoublePoint(-m_normals[1].X, -m_normals[1].Y); + + k = len - 1; + for (int j = k - 1; j > 0; --j) OffsetPoint(j, k, node.m_jointype); + + if (node.m_endtype == etOpenButt) + { + pt1 = IntPoint(Round(m_srcPoly[0].X - m_normals[0].X * delta), + Round(m_srcPoly[0].Y - m_normals[0].Y * delta)); + m_destPoly.push_back(pt1); + pt1 = IntPoint(Round(m_srcPoly[0].X + m_normals[0].X * delta), + Round(m_srcPoly[0].Y + m_normals[0].Y * delta)); + m_destPoly.push_back(pt1); + } + else + { + k = 1; + m_sinA = 0; + if (node.m_endtype == etOpenSquare) + DoSquare(0, 1); + else + DoRound(0, 1); + } + m_destPolys.push_back(m_destPoly); + } + } +} +//------------------------------------------------------------------------------ + +void ClipperOffset::OffsetPoint(int j, int& k, JoinType jointype) +{ + //cross product ... + m_sinA = (m_normals[k].X * m_normals[j].Y - m_normals[j].X * m_normals[k].Y); + if (std::fabs(m_sinA * m_delta) < 1.0) + { + //dot product ... + double cosA = (m_normals[k].X * m_normals[j].X + m_normals[j].Y * m_normals[k].Y ); + if (cosA > 0) // angle => 0 degrees + { + m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].X + m_normals[k].X * m_delta), + Round(m_srcPoly[j].Y + m_normals[k].Y * m_delta))); + return; + } + //else angle => 180 degrees + } + else if (m_sinA > 1.0) m_sinA = 1.0; + else if (m_sinA < -1.0) m_sinA = -1.0; + + if (m_sinA * m_delta < 0) + { + m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].X + m_normals[k].X * m_delta), + Round(m_srcPoly[j].Y + m_normals[k].Y * m_delta))); + m_destPoly.push_back(m_srcPoly[j]); + m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].X + m_normals[j].X * m_delta), + Round(m_srcPoly[j].Y + m_normals[j].Y * m_delta))); + } + else + switch (jointype) + { + case jtMiter: + { + double r = 1 + (m_normals[j].X * m_normals[k].X + + m_normals[j].Y * m_normals[k].Y); + if (r >= m_miterLim) DoMiter(j, k, r); else DoSquare(j, k); + break; + } + case jtSquare: DoSquare(j, k); break; + case jtRound: DoRound(j, k); break; + } + k = j; +} +//------------------------------------------------------------------------------ + +void ClipperOffset::DoSquare(int j, int k) +{ + double dx = std::tan(std::atan2(m_sinA, + m_normals[k].X * m_normals[j].X + m_normals[k].Y * m_normals[j].Y) / 4); + m_destPoly.push_back(IntPoint( + Round(m_srcPoly[j].X + m_delta * (m_normals[k].X - m_normals[k].Y * dx)), + Round(m_srcPoly[j].Y + m_delta * (m_normals[k].Y + m_normals[k].X * dx)))); + m_destPoly.push_back(IntPoint( + Round(m_srcPoly[j].X + m_delta * (m_normals[j].X + m_normals[j].Y * dx)), + Round(m_srcPoly[j].Y + m_delta * (m_normals[j].Y - m_normals[j].X * dx)))); +} +//------------------------------------------------------------------------------ + +void ClipperOffset::DoMiter(int j, int k, double r) +{ + double q = m_delta / r; + m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].X + (m_normals[k].X + m_normals[j].X) * q), + Round(m_srcPoly[j].Y + (m_normals[k].Y + m_normals[j].Y) * q))); +} +//------------------------------------------------------------------------------ + +void ClipperOffset::DoRound(int j, int k) +{ + double a = std::atan2(m_sinA, + m_normals[k].X * m_normals[j].X + m_normals[k].Y * m_normals[j].Y); + int steps = std::max((int)Round(m_StepsPerRad * std::fabs(a)), 1); + + double X = m_normals[k].X, Y = m_normals[k].Y, X2; + for (int i = 0; i < steps; ++i) + { + m_destPoly.push_back(IntPoint( + Round(m_srcPoly[j].X + X * m_delta), + Round(m_srcPoly[j].Y + Y * m_delta))); + X2 = X; + X = X * m_cos - m_sin * Y; + Y = X2 * m_sin + Y * m_cos; + } + m_destPoly.push_back(IntPoint( + Round(m_srcPoly[j].X + m_normals[j].X * m_delta), + Round(m_srcPoly[j].Y + m_normals[j].Y * m_delta))); +} + +//------------------------------------------------------------------------------ +// Miscellaneous public functions +//------------------------------------------------------------------------------ + +// Called by Clipper::ExecuteInternal() +// For each polygon, search for exactly duplicate non-successive points. +// If such a point is found, the loop is split into two pieces. +// Search for the duplicate points is O(n^2)! +// http://www.angusj.com/delphi/clipper/documentation/Docs/Units/ClipperLib/Classes/Clipper/Properties/StrictlySimple.htm +void Clipper::DoSimplePolygons() +{ + PROFILE_FUNC(); + size_t i = 0; + while (i < m_PolyOuts.size()) + { + OutRec* outrec = m_PolyOuts[i++]; + OutPt* op = outrec->Pts; + if (!op || outrec->IsOpen) continue; + do //for each Pt in Polygon until duplicate found do ... + { + OutPt* op2 = op->Next; + while (op2 != outrec->Pts) + { + if ((op->Pt == op2->Pt) && op2->Next != op && op2->Prev != op) + { + //split the polygon into two ... + OutPt* op3 = op->Prev; + OutPt* op4 = op2->Prev; + op->Prev = op4; + op4->Next = op; + op2->Prev = op3; + op3->Next = op2; + + outrec->Pts = op; + OutRec* outrec2 = CreateOutRec(); + outrec2->Pts = op2; + UpdateOutPtIdxs(*outrec2); + if (Poly2ContainsPoly1(outrec2->Pts, outrec->Pts)) + { + //OutRec2 is contained by OutRec1 ... + outrec2->IsHole = !outrec->IsHole; + outrec2->FirstLeft = outrec; + // For each m_PolyOuts, replace FirstLeft from outRec2 to outrec. + if (m_UsingPolyTree) FixupFirstLefts2(outrec2, outrec); + } + else + if (Poly2ContainsPoly1(outrec->Pts, outrec2->Pts)) + { + //OutRec1 is contained by OutRec2 ... + outrec2->IsHole = outrec->IsHole; + outrec->IsHole = !outrec2->IsHole; + outrec2->FirstLeft = outrec->FirstLeft; + outrec->FirstLeft = outrec2; + // For each m_PolyOuts, replace FirstLeft from outrec to outrec2. + if (m_UsingPolyTree) FixupFirstLefts2(outrec, outrec2); + } + else + { + //the 2 polygons are separate ... + outrec2->IsHole = outrec->IsHole; + outrec2->FirstLeft = outrec->FirstLeft; + // For each polygon of m_PolyOuts, replace FirstLeft from outrec to outrec2 if the polygon is inside outRec2. + //FIXME This is potentially very expensive! O(n^3)! + if (m_UsingPolyTree) FixupFirstLefts1(outrec, outrec2); + } + op2 = op; //ie get ready for the Next iteration + } + op2 = op2->Next; + } + op = op->Next; + } + while (op != outrec->Pts); + } +} +//------------------------------------------------------------------------------ + +void ReversePath(Path& p) +{ + std::reverse(p.begin(), p.end()); +} +//------------------------------------------------------------------------------ + +void ReversePaths(Paths& p) +{ + for (Paths::size_type i = 0; i < p.size(); ++i) + ReversePath(p[i]); +} +//------------------------------------------------------------------------------ + +void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType) +{ + Clipper c; + c.StrictlySimple(true); + c.AddPath(in_poly, ptSubject, true); + c.Execute(ctUnion, out_polys, fillType, fillType); +} +//------------------------------------------------------------------------------ + +void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType) +{ + Clipper c; + c.StrictlySimple(true); + c.AddPaths(in_polys, ptSubject, true); + c.Execute(ctUnion, out_polys, fillType, fillType); +} +//------------------------------------------------------------------------------ + +void SimplifyPolygons(Paths &polys, PolyFillType fillType) +{ + SimplifyPolygons(polys, polys, fillType); +} +//------------------------------------------------------------------------------ + +inline double DistanceSqrd(const IntPoint& pt1, const IntPoint& pt2) +{ + double Dx = ((double)pt1.X - pt2.X); + double dy = ((double)pt1.Y - pt2.Y); + return (Dx*Dx + dy*dy); +} +//------------------------------------------------------------------------------ + +double DistanceFromLineSqrd( + const IntPoint& pt, const IntPoint& ln1, const IntPoint& ln2) +{ + //The equation of a line in general form (Ax + By + C = 0) + //given 2 points (x¹,y¹) & (x²,y²) is ... + //(y¹ - y²)x + (x² - x¹)y + (y² - y¹)x¹ - (x² - x¹)y¹ = 0 + //A = (y¹ - y²); B = (x² - x¹); C = (y² - y¹)x¹ - (x² - x¹)y¹ + //perpendicular distance of point (x³,y³) = (Ax³ + By³ + C)/Sqrt(A² + B²) + //see http://en.wikipedia.org/wiki/Perpendicular_distance + double A = double(ln1.Y - ln2.Y); + double B = double(ln2.X - ln1.X); + double C = A * ln1.X + B * ln1.Y; + C = A * pt.X + B * pt.Y - C; + return (C * C) / (A * A + B * B); +} +//--------------------------------------------------------------------------- + +bool SlopesNearCollinear(const IntPoint& pt1, + const IntPoint& pt2, const IntPoint& pt3, double distSqrd) +{ + //this function is more accurate when the point that's geometrically + //between the other 2 points is the one that's tested for distance. + //ie makes it more likely to pick up 'spikes' ... + if (std::abs(pt1.X - pt2.X) > std::abs(pt1.Y - pt2.Y)) + { + if ((pt1.X > pt2.X) == (pt1.X < pt3.X)) + return DistanceFromLineSqrd(pt1, pt2, pt3) < distSqrd; + else if ((pt2.X > pt1.X) == (pt2.X < pt3.X)) + return DistanceFromLineSqrd(pt2, pt1, pt3) < distSqrd; + else + return DistanceFromLineSqrd(pt3, pt1, pt2) < distSqrd; + } + else + { + if ((pt1.Y > pt2.Y) == (pt1.Y < pt3.Y)) + return DistanceFromLineSqrd(pt1, pt2, pt3) < distSqrd; + else if ((pt2.Y > pt1.Y) == (pt2.Y < pt3.Y)) + return DistanceFromLineSqrd(pt2, pt1, pt3) < distSqrd; + else + return DistanceFromLineSqrd(pt3, pt1, pt2) < distSqrd; + } +} +//------------------------------------------------------------------------------ + +bool PointsAreClose(IntPoint pt1, IntPoint pt2, double distSqrd) +{ + double Dx = (double)pt1.X - pt2.X; + double dy = (double)pt1.Y - pt2.Y; + return ((Dx * Dx) + (dy * dy) <= distSqrd); +} +//------------------------------------------------------------------------------ + +OutPt* ExcludeOp(OutPt* op) +{ + OutPt* result = op->Prev; + result->Next = op->Next; + op->Next->Prev = result; + result->Idx = 0; + return result; +} +//------------------------------------------------------------------------------ + +// Simplify a polygon using a linked list of points. +void CleanPolygon(const Path& in_poly, Path& out_poly, double distance) +{ + //distance = proximity in units/pixels below which vertices + //will be stripped. Default ~= sqrt(2). + + size_t size = in_poly.size(); + + if (size == 0) + { + out_poly.clear(); + return; + } + + std::vector outPts(size); + for (size_t i = 0; i < size; ++i) + { + outPts[i].Pt = in_poly[i]; + outPts[i].Next = &outPts[(i + 1) % size]; + outPts[i].Next->Prev = &outPts[i]; + outPts[i].Idx = 0; + } + + double distSqrd = distance * distance; + OutPt* op = &outPts[0]; + while (op->Idx == 0 && op->Next != op->Prev) + { + if (PointsAreClose(op->Pt, op->Prev->Pt, distSqrd)) + { + op = ExcludeOp(op); + size--; + } + else if (PointsAreClose(op->Prev->Pt, op->Next->Pt, distSqrd)) + { + ExcludeOp(op->Next); + op = ExcludeOp(op); + size -= 2; + } + else if (SlopesNearCollinear(op->Prev->Pt, op->Pt, op->Next->Pt, distSqrd)) + { + op = ExcludeOp(op); + size--; + } + else + { + op->Idx = 1; + op = op->Next; + } + } + + if (size < 3) size = 0; + out_poly.resize(size); + for (size_t i = 0; i < size; ++i) + { + out_poly[i] = op->Pt; + op = op->Next; + } +} +//------------------------------------------------------------------------------ + +void CleanPolygon(Path& poly, double distance) +{ + CleanPolygon(poly, poly, distance); +} +//------------------------------------------------------------------------------ + +void CleanPolygons(const Paths& in_polys, Paths& out_polys, double distance) +{ + for (Paths::size_type i = 0; i < in_polys.size(); ++i) + CleanPolygon(in_polys[i], out_polys[i], distance); +} +//------------------------------------------------------------------------------ + +void CleanPolygons(Paths& polys, double distance) +{ + CleanPolygons(polys, polys, distance); +} +//------------------------------------------------------------------------------ + +void Minkowski(const Path& poly, const Path& path, + Paths& solution, bool isSum, bool isClosed) +{ + int delta = (isClosed ? 1 : 0); + size_t polyCnt = poly.size(); + size_t pathCnt = path.size(); + Paths pp; + pp.reserve(pathCnt); + if (isSum) + for (size_t i = 0; i < pathCnt; ++i) + { + Path p; + p.reserve(polyCnt); + for (size_t j = 0; j < poly.size(); ++j) + p.push_back(IntPoint(path[i].X + poly[j].X, path[i].Y + poly[j].Y)); + pp.push_back(p); + } + else + for (size_t i = 0; i < pathCnt; ++i) + { + Path p; + p.reserve(polyCnt); + for (size_t j = 0; j < poly.size(); ++j) + p.push_back(IntPoint(path[i].X - poly[j].X, path[i].Y - poly[j].Y)); + pp.push_back(p); + } + + solution.clear(); + solution.reserve((pathCnt + delta) * (polyCnt + 1)); + for (size_t i = 0; i < pathCnt - 1 + delta; ++i) + for (size_t j = 0; j < polyCnt; ++j) + { + Path quad; + quad.reserve(4); + quad.push_back(pp[i % pathCnt][j % polyCnt]); + quad.push_back(pp[(i + 1) % pathCnt][j % polyCnt]); + quad.push_back(pp[(i + 1) % pathCnt][(j + 1) % polyCnt]); + quad.push_back(pp[i % pathCnt][(j + 1) % polyCnt]); + if (!Orientation(quad)) ReversePath(quad); + solution.push_back(quad); + } +} +//------------------------------------------------------------------------------ + +void MinkowskiSum(const Path& pattern, const Path& path, Paths& solution, bool pathIsClosed) +{ + Minkowski(pattern, path, solution, true, pathIsClosed); + Clipper c; + c.AddPaths(solution, ptSubject, true); + c.Execute(ctUnion, solution, pftNonZero, pftNonZero); +} +//------------------------------------------------------------------------------ + +void TranslatePath(const Path& input, Path& output, const IntPoint& delta) +{ + //precondition: input != output + output.resize(input.size()); + for (size_t i = 0; i < input.size(); ++i) + output[i] = IntPoint(input[i].X + delta.X, input[i].Y + delta.Y); +} +//------------------------------------------------------------------------------ + +void MinkowskiSum(const Path& pattern, const Paths& paths, Paths& solution, bool pathIsClosed) +{ + Clipper c; + for (size_t i = 0; i < paths.size(); ++i) + { + Paths tmp; + Minkowski(pattern, paths[i], tmp, true, pathIsClosed); + c.AddPaths(tmp, ptSubject, true); + if (pathIsClosed) + { + Path tmp2; + TranslatePath(paths[i], tmp2, pattern[0]); + c.AddPath(tmp2, ptClip, true); + } + } + c.Execute(ctUnion, solution, pftNonZero, pftNonZero); +} +//------------------------------------------------------------------------------ + +void MinkowskiDiff(const Path& poly1, const Path& poly2, Paths& solution) +{ + Minkowski(poly1, poly2, solution, false, true); + Clipper c; + c.AddPaths(solution, ptSubject, true); + c.Execute(ctUnion, solution, pftNonZero, pftNonZero); +} +//------------------------------------------------------------------------------ + +enum NodeType {ntAny, ntOpen, ntClosed}; + +void AddPolyNodeToPaths(const PolyNode& polynode, NodeType nodetype, Paths& paths) +{ + bool match = true; + if (nodetype == ntClosed) match = !polynode.IsOpen(); + else if (nodetype == ntOpen) return; + + if (!polynode.Contour.empty() && match) + paths.push_back(polynode.Contour); + for (int i = 0; i < polynode.ChildCount(); ++i) + AddPolyNodeToPaths(*polynode.Childs[i], nodetype, paths); +} +//------------------------------------------------------------------------------ + +void PolyTreeToPaths(const PolyTree& polytree, Paths& paths) +{ + paths.resize(0); + paths.reserve(polytree.Total()); + AddPolyNodeToPaths(polytree, ntAny, paths); +} +//------------------------------------------------------------------------------ + +void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths) +{ + paths.resize(0); + paths.reserve(polytree.Total()); + AddPolyNodeToPaths(polytree, ntClosed, paths); +} +//------------------------------------------------------------------------------ + +void OpenPathsFromPolyTree(PolyTree& polytree, Paths& paths) +{ + paths.resize(0); + paths.reserve(polytree.Total()); + //Open paths are top level only, so ... + for (int i = 0; i < polytree.ChildCount(); ++i) + if (polytree.Childs[i]->IsOpen()) + paths.push_back(polytree.Childs[i]->Contour); +} +//------------------------------------------------------------------------------ + +std::ostream& operator <<(std::ostream &s, const IntPoint &p) +{ + s << "(" << p.X << "," << p.Y << ")"; + return s; +} +//------------------------------------------------------------------------------ + +std::ostream& operator <<(std::ostream &s, const Path &p) +{ + if (p.empty()) return s; + Path::size_type last = p.size() -1; + for (Path::size_type i = 0; i < last; i++) + s << "(" << p[i].X << "," << p[i].Y << "), "; + s << "(" << p[last].X << "," << p[last].Y << ")\n"; + return s; +} +//------------------------------------------------------------------------------ + +std::ostream& operator <<(std::ostream &s, const Paths &p) +{ + for (Paths::size_type i = 0; i < p.size(); i++) + s << p[i]; + s << "\n"; + return s; +} +//------------------------------------------------------------------------------ + +} //ClipperLib namespace diff --git a/xs/src/clipper.hpp b/src/clipper/clipper.hpp similarity index 97% rename from xs/src/clipper.hpp rename to src/clipper/clipper.hpp index 2e70696197..8a28fe46f7 100644 --- a/xs/src/clipper.hpp +++ b/src/clipper/clipper.hpp @@ -1,487 +1,487 @@ -/******************************************************************************* -* * -* Author : Angus Johnson * -* Version : 6.2.9 * -* Date : 16 February 2015 * -* Website : http://www.angusj.com * -* Copyright : Angus Johnson 2010-2015 * -* * -* License: * -* Use, modification & distribution is subject to Boost Software License Ver 1. * -* http://www.boost.org/LICENSE_1_0.txt * -* * -* Attributions: * -* The code in this library is an extension of Bala Vatti's clipping algorithm: * -* "A generic solution to polygon clipping" * -* Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63. * -* http://portal.acm.org/citation.cfm?id=129906 * -* * -* Computer graphics and geometric modeling: implementation and algorithms * -* By Max K. Agoston * -* Springer; 1 edition (January 4, 2005) * -* http://books.google.com/books?q=vatti+clipping+agoston * -* * -* See also: * -* "Polygon Offsetting by Computing Winding Numbers" * -* Paper no. DETC2005-85513 pp. 565-575 * -* ASME 2005 International Design Engineering Technical Conferences * -* and Computers and Information in Engineering Conference (IDETC/CIE2005) * -* September 24-28, 2005 , Long Beach, California, USA * -* http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf * -* * -*******************************************************************************/ - -#ifndef clipper_hpp -#define clipper_hpp - -#include - -#define CLIPPER_VERSION "6.2.6" - -//use_xyz: adds a Z member to IntPoint. Adds a minor cost to perfomance. -//#define use_xyz - -//use_lines: Enables line clipping. Adds a very minor cost to performance. -#define use_lines - -//use_deprecated: Enables temporary support for the obsolete functions -//#define use_deprecated - -#include -#include -#include -#include -#include -#include -#include -#include - -namespace ClipperLib { - -enum ClipType { ctIntersection, ctUnion, ctDifference, ctXor }; -enum PolyType { ptSubject, ptClip }; -//By far the most widely used winding rules for polygon filling are -//EvenOdd & NonZero (GDI, GDI+, XLib, OpenGL, Cairo, AGG, Quartz, SVG, Gr32) -//Others rules include Positive, Negative and ABS_GTR_EQ_TWO (only in OpenGL) -//see http://glprogramming.com/red/chapter11.html -enum PolyFillType { pftEvenOdd, pftNonZero, pftPositive, pftNegative }; - -// Point coordinate type -typedef int64_t cInt; -// Maximum cInt value to allow a cross product calculation using 32bit expressions. -static cInt const loRange = 0x3FFFFFFF; -// Maximum allowed cInt value. -static cInt const hiRange = 0x3FFFFFFFFFFFFFFFLL; - -struct IntPoint { - cInt X; - cInt Y; -#ifdef use_xyz - cInt Z; - IntPoint(cInt x = 0, cInt y = 0, cInt z = 0): X(x), Y(y), Z(z) {}; -#else - IntPoint(cInt x = 0, cInt y = 0): X(x), Y(y) {}; -#endif - - friend inline bool operator== (const IntPoint& a, const IntPoint& b) - { - return a.X == b.X && a.Y == b.Y; - } - friend inline bool operator!= (const IntPoint& a, const IntPoint& b) - { - return a.X != b.X || a.Y != b.Y; - } -}; -//------------------------------------------------------------------------------ - -typedef std::vector< IntPoint > Path; -typedef std::vector< Path > Paths; - -inline Path& operator <<(Path& poly, const IntPoint& p) {poly.push_back(p); return poly;} -inline Paths& operator <<(Paths& polys, const Path& p) {polys.push_back(p); return polys;} - -std::ostream& operator <<(std::ostream &s, const IntPoint &p); -std::ostream& operator <<(std::ostream &s, const Path &p); -std::ostream& operator <<(std::ostream &s, const Paths &p); - -struct DoublePoint -{ - double X; - double Y; - DoublePoint(double x = 0, double y = 0) : X(x), Y(y) {} - DoublePoint(IntPoint ip) : X((double)ip.X), Y((double)ip.Y) {} -}; -//------------------------------------------------------------------------------ - -#ifdef use_xyz -typedef void (*ZFillCallback)(IntPoint& e1bot, IntPoint& e1top, IntPoint& e2bot, IntPoint& e2top, IntPoint& pt); -#endif - -enum InitOptions {ioReverseSolution = 1, ioStrictlySimple = 2, ioPreserveCollinear = 4}; -enum JoinType {jtSquare, jtRound, jtMiter}; -enum EndType {etClosedPolygon, etClosedLine, etOpenButt, etOpenSquare, etOpenRound}; - -class PolyNode; -typedef std::vector< PolyNode* > PolyNodes; - -class PolyNode -{ -public: - PolyNode() : Childs(), Parent(0), Index(0), m_IsOpen(false) {} - virtual ~PolyNode(){}; - Path Contour; - PolyNodes Childs; - PolyNode* Parent; - // Traversal of the polygon tree in a depth first fashion. - PolyNode* GetNext() const { return Childs.empty() ? GetNextSiblingUp() : Childs.front(); } - bool IsHole() const; - bool IsOpen() const { return m_IsOpen; } - int ChildCount() const { return (int)Childs.size(); } -private: - unsigned Index; //node index in Parent.Childs - bool m_IsOpen; - JoinType m_jointype; - EndType m_endtype; - PolyNode* GetNextSiblingUp() const { return Parent ? ((Index == Parent->Childs.size() - 1) ? Parent->GetNextSiblingUp() : Parent->Childs[Index + 1]) : nullptr; } - void AddChild(PolyNode& child); - friend class Clipper; //to access Index - friend class ClipperOffset; - friend class PolyTree; //to implement the PolyTree::move operator -}; - -class PolyTree: public PolyNode -{ -public: - PolyTree() {} - PolyTree(PolyTree &&src) { *this = std::move(src); } - virtual ~PolyTree(){Clear();}; - PolyTree& operator=(PolyTree &&src) { - AllNodes = std::move(src.AllNodes); - Contour = std::move(src.Contour); - Childs = std::move(src.Childs); - Parent = nullptr; - Index = src.Index; - m_IsOpen = src.m_IsOpen; - m_jointype = src.m_jointype; - m_endtype = src.m_endtype; - for (size_t i = 0; i < Childs.size(); ++ i) - Childs[i]->Parent = this; - return *this; - } - PolyNode* GetFirst() const { return Childs.empty() ? nullptr : Childs.front(); } - void Clear() { AllNodes.clear(); Childs.clear(); } - int Total() const; -private: - PolyTree(const PolyTree &src) = delete; - PolyTree& operator=(const PolyTree &src) = delete; - std::vector AllNodes; - friend class Clipper; //to access AllNodes -}; - -double Area(const Path &poly); -inline bool Orientation(const Path &poly) { return Area(poly) >= 0; } -int PointInPolygon(const IntPoint &pt, const Path &path); - -void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType = pftEvenOdd); -void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType = pftEvenOdd); -void SimplifyPolygons(Paths &polys, PolyFillType fillType = pftEvenOdd); - -void CleanPolygon(const Path& in_poly, Path& out_poly, double distance = 1.415); -void CleanPolygon(Path& poly, double distance = 1.415); -void CleanPolygons(const Paths& in_polys, Paths& out_polys, double distance = 1.415); -void CleanPolygons(Paths& polys, double distance = 1.415); - -void MinkowskiSum(const Path& pattern, const Path& path, Paths& solution, bool pathIsClosed); -void MinkowskiSum(const Path& pattern, const Paths& paths, Paths& solution, bool pathIsClosed); -void MinkowskiDiff(const Path& poly1, const Path& poly2, Paths& solution); - -void PolyTreeToPaths(const PolyTree& polytree, Paths& paths); -void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths); -void OpenPathsFromPolyTree(PolyTree& polytree, Paths& paths); - -void ReversePath(Path& p); -void ReversePaths(Paths& p); - -struct IntRect { cInt left; cInt top; cInt right; cInt bottom; }; - -//enums that are used internally ... -enum EdgeSide { esLeft = 1, esRight = 2}; - -// namespace Internal { - //forward declarations (for stuff used internally) ... - struct TEdge { - // Bottom point of this edge (with minimum Y). - IntPoint Bot; - // Current position. - IntPoint Curr; - // Top point of this edge (with maximum Y). - IntPoint Top; - // Vector from Bot to Top. - IntPoint Delta; - // Slope (dx/dy). For horiontal edges, the slope is set to HORIZONTAL (-1.0E+40). - double Dx; - PolyType PolyTyp; - EdgeSide Side; - // Winding number delta. 1 or -1 depending on winding direction, 0 for open paths and flat closed paths. - int WindDelta; - int WindCnt; - int WindCnt2; //winding count of the opposite polytype - int OutIdx; - // Next edge in the input path. - TEdge *Next; - // Previous edge in the input path. - TEdge *Prev; - // Next edge in the Local Minima List chain. - TEdge *NextInLML; - TEdge *NextInAEL; - TEdge *PrevInAEL; - TEdge *NextInSEL; - TEdge *PrevInSEL; - }; - - struct IntersectNode { - IntersectNode(TEdge *Edge1, TEdge *Edge2, IntPoint Pt) : - Edge1(Edge1), Edge2(Edge2), Pt(Pt) {} - TEdge *Edge1; - TEdge *Edge2; - IntPoint Pt; - }; - - struct LocalMinimum { - cInt Y; - TEdge *LeftBound; - TEdge *RightBound; - }; - - // Point of an output polygon. - // 36B on 64bit system without use_xyz. - struct OutPt { - // 4B - int Idx; - // 16B without use_xyz / 24B with use_xyz - IntPoint Pt; - // 4B on 32bit system, 8B on 64bit system - OutPt *Next; - // 4B on 32bit system, 8B on 64bit system - OutPt *Prev; - }; - - struct OutRec; - struct Join { - Join(OutPt *OutPt1, OutPt *OutPt2, IntPoint OffPt) : - OutPt1(OutPt1), OutPt2(OutPt2), OffPt(OffPt) {} - OutPt *OutPt1; - OutPt *OutPt2; - IntPoint OffPt; - }; -// }; // namespace Internal - -//------------------------------------------------------------------------------ - -//ClipperBase is the ancestor to the Clipper class. It should not be -//instantiated directly. This class simply abstracts the conversion of sets of -//polygon coordinates into edge objects that are stored in a LocalMinima list. -class ClipperBase -{ -public: - ClipperBase() : m_UseFullRange(false), m_HasOpenPaths(false) {} - ~ClipperBase() { Clear(); } - bool AddPath(const Path &pg, PolyType PolyTyp, bool Closed); - bool AddPaths(const Paths &ppg, PolyType PolyTyp, bool Closed); - void Clear(); - IntRect GetBounds(); - // By default, when three or more vertices are collinear in input polygons (subject or clip), the Clipper object removes the 'inner' vertices before clipping. - // When enabled the PreserveCollinear property prevents this default behavior to allow these inner vertices to appear in the solution. - bool PreserveCollinear() const {return m_PreserveCollinear;}; - void PreserveCollinear(bool value) {m_PreserveCollinear = value;}; -protected: - bool AddPathInternal(const Path &pg, int highI, PolyType PolyTyp, bool Closed, TEdge* edges); - TEdge* AddBoundsToLML(TEdge *e, bool IsClosed); - void Reset(); - TEdge* ProcessBound(TEdge* E, bool IsClockwise); - TEdge* DescendToMin(TEdge *&E); - void AscendToMax(TEdge *&E, bool Appending, bool IsClosed); - - // Local minima (Y, left edge, right edge) sorted by ascending Y. - std::vector m_MinimaList; - - // True if the input polygons have abs values higher than loRange, but lower than hiRange. - // False if the input polygons have abs values lower or equal to loRange. - bool m_UseFullRange; - // A vector of edges per each input path. - std::vector> m_edges; - // Don't remove intermediate vertices of a collinear sequence of points. - bool m_PreserveCollinear; - // Is any of the paths inserted by AddPath() or AddPaths() open? - bool m_HasOpenPaths; -}; -//------------------------------------------------------------------------------ - -class Clipper : public ClipperBase -{ -public: - Clipper(int initOptions = 0); - ~Clipper() { Clear(); } - void Clear() { ClipperBase::Clear(); DisposeAllOutRecs(); } - bool Execute(ClipType clipType, - Paths &solution, - PolyFillType fillType = pftEvenOdd) - { return Execute(clipType, solution, fillType, fillType); } - bool Execute(ClipType clipType, - Paths &solution, - PolyFillType subjFillType, - PolyFillType clipFillType); - bool Execute(ClipType clipType, - PolyTree &polytree, - PolyFillType fillType = pftEvenOdd) - { return Execute(clipType, polytree, fillType, fillType); } - bool Execute(ClipType clipType, - PolyTree &polytree, - PolyFillType subjFillType, - PolyFillType clipFillType); - bool ReverseSolution() const { return m_ReverseOutput; }; - void ReverseSolution(bool value) {m_ReverseOutput = value;}; - bool StrictlySimple() const {return m_StrictSimple;}; - void StrictlySimple(bool value) {m_StrictSimple = value;}; - //set the callback function for z value filling on intersections (otherwise Z is 0) -#ifdef use_xyz - void ZFillFunction(ZFillCallback zFillFunc) { m_ZFill = zFillFunc; } -#endif -protected: - void Reset(); - virtual bool ExecuteInternal(); -private: - - // Output polygons. - std::vector m_PolyOuts; - // Output points, allocated by a continuous sets of m_OutPtsChunkSize. - std::vector m_OutPts; - // List of free output points, to be used before taking a point from m_OutPts or allocating a new chunk. - OutPt *m_OutPtsFree; - size_t m_OutPtsChunkSize; - size_t m_OutPtsChunkLast; - - std::vector m_Joins; - std::vector m_GhostJoins; - std::vector m_IntersectList; - ClipType m_ClipType; - // A priority queue (a binary heap) of Y coordinates. - std::priority_queue m_Scanbeam; - // Maxima are collected by ProcessEdgesAtTopOfScanbeam(), consumed by ProcessHorizontal(). - std::vector m_Maxima; - TEdge *m_ActiveEdges; - TEdge *m_SortedEdges; - PolyFillType m_ClipFillType; - PolyFillType m_SubjFillType; - bool m_ReverseOutput; - // Does the result go to a PolyTree or Paths? - bool m_UsingPolyTree; - bool m_StrictSimple; -#ifdef use_xyz - ZFillCallback m_ZFill; //custom callback -#endif - void SetWindingCount(TEdge& edge) const; - bool IsEvenOddFillType(const TEdge& edge) const - { return (edge.PolyTyp == ptSubject) ? m_SubjFillType == pftEvenOdd : m_ClipFillType == pftEvenOdd; } - bool IsEvenOddAltFillType(const TEdge& edge) const - { return (edge.PolyTyp == ptSubject) ? m_ClipFillType == pftEvenOdd : m_SubjFillType == pftEvenOdd; } - void InsertLocalMinimaIntoAEL(const cInt botY); - void InsertEdgeIntoAEL(TEdge *edge, TEdge* startEdge); - void AddEdgeToSEL(TEdge *edge); - void CopyAELToSEL(); - void DeleteFromSEL(TEdge *e); - void DeleteFromAEL(TEdge *e); - void UpdateEdgeIntoAEL(TEdge *&e); - void SwapPositionsInSEL(TEdge *edge1, TEdge *edge2); - bool IsContributing(const TEdge& edge) const; - bool IsTopHorz(const cInt XPos); - void SwapPositionsInAEL(TEdge *edge1, TEdge *edge2); - void DoMaxima(TEdge *e); - void ProcessHorizontals(); - void ProcessHorizontal(TEdge *horzEdge); - void AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &pt); - OutPt* AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &pt); - OutRec* GetOutRec(int idx); - void AppendPolygon(TEdge *e1, TEdge *e2) const; - void IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &pt); - OutRec* CreateOutRec(); - OutPt* AddOutPt(TEdge *e, const IntPoint &pt); - OutPt* GetLastOutPt(TEdge *e); - OutPt* AllocateOutPt(); - OutPt* DupOutPt(OutPt* outPt, bool InsertAfter); - // Add the point to a list of free points. - void DisposeOutPt(OutPt *pt) { pt->Next = m_OutPtsFree; m_OutPtsFree = pt; } - void DisposeOutPts(OutPt*& pp) { if (pp != nullptr) { pp->Prev->Next = m_OutPtsFree; m_OutPtsFree = pp; } } - void DisposeAllOutRecs(); - bool ProcessIntersections(const cInt topY); - void BuildIntersectList(const cInt topY); - void ProcessEdgesAtTopOfScanbeam(const cInt topY); - void BuildResult(Paths& polys); - void BuildResult2(PolyTree& polytree); - void SetHoleState(TEdge *e, OutRec *outrec) const; - bool FixupIntersectionOrder(); - void FixupOutPolygon(OutRec &outrec); - void FixupOutPolyline(OutRec &outrec); - bool FindOwnerFromSplitRecs(OutRec &outRec, OutRec *&currOrfl); - void FixHoleLinkage(OutRec &outrec); - bool JoinPoints(Join *j, OutRec* outRec1, OutRec* outRec2); - bool JoinHorz(OutPt* op1, OutPt* op1b, OutPt* op2, OutPt* op2b, const IntPoint &Pt, bool DiscardLeft); - void JoinCommonEdges(); - void DoSimplePolygons(); - void FixupFirstLefts1(OutRec* OldOutRec, OutRec* NewOutRec) const; - void FixupFirstLefts2(OutRec* OldOutRec, OutRec* NewOutRec) const; -#ifdef use_xyz - void SetZ(IntPoint& pt, TEdge& e1, TEdge& e2); -#endif -}; -//------------------------------------------------------------------------------ - -class ClipperOffset -{ -public: - ClipperOffset(double miterLimit = 2.0, double roundPrecision = 0.25, double shortestEdgeLength = 0.) : - MiterLimit(miterLimit), ArcTolerance(roundPrecision), ShortestEdgeLength(shortestEdgeLength), m_lowest(-1, 0) {} - ~ClipperOffset() { Clear(); } - void AddPath(const Path& path, JoinType joinType, EndType endType); - void AddPaths(const Paths& paths, JoinType joinType, EndType endType); - void Execute(Paths& solution, double delta); - void Execute(PolyTree& solution, double delta); - void Clear(); - double MiterLimit; - double ArcTolerance; - double ShortestEdgeLength; -private: - Paths m_destPolys; - Path m_srcPoly; - Path m_destPoly; - std::vector m_normals; - double m_delta, m_sinA, m_sin, m_cos; - double m_miterLim, m_StepsPerRad; - IntPoint m_lowest; - PolyNode m_polyNodes; - - void FixOrientations(); - void DoOffset(double delta); - void OffsetPoint(int j, int& k, JoinType jointype); - void DoSquare(int j, int k); - void DoMiter(int j, int k, double r); - void DoRound(int j, int k); -}; -//------------------------------------------------------------------------------ - -class clipperException : public std::exception -{ - public: - clipperException(const char* description): m_descr(description) {} - virtual ~clipperException() throw() {} - virtual const char* what() const throw() {return m_descr.c_str();} - private: - std::string m_descr; -}; -//------------------------------------------------------------------------------ - -} //ClipperLib namespace - -#endif //clipper_hpp - - +/******************************************************************************* +* * +* Author : Angus Johnson * +* Version : 6.2.9 * +* Date : 16 February 2015 * +* Website : http://www.angusj.com * +* Copyright : Angus Johnson 2010-2015 * +* * +* License: * +* Use, modification & distribution is subject to Boost Software License Ver 1. * +* http://www.boost.org/LICENSE_1_0.txt * +* * +* Attributions: * +* The code in this library is an extension of Bala Vatti's clipping algorithm: * +* "A generic solution to polygon clipping" * +* Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63. * +* http://portal.acm.org/citation.cfm?id=129906 * +* * +* Computer graphics and geometric modeling: implementation and algorithms * +* By Max K. Agoston * +* Springer; 1 edition (January 4, 2005) * +* http://books.google.com/books?q=vatti+clipping+agoston * +* * +* See also: * +* "Polygon Offsetting by Computing Winding Numbers" * +* Paper no. DETC2005-85513 pp. 565-575 * +* ASME 2005 International Design Engineering Technical Conferences * +* and Computers and Information in Engineering Conference (IDETC/CIE2005) * +* September 24-28, 2005 , Long Beach, California, USA * +* http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf * +* * +*******************************************************************************/ + +#ifndef clipper_hpp +#define clipper_hpp + +#include + +#define CLIPPER_VERSION "6.2.6" + +//use_xyz: adds a Z member to IntPoint. Adds a minor cost to perfomance. +//#define use_xyz + +//use_lines: Enables line clipping. Adds a very minor cost to performance. +#define use_lines + +//use_deprecated: Enables temporary support for the obsolete functions +//#define use_deprecated + +#include +#include +#include +#include +#include +#include +#include +#include + +namespace ClipperLib { + +enum ClipType { ctIntersection, ctUnion, ctDifference, ctXor }; +enum PolyType { ptSubject, ptClip }; +//By far the most widely used winding rules for polygon filling are +//EvenOdd & NonZero (GDI, GDI+, XLib, OpenGL, Cairo, AGG, Quartz, SVG, Gr32) +//Others rules include Positive, Negative and ABS_GTR_EQ_TWO (only in OpenGL) +//see http://glprogramming.com/red/chapter11.html +enum PolyFillType { pftEvenOdd, pftNonZero, pftPositive, pftNegative }; + +// Point coordinate type +typedef int64_t cInt; +// Maximum cInt value to allow a cross product calculation using 32bit expressions. +static cInt const loRange = 0x3FFFFFFF; +// Maximum allowed cInt value. +static cInt const hiRange = 0x3FFFFFFFFFFFFFFFLL; + +struct IntPoint { + cInt X; + cInt Y; +#ifdef use_xyz + cInt Z; + IntPoint(cInt x = 0, cInt y = 0, cInt z = 0): X(x), Y(y), Z(z) {}; +#else + IntPoint(cInt x = 0, cInt y = 0): X(x), Y(y) {}; +#endif + + friend inline bool operator== (const IntPoint& a, const IntPoint& b) + { + return a.X == b.X && a.Y == b.Y; + } + friend inline bool operator!= (const IntPoint& a, const IntPoint& b) + { + return a.X != b.X || a.Y != b.Y; + } +}; +//------------------------------------------------------------------------------ + +typedef std::vector< IntPoint > Path; +typedef std::vector< Path > Paths; + +inline Path& operator <<(Path& poly, const IntPoint& p) {poly.push_back(p); return poly;} +inline Paths& operator <<(Paths& polys, const Path& p) {polys.push_back(p); return polys;} + +std::ostream& operator <<(std::ostream &s, const IntPoint &p); +std::ostream& operator <<(std::ostream &s, const Path &p); +std::ostream& operator <<(std::ostream &s, const Paths &p); + +struct DoublePoint +{ + double X; + double Y; + DoublePoint(double x = 0, double y = 0) : X(x), Y(y) {} + DoublePoint(IntPoint ip) : X((double)ip.X), Y((double)ip.Y) {} +}; +//------------------------------------------------------------------------------ + +#ifdef use_xyz +typedef void (*ZFillCallback)(IntPoint& e1bot, IntPoint& e1top, IntPoint& e2bot, IntPoint& e2top, IntPoint& pt); +#endif + +enum InitOptions {ioReverseSolution = 1, ioStrictlySimple = 2, ioPreserveCollinear = 4}; +enum JoinType {jtSquare, jtRound, jtMiter}; +enum EndType {etClosedPolygon, etClosedLine, etOpenButt, etOpenSquare, etOpenRound}; + +class PolyNode; +typedef std::vector< PolyNode* > PolyNodes; + +class PolyNode +{ +public: + PolyNode() : Childs(), Parent(0), Index(0), m_IsOpen(false) {} + virtual ~PolyNode(){}; + Path Contour; + PolyNodes Childs; + PolyNode* Parent; + // Traversal of the polygon tree in a depth first fashion. + PolyNode* GetNext() const { return Childs.empty() ? GetNextSiblingUp() : Childs.front(); } + bool IsHole() const; + bool IsOpen() const { return m_IsOpen; } + int ChildCount() const { return (int)Childs.size(); } +private: + unsigned Index; //node index in Parent.Childs + bool m_IsOpen; + JoinType m_jointype; + EndType m_endtype; + PolyNode* GetNextSiblingUp() const { return Parent ? ((Index == Parent->Childs.size() - 1) ? Parent->GetNextSiblingUp() : Parent->Childs[Index + 1]) : nullptr; } + void AddChild(PolyNode& child); + friend class Clipper; //to access Index + friend class ClipperOffset; + friend class PolyTree; //to implement the PolyTree::move operator +}; + +class PolyTree: public PolyNode +{ +public: + PolyTree() {} + PolyTree(PolyTree &&src) { *this = std::move(src); } + virtual ~PolyTree(){Clear();}; + PolyTree& operator=(PolyTree &&src) { + AllNodes = std::move(src.AllNodes); + Contour = std::move(src.Contour); + Childs = std::move(src.Childs); + Parent = nullptr; + Index = src.Index; + m_IsOpen = src.m_IsOpen; + m_jointype = src.m_jointype; + m_endtype = src.m_endtype; + for (size_t i = 0; i < Childs.size(); ++ i) + Childs[i]->Parent = this; + return *this; + } + PolyNode* GetFirst() const { return Childs.empty() ? nullptr : Childs.front(); } + void Clear() { AllNodes.clear(); Childs.clear(); } + int Total() const; +private: + PolyTree(const PolyTree &src) = delete; + PolyTree& operator=(const PolyTree &src) = delete; + std::vector AllNodes; + friend class Clipper; //to access AllNodes +}; + +double Area(const Path &poly); +inline bool Orientation(const Path &poly) { return Area(poly) >= 0; } +int PointInPolygon(const IntPoint &pt, const Path &path); + +void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType = pftEvenOdd); +void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType = pftEvenOdd); +void SimplifyPolygons(Paths &polys, PolyFillType fillType = pftEvenOdd); + +void CleanPolygon(const Path& in_poly, Path& out_poly, double distance = 1.415); +void CleanPolygon(Path& poly, double distance = 1.415); +void CleanPolygons(const Paths& in_polys, Paths& out_polys, double distance = 1.415); +void CleanPolygons(Paths& polys, double distance = 1.415); + +void MinkowskiSum(const Path& pattern, const Path& path, Paths& solution, bool pathIsClosed); +void MinkowskiSum(const Path& pattern, const Paths& paths, Paths& solution, bool pathIsClosed); +void MinkowskiDiff(const Path& poly1, const Path& poly2, Paths& solution); + +void PolyTreeToPaths(const PolyTree& polytree, Paths& paths); +void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths); +void OpenPathsFromPolyTree(PolyTree& polytree, Paths& paths); + +void ReversePath(Path& p); +void ReversePaths(Paths& p); + +struct IntRect { cInt left; cInt top; cInt right; cInt bottom; }; + +//enums that are used internally ... +enum EdgeSide { esLeft = 1, esRight = 2}; + +// namespace Internal { + //forward declarations (for stuff used internally) ... + struct TEdge { + // Bottom point of this edge (with minimum Y). + IntPoint Bot; + // Current position. + IntPoint Curr; + // Top point of this edge (with maximum Y). + IntPoint Top; + // Vector from Bot to Top. + IntPoint Delta; + // Slope (dx/dy). For horiontal edges, the slope is set to HORIZONTAL (-1.0E+40). + double Dx; + PolyType PolyTyp; + EdgeSide Side; + // Winding number delta. 1 or -1 depending on winding direction, 0 for open paths and flat closed paths. + int WindDelta; + int WindCnt; + int WindCnt2; //winding count of the opposite polytype + int OutIdx; + // Next edge in the input path. + TEdge *Next; + // Previous edge in the input path. + TEdge *Prev; + // Next edge in the Local Minima List chain. + TEdge *NextInLML; + TEdge *NextInAEL; + TEdge *PrevInAEL; + TEdge *NextInSEL; + TEdge *PrevInSEL; + }; + + struct IntersectNode { + IntersectNode(TEdge *Edge1, TEdge *Edge2, IntPoint Pt) : + Edge1(Edge1), Edge2(Edge2), Pt(Pt) {} + TEdge *Edge1; + TEdge *Edge2; + IntPoint Pt; + }; + + struct LocalMinimum { + cInt Y; + TEdge *LeftBound; + TEdge *RightBound; + }; + + // Point of an output polygon. + // 36B on 64bit system without use_xyz. + struct OutPt { + // 4B + int Idx; + // 16B without use_xyz / 24B with use_xyz + IntPoint Pt; + // 4B on 32bit system, 8B on 64bit system + OutPt *Next; + // 4B on 32bit system, 8B on 64bit system + OutPt *Prev; + }; + + struct OutRec; + struct Join { + Join(OutPt *OutPt1, OutPt *OutPt2, IntPoint OffPt) : + OutPt1(OutPt1), OutPt2(OutPt2), OffPt(OffPt) {} + OutPt *OutPt1; + OutPt *OutPt2; + IntPoint OffPt; + }; +// }; // namespace Internal + +//------------------------------------------------------------------------------ + +//ClipperBase is the ancestor to the Clipper class. It should not be +//instantiated directly. This class simply abstracts the conversion of sets of +//polygon coordinates into edge objects that are stored in a LocalMinima list. +class ClipperBase +{ +public: + ClipperBase() : m_UseFullRange(false), m_HasOpenPaths(false) {} + ~ClipperBase() { Clear(); } + bool AddPath(const Path &pg, PolyType PolyTyp, bool Closed); + bool AddPaths(const Paths &ppg, PolyType PolyTyp, bool Closed); + void Clear(); + IntRect GetBounds(); + // By default, when three or more vertices are collinear in input polygons (subject or clip), the Clipper object removes the 'inner' vertices before clipping. + // When enabled the PreserveCollinear property prevents this default behavior to allow these inner vertices to appear in the solution. + bool PreserveCollinear() const {return m_PreserveCollinear;}; + void PreserveCollinear(bool value) {m_PreserveCollinear = value;}; +protected: + bool AddPathInternal(const Path &pg, int highI, PolyType PolyTyp, bool Closed, TEdge* edges); + TEdge* AddBoundsToLML(TEdge *e, bool IsClosed); + void Reset(); + TEdge* ProcessBound(TEdge* E, bool IsClockwise); + TEdge* DescendToMin(TEdge *&E); + void AscendToMax(TEdge *&E, bool Appending, bool IsClosed); + + // Local minima (Y, left edge, right edge) sorted by ascending Y. + std::vector m_MinimaList; + + // True if the input polygons have abs values higher than loRange, but lower than hiRange. + // False if the input polygons have abs values lower or equal to loRange. + bool m_UseFullRange; + // A vector of edges per each input path. + std::vector> m_edges; + // Don't remove intermediate vertices of a collinear sequence of points. + bool m_PreserveCollinear; + // Is any of the paths inserted by AddPath() or AddPaths() open? + bool m_HasOpenPaths; +}; +//------------------------------------------------------------------------------ + +class Clipper : public ClipperBase +{ +public: + Clipper(int initOptions = 0); + ~Clipper() { Clear(); } + void Clear() { ClipperBase::Clear(); DisposeAllOutRecs(); } + bool Execute(ClipType clipType, + Paths &solution, + PolyFillType fillType = pftEvenOdd) + { return Execute(clipType, solution, fillType, fillType); } + bool Execute(ClipType clipType, + Paths &solution, + PolyFillType subjFillType, + PolyFillType clipFillType); + bool Execute(ClipType clipType, + PolyTree &polytree, + PolyFillType fillType = pftEvenOdd) + { return Execute(clipType, polytree, fillType, fillType); } + bool Execute(ClipType clipType, + PolyTree &polytree, + PolyFillType subjFillType, + PolyFillType clipFillType); + bool ReverseSolution() const { return m_ReverseOutput; }; + void ReverseSolution(bool value) {m_ReverseOutput = value;}; + bool StrictlySimple() const {return m_StrictSimple;}; + void StrictlySimple(bool value) {m_StrictSimple = value;}; + //set the callback function for z value filling on intersections (otherwise Z is 0) +#ifdef use_xyz + void ZFillFunction(ZFillCallback zFillFunc) { m_ZFill = zFillFunc; } +#endif +protected: + void Reset(); + virtual bool ExecuteInternal(); +private: + + // Output polygons. + std::vector m_PolyOuts; + // Output points, allocated by a continuous sets of m_OutPtsChunkSize. + std::vector m_OutPts; + // List of free output points, to be used before taking a point from m_OutPts or allocating a new chunk. + OutPt *m_OutPtsFree; + size_t m_OutPtsChunkSize; + size_t m_OutPtsChunkLast; + + std::vector m_Joins; + std::vector m_GhostJoins; + std::vector m_IntersectList; + ClipType m_ClipType; + // A priority queue (a binary heap) of Y coordinates. + std::priority_queue m_Scanbeam; + // Maxima are collected by ProcessEdgesAtTopOfScanbeam(), consumed by ProcessHorizontal(). + std::vector m_Maxima; + TEdge *m_ActiveEdges; + TEdge *m_SortedEdges; + PolyFillType m_ClipFillType; + PolyFillType m_SubjFillType; + bool m_ReverseOutput; + // Does the result go to a PolyTree or Paths? + bool m_UsingPolyTree; + bool m_StrictSimple; +#ifdef use_xyz + ZFillCallback m_ZFill; //custom callback +#endif + void SetWindingCount(TEdge& edge) const; + bool IsEvenOddFillType(const TEdge& edge) const + { return (edge.PolyTyp == ptSubject) ? m_SubjFillType == pftEvenOdd : m_ClipFillType == pftEvenOdd; } + bool IsEvenOddAltFillType(const TEdge& edge) const + { return (edge.PolyTyp == ptSubject) ? m_ClipFillType == pftEvenOdd : m_SubjFillType == pftEvenOdd; } + void InsertLocalMinimaIntoAEL(const cInt botY); + void InsertEdgeIntoAEL(TEdge *edge, TEdge* startEdge); + void AddEdgeToSEL(TEdge *edge); + void CopyAELToSEL(); + void DeleteFromSEL(TEdge *e); + void DeleteFromAEL(TEdge *e); + void UpdateEdgeIntoAEL(TEdge *&e); + void SwapPositionsInSEL(TEdge *edge1, TEdge *edge2); + bool IsContributing(const TEdge& edge) const; + bool IsTopHorz(const cInt XPos); + void SwapPositionsInAEL(TEdge *edge1, TEdge *edge2); + void DoMaxima(TEdge *e); + void ProcessHorizontals(); + void ProcessHorizontal(TEdge *horzEdge); + void AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &pt); + OutPt* AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &pt); + OutRec* GetOutRec(int idx); + void AppendPolygon(TEdge *e1, TEdge *e2) const; + void IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &pt); + OutRec* CreateOutRec(); + OutPt* AddOutPt(TEdge *e, const IntPoint &pt); + OutPt* GetLastOutPt(TEdge *e); + OutPt* AllocateOutPt(); + OutPt* DupOutPt(OutPt* outPt, bool InsertAfter); + // Add the point to a list of free points. + void DisposeOutPt(OutPt *pt) { pt->Next = m_OutPtsFree; m_OutPtsFree = pt; } + void DisposeOutPts(OutPt*& pp) { if (pp != nullptr) { pp->Prev->Next = m_OutPtsFree; m_OutPtsFree = pp; } } + void DisposeAllOutRecs(); + bool ProcessIntersections(const cInt topY); + void BuildIntersectList(const cInt topY); + void ProcessEdgesAtTopOfScanbeam(const cInt topY); + void BuildResult(Paths& polys); + void BuildResult2(PolyTree& polytree); + void SetHoleState(TEdge *e, OutRec *outrec) const; + bool FixupIntersectionOrder(); + void FixupOutPolygon(OutRec &outrec); + void FixupOutPolyline(OutRec &outrec); + bool FindOwnerFromSplitRecs(OutRec &outRec, OutRec *&currOrfl); + void FixHoleLinkage(OutRec &outrec); + bool JoinPoints(Join *j, OutRec* outRec1, OutRec* outRec2); + bool JoinHorz(OutPt* op1, OutPt* op1b, OutPt* op2, OutPt* op2b, const IntPoint &Pt, bool DiscardLeft); + void JoinCommonEdges(); + void DoSimplePolygons(); + void FixupFirstLefts1(OutRec* OldOutRec, OutRec* NewOutRec) const; + void FixupFirstLefts2(OutRec* OldOutRec, OutRec* NewOutRec) const; +#ifdef use_xyz + void SetZ(IntPoint& pt, TEdge& e1, TEdge& e2); +#endif +}; +//------------------------------------------------------------------------------ + +class ClipperOffset +{ +public: + ClipperOffset(double miterLimit = 2.0, double roundPrecision = 0.25, double shortestEdgeLength = 0.) : + MiterLimit(miterLimit), ArcTolerance(roundPrecision), ShortestEdgeLength(shortestEdgeLength), m_lowest(-1, 0) {} + ~ClipperOffset() { Clear(); } + void AddPath(const Path& path, JoinType joinType, EndType endType); + void AddPaths(const Paths& paths, JoinType joinType, EndType endType); + void Execute(Paths& solution, double delta); + void Execute(PolyTree& solution, double delta); + void Clear(); + double MiterLimit; + double ArcTolerance; + double ShortestEdgeLength; +private: + Paths m_destPolys; + Path m_srcPoly; + Path m_destPoly; + std::vector m_normals; + double m_delta, m_sinA, m_sin, m_cos; + double m_miterLim, m_StepsPerRad; + IntPoint m_lowest; + PolyNode m_polyNodes; + + void FixOrientations(); + void DoOffset(double delta); + void OffsetPoint(int j, int& k, JoinType jointype); + void DoSquare(int j, int k); + void DoMiter(int j, int k, double r); + void DoRound(int j, int k); +}; +//------------------------------------------------------------------------------ + +class clipperException : public std::exception +{ + public: + clipperException(const char* description): m_descr(description) {} + virtual ~clipperException() throw() {} + virtual const char* what() const throw() {return m_descr.c_str();} + private: + std::string m_descr; +}; +//------------------------------------------------------------------------------ + +} //ClipperLib namespace + +#endif //clipper_hpp + + diff --git a/xs/src/eigen/COPYING.README b/src/eigen/COPYING.README similarity index 100% rename from xs/src/eigen/COPYING.README rename to src/eigen/COPYING.README diff --git a/xs/src/eigen/Eigen/CMakeLists.txt b/src/eigen/Eigen/CMakeLists.txt similarity index 100% rename from xs/src/eigen/Eigen/CMakeLists.txt rename to src/eigen/Eigen/CMakeLists.txt diff --git a/xs/src/eigen/Eigen/Cholesky b/src/eigen/Eigen/Cholesky similarity index 100% rename from xs/src/eigen/Eigen/Cholesky rename to src/eigen/Eigen/Cholesky diff --git a/xs/src/eigen/Eigen/CholmodSupport b/src/eigen/Eigen/CholmodSupport similarity index 100% rename from xs/src/eigen/Eigen/CholmodSupport rename to src/eigen/Eigen/CholmodSupport diff --git a/xs/src/eigen/Eigen/Core b/src/eigen/Eigen/Core similarity index 100% rename from xs/src/eigen/Eigen/Core rename to src/eigen/Eigen/Core diff --git a/xs/src/eigen/Eigen/Dense b/src/eigen/Eigen/Dense similarity index 100% rename from xs/src/eigen/Eigen/Dense rename to src/eigen/Eigen/Dense diff --git a/xs/src/eigen/Eigen/Eigen b/src/eigen/Eigen/Eigen similarity index 100% rename from xs/src/eigen/Eigen/Eigen rename to src/eigen/Eigen/Eigen diff --git a/xs/src/eigen/Eigen/Eigenvalues b/src/eigen/Eigen/Eigenvalues similarity index 100% rename from xs/src/eigen/Eigen/Eigenvalues rename to src/eigen/Eigen/Eigenvalues diff --git a/xs/src/eigen/Eigen/Geometry b/src/eigen/Eigen/Geometry similarity index 100% rename from xs/src/eigen/Eigen/Geometry rename to src/eigen/Eigen/Geometry diff --git a/xs/src/eigen/Eigen/Householder b/src/eigen/Eigen/Householder similarity index 100% rename from xs/src/eigen/Eigen/Householder rename to src/eigen/Eigen/Householder diff --git a/xs/src/eigen/Eigen/IterativeLinearSolvers b/src/eigen/Eigen/IterativeLinearSolvers similarity index 100% rename from xs/src/eigen/Eigen/IterativeLinearSolvers rename to src/eigen/Eigen/IterativeLinearSolvers diff --git a/xs/src/eigen/Eigen/Jacobi b/src/eigen/Eigen/Jacobi similarity index 100% rename from xs/src/eigen/Eigen/Jacobi rename to src/eigen/Eigen/Jacobi diff --git a/xs/src/eigen/Eigen/LU b/src/eigen/Eigen/LU similarity index 100% rename from xs/src/eigen/Eigen/LU rename to src/eigen/Eigen/LU diff --git a/xs/src/eigen/Eigen/MetisSupport b/src/eigen/Eigen/MetisSupport similarity index 100% rename from xs/src/eigen/Eigen/MetisSupport rename to src/eigen/Eigen/MetisSupport diff --git a/xs/src/eigen/Eigen/OrderingMethods b/src/eigen/Eigen/OrderingMethods similarity index 100% rename from xs/src/eigen/Eigen/OrderingMethods rename to src/eigen/Eigen/OrderingMethods diff --git a/xs/src/eigen/Eigen/PaStiXSupport b/src/eigen/Eigen/PaStiXSupport similarity index 100% rename from xs/src/eigen/Eigen/PaStiXSupport rename to src/eigen/Eigen/PaStiXSupport diff --git a/xs/src/eigen/Eigen/PardisoSupport b/src/eigen/Eigen/PardisoSupport similarity index 100% rename from xs/src/eigen/Eigen/PardisoSupport rename to src/eigen/Eigen/PardisoSupport diff --git a/xs/src/eigen/Eigen/QR b/src/eigen/Eigen/QR similarity index 100% rename from xs/src/eigen/Eigen/QR rename to src/eigen/Eigen/QR diff --git a/xs/src/eigen/Eigen/QtAlignedMalloc b/src/eigen/Eigen/QtAlignedMalloc similarity index 100% rename from xs/src/eigen/Eigen/QtAlignedMalloc rename to src/eigen/Eigen/QtAlignedMalloc diff --git a/xs/src/eigen/Eigen/SPQRSupport b/src/eigen/Eigen/SPQRSupport similarity index 100% rename from xs/src/eigen/Eigen/SPQRSupport rename to src/eigen/Eigen/SPQRSupport diff --git a/xs/src/eigen/Eigen/SVD b/src/eigen/Eigen/SVD similarity index 100% rename from xs/src/eigen/Eigen/SVD rename to src/eigen/Eigen/SVD diff --git a/xs/src/eigen/Eigen/Sparse b/src/eigen/Eigen/Sparse similarity index 100% rename from xs/src/eigen/Eigen/Sparse rename to src/eigen/Eigen/Sparse diff --git a/xs/src/eigen/Eigen/SparseCholesky b/src/eigen/Eigen/SparseCholesky similarity index 100% rename from xs/src/eigen/Eigen/SparseCholesky rename to src/eigen/Eigen/SparseCholesky diff --git a/xs/src/eigen/Eigen/SparseCore b/src/eigen/Eigen/SparseCore similarity index 100% rename from xs/src/eigen/Eigen/SparseCore rename to src/eigen/Eigen/SparseCore diff --git a/xs/src/eigen/Eigen/SparseLU b/src/eigen/Eigen/SparseLU similarity index 100% rename from xs/src/eigen/Eigen/SparseLU rename to src/eigen/Eigen/SparseLU diff --git a/xs/src/eigen/Eigen/SparseQR b/src/eigen/Eigen/SparseQR similarity index 100% rename from xs/src/eigen/Eigen/SparseQR rename to src/eigen/Eigen/SparseQR diff --git a/xs/src/eigen/Eigen/StdDeque b/src/eigen/Eigen/StdDeque similarity index 100% rename from xs/src/eigen/Eigen/StdDeque rename to src/eigen/Eigen/StdDeque diff --git a/xs/src/eigen/Eigen/StdList b/src/eigen/Eigen/StdList similarity index 100% rename from xs/src/eigen/Eigen/StdList rename to src/eigen/Eigen/StdList diff --git a/xs/src/eigen/Eigen/StdVector b/src/eigen/Eigen/StdVector similarity index 100% rename from xs/src/eigen/Eigen/StdVector rename to src/eigen/Eigen/StdVector diff --git a/xs/src/eigen/Eigen/SuperLUSupport b/src/eigen/Eigen/SuperLUSupport similarity index 100% rename from xs/src/eigen/Eigen/SuperLUSupport rename to src/eigen/Eigen/SuperLUSupport diff --git a/xs/src/eigen/Eigen/UmfPackSupport b/src/eigen/Eigen/UmfPackSupport similarity index 100% rename from xs/src/eigen/Eigen/UmfPackSupport rename to src/eigen/Eigen/UmfPackSupport diff --git a/xs/src/eigen/Eigen/src/Cholesky/LDLT.h b/src/eigen/Eigen/src/Cholesky/LDLT.h similarity index 100% rename from xs/src/eigen/Eigen/src/Cholesky/LDLT.h rename to src/eigen/Eigen/src/Cholesky/LDLT.h diff --git a/xs/src/eigen/Eigen/src/Cholesky/LLT.h b/src/eigen/Eigen/src/Cholesky/LLT.h similarity index 100% rename from xs/src/eigen/Eigen/src/Cholesky/LLT.h rename to src/eigen/Eigen/src/Cholesky/LLT.h diff --git a/xs/src/eigen/Eigen/src/Cholesky/LLT_LAPACKE.h b/src/eigen/Eigen/src/Cholesky/LLT_LAPACKE.h similarity index 100% rename from xs/src/eigen/Eigen/src/Cholesky/LLT_LAPACKE.h rename to src/eigen/Eigen/src/Cholesky/LLT_LAPACKE.h diff --git a/xs/src/eigen/Eigen/src/CholmodSupport/CholmodSupport.h b/src/eigen/Eigen/src/CholmodSupport/CholmodSupport.h similarity index 100% rename from xs/src/eigen/Eigen/src/CholmodSupport/CholmodSupport.h rename to src/eigen/Eigen/src/CholmodSupport/CholmodSupport.h diff --git a/xs/src/eigen/Eigen/src/Core/Array.h b/src/eigen/Eigen/src/Core/Array.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Array.h rename to src/eigen/Eigen/src/Core/Array.h diff --git a/xs/src/eigen/Eigen/src/Core/ArrayBase.h b/src/eigen/Eigen/src/Core/ArrayBase.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/ArrayBase.h rename to src/eigen/Eigen/src/Core/ArrayBase.h diff --git a/xs/src/eigen/Eigen/src/Core/ArrayWrapper.h b/src/eigen/Eigen/src/Core/ArrayWrapper.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/ArrayWrapper.h rename to src/eigen/Eigen/src/Core/ArrayWrapper.h diff --git a/xs/src/eigen/Eigen/src/Core/Assign.h b/src/eigen/Eigen/src/Core/Assign.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Assign.h rename to src/eigen/Eigen/src/Core/Assign.h diff --git a/xs/src/eigen/Eigen/src/Core/AssignEvaluator.h b/src/eigen/Eigen/src/Core/AssignEvaluator.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/AssignEvaluator.h rename to src/eigen/Eigen/src/Core/AssignEvaluator.h diff --git a/xs/src/eigen/Eigen/src/Core/Assign_MKL.h b/src/eigen/Eigen/src/Core/Assign_MKL.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Assign_MKL.h rename to src/eigen/Eigen/src/Core/Assign_MKL.h diff --git a/xs/src/eigen/Eigen/src/Core/BandMatrix.h b/src/eigen/Eigen/src/Core/BandMatrix.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/BandMatrix.h rename to src/eigen/Eigen/src/Core/BandMatrix.h diff --git a/xs/src/eigen/Eigen/src/Core/Block.h b/src/eigen/Eigen/src/Core/Block.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Block.h rename to src/eigen/Eigen/src/Core/Block.h diff --git a/xs/src/eigen/Eigen/src/Core/BooleanRedux.h b/src/eigen/Eigen/src/Core/BooleanRedux.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/BooleanRedux.h rename to src/eigen/Eigen/src/Core/BooleanRedux.h diff --git a/xs/src/eigen/Eigen/src/Core/CommaInitializer.h b/src/eigen/Eigen/src/Core/CommaInitializer.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/CommaInitializer.h rename to src/eigen/Eigen/src/Core/CommaInitializer.h diff --git a/xs/src/eigen/Eigen/src/Core/ConditionEstimator.h b/src/eigen/Eigen/src/Core/ConditionEstimator.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/ConditionEstimator.h rename to src/eigen/Eigen/src/Core/ConditionEstimator.h diff --git a/xs/src/eigen/Eigen/src/Core/CoreEvaluators.h b/src/eigen/Eigen/src/Core/CoreEvaluators.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/CoreEvaluators.h rename to src/eigen/Eigen/src/Core/CoreEvaluators.h diff --git a/xs/src/eigen/Eigen/src/Core/CoreIterators.h b/src/eigen/Eigen/src/Core/CoreIterators.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/CoreIterators.h rename to src/eigen/Eigen/src/Core/CoreIterators.h diff --git a/xs/src/eigen/Eigen/src/Core/CwiseBinaryOp.h b/src/eigen/Eigen/src/Core/CwiseBinaryOp.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/CwiseBinaryOp.h rename to src/eigen/Eigen/src/Core/CwiseBinaryOp.h diff --git a/xs/src/eigen/Eigen/src/Core/CwiseNullaryOp.h b/src/eigen/Eigen/src/Core/CwiseNullaryOp.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/CwiseNullaryOp.h rename to src/eigen/Eigen/src/Core/CwiseNullaryOp.h diff --git a/xs/src/eigen/Eigen/src/Core/CwiseTernaryOp.h b/src/eigen/Eigen/src/Core/CwiseTernaryOp.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/CwiseTernaryOp.h rename to src/eigen/Eigen/src/Core/CwiseTernaryOp.h diff --git a/xs/src/eigen/Eigen/src/Core/CwiseUnaryOp.h b/src/eigen/Eigen/src/Core/CwiseUnaryOp.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/CwiseUnaryOp.h rename to src/eigen/Eigen/src/Core/CwiseUnaryOp.h diff --git a/xs/src/eigen/Eigen/src/Core/CwiseUnaryView.h b/src/eigen/Eigen/src/Core/CwiseUnaryView.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/CwiseUnaryView.h rename to src/eigen/Eigen/src/Core/CwiseUnaryView.h diff --git a/xs/src/eigen/Eigen/src/Core/DenseBase.h b/src/eigen/Eigen/src/Core/DenseBase.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/DenseBase.h rename to src/eigen/Eigen/src/Core/DenseBase.h diff --git a/xs/src/eigen/Eigen/src/Core/DenseCoeffsBase.h b/src/eigen/Eigen/src/Core/DenseCoeffsBase.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/DenseCoeffsBase.h rename to src/eigen/Eigen/src/Core/DenseCoeffsBase.h diff --git a/xs/src/eigen/Eigen/src/Core/DenseStorage.h b/src/eigen/Eigen/src/Core/DenseStorage.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/DenseStorage.h rename to src/eigen/Eigen/src/Core/DenseStorage.h diff --git a/xs/src/eigen/Eigen/src/Core/Diagonal.h b/src/eigen/Eigen/src/Core/Diagonal.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Diagonal.h rename to src/eigen/Eigen/src/Core/Diagonal.h diff --git a/xs/src/eigen/Eigen/src/Core/DiagonalMatrix.h b/src/eigen/Eigen/src/Core/DiagonalMatrix.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/DiagonalMatrix.h rename to src/eigen/Eigen/src/Core/DiagonalMatrix.h diff --git a/xs/src/eigen/Eigen/src/Core/DiagonalProduct.h b/src/eigen/Eigen/src/Core/DiagonalProduct.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/DiagonalProduct.h rename to src/eigen/Eigen/src/Core/DiagonalProduct.h diff --git a/xs/src/eigen/Eigen/src/Core/Dot.h b/src/eigen/Eigen/src/Core/Dot.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Dot.h rename to src/eigen/Eigen/src/Core/Dot.h diff --git a/xs/src/eigen/Eigen/src/Core/EigenBase.h b/src/eigen/Eigen/src/Core/EigenBase.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/EigenBase.h rename to src/eigen/Eigen/src/Core/EigenBase.h diff --git a/xs/src/eigen/Eigen/src/Core/ForceAlignedAccess.h b/src/eigen/Eigen/src/Core/ForceAlignedAccess.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/ForceAlignedAccess.h rename to src/eigen/Eigen/src/Core/ForceAlignedAccess.h diff --git a/xs/src/eigen/Eigen/src/Core/Fuzzy.h b/src/eigen/Eigen/src/Core/Fuzzy.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Fuzzy.h rename to src/eigen/Eigen/src/Core/Fuzzy.h diff --git a/xs/src/eigen/Eigen/src/Core/GeneralProduct.h b/src/eigen/Eigen/src/Core/GeneralProduct.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/GeneralProduct.h rename to src/eigen/Eigen/src/Core/GeneralProduct.h diff --git a/xs/src/eigen/Eigen/src/Core/GenericPacketMath.h b/src/eigen/Eigen/src/Core/GenericPacketMath.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/GenericPacketMath.h rename to src/eigen/Eigen/src/Core/GenericPacketMath.h diff --git a/xs/src/eigen/Eigen/src/Core/GlobalFunctions.h b/src/eigen/Eigen/src/Core/GlobalFunctions.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/GlobalFunctions.h rename to src/eigen/Eigen/src/Core/GlobalFunctions.h diff --git a/xs/src/eigen/Eigen/src/Core/IO.h b/src/eigen/Eigen/src/Core/IO.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/IO.h rename to src/eigen/Eigen/src/Core/IO.h diff --git a/xs/src/eigen/Eigen/src/Core/Inverse.h b/src/eigen/Eigen/src/Core/Inverse.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Inverse.h rename to src/eigen/Eigen/src/Core/Inverse.h diff --git a/xs/src/eigen/Eigen/src/Core/Map.h b/src/eigen/Eigen/src/Core/Map.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Map.h rename to src/eigen/Eigen/src/Core/Map.h diff --git a/xs/src/eigen/Eigen/src/Core/MapBase.h b/src/eigen/Eigen/src/Core/MapBase.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/MapBase.h rename to src/eigen/Eigen/src/Core/MapBase.h diff --git a/xs/src/eigen/Eigen/src/Core/MathFunctions.h b/src/eigen/Eigen/src/Core/MathFunctions.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/MathFunctions.h rename to src/eigen/Eigen/src/Core/MathFunctions.h diff --git a/xs/src/eigen/Eigen/src/Core/MathFunctionsImpl.h b/src/eigen/Eigen/src/Core/MathFunctionsImpl.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/MathFunctionsImpl.h rename to src/eigen/Eigen/src/Core/MathFunctionsImpl.h diff --git a/xs/src/eigen/Eigen/src/Core/Matrix.h b/src/eigen/Eigen/src/Core/Matrix.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Matrix.h rename to src/eigen/Eigen/src/Core/Matrix.h diff --git a/xs/src/eigen/Eigen/src/Core/MatrixBase.h b/src/eigen/Eigen/src/Core/MatrixBase.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/MatrixBase.h rename to src/eigen/Eigen/src/Core/MatrixBase.h diff --git a/xs/src/eigen/Eigen/src/Core/NestByValue.h b/src/eigen/Eigen/src/Core/NestByValue.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/NestByValue.h rename to src/eigen/Eigen/src/Core/NestByValue.h diff --git a/xs/src/eigen/Eigen/src/Core/NoAlias.h b/src/eigen/Eigen/src/Core/NoAlias.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/NoAlias.h rename to src/eigen/Eigen/src/Core/NoAlias.h diff --git a/xs/src/eigen/Eigen/src/Core/NumTraits.h b/src/eigen/Eigen/src/Core/NumTraits.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/NumTraits.h rename to src/eigen/Eigen/src/Core/NumTraits.h diff --git a/xs/src/eigen/Eigen/src/Core/PermutationMatrix.h b/src/eigen/Eigen/src/Core/PermutationMatrix.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/PermutationMatrix.h rename to src/eigen/Eigen/src/Core/PermutationMatrix.h diff --git a/xs/src/eigen/Eigen/src/Core/PlainObjectBase.h b/src/eigen/Eigen/src/Core/PlainObjectBase.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/PlainObjectBase.h rename to src/eigen/Eigen/src/Core/PlainObjectBase.h diff --git a/xs/src/eigen/Eigen/src/Core/Product.h b/src/eigen/Eigen/src/Core/Product.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Product.h rename to src/eigen/Eigen/src/Core/Product.h diff --git a/xs/src/eigen/Eigen/src/Core/ProductEvaluators.h b/src/eigen/Eigen/src/Core/ProductEvaluators.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/ProductEvaluators.h rename to src/eigen/Eigen/src/Core/ProductEvaluators.h diff --git a/xs/src/eigen/Eigen/src/Core/Random.h b/src/eigen/Eigen/src/Core/Random.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Random.h rename to src/eigen/Eigen/src/Core/Random.h diff --git a/xs/src/eigen/Eigen/src/Core/Redux.h b/src/eigen/Eigen/src/Core/Redux.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Redux.h rename to src/eigen/Eigen/src/Core/Redux.h diff --git a/xs/src/eigen/Eigen/src/Core/Ref.h b/src/eigen/Eigen/src/Core/Ref.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Ref.h rename to src/eigen/Eigen/src/Core/Ref.h diff --git a/xs/src/eigen/Eigen/src/Core/Replicate.h b/src/eigen/Eigen/src/Core/Replicate.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Replicate.h rename to src/eigen/Eigen/src/Core/Replicate.h diff --git a/xs/src/eigen/Eigen/src/Core/ReturnByValue.h b/src/eigen/Eigen/src/Core/ReturnByValue.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/ReturnByValue.h rename to src/eigen/Eigen/src/Core/ReturnByValue.h diff --git a/xs/src/eigen/Eigen/src/Core/Reverse.h b/src/eigen/Eigen/src/Core/Reverse.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Reverse.h rename to src/eigen/Eigen/src/Core/Reverse.h diff --git a/xs/src/eigen/Eigen/src/Core/Select.h b/src/eigen/Eigen/src/Core/Select.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Select.h rename to src/eigen/Eigen/src/Core/Select.h diff --git a/xs/src/eigen/Eigen/src/Core/SelfAdjointView.h b/src/eigen/Eigen/src/Core/SelfAdjointView.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/SelfAdjointView.h rename to src/eigen/Eigen/src/Core/SelfAdjointView.h diff --git a/xs/src/eigen/Eigen/src/Core/SelfCwiseBinaryOp.h b/src/eigen/Eigen/src/Core/SelfCwiseBinaryOp.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/SelfCwiseBinaryOp.h rename to src/eigen/Eigen/src/Core/SelfCwiseBinaryOp.h diff --git a/xs/src/eigen/Eigen/src/Core/Solve.h b/src/eigen/Eigen/src/Core/Solve.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Solve.h rename to src/eigen/Eigen/src/Core/Solve.h diff --git a/xs/src/eigen/Eigen/src/Core/SolveTriangular.h b/src/eigen/Eigen/src/Core/SolveTriangular.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/SolveTriangular.h rename to src/eigen/Eigen/src/Core/SolveTriangular.h diff --git a/xs/src/eigen/Eigen/src/Core/SolverBase.h b/src/eigen/Eigen/src/Core/SolverBase.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/SolverBase.h rename to src/eigen/Eigen/src/Core/SolverBase.h diff --git a/xs/src/eigen/Eigen/src/Core/StableNorm.h b/src/eigen/Eigen/src/Core/StableNorm.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/StableNorm.h rename to src/eigen/Eigen/src/Core/StableNorm.h diff --git a/xs/src/eigen/Eigen/src/Core/Stride.h b/src/eigen/Eigen/src/Core/Stride.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Stride.h rename to src/eigen/Eigen/src/Core/Stride.h diff --git a/xs/src/eigen/Eigen/src/Core/Swap.h b/src/eigen/Eigen/src/Core/Swap.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Swap.h rename to src/eigen/Eigen/src/Core/Swap.h diff --git a/xs/src/eigen/Eigen/src/Core/Transpose.h b/src/eigen/Eigen/src/Core/Transpose.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Transpose.h rename to src/eigen/Eigen/src/Core/Transpose.h diff --git a/xs/src/eigen/Eigen/src/Core/Transpositions.h b/src/eigen/Eigen/src/Core/Transpositions.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Transpositions.h rename to src/eigen/Eigen/src/Core/Transpositions.h diff --git a/xs/src/eigen/Eigen/src/Core/TriangularMatrix.h b/src/eigen/Eigen/src/Core/TriangularMatrix.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/TriangularMatrix.h rename to src/eigen/Eigen/src/Core/TriangularMatrix.h diff --git a/xs/src/eigen/Eigen/src/Core/VectorBlock.h b/src/eigen/Eigen/src/Core/VectorBlock.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/VectorBlock.h rename to src/eigen/Eigen/src/Core/VectorBlock.h diff --git a/xs/src/eigen/Eigen/src/Core/VectorwiseOp.h b/src/eigen/Eigen/src/Core/VectorwiseOp.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/VectorwiseOp.h rename to src/eigen/Eigen/src/Core/VectorwiseOp.h diff --git a/xs/src/eigen/Eigen/src/Core/Visitor.h b/src/eigen/Eigen/src/Core/Visitor.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/Visitor.h rename to src/eigen/Eigen/src/Core/Visitor.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/AVX/Complex.h b/src/eigen/Eigen/src/Core/arch/AVX/Complex.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/AVX/Complex.h rename to src/eigen/Eigen/src/Core/arch/AVX/Complex.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/AVX/MathFunctions.h b/src/eigen/Eigen/src/Core/arch/AVX/MathFunctions.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/AVX/MathFunctions.h rename to src/eigen/Eigen/src/Core/arch/AVX/MathFunctions.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/AVX/PacketMath.h b/src/eigen/Eigen/src/Core/arch/AVX/PacketMath.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/AVX/PacketMath.h rename to src/eigen/Eigen/src/Core/arch/AVX/PacketMath.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/AVX/TypeCasting.h b/src/eigen/Eigen/src/Core/arch/AVX/TypeCasting.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/AVX/TypeCasting.h rename to src/eigen/Eigen/src/Core/arch/AVX/TypeCasting.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/AVX512/MathFunctions.h b/src/eigen/Eigen/src/Core/arch/AVX512/MathFunctions.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/AVX512/MathFunctions.h rename to src/eigen/Eigen/src/Core/arch/AVX512/MathFunctions.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/AVX512/PacketMath.h b/src/eigen/Eigen/src/Core/arch/AVX512/PacketMath.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/AVX512/PacketMath.h rename to src/eigen/Eigen/src/Core/arch/AVX512/PacketMath.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/AltiVec/Complex.h b/src/eigen/Eigen/src/Core/arch/AltiVec/Complex.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/AltiVec/Complex.h rename to src/eigen/Eigen/src/Core/arch/AltiVec/Complex.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/AltiVec/MathFunctions.h b/src/eigen/Eigen/src/Core/arch/AltiVec/MathFunctions.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/AltiVec/MathFunctions.h rename to src/eigen/Eigen/src/Core/arch/AltiVec/MathFunctions.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/AltiVec/PacketMath.h b/src/eigen/Eigen/src/Core/arch/AltiVec/PacketMath.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/AltiVec/PacketMath.h rename to src/eigen/Eigen/src/Core/arch/AltiVec/PacketMath.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/CUDA/Complex.h b/src/eigen/Eigen/src/Core/arch/CUDA/Complex.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/CUDA/Complex.h rename to src/eigen/Eigen/src/Core/arch/CUDA/Complex.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/CUDA/Half.h b/src/eigen/Eigen/src/Core/arch/CUDA/Half.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/CUDA/Half.h rename to src/eigen/Eigen/src/Core/arch/CUDA/Half.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/CUDA/MathFunctions.h b/src/eigen/Eigen/src/Core/arch/CUDA/MathFunctions.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/CUDA/MathFunctions.h rename to src/eigen/Eigen/src/Core/arch/CUDA/MathFunctions.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/CUDA/PacketMath.h b/src/eigen/Eigen/src/Core/arch/CUDA/PacketMath.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/CUDA/PacketMath.h rename to src/eigen/Eigen/src/Core/arch/CUDA/PacketMath.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/CUDA/PacketMathHalf.h b/src/eigen/Eigen/src/Core/arch/CUDA/PacketMathHalf.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/CUDA/PacketMathHalf.h rename to src/eigen/Eigen/src/Core/arch/CUDA/PacketMathHalf.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/CUDA/TypeCasting.h b/src/eigen/Eigen/src/Core/arch/CUDA/TypeCasting.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/CUDA/TypeCasting.h rename to src/eigen/Eigen/src/Core/arch/CUDA/TypeCasting.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/Default/ConjHelper.h b/src/eigen/Eigen/src/Core/arch/Default/ConjHelper.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/Default/ConjHelper.h rename to src/eigen/Eigen/src/Core/arch/Default/ConjHelper.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/Default/Settings.h b/src/eigen/Eigen/src/Core/arch/Default/Settings.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/Default/Settings.h rename to src/eigen/Eigen/src/Core/arch/Default/Settings.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/NEON/Complex.h b/src/eigen/Eigen/src/Core/arch/NEON/Complex.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/NEON/Complex.h rename to src/eigen/Eigen/src/Core/arch/NEON/Complex.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/NEON/MathFunctions.h b/src/eigen/Eigen/src/Core/arch/NEON/MathFunctions.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/NEON/MathFunctions.h rename to src/eigen/Eigen/src/Core/arch/NEON/MathFunctions.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/NEON/PacketMath.h b/src/eigen/Eigen/src/Core/arch/NEON/PacketMath.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/NEON/PacketMath.h rename to src/eigen/Eigen/src/Core/arch/NEON/PacketMath.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/SSE/Complex.h b/src/eigen/Eigen/src/Core/arch/SSE/Complex.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/SSE/Complex.h rename to src/eigen/Eigen/src/Core/arch/SSE/Complex.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/SSE/MathFunctions.h b/src/eigen/Eigen/src/Core/arch/SSE/MathFunctions.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/SSE/MathFunctions.h rename to src/eigen/Eigen/src/Core/arch/SSE/MathFunctions.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/SSE/PacketMath.h b/src/eigen/Eigen/src/Core/arch/SSE/PacketMath.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/SSE/PacketMath.h rename to src/eigen/Eigen/src/Core/arch/SSE/PacketMath.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/SSE/TypeCasting.h b/src/eigen/Eigen/src/Core/arch/SSE/TypeCasting.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/SSE/TypeCasting.h rename to src/eigen/Eigen/src/Core/arch/SSE/TypeCasting.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/ZVector/Complex.h b/src/eigen/Eigen/src/Core/arch/ZVector/Complex.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/ZVector/Complex.h rename to src/eigen/Eigen/src/Core/arch/ZVector/Complex.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/ZVector/MathFunctions.h b/src/eigen/Eigen/src/Core/arch/ZVector/MathFunctions.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/ZVector/MathFunctions.h rename to src/eigen/Eigen/src/Core/arch/ZVector/MathFunctions.h diff --git a/xs/src/eigen/Eigen/src/Core/arch/ZVector/PacketMath.h b/src/eigen/Eigen/src/Core/arch/ZVector/PacketMath.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/arch/ZVector/PacketMath.h rename to src/eigen/Eigen/src/Core/arch/ZVector/PacketMath.h diff --git a/xs/src/eigen/Eigen/src/Core/functors/AssignmentFunctors.h b/src/eigen/Eigen/src/Core/functors/AssignmentFunctors.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/functors/AssignmentFunctors.h rename to src/eigen/Eigen/src/Core/functors/AssignmentFunctors.h diff --git a/xs/src/eigen/Eigen/src/Core/functors/BinaryFunctors.h b/src/eigen/Eigen/src/Core/functors/BinaryFunctors.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/functors/BinaryFunctors.h rename to src/eigen/Eigen/src/Core/functors/BinaryFunctors.h diff --git a/xs/src/eigen/Eigen/src/Core/functors/NullaryFunctors.h b/src/eigen/Eigen/src/Core/functors/NullaryFunctors.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/functors/NullaryFunctors.h rename to src/eigen/Eigen/src/Core/functors/NullaryFunctors.h diff --git a/xs/src/eigen/Eigen/src/Core/functors/StlFunctors.h b/src/eigen/Eigen/src/Core/functors/StlFunctors.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/functors/StlFunctors.h rename to src/eigen/Eigen/src/Core/functors/StlFunctors.h diff --git a/xs/src/eigen/Eigen/src/Core/functors/TernaryFunctors.h b/src/eigen/Eigen/src/Core/functors/TernaryFunctors.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/functors/TernaryFunctors.h rename to src/eigen/Eigen/src/Core/functors/TernaryFunctors.h diff --git a/xs/src/eigen/Eigen/src/Core/functors/UnaryFunctors.h b/src/eigen/Eigen/src/Core/functors/UnaryFunctors.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/functors/UnaryFunctors.h rename to src/eigen/Eigen/src/Core/functors/UnaryFunctors.h diff --git a/xs/src/eigen/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/src/eigen/Eigen/src/Core/products/GeneralBlockPanelKernel.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/GeneralBlockPanelKernel.h rename to src/eigen/Eigen/src/Core/products/GeneralBlockPanelKernel.h diff --git a/xs/src/eigen/Eigen/src/Core/products/GeneralMatrixMatrix.h b/src/eigen/Eigen/src/Core/products/GeneralMatrixMatrix.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/GeneralMatrixMatrix.h rename to src/eigen/Eigen/src/Core/products/GeneralMatrixMatrix.h diff --git a/xs/src/eigen/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h b/src/eigen/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h rename to src/eigen/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h diff --git a/xs/src/eigen/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_BLAS.h b/src/eigen/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_BLAS.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_BLAS.h rename to src/eigen/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_BLAS.h diff --git a/xs/src/eigen/Eigen/src/Core/products/GeneralMatrixMatrix_BLAS.h b/src/eigen/Eigen/src/Core/products/GeneralMatrixMatrix_BLAS.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/GeneralMatrixMatrix_BLAS.h rename to src/eigen/Eigen/src/Core/products/GeneralMatrixMatrix_BLAS.h diff --git a/xs/src/eigen/Eigen/src/Core/products/GeneralMatrixVector.h b/src/eigen/Eigen/src/Core/products/GeneralMatrixVector.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/GeneralMatrixVector.h rename to src/eigen/Eigen/src/Core/products/GeneralMatrixVector.h diff --git a/xs/src/eigen/Eigen/src/Core/products/GeneralMatrixVector_BLAS.h b/src/eigen/Eigen/src/Core/products/GeneralMatrixVector_BLAS.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/GeneralMatrixVector_BLAS.h rename to src/eigen/Eigen/src/Core/products/GeneralMatrixVector_BLAS.h diff --git a/xs/src/eigen/Eigen/src/Core/products/Parallelizer.h b/src/eigen/Eigen/src/Core/products/Parallelizer.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/Parallelizer.h rename to src/eigen/Eigen/src/Core/products/Parallelizer.h diff --git a/xs/src/eigen/Eigen/src/Core/products/SelfadjointMatrixMatrix.h b/src/eigen/Eigen/src/Core/products/SelfadjointMatrixMatrix.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/SelfadjointMatrixMatrix.h rename to src/eigen/Eigen/src/Core/products/SelfadjointMatrixMatrix.h diff --git a/xs/src/eigen/Eigen/src/Core/products/SelfadjointMatrixMatrix_BLAS.h b/src/eigen/Eigen/src/Core/products/SelfadjointMatrixMatrix_BLAS.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/SelfadjointMatrixMatrix_BLAS.h rename to src/eigen/Eigen/src/Core/products/SelfadjointMatrixMatrix_BLAS.h diff --git a/xs/src/eigen/Eigen/src/Core/products/SelfadjointMatrixVector.h b/src/eigen/Eigen/src/Core/products/SelfadjointMatrixVector.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/SelfadjointMatrixVector.h rename to src/eigen/Eigen/src/Core/products/SelfadjointMatrixVector.h diff --git a/xs/src/eigen/Eigen/src/Core/products/SelfadjointMatrixVector_BLAS.h b/src/eigen/Eigen/src/Core/products/SelfadjointMatrixVector_BLAS.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/SelfadjointMatrixVector_BLAS.h rename to src/eigen/Eigen/src/Core/products/SelfadjointMatrixVector_BLAS.h diff --git a/xs/src/eigen/Eigen/src/Core/products/SelfadjointProduct.h b/src/eigen/Eigen/src/Core/products/SelfadjointProduct.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/SelfadjointProduct.h rename to src/eigen/Eigen/src/Core/products/SelfadjointProduct.h diff --git a/xs/src/eigen/Eigen/src/Core/products/SelfadjointRank2Update.h b/src/eigen/Eigen/src/Core/products/SelfadjointRank2Update.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/SelfadjointRank2Update.h rename to src/eigen/Eigen/src/Core/products/SelfadjointRank2Update.h diff --git a/xs/src/eigen/Eigen/src/Core/products/TriangularMatrixMatrix.h b/src/eigen/Eigen/src/Core/products/TriangularMatrixMatrix.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/TriangularMatrixMatrix.h rename to src/eigen/Eigen/src/Core/products/TriangularMatrixMatrix.h diff --git a/xs/src/eigen/Eigen/src/Core/products/TriangularMatrixMatrix_BLAS.h b/src/eigen/Eigen/src/Core/products/TriangularMatrixMatrix_BLAS.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/TriangularMatrixMatrix_BLAS.h rename to src/eigen/Eigen/src/Core/products/TriangularMatrixMatrix_BLAS.h diff --git a/xs/src/eigen/Eigen/src/Core/products/TriangularMatrixVector.h b/src/eigen/Eigen/src/Core/products/TriangularMatrixVector.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/TriangularMatrixVector.h rename to src/eigen/Eigen/src/Core/products/TriangularMatrixVector.h diff --git a/xs/src/eigen/Eigen/src/Core/products/TriangularMatrixVector_BLAS.h b/src/eigen/Eigen/src/Core/products/TriangularMatrixVector_BLAS.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/TriangularMatrixVector_BLAS.h rename to src/eigen/Eigen/src/Core/products/TriangularMatrixVector_BLAS.h diff --git a/xs/src/eigen/Eigen/src/Core/products/TriangularSolverMatrix.h b/src/eigen/Eigen/src/Core/products/TriangularSolverMatrix.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/TriangularSolverMatrix.h rename to src/eigen/Eigen/src/Core/products/TriangularSolverMatrix.h diff --git a/xs/src/eigen/Eigen/src/Core/products/TriangularSolverMatrix_BLAS.h b/src/eigen/Eigen/src/Core/products/TriangularSolverMatrix_BLAS.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/TriangularSolverMatrix_BLAS.h rename to src/eigen/Eigen/src/Core/products/TriangularSolverMatrix_BLAS.h diff --git a/xs/src/eigen/Eigen/src/Core/products/TriangularSolverVector.h b/src/eigen/Eigen/src/Core/products/TriangularSolverVector.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/products/TriangularSolverVector.h rename to src/eigen/Eigen/src/Core/products/TriangularSolverVector.h diff --git a/xs/src/eigen/Eigen/src/Core/util/BlasUtil.h b/src/eigen/Eigen/src/Core/util/BlasUtil.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/util/BlasUtil.h rename to src/eigen/Eigen/src/Core/util/BlasUtil.h diff --git a/xs/src/eigen/Eigen/src/Core/util/Constants.h b/src/eigen/Eigen/src/Core/util/Constants.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/util/Constants.h rename to src/eigen/Eigen/src/Core/util/Constants.h diff --git a/xs/src/eigen/Eigen/src/Core/util/DisableStupidWarnings.h b/src/eigen/Eigen/src/Core/util/DisableStupidWarnings.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/util/DisableStupidWarnings.h rename to src/eigen/Eigen/src/Core/util/DisableStupidWarnings.h diff --git a/xs/src/eigen/Eigen/src/Core/util/ForwardDeclarations.h b/src/eigen/Eigen/src/Core/util/ForwardDeclarations.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/util/ForwardDeclarations.h rename to src/eigen/Eigen/src/Core/util/ForwardDeclarations.h diff --git a/xs/src/eigen/Eigen/src/Core/util/MKL_support.h b/src/eigen/Eigen/src/Core/util/MKL_support.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/util/MKL_support.h rename to src/eigen/Eigen/src/Core/util/MKL_support.h diff --git a/xs/src/eigen/Eigen/src/Core/util/Macros.h b/src/eigen/Eigen/src/Core/util/Macros.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/util/Macros.h rename to src/eigen/Eigen/src/Core/util/Macros.h diff --git a/xs/src/eigen/Eigen/src/Core/util/Memory.h b/src/eigen/Eigen/src/Core/util/Memory.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/util/Memory.h rename to src/eigen/Eigen/src/Core/util/Memory.h diff --git a/xs/src/eigen/Eigen/src/Core/util/Meta.h b/src/eigen/Eigen/src/Core/util/Meta.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/util/Meta.h rename to src/eigen/Eigen/src/Core/util/Meta.h diff --git a/xs/src/eigen/Eigen/src/Core/util/NonMPL2.h b/src/eigen/Eigen/src/Core/util/NonMPL2.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/util/NonMPL2.h rename to src/eigen/Eigen/src/Core/util/NonMPL2.h diff --git a/xs/src/eigen/Eigen/src/Core/util/ReenableStupidWarnings.h b/src/eigen/Eigen/src/Core/util/ReenableStupidWarnings.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/util/ReenableStupidWarnings.h rename to src/eigen/Eigen/src/Core/util/ReenableStupidWarnings.h diff --git a/xs/src/eigen/Eigen/src/Core/util/StaticAssert.h b/src/eigen/Eigen/src/Core/util/StaticAssert.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/util/StaticAssert.h rename to src/eigen/Eigen/src/Core/util/StaticAssert.h diff --git a/xs/src/eigen/Eigen/src/Core/util/XprHelper.h b/src/eigen/Eigen/src/Core/util/XprHelper.h similarity index 100% rename from xs/src/eigen/Eigen/src/Core/util/XprHelper.h rename to src/eigen/Eigen/src/Core/util/XprHelper.h diff --git a/xs/src/eigen/Eigen/src/Eigenvalues/ComplexEigenSolver.h b/src/eigen/Eigen/src/Eigenvalues/ComplexEigenSolver.h similarity index 100% rename from xs/src/eigen/Eigen/src/Eigenvalues/ComplexEigenSolver.h rename to src/eigen/Eigen/src/Eigenvalues/ComplexEigenSolver.h diff --git a/xs/src/eigen/Eigen/src/Eigenvalues/ComplexSchur.h b/src/eigen/Eigen/src/Eigenvalues/ComplexSchur.h similarity index 100% rename from xs/src/eigen/Eigen/src/Eigenvalues/ComplexSchur.h rename to src/eigen/Eigen/src/Eigenvalues/ComplexSchur.h diff --git a/xs/src/eigen/Eigen/src/Eigenvalues/ComplexSchur_LAPACKE.h b/src/eigen/Eigen/src/Eigenvalues/ComplexSchur_LAPACKE.h similarity index 100% rename from xs/src/eigen/Eigen/src/Eigenvalues/ComplexSchur_LAPACKE.h rename to src/eigen/Eigen/src/Eigenvalues/ComplexSchur_LAPACKE.h diff --git a/xs/src/eigen/Eigen/src/Eigenvalues/EigenSolver.h b/src/eigen/Eigen/src/Eigenvalues/EigenSolver.h similarity index 100% rename from xs/src/eigen/Eigen/src/Eigenvalues/EigenSolver.h rename to src/eigen/Eigen/src/Eigenvalues/EigenSolver.h diff --git a/xs/src/eigen/Eigen/src/Eigenvalues/GeneralizedEigenSolver.h b/src/eigen/Eigen/src/Eigenvalues/GeneralizedEigenSolver.h similarity index 100% rename from xs/src/eigen/Eigen/src/Eigenvalues/GeneralizedEigenSolver.h rename to src/eigen/Eigen/src/Eigenvalues/GeneralizedEigenSolver.h diff --git a/xs/src/eigen/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h b/src/eigen/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h similarity index 100% rename from xs/src/eigen/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h rename to src/eigen/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h diff --git a/xs/src/eigen/Eigen/src/Eigenvalues/HessenbergDecomposition.h b/src/eigen/Eigen/src/Eigenvalues/HessenbergDecomposition.h similarity index 100% rename from xs/src/eigen/Eigen/src/Eigenvalues/HessenbergDecomposition.h rename to src/eigen/Eigen/src/Eigenvalues/HessenbergDecomposition.h diff --git a/xs/src/eigen/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h b/src/eigen/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h similarity index 100% rename from xs/src/eigen/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h rename to src/eigen/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h diff --git a/xs/src/eigen/Eigen/src/Eigenvalues/RealQZ.h b/src/eigen/Eigen/src/Eigenvalues/RealQZ.h similarity index 100% rename from xs/src/eigen/Eigen/src/Eigenvalues/RealQZ.h rename to src/eigen/Eigen/src/Eigenvalues/RealQZ.h diff --git a/xs/src/eigen/Eigen/src/Eigenvalues/RealSchur.h b/src/eigen/Eigen/src/Eigenvalues/RealSchur.h similarity index 100% rename from xs/src/eigen/Eigen/src/Eigenvalues/RealSchur.h rename to src/eigen/Eigen/src/Eigenvalues/RealSchur.h diff --git a/xs/src/eigen/Eigen/src/Eigenvalues/RealSchur_LAPACKE.h b/src/eigen/Eigen/src/Eigenvalues/RealSchur_LAPACKE.h similarity index 100% rename from xs/src/eigen/Eigen/src/Eigenvalues/RealSchur_LAPACKE.h rename to src/eigen/Eigen/src/Eigenvalues/RealSchur_LAPACKE.h diff --git a/xs/src/eigen/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h b/src/eigen/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h similarity index 100% rename from xs/src/eigen/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h rename to src/eigen/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h diff --git a/xs/src/eigen/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_LAPACKE.h b/src/eigen/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_LAPACKE.h similarity index 100% rename from xs/src/eigen/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_LAPACKE.h rename to src/eigen/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_LAPACKE.h diff --git a/xs/src/eigen/Eigen/src/Eigenvalues/Tridiagonalization.h b/src/eigen/Eigen/src/Eigenvalues/Tridiagonalization.h similarity index 100% rename from xs/src/eigen/Eigen/src/Eigenvalues/Tridiagonalization.h rename to src/eigen/Eigen/src/Eigenvalues/Tridiagonalization.h diff --git a/xs/src/eigen/Eigen/src/Geometry/AlignedBox.h b/src/eigen/Eigen/src/Geometry/AlignedBox.h similarity index 100% rename from xs/src/eigen/Eigen/src/Geometry/AlignedBox.h rename to src/eigen/Eigen/src/Geometry/AlignedBox.h diff --git a/xs/src/eigen/Eigen/src/Geometry/AngleAxis.h b/src/eigen/Eigen/src/Geometry/AngleAxis.h similarity index 100% rename from xs/src/eigen/Eigen/src/Geometry/AngleAxis.h rename to src/eigen/Eigen/src/Geometry/AngleAxis.h diff --git a/xs/src/eigen/Eigen/src/Geometry/EulerAngles.h b/src/eigen/Eigen/src/Geometry/EulerAngles.h similarity index 100% rename from xs/src/eigen/Eigen/src/Geometry/EulerAngles.h rename to src/eigen/Eigen/src/Geometry/EulerAngles.h diff --git a/xs/src/eigen/Eigen/src/Geometry/Homogeneous.h b/src/eigen/Eigen/src/Geometry/Homogeneous.h similarity index 100% rename from xs/src/eigen/Eigen/src/Geometry/Homogeneous.h rename to src/eigen/Eigen/src/Geometry/Homogeneous.h diff --git a/xs/src/eigen/Eigen/src/Geometry/Hyperplane.h b/src/eigen/Eigen/src/Geometry/Hyperplane.h similarity index 100% rename from xs/src/eigen/Eigen/src/Geometry/Hyperplane.h rename to src/eigen/Eigen/src/Geometry/Hyperplane.h diff --git a/xs/src/eigen/Eigen/src/Geometry/OrthoMethods.h b/src/eigen/Eigen/src/Geometry/OrthoMethods.h similarity index 100% rename from xs/src/eigen/Eigen/src/Geometry/OrthoMethods.h rename to src/eigen/Eigen/src/Geometry/OrthoMethods.h diff --git a/xs/src/eigen/Eigen/src/Geometry/ParametrizedLine.h b/src/eigen/Eigen/src/Geometry/ParametrizedLine.h similarity index 100% rename from xs/src/eigen/Eigen/src/Geometry/ParametrizedLine.h rename to src/eigen/Eigen/src/Geometry/ParametrizedLine.h diff --git a/xs/src/eigen/Eigen/src/Geometry/Quaternion.h b/src/eigen/Eigen/src/Geometry/Quaternion.h similarity index 100% rename from xs/src/eigen/Eigen/src/Geometry/Quaternion.h rename to src/eigen/Eigen/src/Geometry/Quaternion.h diff --git a/xs/src/eigen/Eigen/src/Geometry/Rotation2D.h b/src/eigen/Eigen/src/Geometry/Rotation2D.h similarity index 100% rename from xs/src/eigen/Eigen/src/Geometry/Rotation2D.h rename to src/eigen/Eigen/src/Geometry/Rotation2D.h diff --git a/xs/src/eigen/Eigen/src/Geometry/RotationBase.h b/src/eigen/Eigen/src/Geometry/RotationBase.h similarity index 100% rename from xs/src/eigen/Eigen/src/Geometry/RotationBase.h rename to src/eigen/Eigen/src/Geometry/RotationBase.h diff --git a/xs/src/eigen/Eigen/src/Geometry/Scaling.h b/src/eigen/Eigen/src/Geometry/Scaling.h similarity index 100% rename from xs/src/eigen/Eigen/src/Geometry/Scaling.h rename to src/eigen/Eigen/src/Geometry/Scaling.h diff --git a/xs/src/eigen/Eigen/src/Geometry/Transform.h b/src/eigen/Eigen/src/Geometry/Transform.h similarity index 100% rename from xs/src/eigen/Eigen/src/Geometry/Transform.h rename to src/eigen/Eigen/src/Geometry/Transform.h diff --git a/xs/src/eigen/Eigen/src/Geometry/Translation.h b/src/eigen/Eigen/src/Geometry/Translation.h similarity index 100% rename from xs/src/eigen/Eigen/src/Geometry/Translation.h rename to src/eigen/Eigen/src/Geometry/Translation.h diff --git a/xs/src/eigen/Eigen/src/Geometry/Umeyama.h b/src/eigen/Eigen/src/Geometry/Umeyama.h similarity index 100% rename from xs/src/eigen/Eigen/src/Geometry/Umeyama.h rename to src/eigen/Eigen/src/Geometry/Umeyama.h diff --git a/xs/src/eigen/Eigen/src/Geometry/arch/Geometry_SSE.h b/src/eigen/Eigen/src/Geometry/arch/Geometry_SSE.h similarity index 100% rename from xs/src/eigen/Eigen/src/Geometry/arch/Geometry_SSE.h rename to src/eigen/Eigen/src/Geometry/arch/Geometry_SSE.h diff --git a/xs/src/eigen/Eigen/src/Householder/BlockHouseholder.h b/src/eigen/Eigen/src/Householder/BlockHouseholder.h similarity index 100% rename from xs/src/eigen/Eigen/src/Householder/BlockHouseholder.h rename to src/eigen/Eigen/src/Householder/BlockHouseholder.h diff --git a/xs/src/eigen/Eigen/src/Householder/Householder.h b/src/eigen/Eigen/src/Householder/Householder.h similarity index 100% rename from xs/src/eigen/Eigen/src/Householder/Householder.h rename to src/eigen/Eigen/src/Householder/Householder.h diff --git a/xs/src/eigen/Eigen/src/Householder/HouseholderSequence.h b/src/eigen/Eigen/src/Householder/HouseholderSequence.h similarity index 100% rename from xs/src/eigen/Eigen/src/Householder/HouseholderSequence.h rename to src/eigen/Eigen/src/Householder/HouseholderSequence.h diff --git a/xs/src/eigen/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h b/src/eigen/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h similarity index 100% rename from xs/src/eigen/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h rename to src/eigen/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h diff --git a/xs/src/eigen/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h b/src/eigen/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h similarity index 100% rename from xs/src/eigen/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h rename to src/eigen/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h diff --git a/xs/src/eigen/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h b/src/eigen/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h similarity index 100% rename from xs/src/eigen/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h rename to src/eigen/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h diff --git a/xs/src/eigen/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h b/src/eigen/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h similarity index 100% rename from xs/src/eigen/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h rename to src/eigen/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h diff --git a/xs/src/eigen/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h b/src/eigen/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h similarity index 100% rename from xs/src/eigen/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h rename to src/eigen/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h diff --git a/xs/src/eigen/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h b/src/eigen/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h similarity index 100% rename from xs/src/eigen/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h rename to src/eigen/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h diff --git a/xs/src/eigen/Eigen/src/IterativeLinearSolvers/LeastSquareConjugateGradient.h b/src/eigen/Eigen/src/IterativeLinearSolvers/LeastSquareConjugateGradient.h similarity index 100% rename from xs/src/eigen/Eigen/src/IterativeLinearSolvers/LeastSquareConjugateGradient.h rename to src/eigen/Eigen/src/IterativeLinearSolvers/LeastSquareConjugateGradient.h diff --git a/xs/src/eigen/Eigen/src/IterativeLinearSolvers/SolveWithGuess.h b/src/eigen/Eigen/src/IterativeLinearSolvers/SolveWithGuess.h similarity index 100% rename from xs/src/eigen/Eigen/src/IterativeLinearSolvers/SolveWithGuess.h rename to src/eigen/Eigen/src/IterativeLinearSolvers/SolveWithGuess.h diff --git a/xs/src/eigen/Eigen/src/Jacobi/Jacobi.h b/src/eigen/Eigen/src/Jacobi/Jacobi.h similarity index 100% rename from xs/src/eigen/Eigen/src/Jacobi/Jacobi.h rename to src/eigen/Eigen/src/Jacobi/Jacobi.h diff --git a/xs/src/eigen/Eigen/src/LU/Determinant.h b/src/eigen/Eigen/src/LU/Determinant.h similarity index 100% rename from xs/src/eigen/Eigen/src/LU/Determinant.h rename to src/eigen/Eigen/src/LU/Determinant.h diff --git a/xs/src/eigen/Eigen/src/LU/FullPivLU.h b/src/eigen/Eigen/src/LU/FullPivLU.h similarity index 100% rename from xs/src/eigen/Eigen/src/LU/FullPivLU.h rename to src/eigen/Eigen/src/LU/FullPivLU.h diff --git a/xs/src/eigen/Eigen/src/LU/InverseImpl.h b/src/eigen/Eigen/src/LU/InverseImpl.h similarity index 100% rename from xs/src/eigen/Eigen/src/LU/InverseImpl.h rename to src/eigen/Eigen/src/LU/InverseImpl.h diff --git a/xs/src/eigen/Eigen/src/LU/PartialPivLU.h b/src/eigen/Eigen/src/LU/PartialPivLU.h similarity index 100% rename from xs/src/eigen/Eigen/src/LU/PartialPivLU.h rename to src/eigen/Eigen/src/LU/PartialPivLU.h diff --git a/xs/src/eigen/Eigen/src/LU/PartialPivLU_LAPACKE.h b/src/eigen/Eigen/src/LU/PartialPivLU_LAPACKE.h similarity index 100% rename from xs/src/eigen/Eigen/src/LU/PartialPivLU_LAPACKE.h rename to src/eigen/Eigen/src/LU/PartialPivLU_LAPACKE.h diff --git a/xs/src/eigen/Eigen/src/LU/arch/Inverse_SSE.h b/src/eigen/Eigen/src/LU/arch/Inverse_SSE.h similarity index 100% rename from xs/src/eigen/Eigen/src/LU/arch/Inverse_SSE.h rename to src/eigen/Eigen/src/LU/arch/Inverse_SSE.h diff --git a/xs/src/eigen/Eigen/src/MetisSupport/MetisSupport.h b/src/eigen/Eigen/src/MetisSupport/MetisSupport.h similarity index 100% rename from xs/src/eigen/Eigen/src/MetisSupport/MetisSupport.h rename to src/eigen/Eigen/src/MetisSupport/MetisSupport.h diff --git a/xs/src/eigen/Eigen/src/OrderingMethods/Amd.h b/src/eigen/Eigen/src/OrderingMethods/Amd.h similarity index 100% rename from xs/src/eigen/Eigen/src/OrderingMethods/Amd.h rename to src/eigen/Eigen/src/OrderingMethods/Amd.h diff --git a/xs/src/eigen/Eigen/src/OrderingMethods/Eigen_Colamd.h b/src/eigen/Eigen/src/OrderingMethods/Eigen_Colamd.h similarity index 100% rename from xs/src/eigen/Eigen/src/OrderingMethods/Eigen_Colamd.h rename to src/eigen/Eigen/src/OrderingMethods/Eigen_Colamd.h diff --git a/xs/src/eigen/Eigen/src/OrderingMethods/Ordering.h b/src/eigen/Eigen/src/OrderingMethods/Ordering.h similarity index 100% rename from xs/src/eigen/Eigen/src/OrderingMethods/Ordering.h rename to src/eigen/Eigen/src/OrderingMethods/Ordering.h diff --git a/xs/src/eigen/Eigen/src/PaStiXSupport/PaStiXSupport.h b/src/eigen/Eigen/src/PaStiXSupport/PaStiXSupport.h similarity index 100% rename from xs/src/eigen/Eigen/src/PaStiXSupport/PaStiXSupport.h rename to src/eigen/Eigen/src/PaStiXSupport/PaStiXSupport.h diff --git a/xs/src/eigen/Eigen/src/PardisoSupport/PardisoSupport.h b/src/eigen/Eigen/src/PardisoSupport/PardisoSupport.h similarity index 100% rename from xs/src/eigen/Eigen/src/PardisoSupport/PardisoSupport.h rename to src/eigen/Eigen/src/PardisoSupport/PardisoSupport.h diff --git a/xs/src/eigen/Eigen/src/QR/ColPivHouseholderQR.h b/src/eigen/Eigen/src/QR/ColPivHouseholderQR.h similarity index 100% rename from xs/src/eigen/Eigen/src/QR/ColPivHouseholderQR.h rename to src/eigen/Eigen/src/QR/ColPivHouseholderQR.h diff --git a/xs/src/eigen/Eigen/src/QR/ColPivHouseholderQR_LAPACKE.h b/src/eigen/Eigen/src/QR/ColPivHouseholderQR_LAPACKE.h similarity index 100% rename from xs/src/eigen/Eigen/src/QR/ColPivHouseholderQR_LAPACKE.h rename to src/eigen/Eigen/src/QR/ColPivHouseholderQR_LAPACKE.h diff --git a/xs/src/eigen/Eigen/src/QR/CompleteOrthogonalDecomposition.h b/src/eigen/Eigen/src/QR/CompleteOrthogonalDecomposition.h similarity index 100% rename from xs/src/eigen/Eigen/src/QR/CompleteOrthogonalDecomposition.h rename to src/eigen/Eigen/src/QR/CompleteOrthogonalDecomposition.h diff --git a/xs/src/eigen/Eigen/src/QR/FullPivHouseholderQR.h b/src/eigen/Eigen/src/QR/FullPivHouseholderQR.h similarity index 100% rename from xs/src/eigen/Eigen/src/QR/FullPivHouseholderQR.h rename to src/eigen/Eigen/src/QR/FullPivHouseholderQR.h diff --git a/xs/src/eigen/Eigen/src/QR/HouseholderQR.h b/src/eigen/Eigen/src/QR/HouseholderQR.h similarity index 100% rename from xs/src/eigen/Eigen/src/QR/HouseholderQR.h rename to src/eigen/Eigen/src/QR/HouseholderQR.h diff --git a/xs/src/eigen/Eigen/src/QR/HouseholderQR_LAPACKE.h b/src/eigen/Eigen/src/QR/HouseholderQR_LAPACKE.h similarity index 100% rename from xs/src/eigen/Eigen/src/QR/HouseholderQR_LAPACKE.h rename to src/eigen/Eigen/src/QR/HouseholderQR_LAPACKE.h diff --git a/xs/src/eigen/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h b/src/eigen/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h similarity index 100% rename from xs/src/eigen/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h rename to src/eigen/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h diff --git a/xs/src/eigen/Eigen/src/SVD/BDCSVD.h b/src/eigen/Eigen/src/SVD/BDCSVD.h similarity index 100% rename from xs/src/eigen/Eigen/src/SVD/BDCSVD.h rename to src/eigen/Eigen/src/SVD/BDCSVD.h diff --git a/xs/src/eigen/Eigen/src/SVD/JacobiSVD.h b/src/eigen/Eigen/src/SVD/JacobiSVD.h similarity index 100% rename from xs/src/eigen/Eigen/src/SVD/JacobiSVD.h rename to src/eigen/Eigen/src/SVD/JacobiSVD.h diff --git a/xs/src/eigen/Eigen/src/SVD/JacobiSVD_LAPACKE.h b/src/eigen/Eigen/src/SVD/JacobiSVD_LAPACKE.h similarity index 100% rename from xs/src/eigen/Eigen/src/SVD/JacobiSVD_LAPACKE.h rename to src/eigen/Eigen/src/SVD/JacobiSVD_LAPACKE.h diff --git a/xs/src/eigen/Eigen/src/SVD/SVDBase.h b/src/eigen/Eigen/src/SVD/SVDBase.h similarity index 100% rename from xs/src/eigen/Eigen/src/SVD/SVDBase.h rename to src/eigen/Eigen/src/SVD/SVDBase.h diff --git a/xs/src/eigen/Eigen/src/SVD/UpperBidiagonalization.h b/src/eigen/Eigen/src/SVD/UpperBidiagonalization.h similarity index 100% rename from xs/src/eigen/Eigen/src/SVD/UpperBidiagonalization.h rename to src/eigen/Eigen/src/SVD/UpperBidiagonalization.h diff --git a/xs/src/eigen/Eigen/src/SparseCholesky/SimplicialCholesky.h b/src/eigen/Eigen/src/SparseCholesky/SimplicialCholesky.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCholesky/SimplicialCholesky.h rename to src/eigen/Eigen/src/SparseCholesky/SimplicialCholesky.h diff --git a/xs/src/eigen/Eigen/src/SparseCholesky/SimplicialCholesky_impl.h b/src/eigen/Eigen/src/SparseCholesky/SimplicialCholesky_impl.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCholesky/SimplicialCholesky_impl.h rename to src/eigen/Eigen/src/SparseCholesky/SimplicialCholesky_impl.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/AmbiVector.h b/src/eigen/Eigen/src/SparseCore/AmbiVector.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/AmbiVector.h rename to src/eigen/Eigen/src/SparseCore/AmbiVector.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/CompressedStorage.h b/src/eigen/Eigen/src/SparseCore/CompressedStorage.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/CompressedStorage.h rename to src/eigen/Eigen/src/SparseCore/CompressedStorage.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h b/src/eigen/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h rename to src/eigen/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/MappedSparseMatrix.h b/src/eigen/Eigen/src/SparseCore/MappedSparseMatrix.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/MappedSparseMatrix.h rename to src/eigen/Eigen/src/SparseCore/MappedSparseMatrix.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseAssign.h b/src/eigen/Eigen/src/SparseCore/SparseAssign.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseAssign.h rename to src/eigen/Eigen/src/SparseCore/SparseAssign.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseBlock.h b/src/eigen/Eigen/src/SparseCore/SparseBlock.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseBlock.h rename to src/eigen/Eigen/src/SparseCore/SparseBlock.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseColEtree.h b/src/eigen/Eigen/src/SparseCore/SparseColEtree.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseColEtree.h rename to src/eigen/Eigen/src/SparseCore/SparseColEtree.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseCompressedBase.h b/src/eigen/Eigen/src/SparseCore/SparseCompressedBase.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseCompressedBase.h rename to src/eigen/Eigen/src/SparseCore/SparseCompressedBase.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseCwiseBinaryOp.h b/src/eigen/Eigen/src/SparseCore/SparseCwiseBinaryOp.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseCwiseBinaryOp.h rename to src/eigen/Eigen/src/SparseCore/SparseCwiseBinaryOp.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseCwiseUnaryOp.h b/src/eigen/Eigen/src/SparseCore/SparseCwiseUnaryOp.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseCwiseUnaryOp.h rename to src/eigen/Eigen/src/SparseCore/SparseCwiseUnaryOp.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseDenseProduct.h b/src/eigen/Eigen/src/SparseCore/SparseDenseProduct.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseDenseProduct.h rename to src/eigen/Eigen/src/SparseCore/SparseDenseProduct.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseDiagonalProduct.h b/src/eigen/Eigen/src/SparseCore/SparseDiagonalProduct.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseDiagonalProduct.h rename to src/eigen/Eigen/src/SparseCore/SparseDiagonalProduct.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseDot.h b/src/eigen/Eigen/src/SparseCore/SparseDot.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseDot.h rename to src/eigen/Eigen/src/SparseCore/SparseDot.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseFuzzy.h b/src/eigen/Eigen/src/SparseCore/SparseFuzzy.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseFuzzy.h rename to src/eigen/Eigen/src/SparseCore/SparseFuzzy.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseMap.h b/src/eigen/Eigen/src/SparseCore/SparseMap.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseMap.h rename to src/eigen/Eigen/src/SparseCore/SparseMap.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseMatrix.h b/src/eigen/Eigen/src/SparseCore/SparseMatrix.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseMatrix.h rename to src/eigen/Eigen/src/SparseCore/SparseMatrix.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseMatrixBase.h b/src/eigen/Eigen/src/SparseCore/SparseMatrixBase.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseMatrixBase.h rename to src/eigen/Eigen/src/SparseCore/SparseMatrixBase.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparsePermutation.h b/src/eigen/Eigen/src/SparseCore/SparsePermutation.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparsePermutation.h rename to src/eigen/Eigen/src/SparseCore/SparsePermutation.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseProduct.h b/src/eigen/Eigen/src/SparseCore/SparseProduct.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseProduct.h rename to src/eigen/Eigen/src/SparseCore/SparseProduct.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseRedux.h b/src/eigen/Eigen/src/SparseCore/SparseRedux.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseRedux.h rename to src/eigen/Eigen/src/SparseCore/SparseRedux.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseRef.h b/src/eigen/Eigen/src/SparseCore/SparseRef.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseRef.h rename to src/eigen/Eigen/src/SparseCore/SparseRef.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseSelfAdjointView.h b/src/eigen/Eigen/src/SparseCore/SparseSelfAdjointView.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseSelfAdjointView.h rename to src/eigen/Eigen/src/SparseCore/SparseSelfAdjointView.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseSolverBase.h b/src/eigen/Eigen/src/SparseCore/SparseSolverBase.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseSolverBase.h rename to src/eigen/Eigen/src/SparseCore/SparseSolverBase.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseSparseProductWithPruning.h b/src/eigen/Eigen/src/SparseCore/SparseSparseProductWithPruning.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseSparseProductWithPruning.h rename to src/eigen/Eigen/src/SparseCore/SparseSparseProductWithPruning.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseTranspose.h b/src/eigen/Eigen/src/SparseCore/SparseTranspose.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseTranspose.h rename to src/eigen/Eigen/src/SparseCore/SparseTranspose.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseTriangularView.h b/src/eigen/Eigen/src/SparseCore/SparseTriangularView.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseTriangularView.h rename to src/eigen/Eigen/src/SparseCore/SparseTriangularView.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseUtil.h b/src/eigen/Eigen/src/SparseCore/SparseUtil.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseUtil.h rename to src/eigen/Eigen/src/SparseCore/SparseUtil.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseVector.h b/src/eigen/Eigen/src/SparseCore/SparseVector.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseVector.h rename to src/eigen/Eigen/src/SparseCore/SparseVector.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/SparseView.h b/src/eigen/Eigen/src/SparseCore/SparseView.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/SparseView.h rename to src/eigen/Eigen/src/SparseCore/SparseView.h diff --git a/xs/src/eigen/Eigen/src/SparseCore/TriangularSolver.h b/src/eigen/Eigen/src/SparseCore/TriangularSolver.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseCore/TriangularSolver.h rename to src/eigen/Eigen/src/SparseCore/TriangularSolver.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLU.h b/src/eigen/Eigen/src/SparseLU/SparseLU.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLU.h rename to src/eigen/Eigen/src/SparseLU/SparseLU.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLUImpl.h b/src/eigen/Eigen/src/SparseLU/SparseLUImpl.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLUImpl.h rename to src/eigen/Eigen/src/SparseLU/SparseLUImpl.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLU_Memory.h b/src/eigen/Eigen/src/SparseLU/SparseLU_Memory.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLU_Memory.h rename to src/eigen/Eigen/src/SparseLU/SparseLU_Memory.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLU_Structs.h b/src/eigen/Eigen/src/SparseLU/SparseLU_Structs.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLU_Structs.h rename to src/eigen/Eigen/src/SparseLU/SparseLU_Structs.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/src/eigen/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h rename to src/eigen/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLU_Utils.h b/src/eigen/Eigen/src/SparseLU/SparseLU_Utils.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLU_Utils.h rename to src/eigen/Eigen/src/SparseLU/SparseLU_Utils.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLU_column_bmod.h b/src/eigen/Eigen/src/SparseLU/SparseLU_column_bmod.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLU_column_bmod.h rename to src/eigen/Eigen/src/SparseLU/SparseLU_column_bmod.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLU_column_dfs.h b/src/eigen/Eigen/src/SparseLU/SparseLU_column_dfs.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLU_column_dfs.h rename to src/eigen/Eigen/src/SparseLU/SparseLU_column_dfs.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLU_copy_to_ucol.h b/src/eigen/Eigen/src/SparseLU/SparseLU_copy_to_ucol.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLU_copy_to_ucol.h rename to src/eigen/Eigen/src/SparseLU/SparseLU_copy_to_ucol.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLU_gemm_kernel.h b/src/eigen/Eigen/src/SparseLU/SparseLU_gemm_kernel.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLU_gemm_kernel.h rename to src/eigen/Eigen/src/SparseLU/SparseLU_gemm_kernel.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLU_heap_relax_snode.h b/src/eigen/Eigen/src/SparseLU/SparseLU_heap_relax_snode.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLU_heap_relax_snode.h rename to src/eigen/Eigen/src/SparseLU/SparseLU_heap_relax_snode.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLU_kernel_bmod.h b/src/eigen/Eigen/src/SparseLU/SparseLU_kernel_bmod.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLU_kernel_bmod.h rename to src/eigen/Eigen/src/SparseLU/SparseLU_kernel_bmod.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLU_panel_bmod.h b/src/eigen/Eigen/src/SparseLU/SparseLU_panel_bmod.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLU_panel_bmod.h rename to src/eigen/Eigen/src/SparseLU/SparseLU_panel_bmod.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLU_panel_dfs.h b/src/eigen/Eigen/src/SparseLU/SparseLU_panel_dfs.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLU_panel_dfs.h rename to src/eigen/Eigen/src/SparseLU/SparseLU_panel_dfs.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLU_pivotL.h b/src/eigen/Eigen/src/SparseLU/SparseLU_pivotL.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLU_pivotL.h rename to src/eigen/Eigen/src/SparseLU/SparseLU_pivotL.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLU_pruneL.h b/src/eigen/Eigen/src/SparseLU/SparseLU_pruneL.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLU_pruneL.h rename to src/eigen/Eigen/src/SparseLU/SparseLU_pruneL.h diff --git a/xs/src/eigen/Eigen/src/SparseLU/SparseLU_relax_snode.h b/src/eigen/Eigen/src/SparseLU/SparseLU_relax_snode.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseLU/SparseLU_relax_snode.h rename to src/eigen/Eigen/src/SparseLU/SparseLU_relax_snode.h diff --git a/xs/src/eigen/Eigen/src/SparseQR/SparseQR.h b/src/eigen/Eigen/src/SparseQR/SparseQR.h similarity index 100% rename from xs/src/eigen/Eigen/src/SparseQR/SparseQR.h rename to src/eigen/Eigen/src/SparseQR/SparseQR.h diff --git a/xs/src/eigen/Eigen/src/StlSupport/StdDeque.h b/src/eigen/Eigen/src/StlSupport/StdDeque.h similarity index 100% rename from xs/src/eigen/Eigen/src/StlSupport/StdDeque.h rename to src/eigen/Eigen/src/StlSupport/StdDeque.h diff --git a/xs/src/eigen/Eigen/src/StlSupport/StdList.h b/src/eigen/Eigen/src/StlSupport/StdList.h similarity index 100% rename from xs/src/eigen/Eigen/src/StlSupport/StdList.h rename to src/eigen/Eigen/src/StlSupport/StdList.h diff --git a/xs/src/eigen/Eigen/src/StlSupport/StdVector.h b/src/eigen/Eigen/src/StlSupport/StdVector.h similarity index 100% rename from xs/src/eigen/Eigen/src/StlSupport/StdVector.h rename to src/eigen/Eigen/src/StlSupport/StdVector.h diff --git a/xs/src/eigen/Eigen/src/StlSupport/details.h b/src/eigen/Eigen/src/StlSupport/details.h similarity index 100% rename from xs/src/eigen/Eigen/src/StlSupport/details.h rename to src/eigen/Eigen/src/StlSupport/details.h diff --git a/xs/src/eigen/Eigen/src/SuperLUSupport/SuperLUSupport.h b/src/eigen/Eigen/src/SuperLUSupport/SuperLUSupport.h similarity index 100% rename from xs/src/eigen/Eigen/src/SuperLUSupport/SuperLUSupport.h rename to src/eigen/Eigen/src/SuperLUSupport/SuperLUSupport.h diff --git a/xs/src/eigen/Eigen/src/UmfPackSupport/UmfPackSupport.h b/src/eigen/Eigen/src/UmfPackSupport/UmfPackSupport.h similarity index 100% rename from xs/src/eigen/Eigen/src/UmfPackSupport/UmfPackSupport.h rename to src/eigen/Eigen/src/UmfPackSupport/UmfPackSupport.h diff --git a/xs/src/eigen/Eigen/src/misc/Image.h b/src/eigen/Eigen/src/misc/Image.h similarity index 100% rename from xs/src/eigen/Eigen/src/misc/Image.h rename to src/eigen/Eigen/src/misc/Image.h diff --git a/xs/src/eigen/Eigen/src/misc/Kernel.h b/src/eigen/Eigen/src/misc/Kernel.h similarity index 100% rename from xs/src/eigen/Eigen/src/misc/Kernel.h rename to src/eigen/Eigen/src/misc/Kernel.h diff --git a/xs/src/eigen/Eigen/src/misc/RealSvd2x2.h b/src/eigen/Eigen/src/misc/RealSvd2x2.h similarity index 100% rename from xs/src/eigen/Eigen/src/misc/RealSvd2x2.h rename to src/eigen/Eigen/src/misc/RealSvd2x2.h diff --git a/xs/src/eigen/Eigen/src/misc/blas.h b/src/eigen/Eigen/src/misc/blas.h similarity index 100% rename from xs/src/eigen/Eigen/src/misc/blas.h rename to src/eigen/Eigen/src/misc/blas.h diff --git a/xs/src/eigen/Eigen/src/misc/lapack.h b/src/eigen/Eigen/src/misc/lapack.h similarity index 100% rename from xs/src/eigen/Eigen/src/misc/lapack.h rename to src/eigen/Eigen/src/misc/lapack.h diff --git a/xs/src/eigen/Eigen/src/misc/lapacke.h b/src/eigen/Eigen/src/misc/lapacke.h similarity index 100% rename from xs/src/eigen/Eigen/src/misc/lapacke.h rename to src/eigen/Eigen/src/misc/lapacke.h diff --git a/xs/src/eigen/Eigen/src/misc/lapacke_mangling.h b/src/eigen/Eigen/src/misc/lapacke_mangling.h similarity index 100% rename from xs/src/eigen/Eigen/src/misc/lapacke_mangling.h rename to src/eigen/Eigen/src/misc/lapacke_mangling.h diff --git a/xs/src/eigen/Eigen/src/plugins/ArrayCwiseBinaryOps.h b/src/eigen/Eigen/src/plugins/ArrayCwiseBinaryOps.h similarity index 100% rename from xs/src/eigen/Eigen/src/plugins/ArrayCwiseBinaryOps.h rename to src/eigen/Eigen/src/plugins/ArrayCwiseBinaryOps.h diff --git a/xs/src/eigen/Eigen/src/plugins/ArrayCwiseUnaryOps.h b/src/eigen/Eigen/src/plugins/ArrayCwiseUnaryOps.h similarity index 100% rename from xs/src/eigen/Eigen/src/plugins/ArrayCwiseUnaryOps.h rename to src/eigen/Eigen/src/plugins/ArrayCwiseUnaryOps.h diff --git a/xs/src/eigen/Eigen/src/plugins/BlockMethods.h b/src/eigen/Eigen/src/plugins/BlockMethods.h similarity index 100% rename from xs/src/eigen/Eigen/src/plugins/BlockMethods.h rename to src/eigen/Eigen/src/plugins/BlockMethods.h diff --git a/xs/src/eigen/Eigen/src/plugins/CommonCwiseBinaryOps.h b/src/eigen/Eigen/src/plugins/CommonCwiseBinaryOps.h similarity index 100% rename from xs/src/eigen/Eigen/src/plugins/CommonCwiseBinaryOps.h rename to src/eigen/Eigen/src/plugins/CommonCwiseBinaryOps.h diff --git a/xs/src/eigen/Eigen/src/plugins/CommonCwiseUnaryOps.h b/src/eigen/Eigen/src/plugins/CommonCwiseUnaryOps.h similarity index 100% rename from xs/src/eigen/Eigen/src/plugins/CommonCwiseUnaryOps.h rename to src/eigen/Eigen/src/plugins/CommonCwiseUnaryOps.h diff --git a/xs/src/eigen/Eigen/src/plugins/MatrixCwiseBinaryOps.h b/src/eigen/Eigen/src/plugins/MatrixCwiseBinaryOps.h similarity index 100% rename from xs/src/eigen/Eigen/src/plugins/MatrixCwiseBinaryOps.h rename to src/eigen/Eigen/src/plugins/MatrixCwiseBinaryOps.h diff --git a/xs/src/eigen/Eigen/src/plugins/MatrixCwiseUnaryOps.h b/src/eigen/Eigen/src/plugins/MatrixCwiseUnaryOps.h similarity index 100% rename from xs/src/eigen/Eigen/src/plugins/MatrixCwiseUnaryOps.h rename to src/eigen/Eigen/src/plugins/MatrixCwiseUnaryOps.h diff --git a/xs/src/eigen/README.md b/src/eigen/README.md similarity index 100% rename from xs/src/eigen/README.md rename to src/eigen/README.md diff --git a/xs/src/expat/COPYING b/src/expat/COPYING similarity index 100% rename from xs/src/expat/COPYING rename to src/expat/COPYING diff --git a/xs/src/expat/README b/src/expat/README similarity index 100% rename from xs/src/expat/README rename to src/expat/README diff --git a/xs/src/expat/ascii.h b/src/expat/ascii.h similarity index 100% rename from xs/src/expat/ascii.h rename to src/expat/ascii.h diff --git a/xs/src/expat/asciitab.h b/src/expat/asciitab.h similarity index 100% rename from xs/src/expat/asciitab.h rename to src/expat/asciitab.h diff --git a/xs/src/expat/expat.h b/src/expat/expat.h similarity index 100% rename from xs/src/expat/expat.h rename to src/expat/expat.h diff --git a/xs/src/expat/expat_config.h b/src/expat/expat_config.h similarity index 100% rename from xs/src/expat/expat_config.h rename to src/expat/expat_config.h diff --git a/xs/src/expat/expat_external.h b/src/expat/expat_external.h similarity index 100% rename from xs/src/expat/expat_external.h rename to src/expat/expat_external.h diff --git a/xs/src/expat/iasciitab.h b/src/expat/iasciitab.h similarity index 100% rename from xs/src/expat/iasciitab.h rename to src/expat/iasciitab.h diff --git a/xs/src/expat/internal.h b/src/expat/internal.h similarity index 100% rename from xs/src/expat/internal.h rename to src/expat/internal.h diff --git a/xs/src/expat/latin1tab.h b/src/expat/latin1tab.h similarity index 100% rename from xs/src/expat/latin1tab.h rename to src/expat/latin1tab.h diff --git a/xs/src/expat/nametab.h b/src/expat/nametab.h similarity index 100% rename from xs/src/expat/nametab.h rename to src/expat/nametab.h diff --git a/xs/src/expat/utf8tab.h b/src/expat/utf8tab.h similarity index 100% rename from xs/src/expat/utf8tab.h rename to src/expat/utf8tab.h diff --git a/xs/src/expat/xmlparse.c b/src/expat/xmlparse.c similarity index 100% rename from xs/src/expat/xmlparse.c rename to src/expat/xmlparse.c diff --git a/xs/src/expat/xmlrole.c b/src/expat/xmlrole.c similarity index 100% rename from xs/src/expat/xmlrole.c rename to src/expat/xmlrole.c diff --git a/xs/src/expat/xmlrole.h b/src/expat/xmlrole.h similarity index 100% rename from xs/src/expat/xmlrole.h rename to src/expat/xmlrole.h diff --git a/xs/src/expat/xmltok.c b/src/expat/xmltok.c similarity index 100% rename from xs/src/expat/xmltok.c rename to src/expat/xmltok.c diff --git a/xs/src/expat/xmltok.h b/src/expat/xmltok.h similarity index 100% rename from xs/src/expat/xmltok.h rename to src/expat/xmltok.h diff --git a/xs/src/expat/xmltok_impl.h b/src/expat/xmltok_impl.h similarity index 100% rename from xs/src/expat/xmltok_impl.h rename to src/expat/xmltok_impl.h diff --git a/xs/src/expat/xmltok_impl.inc b/src/expat/xmltok_impl.inc similarity index 100% rename from xs/src/expat/xmltok_impl.inc rename to src/expat/xmltok_impl.inc diff --git a/xs/src/expat/xmltok_ns.inc b/src/expat/xmltok_ns.inc similarity index 100% rename from xs/src/expat/xmltok_ns.inc rename to src/expat/xmltok_ns.inc diff --git a/xs/src/glew/LICENSE.txt b/src/glew/LICENSE.txt similarity index 100% rename from xs/src/glew/LICENSE.txt rename to src/glew/LICENSE.txt diff --git a/xs/src/glew/README.md b/src/glew/README.md similarity index 100% rename from xs/src/glew/README.md rename to src/glew/README.md diff --git a/xs/src/glew/include/GL/glew.h b/src/glew/include/GL/glew.h similarity index 100% rename from xs/src/glew/include/GL/glew.h rename to src/glew/include/GL/glew.h diff --git a/xs/src/glew/include/GL/glxew.h b/src/glew/include/GL/glxew.h similarity index 100% rename from xs/src/glew/include/GL/glxew.h rename to src/glew/include/GL/glxew.h diff --git a/xs/src/glew/include/GL/wglew.h b/src/glew/include/GL/wglew.h similarity index 100% rename from xs/src/glew/include/GL/wglew.h rename to src/glew/include/GL/wglew.h diff --git a/xs/src/glew/src/glew.c b/src/glew/src/glew.c similarity index 100% rename from xs/src/glew/src/glew.c rename to src/glew/src/glew.c diff --git a/xs/src/libnest2d/CMakeLists.txt b/src/libnest2d/CMakeLists.txt similarity index 100% rename from xs/src/libnest2d/CMakeLists.txt rename to src/libnest2d/CMakeLists.txt diff --git a/xs/src/libnest2d/LICENSE.txt b/src/libnest2d/LICENSE.txt similarity index 100% rename from xs/src/libnest2d/LICENSE.txt rename to src/libnest2d/LICENSE.txt diff --git a/xs/src/libnest2d/README.md b/src/libnest2d/README.md similarity index 100% rename from xs/src/libnest2d/README.md rename to src/libnest2d/README.md diff --git a/xs/src/libnest2d/cmake_modules/DownloadNLopt.cmake b/src/libnest2d/cmake_modules/DownloadNLopt.cmake similarity index 100% rename from xs/src/libnest2d/cmake_modules/DownloadNLopt.cmake rename to src/libnest2d/cmake_modules/DownloadNLopt.cmake diff --git a/xs/src/libnest2d/cmake_modules/DownloadProject.CMakeLists.cmake.in b/src/libnest2d/cmake_modules/DownloadProject.CMakeLists.cmake.in similarity index 100% rename from xs/src/libnest2d/cmake_modules/DownloadProject.CMakeLists.cmake.in rename to src/libnest2d/cmake_modules/DownloadProject.CMakeLists.cmake.in diff --git a/xs/src/libnest2d/cmake_modules/DownloadProject.cmake b/src/libnest2d/cmake_modules/DownloadProject.cmake similarity index 100% rename from xs/src/libnest2d/cmake_modules/DownloadProject.cmake rename to src/libnest2d/cmake_modules/DownloadProject.cmake diff --git a/xs/src/libnest2d/cmake_modules/FindClipper.cmake b/src/libnest2d/cmake_modules/FindClipper.cmake similarity index 100% rename from xs/src/libnest2d/cmake_modules/FindClipper.cmake rename to src/libnest2d/cmake_modules/FindClipper.cmake diff --git a/xs/src/libnest2d/cmake_modules/FindNLopt.cmake b/src/libnest2d/cmake_modules/FindNLopt.cmake similarity index 100% rename from xs/src/libnest2d/cmake_modules/FindNLopt.cmake rename to src/libnest2d/cmake_modules/FindNLopt.cmake diff --git a/xs/src/libnest2d/cmake_modules/FindTBB.cmake b/src/libnest2d/cmake_modules/FindTBB.cmake similarity index 100% rename from xs/src/libnest2d/cmake_modules/FindTBB.cmake rename to src/libnest2d/cmake_modules/FindTBB.cmake diff --git a/xs/src/libnest2d/examples/main.cpp b/src/libnest2d/examples/main.cpp similarity index 100% rename from xs/src/libnest2d/examples/main.cpp rename to src/libnest2d/examples/main.cpp diff --git a/xs/src/libnest2d/libnest2d.h b/src/libnest2d/libnest2d.h similarity index 100% rename from xs/src/libnest2d/libnest2d.h rename to src/libnest2d/libnest2d.h diff --git a/xs/src/libnest2d/libnest2d/boost_alg.hpp b/src/libnest2d/libnest2d/boost_alg.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/boost_alg.hpp rename to src/libnest2d/libnest2d/boost_alg.hpp diff --git a/xs/src/libnest2d/libnest2d/clipper_backend/CMakeLists.txt b/src/libnest2d/libnest2d/clipper_backend/CMakeLists.txt similarity index 100% rename from xs/src/libnest2d/libnest2d/clipper_backend/CMakeLists.txt rename to src/libnest2d/libnest2d/clipper_backend/CMakeLists.txt diff --git a/xs/src/libnest2d/libnest2d/clipper_backend/clipper_backend.hpp b/src/libnest2d/libnest2d/clipper_backend/clipper_backend.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/clipper_backend/clipper_backend.hpp rename to src/libnest2d/libnest2d/clipper_backend/clipper_backend.hpp diff --git a/xs/src/libnest2d/libnest2d/common.hpp b/src/libnest2d/libnest2d/common.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/common.hpp rename to src/libnest2d/libnest2d/common.hpp diff --git a/xs/src/libnest2d/libnest2d/geometry_traits.hpp b/src/libnest2d/libnest2d/geometry_traits.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/geometry_traits.hpp rename to src/libnest2d/libnest2d/geometry_traits.hpp diff --git a/xs/src/libnest2d/libnest2d/geometry_traits_nfp.hpp b/src/libnest2d/libnest2d/geometry_traits_nfp.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/geometry_traits_nfp.hpp rename to src/libnest2d/libnest2d/geometry_traits_nfp.hpp diff --git a/xs/src/libnest2d/libnest2d/libnest2d.hpp b/src/libnest2d/libnest2d/libnest2d.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/libnest2d.hpp rename to src/libnest2d/libnest2d/libnest2d.hpp diff --git a/xs/src/libnest2d/libnest2d/metaloop.hpp b/src/libnest2d/libnest2d/metaloop.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/metaloop.hpp rename to src/libnest2d/libnest2d/metaloop.hpp diff --git a/xs/src/libnest2d/libnest2d/optimizer.hpp b/src/libnest2d/libnest2d/optimizer.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/optimizer.hpp rename to src/libnest2d/libnest2d/optimizer.hpp diff --git a/xs/src/libnest2d/libnest2d/optimizers/genetic.hpp b/src/libnest2d/libnest2d/optimizers/genetic.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/optimizers/genetic.hpp rename to src/libnest2d/libnest2d/optimizers/genetic.hpp diff --git a/xs/src/libnest2d/libnest2d/optimizers/nlopt_boilerplate.hpp b/src/libnest2d/libnest2d/optimizers/nlopt_boilerplate.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/optimizers/nlopt_boilerplate.hpp rename to src/libnest2d/libnest2d/optimizers/nlopt_boilerplate.hpp diff --git a/xs/src/libnest2d/libnest2d/optimizers/simplex.hpp b/src/libnest2d/libnest2d/optimizers/simplex.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/optimizers/simplex.hpp rename to src/libnest2d/libnest2d/optimizers/simplex.hpp diff --git a/xs/src/libnest2d/libnest2d/optimizers/subplex.hpp b/src/libnest2d/libnest2d/optimizers/subplex.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/optimizers/subplex.hpp rename to src/libnest2d/libnest2d/optimizers/subplex.hpp diff --git a/xs/src/libnest2d/libnest2d/placers/bottomleftplacer.hpp b/src/libnest2d/libnest2d/placers/bottomleftplacer.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/placers/bottomleftplacer.hpp rename to src/libnest2d/libnest2d/placers/bottomleftplacer.hpp diff --git a/xs/src/libnest2d/libnest2d/placers/nfpplacer.hpp b/src/libnest2d/libnest2d/placers/nfpplacer.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/placers/nfpplacer.hpp rename to src/libnest2d/libnest2d/placers/nfpplacer.hpp diff --git a/xs/src/libnest2d/libnest2d/placers/placer_boilerplate.hpp b/src/libnest2d/libnest2d/placers/placer_boilerplate.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/placers/placer_boilerplate.hpp rename to src/libnest2d/libnest2d/placers/placer_boilerplate.hpp diff --git a/xs/src/libnest2d/libnest2d/rotfinder.hpp b/src/libnest2d/libnest2d/rotfinder.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/rotfinder.hpp rename to src/libnest2d/libnest2d/rotfinder.hpp diff --git a/xs/src/libnest2d/libnest2d/selections/djd_heuristic.hpp b/src/libnest2d/libnest2d/selections/djd_heuristic.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/selections/djd_heuristic.hpp rename to src/libnest2d/libnest2d/selections/djd_heuristic.hpp diff --git a/xs/src/libnest2d/libnest2d/selections/filler.hpp b/src/libnest2d/libnest2d/selections/filler.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/selections/filler.hpp rename to src/libnest2d/libnest2d/selections/filler.hpp diff --git a/xs/src/libnest2d/libnest2d/selections/firstfit.hpp b/src/libnest2d/libnest2d/selections/firstfit.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/selections/firstfit.hpp rename to src/libnest2d/libnest2d/selections/firstfit.hpp diff --git a/xs/src/libnest2d/libnest2d/selections/selection_boilerplate.hpp b/src/libnest2d/libnest2d/selections/selection_boilerplate.hpp similarity index 100% rename from xs/src/libnest2d/libnest2d/selections/selection_boilerplate.hpp rename to src/libnest2d/libnest2d/selections/selection_boilerplate.hpp diff --git a/xs/src/libnest2d/tests/CMakeLists.txt b/src/libnest2d/tests/CMakeLists.txt similarity index 100% rename from xs/src/libnest2d/tests/CMakeLists.txt rename to src/libnest2d/tests/CMakeLists.txt diff --git a/xs/src/libnest2d/tests/printer_parts.cpp b/src/libnest2d/tests/printer_parts.cpp similarity index 100% rename from xs/src/libnest2d/tests/printer_parts.cpp rename to src/libnest2d/tests/printer_parts.cpp diff --git a/xs/src/libnest2d/tests/printer_parts.h b/src/libnest2d/tests/printer_parts.h similarity index 100% rename from xs/src/libnest2d/tests/printer_parts.h rename to src/libnest2d/tests/printer_parts.h diff --git a/xs/src/libnest2d/tests/test.cpp b/src/libnest2d/tests/test.cpp similarity index 100% rename from xs/src/libnest2d/tests/test.cpp rename to src/libnest2d/tests/test.cpp diff --git a/xs/src/benchmark.h b/src/libnest2d/tools/benchmark.h similarity index 100% rename from xs/src/benchmark.h rename to src/libnest2d/tools/benchmark.h diff --git a/xs/src/libnest2d/tools/libnfpglue.cpp b/src/libnest2d/tools/libnfpglue.cpp similarity index 100% rename from xs/src/libnest2d/tools/libnfpglue.cpp rename to src/libnest2d/tools/libnfpglue.cpp diff --git a/xs/src/libnest2d/tools/libnfpglue.hpp b/src/libnest2d/tools/libnfpglue.hpp similarity index 100% rename from xs/src/libnest2d/tools/libnfpglue.hpp rename to src/libnest2d/tools/libnfpglue.hpp diff --git a/xs/src/libnest2d/tools/libnfporb/LICENSE b/src/libnest2d/tools/libnfporb/LICENSE similarity index 100% rename from xs/src/libnest2d/tools/libnfporb/LICENSE rename to src/libnest2d/tools/libnfporb/LICENSE diff --git a/xs/src/libnest2d/tools/libnfporb/ORIGIN b/src/libnest2d/tools/libnfporb/ORIGIN similarity index 100% rename from xs/src/libnest2d/tools/libnfporb/ORIGIN rename to src/libnest2d/tools/libnfporb/ORIGIN diff --git a/xs/src/libnest2d/tools/libnfporb/README.md b/src/libnest2d/tools/libnfporb/README.md similarity index 100% rename from xs/src/libnest2d/tools/libnfporb/README.md rename to src/libnest2d/tools/libnfporb/README.md diff --git a/xs/src/libnest2d/tools/libnfporb/libnfporb.hpp b/src/libnest2d/tools/libnfporb/libnfporb.hpp similarity index 100% rename from xs/src/libnest2d/tools/libnfporb/libnfporb.hpp rename to src/libnest2d/tools/libnfporb/libnfporb.hpp diff --git a/xs/src/libnest2d/tools/nfp_svgnest.hpp b/src/libnest2d/tools/nfp_svgnest.hpp similarity index 100% rename from xs/src/libnest2d/tools/nfp_svgnest.hpp rename to src/libnest2d/tools/nfp_svgnest.hpp diff --git a/xs/src/libnest2d/tools/nfp_svgnest_glue.hpp b/src/libnest2d/tools/nfp_svgnest_glue.hpp similarity index 100% rename from xs/src/libnest2d/tools/nfp_svgnest_glue.hpp rename to src/libnest2d/tools/nfp_svgnest_glue.hpp diff --git a/xs/src/libnest2d/tools/svgtools.hpp b/src/libnest2d/tools/svgtools.hpp similarity index 100% rename from xs/src/libnest2d/tools/svgtools.hpp rename to src/libnest2d/tools/svgtools.hpp diff --git a/xs/src/libslic3r/BoundingBox.cpp b/src/libslic3r/BoundingBox.cpp similarity index 100% rename from xs/src/libslic3r/BoundingBox.cpp rename to src/libslic3r/BoundingBox.cpp diff --git a/xs/src/libslic3r/BoundingBox.hpp b/src/libslic3r/BoundingBox.hpp similarity index 100% rename from xs/src/libslic3r/BoundingBox.hpp rename to src/libslic3r/BoundingBox.hpp diff --git a/xs/src/libslic3r/BridgeDetector.cpp b/src/libslic3r/BridgeDetector.cpp similarity index 100% rename from xs/src/libslic3r/BridgeDetector.cpp rename to src/libslic3r/BridgeDetector.cpp diff --git a/xs/src/libslic3r/BridgeDetector.hpp b/src/libslic3r/BridgeDetector.hpp similarity index 100% rename from xs/src/libslic3r/BridgeDetector.hpp rename to src/libslic3r/BridgeDetector.hpp diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt new file mode 100644 index 0000000000..6955dd1e7e --- /dev/null +++ b/src/libslic3r/CMakeLists.txt @@ -0,0 +1,173 @@ +project(libslic3r) +cmake_minimum_required(VERSION 2.6) + +add_library(libslic3r STATIC + BoundingBox.cpp + BoundingBox.hpp + BridgeDetector.cpp + BridgeDetector.hpp + ClipperUtils.cpp + ClipperUtils.hpp + Config.cpp + Config.hpp + EdgeGrid.cpp + EdgeGrid.hpp + ExPolygon.cpp + ExPolygon.hpp + ExPolygonCollection.cpp + ExPolygonCollection.hpp + Extruder.cpp + Extruder.hpp + ExtrusionEntity.cpp + ExtrusionEntity.hpp + ExtrusionEntityCollection.cpp + ExtrusionEntityCollection.hpp + ExtrusionSimulator.cpp + ExtrusionSimulator.hpp + FileParserError.hpp + Fill/Fill.cpp + Fill/Fill.hpp + Fill/Fill3DHoneycomb.cpp + Fill/Fill3DHoneycomb.hpp + Fill/FillBase.cpp + Fill/FillBase.hpp + Fill/FillConcentric.cpp + Fill/FillConcentric.hpp + Fill/FillHoneycomb.cpp + Fill/FillHoneycomb.hpp + Fill/FillGyroid.cpp + Fill/FillGyroid.hpp + Fill/FillPlanePath.cpp + Fill/FillPlanePath.hpp + Fill/FillRectilinear.cpp + Fill/FillRectilinear.hpp + Fill/FillRectilinear2.cpp + Fill/FillRectilinear2.hpp + Fill/FillRectilinear3.cpp + Fill/FillRectilinear3.hpp + Flow.cpp + Flow.hpp + Format/3mf.cpp + Format/3mf.hpp + Format/AMF.cpp + Format/AMF.hpp + Format/OBJ.cpp + Format/OBJ.hpp + Format/objparser.cpp + Format/objparser.hpp + Format/PRUS.cpp + Format/PRUS.hpp + Format/STL.cpp + Format/STL.hpp + GCode/Analyzer.cpp + GCode/Analyzer.hpp + GCode/CoolingBuffer.cpp + GCode/CoolingBuffer.hpp + GCode/PostProcessor.cpp + GCode/PostProcessor.hpp + GCode/PressureEqualizer.cpp + GCode/PressureEqualizer.hpp + GCode/PreviewData.cpp + GCode/PreviewData.hpp + GCode/PrintExtents.cpp + GCode/PrintExtents.hpp + GCode/SpiralVase.cpp + GCode/SpiralVase.hpp + GCode/ToolOrdering.cpp + GCode/ToolOrdering.hpp + GCode/WipeTower.hpp + GCode/WipeTowerPrusaMM.cpp + GCode/WipeTowerPrusaMM.hpp + GCode.cpp + GCode.hpp + GCodeReader.cpp + GCodeReader.hpp + GCodeSender.cpp + GCodeSender.hpp + GCodeTimeEstimator.cpp + GCodeTimeEstimator.hpp + GCodeWriter.cpp + GCodeWriter.hpp + Geometry.cpp + Geometry.hpp + Int128.hpp +# KdTree.hpp + Layer.cpp + Layer.hpp + LayerRegion.cpp + libslic3r.h + Line.cpp + Line.hpp + Model.cpp + Model.hpp + ModelArrange.hpp + MotionPlanner.cpp + MotionPlanner.hpp + MultiPoint.cpp + MultiPoint.hpp + MutablePriorityQueue.hpp + PerimeterGenerator.cpp + PerimeterGenerator.hpp + PlaceholderParser.cpp + PlaceholderParser.hpp + Point.cpp + Point.hpp + Polygon.cpp + Polygon.hpp + Polyline.cpp + Polyline.hpp + PolylineCollection.cpp + PolylineCollection.hpp + Print.cpp + Print.hpp + PrintExport.hpp + PrintConfig.cpp + PrintConfig.hpp + PrintObject.cpp + PrintRegion.cpp + Rasterizer/Rasterizer.hpp + Rasterizer/Rasterizer.cpp + Slicing.cpp + Slicing.hpp + SlicingAdaptive.cpp + SlicingAdaptive.hpp + SupportMaterial.cpp + SupportMaterial.hpp + Surface.cpp + Surface.hpp + SurfaceCollection.cpp + SurfaceCollection.hpp + SVG.cpp + SVG.hpp + Technologies.hpp + TriangleMesh.cpp + TriangleMesh.hpp + SLABasePool.hpp + SLABasePool.cpp + utils.cpp + Utils.hpp +) + +target_compile_definitions(libslic3r PUBLIC -DUSE_TBB ${PNG_DEFINITIONS}) +target_include_directories(libslic3r PUBLIC BEFORE ${LIBNEST2D_INCLUDES} ${PNG_INCLUDE_DIRS}) +target_link_libraries(libslic3r + ${LIBNEST2D_LIBRARIES} + admesh + miniz + ${Boost_LIBRARIES} + clipper + nowide + ${EXPAT_LIBRARIES} + ${GLEW_LIBRARIES} + ${PNG_LIBRARIES} + polypartition + poly2tri + qhull + semver + ${TBB_LIBRARIES} +# ${wxWidgets_LIBRARIES} + ) + +if(SLIC3R_PROFILE) + target_link_libraries(slic3r Shiny) +endif() diff --git a/xs/src/libslic3r/ClipperUtils.cpp b/src/libslic3r/ClipperUtils.cpp similarity index 100% rename from xs/src/libslic3r/ClipperUtils.cpp rename to src/libslic3r/ClipperUtils.cpp diff --git a/xs/src/libslic3r/ClipperUtils.hpp b/src/libslic3r/ClipperUtils.hpp similarity index 100% rename from xs/src/libslic3r/ClipperUtils.hpp rename to src/libslic3r/ClipperUtils.hpp diff --git a/xs/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp similarity index 100% rename from xs/src/libslic3r/Config.cpp rename to src/libslic3r/Config.cpp diff --git a/xs/src/libslic3r/Config.hpp b/src/libslic3r/Config.hpp similarity index 100% rename from xs/src/libslic3r/Config.hpp rename to src/libslic3r/Config.hpp diff --git a/xs/src/libslic3r/EdgeGrid.cpp b/src/libslic3r/EdgeGrid.cpp similarity index 100% rename from xs/src/libslic3r/EdgeGrid.cpp rename to src/libslic3r/EdgeGrid.cpp diff --git a/xs/src/libslic3r/EdgeGrid.hpp b/src/libslic3r/EdgeGrid.hpp similarity index 100% rename from xs/src/libslic3r/EdgeGrid.hpp rename to src/libslic3r/EdgeGrid.hpp diff --git a/xs/src/libslic3r/ExPolygon.cpp b/src/libslic3r/ExPolygon.cpp similarity index 100% rename from xs/src/libslic3r/ExPolygon.cpp rename to src/libslic3r/ExPolygon.cpp diff --git a/xs/src/libslic3r/ExPolygon.hpp b/src/libslic3r/ExPolygon.hpp similarity index 100% rename from xs/src/libslic3r/ExPolygon.hpp rename to src/libslic3r/ExPolygon.hpp diff --git a/xs/src/libslic3r/ExPolygonCollection.cpp b/src/libslic3r/ExPolygonCollection.cpp similarity index 100% rename from xs/src/libslic3r/ExPolygonCollection.cpp rename to src/libslic3r/ExPolygonCollection.cpp diff --git a/xs/src/libslic3r/ExPolygonCollection.hpp b/src/libslic3r/ExPolygonCollection.hpp similarity index 100% rename from xs/src/libslic3r/ExPolygonCollection.hpp rename to src/libslic3r/ExPolygonCollection.hpp diff --git a/xs/src/libslic3r/Extruder.cpp b/src/libslic3r/Extruder.cpp similarity index 100% rename from xs/src/libslic3r/Extruder.cpp rename to src/libslic3r/Extruder.cpp diff --git a/xs/src/libslic3r/Extruder.hpp b/src/libslic3r/Extruder.hpp similarity index 100% rename from xs/src/libslic3r/Extruder.hpp rename to src/libslic3r/Extruder.hpp diff --git a/xs/src/libslic3r/ExtrusionEntity.cpp b/src/libslic3r/ExtrusionEntity.cpp similarity index 100% rename from xs/src/libslic3r/ExtrusionEntity.cpp rename to src/libslic3r/ExtrusionEntity.cpp diff --git a/xs/src/libslic3r/ExtrusionEntity.hpp b/src/libslic3r/ExtrusionEntity.hpp similarity index 100% rename from xs/src/libslic3r/ExtrusionEntity.hpp rename to src/libslic3r/ExtrusionEntity.hpp diff --git a/xs/src/libslic3r/ExtrusionEntityCollection.cpp b/src/libslic3r/ExtrusionEntityCollection.cpp similarity index 100% rename from xs/src/libslic3r/ExtrusionEntityCollection.cpp rename to src/libslic3r/ExtrusionEntityCollection.cpp diff --git a/xs/src/libslic3r/ExtrusionEntityCollection.hpp b/src/libslic3r/ExtrusionEntityCollection.hpp similarity index 100% rename from xs/src/libslic3r/ExtrusionEntityCollection.hpp rename to src/libslic3r/ExtrusionEntityCollection.hpp diff --git a/xs/src/libslic3r/ExtrusionSimulator.cpp b/src/libslic3r/ExtrusionSimulator.cpp similarity index 100% rename from xs/src/libslic3r/ExtrusionSimulator.cpp rename to src/libslic3r/ExtrusionSimulator.cpp diff --git a/xs/src/libslic3r/ExtrusionSimulator.hpp b/src/libslic3r/ExtrusionSimulator.hpp similarity index 100% rename from xs/src/libslic3r/ExtrusionSimulator.hpp rename to src/libslic3r/ExtrusionSimulator.hpp diff --git a/xs/src/libslic3r/FileParserError.hpp b/src/libslic3r/FileParserError.hpp similarity index 100% rename from xs/src/libslic3r/FileParserError.hpp rename to src/libslic3r/FileParserError.hpp diff --git a/xs/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp similarity index 100% rename from xs/src/libslic3r/Fill/Fill.cpp rename to src/libslic3r/Fill/Fill.cpp diff --git a/xs/src/libslic3r/Fill/Fill.hpp b/src/libslic3r/Fill/Fill.hpp similarity index 100% rename from xs/src/libslic3r/Fill/Fill.hpp rename to src/libslic3r/Fill/Fill.hpp diff --git a/xs/src/libslic3r/Fill/Fill3DHoneycomb.cpp b/src/libslic3r/Fill/Fill3DHoneycomb.cpp similarity index 100% rename from xs/src/libslic3r/Fill/Fill3DHoneycomb.cpp rename to src/libslic3r/Fill/Fill3DHoneycomb.cpp diff --git a/xs/src/libslic3r/Fill/Fill3DHoneycomb.hpp b/src/libslic3r/Fill/Fill3DHoneycomb.hpp similarity index 100% rename from xs/src/libslic3r/Fill/Fill3DHoneycomb.hpp rename to src/libslic3r/Fill/Fill3DHoneycomb.hpp diff --git a/xs/src/libslic3r/Fill/FillBase.cpp b/src/libslic3r/Fill/FillBase.cpp similarity index 100% rename from xs/src/libslic3r/Fill/FillBase.cpp rename to src/libslic3r/Fill/FillBase.cpp diff --git a/xs/src/libslic3r/Fill/FillBase.hpp b/src/libslic3r/Fill/FillBase.hpp similarity index 100% rename from xs/src/libslic3r/Fill/FillBase.hpp rename to src/libslic3r/Fill/FillBase.hpp diff --git a/xs/src/libslic3r/Fill/FillConcentric.cpp b/src/libslic3r/Fill/FillConcentric.cpp similarity index 100% rename from xs/src/libslic3r/Fill/FillConcentric.cpp rename to src/libslic3r/Fill/FillConcentric.cpp diff --git a/xs/src/libslic3r/Fill/FillConcentric.hpp b/src/libslic3r/Fill/FillConcentric.hpp similarity index 100% rename from xs/src/libslic3r/Fill/FillConcentric.hpp rename to src/libslic3r/Fill/FillConcentric.hpp diff --git a/xs/src/libslic3r/Fill/FillGyroid.cpp b/src/libslic3r/Fill/FillGyroid.cpp similarity index 100% rename from xs/src/libslic3r/Fill/FillGyroid.cpp rename to src/libslic3r/Fill/FillGyroid.cpp diff --git a/xs/src/libslic3r/Fill/FillGyroid.hpp b/src/libslic3r/Fill/FillGyroid.hpp similarity index 100% rename from xs/src/libslic3r/Fill/FillGyroid.hpp rename to src/libslic3r/Fill/FillGyroid.hpp diff --git a/xs/src/libslic3r/Fill/FillHoneycomb.cpp b/src/libslic3r/Fill/FillHoneycomb.cpp similarity index 100% rename from xs/src/libslic3r/Fill/FillHoneycomb.cpp rename to src/libslic3r/Fill/FillHoneycomb.cpp diff --git a/xs/src/libslic3r/Fill/FillHoneycomb.hpp b/src/libslic3r/Fill/FillHoneycomb.hpp similarity index 100% rename from xs/src/libslic3r/Fill/FillHoneycomb.hpp rename to src/libslic3r/Fill/FillHoneycomb.hpp diff --git a/xs/src/libslic3r/Fill/FillPlanePath.cpp b/src/libslic3r/Fill/FillPlanePath.cpp similarity index 100% rename from xs/src/libslic3r/Fill/FillPlanePath.cpp rename to src/libslic3r/Fill/FillPlanePath.cpp diff --git a/xs/src/libslic3r/Fill/FillPlanePath.hpp b/src/libslic3r/Fill/FillPlanePath.hpp similarity index 100% rename from xs/src/libslic3r/Fill/FillPlanePath.hpp rename to src/libslic3r/Fill/FillPlanePath.hpp diff --git a/xs/src/libslic3r/Fill/FillRectilinear.cpp b/src/libslic3r/Fill/FillRectilinear.cpp similarity index 100% rename from xs/src/libslic3r/Fill/FillRectilinear.cpp rename to src/libslic3r/Fill/FillRectilinear.cpp diff --git a/xs/src/libslic3r/Fill/FillRectilinear.hpp b/src/libslic3r/Fill/FillRectilinear.hpp similarity index 100% rename from xs/src/libslic3r/Fill/FillRectilinear.hpp rename to src/libslic3r/Fill/FillRectilinear.hpp diff --git a/xs/src/libslic3r/Fill/FillRectilinear2.cpp b/src/libslic3r/Fill/FillRectilinear2.cpp similarity index 100% rename from xs/src/libslic3r/Fill/FillRectilinear2.cpp rename to src/libslic3r/Fill/FillRectilinear2.cpp diff --git a/xs/src/libslic3r/Fill/FillRectilinear2.hpp b/src/libslic3r/Fill/FillRectilinear2.hpp similarity index 100% rename from xs/src/libslic3r/Fill/FillRectilinear2.hpp rename to src/libslic3r/Fill/FillRectilinear2.hpp diff --git a/xs/src/libslic3r/Fill/FillRectilinear3.cpp b/src/libslic3r/Fill/FillRectilinear3.cpp similarity index 100% rename from xs/src/libslic3r/Fill/FillRectilinear3.cpp rename to src/libslic3r/Fill/FillRectilinear3.cpp diff --git a/xs/src/libslic3r/Fill/FillRectilinear3.hpp b/src/libslic3r/Fill/FillRectilinear3.hpp similarity index 100% rename from xs/src/libslic3r/Fill/FillRectilinear3.hpp rename to src/libslic3r/Fill/FillRectilinear3.hpp diff --git a/xs/src/libslic3r/Flow.cpp b/src/libslic3r/Flow.cpp similarity index 100% rename from xs/src/libslic3r/Flow.cpp rename to src/libslic3r/Flow.cpp diff --git a/xs/src/libslic3r/Flow.hpp b/src/libslic3r/Flow.hpp similarity index 100% rename from xs/src/libslic3r/Flow.hpp rename to src/libslic3r/Flow.hpp diff --git a/xs/src/libslic3r/Format/3mf.cpp b/src/libslic3r/Format/3mf.cpp similarity index 100% rename from xs/src/libslic3r/Format/3mf.cpp rename to src/libslic3r/Format/3mf.cpp diff --git a/xs/src/libslic3r/Format/3mf.hpp b/src/libslic3r/Format/3mf.hpp similarity index 100% rename from xs/src/libslic3r/Format/3mf.hpp rename to src/libslic3r/Format/3mf.hpp diff --git a/xs/src/libslic3r/Format/AMF.cpp b/src/libslic3r/Format/AMF.cpp similarity index 100% rename from xs/src/libslic3r/Format/AMF.cpp rename to src/libslic3r/Format/AMF.cpp diff --git a/xs/src/libslic3r/Format/AMF.hpp b/src/libslic3r/Format/AMF.hpp similarity index 100% rename from xs/src/libslic3r/Format/AMF.hpp rename to src/libslic3r/Format/AMF.hpp diff --git a/xs/src/libslic3r/Format/OBJ.cpp b/src/libslic3r/Format/OBJ.cpp similarity index 100% rename from xs/src/libslic3r/Format/OBJ.cpp rename to src/libslic3r/Format/OBJ.cpp diff --git a/xs/src/libslic3r/Format/OBJ.hpp b/src/libslic3r/Format/OBJ.hpp similarity index 100% rename from xs/src/libslic3r/Format/OBJ.hpp rename to src/libslic3r/Format/OBJ.hpp diff --git a/xs/src/libslic3r/Format/PRUS.cpp b/src/libslic3r/Format/PRUS.cpp similarity index 100% rename from xs/src/libslic3r/Format/PRUS.cpp rename to src/libslic3r/Format/PRUS.cpp diff --git a/xs/src/libslic3r/Format/PRUS.hpp b/src/libslic3r/Format/PRUS.hpp similarity index 100% rename from xs/src/libslic3r/Format/PRUS.hpp rename to src/libslic3r/Format/PRUS.hpp diff --git a/xs/src/libslic3r/Format/STL.cpp b/src/libslic3r/Format/STL.cpp similarity index 100% rename from xs/src/libslic3r/Format/STL.cpp rename to src/libslic3r/Format/STL.cpp diff --git a/xs/src/libslic3r/Format/STL.hpp b/src/libslic3r/Format/STL.hpp similarity index 100% rename from xs/src/libslic3r/Format/STL.hpp rename to src/libslic3r/Format/STL.hpp diff --git a/xs/src/libslic3r/Format/objparser.cpp b/src/libslic3r/Format/objparser.cpp similarity index 100% rename from xs/src/libslic3r/Format/objparser.cpp rename to src/libslic3r/Format/objparser.cpp diff --git a/xs/src/libslic3r/Format/objparser.hpp b/src/libslic3r/Format/objparser.hpp similarity index 100% rename from xs/src/libslic3r/Format/objparser.hpp rename to src/libslic3r/Format/objparser.hpp diff --git a/xs/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp similarity index 100% rename from xs/src/libslic3r/GCode.cpp rename to src/libslic3r/GCode.cpp diff --git a/xs/src/libslic3r/GCode.hpp b/src/libslic3r/GCode.hpp similarity index 100% rename from xs/src/libslic3r/GCode.hpp rename to src/libslic3r/GCode.hpp diff --git a/xs/src/libslic3r/GCode/Analyzer.cpp b/src/libslic3r/GCode/Analyzer.cpp similarity index 100% rename from xs/src/libslic3r/GCode/Analyzer.cpp rename to src/libslic3r/GCode/Analyzer.cpp diff --git a/xs/src/libslic3r/GCode/Analyzer.hpp b/src/libslic3r/GCode/Analyzer.hpp similarity index 100% rename from xs/src/libslic3r/GCode/Analyzer.hpp rename to src/libslic3r/GCode/Analyzer.hpp diff --git a/xs/src/libslic3r/GCode/CoolingBuffer.cpp b/src/libslic3r/GCode/CoolingBuffer.cpp similarity index 100% rename from xs/src/libslic3r/GCode/CoolingBuffer.cpp rename to src/libslic3r/GCode/CoolingBuffer.cpp diff --git a/xs/src/libslic3r/GCode/CoolingBuffer.hpp b/src/libslic3r/GCode/CoolingBuffer.hpp similarity index 100% rename from xs/src/libslic3r/GCode/CoolingBuffer.hpp rename to src/libslic3r/GCode/CoolingBuffer.hpp diff --git a/xs/src/libslic3r/GCode/PostProcessor.cpp b/src/libslic3r/GCode/PostProcessor.cpp similarity index 100% rename from xs/src/libslic3r/GCode/PostProcessor.cpp rename to src/libslic3r/GCode/PostProcessor.cpp diff --git a/xs/src/libslic3r/GCode/PostProcessor.hpp b/src/libslic3r/GCode/PostProcessor.hpp similarity index 100% rename from xs/src/libslic3r/GCode/PostProcessor.hpp rename to src/libslic3r/GCode/PostProcessor.hpp diff --git a/xs/src/libslic3r/GCode/PressureEqualizer.cpp b/src/libslic3r/GCode/PressureEqualizer.cpp similarity index 100% rename from xs/src/libslic3r/GCode/PressureEqualizer.cpp rename to src/libslic3r/GCode/PressureEqualizer.cpp diff --git a/xs/src/libslic3r/GCode/PressureEqualizer.hpp b/src/libslic3r/GCode/PressureEqualizer.hpp similarity index 100% rename from xs/src/libslic3r/GCode/PressureEqualizer.hpp rename to src/libslic3r/GCode/PressureEqualizer.hpp diff --git a/xs/src/libslic3r/GCode/PreviewData.cpp b/src/libslic3r/GCode/PreviewData.cpp similarity index 100% rename from xs/src/libslic3r/GCode/PreviewData.cpp rename to src/libslic3r/GCode/PreviewData.cpp diff --git a/xs/src/libslic3r/GCode/PreviewData.hpp b/src/libslic3r/GCode/PreviewData.hpp similarity index 100% rename from xs/src/libslic3r/GCode/PreviewData.hpp rename to src/libslic3r/GCode/PreviewData.hpp diff --git a/xs/src/libslic3r/GCode/PrintExtents.cpp b/src/libslic3r/GCode/PrintExtents.cpp similarity index 100% rename from xs/src/libslic3r/GCode/PrintExtents.cpp rename to src/libslic3r/GCode/PrintExtents.cpp diff --git a/xs/src/libslic3r/GCode/PrintExtents.hpp b/src/libslic3r/GCode/PrintExtents.hpp similarity index 100% rename from xs/src/libslic3r/GCode/PrintExtents.hpp rename to src/libslic3r/GCode/PrintExtents.hpp diff --git a/xs/src/libslic3r/GCode/SpiralVase.cpp b/src/libslic3r/GCode/SpiralVase.cpp similarity index 100% rename from xs/src/libslic3r/GCode/SpiralVase.cpp rename to src/libslic3r/GCode/SpiralVase.cpp diff --git a/xs/src/libslic3r/GCode/SpiralVase.hpp b/src/libslic3r/GCode/SpiralVase.hpp similarity index 100% rename from xs/src/libslic3r/GCode/SpiralVase.hpp rename to src/libslic3r/GCode/SpiralVase.hpp diff --git a/xs/src/libslic3r/GCode/ToolOrdering.cpp b/src/libslic3r/GCode/ToolOrdering.cpp similarity index 100% rename from xs/src/libslic3r/GCode/ToolOrdering.cpp rename to src/libslic3r/GCode/ToolOrdering.cpp diff --git a/xs/src/libslic3r/GCode/ToolOrdering.hpp b/src/libslic3r/GCode/ToolOrdering.hpp similarity index 100% rename from xs/src/libslic3r/GCode/ToolOrdering.hpp rename to src/libslic3r/GCode/ToolOrdering.hpp diff --git a/xs/src/libslic3r/GCode/WipeTower.hpp b/src/libslic3r/GCode/WipeTower.hpp similarity index 100% rename from xs/src/libslic3r/GCode/WipeTower.hpp rename to src/libslic3r/GCode/WipeTower.hpp diff --git a/xs/src/libslic3r/GCode/WipeTowerPrusaMM.cpp b/src/libslic3r/GCode/WipeTowerPrusaMM.cpp similarity index 100% rename from xs/src/libslic3r/GCode/WipeTowerPrusaMM.cpp rename to src/libslic3r/GCode/WipeTowerPrusaMM.cpp diff --git a/xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp b/src/libslic3r/GCode/WipeTowerPrusaMM.hpp similarity index 100% rename from xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp rename to src/libslic3r/GCode/WipeTowerPrusaMM.hpp diff --git a/xs/src/libslic3r/GCodeReader.cpp b/src/libslic3r/GCodeReader.cpp similarity index 100% rename from xs/src/libslic3r/GCodeReader.cpp rename to src/libslic3r/GCodeReader.cpp diff --git a/xs/src/libslic3r/GCodeReader.hpp b/src/libslic3r/GCodeReader.hpp similarity index 100% rename from xs/src/libslic3r/GCodeReader.hpp rename to src/libslic3r/GCodeReader.hpp diff --git a/xs/src/libslic3r/GCodeSender.cpp b/src/libslic3r/GCodeSender.cpp similarity index 100% rename from xs/src/libslic3r/GCodeSender.cpp rename to src/libslic3r/GCodeSender.cpp diff --git a/xs/src/libslic3r/GCodeSender.hpp b/src/libslic3r/GCodeSender.hpp similarity index 100% rename from xs/src/libslic3r/GCodeSender.hpp rename to src/libslic3r/GCodeSender.hpp diff --git a/xs/src/libslic3r/GCodeTimeEstimator.cpp b/src/libslic3r/GCodeTimeEstimator.cpp similarity index 100% rename from xs/src/libslic3r/GCodeTimeEstimator.cpp rename to src/libslic3r/GCodeTimeEstimator.cpp diff --git a/xs/src/libslic3r/GCodeTimeEstimator.hpp b/src/libslic3r/GCodeTimeEstimator.hpp similarity index 100% rename from xs/src/libslic3r/GCodeTimeEstimator.hpp rename to src/libslic3r/GCodeTimeEstimator.hpp diff --git a/xs/src/libslic3r/GCodeWriter.cpp b/src/libslic3r/GCodeWriter.cpp similarity index 100% rename from xs/src/libslic3r/GCodeWriter.cpp rename to src/libslic3r/GCodeWriter.cpp diff --git a/xs/src/libslic3r/GCodeWriter.hpp b/src/libslic3r/GCodeWriter.hpp similarity index 100% rename from xs/src/libslic3r/GCodeWriter.hpp rename to src/libslic3r/GCodeWriter.hpp diff --git a/xs/src/libslic3r/Geometry.cpp b/src/libslic3r/Geometry.cpp similarity index 100% rename from xs/src/libslic3r/Geometry.cpp rename to src/libslic3r/Geometry.cpp diff --git a/xs/src/libslic3r/Geometry.hpp b/src/libslic3r/Geometry.hpp similarity index 100% rename from xs/src/libslic3r/Geometry.hpp rename to src/libslic3r/Geometry.hpp diff --git a/xs/src/libslic3r/I18N.hpp b/src/libslic3r/I18N.hpp similarity index 100% rename from xs/src/libslic3r/I18N.hpp rename to src/libslic3r/I18N.hpp diff --git a/xs/src/libslic3r/Int128.hpp b/src/libslic3r/Int128.hpp similarity index 100% rename from xs/src/libslic3r/Int128.hpp rename to src/libslic3r/Int128.hpp diff --git a/xs/src/libslic3r/Layer.cpp b/src/libslic3r/Layer.cpp similarity index 100% rename from xs/src/libslic3r/Layer.cpp rename to src/libslic3r/Layer.cpp diff --git a/xs/src/libslic3r/Layer.hpp b/src/libslic3r/Layer.hpp similarity index 100% rename from xs/src/libslic3r/Layer.hpp rename to src/libslic3r/Layer.hpp diff --git a/xs/src/libslic3r/LayerRegion.cpp b/src/libslic3r/LayerRegion.cpp similarity index 100% rename from xs/src/libslic3r/LayerRegion.cpp rename to src/libslic3r/LayerRegion.cpp diff --git a/xs/src/libslic3r/Line.cpp b/src/libslic3r/Line.cpp similarity index 100% rename from xs/src/libslic3r/Line.cpp rename to src/libslic3r/Line.cpp diff --git a/xs/src/libslic3r/Line.hpp b/src/libslic3r/Line.hpp similarity index 100% rename from xs/src/libslic3r/Line.hpp rename to src/libslic3r/Line.hpp diff --git a/xs/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp similarity index 100% rename from xs/src/libslic3r/Model.cpp rename to src/libslic3r/Model.cpp diff --git a/xs/src/libslic3r/Model.hpp b/src/libslic3r/Model.hpp similarity index 100% rename from xs/src/libslic3r/Model.hpp rename to src/libslic3r/Model.hpp diff --git a/xs/src/libslic3r/ModelArrange.hpp b/src/libslic3r/ModelArrange.hpp similarity index 100% rename from xs/src/libslic3r/ModelArrange.hpp rename to src/libslic3r/ModelArrange.hpp diff --git a/xs/src/libslic3r/MotionPlanner.cpp b/src/libslic3r/MotionPlanner.cpp similarity index 100% rename from xs/src/libslic3r/MotionPlanner.cpp rename to src/libslic3r/MotionPlanner.cpp diff --git a/xs/src/libslic3r/MotionPlanner.hpp b/src/libslic3r/MotionPlanner.hpp similarity index 100% rename from xs/src/libslic3r/MotionPlanner.hpp rename to src/libslic3r/MotionPlanner.hpp diff --git a/xs/src/libslic3r/MultiPoint.cpp b/src/libslic3r/MultiPoint.cpp similarity index 100% rename from xs/src/libslic3r/MultiPoint.cpp rename to src/libslic3r/MultiPoint.cpp diff --git a/xs/src/libslic3r/MultiPoint.hpp b/src/libslic3r/MultiPoint.hpp similarity index 100% rename from xs/src/libslic3r/MultiPoint.hpp rename to src/libslic3r/MultiPoint.hpp diff --git a/xs/src/libslic3r/MutablePriorityQueue.hpp b/src/libslic3r/MutablePriorityQueue.hpp similarity index 100% rename from xs/src/libslic3r/MutablePriorityQueue.hpp rename to src/libslic3r/MutablePriorityQueue.hpp diff --git a/xs/src/libslic3r/PerimeterGenerator.cpp b/src/libslic3r/PerimeterGenerator.cpp similarity index 100% rename from xs/src/libslic3r/PerimeterGenerator.cpp rename to src/libslic3r/PerimeterGenerator.cpp diff --git a/xs/src/libslic3r/PerimeterGenerator.hpp b/src/libslic3r/PerimeterGenerator.hpp similarity index 100% rename from xs/src/libslic3r/PerimeterGenerator.hpp rename to src/libslic3r/PerimeterGenerator.hpp diff --git a/xs/src/libslic3r/PlaceholderParser.cpp b/src/libslic3r/PlaceholderParser.cpp similarity index 100% rename from xs/src/libslic3r/PlaceholderParser.cpp rename to src/libslic3r/PlaceholderParser.cpp diff --git a/xs/src/libslic3r/PlaceholderParser.hpp b/src/libslic3r/PlaceholderParser.hpp similarity index 100% rename from xs/src/libslic3r/PlaceholderParser.hpp rename to src/libslic3r/PlaceholderParser.hpp diff --git a/xs/src/libslic3r/Point.cpp b/src/libslic3r/Point.cpp similarity index 100% rename from xs/src/libslic3r/Point.cpp rename to src/libslic3r/Point.cpp diff --git a/xs/src/libslic3r/Point.hpp b/src/libslic3r/Point.hpp similarity index 100% rename from xs/src/libslic3r/Point.hpp rename to src/libslic3r/Point.hpp diff --git a/xs/src/libslic3r/Polygon.cpp b/src/libslic3r/Polygon.cpp similarity index 100% rename from xs/src/libslic3r/Polygon.cpp rename to src/libslic3r/Polygon.cpp diff --git a/xs/src/libslic3r/Polygon.hpp b/src/libslic3r/Polygon.hpp similarity index 100% rename from xs/src/libslic3r/Polygon.hpp rename to src/libslic3r/Polygon.hpp diff --git a/xs/src/libslic3r/Polyline.cpp b/src/libslic3r/Polyline.cpp similarity index 100% rename from xs/src/libslic3r/Polyline.cpp rename to src/libslic3r/Polyline.cpp diff --git a/xs/src/libslic3r/Polyline.hpp b/src/libslic3r/Polyline.hpp similarity index 100% rename from xs/src/libslic3r/Polyline.hpp rename to src/libslic3r/Polyline.hpp diff --git a/xs/src/libslic3r/PolylineCollection.cpp b/src/libslic3r/PolylineCollection.cpp similarity index 100% rename from xs/src/libslic3r/PolylineCollection.cpp rename to src/libslic3r/PolylineCollection.cpp diff --git a/xs/src/libslic3r/PolylineCollection.hpp b/src/libslic3r/PolylineCollection.hpp similarity index 100% rename from xs/src/libslic3r/PolylineCollection.hpp rename to src/libslic3r/PolylineCollection.hpp diff --git a/xs/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp similarity index 98% rename from xs/src/libslic3r/Print.cpp rename to src/libslic3r/Print.cpp index f8f6537ca8..cdc12d2d15 100644 --- a/xs/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -1341,22 +1341,22 @@ std::string Print::output_filepath(const std::string &path) const void Print::export_png(const std::string &dirpath) { - size_t idx = 0; - for (PrintObject *obj : m_objects) { - obj->slice(); - this->set_status(int(floor(idx * 100. / m_objects.size() + 0.5)), "Slicing..."); - ++ idx; - } - this->set_status(90, "Exporting zipped archive..."); - print_to(*this, - dirpath, - float(m_config.bed_size_x.value), - float(m_config.bed_size_y.value), - int(m_config.pixel_width.value), - int(m_config.pixel_height.value), - float(m_config.exp_time.value), - float(m_config.exp_time_first.value)); - this->set_status(100, "Done."); +// size_t idx = 0; +// for (PrintObject *obj : m_objects) { +// obj->slice(); +// this->set_status(int(floor(idx * 100. / m_objects.size() + 0.5)), "Slicing..."); +// ++ idx; +// } +// this->set_status(90, "Exporting zipped archive..."); +// print_to(*this, +// dirpath, +// float(m_config.bed_size_x.value), +// float(m_config.bed_size_y.value), +// int(m_config.pixel_width.value), +// int(m_config.pixel_height.value), +// float(m_config.exp_time.value), +// float(m_config.exp_time_first.value)); +// this->set_status(100, "Done."); } // Returns extruder this eec should be printed with, according to PrintRegion config diff --git a/xs/src/libslic3r/Print.hpp b/src/libslic3r/Print.hpp similarity index 100% rename from xs/src/libslic3r/Print.hpp rename to src/libslic3r/Print.hpp diff --git a/xs/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp similarity index 100% rename from xs/src/libslic3r/PrintConfig.cpp rename to src/libslic3r/PrintConfig.cpp diff --git a/xs/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp similarity index 100% rename from xs/src/libslic3r/PrintConfig.hpp rename to src/libslic3r/PrintConfig.hpp diff --git a/xs/src/libslic3r/PrintExport.hpp b/src/libslic3r/PrintExport.hpp similarity index 100% rename from xs/src/libslic3r/PrintExport.hpp rename to src/libslic3r/PrintExport.hpp diff --git a/xs/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp similarity index 100% rename from xs/src/libslic3r/PrintObject.cpp rename to src/libslic3r/PrintObject.cpp diff --git a/xs/src/libslic3r/PrintRegion.cpp b/src/libslic3r/PrintRegion.cpp similarity index 100% rename from xs/src/libslic3r/PrintRegion.cpp rename to src/libslic3r/PrintRegion.cpp diff --git a/xs/src/libslic3r/Rasterizer/Rasterizer.cpp b/src/libslic3r/Rasterizer/Rasterizer.cpp similarity index 100% rename from xs/src/libslic3r/Rasterizer/Rasterizer.cpp rename to src/libslic3r/Rasterizer/Rasterizer.cpp diff --git a/xs/src/libslic3r/Rasterizer/Rasterizer.hpp b/src/libslic3r/Rasterizer/Rasterizer.hpp similarity index 100% rename from xs/src/libslic3r/Rasterizer/Rasterizer.hpp rename to src/libslic3r/Rasterizer/Rasterizer.hpp diff --git a/xs/src/libslic3r/SLABasePool.cpp b/src/libslic3r/SLABasePool.cpp similarity index 100% rename from xs/src/libslic3r/SLABasePool.cpp rename to src/libslic3r/SLABasePool.cpp diff --git a/xs/src/libslic3r/SLABasePool.hpp b/src/libslic3r/SLABasePool.hpp similarity index 100% rename from xs/src/libslic3r/SLABasePool.hpp rename to src/libslic3r/SLABasePool.hpp diff --git a/xs/src/libslic3r/SVG.cpp b/src/libslic3r/SVG.cpp similarity index 100% rename from xs/src/libslic3r/SVG.cpp rename to src/libslic3r/SVG.cpp diff --git a/xs/src/libslic3r/SVG.hpp b/src/libslic3r/SVG.hpp similarity index 100% rename from xs/src/libslic3r/SVG.hpp rename to src/libslic3r/SVG.hpp diff --git a/xs/src/libslic3r/Slicing.cpp b/src/libslic3r/Slicing.cpp similarity index 100% rename from xs/src/libslic3r/Slicing.cpp rename to src/libslic3r/Slicing.cpp diff --git a/xs/src/libslic3r/Slicing.hpp b/src/libslic3r/Slicing.hpp similarity index 100% rename from xs/src/libslic3r/Slicing.hpp rename to src/libslic3r/Slicing.hpp diff --git a/xs/src/libslic3r/SlicingAdaptive.cpp b/src/libslic3r/SlicingAdaptive.cpp similarity index 100% rename from xs/src/libslic3r/SlicingAdaptive.cpp rename to src/libslic3r/SlicingAdaptive.cpp diff --git a/xs/src/libslic3r/SlicingAdaptive.hpp b/src/libslic3r/SlicingAdaptive.hpp similarity index 100% rename from xs/src/libslic3r/SlicingAdaptive.hpp rename to src/libslic3r/SlicingAdaptive.hpp diff --git a/xs/src/libslic3r/SupportMaterial.cpp b/src/libslic3r/SupportMaterial.cpp similarity index 100% rename from xs/src/libslic3r/SupportMaterial.cpp rename to src/libslic3r/SupportMaterial.cpp diff --git a/xs/src/libslic3r/SupportMaterial.hpp b/src/libslic3r/SupportMaterial.hpp similarity index 100% rename from xs/src/libslic3r/SupportMaterial.hpp rename to src/libslic3r/SupportMaterial.hpp diff --git a/xs/src/libslic3r/Surface.cpp b/src/libslic3r/Surface.cpp similarity index 100% rename from xs/src/libslic3r/Surface.cpp rename to src/libslic3r/Surface.cpp diff --git a/xs/src/libslic3r/Surface.hpp b/src/libslic3r/Surface.hpp similarity index 100% rename from xs/src/libslic3r/Surface.hpp rename to src/libslic3r/Surface.hpp diff --git a/xs/src/libslic3r/SurfaceCollection.cpp b/src/libslic3r/SurfaceCollection.cpp similarity index 100% rename from xs/src/libslic3r/SurfaceCollection.cpp rename to src/libslic3r/SurfaceCollection.cpp diff --git a/xs/src/libslic3r/SurfaceCollection.hpp b/src/libslic3r/SurfaceCollection.hpp similarity index 100% rename from xs/src/libslic3r/SurfaceCollection.hpp rename to src/libslic3r/SurfaceCollection.hpp diff --git a/xs/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp similarity index 100% rename from xs/src/libslic3r/Technologies.hpp rename to src/libslic3r/Technologies.hpp diff --git a/xs/src/libslic3r/TriangleMesh.cpp b/src/libslic3r/TriangleMesh.cpp similarity index 100% rename from xs/src/libslic3r/TriangleMesh.cpp rename to src/libslic3r/TriangleMesh.cpp diff --git a/xs/src/libslic3r/TriangleMesh.hpp b/src/libslic3r/TriangleMesh.hpp similarity index 100% rename from xs/src/libslic3r/TriangleMesh.hpp rename to src/libslic3r/TriangleMesh.hpp diff --git a/xs/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp similarity index 100% rename from xs/src/libslic3r/Utils.hpp rename to src/libslic3r/Utils.hpp diff --git a/xs/src/libslic3r/libslic3r.h b/src/libslic3r/libslic3r.h similarity index 100% rename from xs/src/libslic3r/libslic3r.h rename to src/libslic3r/libslic3r.h diff --git a/xs/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp similarity index 100% rename from xs/src/libslic3r/utils.cpp rename to src/libslic3r/utils.cpp diff --git a/src/miniz/CMakeLists.txt b/src/miniz/CMakeLists.txt new file mode 100644 index 0000000000..da92b1252e --- /dev/null +++ b/src/miniz/CMakeLists.txt @@ -0,0 +1,14 @@ +project(miniz) +cmake_minimum_required(VERSION 2.6) + +add_library(miniz STATIC + miniz.h + miniz_common.h + miniz_tdef.h + miniz_tinfl.h + miniz_zip.h + miniz.cpp + miniz_tdef.cpp + miniz_tinfl.cpp + miniz_zip.cpp +) diff --git a/xs/src/miniz/miniz.cpp b/src/miniz/miniz.cpp similarity index 100% rename from xs/src/miniz/miniz.cpp rename to src/miniz/miniz.cpp diff --git a/xs/src/miniz/miniz.h b/src/miniz/miniz.h similarity index 100% rename from xs/src/miniz/miniz.h rename to src/miniz/miniz.h diff --git a/xs/src/miniz/miniz_common.h b/src/miniz/miniz_common.h similarity index 100% rename from xs/src/miniz/miniz_common.h rename to src/miniz/miniz_common.h diff --git a/xs/src/miniz/miniz_tdef.cpp b/src/miniz/miniz_tdef.cpp similarity index 100% rename from xs/src/miniz/miniz_tdef.cpp rename to src/miniz/miniz_tdef.cpp diff --git a/xs/src/miniz/miniz_tdef.h b/src/miniz/miniz_tdef.h similarity index 100% rename from xs/src/miniz/miniz_tdef.h rename to src/miniz/miniz_tdef.h diff --git a/xs/src/miniz/miniz_tinfl.cpp b/src/miniz/miniz_tinfl.cpp similarity index 100% rename from xs/src/miniz/miniz_tinfl.cpp rename to src/miniz/miniz_tinfl.cpp diff --git a/xs/src/miniz/miniz_tinfl.h b/src/miniz/miniz_tinfl.h similarity index 100% rename from xs/src/miniz/miniz_tinfl.h rename to src/miniz/miniz_tinfl.h diff --git a/xs/src/miniz/miniz_zip.cpp b/src/miniz/miniz_zip.cpp similarity index 100% rename from xs/src/miniz/miniz_zip.cpp rename to src/miniz/miniz_zip.cpp diff --git a/xs/src/miniz/miniz_zip.h b/src/miniz/miniz_zip.h similarity index 100% rename from xs/src/miniz/miniz_zip.h rename to src/miniz/miniz_zip.h diff --git a/xs/src/png/AUTHORS b/src/png/AUTHORS similarity index 100% rename from xs/src/png/AUTHORS rename to src/png/AUTHORS diff --git a/xs/src/png/COPYING b/src/png/COPYING similarity index 100% rename from xs/src/png/COPYING rename to src/png/COPYING diff --git a/xs/src/png/NEWS b/src/png/NEWS similarity index 100% rename from xs/src/png/NEWS rename to src/png/NEWS diff --git a/xs/src/png/color.hpp b/src/png/color.hpp similarity index 100% rename from xs/src/png/color.hpp rename to src/png/color.hpp diff --git a/xs/src/png/end_info.hpp b/src/png/end_info.hpp similarity index 100% rename from xs/src/png/end_info.hpp rename to src/png/end_info.hpp diff --git a/xs/src/png/error.hpp b/src/png/error.hpp similarity index 100% rename from xs/src/png/error.hpp rename to src/png/error.hpp diff --git a/xs/src/png/image_info.hpp b/src/png/image_info.hpp similarity index 100% rename from xs/src/png/image_info.hpp rename to src/png/image_info.hpp diff --git a/xs/src/png/info.hpp b/src/png/info.hpp similarity index 100% rename from xs/src/png/info.hpp rename to src/png/info.hpp diff --git a/xs/src/png/info_base.hpp b/src/png/info_base.hpp similarity index 100% rename from xs/src/png/info_base.hpp rename to src/png/info_base.hpp diff --git a/xs/src/png/io_base.hpp b/src/png/io_base.hpp similarity index 100% rename from xs/src/png/io_base.hpp rename to src/png/io_base.hpp diff --git a/xs/src/png/libpng/ANNOUNCE b/src/png/libpng/ANNOUNCE similarity index 100% rename from xs/src/png/libpng/ANNOUNCE rename to src/png/libpng/ANNOUNCE diff --git a/xs/src/png/libpng/CMakeLists.txt b/src/png/libpng/CMakeLists.txt similarity index 98% rename from xs/src/png/libpng/CMakeLists.txt rename to src/png/libpng/CMakeLists.txt index 266b67d0e2..7697110c72 100644 --- a/xs/src/png/libpng/CMakeLists.txt +++ b/src/png/libpng/CMakeLists.txt @@ -107,7 +107,7 @@ endif() # set definitions and sources for powerpc if(CMAKE_SYSTEM_PROCESSOR MATCHES "^powerpc*" OR - CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc64*" ) + CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc64*" ) set(PNG_POWERPC_VSX_POSSIBLE_VALUES on off) set(PNG_POWERPC_VSX "on" CACHE STRING "Enable POWERPC VSX optimizations: off: disable the optimizations.") @@ -131,7 +131,7 @@ endif() # set definitions and sources for intel if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i?86" OR - CMAKE_SYSTEM_PROCESSOR MATCHES "^x86_64*" ) + CMAKE_SYSTEM_PROCESSOR MATCHES "^x86_64*" ) set(PNG_INTEL_SSE_POSSIBLE_VALUES on off) set(PNG_INTEL_SSE "on" CACHE STRING "Enable INTEL_SSE optimizations: off: disable the optimizations") @@ -155,7 +155,7 @@ endif() # set definitions and sources for MIPS if(CMAKE_SYSTEM_PROCESSOR MATCHES "mipsel*" OR - CMAKE_SYSTEM_PROCESSOR MATCHES "mips64el*" ) + CMAKE_SYSTEM_PROCESSOR MATCHES "mips64el*" ) set(PNG_MIPS_MSA_POSSIBLE_VALUES on off) set(PNG_MIPS_MSA "on" CACHE STRING "Enable MIPS_MSA optimizations: off: disable the optimizations") @@ -770,14 +770,14 @@ function(CREATE_SYMLINK DEST_FILE) if(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS) execute_process( - COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${S_FILE} ${DEST_FILE} - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" - ) + COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${S_FILE} ${DEST_FILE} + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" + ) else(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS) execute_process( - COMMAND ${CMAKE_COMMAND} -E create_symlink ${S_FILE} ${DEST_FILE} - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" - ) + COMMAND ${CMAKE_COMMAND} -E create_symlink ${S_FILE} ${DEST_FILE} + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" + ) endif(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS) endif(S_FILE) @@ -788,12 +788,12 @@ function(CREATE_SYMLINK DEST_FILE) if(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS) add_custom_command(TARGET ${S_TARGET} POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E copy_if_different $ $/${DEST_FILE} - ) + COMMAND "${CMAKE_COMMAND}" -E copy_if_different $ $/${DEST_FILE} + ) else(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS) add_custom_command(TARGET ${S_TARGET} POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E create_symlink $ $/${DEST_FILE} - ) + COMMAND "${CMAKE_COMMAND}" -E create_symlink $ $/${DEST_FILE} + ) endif(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS) endif(S_TARGET) diff --git a/xs/src/png/libpng/LICENSE b/src/png/libpng/LICENSE similarity index 100% rename from xs/src/png/libpng/LICENSE rename to src/png/libpng/LICENSE diff --git a/xs/src/png/libpng/arm/arm_init.c b/src/png/libpng/arm/arm_init.c similarity index 100% rename from xs/src/png/libpng/arm/arm_init.c rename to src/png/libpng/arm/arm_init.c diff --git a/xs/src/png/libpng/arm/filter_neon.S b/src/png/libpng/arm/filter_neon.S similarity index 100% rename from xs/src/png/libpng/arm/filter_neon.S rename to src/png/libpng/arm/filter_neon.S diff --git a/xs/src/png/libpng/arm/filter_neon_intrinsics.c b/src/png/libpng/arm/filter_neon_intrinsics.c similarity index 100% rename from xs/src/png/libpng/arm/filter_neon_intrinsics.c rename to src/png/libpng/arm/filter_neon_intrinsics.c diff --git a/xs/src/png/libpng/intel/filter_sse2_intrinsics.c b/src/png/libpng/intel/filter_sse2_intrinsics.c similarity index 100% rename from xs/src/png/libpng/intel/filter_sse2_intrinsics.c rename to src/png/libpng/intel/filter_sse2_intrinsics.c diff --git a/xs/src/png/libpng/intel/intel_init.c b/src/png/libpng/intel/intel_init.c similarity index 100% rename from xs/src/png/libpng/intel/intel_init.c rename to src/png/libpng/intel/intel_init.c diff --git a/xs/src/png/libpng/libpng-config.in b/src/png/libpng/libpng-config.in similarity index 100% rename from xs/src/png/libpng/libpng-config.in rename to src/png/libpng/libpng-config.in diff --git a/xs/src/png/libpng/libpng.pc.in b/src/png/libpng/libpng.pc.in similarity index 100% rename from xs/src/png/libpng/libpng.pc.in rename to src/png/libpng/libpng.pc.in diff --git a/xs/src/png/libpng/mips/filter_msa_intrinsics.c b/src/png/libpng/mips/filter_msa_intrinsics.c similarity index 100% rename from xs/src/png/libpng/mips/filter_msa_intrinsics.c rename to src/png/libpng/mips/filter_msa_intrinsics.c diff --git a/xs/src/png/libpng/mips/mips_init.c b/src/png/libpng/mips/mips_init.c similarity index 100% rename from xs/src/png/libpng/mips/mips_init.c rename to src/png/libpng/mips/mips_init.c diff --git a/xs/src/png/libpng/png.c b/src/png/libpng/png.c similarity index 100% rename from xs/src/png/libpng/png.c rename to src/png/libpng/png.c diff --git a/xs/src/png/libpng/png.h b/src/png/libpng/png.h similarity index 100% rename from xs/src/png/libpng/png.h rename to src/png/libpng/png.h diff --git a/xs/src/png/libpng/pngconf.h b/src/png/libpng/pngconf.h similarity index 100% rename from xs/src/png/libpng/pngconf.h rename to src/png/libpng/pngconf.h diff --git a/xs/src/png/libpng/pngdebug.h b/src/png/libpng/pngdebug.h similarity index 100% rename from xs/src/png/libpng/pngdebug.h rename to src/png/libpng/pngdebug.h diff --git a/xs/src/png/libpng/pngerror.c b/src/png/libpng/pngerror.c similarity index 100% rename from xs/src/png/libpng/pngerror.c rename to src/png/libpng/pngerror.c diff --git a/xs/src/png/libpng/pngget.c b/src/png/libpng/pngget.c similarity index 100% rename from xs/src/png/libpng/pngget.c rename to src/png/libpng/pngget.c diff --git a/xs/src/png/libpng/pnginfo.h b/src/png/libpng/pnginfo.h similarity index 100% rename from xs/src/png/libpng/pnginfo.h rename to src/png/libpng/pnginfo.h diff --git a/xs/src/png/libpng/pngmem.c b/src/png/libpng/pngmem.c similarity index 100% rename from xs/src/png/libpng/pngmem.c rename to src/png/libpng/pngmem.c diff --git a/xs/src/png/libpng/pngpread.c b/src/png/libpng/pngpread.c similarity index 100% rename from xs/src/png/libpng/pngpread.c rename to src/png/libpng/pngpread.c diff --git a/xs/src/png/libpng/pngpriv.h b/src/png/libpng/pngpriv.h similarity index 100% rename from xs/src/png/libpng/pngpriv.h rename to src/png/libpng/pngpriv.h diff --git a/xs/src/png/libpng/pngread.c b/src/png/libpng/pngread.c similarity index 100% rename from xs/src/png/libpng/pngread.c rename to src/png/libpng/pngread.c diff --git a/xs/src/png/libpng/pngrio.c b/src/png/libpng/pngrio.c similarity index 100% rename from xs/src/png/libpng/pngrio.c rename to src/png/libpng/pngrio.c diff --git a/xs/src/png/libpng/pngrtran.c b/src/png/libpng/pngrtran.c similarity index 100% rename from xs/src/png/libpng/pngrtran.c rename to src/png/libpng/pngrtran.c diff --git a/xs/src/png/libpng/pngrutil.c b/src/png/libpng/pngrutil.c similarity index 100% rename from xs/src/png/libpng/pngrutil.c rename to src/png/libpng/pngrutil.c diff --git a/xs/src/png/libpng/pngset.c b/src/png/libpng/pngset.c similarity index 100% rename from xs/src/png/libpng/pngset.c rename to src/png/libpng/pngset.c diff --git a/xs/src/png/libpng/pngstruct.h b/src/png/libpng/pngstruct.h similarity index 100% rename from xs/src/png/libpng/pngstruct.h rename to src/png/libpng/pngstruct.h diff --git a/xs/src/png/libpng/pngtest.c b/src/png/libpng/pngtest.c similarity index 100% rename from xs/src/png/libpng/pngtest.c rename to src/png/libpng/pngtest.c diff --git a/xs/src/png/libpng/pngtrans.c b/src/png/libpng/pngtrans.c similarity index 100% rename from xs/src/png/libpng/pngtrans.c rename to src/png/libpng/pngtrans.c diff --git a/xs/src/png/libpng/pngusr.dfa b/src/png/libpng/pngusr.dfa similarity index 100% rename from xs/src/png/libpng/pngusr.dfa rename to src/png/libpng/pngusr.dfa diff --git a/xs/src/png/libpng/pngwio.c b/src/png/libpng/pngwio.c similarity index 100% rename from xs/src/png/libpng/pngwio.c rename to src/png/libpng/pngwio.c diff --git a/xs/src/png/libpng/pngwrite.c b/src/png/libpng/pngwrite.c similarity index 100% rename from xs/src/png/libpng/pngwrite.c rename to src/png/libpng/pngwrite.c diff --git a/xs/src/png/libpng/pngwtran.c b/src/png/libpng/pngwtran.c similarity index 100% rename from xs/src/png/libpng/pngwtran.c rename to src/png/libpng/pngwtran.c diff --git a/xs/src/png/libpng/pngwutil.c b/src/png/libpng/pngwutil.c similarity index 100% rename from xs/src/png/libpng/pngwutil.c rename to src/png/libpng/pngwutil.c diff --git a/xs/src/png/libpng/powerpc/filter_vsx_intrinsics.c b/src/png/libpng/powerpc/filter_vsx_intrinsics.c similarity index 100% rename from xs/src/png/libpng/powerpc/filter_vsx_intrinsics.c rename to src/png/libpng/powerpc/filter_vsx_intrinsics.c diff --git a/xs/src/png/libpng/powerpc/powerpc_init.c b/src/png/libpng/powerpc/powerpc_init.c similarity index 100% rename from xs/src/png/libpng/powerpc/powerpc_init.c rename to src/png/libpng/powerpc/powerpc_init.c diff --git a/xs/src/png/libpng/scripts/checksym.awk b/src/png/libpng/scripts/checksym.awk old mode 100755 new mode 100644 similarity index 100% rename from xs/src/png/libpng/scripts/checksym.awk rename to src/png/libpng/scripts/checksym.awk diff --git a/xs/src/png/libpng/scripts/def.c b/src/png/libpng/scripts/def.c similarity index 100% rename from xs/src/png/libpng/scripts/def.c rename to src/png/libpng/scripts/def.c diff --git a/xs/src/png/libpng/scripts/dfn.awk b/src/png/libpng/scripts/dfn.awk old mode 100755 new mode 100644 similarity index 100% rename from xs/src/png/libpng/scripts/dfn.awk rename to src/png/libpng/scripts/dfn.awk diff --git a/xs/src/png/libpng/scripts/genchk.cmake.in b/src/png/libpng/scripts/genchk.cmake.in similarity index 100% rename from xs/src/png/libpng/scripts/genchk.cmake.in rename to src/png/libpng/scripts/genchk.cmake.in diff --git a/xs/src/png/libpng/scripts/genout.cmake.in b/src/png/libpng/scripts/genout.cmake.in similarity index 100% rename from xs/src/png/libpng/scripts/genout.cmake.in rename to src/png/libpng/scripts/genout.cmake.in diff --git a/xs/src/png/libpng/scripts/gensrc.cmake.in b/src/png/libpng/scripts/gensrc.cmake.in similarity index 100% rename from xs/src/png/libpng/scripts/gensrc.cmake.in rename to src/png/libpng/scripts/gensrc.cmake.in diff --git a/xs/src/png/libpng/scripts/intprefix.c b/src/png/libpng/scripts/intprefix.c similarity index 100% rename from xs/src/png/libpng/scripts/intprefix.c rename to src/png/libpng/scripts/intprefix.c diff --git a/xs/src/png/libpng/scripts/libpng-config-body.in b/src/png/libpng/scripts/libpng-config-body.in similarity index 100% rename from xs/src/png/libpng/scripts/libpng-config-body.in rename to src/png/libpng/scripts/libpng-config-body.in diff --git a/xs/src/png/libpng/scripts/libpng-config-head.in b/src/png/libpng/scripts/libpng-config-head.in similarity index 100% rename from xs/src/png/libpng/scripts/libpng-config-head.in rename to src/png/libpng/scripts/libpng-config-head.in diff --git a/xs/src/png/libpng/scripts/libpng.pc.in b/src/png/libpng/scripts/libpng.pc.in similarity index 100% rename from xs/src/png/libpng/scripts/libpng.pc.in rename to src/png/libpng/scripts/libpng.pc.in diff --git a/xs/src/png/libpng/scripts/options.awk b/src/png/libpng/scripts/options.awk old mode 100755 new mode 100644 similarity index 100% rename from xs/src/png/libpng/scripts/options.awk rename to src/png/libpng/scripts/options.awk diff --git a/xs/src/png/libpng/scripts/pnglibconf.dfa b/src/png/libpng/scripts/pnglibconf.dfa similarity index 100% rename from xs/src/png/libpng/scripts/pnglibconf.dfa rename to src/png/libpng/scripts/pnglibconf.dfa diff --git a/xs/src/png/libpng/scripts/pnglibconf.h.prebuilt b/src/png/libpng/scripts/pnglibconf.h.prebuilt similarity index 100% rename from xs/src/png/libpng/scripts/pnglibconf.h.prebuilt rename to src/png/libpng/scripts/pnglibconf.h.prebuilt diff --git a/xs/src/png/libpng/scripts/prefix.c b/src/png/libpng/scripts/prefix.c similarity index 100% rename from xs/src/png/libpng/scripts/prefix.c rename to src/png/libpng/scripts/prefix.c diff --git a/xs/src/png/libpng/scripts/sym.c b/src/png/libpng/scripts/sym.c similarity index 100% rename from xs/src/png/libpng/scripts/sym.c rename to src/png/libpng/scripts/sym.c diff --git a/xs/src/png/libpng/scripts/symbols.c b/src/png/libpng/scripts/symbols.c similarity index 100% rename from xs/src/png/libpng/scripts/symbols.c rename to src/png/libpng/scripts/symbols.c diff --git a/xs/src/png/libpng/scripts/symbols.def b/src/png/libpng/scripts/symbols.def similarity index 100% rename from xs/src/png/libpng/scripts/symbols.def rename to src/png/libpng/scripts/symbols.def diff --git a/xs/src/png/libpng/scripts/test.cmake.in b/src/png/libpng/scripts/test.cmake.in similarity index 100% rename from xs/src/png/libpng/scripts/test.cmake.in rename to src/png/libpng/scripts/test.cmake.in diff --git a/xs/src/png/libpng/scripts/vers.c b/src/png/libpng/scripts/vers.c similarity index 100% rename from xs/src/png/libpng/scripts/vers.c rename to src/png/libpng/scripts/vers.c diff --git a/xs/src/png/palette.hpp b/src/png/palette.hpp similarity index 100% rename from xs/src/png/palette.hpp rename to src/png/palette.hpp diff --git a/xs/src/png/pixel_traits.hpp b/src/png/pixel_traits.hpp similarity index 100% rename from xs/src/png/pixel_traits.hpp rename to src/png/pixel_traits.hpp diff --git a/xs/src/png/tRNS.hpp b/src/png/tRNS.hpp similarity index 100% rename from xs/src/png/tRNS.hpp rename to src/png/tRNS.hpp diff --git a/xs/src/png/types.hpp b/src/png/types.hpp similarity index 100% rename from xs/src/png/types.hpp rename to src/png/types.hpp diff --git a/xs/src/png/writer.hpp b/src/png/writer.hpp similarity index 100% rename from xs/src/png/writer.hpp rename to src/png/writer.hpp diff --git a/xs/src/png/zlib/CMakeLists.txt b/src/png/zlib/CMakeLists.txt similarity index 100% rename from xs/src/png/zlib/CMakeLists.txt rename to src/png/zlib/CMakeLists.txt diff --git a/xs/src/png/zlib/ChangeLog b/src/png/zlib/ChangeLog similarity index 100% rename from xs/src/png/zlib/ChangeLog rename to src/png/zlib/ChangeLog diff --git a/xs/src/png/zlib/FAQ b/src/png/zlib/FAQ similarity index 100% rename from xs/src/png/zlib/FAQ rename to src/png/zlib/FAQ diff --git a/xs/src/png/zlib/INDEX b/src/png/zlib/INDEX similarity index 100% rename from xs/src/png/zlib/INDEX rename to src/png/zlib/INDEX diff --git a/xs/src/png/zlib/Makefile b/src/png/zlib/Makefile similarity index 100% rename from xs/src/png/zlib/Makefile rename to src/png/zlib/Makefile diff --git a/xs/src/png/zlib/Makefile.in b/src/png/zlib/Makefile.in similarity index 100% rename from xs/src/png/zlib/Makefile.in rename to src/png/zlib/Makefile.in diff --git a/xs/src/png/zlib/README b/src/png/zlib/README similarity index 100% rename from xs/src/png/zlib/README rename to src/png/zlib/README diff --git a/xs/src/png/zlib/adler32.c b/src/png/zlib/adler32.c similarity index 100% rename from xs/src/png/zlib/adler32.c rename to src/png/zlib/adler32.c diff --git a/xs/src/png/zlib/amiga/Makefile.pup b/src/png/zlib/amiga/Makefile.pup similarity index 100% rename from xs/src/png/zlib/amiga/Makefile.pup rename to src/png/zlib/amiga/Makefile.pup diff --git a/xs/src/png/zlib/amiga/Makefile.sas b/src/png/zlib/amiga/Makefile.sas similarity index 100% rename from xs/src/png/zlib/amiga/Makefile.sas rename to src/png/zlib/amiga/Makefile.sas diff --git a/xs/src/png/zlib/compress.c b/src/png/zlib/compress.c similarity index 100% rename from xs/src/png/zlib/compress.c rename to src/png/zlib/compress.c diff --git a/xs/src/png/zlib/configure b/src/png/zlib/configure similarity index 100% rename from xs/src/png/zlib/configure rename to src/png/zlib/configure diff --git a/xs/src/png/zlib/contrib/README.contrib b/src/png/zlib/contrib/README.contrib similarity index 100% rename from xs/src/png/zlib/contrib/README.contrib rename to src/png/zlib/contrib/README.contrib diff --git a/xs/src/png/zlib/contrib/ada/buffer_demo.adb b/src/png/zlib/contrib/ada/buffer_demo.adb similarity index 100% rename from xs/src/png/zlib/contrib/ada/buffer_demo.adb rename to src/png/zlib/contrib/ada/buffer_demo.adb diff --git a/xs/src/png/zlib/contrib/ada/mtest.adb b/src/png/zlib/contrib/ada/mtest.adb similarity index 100% rename from xs/src/png/zlib/contrib/ada/mtest.adb rename to src/png/zlib/contrib/ada/mtest.adb diff --git a/xs/src/png/zlib/contrib/ada/read.adb b/src/png/zlib/contrib/ada/read.adb similarity index 100% rename from xs/src/png/zlib/contrib/ada/read.adb rename to src/png/zlib/contrib/ada/read.adb diff --git a/xs/src/png/zlib/contrib/ada/readme.txt b/src/png/zlib/contrib/ada/readme.txt similarity index 100% rename from xs/src/png/zlib/contrib/ada/readme.txt rename to src/png/zlib/contrib/ada/readme.txt diff --git a/xs/src/png/zlib/contrib/ada/test.adb b/src/png/zlib/contrib/ada/test.adb similarity index 100% rename from xs/src/png/zlib/contrib/ada/test.adb rename to src/png/zlib/contrib/ada/test.adb diff --git a/xs/src/png/zlib/contrib/ada/zlib-streams.adb b/src/png/zlib/contrib/ada/zlib-streams.adb similarity index 100% rename from xs/src/png/zlib/contrib/ada/zlib-streams.adb rename to src/png/zlib/contrib/ada/zlib-streams.adb diff --git a/xs/src/png/zlib/contrib/ada/zlib-streams.ads b/src/png/zlib/contrib/ada/zlib-streams.ads similarity index 100% rename from xs/src/png/zlib/contrib/ada/zlib-streams.ads rename to src/png/zlib/contrib/ada/zlib-streams.ads diff --git a/xs/src/png/zlib/contrib/ada/zlib-thin.adb b/src/png/zlib/contrib/ada/zlib-thin.adb similarity index 100% rename from xs/src/png/zlib/contrib/ada/zlib-thin.adb rename to src/png/zlib/contrib/ada/zlib-thin.adb diff --git a/xs/src/png/zlib/contrib/ada/zlib-thin.ads b/src/png/zlib/contrib/ada/zlib-thin.ads similarity index 100% rename from xs/src/png/zlib/contrib/ada/zlib-thin.ads rename to src/png/zlib/contrib/ada/zlib-thin.ads diff --git a/xs/src/png/zlib/contrib/ada/zlib.adb b/src/png/zlib/contrib/ada/zlib.adb similarity index 100% rename from xs/src/png/zlib/contrib/ada/zlib.adb rename to src/png/zlib/contrib/ada/zlib.adb diff --git a/xs/src/png/zlib/contrib/ada/zlib.ads b/src/png/zlib/contrib/ada/zlib.ads similarity index 100% rename from xs/src/png/zlib/contrib/ada/zlib.ads rename to src/png/zlib/contrib/ada/zlib.ads diff --git a/xs/src/png/zlib/contrib/ada/zlib.gpr b/src/png/zlib/contrib/ada/zlib.gpr similarity index 100% rename from xs/src/png/zlib/contrib/ada/zlib.gpr rename to src/png/zlib/contrib/ada/zlib.gpr diff --git a/xs/src/png/zlib/contrib/amd64/amd64-match.S b/src/png/zlib/contrib/amd64/amd64-match.S similarity index 100% rename from xs/src/png/zlib/contrib/amd64/amd64-match.S rename to src/png/zlib/contrib/amd64/amd64-match.S diff --git a/xs/src/png/zlib/contrib/asm686/README.686 b/src/png/zlib/contrib/asm686/README.686 similarity index 100% rename from xs/src/png/zlib/contrib/asm686/README.686 rename to src/png/zlib/contrib/asm686/README.686 diff --git a/xs/src/png/zlib/contrib/asm686/match.S b/src/png/zlib/contrib/asm686/match.S similarity index 100% rename from xs/src/png/zlib/contrib/asm686/match.S rename to src/png/zlib/contrib/asm686/match.S diff --git a/xs/src/png/zlib/contrib/blast/Makefile b/src/png/zlib/contrib/blast/Makefile similarity index 100% rename from xs/src/png/zlib/contrib/blast/Makefile rename to src/png/zlib/contrib/blast/Makefile diff --git a/xs/src/png/zlib/contrib/blast/README b/src/png/zlib/contrib/blast/README similarity index 100% rename from xs/src/png/zlib/contrib/blast/README rename to src/png/zlib/contrib/blast/README diff --git a/xs/src/png/zlib/contrib/blast/blast.c b/src/png/zlib/contrib/blast/blast.c similarity index 100% rename from xs/src/png/zlib/contrib/blast/blast.c rename to src/png/zlib/contrib/blast/blast.c diff --git a/xs/src/png/zlib/contrib/blast/blast.h b/src/png/zlib/contrib/blast/blast.h similarity index 100% rename from xs/src/png/zlib/contrib/blast/blast.h rename to src/png/zlib/contrib/blast/blast.h diff --git a/xs/src/png/zlib/contrib/blast/test.pk b/src/png/zlib/contrib/blast/test.pk similarity index 100% rename from xs/src/png/zlib/contrib/blast/test.pk rename to src/png/zlib/contrib/blast/test.pk diff --git a/xs/src/png/zlib/contrib/blast/test.txt b/src/png/zlib/contrib/blast/test.txt similarity index 100% rename from xs/src/png/zlib/contrib/blast/test.txt rename to src/png/zlib/contrib/blast/test.txt diff --git a/xs/src/png/zlib/contrib/delphi/ZLib.pas b/src/png/zlib/contrib/delphi/ZLib.pas similarity index 100% rename from xs/src/png/zlib/contrib/delphi/ZLib.pas rename to src/png/zlib/contrib/delphi/ZLib.pas diff --git a/xs/src/png/zlib/contrib/delphi/ZLibConst.pas b/src/png/zlib/contrib/delphi/ZLibConst.pas similarity index 100% rename from xs/src/png/zlib/contrib/delphi/ZLibConst.pas rename to src/png/zlib/contrib/delphi/ZLibConst.pas diff --git a/xs/src/png/zlib/contrib/delphi/readme.txt b/src/png/zlib/contrib/delphi/readme.txt similarity index 100% rename from xs/src/png/zlib/contrib/delphi/readme.txt rename to src/png/zlib/contrib/delphi/readme.txt diff --git a/xs/src/png/zlib/contrib/delphi/zlibd32.mak b/src/png/zlib/contrib/delphi/zlibd32.mak similarity index 100% rename from xs/src/png/zlib/contrib/delphi/zlibd32.mak rename to src/png/zlib/contrib/delphi/zlibd32.mak diff --git a/xs/src/png/zlib/contrib/dotzlib/DotZLib.build b/src/png/zlib/contrib/dotzlib/DotZLib.build similarity index 100% rename from xs/src/png/zlib/contrib/dotzlib/DotZLib.build rename to src/png/zlib/contrib/dotzlib/DotZLib.build diff --git a/xs/src/png/zlib/contrib/dotzlib/DotZLib.chm b/src/png/zlib/contrib/dotzlib/DotZLib.chm similarity index 100% rename from xs/src/png/zlib/contrib/dotzlib/DotZLib.chm rename to src/png/zlib/contrib/dotzlib/DotZLib.chm diff --git a/xs/src/png/zlib/contrib/dotzlib/DotZLib.sln b/src/png/zlib/contrib/dotzlib/DotZLib.sln similarity index 100% rename from xs/src/png/zlib/contrib/dotzlib/DotZLib.sln rename to src/png/zlib/contrib/dotzlib/DotZLib.sln diff --git a/xs/src/png/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs b/src/png/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs similarity index 100% rename from xs/src/png/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs rename to src/png/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs diff --git a/xs/src/png/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs b/src/png/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs similarity index 100% rename from xs/src/png/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs rename to src/png/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs diff --git a/xs/src/png/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs b/src/png/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs similarity index 100% rename from xs/src/png/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs rename to src/png/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs diff --git a/xs/src/png/zlib/contrib/dotzlib/DotZLib/CodecBase.cs b/src/png/zlib/contrib/dotzlib/DotZLib/CodecBase.cs similarity index 100% rename from xs/src/png/zlib/contrib/dotzlib/DotZLib/CodecBase.cs rename to src/png/zlib/contrib/dotzlib/DotZLib/CodecBase.cs diff --git a/xs/src/png/zlib/contrib/dotzlib/DotZLib/Deflater.cs b/src/png/zlib/contrib/dotzlib/DotZLib/Deflater.cs similarity index 100% rename from xs/src/png/zlib/contrib/dotzlib/DotZLib/Deflater.cs rename to src/png/zlib/contrib/dotzlib/DotZLib/Deflater.cs diff --git a/xs/src/png/zlib/contrib/dotzlib/DotZLib/DotZLib.cs b/src/png/zlib/contrib/dotzlib/DotZLib/DotZLib.cs similarity index 100% rename from xs/src/png/zlib/contrib/dotzlib/DotZLib/DotZLib.cs rename to src/png/zlib/contrib/dotzlib/DotZLib/DotZLib.cs diff --git a/xs/src/png/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj b/src/png/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj similarity index 100% rename from xs/src/png/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj rename to src/png/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj diff --git a/xs/src/png/zlib/contrib/dotzlib/DotZLib/GZipStream.cs b/src/png/zlib/contrib/dotzlib/DotZLib/GZipStream.cs similarity index 100% rename from xs/src/png/zlib/contrib/dotzlib/DotZLib/GZipStream.cs rename to src/png/zlib/contrib/dotzlib/DotZLib/GZipStream.cs diff --git a/xs/src/png/zlib/contrib/dotzlib/DotZLib/Inflater.cs b/src/png/zlib/contrib/dotzlib/DotZLib/Inflater.cs similarity index 100% rename from xs/src/png/zlib/contrib/dotzlib/DotZLib/Inflater.cs rename to src/png/zlib/contrib/dotzlib/DotZLib/Inflater.cs diff --git a/xs/src/png/zlib/contrib/dotzlib/DotZLib/UnitTests.cs b/src/png/zlib/contrib/dotzlib/DotZLib/UnitTests.cs similarity index 100% rename from xs/src/png/zlib/contrib/dotzlib/DotZLib/UnitTests.cs rename to src/png/zlib/contrib/dotzlib/DotZLib/UnitTests.cs diff --git a/xs/src/png/zlib/contrib/dotzlib/LICENSE_1_0.txt b/src/png/zlib/contrib/dotzlib/LICENSE_1_0.txt similarity index 100% rename from xs/src/png/zlib/contrib/dotzlib/LICENSE_1_0.txt rename to src/png/zlib/contrib/dotzlib/LICENSE_1_0.txt diff --git a/xs/src/png/zlib/contrib/dotzlib/readme.txt b/src/png/zlib/contrib/dotzlib/readme.txt similarity index 100% rename from xs/src/png/zlib/contrib/dotzlib/readme.txt rename to src/png/zlib/contrib/dotzlib/readme.txt diff --git a/xs/src/png/zlib/contrib/gcc_gvmat64/gvmat64.S b/src/png/zlib/contrib/gcc_gvmat64/gvmat64.S similarity index 100% rename from xs/src/png/zlib/contrib/gcc_gvmat64/gvmat64.S rename to src/png/zlib/contrib/gcc_gvmat64/gvmat64.S diff --git a/xs/src/png/zlib/contrib/infback9/README b/src/png/zlib/contrib/infback9/README similarity index 100% rename from xs/src/png/zlib/contrib/infback9/README rename to src/png/zlib/contrib/infback9/README diff --git a/xs/src/png/zlib/contrib/infback9/infback9.c b/src/png/zlib/contrib/infback9/infback9.c similarity index 100% rename from xs/src/png/zlib/contrib/infback9/infback9.c rename to src/png/zlib/contrib/infback9/infback9.c diff --git a/xs/src/png/zlib/contrib/infback9/infback9.h b/src/png/zlib/contrib/infback9/infback9.h similarity index 100% rename from xs/src/png/zlib/contrib/infback9/infback9.h rename to src/png/zlib/contrib/infback9/infback9.h diff --git a/xs/src/png/zlib/contrib/infback9/inffix9.h b/src/png/zlib/contrib/infback9/inffix9.h similarity index 100% rename from xs/src/png/zlib/contrib/infback9/inffix9.h rename to src/png/zlib/contrib/infback9/inffix9.h diff --git a/xs/src/png/zlib/contrib/infback9/inflate9.h b/src/png/zlib/contrib/infback9/inflate9.h similarity index 100% rename from xs/src/png/zlib/contrib/infback9/inflate9.h rename to src/png/zlib/contrib/infback9/inflate9.h diff --git a/xs/src/png/zlib/contrib/infback9/inftree9.c b/src/png/zlib/contrib/infback9/inftree9.c similarity index 100% rename from xs/src/png/zlib/contrib/infback9/inftree9.c rename to src/png/zlib/contrib/infback9/inftree9.c diff --git a/xs/src/png/zlib/contrib/infback9/inftree9.h b/src/png/zlib/contrib/infback9/inftree9.h similarity index 100% rename from xs/src/png/zlib/contrib/infback9/inftree9.h rename to src/png/zlib/contrib/infback9/inftree9.h diff --git a/xs/src/png/zlib/contrib/inflate86/inffas86.c b/src/png/zlib/contrib/inflate86/inffas86.c similarity index 100% rename from xs/src/png/zlib/contrib/inflate86/inffas86.c rename to src/png/zlib/contrib/inflate86/inffas86.c diff --git a/xs/src/png/zlib/contrib/inflate86/inffast.S b/src/png/zlib/contrib/inflate86/inffast.S similarity index 100% rename from xs/src/png/zlib/contrib/inflate86/inffast.S rename to src/png/zlib/contrib/inflate86/inffast.S diff --git a/xs/src/png/zlib/contrib/iostream/test.cpp b/src/png/zlib/contrib/iostream/test.cpp similarity index 100% rename from xs/src/png/zlib/contrib/iostream/test.cpp rename to src/png/zlib/contrib/iostream/test.cpp diff --git a/xs/src/png/zlib/contrib/iostream/zfstream.cpp b/src/png/zlib/contrib/iostream/zfstream.cpp similarity index 100% rename from xs/src/png/zlib/contrib/iostream/zfstream.cpp rename to src/png/zlib/contrib/iostream/zfstream.cpp diff --git a/xs/src/png/zlib/contrib/iostream/zfstream.h b/src/png/zlib/contrib/iostream/zfstream.h similarity index 100% rename from xs/src/png/zlib/contrib/iostream/zfstream.h rename to src/png/zlib/contrib/iostream/zfstream.h diff --git a/xs/src/png/zlib/contrib/iostream2/zstream.h b/src/png/zlib/contrib/iostream2/zstream.h similarity index 100% rename from xs/src/png/zlib/contrib/iostream2/zstream.h rename to src/png/zlib/contrib/iostream2/zstream.h diff --git a/xs/src/png/zlib/contrib/iostream2/zstream_test.cpp b/src/png/zlib/contrib/iostream2/zstream_test.cpp similarity index 100% rename from xs/src/png/zlib/contrib/iostream2/zstream_test.cpp rename to src/png/zlib/contrib/iostream2/zstream_test.cpp diff --git a/xs/src/png/zlib/contrib/iostream3/README b/src/png/zlib/contrib/iostream3/README similarity index 100% rename from xs/src/png/zlib/contrib/iostream3/README rename to src/png/zlib/contrib/iostream3/README diff --git a/xs/src/png/zlib/contrib/iostream3/TODO b/src/png/zlib/contrib/iostream3/TODO similarity index 100% rename from xs/src/png/zlib/contrib/iostream3/TODO rename to src/png/zlib/contrib/iostream3/TODO diff --git a/xs/src/png/zlib/contrib/iostream3/test.cc b/src/png/zlib/contrib/iostream3/test.cc similarity index 100% rename from xs/src/png/zlib/contrib/iostream3/test.cc rename to src/png/zlib/contrib/iostream3/test.cc diff --git a/xs/src/png/zlib/contrib/iostream3/zfstream.cc b/src/png/zlib/contrib/iostream3/zfstream.cc similarity index 100% rename from xs/src/png/zlib/contrib/iostream3/zfstream.cc rename to src/png/zlib/contrib/iostream3/zfstream.cc diff --git a/xs/src/png/zlib/contrib/iostream3/zfstream.h b/src/png/zlib/contrib/iostream3/zfstream.h similarity index 100% rename from xs/src/png/zlib/contrib/iostream3/zfstream.h rename to src/png/zlib/contrib/iostream3/zfstream.h diff --git a/xs/src/png/zlib/contrib/masmx64/bld_ml64.bat b/src/png/zlib/contrib/masmx64/bld_ml64.bat similarity index 100% rename from xs/src/png/zlib/contrib/masmx64/bld_ml64.bat rename to src/png/zlib/contrib/masmx64/bld_ml64.bat diff --git a/xs/src/png/zlib/contrib/masmx64/gvmat64.asm b/src/png/zlib/contrib/masmx64/gvmat64.asm similarity index 100% rename from xs/src/png/zlib/contrib/masmx64/gvmat64.asm rename to src/png/zlib/contrib/masmx64/gvmat64.asm diff --git a/xs/src/png/zlib/contrib/masmx64/inffas8664.c b/src/png/zlib/contrib/masmx64/inffas8664.c similarity index 100% rename from xs/src/png/zlib/contrib/masmx64/inffas8664.c rename to src/png/zlib/contrib/masmx64/inffas8664.c diff --git a/xs/src/png/zlib/contrib/masmx64/inffasx64.asm b/src/png/zlib/contrib/masmx64/inffasx64.asm similarity index 100% rename from xs/src/png/zlib/contrib/masmx64/inffasx64.asm rename to src/png/zlib/contrib/masmx64/inffasx64.asm diff --git a/xs/src/png/zlib/contrib/masmx64/readme.txt b/src/png/zlib/contrib/masmx64/readme.txt similarity index 100% rename from xs/src/png/zlib/contrib/masmx64/readme.txt rename to src/png/zlib/contrib/masmx64/readme.txt diff --git a/xs/src/png/zlib/contrib/masmx86/bld_ml32.bat b/src/png/zlib/contrib/masmx86/bld_ml32.bat similarity index 100% rename from xs/src/png/zlib/contrib/masmx86/bld_ml32.bat rename to src/png/zlib/contrib/masmx86/bld_ml32.bat diff --git a/xs/src/png/zlib/contrib/masmx86/inffas32.asm b/src/png/zlib/contrib/masmx86/inffas32.asm similarity index 100% rename from xs/src/png/zlib/contrib/masmx86/inffas32.asm rename to src/png/zlib/contrib/masmx86/inffas32.asm diff --git a/xs/src/png/zlib/contrib/masmx86/match686.asm b/src/png/zlib/contrib/masmx86/match686.asm similarity index 100% rename from xs/src/png/zlib/contrib/masmx86/match686.asm rename to src/png/zlib/contrib/masmx86/match686.asm diff --git a/xs/src/png/zlib/contrib/masmx86/readme.txt b/src/png/zlib/contrib/masmx86/readme.txt similarity index 100% rename from xs/src/png/zlib/contrib/masmx86/readme.txt rename to src/png/zlib/contrib/masmx86/readme.txt diff --git a/xs/src/png/zlib/contrib/minizip/Makefile b/src/png/zlib/contrib/minizip/Makefile similarity index 100% rename from xs/src/png/zlib/contrib/minizip/Makefile rename to src/png/zlib/contrib/minizip/Makefile diff --git a/xs/src/png/zlib/contrib/minizip/Makefile.am b/src/png/zlib/contrib/minizip/Makefile.am similarity index 100% rename from xs/src/png/zlib/contrib/minizip/Makefile.am rename to src/png/zlib/contrib/minizip/Makefile.am diff --git a/xs/src/png/zlib/contrib/minizip/MiniZip64_Changes.txt b/src/png/zlib/contrib/minizip/MiniZip64_Changes.txt similarity index 100% rename from xs/src/png/zlib/contrib/minizip/MiniZip64_Changes.txt rename to src/png/zlib/contrib/minizip/MiniZip64_Changes.txt diff --git a/xs/src/png/zlib/contrib/minizip/MiniZip64_info.txt b/src/png/zlib/contrib/minizip/MiniZip64_info.txt similarity index 100% rename from xs/src/png/zlib/contrib/minizip/MiniZip64_info.txt rename to src/png/zlib/contrib/minizip/MiniZip64_info.txt diff --git a/xs/src/png/zlib/contrib/minizip/configure.ac b/src/png/zlib/contrib/minizip/configure.ac similarity index 100% rename from xs/src/png/zlib/contrib/minizip/configure.ac rename to src/png/zlib/contrib/minizip/configure.ac diff --git a/xs/src/png/zlib/contrib/minizip/crypt.h b/src/png/zlib/contrib/minizip/crypt.h similarity index 100% rename from xs/src/png/zlib/contrib/minizip/crypt.h rename to src/png/zlib/contrib/minizip/crypt.h diff --git a/xs/src/png/zlib/contrib/minizip/ioapi.c b/src/png/zlib/contrib/minizip/ioapi.c similarity index 100% rename from xs/src/png/zlib/contrib/minizip/ioapi.c rename to src/png/zlib/contrib/minizip/ioapi.c diff --git a/xs/src/png/zlib/contrib/minizip/ioapi.h b/src/png/zlib/contrib/minizip/ioapi.h similarity index 100% rename from xs/src/png/zlib/contrib/minizip/ioapi.h rename to src/png/zlib/contrib/minizip/ioapi.h diff --git a/xs/src/png/zlib/contrib/minizip/iowin32.c b/src/png/zlib/contrib/minizip/iowin32.c similarity index 100% rename from xs/src/png/zlib/contrib/minizip/iowin32.c rename to src/png/zlib/contrib/minizip/iowin32.c diff --git a/xs/src/png/zlib/contrib/minizip/iowin32.h b/src/png/zlib/contrib/minizip/iowin32.h similarity index 100% rename from xs/src/png/zlib/contrib/minizip/iowin32.h rename to src/png/zlib/contrib/minizip/iowin32.h diff --git a/xs/src/png/zlib/contrib/minizip/make_vms.com b/src/png/zlib/contrib/minizip/make_vms.com similarity index 100% rename from xs/src/png/zlib/contrib/minizip/make_vms.com rename to src/png/zlib/contrib/minizip/make_vms.com diff --git a/xs/src/png/zlib/contrib/minizip/miniunz.c b/src/png/zlib/contrib/minizip/miniunz.c similarity index 100% rename from xs/src/png/zlib/contrib/minizip/miniunz.c rename to src/png/zlib/contrib/minizip/miniunz.c diff --git a/xs/src/png/zlib/contrib/minizip/miniunzip.1 b/src/png/zlib/contrib/minizip/miniunzip.1 similarity index 100% rename from xs/src/png/zlib/contrib/minizip/miniunzip.1 rename to src/png/zlib/contrib/minizip/miniunzip.1 diff --git a/xs/src/png/zlib/contrib/minizip/minizip.1 b/src/png/zlib/contrib/minizip/minizip.1 similarity index 100% rename from xs/src/png/zlib/contrib/minizip/minizip.1 rename to src/png/zlib/contrib/minizip/minizip.1 diff --git a/xs/src/png/zlib/contrib/minizip/minizip.c b/src/png/zlib/contrib/minizip/minizip.c similarity index 100% rename from xs/src/png/zlib/contrib/minizip/minizip.c rename to src/png/zlib/contrib/minizip/minizip.c diff --git a/xs/src/png/zlib/contrib/minizip/minizip.pc.in b/src/png/zlib/contrib/minizip/minizip.pc.in similarity index 100% rename from xs/src/png/zlib/contrib/minizip/minizip.pc.in rename to src/png/zlib/contrib/minizip/minizip.pc.in diff --git a/xs/src/png/zlib/contrib/minizip/mztools.c b/src/png/zlib/contrib/minizip/mztools.c similarity index 100% rename from xs/src/png/zlib/contrib/minizip/mztools.c rename to src/png/zlib/contrib/minizip/mztools.c diff --git a/xs/src/png/zlib/contrib/minizip/mztools.h b/src/png/zlib/contrib/minizip/mztools.h similarity index 100% rename from xs/src/png/zlib/contrib/minizip/mztools.h rename to src/png/zlib/contrib/minizip/mztools.h diff --git a/xs/src/png/zlib/contrib/minizip/unzip.c b/src/png/zlib/contrib/minizip/unzip.c similarity index 100% rename from xs/src/png/zlib/contrib/minizip/unzip.c rename to src/png/zlib/contrib/minizip/unzip.c diff --git a/xs/src/png/zlib/contrib/minizip/unzip.h b/src/png/zlib/contrib/minizip/unzip.h similarity index 100% rename from xs/src/png/zlib/contrib/minizip/unzip.h rename to src/png/zlib/contrib/minizip/unzip.h diff --git a/xs/src/png/zlib/contrib/minizip/zip.c b/src/png/zlib/contrib/minizip/zip.c similarity index 100% rename from xs/src/png/zlib/contrib/minizip/zip.c rename to src/png/zlib/contrib/minizip/zip.c diff --git a/xs/src/png/zlib/contrib/minizip/zip.h b/src/png/zlib/contrib/minizip/zip.h similarity index 100% rename from xs/src/png/zlib/contrib/minizip/zip.h rename to src/png/zlib/contrib/minizip/zip.h diff --git a/xs/src/png/zlib/contrib/pascal/example.pas b/src/png/zlib/contrib/pascal/example.pas similarity index 100% rename from xs/src/png/zlib/contrib/pascal/example.pas rename to src/png/zlib/contrib/pascal/example.pas diff --git a/xs/src/png/zlib/contrib/pascal/readme.txt b/src/png/zlib/contrib/pascal/readme.txt similarity index 100% rename from xs/src/png/zlib/contrib/pascal/readme.txt rename to src/png/zlib/contrib/pascal/readme.txt diff --git a/xs/src/png/zlib/contrib/pascal/zlibd32.mak b/src/png/zlib/contrib/pascal/zlibd32.mak similarity index 100% rename from xs/src/png/zlib/contrib/pascal/zlibd32.mak rename to src/png/zlib/contrib/pascal/zlibd32.mak diff --git a/xs/src/png/zlib/contrib/pascal/zlibpas.pas b/src/png/zlib/contrib/pascal/zlibpas.pas similarity index 100% rename from xs/src/png/zlib/contrib/pascal/zlibpas.pas rename to src/png/zlib/contrib/pascal/zlibpas.pas diff --git a/xs/src/png/zlib/contrib/puff/Makefile b/src/png/zlib/contrib/puff/Makefile similarity index 100% rename from xs/src/png/zlib/contrib/puff/Makefile rename to src/png/zlib/contrib/puff/Makefile diff --git a/xs/src/png/zlib/contrib/puff/README b/src/png/zlib/contrib/puff/README similarity index 100% rename from xs/src/png/zlib/contrib/puff/README rename to src/png/zlib/contrib/puff/README diff --git a/xs/src/png/zlib/contrib/puff/puff.c b/src/png/zlib/contrib/puff/puff.c similarity index 100% rename from xs/src/png/zlib/contrib/puff/puff.c rename to src/png/zlib/contrib/puff/puff.c diff --git a/xs/src/png/zlib/contrib/puff/puff.h b/src/png/zlib/contrib/puff/puff.h similarity index 100% rename from xs/src/png/zlib/contrib/puff/puff.h rename to src/png/zlib/contrib/puff/puff.h diff --git a/xs/src/png/zlib/contrib/puff/pufftest.c b/src/png/zlib/contrib/puff/pufftest.c similarity index 100% rename from xs/src/png/zlib/contrib/puff/pufftest.c rename to src/png/zlib/contrib/puff/pufftest.c diff --git a/xs/src/png/zlib/contrib/puff/zeros.raw b/src/png/zlib/contrib/puff/zeros.raw similarity index 100% rename from xs/src/png/zlib/contrib/puff/zeros.raw rename to src/png/zlib/contrib/puff/zeros.raw diff --git a/xs/src/png/zlib/contrib/testzlib/testzlib.c b/src/png/zlib/contrib/testzlib/testzlib.c similarity index 100% rename from xs/src/png/zlib/contrib/testzlib/testzlib.c rename to src/png/zlib/contrib/testzlib/testzlib.c diff --git a/xs/src/png/zlib/contrib/testzlib/testzlib.txt b/src/png/zlib/contrib/testzlib/testzlib.txt similarity index 100% rename from xs/src/png/zlib/contrib/testzlib/testzlib.txt rename to src/png/zlib/contrib/testzlib/testzlib.txt diff --git a/xs/src/png/zlib/contrib/untgz/Makefile b/src/png/zlib/contrib/untgz/Makefile similarity index 100% rename from xs/src/png/zlib/contrib/untgz/Makefile rename to src/png/zlib/contrib/untgz/Makefile diff --git a/xs/src/png/zlib/contrib/untgz/Makefile.msc b/src/png/zlib/contrib/untgz/Makefile.msc similarity index 100% rename from xs/src/png/zlib/contrib/untgz/Makefile.msc rename to src/png/zlib/contrib/untgz/Makefile.msc diff --git a/xs/src/png/zlib/contrib/untgz/untgz.c b/src/png/zlib/contrib/untgz/untgz.c similarity index 100% rename from xs/src/png/zlib/contrib/untgz/untgz.c rename to src/png/zlib/contrib/untgz/untgz.c diff --git a/xs/src/png/zlib/contrib/vstudio/readme.txt b/src/png/zlib/contrib/vstudio/readme.txt similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/readme.txt rename to src/png/zlib/contrib/vstudio/readme.txt diff --git a/xs/src/png/zlib/contrib/vstudio/vc10/miniunz.vcxproj b/src/png/zlib/contrib/vstudio/vc10/miniunz.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc10/miniunz.vcxproj rename to src/png/zlib/contrib/vstudio/vc10/miniunz.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters b/src/png/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters rename to src/png/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters diff --git a/xs/src/png/zlib/contrib/vstudio/vc10/minizip.vcxproj b/src/png/zlib/contrib/vstudio/vc10/minizip.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc10/minizip.vcxproj rename to src/png/zlib/contrib/vstudio/vc10/minizip.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters b/src/png/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters rename to src/png/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters diff --git a/xs/src/png/zlib/contrib/vstudio/vc10/testzlib.vcxproj b/src/png/zlib/contrib/vstudio/vc10/testzlib.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc10/testzlib.vcxproj rename to src/png/zlib/contrib/vstudio/vc10/testzlib.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters b/src/png/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters rename to src/png/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters diff --git a/xs/src/png/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj b/src/png/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj rename to src/png/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters b/src/png/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters rename to src/png/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters diff --git a/xs/src/png/zlib/contrib/vstudio/vc10/zlib.rc b/src/png/zlib/contrib/vstudio/vc10/zlib.rc similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc10/zlib.rc rename to src/png/zlib/contrib/vstudio/vc10/zlib.rc diff --git a/xs/src/png/zlib/contrib/vstudio/vc10/zlibstat.vcxproj b/src/png/zlib/contrib/vstudio/vc10/zlibstat.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc10/zlibstat.vcxproj rename to src/png/zlib/contrib/vstudio/vc10/zlibstat.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters b/src/png/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters rename to src/png/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters diff --git a/xs/src/png/zlib/contrib/vstudio/vc10/zlibvc.def b/src/png/zlib/contrib/vstudio/vc10/zlibvc.def similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc10/zlibvc.def rename to src/png/zlib/contrib/vstudio/vc10/zlibvc.def diff --git a/xs/src/png/zlib/contrib/vstudio/vc10/zlibvc.sln b/src/png/zlib/contrib/vstudio/vc10/zlibvc.sln similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc10/zlibvc.sln rename to src/png/zlib/contrib/vstudio/vc10/zlibvc.sln diff --git a/xs/src/png/zlib/contrib/vstudio/vc10/zlibvc.vcxproj b/src/png/zlib/contrib/vstudio/vc10/zlibvc.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc10/zlibvc.vcxproj rename to src/png/zlib/contrib/vstudio/vc10/zlibvc.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters b/src/png/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters rename to src/png/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters diff --git a/xs/src/png/zlib/contrib/vstudio/vc11/miniunz.vcxproj b/src/png/zlib/contrib/vstudio/vc11/miniunz.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc11/miniunz.vcxproj rename to src/png/zlib/contrib/vstudio/vc11/miniunz.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc11/minizip.vcxproj b/src/png/zlib/contrib/vstudio/vc11/minizip.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc11/minizip.vcxproj rename to src/png/zlib/contrib/vstudio/vc11/minizip.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc11/testzlib.vcxproj b/src/png/zlib/contrib/vstudio/vc11/testzlib.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc11/testzlib.vcxproj rename to src/png/zlib/contrib/vstudio/vc11/testzlib.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj b/src/png/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj rename to src/png/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc11/zlib.rc b/src/png/zlib/contrib/vstudio/vc11/zlib.rc similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc11/zlib.rc rename to src/png/zlib/contrib/vstudio/vc11/zlib.rc diff --git a/xs/src/png/zlib/contrib/vstudio/vc11/zlibstat.vcxproj b/src/png/zlib/contrib/vstudio/vc11/zlibstat.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc11/zlibstat.vcxproj rename to src/png/zlib/contrib/vstudio/vc11/zlibstat.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc11/zlibvc.def b/src/png/zlib/contrib/vstudio/vc11/zlibvc.def similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc11/zlibvc.def rename to src/png/zlib/contrib/vstudio/vc11/zlibvc.def diff --git a/xs/src/png/zlib/contrib/vstudio/vc11/zlibvc.sln b/src/png/zlib/contrib/vstudio/vc11/zlibvc.sln similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc11/zlibvc.sln rename to src/png/zlib/contrib/vstudio/vc11/zlibvc.sln diff --git a/xs/src/png/zlib/contrib/vstudio/vc11/zlibvc.vcxproj b/src/png/zlib/contrib/vstudio/vc11/zlibvc.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc11/zlibvc.vcxproj rename to src/png/zlib/contrib/vstudio/vc11/zlibvc.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc12/miniunz.vcxproj b/src/png/zlib/contrib/vstudio/vc12/miniunz.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc12/miniunz.vcxproj rename to src/png/zlib/contrib/vstudio/vc12/miniunz.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc12/minizip.vcxproj b/src/png/zlib/contrib/vstudio/vc12/minizip.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc12/minizip.vcxproj rename to src/png/zlib/contrib/vstudio/vc12/minizip.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc12/testzlib.vcxproj b/src/png/zlib/contrib/vstudio/vc12/testzlib.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc12/testzlib.vcxproj rename to src/png/zlib/contrib/vstudio/vc12/testzlib.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj b/src/png/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj rename to src/png/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc12/zlib.rc b/src/png/zlib/contrib/vstudio/vc12/zlib.rc similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc12/zlib.rc rename to src/png/zlib/contrib/vstudio/vc12/zlib.rc diff --git a/xs/src/png/zlib/contrib/vstudio/vc12/zlibstat.vcxproj b/src/png/zlib/contrib/vstudio/vc12/zlibstat.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc12/zlibstat.vcxproj rename to src/png/zlib/contrib/vstudio/vc12/zlibstat.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc12/zlibvc.def b/src/png/zlib/contrib/vstudio/vc12/zlibvc.def similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc12/zlibvc.def rename to src/png/zlib/contrib/vstudio/vc12/zlibvc.def diff --git a/xs/src/png/zlib/contrib/vstudio/vc12/zlibvc.sln b/src/png/zlib/contrib/vstudio/vc12/zlibvc.sln similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc12/zlibvc.sln rename to src/png/zlib/contrib/vstudio/vc12/zlibvc.sln diff --git a/xs/src/png/zlib/contrib/vstudio/vc12/zlibvc.vcxproj b/src/png/zlib/contrib/vstudio/vc12/zlibvc.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc12/zlibvc.vcxproj rename to src/png/zlib/contrib/vstudio/vc12/zlibvc.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc14/miniunz.vcxproj b/src/png/zlib/contrib/vstudio/vc14/miniunz.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc14/miniunz.vcxproj rename to src/png/zlib/contrib/vstudio/vc14/miniunz.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc14/minizip.vcxproj b/src/png/zlib/contrib/vstudio/vc14/minizip.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc14/minizip.vcxproj rename to src/png/zlib/contrib/vstudio/vc14/minizip.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc14/testzlib.vcxproj b/src/png/zlib/contrib/vstudio/vc14/testzlib.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc14/testzlib.vcxproj rename to src/png/zlib/contrib/vstudio/vc14/testzlib.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj b/src/png/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj rename to src/png/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc14/zlib.rc b/src/png/zlib/contrib/vstudio/vc14/zlib.rc similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc14/zlib.rc rename to src/png/zlib/contrib/vstudio/vc14/zlib.rc diff --git a/xs/src/png/zlib/contrib/vstudio/vc14/zlibstat.vcxproj b/src/png/zlib/contrib/vstudio/vc14/zlibstat.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc14/zlibstat.vcxproj rename to src/png/zlib/contrib/vstudio/vc14/zlibstat.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc14/zlibvc.def b/src/png/zlib/contrib/vstudio/vc14/zlibvc.def similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc14/zlibvc.def rename to src/png/zlib/contrib/vstudio/vc14/zlibvc.def diff --git a/xs/src/png/zlib/contrib/vstudio/vc14/zlibvc.sln b/src/png/zlib/contrib/vstudio/vc14/zlibvc.sln similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc14/zlibvc.sln rename to src/png/zlib/contrib/vstudio/vc14/zlibvc.sln diff --git a/xs/src/png/zlib/contrib/vstudio/vc14/zlibvc.vcxproj b/src/png/zlib/contrib/vstudio/vc14/zlibvc.vcxproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc14/zlibvc.vcxproj rename to src/png/zlib/contrib/vstudio/vc14/zlibvc.vcxproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc9/miniunz.vcproj b/src/png/zlib/contrib/vstudio/vc9/miniunz.vcproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc9/miniunz.vcproj rename to src/png/zlib/contrib/vstudio/vc9/miniunz.vcproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc9/minizip.vcproj b/src/png/zlib/contrib/vstudio/vc9/minizip.vcproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc9/minizip.vcproj rename to src/png/zlib/contrib/vstudio/vc9/minizip.vcproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc9/testzlib.vcproj b/src/png/zlib/contrib/vstudio/vc9/testzlib.vcproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc9/testzlib.vcproj rename to src/png/zlib/contrib/vstudio/vc9/testzlib.vcproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc9/testzlibdll.vcproj b/src/png/zlib/contrib/vstudio/vc9/testzlibdll.vcproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc9/testzlibdll.vcproj rename to src/png/zlib/contrib/vstudio/vc9/testzlibdll.vcproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc9/zlib.rc b/src/png/zlib/contrib/vstudio/vc9/zlib.rc similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc9/zlib.rc rename to src/png/zlib/contrib/vstudio/vc9/zlib.rc diff --git a/xs/src/png/zlib/contrib/vstudio/vc9/zlibstat.vcproj b/src/png/zlib/contrib/vstudio/vc9/zlibstat.vcproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc9/zlibstat.vcproj rename to src/png/zlib/contrib/vstudio/vc9/zlibstat.vcproj diff --git a/xs/src/png/zlib/contrib/vstudio/vc9/zlibvc.def b/src/png/zlib/contrib/vstudio/vc9/zlibvc.def similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc9/zlibvc.def rename to src/png/zlib/contrib/vstudio/vc9/zlibvc.def diff --git a/xs/src/png/zlib/contrib/vstudio/vc9/zlibvc.sln b/src/png/zlib/contrib/vstudio/vc9/zlibvc.sln similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc9/zlibvc.sln rename to src/png/zlib/contrib/vstudio/vc9/zlibvc.sln diff --git a/xs/src/png/zlib/contrib/vstudio/vc9/zlibvc.vcproj b/src/png/zlib/contrib/vstudio/vc9/zlibvc.vcproj similarity index 100% rename from xs/src/png/zlib/contrib/vstudio/vc9/zlibvc.vcproj rename to src/png/zlib/contrib/vstudio/vc9/zlibvc.vcproj diff --git a/xs/src/png/zlib/crc32.c b/src/png/zlib/crc32.c similarity index 100% rename from xs/src/png/zlib/crc32.c rename to src/png/zlib/crc32.c diff --git a/xs/src/png/zlib/crc32.h b/src/png/zlib/crc32.h similarity index 100% rename from xs/src/png/zlib/crc32.h rename to src/png/zlib/crc32.h diff --git a/xs/src/png/zlib/deflate.c b/src/png/zlib/deflate.c similarity index 100% rename from xs/src/png/zlib/deflate.c rename to src/png/zlib/deflate.c diff --git a/xs/src/png/zlib/deflate.h b/src/png/zlib/deflate.h similarity index 100% rename from xs/src/png/zlib/deflate.h rename to src/png/zlib/deflate.h diff --git a/xs/src/png/zlib/gzclose.c b/src/png/zlib/gzclose.c similarity index 100% rename from xs/src/png/zlib/gzclose.c rename to src/png/zlib/gzclose.c diff --git a/xs/src/png/zlib/gzguts.h b/src/png/zlib/gzguts.h similarity index 100% rename from xs/src/png/zlib/gzguts.h rename to src/png/zlib/gzguts.h diff --git a/xs/src/png/zlib/gzlib.c b/src/png/zlib/gzlib.c similarity index 100% rename from xs/src/png/zlib/gzlib.c rename to src/png/zlib/gzlib.c diff --git a/xs/src/png/zlib/gzread.c b/src/png/zlib/gzread.c similarity index 100% rename from xs/src/png/zlib/gzread.c rename to src/png/zlib/gzread.c diff --git a/xs/src/png/zlib/gzwrite.c b/src/png/zlib/gzwrite.c similarity index 100% rename from xs/src/png/zlib/gzwrite.c rename to src/png/zlib/gzwrite.c diff --git a/xs/src/png/zlib/infback.c b/src/png/zlib/infback.c similarity index 100% rename from xs/src/png/zlib/infback.c rename to src/png/zlib/infback.c diff --git a/xs/src/png/zlib/inffast.c b/src/png/zlib/inffast.c similarity index 100% rename from xs/src/png/zlib/inffast.c rename to src/png/zlib/inffast.c diff --git a/xs/src/png/zlib/inffast.h b/src/png/zlib/inffast.h similarity index 100% rename from xs/src/png/zlib/inffast.h rename to src/png/zlib/inffast.h diff --git a/xs/src/png/zlib/inffixed.h b/src/png/zlib/inffixed.h similarity index 100% rename from xs/src/png/zlib/inffixed.h rename to src/png/zlib/inffixed.h diff --git a/xs/src/png/zlib/inflate.c b/src/png/zlib/inflate.c similarity index 100% rename from xs/src/png/zlib/inflate.c rename to src/png/zlib/inflate.c diff --git a/xs/src/png/zlib/inflate.h b/src/png/zlib/inflate.h similarity index 100% rename from xs/src/png/zlib/inflate.h rename to src/png/zlib/inflate.h diff --git a/xs/src/png/zlib/inftrees.c b/src/png/zlib/inftrees.c similarity index 100% rename from xs/src/png/zlib/inftrees.c rename to src/png/zlib/inftrees.c diff --git a/xs/src/png/zlib/inftrees.h b/src/png/zlib/inftrees.h similarity index 100% rename from xs/src/png/zlib/inftrees.h rename to src/png/zlib/inftrees.h diff --git a/xs/src/png/zlib/make_vms.com b/src/png/zlib/make_vms.com similarity index 100% rename from xs/src/png/zlib/make_vms.com rename to src/png/zlib/make_vms.com diff --git a/xs/src/png/zlib/msdos/Makefile.bor b/src/png/zlib/msdos/Makefile.bor similarity index 100% rename from xs/src/png/zlib/msdos/Makefile.bor rename to src/png/zlib/msdos/Makefile.bor diff --git a/xs/src/png/zlib/msdos/Makefile.dj2 b/src/png/zlib/msdos/Makefile.dj2 similarity index 100% rename from xs/src/png/zlib/msdos/Makefile.dj2 rename to src/png/zlib/msdos/Makefile.dj2 diff --git a/xs/src/png/zlib/msdos/Makefile.emx b/src/png/zlib/msdos/Makefile.emx similarity index 100% rename from xs/src/png/zlib/msdos/Makefile.emx rename to src/png/zlib/msdos/Makefile.emx diff --git a/xs/src/png/zlib/msdos/Makefile.msc b/src/png/zlib/msdos/Makefile.msc similarity index 100% rename from xs/src/png/zlib/msdos/Makefile.msc rename to src/png/zlib/msdos/Makefile.msc diff --git a/xs/src/png/zlib/msdos/Makefile.tc b/src/png/zlib/msdos/Makefile.tc similarity index 100% rename from xs/src/png/zlib/msdos/Makefile.tc rename to src/png/zlib/msdos/Makefile.tc diff --git a/xs/src/png/zlib/nintendods/Makefile b/src/png/zlib/nintendods/Makefile similarity index 100% rename from xs/src/png/zlib/nintendods/Makefile rename to src/png/zlib/nintendods/Makefile diff --git a/xs/src/png/zlib/nintendods/README b/src/png/zlib/nintendods/README similarity index 100% rename from xs/src/png/zlib/nintendods/README rename to src/png/zlib/nintendods/README diff --git a/xs/src/png/zlib/old/Makefile.emx b/src/png/zlib/old/Makefile.emx similarity index 100% rename from xs/src/png/zlib/old/Makefile.emx rename to src/png/zlib/old/Makefile.emx diff --git a/xs/src/png/zlib/old/Makefile.riscos b/src/png/zlib/old/Makefile.riscos similarity index 100% rename from xs/src/png/zlib/old/Makefile.riscos rename to src/png/zlib/old/Makefile.riscos diff --git a/xs/src/png/zlib/old/README b/src/png/zlib/old/README similarity index 100% rename from xs/src/png/zlib/old/README rename to src/png/zlib/old/README diff --git a/xs/src/png/zlib/old/descrip.mms b/src/png/zlib/old/descrip.mms similarity index 100% rename from xs/src/png/zlib/old/descrip.mms rename to src/png/zlib/old/descrip.mms diff --git a/xs/src/png/zlib/old/os2/Makefile.os2 b/src/png/zlib/old/os2/Makefile.os2 similarity index 100% rename from xs/src/png/zlib/old/os2/Makefile.os2 rename to src/png/zlib/old/os2/Makefile.os2 diff --git a/xs/src/png/zlib/old/os2/zlib.def b/src/png/zlib/old/os2/zlib.def similarity index 100% rename from xs/src/png/zlib/old/os2/zlib.def rename to src/png/zlib/old/os2/zlib.def diff --git a/xs/src/png/zlib/old/visual-basic.txt b/src/png/zlib/old/visual-basic.txt similarity index 100% rename from xs/src/png/zlib/old/visual-basic.txt rename to src/png/zlib/old/visual-basic.txt diff --git a/xs/src/png/zlib/os400/README400 b/src/png/zlib/os400/README400 similarity index 100% rename from xs/src/png/zlib/os400/README400 rename to src/png/zlib/os400/README400 diff --git a/xs/src/png/zlib/os400/bndsrc b/src/png/zlib/os400/bndsrc similarity index 100% rename from xs/src/png/zlib/os400/bndsrc rename to src/png/zlib/os400/bndsrc diff --git a/xs/src/png/zlib/os400/make.sh b/src/png/zlib/os400/make.sh similarity index 100% rename from xs/src/png/zlib/os400/make.sh rename to src/png/zlib/os400/make.sh diff --git a/xs/src/png/zlib/os400/zlib.inc b/src/png/zlib/os400/zlib.inc similarity index 100% rename from xs/src/png/zlib/os400/zlib.inc rename to src/png/zlib/os400/zlib.inc diff --git a/xs/src/png/zlib/qnx/package.qpg b/src/png/zlib/qnx/package.qpg similarity index 100% rename from xs/src/png/zlib/qnx/package.qpg rename to src/png/zlib/qnx/package.qpg diff --git a/xs/src/png/zlib/treebuild.xml b/src/png/zlib/treebuild.xml similarity index 100% rename from xs/src/png/zlib/treebuild.xml rename to src/png/zlib/treebuild.xml diff --git a/xs/src/png/zlib/trees.c b/src/png/zlib/trees.c similarity index 100% rename from xs/src/png/zlib/trees.c rename to src/png/zlib/trees.c diff --git a/xs/src/png/zlib/trees.h b/src/png/zlib/trees.h similarity index 100% rename from xs/src/png/zlib/trees.h rename to src/png/zlib/trees.h diff --git a/xs/src/png/zlib/uncompr.c b/src/png/zlib/uncompr.c similarity index 100% rename from xs/src/png/zlib/uncompr.c rename to src/png/zlib/uncompr.c diff --git a/xs/src/png/zlib/watcom/watcom_f.mak b/src/png/zlib/watcom/watcom_f.mak similarity index 100% rename from xs/src/png/zlib/watcom/watcom_f.mak rename to src/png/zlib/watcom/watcom_f.mak diff --git a/xs/src/png/zlib/watcom/watcom_l.mak b/src/png/zlib/watcom/watcom_l.mak similarity index 100% rename from xs/src/png/zlib/watcom/watcom_l.mak rename to src/png/zlib/watcom/watcom_l.mak diff --git a/xs/src/png/zlib/win32/DLL_FAQ.txt b/src/png/zlib/win32/DLL_FAQ.txt similarity index 100% rename from xs/src/png/zlib/win32/DLL_FAQ.txt rename to src/png/zlib/win32/DLL_FAQ.txt diff --git a/xs/src/png/zlib/win32/Makefile.bor b/src/png/zlib/win32/Makefile.bor similarity index 100% rename from xs/src/png/zlib/win32/Makefile.bor rename to src/png/zlib/win32/Makefile.bor diff --git a/xs/src/png/zlib/win32/Makefile.gcc b/src/png/zlib/win32/Makefile.gcc similarity index 100% rename from xs/src/png/zlib/win32/Makefile.gcc rename to src/png/zlib/win32/Makefile.gcc diff --git a/xs/src/png/zlib/win32/Makefile.msc b/src/png/zlib/win32/Makefile.msc similarity index 100% rename from xs/src/png/zlib/win32/Makefile.msc rename to src/png/zlib/win32/Makefile.msc diff --git a/xs/src/png/zlib/win32/README-WIN32.txt b/src/png/zlib/win32/README-WIN32.txt similarity index 100% rename from xs/src/png/zlib/win32/README-WIN32.txt rename to src/png/zlib/win32/README-WIN32.txt diff --git a/xs/src/png/zlib/win32/VisualC.txt b/src/png/zlib/win32/VisualC.txt similarity index 100% rename from xs/src/png/zlib/win32/VisualC.txt rename to src/png/zlib/win32/VisualC.txt diff --git a/xs/src/png/zlib/win32/zlib.def b/src/png/zlib/win32/zlib.def similarity index 100% rename from xs/src/png/zlib/win32/zlib.def rename to src/png/zlib/win32/zlib.def diff --git a/xs/src/png/zlib/win32/zlib1.rc b/src/png/zlib/win32/zlib1.rc similarity index 100% rename from xs/src/png/zlib/win32/zlib1.rc rename to src/png/zlib/win32/zlib1.rc diff --git a/xs/src/png/zlib/zconf.h.cmakein b/src/png/zlib/zconf.h.cmakein similarity index 100% rename from xs/src/png/zlib/zconf.h.cmakein rename to src/png/zlib/zconf.h.cmakein diff --git a/xs/src/png/zlib/zconf.h.in b/src/png/zlib/zconf.h.in similarity index 100% rename from xs/src/png/zlib/zconf.h.in rename to src/png/zlib/zconf.h.in diff --git a/xs/src/png/zlib/zconf.h.included b/src/png/zlib/zconf.h.included similarity index 100% rename from xs/src/png/zlib/zconf.h.included rename to src/png/zlib/zconf.h.included diff --git a/xs/src/png/zlib/zlib.3 b/src/png/zlib/zlib.3 similarity index 100% rename from xs/src/png/zlib/zlib.3 rename to src/png/zlib/zlib.3 diff --git a/xs/src/png/zlib/zlib.3.pdf b/src/png/zlib/zlib.3.pdf similarity index 100% rename from xs/src/png/zlib/zlib.3.pdf rename to src/png/zlib/zlib.3.pdf diff --git a/xs/src/png/zlib/zlib.h b/src/png/zlib/zlib.h similarity index 100% rename from xs/src/png/zlib/zlib.h rename to src/png/zlib/zlib.h diff --git a/xs/src/png/zlib/zlib.map b/src/png/zlib/zlib.map similarity index 100% rename from xs/src/png/zlib/zlib.map rename to src/png/zlib/zlib.map diff --git a/xs/src/png/zlib/zlib.pc.cmakein b/src/png/zlib/zlib.pc.cmakein similarity index 100% rename from xs/src/png/zlib/zlib.pc.cmakein rename to src/png/zlib/zlib.pc.cmakein diff --git a/xs/src/png/zlib/zlib.pc.in b/src/png/zlib/zlib.pc.in similarity index 100% rename from xs/src/png/zlib/zlib.pc.in rename to src/png/zlib/zlib.pc.in diff --git a/xs/src/png/zlib/zlib2ansi b/src/png/zlib/zlib2ansi similarity index 100% rename from xs/src/png/zlib/zlib2ansi rename to src/png/zlib/zlib2ansi diff --git a/xs/src/png/zlib/zutil.c b/src/png/zlib/zutil.c similarity index 100% rename from xs/src/png/zlib/zutil.c rename to src/png/zlib/zutil.c diff --git a/xs/src/png/zlib/zutil.h b/src/png/zlib/zutil.h similarity index 100% rename from xs/src/png/zlib/zutil.h rename to src/png/zlib/zutil.h diff --git a/src/poly2tri/CMakeLists.txt b/src/poly2tri/CMakeLists.txt new file mode 100644 index 0000000000..3cdff1221d --- /dev/null +++ b/src/poly2tri/CMakeLists.txt @@ -0,0 +1,17 @@ +project(poly2tri) +cmake_minimum_required(VERSION 2.6) + +add_library(poly2tri STATIC + common/shapes.cc + common/shapes.h + common/utils.h + poly2tri.h + sweep/advancing_front.cc + sweep/advancing_front.h + sweep/cdt.cc + sweep/cdt.h + sweep/sweep.cc + sweep/sweep.h + sweep/sweep_context.cc + sweep/sweep_context.h +) diff --git a/xs/src/poly2tri/common/shapes.cc b/src/poly2tri/common/shapes.cc similarity index 100% rename from xs/src/poly2tri/common/shapes.cc rename to src/poly2tri/common/shapes.cc diff --git a/xs/src/poly2tri/common/shapes.h b/src/poly2tri/common/shapes.h similarity index 100% rename from xs/src/poly2tri/common/shapes.h rename to src/poly2tri/common/shapes.h diff --git a/xs/src/poly2tri/common/utils.h b/src/poly2tri/common/utils.h similarity index 100% rename from xs/src/poly2tri/common/utils.h rename to src/poly2tri/common/utils.h diff --git a/xs/src/poly2tri/poly2tri.h b/src/poly2tri/poly2tri.h similarity index 100% rename from xs/src/poly2tri/poly2tri.h rename to src/poly2tri/poly2tri.h diff --git a/xs/src/poly2tri/sweep/advancing_front.cc b/src/poly2tri/sweep/advancing_front.cc similarity index 100% rename from xs/src/poly2tri/sweep/advancing_front.cc rename to src/poly2tri/sweep/advancing_front.cc diff --git a/xs/src/poly2tri/sweep/advancing_front.h b/src/poly2tri/sweep/advancing_front.h similarity index 100% rename from xs/src/poly2tri/sweep/advancing_front.h rename to src/poly2tri/sweep/advancing_front.h diff --git a/xs/src/poly2tri/sweep/cdt.cc b/src/poly2tri/sweep/cdt.cc similarity index 100% rename from xs/src/poly2tri/sweep/cdt.cc rename to src/poly2tri/sweep/cdt.cc diff --git a/xs/src/poly2tri/sweep/cdt.h b/src/poly2tri/sweep/cdt.h similarity index 100% rename from xs/src/poly2tri/sweep/cdt.h rename to src/poly2tri/sweep/cdt.h diff --git a/xs/src/poly2tri/sweep/sweep.cc b/src/poly2tri/sweep/sweep.cc similarity index 100% rename from xs/src/poly2tri/sweep/sweep.cc rename to src/poly2tri/sweep/sweep.cc diff --git a/xs/src/poly2tri/sweep/sweep.h b/src/poly2tri/sweep/sweep.h similarity index 100% rename from xs/src/poly2tri/sweep/sweep.h rename to src/poly2tri/sweep/sweep.h diff --git a/xs/src/poly2tri/sweep/sweep_context.cc b/src/poly2tri/sweep/sweep_context.cc similarity index 100% rename from xs/src/poly2tri/sweep/sweep_context.cc rename to src/poly2tri/sweep/sweep_context.cc diff --git a/xs/src/poly2tri/sweep/sweep_context.h b/src/poly2tri/sweep/sweep_context.h similarity index 100% rename from xs/src/poly2tri/sweep/sweep_context.h rename to src/poly2tri/sweep/sweep_context.h diff --git a/src/polypartition/CMakeLists.txt b/src/polypartition/CMakeLists.txt new file mode 100644 index 0000000000..07b92840b8 --- /dev/null +++ b/src/polypartition/CMakeLists.txt @@ -0,0 +1,7 @@ +project(polypartition) +cmake_minimum_required(VERSION 2.6) + +add_library(polypartition STATIC + polypartition.cpp + polypartition.h +) diff --git a/xs/src/polypartition.cpp b/src/polypartition/polypartition.cpp similarity index 96% rename from xs/src/polypartition.cpp rename to src/polypartition/polypartition.cpp index 700cd09743..9c59172514 100644 --- a/xs/src/polypartition.cpp +++ b/src/polypartition/polypartition.cpp @@ -1,1563 +1,1563 @@ -//Copyright (C) 2011 by Ivan Fratric -// -//Permission is hereby granted, free of charge, to any person obtaining a copy -//of this software and associated documentation files (the "Software"), to deal -//in the Software without restriction, including without limitation the rights -//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -//copies of the Software, and to permit persons to whom the Software is -//furnished to do so, subject to the following conditions: -// -//The above copyright notice and this permission notice shall be included in -//all copies or substantial portions of the Software. -// -//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -//THE SOFTWARE. - - -#include -#include -#include -#include -#include -#include - -using namespace std; - -#include "polypartition.h" - -#define TPPL_VERTEXTYPE_REGULAR 0 -#define TPPL_VERTEXTYPE_START 1 -#define TPPL_VERTEXTYPE_END 2 -#define TPPL_VERTEXTYPE_SPLIT 3 -#define TPPL_VERTEXTYPE_MERGE 4 - -TPPLPoly::TPPLPoly() { - hole = false; - numpoints = 0; - points = NULL; -} - -TPPLPoly::~TPPLPoly() { - if(points) delete [] points; -} - -void TPPLPoly::Clear() { - if(points) delete [] points; - hole = false; - numpoints = 0; - points = NULL; -} - -void TPPLPoly::Init(long numpoints) { - Clear(); - this->numpoints = numpoints; - points = new TPPLPoint[numpoints]; -} - -void TPPLPoly::Triangle(TPPLPoint &p1, TPPLPoint &p2, TPPLPoint &p3) { - Init(3); - points[0] = p1; - points[1] = p2; - points[2] = p3; -} - -TPPLPoly::TPPLPoly(const TPPLPoly &src) { - hole = src.hole; - numpoints = src.numpoints; - points = new TPPLPoint[numpoints]; - memcpy(points, src.points, numpoints*sizeof(TPPLPoint)); -} - -TPPLPoly& TPPLPoly::operator=(const TPPLPoly &src) { - if(&src != this) { - Clear(); - hole = src.hole; - numpoints = src.numpoints; - points = new TPPLPoint[numpoints]; - memcpy(points, src.points, numpoints*sizeof(TPPLPoint)); - } - return *this; -} - -int TPPLPoly::GetOrientation() const { - long i1,i2; - tppl_float area = 0; - for(i1=0; i10) return TPPL_CCW; - if(area<0) return TPPL_CW; - return 0; -} - -void TPPLPoly::SetOrientation(int orientation) { - int polyorientation = GetOrientation(); - if(polyorientation&&(polyorientation!=orientation)) { - Invert(); - } -} - -void TPPLPoly::Invert() { - long i; - TPPLPoint *invpoints; - - invpoints = new TPPLPoint[numpoints]; - for(i=0;i0) return 0; - if(dot21*dot22>0) return 0; - - return 1; -} - -//removes holes from inpolys by merging them with non-holes -int TPPLPartition::RemoveHoles(list *inpolys, list *outpolys) { - list polys; - list::iterator holeiter,polyiter,iter,iter2; - long i,i2,holepointindex,polypointindex = 0; - TPPLPoint holepoint,polypoint,bestpolypoint; - TPPLPoint linep1,linep2; - TPPLPoint v1,v2; - TPPLPoly newpoly; - bool hasholes; - bool pointvisible; - bool pointfound; - - //check for trivial case (no holes) - hasholes = false; - for(iter = inpolys->begin(); iter!=inpolys->end(); ++iter) { - if(iter->IsHole()) { - hasholes = true; - break; - } - } - if(!hasholes) { - for(iter = inpolys->begin(); iter!=inpolys->end(); ++iter) { - outpolys->push_back(*iter); - } - return 1; - } - - polys = *inpolys; - - while(1) { - //find the hole point with the largest x - hasholes = false; - for(iter = polys.begin(); iter!=polys.end(); ++iter) { - if(!iter->IsHole()) continue; - - if(!hasholes) { - hasholes = true; - holeiter = iter; - holepointindex = 0; - } - - for(i=0; i < iter->GetNumPoints(); i++) { - if(iter->GetPoint(i).x > holeiter->GetPoint(holepointindex).x) { - holeiter = iter; - holepointindex = i; - } - } - } - if(!hasholes) break; - holepoint = holeiter->GetPoint(holepointindex); - - pointfound = false; - for(iter = polys.begin(); iter!=polys.end(); ++iter) { - if(iter->IsHole()) continue; - for(i=0; i < iter->GetNumPoints(); i++) { - if(iter->GetPoint(i).x <= holepoint.x) continue; - if(!InCone(iter->GetPoint((i+iter->GetNumPoints()-1)%(iter->GetNumPoints())), - iter->GetPoint(i), - iter->GetPoint((i+1)%(iter->GetNumPoints())), - holepoint)) - continue; - polypoint = iter->GetPoint(i); - if(pointfound) { - v1 = Normalize(polypoint-holepoint); - v2 = Normalize(bestpolypoint-holepoint); - if(v2.x > v1.x) continue; - } - pointvisible = true; - for(iter2 = polys.begin(); iter2!=polys.end(); ++iter2) { - if(iter2->IsHole()) continue; - for(i2=0; i2 < iter2->GetNumPoints(); i2++) { - linep1 = iter2->GetPoint(i2); - linep2 = iter2->GetPoint((i2+1)%(iter2->GetNumPoints())); - if(Intersects(holepoint,polypoint,linep1,linep2)) { - pointvisible = false; - break; - } - } - if(!pointvisible) break; - } - if(pointvisible) { - pointfound = true; - bestpolypoint = polypoint; - polyiter = iter; - polypointindex = i; - } - } - } - - if(!pointfound) return 0; - - newpoly.Init(holeiter->GetNumPoints() + polyiter->GetNumPoints() + 2); - i2 = 0; - for(i=0;i<=polypointindex;i++) { - newpoly[i2] = polyiter->GetPoint(i); - i2++; - } - for(i=0;i<=holeiter->GetNumPoints();i++) { - newpoly[i2] = holeiter->GetPoint((i+holepointindex)%holeiter->GetNumPoints()); - i2++; - } - for(i=polypointindex;iGetNumPoints();i++) { - newpoly[i2] = polyiter->GetPoint(i); - i2++; - } - - polys.erase(holeiter); - polys.erase(polyiter); - polys.push_back(newpoly); - } - - for(iter = polys.begin(); iter!=polys.end(); ++iter) { - outpolys->push_back(*iter); - } - - return 1; -} - -bool TPPLPartition::IsConvex(TPPLPoint& p1, TPPLPoint& p2, TPPLPoint& p3) { - tppl_float tmp; - tmp = (p3.y-p1.y)*(p2.x-p1.x)-(p3.x-p1.x)*(p2.y-p1.y); - if(tmp>0) return 1; - else return 0; -} - -bool TPPLPartition::IsReflex(TPPLPoint& p1, TPPLPoint& p2, TPPLPoint& p3) { - tppl_float tmp; - tmp = (p3.y-p1.y)*(p2.x-p1.x)-(p3.x-p1.x)*(p2.y-p1.y); - if(tmp<0) return 1; - else return 0; -} - -bool TPPLPartition::IsInside(TPPLPoint& p1, TPPLPoint& p2, TPPLPoint& p3, TPPLPoint &p) { - if(IsConvex(p1,p,p2)) return false; - if(IsConvex(p2,p,p3)) return false; - if(IsConvex(p3,p,p1)) return false; - return true; -} - -bool TPPLPartition::InCone(TPPLPoint &p1, TPPLPoint &p2, TPPLPoint &p3, TPPLPoint &p) { - bool convex; - - convex = IsConvex(p1,p2,p3); - - if(convex) { - if(!IsConvex(p1,p2,p)) return false; - if(!IsConvex(p2,p3,p)) return false; - return true; - } else { - if(IsConvex(p1,p2,p)) return true; - if(IsConvex(p2,p3,p)) return true; - return false; - } -} - -bool TPPLPartition::InCone(PartitionVertex *v, TPPLPoint &p) { - TPPLPoint p1,p2,p3; - - p1 = v->previous->p; - p2 = v->p; - p3 = v->next->p; - - return InCone(p1,p2,p3,p); -} - -void TPPLPartition::UpdateVertexReflexity(PartitionVertex *v) { - PartitionVertex *v1,*v3; - v1 = v->previous; - v3 = v->next; - v->isConvex = !IsReflex(v1->p,v->p,v3->p); -} - -void TPPLPartition::UpdateVertex(PartitionVertex *v, PartitionVertex *vertices, long numvertices) { - long i; - PartitionVertex *v1,*v3; - TPPLPoint vec1,vec3; - - v1 = v->previous; - v3 = v->next; - - v->isConvex = IsConvex(v1->p,v->p,v3->p); - - vec1 = Normalize(v1->p - v->p); - vec3 = Normalize(v3->p - v->p); - v->angle = vec1.x*vec3.x + vec1.y*vec3.y; - - if(v->isConvex) { - v->isEar = true; - for(i=0;ip.x)&&(vertices[i].p.y==v->p.y)) continue; - if((vertices[i].p.x==v1->p.x)&&(vertices[i].p.y==v1->p.y)) continue; - if((vertices[i].p.x==v3->p.x)&&(vertices[i].p.y==v3->p.y)) continue; - if(IsInside(v1->p,v->p,v3->p,vertices[i].p)) { - v->isEar = false; - break; - } - } - } else { - v->isEar = false; - } -} - -//triangulation by ear removal -int TPPLPartition::Triangulate_EC(TPPLPoly *poly, list *triangles) { - long numvertices; - PartitionVertex *vertices; - PartitionVertex *ear; - TPPLPoly triangle; - long i,j; - bool earfound; - - if(poly->GetNumPoints() < 3) return 0; - if(poly->GetNumPoints() == 3) { - triangles->push_back(*poly); - return 1; - } - - numvertices = poly->GetNumPoints(); - - vertices = new PartitionVertex[numvertices]; - for(i=0;iGetPoint(i); - if(i==(numvertices-1)) vertices[i].next=&(vertices[0]); - else vertices[i].next=&(vertices[i+1]); - if(i==0) vertices[i].previous = &(vertices[numvertices-1]); - else vertices[i].previous = &(vertices[i-1]); - } - for(i=0;i ear->angle) { - ear = &(vertices[j]); - } - } - } - if(!earfound) { - delete [] vertices; - return 0; - } - - triangle.Triangle(ear->previous->p,ear->p,ear->next->p); - triangles->push_back(triangle); - - ear->isActive = false; - ear->previous->next = ear->next; - ear->next->previous = ear->previous; - - if(i==numvertices-4) break; - - UpdateVertex(ear->previous,vertices,numvertices); - UpdateVertex(ear->next,vertices,numvertices); - } - for(i=0;ip,vertices[i].p,vertices[i].next->p); - triangles->push_back(triangle); - break; - } - } - - delete [] vertices; - - return 1; -} - -int TPPLPartition::Triangulate_EC(list *inpolys, list *triangles) { - list outpolys; - list::iterator iter; - - if(!RemoveHoles(inpolys,&outpolys)) return 0; - for(iter=outpolys.begin();iter!=outpolys.end();++iter) { - if(!Triangulate_EC(&(*iter),triangles)) return 0; - } - return 1; -} - -int TPPLPartition::ConvexPartition_HM(TPPLPoly *poly, list *parts) { - list triangles; - list::iterator iter1,iter2; - TPPLPoly *poly1,*poly2; - TPPLPoly newpoly; - TPPLPoint d1,d2,p1,p2,p3; - long i11,i12,i21,i22,i13,i23,j,k; - bool isdiagonal; - long numreflex; - - //check if the poly is already convex - numreflex = 0; - for(i11=0;i11GetNumPoints();i11++) { - if(i11==0) i12 = poly->GetNumPoints()-1; - else i12=i11-1; - if(i11==(poly->GetNumPoints()-1)) i13=0; - else i13=i11+1; - if(IsReflex(poly->GetPoint(i12),poly->GetPoint(i11),poly->GetPoint(i13))) { - numreflex = 1; - break; - } - } - if(numreflex == 0) { - parts->push_back(*poly); - return 1; - } - - if(!Triangulate_EC(poly,&triangles)) return 0; - - for(iter1 = triangles.begin(); iter1 != triangles.end(); ++iter1) { - poly1 = &(*iter1); - for(i11=0;i11GetNumPoints();i11++) { - d1 = poly1->GetPoint(i11); - i12 = (i11+1)%(poly1->GetNumPoints()); - d2 = poly1->GetPoint(i12); - - isdiagonal = false; - for(iter2 = iter1; iter2 != triangles.end(); ++iter2) { - if(iter1 == iter2) continue; - poly2 = &(*iter2); - - for(i21=0;i21GetNumPoints();i21++) { - if((d2.x != poly2->GetPoint(i21).x)||(d2.y != poly2->GetPoint(i21).y)) continue; - i22 = (i21+1)%(poly2->GetNumPoints()); - if((d1.x != poly2->GetPoint(i22).x)||(d1.y != poly2->GetPoint(i22).y)) continue; - isdiagonal = true; - break; - } - if(isdiagonal) break; - } - - if(!isdiagonal) continue; - - p2 = poly1->GetPoint(i11); - if(i11 == 0) i13 = poly1->GetNumPoints()-1; - else i13 = i11-1; - p1 = poly1->GetPoint(i13); - if(i22 == (poly2->GetNumPoints()-1)) i23 = 0; - else i23 = i22+1; - p3 = poly2->GetPoint(i23); - - if(!IsConvex(p1,p2,p3)) continue; - - p2 = poly1->GetPoint(i12); - if(i12 == (poly1->GetNumPoints()-1)) i13 = 0; - else i13 = i12+1; - p3 = poly1->GetPoint(i13); - if(i21 == 0) i23 = poly2->GetNumPoints()-1; - else i23 = i21-1; - p1 = poly2->GetPoint(i23); - - if(!IsConvex(p1,p2,p3)) continue; - - newpoly.Init(poly1->GetNumPoints()+poly2->GetNumPoints()-2); - k = 0; - for(j=i12;j!=i11;j=(j+1)%(poly1->GetNumPoints())) { - newpoly[k] = poly1->GetPoint(j); - k++; - } - for(j=i22;j!=i21;j=(j+1)%(poly2->GetNumPoints())) { - newpoly[k] = poly2->GetPoint(j); - k++; - } - - triangles.erase(iter2); - *iter1 = newpoly; - poly1 = &(*iter1); - i11 = -1; - - continue; - } - } - - for(iter1 = triangles.begin(); iter1 != triangles.end(); ++iter1) { - parts->push_back(*iter1); - } - - return 1; -} - -int TPPLPartition::ConvexPartition_HM(list *inpolys, list *parts) { - list outpolys; - list::iterator iter; - - if(!RemoveHoles(inpolys,&outpolys)) return 0; - for(iter=outpolys.begin();iter!=outpolys.end();++iter) { - if(!ConvexPartition_HM(&(*iter),parts)) return 0; - } - return 1; -} - -//minimum-weight polygon triangulation by dynamic programming -//O(n^3) time complexity -//O(n^2) space complexity -int TPPLPartition::Triangulate_OPT(TPPLPoly *poly, list *triangles) { - long i,j,k,gap,n; - DPState **dpstates; - TPPLPoint p1,p2,p3,p4; - long bestvertex; - tppl_float weight,minweight,d1,d2; - Diagonal diagonal,newdiagonal; - list diagonals; - TPPLPoly triangle; - int ret = 1; - - n = poly->GetNumPoints(); - dpstates = new DPState *[n]; - for(i=1;iGetPoint(i); - for(j=i+1;jGetPoint(j); - - //visibility check - if(i==0) p3 = poly->GetPoint(n-1); - else p3 = poly->GetPoint(i-1); - if(i==(n-1)) p4 = poly->GetPoint(0); - else p4 = poly->GetPoint(i+1); - if(!InCone(p3,p1,p4,p2)) { - dpstates[j][i].visible = false; - continue; - } - - if(j==0) p3 = poly->GetPoint(n-1); - else p3 = poly->GetPoint(j-1); - if(j==(n-1)) p4 = poly->GetPoint(0); - else p4 = poly->GetPoint(j+1); - if(!InCone(p3,p2,p4,p1)) { - dpstates[j][i].visible = false; - continue; - } - - for(k=0;kGetPoint(k); - if(k==(n-1)) p4 = poly->GetPoint(0); - else p4 = poly->GetPoint(k+1); - if(Intersects(p1,p2,p3,p4)) { - dpstates[j][i].visible = false; - break; - } - } - } - } - } - dpstates[n-1][0].visible = true; - dpstates[n-1][0].weight = 0; - dpstates[n-1][0].bestvertex = -1; - - for(gap = 2; gapGetPoint(i),poly->GetPoint(k)); - if(j<=(k+1)) d2=0; - else d2 = Distance(poly->GetPoint(k),poly->GetPoint(j)); - - weight = dpstates[k][i].weight + dpstates[j][k].weight + d1 + d2; - - if((bestvertex == -1)||(weightGetPoint(diagonal.index1),poly->GetPoint(bestvertex),poly->GetPoint(diagonal.index2)); - triangles->push_back(triangle); - if(bestvertex > (diagonal.index1+1)) { - newdiagonal.index1 = diagonal.index1; - newdiagonal.index2 = bestvertex; - diagonals.push_back(newdiagonal); - } - if(diagonal.index2 > (bestvertex+1)) { - newdiagonal.index1 = bestvertex; - newdiagonal.index2 = diagonal.index2; - diagonals.push_back(newdiagonal); - } - } - - for(i=1;i *pairs; - long w2; - - w2 = dpstates[a][b].weight; - if(w>w2) return; - - pairs = &(dpstates[a][b].pairs); - newdiagonal.index1 = i; - newdiagonal.index2 = j; - - if(wclear(); - pairs->push_front(newdiagonal); - dpstates[a][b].weight = w; - } else { - if((!pairs->empty())&&(i <= pairs->begin()->index1)) return; - while((!pairs->empty())&&(pairs->begin()->index2 >= j)) pairs->pop_front(); - pairs->push_front(newdiagonal); - } -} - -void TPPLPartition::TypeA(long i, long j, long k, PartitionVertex *vertices, DPState2 **dpstates) { - list *pairs; - list::iterator iter,lastiter; - long top; - long w; - - if(!dpstates[i][j].visible) return; - top = j; - w = dpstates[i][j].weight; - if(k-j > 1) { - if (!dpstates[j][k].visible) return; - w += dpstates[j][k].weight + 1; - } - if(j-i > 1) { - pairs = &(dpstates[i][j].pairs); - iter = pairs->end(); - lastiter = pairs->end(); - while(iter!=pairs->begin()) { - --iter; - if(!IsReflex(vertices[iter->index2].p,vertices[j].p,vertices[k].p)) lastiter = iter; - else break; - } - if(lastiter == pairs->end()) w++; - else { - if(IsReflex(vertices[k].p,vertices[i].p,vertices[lastiter->index1].p)) w++; - else top = lastiter->index1; - } - } - UpdateState(i,k,w,top,j,dpstates); -} - -void TPPLPartition::TypeB(long i, long j, long k, PartitionVertex *vertices, DPState2 **dpstates) { - list *pairs; - list::iterator iter,lastiter; - long top; - long w; - - if(!dpstates[j][k].visible) return; - top = j; - w = dpstates[j][k].weight; - - if (j-i > 1) { - if (!dpstates[i][j].visible) return; - w += dpstates[i][j].weight + 1; - } - if (k-j > 1) { - pairs = &(dpstates[j][k].pairs); - - iter = pairs->begin(); - if((!pairs->empty())&&(!IsReflex(vertices[i].p,vertices[j].p,vertices[iter->index1].p))) { - lastiter = iter; - while(iter!=pairs->end()) { - if(!IsReflex(vertices[i].p,vertices[j].p,vertices[iter->index1].p)) { - lastiter = iter; - ++iter; - } - else break; - } - if(IsReflex(vertices[lastiter->index2].p,vertices[k].p,vertices[i].p)) w++; - else top = lastiter->index2; - } else w++; - } - UpdateState(i,k,w,j,top,dpstates); -} - -int TPPLPartition::ConvexPartition_OPT(TPPLPoly *poly, list *parts) { - TPPLPoint p1,p2,p3,p4; - PartitionVertex *vertices; - DPState2 **dpstates; - long i,j,k,n,gap; - list diagonals,diagonals2; - Diagonal diagonal,newdiagonal; - list *pairs,*pairs2; - list::iterator iter,iter2; - int ret; - TPPLPoly newpoly; - list indices; - list::iterator iiter; - bool ijreal,jkreal; - - n = poly->GetNumPoints(); - vertices = new PartitionVertex[n]; - - dpstates = new DPState2 *[n]; - for(i=0;iGetPoint(i); - vertices[i].isActive = true; - if(i==0) vertices[i].previous = &(vertices[n-1]); - else vertices[i].previous = &(vertices[i-1]); - if(i==(poly->GetNumPoints()-1)) vertices[i].next = &(vertices[0]); - else vertices[i].next = &(vertices[i+1]); - } - for(i=1;iGetPoint(i); - for(j=i+1;jGetPoint(j); - - //visibility check - if(!InCone(&vertices[i],p2)) { - dpstates[i][j].visible = false; - continue; - } - if(!InCone(&vertices[j],p1)) { - dpstates[i][j].visible = false; - continue; - } - - for(k=0;kGetPoint(k); - if(k==(n-1)) p4 = poly->GetPoint(0); - else p4 = poly->GetPoint(k+1); - if(Intersects(p1,p2,p3,p4)) { - dpstates[i][j].visible = false; - break; - } - } - } - } - } - for(i=0;i<(n-2);i++) { - j = i+2; - if(dpstates[i][j].visible) { - dpstates[i][j].weight = 0; - newdiagonal.index1 = i+1; - newdiagonal.index2 = i+1; - dpstates[i][j].pairs.push_back(newdiagonal); - } - } - - dpstates[0][n-1].visible = true; - vertices[0].isConvex = false; //by convention - - for(gap=3; gapempty()) { - ret = 0; - break; - } - if(!vertices[diagonal.index1].isConvex) { - iter = pairs->end(); - --iter; - j = iter->index2; - newdiagonal.index1 = j; - newdiagonal.index2 = diagonal.index2; - diagonals.push_front(newdiagonal); - if((j - diagonal.index1)>1) { - if(iter->index1 != iter->index2) { - pairs2 = &(dpstates[diagonal.index1][j].pairs); - while(1) { - if(pairs2->empty()) { - ret = 0; - break; - } - iter2 = pairs2->end(); - --iter2; - if(iter->index1 != iter2->index1) pairs2->pop_back(); - else break; - } - if(ret == 0) break; - } - newdiagonal.index1 = diagonal.index1; - newdiagonal.index2 = j; - diagonals.push_front(newdiagonal); - } - } else { - iter = pairs->begin(); - j = iter->index1; - newdiagonal.index1 = diagonal.index1; - newdiagonal.index2 = j; - diagonals.push_front(newdiagonal); - if((diagonal.index2 - j) > 1) { - if(iter->index1 != iter->index2) { - pairs2 = &(dpstates[j][diagonal.index2].pairs); - while(1) { - if(pairs2->empty()) { - ret = 0; - break; - } - iter2 = pairs2->begin(); - if(iter->index2 != iter2->index2) pairs2->pop_front(); - else break; - } - if(ret == 0) break; - } - newdiagonal.index1 = j; - newdiagonal.index2 = diagonal.index2; - diagonals.push_front(newdiagonal); - } - } - } - - if(ret == 0) { - for(i=0;iend(); - --iter; - j = iter->index2; - if(iter->index1 != iter->index2) ijreal = false; - } else { - iter = pairs->begin(); - j = iter->index1; - if(iter->index1 != iter->index2) jkreal = false; - } - - newdiagonal.index1 = diagonal.index1; - newdiagonal.index2 = j; - if(ijreal) { - diagonals.push_back(newdiagonal); - } else { - diagonals2.push_back(newdiagonal); - } - - newdiagonal.index1 = j; - newdiagonal.index2 = diagonal.index2; - if(jkreal) { - diagonals.push_back(newdiagonal); - } else { - diagonals2.push_back(newdiagonal); - } - - indices.push_back(j); - } - - indices.sort(); - newpoly.Init((long)indices.size()); - k=0; - for(iiter = indices.begin();iiter!=indices.end(); ++iiter) { - newpoly[k] = vertices[*iiter].p; - k++; - } - parts->push_back(newpoly); - } - - for(i=0;i *inpolys, list *monotonePolys) { - list::iterator iter; - MonotoneVertex *vertices; - long i,numvertices,vindex,vindex2,newnumvertices,maxnumvertices; - long polystartindex, polyendindex; - TPPLPoly *poly; - MonotoneVertex *v,*v2,*vprev,*vnext; - ScanLineEdge newedge; - bool error = false; - - numvertices = 0; - for(iter = inpolys->begin(); iter != inpolys->end(); ++iter) { - numvertices += iter->GetNumPoints(); - } - - maxnumvertices = numvertices*3; - vertices = new MonotoneVertex[maxnumvertices]; - newnumvertices = numvertices; - - polystartindex = 0; - for(iter = inpolys->begin(); iter != inpolys->end(); ++iter) { - poly = &(*iter); - polyendindex = polystartindex + poly->GetNumPoints()-1; - for(i=0;iGetNumPoints();i++) { - vertices[i+polystartindex].p = poly->GetPoint(i); - if(i==0) vertices[i+polystartindex].previous = polyendindex; - else vertices[i+polystartindex].previous = i+polystartindex-1; - if(i==(poly->GetNumPoints()-1)) vertices[i+polystartindex].next = polystartindex; - else vertices[i+polystartindex].next = i+polystartindex+1; - } - polystartindex = polyendindex+1; - } - - //construct the priority queue - long *priority = new long [numvertices]; - for(i=0;iprevious]); - vnext = &(vertices[v->next]); - - if(Below(vprev->p,v->p)&&Below(vnext->p,v->p)) { - if(IsConvex(vnext->p,vprev->p,v->p)) { - vertextypes[i] = TPPL_VERTEXTYPE_START; - } else { - vertextypes[i] = TPPL_VERTEXTYPE_SPLIT; - } - } else if(Below(v->p,vprev->p)&&Below(v->p,vnext->p)) { - if(IsConvex(vnext->p,vprev->p,v->p)) - { - vertextypes[i] = TPPL_VERTEXTYPE_END; - } else { - vertextypes[i] = TPPL_VERTEXTYPE_MERGE; - } - } else { - vertextypes[i] = TPPL_VERTEXTYPE_REGULAR; - } - } - - //helpers - long *helpers = new long[maxnumvertices]; - - //binary search tree that holds edges intersecting the scanline - //note that while set doesn't actually have to be implemented as a tree - //complexity requirements for operations are the same as for the balanced binary search tree - set edgeTree; - //store iterators to the edge tree elements - //this makes deleting existing edges much faster - set::iterator *edgeTreeIterators,edgeIter; - edgeTreeIterators = new set::iterator[maxnumvertices]; - pair::iterator,bool> edgeTreeRet; - - //for each vertex - for(i=0;ip; - newedge.p2 = vertices[v->next].p; - newedge.index = vindex; - edgeTreeRet = edgeTree.insert(newedge); - edgeTreeIterators[vindex] = edgeTreeRet.first; - helpers[vindex] = vindex; - break; - - case TPPL_VERTEXTYPE_END: - //if helper(ei-1) is a merge vertex - if(vertextypes[helpers[v->previous]]==TPPL_VERTEXTYPE_MERGE) { - //Insert the diagonal connecting vi to helper(ei-1) in D. - AddDiagonal(vertices,&newnumvertices,vindex,helpers[v->previous]); - vertextypes[newnumvertices-2] = vertextypes[vindex]; - edgeTreeIterators[newnumvertices-2] = edgeTreeIterators[vindex]; - helpers[newnumvertices-2] = helpers[vindex]; - vertextypes[newnumvertices-1] = vertextypes[helpers[v->previous]]; - edgeTreeIterators[newnumvertices-1] = edgeTreeIterators[helpers[v->previous]]; - helpers[newnumvertices-1] = helpers[helpers[v->previous]]; - } - //Delete ei-1 from T - edgeTree.erase(edgeTreeIterators[v->previous]); - break; - - case TPPL_VERTEXTYPE_SPLIT: - //Search in T to find the edge e j directly left of vi. - newedge.p1 = v->p; - newedge.p2 = v->p; - edgeIter = edgeTree.lower_bound(newedge); - if(edgeIter == edgeTree.begin()) { - error = true; - break; - } - --edgeIter; - //Insert the diagonal connecting vi to helper(ej) in D. - AddDiagonal(vertices,&newnumvertices,vindex,helpers[edgeIter->index]); - vertextypes[newnumvertices-2] = vertextypes[vindex]; - edgeTreeIterators[newnumvertices-2] = edgeTreeIterators[vindex]; - helpers[newnumvertices-2] = helpers[vindex]; - vertextypes[newnumvertices-1] = vertextypes[helpers[edgeIter->index]]; - edgeTreeIterators[newnumvertices-1] = edgeTreeIterators[helpers[edgeIter->index]]; - helpers[newnumvertices-1] = helpers[helpers[edgeIter->index]]; - vindex2 = newnumvertices-2; - v2 = &(vertices[vindex2]); - //helper(e j)�vi - helpers[edgeIter->index] = vindex; - //Insert ei in T and set helper(ei) to vi. - newedge.p1 = v2->p; - newedge.p2 = vertices[v2->next].p; - newedge.index = vindex2; - edgeTreeRet = edgeTree.insert(newedge); - edgeTreeIterators[vindex2] = edgeTreeRet.first; - helpers[vindex2] = vindex2; - break; - - case TPPL_VERTEXTYPE_MERGE: - //if helper(ei-1) is a merge vertex - if(vertextypes[helpers[v->previous]]==TPPL_VERTEXTYPE_MERGE) { - //Insert the diagonal connecting vi to helper(ei-1) in D. - AddDiagonal(vertices,&newnumvertices,vindex,helpers[v->previous]); - vertextypes[newnumvertices-2] = vertextypes[vindex]; - edgeTreeIterators[newnumvertices-2] = edgeTreeIterators[vindex]; - helpers[newnumvertices-2] = helpers[vindex]; - vertextypes[newnumvertices-1] = vertextypes[helpers[v->previous]]; - edgeTreeIterators[newnumvertices-1] = edgeTreeIterators[helpers[v->previous]]; - helpers[newnumvertices-1] = helpers[helpers[v->previous]]; - vindex2 = newnumvertices-2; - v2 = &(vertices[vindex2]); - } - //Delete ei-1 from T. - edgeTree.erase(edgeTreeIterators[v->previous]); - //Search in T to find the edge e j directly left of vi. - newedge.p1 = v->p; - newedge.p2 = v->p; - edgeIter = edgeTree.lower_bound(newedge); - if(edgeIter == edgeTree.begin()) { - error = true; - break; - } - --edgeIter; - //if helper(ej) is a merge vertex - if(vertextypes[helpers[edgeIter->index]]==TPPL_VERTEXTYPE_MERGE) { - //Insert the diagonal connecting vi to helper(e j) in D. - AddDiagonal(vertices,&newnumvertices,vindex2,helpers[edgeIter->index]); - vertextypes[newnumvertices-2] = vertextypes[vindex2]; - edgeTreeIterators[newnumvertices-2] = edgeTreeIterators[vindex2]; - helpers[newnumvertices-2] = helpers[vindex2]; - vertextypes[newnumvertices-1] = vertextypes[helpers[edgeIter->index]]; - edgeTreeIterators[newnumvertices-1] = edgeTreeIterators[helpers[edgeIter->index]]; - helpers[newnumvertices-1] = helpers[helpers[edgeIter->index]]; - } - //helper(e j)�vi - helpers[edgeIter->index] = vindex2; - break; - - case TPPL_VERTEXTYPE_REGULAR: - //if the interior of P lies to the right of vi - if(Below(v->p,vertices[v->previous].p)) { - //if helper(ei-1) is a merge vertex - if(vertextypes[helpers[v->previous]]==TPPL_VERTEXTYPE_MERGE) { - //Insert the diagonal connecting vi to helper(ei-1) in D. - AddDiagonal(vertices,&newnumvertices,vindex,helpers[v->previous]); - vertextypes[newnumvertices-2] = vertextypes[vindex]; - edgeTreeIterators[newnumvertices-2] = edgeTreeIterators[vindex]; - helpers[newnumvertices-2] = helpers[vindex]; - vertextypes[newnumvertices-1] = vertextypes[helpers[v->previous]]; - edgeTreeIterators[newnumvertices-1] = edgeTreeIterators[helpers[v->previous]]; - helpers[newnumvertices-1] = helpers[helpers[v->previous]]; - vindex2 = newnumvertices-2; - v2 = &(vertices[vindex2]); - } - //Delete ei-1 from T. - edgeTree.erase(edgeTreeIterators[v->previous]); - //Insert ei in T and set helper(ei) to vi. - newedge.p1 = v2->p; - newedge.p2 = vertices[v2->next].p; - newedge.index = vindex2; - edgeTreeRet = edgeTree.insert(newedge); - edgeTreeIterators[vindex2] = edgeTreeRet.first; - helpers[vindex2] = vindex; - } else { - //Search in T to find the edge ej directly left of vi. - newedge.p1 = v->p; - newedge.p2 = v->p; - edgeIter = edgeTree.lower_bound(newedge); - if(edgeIter == edgeTree.begin()) { - error = true; - break; - } - --edgeIter; - //if helper(ej) is a merge vertex - if(vertextypes[helpers[edgeIter->index]]==TPPL_VERTEXTYPE_MERGE) { - //Insert the diagonal connecting vi to helper(e j) in D. - AddDiagonal(vertices,&newnumvertices,vindex,helpers[edgeIter->index]); - vertextypes[newnumvertices-2] = vertextypes[vindex]; - edgeTreeIterators[newnumvertices-2] = edgeTreeIterators[vindex]; - helpers[newnumvertices-2] = helpers[vindex]; - vertextypes[newnumvertices-1] = vertextypes[helpers[edgeIter->index]]; - edgeTreeIterators[newnumvertices-1] = edgeTreeIterators[helpers[edgeIter->index]]; - helpers[newnumvertices-1] = helpers[helpers[edgeIter->index]]; - } - //helper(e j)�vi - helpers[edgeIter->index] = vindex; - } - break; - } - - if(error) break; - } - - char *used = new char[newnumvertices]; - memset(used,0,newnumvertices*sizeof(char)); - - if(!error) { - //return result - long size; - TPPLPoly mpoly; - for(i=0;inext]); - size = 1; - while(vnext!=v) { - vnext = &(vertices[vnext->next]); - size++; - } - mpoly.Init(size); - v = &(vertices[i]); - mpoly[0] = v->p; - vnext = &(vertices[v->next]); - size = 1; - used[i] = 1; - used[v->next] = 1; - while(vnext!=v) { - mpoly[size] = vnext->p; - used[vnext->next] = 1; - vnext = &(vertices[vnext->next]); - size++; - } - monotonePolys->push_back(mpoly); - } - } - - //cleanup - delete [] vertices; - delete [] priority; - delete [] vertextypes; - delete [] edgeTreeIterators; - delete [] helpers; - delete [] used; - - if(error) { - return 0; - } else { - return 1; - } -} - -//adds a diagonal to the doubly-connected list of vertices -void TPPLPartition::AddDiagonal(MonotoneVertex *vertices, long *numvertices, long index1, long index2) { - long newindex1,newindex2; - - newindex1 = *numvertices; - (*numvertices)++; - newindex2 = *numvertices; - (*numvertices)++; - - vertices[newindex1].p = vertices[index1].p; - vertices[newindex2].p = vertices[index2].p; - - vertices[newindex2].next = vertices[index2].next; - vertices[newindex1].next = vertices[index1].next; - - vertices[vertices[index2].next].previous = newindex2; - vertices[vertices[index1].next].previous = newindex1; - - vertices[index1].next = newindex2; - vertices[newindex2].previous = index1; - - vertices[index2].next = newindex1; - vertices[newindex1].previous = index2; -} - -bool TPPLPartition::Below(TPPLPoint &p1, TPPLPoint &p2) { - if(p1.y < p2.y) return true; - else if(p1.y == p2.y) { - if(p1.x < p2.x) return true; - } - return false; -} - -//sorts in the falling order of y values, if y is equal, x is used instead -bool TPPLPartition::VertexSorter::operator() (long index1, long index2) const { - if(vertices[index1].p.y > vertices[index2].p.y) return true; - else if(vertices[index1].p.y == vertices[index2].p.y) { - if(vertices[index1].p.x > vertices[index2].p.x) return true; - } - return false; -} - -bool TPPLPartition::ScanLineEdge::IsConvex(const TPPLPoint& p1, const TPPLPoint& p2, const TPPLPoint& p3) const { - tppl_float tmp; - tmp = (p3.y-p1.y)*(p2.x-p1.x)-(p3.x-p1.x)*(p2.y-p1.y); - if(tmp>0) return 1; - else return 0; -} - -bool TPPLPartition::ScanLineEdge::operator < (const ScanLineEdge & other) const { - if(other.p1.y == other.p2.y) { - if(p1.y == p2.y) { - if(p1.y < other.p1.y) return true; - else return false; - } - if(IsConvex(p1,p2,other.p1)) return true; - else return false; - } else if(p1.y == p2.y) { - if(IsConvex(other.p1,other.p2,p1)) return false; - else return true; - } else if(p1.y < other.p1.y) { - if(IsConvex(other.p1,other.p2,p1)) return false; - else return true; - } else { - if(IsConvex(p1,p2,other.p1)) return true; - else return false; - } -} - -//triangulates monotone polygon -//O(n) time, O(n) space complexity -int TPPLPartition::TriangulateMonotone(TPPLPoly *inPoly, list *triangles) { - long i,i2,j,topindex,bottomindex,leftindex,rightindex,vindex; - TPPLPoint *points; - long numpoints; - TPPLPoly triangle; - - numpoints = inPoly->GetNumPoints(); - points = inPoly->GetPoints(); - - //trivial calses - if(numpoints < 3) return 0; - if(numpoints == 3) { - triangles->push_back(*inPoly); - } - - topindex = 0; bottomindex=0; - for(i=1;i=numpoints) i2 = 0; - if(!Below(points[i2],points[i])) return 0; - i = i2; - } - i = bottomindex; - while(i!=topindex) { - i2 = i+1; if(i2>=numpoints) i2 = 0; - if(!Below(points[i],points[i2])) return 0; - i = i2; - } - - char *vertextypes = new char[numpoints]; - long *priority = new long[numpoints]; - - //merge left and right vertex chains - priority[0] = topindex; - vertextypes[topindex] = 0; - leftindex = topindex+1; if(leftindex>=numpoints) leftindex = 0; - rightindex = topindex-1; if(rightindex<0) rightindex = numpoints-1; - for(i=1;i<(numpoints-1);i++) { - if(leftindex==bottomindex) { - priority[i] = rightindex; - rightindex--; if(rightindex<0) rightindex = numpoints-1; - vertextypes[priority[i]] = -1; - } else if(rightindex==bottomindex) { - priority[i] = leftindex; - leftindex++; if(leftindex>=numpoints) leftindex = 0; - vertextypes[priority[i]] = 1; - } else { - if(Below(points[leftindex],points[rightindex])) { - priority[i] = rightindex; - rightindex--; if(rightindex<0) rightindex = numpoints-1; - vertextypes[priority[i]] = -1; - } else { - priority[i] = leftindex; - leftindex++; if(leftindex>=numpoints) leftindex = 0; - vertextypes[priority[i]] = 1; - } - } - } - priority[i] = bottomindex; - vertextypes[bottomindex] = 0; - - long *stack = new long[numpoints]; - long stackptr = 0; - - stack[0] = priority[0]; - stack[1] = priority[1]; - stackptr = 2; - - //for each vertex from top to bottom trim as many triangles as possible - for(i=2;i<(numpoints-1);i++) { - vindex = priority[i]; - if(vertextypes[vindex]!=vertextypes[stack[stackptr-1]]) { - for(j=0;j<(stackptr-1);j++) { - if(vertextypes[vindex]==1) { - triangle.Triangle(points[stack[j+1]],points[stack[j]],points[vindex]); - } else { - triangle.Triangle(points[stack[j]],points[stack[j+1]],points[vindex]); - } - triangles->push_back(triangle); - } - stack[0] = priority[i-1]; - stack[1] = priority[i]; - stackptr = 2; - } else { - stackptr--; - while(stackptr>0) { - if(vertextypes[vindex]==1) { - if(IsConvex(points[vindex],points[stack[stackptr-1]],points[stack[stackptr]])) { - triangle.Triangle(points[vindex],points[stack[stackptr-1]],points[stack[stackptr]]); - triangles->push_back(triangle); - stackptr--; - } else { - break; - } - } else { - if(IsConvex(points[vindex],points[stack[stackptr]],points[stack[stackptr-1]])) { - triangle.Triangle(points[vindex],points[stack[stackptr]],points[stack[stackptr-1]]); - triangles->push_back(triangle); - stackptr--; - } else { - break; - } - } - } - stackptr++; - stack[stackptr] = vindex; - stackptr++; - } - } - vindex = priority[i]; - for(j=0;j<(stackptr-1);j++) { - if(vertextypes[stack[j+1]]==1) { - triangle.Triangle(points[stack[j]],points[stack[j+1]],points[vindex]); - } else { - triangle.Triangle(points[stack[j+1]],points[stack[j]],points[vindex]); - } - triangles->push_back(triangle); - } - - delete [] priority; - delete [] vertextypes; - delete [] stack; - - return 1; -} - -int TPPLPartition::Triangulate_MONO(list *inpolys, list *triangles) { - list monotone; - list::iterator iter; - - if(!MonotonePartition(inpolys,&monotone)) return 0; - for(iter = monotone.begin(); iter!=monotone.end(); ++iter) { - if(!TriangulateMonotone(&(*iter),triangles)) return 0; - } - return 1; -} - -int TPPLPartition::Triangulate_MONO(TPPLPoly *poly, list *triangles) { - list polys; - polys.push_back(*poly); - - return Triangulate_MONO(&polys, triangles); -} +//Copyright (C) 2011 by Ivan Fratric +// +//Permission is hereby granted, free of charge, to any person obtaining a copy +//of this software and associated documentation files (the "Software"), to deal +//in the Software without restriction, including without limitation the rights +//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +//copies of the Software, and to permit persons to whom the Software is +//furnished to do so, subject to the following conditions: +// +//The above copyright notice and this permission notice shall be included in +//all copies or substantial portions of the Software. +// +//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +//THE SOFTWARE. + + +#include +#include +#include +#include +#include +#include + +using namespace std; + +#include "polypartition.h" + +#define TPPL_VERTEXTYPE_REGULAR 0 +#define TPPL_VERTEXTYPE_START 1 +#define TPPL_VERTEXTYPE_END 2 +#define TPPL_VERTEXTYPE_SPLIT 3 +#define TPPL_VERTEXTYPE_MERGE 4 + +TPPLPoly::TPPLPoly() { + hole = false; + numpoints = 0; + points = NULL; +} + +TPPLPoly::~TPPLPoly() { + if(points) delete [] points; +} + +void TPPLPoly::Clear() { + if(points) delete [] points; + hole = false; + numpoints = 0; + points = NULL; +} + +void TPPLPoly::Init(long numpoints) { + Clear(); + this->numpoints = numpoints; + points = new TPPLPoint[numpoints]; +} + +void TPPLPoly::Triangle(TPPLPoint &p1, TPPLPoint &p2, TPPLPoint &p3) { + Init(3); + points[0] = p1; + points[1] = p2; + points[2] = p3; +} + +TPPLPoly::TPPLPoly(const TPPLPoly &src) { + hole = src.hole; + numpoints = src.numpoints; + points = new TPPLPoint[numpoints]; + memcpy(points, src.points, numpoints*sizeof(TPPLPoint)); +} + +TPPLPoly& TPPLPoly::operator=(const TPPLPoly &src) { + if(&src != this) { + Clear(); + hole = src.hole; + numpoints = src.numpoints; + points = new TPPLPoint[numpoints]; + memcpy(points, src.points, numpoints*sizeof(TPPLPoint)); + } + return *this; +} + +int TPPLPoly::GetOrientation() const { + long i1,i2; + tppl_float area = 0; + for(i1=0; i10) return TPPL_CCW; + if(area<0) return TPPL_CW; + return 0; +} + +void TPPLPoly::SetOrientation(int orientation) { + int polyorientation = GetOrientation(); + if(polyorientation&&(polyorientation!=orientation)) { + Invert(); + } +} + +void TPPLPoly::Invert() { + long i; + TPPLPoint *invpoints; + + invpoints = new TPPLPoint[numpoints]; + for(i=0;i0) return 0; + if(dot21*dot22>0) return 0; + + return 1; +} + +//removes holes from inpolys by merging them with non-holes +int TPPLPartition::RemoveHoles(list *inpolys, list *outpolys) { + list polys; + list::iterator holeiter,polyiter,iter,iter2; + long i,i2,holepointindex,polypointindex = 0; + TPPLPoint holepoint,polypoint,bestpolypoint; + TPPLPoint linep1,linep2; + TPPLPoint v1,v2; + TPPLPoly newpoly; + bool hasholes; + bool pointvisible; + bool pointfound; + + //check for trivial case (no holes) + hasholes = false; + for(iter = inpolys->begin(); iter!=inpolys->end(); ++iter) { + if(iter->IsHole()) { + hasholes = true; + break; + } + } + if(!hasholes) { + for(iter = inpolys->begin(); iter!=inpolys->end(); ++iter) { + outpolys->push_back(*iter); + } + return 1; + } + + polys = *inpolys; + + while(1) { + //find the hole point with the largest x + hasholes = false; + for(iter = polys.begin(); iter!=polys.end(); ++iter) { + if(!iter->IsHole()) continue; + + if(!hasholes) { + hasholes = true; + holeiter = iter; + holepointindex = 0; + } + + for(i=0; i < iter->GetNumPoints(); i++) { + if(iter->GetPoint(i).x > holeiter->GetPoint(holepointindex).x) { + holeiter = iter; + holepointindex = i; + } + } + } + if(!hasholes) break; + holepoint = holeiter->GetPoint(holepointindex); + + pointfound = false; + for(iter = polys.begin(); iter!=polys.end(); ++iter) { + if(iter->IsHole()) continue; + for(i=0; i < iter->GetNumPoints(); i++) { + if(iter->GetPoint(i).x <= holepoint.x) continue; + if(!InCone(iter->GetPoint((i+iter->GetNumPoints()-1)%(iter->GetNumPoints())), + iter->GetPoint(i), + iter->GetPoint((i+1)%(iter->GetNumPoints())), + holepoint)) + continue; + polypoint = iter->GetPoint(i); + if(pointfound) { + v1 = Normalize(polypoint-holepoint); + v2 = Normalize(bestpolypoint-holepoint); + if(v2.x > v1.x) continue; + } + pointvisible = true; + for(iter2 = polys.begin(); iter2!=polys.end(); ++iter2) { + if(iter2->IsHole()) continue; + for(i2=0; i2 < iter2->GetNumPoints(); i2++) { + linep1 = iter2->GetPoint(i2); + linep2 = iter2->GetPoint((i2+1)%(iter2->GetNumPoints())); + if(Intersects(holepoint,polypoint,linep1,linep2)) { + pointvisible = false; + break; + } + } + if(!pointvisible) break; + } + if(pointvisible) { + pointfound = true; + bestpolypoint = polypoint; + polyiter = iter; + polypointindex = i; + } + } + } + + if(!pointfound) return 0; + + newpoly.Init(holeiter->GetNumPoints() + polyiter->GetNumPoints() + 2); + i2 = 0; + for(i=0;i<=polypointindex;i++) { + newpoly[i2] = polyiter->GetPoint(i); + i2++; + } + for(i=0;i<=holeiter->GetNumPoints();i++) { + newpoly[i2] = holeiter->GetPoint((i+holepointindex)%holeiter->GetNumPoints()); + i2++; + } + for(i=polypointindex;iGetNumPoints();i++) { + newpoly[i2] = polyiter->GetPoint(i); + i2++; + } + + polys.erase(holeiter); + polys.erase(polyiter); + polys.push_back(newpoly); + } + + for(iter = polys.begin(); iter!=polys.end(); ++iter) { + outpolys->push_back(*iter); + } + + return 1; +} + +bool TPPLPartition::IsConvex(TPPLPoint& p1, TPPLPoint& p2, TPPLPoint& p3) { + tppl_float tmp; + tmp = (p3.y-p1.y)*(p2.x-p1.x)-(p3.x-p1.x)*(p2.y-p1.y); + if(tmp>0) return 1; + else return 0; +} + +bool TPPLPartition::IsReflex(TPPLPoint& p1, TPPLPoint& p2, TPPLPoint& p3) { + tppl_float tmp; + tmp = (p3.y-p1.y)*(p2.x-p1.x)-(p3.x-p1.x)*(p2.y-p1.y); + if(tmp<0) return 1; + else return 0; +} + +bool TPPLPartition::IsInside(TPPLPoint& p1, TPPLPoint& p2, TPPLPoint& p3, TPPLPoint &p) { + if(IsConvex(p1,p,p2)) return false; + if(IsConvex(p2,p,p3)) return false; + if(IsConvex(p3,p,p1)) return false; + return true; +} + +bool TPPLPartition::InCone(TPPLPoint &p1, TPPLPoint &p2, TPPLPoint &p3, TPPLPoint &p) { + bool convex; + + convex = IsConvex(p1,p2,p3); + + if(convex) { + if(!IsConvex(p1,p2,p)) return false; + if(!IsConvex(p2,p3,p)) return false; + return true; + } else { + if(IsConvex(p1,p2,p)) return true; + if(IsConvex(p2,p3,p)) return true; + return false; + } +} + +bool TPPLPartition::InCone(PartitionVertex *v, TPPLPoint &p) { + TPPLPoint p1,p2,p3; + + p1 = v->previous->p; + p2 = v->p; + p3 = v->next->p; + + return InCone(p1,p2,p3,p); +} + +void TPPLPartition::UpdateVertexReflexity(PartitionVertex *v) { + PartitionVertex *v1,*v3; + v1 = v->previous; + v3 = v->next; + v->isConvex = !IsReflex(v1->p,v->p,v3->p); +} + +void TPPLPartition::UpdateVertex(PartitionVertex *v, PartitionVertex *vertices, long numvertices) { + long i; + PartitionVertex *v1,*v3; + TPPLPoint vec1,vec3; + + v1 = v->previous; + v3 = v->next; + + v->isConvex = IsConvex(v1->p,v->p,v3->p); + + vec1 = Normalize(v1->p - v->p); + vec3 = Normalize(v3->p - v->p); + v->angle = vec1.x*vec3.x + vec1.y*vec3.y; + + if(v->isConvex) { + v->isEar = true; + for(i=0;ip.x)&&(vertices[i].p.y==v->p.y)) continue; + if((vertices[i].p.x==v1->p.x)&&(vertices[i].p.y==v1->p.y)) continue; + if((vertices[i].p.x==v3->p.x)&&(vertices[i].p.y==v3->p.y)) continue; + if(IsInside(v1->p,v->p,v3->p,vertices[i].p)) { + v->isEar = false; + break; + } + } + } else { + v->isEar = false; + } +} + +//triangulation by ear removal +int TPPLPartition::Triangulate_EC(TPPLPoly *poly, list *triangles) { + long numvertices; + PartitionVertex *vertices; + PartitionVertex *ear; + TPPLPoly triangle; + long i,j; + bool earfound; + + if(poly->GetNumPoints() < 3) return 0; + if(poly->GetNumPoints() == 3) { + triangles->push_back(*poly); + return 1; + } + + numvertices = poly->GetNumPoints(); + + vertices = new PartitionVertex[numvertices]; + for(i=0;iGetPoint(i); + if(i==(numvertices-1)) vertices[i].next=&(vertices[0]); + else vertices[i].next=&(vertices[i+1]); + if(i==0) vertices[i].previous = &(vertices[numvertices-1]); + else vertices[i].previous = &(vertices[i-1]); + } + for(i=0;i ear->angle) { + ear = &(vertices[j]); + } + } + } + if(!earfound) { + delete [] vertices; + return 0; + } + + triangle.Triangle(ear->previous->p,ear->p,ear->next->p); + triangles->push_back(triangle); + + ear->isActive = false; + ear->previous->next = ear->next; + ear->next->previous = ear->previous; + + if(i==numvertices-4) break; + + UpdateVertex(ear->previous,vertices,numvertices); + UpdateVertex(ear->next,vertices,numvertices); + } + for(i=0;ip,vertices[i].p,vertices[i].next->p); + triangles->push_back(triangle); + break; + } + } + + delete [] vertices; + + return 1; +} + +int TPPLPartition::Triangulate_EC(list *inpolys, list *triangles) { + list outpolys; + list::iterator iter; + + if(!RemoveHoles(inpolys,&outpolys)) return 0; + for(iter=outpolys.begin();iter!=outpolys.end();++iter) { + if(!Triangulate_EC(&(*iter),triangles)) return 0; + } + return 1; +} + +int TPPLPartition::ConvexPartition_HM(TPPLPoly *poly, list *parts) { + list triangles; + list::iterator iter1,iter2; + TPPLPoly *poly1,*poly2; + TPPLPoly newpoly; + TPPLPoint d1,d2,p1,p2,p3; + long i11,i12,i21,i22,i13,i23,j,k; + bool isdiagonal; + long numreflex; + + //check if the poly is already convex + numreflex = 0; + for(i11=0;i11GetNumPoints();i11++) { + if(i11==0) i12 = poly->GetNumPoints()-1; + else i12=i11-1; + if(i11==(poly->GetNumPoints()-1)) i13=0; + else i13=i11+1; + if(IsReflex(poly->GetPoint(i12),poly->GetPoint(i11),poly->GetPoint(i13))) { + numreflex = 1; + break; + } + } + if(numreflex == 0) { + parts->push_back(*poly); + return 1; + } + + if(!Triangulate_EC(poly,&triangles)) return 0; + + for(iter1 = triangles.begin(); iter1 != triangles.end(); ++iter1) { + poly1 = &(*iter1); + for(i11=0;i11GetNumPoints();i11++) { + d1 = poly1->GetPoint(i11); + i12 = (i11+1)%(poly1->GetNumPoints()); + d2 = poly1->GetPoint(i12); + + isdiagonal = false; + for(iter2 = iter1; iter2 != triangles.end(); ++iter2) { + if(iter1 == iter2) continue; + poly2 = &(*iter2); + + for(i21=0;i21GetNumPoints();i21++) { + if((d2.x != poly2->GetPoint(i21).x)||(d2.y != poly2->GetPoint(i21).y)) continue; + i22 = (i21+1)%(poly2->GetNumPoints()); + if((d1.x != poly2->GetPoint(i22).x)||(d1.y != poly2->GetPoint(i22).y)) continue; + isdiagonal = true; + break; + } + if(isdiagonal) break; + } + + if(!isdiagonal) continue; + + p2 = poly1->GetPoint(i11); + if(i11 == 0) i13 = poly1->GetNumPoints()-1; + else i13 = i11-1; + p1 = poly1->GetPoint(i13); + if(i22 == (poly2->GetNumPoints()-1)) i23 = 0; + else i23 = i22+1; + p3 = poly2->GetPoint(i23); + + if(!IsConvex(p1,p2,p3)) continue; + + p2 = poly1->GetPoint(i12); + if(i12 == (poly1->GetNumPoints()-1)) i13 = 0; + else i13 = i12+1; + p3 = poly1->GetPoint(i13); + if(i21 == 0) i23 = poly2->GetNumPoints()-1; + else i23 = i21-1; + p1 = poly2->GetPoint(i23); + + if(!IsConvex(p1,p2,p3)) continue; + + newpoly.Init(poly1->GetNumPoints()+poly2->GetNumPoints()-2); + k = 0; + for(j=i12;j!=i11;j=(j+1)%(poly1->GetNumPoints())) { + newpoly[k] = poly1->GetPoint(j); + k++; + } + for(j=i22;j!=i21;j=(j+1)%(poly2->GetNumPoints())) { + newpoly[k] = poly2->GetPoint(j); + k++; + } + + triangles.erase(iter2); + *iter1 = newpoly; + poly1 = &(*iter1); + i11 = -1; + + continue; + } + } + + for(iter1 = triangles.begin(); iter1 != triangles.end(); ++iter1) { + parts->push_back(*iter1); + } + + return 1; +} + +int TPPLPartition::ConvexPartition_HM(list *inpolys, list *parts) { + list outpolys; + list::iterator iter; + + if(!RemoveHoles(inpolys,&outpolys)) return 0; + for(iter=outpolys.begin();iter!=outpolys.end();++iter) { + if(!ConvexPartition_HM(&(*iter),parts)) return 0; + } + return 1; +} + +//minimum-weight polygon triangulation by dynamic programming +//O(n^3) time complexity +//O(n^2) space complexity +int TPPLPartition::Triangulate_OPT(TPPLPoly *poly, list *triangles) { + long i,j,k,gap,n; + DPState **dpstates; + TPPLPoint p1,p2,p3,p4; + long bestvertex; + tppl_float weight,minweight,d1,d2; + Diagonal diagonal,newdiagonal; + list diagonals; + TPPLPoly triangle; + int ret = 1; + + n = poly->GetNumPoints(); + dpstates = new DPState *[n]; + for(i=1;iGetPoint(i); + for(j=i+1;jGetPoint(j); + + //visibility check + if(i==0) p3 = poly->GetPoint(n-1); + else p3 = poly->GetPoint(i-1); + if(i==(n-1)) p4 = poly->GetPoint(0); + else p4 = poly->GetPoint(i+1); + if(!InCone(p3,p1,p4,p2)) { + dpstates[j][i].visible = false; + continue; + } + + if(j==0) p3 = poly->GetPoint(n-1); + else p3 = poly->GetPoint(j-1); + if(j==(n-1)) p4 = poly->GetPoint(0); + else p4 = poly->GetPoint(j+1); + if(!InCone(p3,p2,p4,p1)) { + dpstates[j][i].visible = false; + continue; + } + + for(k=0;kGetPoint(k); + if(k==(n-1)) p4 = poly->GetPoint(0); + else p4 = poly->GetPoint(k+1); + if(Intersects(p1,p2,p3,p4)) { + dpstates[j][i].visible = false; + break; + } + } + } + } + } + dpstates[n-1][0].visible = true; + dpstates[n-1][0].weight = 0; + dpstates[n-1][0].bestvertex = -1; + + for(gap = 2; gapGetPoint(i),poly->GetPoint(k)); + if(j<=(k+1)) d2=0; + else d2 = Distance(poly->GetPoint(k),poly->GetPoint(j)); + + weight = dpstates[k][i].weight + dpstates[j][k].weight + d1 + d2; + + if((bestvertex == -1)||(weightGetPoint(diagonal.index1),poly->GetPoint(bestvertex),poly->GetPoint(diagonal.index2)); + triangles->push_back(triangle); + if(bestvertex > (diagonal.index1+1)) { + newdiagonal.index1 = diagonal.index1; + newdiagonal.index2 = bestvertex; + diagonals.push_back(newdiagonal); + } + if(diagonal.index2 > (bestvertex+1)) { + newdiagonal.index1 = bestvertex; + newdiagonal.index2 = diagonal.index2; + diagonals.push_back(newdiagonal); + } + } + + for(i=1;i *pairs; + long w2; + + w2 = dpstates[a][b].weight; + if(w>w2) return; + + pairs = &(dpstates[a][b].pairs); + newdiagonal.index1 = i; + newdiagonal.index2 = j; + + if(wclear(); + pairs->push_front(newdiagonal); + dpstates[a][b].weight = w; + } else { + if((!pairs->empty())&&(i <= pairs->begin()->index1)) return; + while((!pairs->empty())&&(pairs->begin()->index2 >= j)) pairs->pop_front(); + pairs->push_front(newdiagonal); + } +} + +void TPPLPartition::TypeA(long i, long j, long k, PartitionVertex *vertices, DPState2 **dpstates) { + list *pairs; + list::iterator iter,lastiter; + long top; + long w; + + if(!dpstates[i][j].visible) return; + top = j; + w = dpstates[i][j].weight; + if(k-j > 1) { + if (!dpstates[j][k].visible) return; + w += dpstates[j][k].weight + 1; + } + if(j-i > 1) { + pairs = &(dpstates[i][j].pairs); + iter = pairs->end(); + lastiter = pairs->end(); + while(iter!=pairs->begin()) { + --iter; + if(!IsReflex(vertices[iter->index2].p,vertices[j].p,vertices[k].p)) lastiter = iter; + else break; + } + if(lastiter == pairs->end()) w++; + else { + if(IsReflex(vertices[k].p,vertices[i].p,vertices[lastiter->index1].p)) w++; + else top = lastiter->index1; + } + } + UpdateState(i,k,w,top,j,dpstates); +} + +void TPPLPartition::TypeB(long i, long j, long k, PartitionVertex *vertices, DPState2 **dpstates) { + list *pairs; + list::iterator iter,lastiter; + long top; + long w; + + if(!dpstates[j][k].visible) return; + top = j; + w = dpstates[j][k].weight; + + if (j-i > 1) { + if (!dpstates[i][j].visible) return; + w += dpstates[i][j].weight + 1; + } + if (k-j > 1) { + pairs = &(dpstates[j][k].pairs); + + iter = pairs->begin(); + if((!pairs->empty())&&(!IsReflex(vertices[i].p,vertices[j].p,vertices[iter->index1].p))) { + lastiter = iter; + while(iter!=pairs->end()) { + if(!IsReflex(vertices[i].p,vertices[j].p,vertices[iter->index1].p)) { + lastiter = iter; + ++iter; + } + else break; + } + if(IsReflex(vertices[lastiter->index2].p,vertices[k].p,vertices[i].p)) w++; + else top = lastiter->index2; + } else w++; + } + UpdateState(i,k,w,j,top,dpstates); +} + +int TPPLPartition::ConvexPartition_OPT(TPPLPoly *poly, list *parts) { + TPPLPoint p1,p2,p3,p4; + PartitionVertex *vertices; + DPState2 **dpstates; + long i,j,k,n,gap; + list diagonals,diagonals2; + Diagonal diagonal,newdiagonal; + list *pairs,*pairs2; + list::iterator iter,iter2; + int ret; + TPPLPoly newpoly; + list indices; + list::iterator iiter; + bool ijreal,jkreal; + + n = poly->GetNumPoints(); + vertices = new PartitionVertex[n]; + + dpstates = new DPState2 *[n]; + for(i=0;iGetPoint(i); + vertices[i].isActive = true; + if(i==0) vertices[i].previous = &(vertices[n-1]); + else vertices[i].previous = &(vertices[i-1]); + if(i==(poly->GetNumPoints()-1)) vertices[i].next = &(vertices[0]); + else vertices[i].next = &(vertices[i+1]); + } + for(i=1;iGetPoint(i); + for(j=i+1;jGetPoint(j); + + //visibility check + if(!InCone(&vertices[i],p2)) { + dpstates[i][j].visible = false; + continue; + } + if(!InCone(&vertices[j],p1)) { + dpstates[i][j].visible = false; + continue; + } + + for(k=0;kGetPoint(k); + if(k==(n-1)) p4 = poly->GetPoint(0); + else p4 = poly->GetPoint(k+1); + if(Intersects(p1,p2,p3,p4)) { + dpstates[i][j].visible = false; + break; + } + } + } + } + } + for(i=0;i<(n-2);i++) { + j = i+2; + if(dpstates[i][j].visible) { + dpstates[i][j].weight = 0; + newdiagonal.index1 = i+1; + newdiagonal.index2 = i+1; + dpstates[i][j].pairs.push_back(newdiagonal); + } + } + + dpstates[0][n-1].visible = true; + vertices[0].isConvex = false; //by convention + + for(gap=3; gapempty()) { + ret = 0; + break; + } + if(!vertices[diagonal.index1].isConvex) { + iter = pairs->end(); + --iter; + j = iter->index2; + newdiagonal.index1 = j; + newdiagonal.index2 = diagonal.index2; + diagonals.push_front(newdiagonal); + if((j - diagonal.index1)>1) { + if(iter->index1 != iter->index2) { + pairs2 = &(dpstates[diagonal.index1][j].pairs); + while(1) { + if(pairs2->empty()) { + ret = 0; + break; + } + iter2 = pairs2->end(); + --iter2; + if(iter->index1 != iter2->index1) pairs2->pop_back(); + else break; + } + if(ret == 0) break; + } + newdiagonal.index1 = diagonal.index1; + newdiagonal.index2 = j; + diagonals.push_front(newdiagonal); + } + } else { + iter = pairs->begin(); + j = iter->index1; + newdiagonal.index1 = diagonal.index1; + newdiagonal.index2 = j; + diagonals.push_front(newdiagonal); + if((diagonal.index2 - j) > 1) { + if(iter->index1 != iter->index2) { + pairs2 = &(dpstates[j][diagonal.index2].pairs); + while(1) { + if(pairs2->empty()) { + ret = 0; + break; + } + iter2 = pairs2->begin(); + if(iter->index2 != iter2->index2) pairs2->pop_front(); + else break; + } + if(ret == 0) break; + } + newdiagonal.index1 = j; + newdiagonal.index2 = diagonal.index2; + diagonals.push_front(newdiagonal); + } + } + } + + if(ret == 0) { + for(i=0;iend(); + --iter; + j = iter->index2; + if(iter->index1 != iter->index2) ijreal = false; + } else { + iter = pairs->begin(); + j = iter->index1; + if(iter->index1 != iter->index2) jkreal = false; + } + + newdiagonal.index1 = diagonal.index1; + newdiagonal.index2 = j; + if(ijreal) { + diagonals.push_back(newdiagonal); + } else { + diagonals2.push_back(newdiagonal); + } + + newdiagonal.index1 = j; + newdiagonal.index2 = diagonal.index2; + if(jkreal) { + diagonals.push_back(newdiagonal); + } else { + diagonals2.push_back(newdiagonal); + } + + indices.push_back(j); + } + + indices.sort(); + newpoly.Init((long)indices.size()); + k=0; + for(iiter = indices.begin();iiter!=indices.end(); ++iiter) { + newpoly[k] = vertices[*iiter].p; + k++; + } + parts->push_back(newpoly); + } + + for(i=0;i *inpolys, list *monotonePolys) { + list::iterator iter; + MonotoneVertex *vertices; + long i,numvertices,vindex,vindex2,newnumvertices,maxnumvertices; + long polystartindex, polyendindex; + TPPLPoly *poly; + MonotoneVertex *v,*v2,*vprev,*vnext; + ScanLineEdge newedge; + bool error = false; + + numvertices = 0; + for(iter = inpolys->begin(); iter != inpolys->end(); ++iter) { + numvertices += iter->GetNumPoints(); + } + + maxnumvertices = numvertices*3; + vertices = new MonotoneVertex[maxnumvertices]; + newnumvertices = numvertices; + + polystartindex = 0; + for(iter = inpolys->begin(); iter != inpolys->end(); ++iter) { + poly = &(*iter); + polyendindex = polystartindex + poly->GetNumPoints()-1; + for(i=0;iGetNumPoints();i++) { + vertices[i+polystartindex].p = poly->GetPoint(i); + if(i==0) vertices[i+polystartindex].previous = polyendindex; + else vertices[i+polystartindex].previous = i+polystartindex-1; + if(i==(poly->GetNumPoints()-1)) vertices[i+polystartindex].next = polystartindex; + else vertices[i+polystartindex].next = i+polystartindex+1; + } + polystartindex = polyendindex+1; + } + + //construct the priority queue + long *priority = new long [numvertices]; + for(i=0;iprevious]); + vnext = &(vertices[v->next]); + + if(Below(vprev->p,v->p)&&Below(vnext->p,v->p)) { + if(IsConvex(vnext->p,vprev->p,v->p)) { + vertextypes[i] = TPPL_VERTEXTYPE_START; + } else { + vertextypes[i] = TPPL_VERTEXTYPE_SPLIT; + } + } else if(Below(v->p,vprev->p)&&Below(v->p,vnext->p)) { + if(IsConvex(vnext->p,vprev->p,v->p)) + { + vertextypes[i] = TPPL_VERTEXTYPE_END; + } else { + vertextypes[i] = TPPL_VERTEXTYPE_MERGE; + } + } else { + vertextypes[i] = TPPL_VERTEXTYPE_REGULAR; + } + } + + //helpers + long *helpers = new long[maxnumvertices]; + + //binary search tree that holds edges intersecting the scanline + //note that while set doesn't actually have to be implemented as a tree + //complexity requirements for operations are the same as for the balanced binary search tree + set edgeTree; + //store iterators to the edge tree elements + //this makes deleting existing edges much faster + set::iterator *edgeTreeIterators,edgeIter; + edgeTreeIterators = new set::iterator[maxnumvertices]; + pair::iterator,bool> edgeTreeRet; + + //for each vertex + for(i=0;ip; + newedge.p2 = vertices[v->next].p; + newedge.index = vindex; + edgeTreeRet = edgeTree.insert(newedge); + edgeTreeIterators[vindex] = edgeTreeRet.first; + helpers[vindex] = vindex; + break; + + case TPPL_VERTEXTYPE_END: + //if helper(ei-1) is a merge vertex + if(vertextypes[helpers[v->previous]]==TPPL_VERTEXTYPE_MERGE) { + //Insert the diagonal connecting vi to helper(ei-1) in D. + AddDiagonal(vertices,&newnumvertices,vindex,helpers[v->previous]); + vertextypes[newnumvertices-2] = vertextypes[vindex]; + edgeTreeIterators[newnumvertices-2] = edgeTreeIterators[vindex]; + helpers[newnumvertices-2] = helpers[vindex]; + vertextypes[newnumvertices-1] = vertextypes[helpers[v->previous]]; + edgeTreeIterators[newnumvertices-1] = edgeTreeIterators[helpers[v->previous]]; + helpers[newnumvertices-1] = helpers[helpers[v->previous]]; + } + //Delete ei-1 from T + edgeTree.erase(edgeTreeIterators[v->previous]); + break; + + case TPPL_VERTEXTYPE_SPLIT: + //Search in T to find the edge e j directly left of vi. + newedge.p1 = v->p; + newedge.p2 = v->p; + edgeIter = edgeTree.lower_bound(newedge); + if(edgeIter == edgeTree.begin()) { + error = true; + break; + } + --edgeIter; + //Insert the diagonal connecting vi to helper(ej) in D. + AddDiagonal(vertices,&newnumvertices,vindex,helpers[edgeIter->index]); + vertextypes[newnumvertices-2] = vertextypes[vindex]; + edgeTreeIterators[newnumvertices-2] = edgeTreeIterators[vindex]; + helpers[newnumvertices-2] = helpers[vindex]; + vertextypes[newnumvertices-1] = vertextypes[helpers[edgeIter->index]]; + edgeTreeIterators[newnumvertices-1] = edgeTreeIterators[helpers[edgeIter->index]]; + helpers[newnumvertices-1] = helpers[helpers[edgeIter->index]]; + vindex2 = newnumvertices-2; + v2 = &(vertices[vindex2]); + //helper(e j)�vi + helpers[edgeIter->index] = vindex; + //Insert ei in T and set helper(ei) to vi. + newedge.p1 = v2->p; + newedge.p2 = vertices[v2->next].p; + newedge.index = vindex2; + edgeTreeRet = edgeTree.insert(newedge); + edgeTreeIterators[vindex2] = edgeTreeRet.first; + helpers[vindex2] = vindex2; + break; + + case TPPL_VERTEXTYPE_MERGE: + //if helper(ei-1) is a merge vertex + if(vertextypes[helpers[v->previous]]==TPPL_VERTEXTYPE_MERGE) { + //Insert the diagonal connecting vi to helper(ei-1) in D. + AddDiagonal(vertices,&newnumvertices,vindex,helpers[v->previous]); + vertextypes[newnumvertices-2] = vertextypes[vindex]; + edgeTreeIterators[newnumvertices-2] = edgeTreeIterators[vindex]; + helpers[newnumvertices-2] = helpers[vindex]; + vertextypes[newnumvertices-1] = vertextypes[helpers[v->previous]]; + edgeTreeIterators[newnumvertices-1] = edgeTreeIterators[helpers[v->previous]]; + helpers[newnumvertices-1] = helpers[helpers[v->previous]]; + vindex2 = newnumvertices-2; + v2 = &(vertices[vindex2]); + } + //Delete ei-1 from T. + edgeTree.erase(edgeTreeIterators[v->previous]); + //Search in T to find the edge e j directly left of vi. + newedge.p1 = v->p; + newedge.p2 = v->p; + edgeIter = edgeTree.lower_bound(newedge); + if(edgeIter == edgeTree.begin()) { + error = true; + break; + } + --edgeIter; + //if helper(ej) is a merge vertex + if(vertextypes[helpers[edgeIter->index]]==TPPL_VERTEXTYPE_MERGE) { + //Insert the diagonal connecting vi to helper(e j) in D. + AddDiagonal(vertices,&newnumvertices,vindex2,helpers[edgeIter->index]); + vertextypes[newnumvertices-2] = vertextypes[vindex2]; + edgeTreeIterators[newnumvertices-2] = edgeTreeIterators[vindex2]; + helpers[newnumvertices-2] = helpers[vindex2]; + vertextypes[newnumvertices-1] = vertextypes[helpers[edgeIter->index]]; + edgeTreeIterators[newnumvertices-1] = edgeTreeIterators[helpers[edgeIter->index]]; + helpers[newnumvertices-1] = helpers[helpers[edgeIter->index]]; + } + //helper(e j)�vi + helpers[edgeIter->index] = vindex2; + break; + + case TPPL_VERTEXTYPE_REGULAR: + //if the interior of P lies to the right of vi + if(Below(v->p,vertices[v->previous].p)) { + //if helper(ei-1) is a merge vertex + if(vertextypes[helpers[v->previous]]==TPPL_VERTEXTYPE_MERGE) { + //Insert the diagonal connecting vi to helper(ei-1) in D. + AddDiagonal(vertices,&newnumvertices,vindex,helpers[v->previous]); + vertextypes[newnumvertices-2] = vertextypes[vindex]; + edgeTreeIterators[newnumvertices-2] = edgeTreeIterators[vindex]; + helpers[newnumvertices-2] = helpers[vindex]; + vertextypes[newnumvertices-1] = vertextypes[helpers[v->previous]]; + edgeTreeIterators[newnumvertices-1] = edgeTreeIterators[helpers[v->previous]]; + helpers[newnumvertices-1] = helpers[helpers[v->previous]]; + vindex2 = newnumvertices-2; + v2 = &(vertices[vindex2]); + } + //Delete ei-1 from T. + edgeTree.erase(edgeTreeIterators[v->previous]); + //Insert ei in T and set helper(ei) to vi. + newedge.p1 = v2->p; + newedge.p2 = vertices[v2->next].p; + newedge.index = vindex2; + edgeTreeRet = edgeTree.insert(newedge); + edgeTreeIterators[vindex2] = edgeTreeRet.first; + helpers[vindex2] = vindex; + } else { + //Search in T to find the edge ej directly left of vi. + newedge.p1 = v->p; + newedge.p2 = v->p; + edgeIter = edgeTree.lower_bound(newedge); + if(edgeIter == edgeTree.begin()) { + error = true; + break; + } + --edgeIter; + //if helper(ej) is a merge vertex + if(vertextypes[helpers[edgeIter->index]]==TPPL_VERTEXTYPE_MERGE) { + //Insert the diagonal connecting vi to helper(e j) in D. + AddDiagonal(vertices,&newnumvertices,vindex,helpers[edgeIter->index]); + vertextypes[newnumvertices-2] = vertextypes[vindex]; + edgeTreeIterators[newnumvertices-2] = edgeTreeIterators[vindex]; + helpers[newnumvertices-2] = helpers[vindex]; + vertextypes[newnumvertices-1] = vertextypes[helpers[edgeIter->index]]; + edgeTreeIterators[newnumvertices-1] = edgeTreeIterators[helpers[edgeIter->index]]; + helpers[newnumvertices-1] = helpers[helpers[edgeIter->index]]; + } + //helper(e j)�vi + helpers[edgeIter->index] = vindex; + } + break; + } + + if(error) break; + } + + char *used = new char[newnumvertices]; + memset(used,0,newnumvertices*sizeof(char)); + + if(!error) { + //return result + long size; + TPPLPoly mpoly; + for(i=0;inext]); + size = 1; + while(vnext!=v) { + vnext = &(vertices[vnext->next]); + size++; + } + mpoly.Init(size); + v = &(vertices[i]); + mpoly[0] = v->p; + vnext = &(vertices[v->next]); + size = 1; + used[i] = 1; + used[v->next] = 1; + while(vnext!=v) { + mpoly[size] = vnext->p; + used[vnext->next] = 1; + vnext = &(vertices[vnext->next]); + size++; + } + monotonePolys->push_back(mpoly); + } + } + + //cleanup + delete [] vertices; + delete [] priority; + delete [] vertextypes; + delete [] edgeTreeIterators; + delete [] helpers; + delete [] used; + + if(error) { + return 0; + } else { + return 1; + } +} + +//adds a diagonal to the doubly-connected list of vertices +void TPPLPartition::AddDiagonal(MonotoneVertex *vertices, long *numvertices, long index1, long index2) { + long newindex1,newindex2; + + newindex1 = *numvertices; + (*numvertices)++; + newindex2 = *numvertices; + (*numvertices)++; + + vertices[newindex1].p = vertices[index1].p; + vertices[newindex2].p = vertices[index2].p; + + vertices[newindex2].next = vertices[index2].next; + vertices[newindex1].next = vertices[index1].next; + + vertices[vertices[index2].next].previous = newindex2; + vertices[vertices[index1].next].previous = newindex1; + + vertices[index1].next = newindex2; + vertices[newindex2].previous = index1; + + vertices[index2].next = newindex1; + vertices[newindex1].previous = index2; +} + +bool TPPLPartition::Below(TPPLPoint &p1, TPPLPoint &p2) { + if(p1.y < p2.y) return true; + else if(p1.y == p2.y) { + if(p1.x < p2.x) return true; + } + return false; +} + +//sorts in the falling order of y values, if y is equal, x is used instead +bool TPPLPartition::VertexSorter::operator() (long index1, long index2) const { + if(vertices[index1].p.y > vertices[index2].p.y) return true; + else if(vertices[index1].p.y == vertices[index2].p.y) { + if(vertices[index1].p.x > vertices[index2].p.x) return true; + } + return false; +} + +bool TPPLPartition::ScanLineEdge::IsConvex(const TPPLPoint& p1, const TPPLPoint& p2, const TPPLPoint& p3) const { + tppl_float tmp; + tmp = (p3.y-p1.y)*(p2.x-p1.x)-(p3.x-p1.x)*(p2.y-p1.y); + if(tmp>0) return 1; + else return 0; +} + +bool TPPLPartition::ScanLineEdge::operator < (const ScanLineEdge & other) const { + if(other.p1.y == other.p2.y) { + if(p1.y == p2.y) { + if(p1.y < other.p1.y) return true; + else return false; + } + if(IsConvex(p1,p2,other.p1)) return true; + else return false; + } else if(p1.y == p2.y) { + if(IsConvex(other.p1,other.p2,p1)) return false; + else return true; + } else if(p1.y < other.p1.y) { + if(IsConvex(other.p1,other.p2,p1)) return false; + else return true; + } else { + if(IsConvex(p1,p2,other.p1)) return true; + else return false; + } +} + +//triangulates monotone polygon +//O(n) time, O(n) space complexity +int TPPLPartition::TriangulateMonotone(TPPLPoly *inPoly, list *triangles) { + long i,i2,j,topindex,bottomindex,leftindex,rightindex,vindex; + TPPLPoint *points; + long numpoints; + TPPLPoly triangle; + + numpoints = inPoly->GetNumPoints(); + points = inPoly->GetPoints(); + + //trivial calses + if(numpoints < 3) return 0; + if(numpoints == 3) { + triangles->push_back(*inPoly); + } + + topindex = 0; bottomindex=0; + for(i=1;i=numpoints) i2 = 0; + if(!Below(points[i2],points[i])) return 0; + i = i2; + } + i = bottomindex; + while(i!=topindex) { + i2 = i+1; if(i2>=numpoints) i2 = 0; + if(!Below(points[i],points[i2])) return 0; + i = i2; + } + + char *vertextypes = new char[numpoints]; + long *priority = new long[numpoints]; + + //merge left and right vertex chains + priority[0] = topindex; + vertextypes[topindex] = 0; + leftindex = topindex+1; if(leftindex>=numpoints) leftindex = 0; + rightindex = topindex-1; if(rightindex<0) rightindex = numpoints-1; + for(i=1;i<(numpoints-1);i++) { + if(leftindex==bottomindex) { + priority[i] = rightindex; + rightindex--; if(rightindex<0) rightindex = numpoints-1; + vertextypes[priority[i]] = -1; + } else if(rightindex==bottomindex) { + priority[i] = leftindex; + leftindex++; if(leftindex>=numpoints) leftindex = 0; + vertextypes[priority[i]] = 1; + } else { + if(Below(points[leftindex],points[rightindex])) { + priority[i] = rightindex; + rightindex--; if(rightindex<0) rightindex = numpoints-1; + vertextypes[priority[i]] = -1; + } else { + priority[i] = leftindex; + leftindex++; if(leftindex>=numpoints) leftindex = 0; + vertextypes[priority[i]] = 1; + } + } + } + priority[i] = bottomindex; + vertextypes[bottomindex] = 0; + + long *stack = new long[numpoints]; + long stackptr = 0; + + stack[0] = priority[0]; + stack[1] = priority[1]; + stackptr = 2; + + //for each vertex from top to bottom trim as many triangles as possible + for(i=2;i<(numpoints-1);i++) { + vindex = priority[i]; + if(vertextypes[vindex]!=vertextypes[stack[stackptr-1]]) { + for(j=0;j<(stackptr-1);j++) { + if(vertextypes[vindex]==1) { + triangle.Triangle(points[stack[j+1]],points[stack[j]],points[vindex]); + } else { + triangle.Triangle(points[stack[j]],points[stack[j+1]],points[vindex]); + } + triangles->push_back(triangle); + } + stack[0] = priority[i-1]; + stack[1] = priority[i]; + stackptr = 2; + } else { + stackptr--; + while(stackptr>0) { + if(vertextypes[vindex]==1) { + if(IsConvex(points[vindex],points[stack[stackptr-1]],points[stack[stackptr]])) { + triangle.Triangle(points[vindex],points[stack[stackptr-1]],points[stack[stackptr]]); + triangles->push_back(triangle); + stackptr--; + } else { + break; + } + } else { + if(IsConvex(points[vindex],points[stack[stackptr]],points[stack[stackptr-1]])) { + triangle.Triangle(points[vindex],points[stack[stackptr]],points[stack[stackptr-1]]); + triangles->push_back(triangle); + stackptr--; + } else { + break; + } + } + } + stackptr++; + stack[stackptr] = vindex; + stackptr++; + } + } + vindex = priority[i]; + for(j=0;j<(stackptr-1);j++) { + if(vertextypes[stack[j+1]]==1) { + triangle.Triangle(points[stack[j]],points[stack[j+1]],points[vindex]); + } else { + triangle.Triangle(points[stack[j+1]],points[stack[j]],points[vindex]); + } + triangles->push_back(triangle); + } + + delete [] priority; + delete [] vertextypes; + delete [] stack; + + return 1; +} + +int TPPLPartition::Triangulate_MONO(list *inpolys, list *triangles) { + list monotone; + list::iterator iter; + + if(!MonotonePartition(inpolys,&monotone)) return 0; + for(iter = monotone.begin(); iter!=monotone.end(); ++iter) { + if(!TriangulateMonotone(&(*iter),triangles)) return 0; + } + return 1; +} + +int TPPLPartition::Triangulate_MONO(TPPLPoly *poly, list *triangles) { + list polys; + polys.push_back(*poly); + + return Triangulate_MONO(&polys, triangles); +} diff --git a/xs/src/polypartition.h b/src/polypartition/polypartition.h similarity index 97% rename from xs/src/polypartition.h rename to src/polypartition/polypartition.h index 2596243ae4..20ec0e24f6 100644 --- a/xs/src/polypartition.h +++ b/src/polypartition/polypartition.h @@ -1,343 +1,343 @@ -//Copyright (C) 2011 by Ivan Fratric -// -//Permission is hereby granted, free of charge, to any person obtaining a copy -//of this software and associated documentation files (the "Software"), to deal -//in the Software without restriction, including without limitation the rights -//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -//copies of the Software, and to permit persons to whom the Software is -//furnished to do so, subject to the following conditions: -// -//The above copyright notice and this permission notice shall be included in -//all copies or substantial portions of the Software. -// -//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -//THE SOFTWARE. - - -#include -using namespace std; - -typedef double tppl_float; - -#define TPPL_CCW 1 -#define TPPL_CW -1 - -//2D point structure -struct TPPLPoint { - tppl_float x; - tppl_float y; - - TPPLPoint operator + (const TPPLPoint& p) const { - TPPLPoint r; - r.x = x + p.x; - r.y = y + p.y; - return r; - } - - TPPLPoint operator - (const TPPLPoint& p) const { - TPPLPoint r; - r.x = x - p.x; - r.y = y - p.y; - return r; - } - - TPPLPoint operator * (const tppl_float f ) const { - TPPLPoint r; - r.x = x*f; - r.y = y*f; - return r; - } - - TPPLPoint operator / (const tppl_float f ) const { - TPPLPoint r; - r.x = x/f; - r.y = y/f; - return r; - } - - bool operator==(const TPPLPoint& p) const { - if((x == p.x)&&(y==p.y)) return true; - else return false; - } - - bool operator!=(const TPPLPoint& p) const { - if((x == p.x)&&(y==p.y)) return false; - else return true; - } -}; - -//Polygon implemented as an array of points with a 'hole' flag -class TPPLPoly { -protected: - - TPPLPoint *points; - long numpoints; - bool hole; - -public: - - //constructors/destructors - TPPLPoly(); - ~TPPLPoly(); - - TPPLPoly(const TPPLPoly &src); - TPPLPoly& operator=(const TPPLPoly &src); - - //getters and setters - long GetNumPoints() const { - return numpoints; - } - - bool IsHole() const { - return hole; - } - - void SetHole(bool hole) { - this->hole = hole; - } - - TPPLPoint &GetPoint(long i) { - return points[i]; - } - - TPPLPoint *GetPoints() { - return points; - } - - TPPLPoint& operator[] (int i) { - return points[i]; - } - - //clears the polygon points - void Clear(); - - //inits the polygon with numpoints vertices - void Init(long numpoints); - - //creates a triangle with points p1,p2,p3 - void Triangle(TPPLPoint &p1, TPPLPoint &p2, TPPLPoint &p3); - - //inverts the orfer of vertices - void Invert(); - - //returns the orientation of the polygon - //possible values: - // TPPL_CCW : polygon vertices are in counter-clockwise order - // TPPL_CW : polygon vertices are in clockwise order - // 0 : the polygon has no (measurable) area - int GetOrientation() const; - - //sets the polygon orientation - //orientation can be - // TPPL_CCW : sets vertices in counter-clockwise order - // TPPL_CW : sets vertices in clockwise order - void SetOrientation(int orientation); -}; - -class TPPLPartition { -protected: - struct PartitionVertex { - bool isActive; - bool isConvex; - bool isEar; - - TPPLPoint p; - tppl_float angle; - PartitionVertex *previous; - PartitionVertex *next; - }; - - struct MonotoneVertex { - TPPLPoint p; - long previous; - long next; - }; - - class VertexSorter{ - MonotoneVertex *vertices; - public: - VertexSorter(MonotoneVertex *v) : vertices(v) {} - bool operator() (long index1, long index2) const; - }; - - struct Diagonal { - long index1; - long index2; - }; - - //dynamic programming state for minimum-weight triangulation - struct DPState { - bool visible; - tppl_float weight; - long bestvertex; - }; - - //dynamic programming state for convex partitioning - struct DPState2 { - bool visible; - long weight; - list pairs; - }; - - //edge that intersects the scanline - struct ScanLineEdge { - long index; - TPPLPoint p1; - TPPLPoint p2; - - //determines if the edge is to the left of another edge - bool operator< (const ScanLineEdge & other) const; - - bool IsConvex(const TPPLPoint& p1, const TPPLPoint& p2, const TPPLPoint& p3) const; - }; - - //standard helper functions - bool IsConvex(TPPLPoint& p1, TPPLPoint& p2, TPPLPoint& p3); - bool IsReflex(TPPLPoint& p1, TPPLPoint& p2, TPPLPoint& p3); - bool IsInside(TPPLPoint& p1, TPPLPoint& p2, TPPLPoint& p3, TPPLPoint &p); - - bool InCone(TPPLPoint &p1, TPPLPoint &p2, TPPLPoint &p3, TPPLPoint &p); - bool InCone(PartitionVertex *v, TPPLPoint &p); - - int Intersects(TPPLPoint &p11, TPPLPoint &p12, TPPLPoint &p21, TPPLPoint &p22); - - TPPLPoint Normalize(const TPPLPoint &p); - tppl_float Distance(const TPPLPoint &p1, const TPPLPoint &p2); - - //helper functions for Triangulate_EC - void UpdateVertexReflexity(PartitionVertex *v); - void UpdateVertex(PartitionVertex *v,PartitionVertex *vertices, long numvertices); - - //helper functions for ConvexPartition_OPT - void UpdateState(long a, long b, long w, long i, long j, DPState2 **dpstates); - void TypeA(long i, long j, long k, PartitionVertex *vertices, DPState2 **dpstates); - void TypeB(long i, long j, long k, PartitionVertex *vertices, DPState2 **dpstates); - - //helper functions for MonotonePartition - bool Below(TPPLPoint &p1, TPPLPoint &p2); - void AddDiagonal(MonotoneVertex *vertices, long *numvertices, long index1, long index2); - - //triangulates a monotone polygon, used in Triangulate_MONO - int TriangulateMonotone(TPPLPoly *inPoly, list *triangles); - -public: - - //simple heuristic procedure for removing holes from a list of polygons - //works by creating a diagonal from the rightmost hole vertex to some visible vertex - //time complexity: O(h*(n^2)), h is the number of holes, n is the number of vertices - //space complexity: O(n) - //params: - // inpolys : a list of polygons that can contain holes - // vertices of all non-hole polys have to be in counter-clockwise order - // vertices of all hole polys have to be in clockwise order - // outpolys : a list of polygons without holes - //returns 1 on success, 0 on failure - int RemoveHoles(list *inpolys, list *outpolys); - - //triangulates a polygon by ear clipping - //time complexity O(n^2), n is the number of vertices - //space complexity: O(n) - //params: - // poly : an input polygon to be triangulated - // vertices have to be in counter-clockwise order - // triangles : a list of triangles (result) - //returns 1 on success, 0 on failure - int Triangulate_EC(TPPLPoly *poly, list *triangles); - - //triangulates a list of polygons that may contain holes by ear clipping algorithm - //first calls RemoveHoles to get rid of the holes, and then Triangulate_EC for each resulting polygon - //time complexity: O(h*(n^2)), h is the number of holes, n is the number of vertices - //space complexity: O(n) - //params: - // inpolys : a list of polygons to be triangulated (can contain holes) - // vertices of all non-hole polys have to be in counter-clockwise order - // vertices of all hole polys have to be in clockwise order - // triangles : a list of triangles (result) - //returns 1 on success, 0 on failure - int Triangulate_EC(list *inpolys, list *triangles); - - //creates an optimal polygon triangulation in terms of minimal edge length - //time complexity: O(n^3), n is the number of vertices - //space complexity: O(n^2) - //params: - // poly : an input polygon to be triangulated - // vertices have to be in counter-clockwise order - // triangles : a list of triangles (result) - //returns 1 on success, 0 on failure - int Triangulate_OPT(TPPLPoly *poly, list *triangles); - - //triangulates a polygons by firstly partitioning it into monotone polygons - //time complexity: O(n*log(n)), n is the number of vertices - //space complexity: O(n) - //params: - // poly : an input polygon to be triangulated - // vertices have to be in counter-clockwise order - // triangles : a list of triangles (result) - //returns 1 on success, 0 on failure - int Triangulate_MONO(TPPLPoly *poly, list *triangles); - - //triangulates a list of polygons by firstly partitioning them into monotone polygons - //time complexity: O(n*log(n)), n is the number of vertices - //space complexity: O(n) - //params: - // inpolys : a list of polygons to be triangulated (can contain holes) - // vertices of all non-hole polys have to be in counter-clockwise order - // vertices of all hole polys have to be in clockwise order - // triangles : a list of triangles (result) - //returns 1 on success, 0 on failure - int Triangulate_MONO(list *inpolys, list *triangles); - - //creates a monotone partition of a list of polygons that can contain holes - //time complexity: O(n*log(n)), n is the number of vertices - //space complexity: O(n) - //params: - // inpolys : a list of polygons to be triangulated (can contain holes) - // vertices of all non-hole polys have to be in counter-clockwise order - // vertices of all hole polys have to be in clockwise order - // monotonePolys : a list of monotone polygons (result) - //returns 1 on success, 0 on failure - int MonotonePartition(list *inpolys, list *monotonePolys); - - //partitions a polygon into convex polygons by using Hertel-Mehlhorn algorithm - //the algorithm gives at most four times the number of parts as the optimal algorithm - //however, in practice it works much better than that and often gives optimal partition - //uses triangulation obtained by ear clipping as intermediate result - //time complexity O(n^2), n is the number of vertices - //space complexity: O(n) - //params: - // poly : an input polygon to be partitioned - // vertices have to be in counter-clockwise order - // parts : resulting list of convex polygons - //returns 1 on success, 0 on failure - int ConvexPartition_HM(TPPLPoly *poly, list *parts); - - //partitions a list of polygons into convex parts by using Hertel-Mehlhorn algorithm - //the algorithm gives at most four times the number of parts as the optimal algorithm - //however, in practice it works much better than that and often gives optimal partition - //uses triangulation obtained by ear clipping as intermediate result - //time complexity O(n^2), n is the number of vertices - //space complexity: O(n) - //params: - // inpolys : an input list of polygons to be partitioned - // vertices of all non-hole polys have to be in counter-clockwise order - // vertices of all hole polys have to be in clockwise order - // parts : resulting list of convex polygons - //returns 1 on success, 0 on failure - int ConvexPartition_HM(list *inpolys, list *parts); - - //optimal convex partitioning (in terms of number of resulting convex polygons) - //using the Keil-Snoeyink algorithm - //M. Keil, J. Snoeyink, "On the time bound for convex decomposition of simple polygons", 1998 - //time complexity O(n^3), n is the number of vertices - //space complexity: O(n^3) - // poly : an input polygon to be partitioned - // vertices have to be in counter-clockwise order - // parts : resulting list of convex polygons - //returns 1 on success, 0 on failure - int ConvexPartition_OPT(TPPLPoly *poly, list *parts); -}; +//Copyright (C) 2011 by Ivan Fratric +// +//Permission is hereby granted, free of charge, to any person obtaining a copy +//of this software and associated documentation files (the "Software"), to deal +//in the Software without restriction, including without limitation the rights +//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +//copies of the Software, and to permit persons to whom the Software is +//furnished to do so, subject to the following conditions: +// +//The above copyright notice and this permission notice shall be included in +//all copies or substantial portions of the Software. +// +//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +//THE SOFTWARE. + + +#include +using namespace std; + +typedef double tppl_float; + +#define TPPL_CCW 1 +#define TPPL_CW -1 + +//2D point structure +struct TPPLPoint { + tppl_float x; + tppl_float y; + + TPPLPoint operator + (const TPPLPoint& p) const { + TPPLPoint r; + r.x = x + p.x; + r.y = y + p.y; + return r; + } + + TPPLPoint operator - (const TPPLPoint& p) const { + TPPLPoint r; + r.x = x - p.x; + r.y = y - p.y; + return r; + } + + TPPLPoint operator * (const tppl_float f ) const { + TPPLPoint r; + r.x = x*f; + r.y = y*f; + return r; + } + + TPPLPoint operator / (const tppl_float f ) const { + TPPLPoint r; + r.x = x/f; + r.y = y/f; + return r; + } + + bool operator==(const TPPLPoint& p) const { + if((x == p.x)&&(y==p.y)) return true; + else return false; + } + + bool operator!=(const TPPLPoint& p) const { + if((x == p.x)&&(y==p.y)) return false; + else return true; + } +}; + +//Polygon implemented as an array of points with a 'hole' flag +class TPPLPoly { +protected: + + TPPLPoint *points; + long numpoints; + bool hole; + +public: + + //constructors/destructors + TPPLPoly(); + ~TPPLPoly(); + + TPPLPoly(const TPPLPoly &src); + TPPLPoly& operator=(const TPPLPoly &src); + + //getters and setters + long GetNumPoints() const { + return numpoints; + } + + bool IsHole() const { + return hole; + } + + void SetHole(bool hole) { + this->hole = hole; + } + + TPPLPoint &GetPoint(long i) { + return points[i]; + } + + TPPLPoint *GetPoints() { + return points; + } + + TPPLPoint& operator[] (int i) { + return points[i]; + } + + //clears the polygon points + void Clear(); + + //inits the polygon with numpoints vertices + void Init(long numpoints); + + //creates a triangle with points p1,p2,p3 + void Triangle(TPPLPoint &p1, TPPLPoint &p2, TPPLPoint &p3); + + //inverts the orfer of vertices + void Invert(); + + //returns the orientation of the polygon + //possible values: + // TPPL_CCW : polygon vertices are in counter-clockwise order + // TPPL_CW : polygon vertices are in clockwise order + // 0 : the polygon has no (measurable) area + int GetOrientation() const; + + //sets the polygon orientation + //orientation can be + // TPPL_CCW : sets vertices in counter-clockwise order + // TPPL_CW : sets vertices in clockwise order + void SetOrientation(int orientation); +}; + +class TPPLPartition { +protected: + struct PartitionVertex { + bool isActive; + bool isConvex; + bool isEar; + + TPPLPoint p; + tppl_float angle; + PartitionVertex *previous; + PartitionVertex *next; + }; + + struct MonotoneVertex { + TPPLPoint p; + long previous; + long next; + }; + + class VertexSorter{ + MonotoneVertex *vertices; + public: + VertexSorter(MonotoneVertex *v) : vertices(v) {} + bool operator() (long index1, long index2) const; + }; + + struct Diagonal { + long index1; + long index2; + }; + + //dynamic programming state for minimum-weight triangulation + struct DPState { + bool visible; + tppl_float weight; + long bestvertex; + }; + + //dynamic programming state for convex partitioning + struct DPState2 { + bool visible; + long weight; + list pairs; + }; + + //edge that intersects the scanline + struct ScanLineEdge { + long index; + TPPLPoint p1; + TPPLPoint p2; + + //determines if the edge is to the left of another edge + bool operator< (const ScanLineEdge & other) const; + + bool IsConvex(const TPPLPoint& p1, const TPPLPoint& p2, const TPPLPoint& p3) const; + }; + + //standard helper functions + bool IsConvex(TPPLPoint& p1, TPPLPoint& p2, TPPLPoint& p3); + bool IsReflex(TPPLPoint& p1, TPPLPoint& p2, TPPLPoint& p3); + bool IsInside(TPPLPoint& p1, TPPLPoint& p2, TPPLPoint& p3, TPPLPoint &p); + + bool InCone(TPPLPoint &p1, TPPLPoint &p2, TPPLPoint &p3, TPPLPoint &p); + bool InCone(PartitionVertex *v, TPPLPoint &p); + + int Intersects(TPPLPoint &p11, TPPLPoint &p12, TPPLPoint &p21, TPPLPoint &p22); + + TPPLPoint Normalize(const TPPLPoint &p); + tppl_float Distance(const TPPLPoint &p1, const TPPLPoint &p2); + + //helper functions for Triangulate_EC + void UpdateVertexReflexity(PartitionVertex *v); + void UpdateVertex(PartitionVertex *v,PartitionVertex *vertices, long numvertices); + + //helper functions for ConvexPartition_OPT + void UpdateState(long a, long b, long w, long i, long j, DPState2 **dpstates); + void TypeA(long i, long j, long k, PartitionVertex *vertices, DPState2 **dpstates); + void TypeB(long i, long j, long k, PartitionVertex *vertices, DPState2 **dpstates); + + //helper functions for MonotonePartition + bool Below(TPPLPoint &p1, TPPLPoint &p2); + void AddDiagonal(MonotoneVertex *vertices, long *numvertices, long index1, long index2); + + //triangulates a monotone polygon, used in Triangulate_MONO + int TriangulateMonotone(TPPLPoly *inPoly, list *triangles); + +public: + + //simple heuristic procedure for removing holes from a list of polygons + //works by creating a diagonal from the rightmost hole vertex to some visible vertex + //time complexity: O(h*(n^2)), h is the number of holes, n is the number of vertices + //space complexity: O(n) + //params: + // inpolys : a list of polygons that can contain holes + // vertices of all non-hole polys have to be in counter-clockwise order + // vertices of all hole polys have to be in clockwise order + // outpolys : a list of polygons without holes + //returns 1 on success, 0 on failure + int RemoveHoles(list *inpolys, list *outpolys); + + //triangulates a polygon by ear clipping + //time complexity O(n^2), n is the number of vertices + //space complexity: O(n) + //params: + // poly : an input polygon to be triangulated + // vertices have to be in counter-clockwise order + // triangles : a list of triangles (result) + //returns 1 on success, 0 on failure + int Triangulate_EC(TPPLPoly *poly, list *triangles); + + //triangulates a list of polygons that may contain holes by ear clipping algorithm + //first calls RemoveHoles to get rid of the holes, and then Triangulate_EC for each resulting polygon + //time complexity: O(h*(n^2)), h is the number of holes, n is the number of vertices + //space complexity: O(n) + //params: + // inpolys : a list of polygons to be triangulated (can contain holes) + // vertices of all non-hole polys have to be in counter-clockwise order + // vertices of all hole polys have to be in clockwise order + // triangles : a list of triangles (result) + //returns 1 on success, 0 on failure + int Triangulate_EC(list *inpolys, list *triangles); + + //creates an optimal polygon triangulation in terms of minimal edge length + //time complexity: O(n^3), n is the number of vertices + //space complexity: O(n^2) + //params: + // poly : an input polygon to be triangulated + // vertices have to be in counter-clockwise order + // triangles : a list of triangles (result) + //returns 1 on success, 0 on failure + int Triangulate_OPT(TPPLPoly *poly, list *triangles); + + //triangulates a polygons by firstly partitioning it into monotone polygons + //time complexity: O(n*log(n)), n is the number of vertices + //space complexity: O(n) + //params: + // poly : an input polygon to be triangulated + // vertices have to be in counter-clockwise order + // triangles : a list of triangles (result) + //returns 1 on success, 0 on failure + int Triangulate_MONO(TPPLPoly *poly, list *triangles); + + //triangulates a list of polygons by firstly partitioning them into monotone polygons + //time complexity: O(n*log(n)), n is the number of vertices + //space complexity: O(n) + //params: + // inpolys : a list of polygons to be triangulated (can contain holes) + // vertices of all non-hole polys have to be in counter-clockwise order + // vertices of all hole polys have to be in clockwise order + // triangles : a list of triangles (result) + //returns 1 on success, 0 on failure + int Triangulate_MONO(list *inpolys, list *triangles); + + //creates a monotone partition of a list of polygons that can contain holes + //time complexity: O(n*log(n)), n is the number of vertices + //space complexity: O(n) + //params: + // inpolys : a list of polygons to be triangulated (can contain holes) + // vertices of all non-hole polys have to be in counter-clockwise order + // vertices of all hole polys have to be in clockwise order + // monotonePolys : a list of monotone polygons (result) + //returns 1 on success, 0 on failure + int MonotonePartition(list *inpolys, list *monotonePolys); + + //partitions a polygon into convex polygons by using Hertel-Mehlhorn algorithm + //the algorithm gives at most four times the number of parts as the optimal algorithm + //however, in practice it works much better than that and often gives optimal partition + //uses triangulation obtained by ear clipping as intermediate result + //time complexity O(n^2), n is the number of vertices + //space complexity: O(n) + //params: + // poly : an input polygon to be partitioned + // vertices have to be in counter-clockwise order + // parts : resulting list of convex polygons + //returns 1 on success, 0 on failure + int ConvexPartition_HM(TPPLPoly *poly, list *parts); + + //partitions a list of polygons into convex parts by using Hertel-Mehlhorn algorithm + //the algorithm gives at most four times the number of parts as the optimal algorithm + //however, in practice it works much better than that and often gives optimal partition + //uses triangulation obtained by ear clipping as intermediate result + //time complexity O(n^2), n is the number of vertices + //space complexity: O(n) + //params: + // inpolys : an input list of polygons to be partitioned + // vertices of all non-hole polys have to be in counter-clockwise order + // vertices of all hole polys have to be in clockwise order + // parts : resulting list of convex polygons + //returns 1 on success, 0 on failure + int ConvexPartition_HM(list *inpolys, list *parts); + + //optimal convex partitioning (in terms of number of resulting convex polygons) + //using the Keil-Snoeyink algorithm + //M. Keil, J. Snoeyink, "On the time bound for convex decomposition of simple polygons", 1998 + //time complexity O(n^3), n is the number of vertices + //space complexity: O(n^3) + // poly : an input polygon to be partitioned + // vertices have to be in counter-clockwise order + // parts : resulting list of convex polygons + //returns 1 on success, 0 on failure + int ConvexPartition_OPT(TPPLPoly *poly, list *parts); +}; diff --git a/xs/src/qhull/Announce.txt b/src/qhull/Announce.txt similarity index 100% rename from xs/src/qhull/Announce.txt rename to src/qhull/Announce.txt diff --git a/xs/src/qhull/CMakeLists.txt b/src/qhull/CMakeLists.txt similarity index 100% rename from xs/src/qhull/CMakeLists.txt rename to src/qhull/CMakeLists.txt diff --git a/xs/src/qhull/COPYING.txt b/src/qhull/COPYING.txt similarity index 100% rename from xs/src/qhull/COPYING.txt rename to src/qhull/COPYING.txt diff --git a/xs/src/qhull/README.txt b/src/qhull/README.txt similarity index 100% rename from xs/src/qhull/README.txt rename to src/qhull/README.txt diff --git a/xs/src/qhull/REGISTER.txt b/src/qhull/REGISTER.txt similarity index 100% rename from xs/src/qhull/REGISTER.txt rename to src/qhull/REGISTER.txt diff --git a/xs/src/qhull/html/index.htm b/src/qhull/html/index.htm similarity index 100% rename from xs/src/qhull/html/index.htm rename to src/qhull/html/index.htm diff --git a/xs/src/qhull/html/normal_voronoi_knauss_oesterle.jpg b/src/qhull/html/normal_voronoi_knauss_oesterle.jpg similarity index 100% rename from xs/src/qhull/html/normal_voronoi_knauss_oesterle.jpg rename to src/qhull/html/normal_voronoi_knauss_oesterle.jpg diff --git a/xs/src/qhull/html/qconvex.htm b/src/qhull/html/qconvex.htm similarity index 100% rename from xs/src/qhull/html/qconvex.htm rename to src/qhull/html/qconvex.htm diff --git a/xs/src/qhull/html/qdelau_f.htm b/src/qhull/html/qdelau_f.htm similarity index 100% rename from xs/src/qhull/html/qdelau_f.htm rename to src/qhull/html/qdelau_f.htm diff --git a/xs/src/qhull/html/qdelaun.htm b/src/qhull/html/qdelaun.htm similarity index 100% rename from xs/src/qhull/html/qdelaun.htm rename to src/qhull/html/qdelaun.htm diff --git a/xs/src/qhull/html/qh--4d.gif b/src/qhull/html/qh--4d.gif similarity index 100% rename from xs/src/qhull/html/qh--4d.gif rename to src/qhull/html/qh--4d.gif diff --git a/xs/src/qhull/html/qh--cone.gif b/src/qhull/html/qh--cone.gif similarity index 100% rename from xs/src/qhull/html/qh--cone.gif rename to src/qhull/html/qh--cone.gif diff --git a/xs/src/qhull/html/qh--dt.gif b/src/qhull/html/qh--dt.gif similarity index 100% rename from xs/src/qhull/html/qh--dt.gif rename to src/qhull/html/qh--dt.gif diff --git a/xs/src/qhull/html/qh--geom.gif b/src/qhull/html/qh--geom.gif similarity index 100% rename from xs/src/qhull/html/qh--geom.gif rename to src/qhull/html/qh--geom.gif diff --git a/xs/src/qhull/html/qh--half.gif b/src/qhull/html/qh--half.gif similarity index 100% rename from xs/src/qhull/html/qh--half.gif rename to src/qhull/html/qh--half.gif diff --git a/xs/src/qhull/html/qh--rand.gif b/src/qhull/html/qh--rand.gif similarity index 100% rename from xs/src/qhull/html/qh--rand.gif rename to src/qhull/html/qh--rand.gif diff --git a/xs/src/qhull/html/qh-code.htm b/src/qhull/html/qh-code.htm similarity index 100% rename from xs/src/qhull/html/qh-code.htm rename to src/qhull/html/qh-code.htm diff --git a/xs/src/qhull/html/qh-eg.htm b/src/qhull/html/qh-eg.htm similarity index 100% rename from xs/src/qhull/html/qh-eg.htm rename to src/qhull/html/qh-eg.htm diff --git a/xs/src/qhull/html/qh-faq.htm b/src/qhull/html/qh-faq.htm similarity index 100% rename from xs/src/qhull/html/qh-faq.htm rename to src/qhull/html/qh-faq.htm diff --git a/xs/src/qhull/html/qh-get.htm b/src/qhull/html/qh-get.htm similarity index 100% rename from xs/src/qhull/html/qh-get.htm rename to src/qhull/html/qh-get.htm diff --git a/xs/src/qhull/html/qh-impre.htm b/src/qhull/html/qh-impre.htm similarity index 100% rename from xs/src/qhull/html/qh-impre.htm rename to src/qhull/html/qh-impre.htm diff --git a/xs/src/qhull/html/qh-optc.htm b/src/qhull/html/qh-optc.htm similarity index 100% rename from xs/src/qhull/html/qh-optc.htm rename to src/qhull/html/qh-optc.htm diff --git a/xs/src/qhull/html/qh-optf.htm b/src/qhull/html/qh-optf.htm similarity index 100% rename from xs/src/qhull/html/qh-optf.htm rename to src/qhull/html/qh-optf.htm diff --git a/xs/src/qhull/html/qh-optg.htm b/src/qhull/html/qh-optg.htm similarity index 100% rename from xs/src/qhull/html/qh-optg.htm rename to src/qhull/html/qh-optg.htm diff --git a/xs/src/qhull/html/qh-opto.htm b/src/qhull/html/qh-opto.htm similarity index 100% rename from xs/src/qhull/html/qh-opto.htm rename to src/qhull/html/qh-opto.htm diff --git a/xs/src/qhull/html/qh-optp.htm b/src/qhull/html/qh-optp.htm similarity index 100% rename from xs/src/qhull/html/qh-optp.htm rename to src/qhull/html/qh-optp.htm diff --git a/xs/src/qhull/html/qh-optq.htm b/src/qhull/html/qh-optq.htm similarity index 100% rename from xs/src/qhull/html/qh-optq.htm rename to src/qhull/html/qh-optq.htm diff --git a/xs/src/qhull/html/qh-optt.htm b/src/qhull/html/qh-optt.htm similarity index 100% rename from xs/src/qhull/html/qh-optt.htm rename to src/qhull/html/qh-optt.htm diff --git a/xs/src/qhull/html/qh-quick.htm b/src/qhull/html/qh-quick.htm similarity index 100% rename from xs/src/qhull/html/qh-quick.htm rename to src/qhull/html/qh-quick.htm diff --git a/xs/src/qhull/html/qhalf.htm b/src/qhull/html/qhalf.htm similarity index 100% rename from xs/src/qhull/html/qhalf.htm rename to src/qhull/html/qhalf.htm diff --git a/xs/src/qhull/html/qhull-cpp.xml b/src/qhull/html/qhull-cpp.xml similarity index 100% rename from xs/src/qhull/html/qhull-cpp.xml rename to src/qhull/html/qhull-cpp.xml diff --git a/xs/src/qhull/html/qhull.htm b/src/qhull/html/qhull.htm similarity index 100% rename from xs/src/qhull/html/qhull.htm rename to src/qhull/html/qhull.htm diff --git a/xs/src/qhull/html/qhull.man b/src/qhull/html/qhull.man similarity index 100% rename from xs/src/qhull/html/qhull.man rename to src/qhull/html/qhull.man diff --git a/xs/src/qhull/html/qhull.txt b/src/qhull/html/qhull.txt similarity index 100% rename from xs/src/qhull/html/qhull.txt rename to src/qhull/html/qhull.txt diff --git a/xs/src/qhull/html/qvoron_f.htm b/src/qhull/html/qvoron_f.htm similarity index 100% rename from xs/src/qhull/html/qvoron_f.htm rename to src/qhull/html/qvoron_f.htm diff --git a/xs/src/qhull/html/qvoronoi.htm b/src/qhull/html/qvoronoi.htm similarity index 100% rename from xs/src/qhull/html/qvoronoi.htm rename to src/qhull/html/qvoronoi.htm diff --git a/xs/src/qhull/html/rbox.htm b/src/qhull/html/rbox.htm similarity index 100% rename from xs/src/qhull/html/rbox.htm rename to src/qhull/html/rbox.htm diff --git a/xs/src/qhull/html/rbox.man b/src/qhull/html/rbox.man similarity index 100% rename from xs/src/qhull/html/rbox.man rename to src/qhull/html/rbox.man diff --git a/xs/src/qhull/html/rbox.txt b/src/qhull/html/rbox.txt similarity index 100% rename from xs/src/qhull/html/rbox.txt rename to src/qhull/html/rbox.txt diff --git a/xs/src/qhull/index.htm b/src/qhull/index.htm similarity index 100% rename from xs/src/qhull/index.htm rename to src/qhull/index.htm diff --git a/xs/src/qhull/origCMakeLists.txt b/src/qhull/origCMakeLists.txt similarity index 100% rename from xs/src/qhull/origCMakeLists.txt rename to src/qhull/origCMakeLists.txt diff --git a/xs/src/qhull/src/Changes.txt b/src/qhull/src/Changes.txt similarity index 100% rename from xs/src/qhull/src/Changes.txt rename to src/qhull/src/Changes.txt diff --git a/xs/src/qhull/src/libqhull/DEPRECATED.txt b/src/qhull/src/libqhull/DEPRECATED.txt similarity index 100% rename from xs/src/qhull/src/libqhull/DEPRECATED.txt rename to src/qhull/src/libqhull/DEPRECATED.txt diff --git a/xs/src/qhull/src/libqhull/Makefile b/src/qhull/src/libqhull/Makefile similarity index 100% rename from xs/src/qhull/src/libqhull/Makefile rename to src/qhull/src/libqhull/Makefile diff --git a/xs/src/qhull/src/libqhull/Mborland b/src/qhull/src/libqhull/Mborland similarity index 100% rename from xs/src/qhull/src/libqhull/Mborland rename to src/qhull/src/libqhull/Mborland diff --git a/xs/src/qhull/src/libqhull/geom.c b/src/qhull/src/libqhull/geom.c similarity index 100% rename from xs/src/qhull/src/libqhull/geom.c rename to src/qhull/src/libqhull/geom.c diff --git a/xs/src/qhull/src/libqhull/geom.h b/src/qhull/src/libqhull/geom.h similarity index 100% rename from xs/src/qhull/src/libqhull/geom.h rename to src/qhull/src/libqhull/geom.h diff --git a/xs/src/qhull/src/libqhull/geom2.c b/src/qhull/src/libqhull/geom2.c similarity index 100% rename from xs/src/qhull/src/libqhull/geom2.c rename to src/qhull/src/libqhull/geom2.c diff --git a/xs/src/qhull/src/libqhull/global.c b/src/qhull/src/libqhull/global.c similarity index 100% rename from xs/src/qhull/src/libqhull/global.c rename to src/qhull/src/libqhull/global.c diff --git a/xs/src/qhull/src/libqhull/index.htm b/src/qhull/src/libqhull/index.htm similarity index 100% rename from xs/src/qhull/src/libqhull/index.htm rename to src/qhull/src/libqhull/index.htm diff --git a/xs/src/qhull/src/libqhull/io.c b/src/qhull/src/libqhull/io.c similarity index 100% rename from xs/src/qhull/src/libqhull/io.c rename to src/qhull/src/libqhull/io.c diff --git a/xs/src/qhull/src/libqhull/io.h b/src/qhull/src/libqhull/io.h similarity index 100% rename from xs/src/qhull/src/libqhull/io.h rename to src/qhull/src/libqhull/io.h diff --git a/xs/src/qhull/src/libqhull/libqhull.c b/src/qhull/src/libqhull/libqhull.c similarity index 100% rename from xs/src/qhull/src/libqhull/libqhull.c rename to src/qhull/src/libqhull/libqhull.c diff --git a/xs/src/qhull/src/libqhull/libqhull.h b/src/qhull/src/libqhull/libqhull.h similarity index 100% rename from xs/src/qhull/src/libqhull/libqhull.h rename to src/qhull/src/libqhull/libqhull.h diff --git a/xs/src/qhull/src/libqhull/libqhull.pro b/src/qhull/src/libqhull/libqhull.pro similarity index 100% rename from xs/src/qhull/src/libqhull/libqhull.pro rename to src/qhull/src/libqhull/libqhull.pro diff --git a/xs/src/qhull/src/libqhull/mem.c b/src/qhull/src/libqhull/mem.c similarity index 100% rename from xs/src/qhull/src/libqhull/mem.c rename to src/qhull/src/libqhull/mem.c diff --git a/xs/src/qhull/src/libqhull/mem.h b/src/qhull/src/libqhull/mem.h similarity index 100% rename from xs/src/qhull/src/libqhull/mem.h rename to src/qhull/src/libqhull/mem.h diff --git a/xs/src/qhull/src/libqhull/merge.c b/src/qhull/src/libqhull/merge.c similarity index 100% rename from xs/src/qhull/src/libqhull/merge.c rename to src/qhull/src/libqhull/merge.c diff --git a/xs/src/qhull/src/libqhull/merge.h b/src/qhull/src/libqhull/merge.h similarity index 100% rename from xs/src/qhull/src/libqhull/merge.h rename to src/qhull/src/libqhull/merge.h diff --git a/xs/src/qhull/src/libqhull/poly.c b/src/qhull/src/libqhull/poly.c similarity index 100% rename from xs/src/qhull/src/libqhull/poly.c rename to src/qhull/src/libqhull/poly.c diff --git a/xs/src/qhull/src/libqhull/poly.h b/src/qhull/src/libqhull/poly.h similarity index 100% rename from xs/src/qhull/src/libqhull/poly.h rename to src/qhull/src/libqhull/poly.h diff --git a/xs/src/qhull/src/libqhull/poly2.c b/src/qhull/src/libqhull/poly2.c similarity index 100% rename from xs/src/qhull/src/libqhull/poly2.c rename to src/qhull/src/libqhull/poly2.c diff --git a/xs/src/qhull/src/libqhull/qh-geom.htm b/src/qhull/src/libqhull/qh-geom.htm similarity index 100% rename from xs/src/qhull/src/libqhull/qh-geom.htm rename to src/qhull/src/libqhull/qh-geom.htm diff --git a/xs/src/qhull/src/libqhull/qh-globa.htm b/src/qhull/src/libqhull/qh-globa.htm similarity index 100% rename from xs/src/qhull/src/libqhull/qh-globa.htm rename to src/qhull/src/libqhull/qh-globa.htm diff --git a/xs/src/qhull/src/libqhull/qh-io.htm b/src/qhull/src/libqhull/qh-io.htm similarity index 100% rename from xs/src/qhull/src/libqhull/qh-io.htm rename to src/qhull/src/libqhull/qh-io.htm diff --git a/xs/src/qhull/src/libqhull/qh-mem.htm b/src/qhull/src/libqhull/qh-mem.htm similarity index 100% rename from xs/src/qhull/src/libqhull/qh-mem.htm rename to src/qhull/src/libqhull/qh-mem.htm diff --git a/xs/src/qhull/src/libqhull/qh-merge.htm b/src/qhull/src/libqhull/qh-merge.htm similarity index 100% rename from xs/src/qhull/src/libqhull/qh-merge.htm rename to src/qhull/src/libqhull/qh-merge.htm diff --git a/xs/src/qhull/src/libqhull/qh-poly.htm b/src/qhull/src/libqhull/qh-poly.htm similarity index 100% rename from xs/src/qhull/src/libqhull/qh-poly.htm rename to src/qhull/src/libqhull/qh-poly.htm diff --git a/xs/src/qhull/src/libqhull/qh-qhull.htm b/src/qhull/src/libqhull/qh-qhull.htm similarity index 100% rename from xs/src/qhull/src/libqhull/qh-qhull.htm rename to src/qhull/src/libqhull/qh-qhull.htm diff --git a/xs/src/qhull/src/libqhull/qh-set.htm b/src/qhull/src/libqhull/qh-set.htm similarity index 100% rename from xs/src/qhull/src/libqhull/qh-set.htm rename to src/qhull/src/libqhull/qh-set.htm diff --git a/xs/src/qhull/src/libqhull/qh-stat.htm b/src/qhull/src/libqhull/qh-stat.htm similarity index 100% rename from xs/src/qhull/src/libqhull/qh-stat.htm rename to src/qhull/src/libqhull/qh-stat.htm diff --git a/xs/src/qhull/src/libqhull/qh-user.htm b/src/qhull/src/libqhull/qh-user.htm similarity index 100% rename from xs/src/qhull/src/libqhull/qh-user.htm rename to src/qhull/src/libqhull/qh-user.htm diff --git a/xs/src/qhull/src/libqhull/qhull-exports.def b/src/qhull/src/libqhull/qhull-exports.def similarity index 100% rename from xs/src/qhull/src/libqhull/qhull-exports.def rename to src/qhull/src/libqhull/qhull-exports.def diff --git a/xs/src/qhull/src/libqhull/qhull_a.h b/src/qhull/src/libqhull/qhull_a.h similarity index 100% rename from xs/src/qhull/src/libqhull/qhull_a.h rename to src/qhull/src/libqhull/qhull_a.h diff --git a/xs/src/qhull/src/libqhull/qhull_p-exports.def b/src/qhull/src/libqhull/qhull_p-exports.def similarity index 100% rename from xs/src/qhull/src/libqhull/qhull_p-exports.def rename to src/qhull/src/libqhull/qhull_p-exports.def diff --git a/xs/src/qhull/src/libqhull/qset.c b/src/qhull/src/libqhull/qset.c similarity index 100% rename from xs/src/qhull/src/libqhull/qset.c rename to src/qhull/src/libqhull/qset.c diff --git a/xs/src/qhull/src/libqhull/qset.h b/src/qhull/src/libqhull/qset.h similarity index 100% rename from xs/src/qhull/src/libqhull/qset.h rename to src/qhull/src/libqhull/qset.h diff --git a/xs/src/qhull/src/libqhull/random.c b/src/qhull/src/libqhull/random.c similarity index 100% rename from xs/src/qhull/src/libqhull/random.c rename to src/qhull/src/libqhull/random.c diff --git a/xs/src/qhull/src/libqhull/random.h b/src/qhull/src/libqhull/random.h similarity index 100% rename from xs/src/qhull/src/libqhull/random.h rename to src/qhull/src/libqhull/random.h diff --git a/xs/src/qhull/src/libqhull/rboxlib.c b/src/qhull/src/libqhull/rboxlib.c similarity index 100% rename from xs/src/qhull/src/libqhull/rboxlib.c rename to src/qhull/src/libqhull/rboxlib.c diff --git a/xs/src/qhull/src/libqhull/stat.c b/src/qhull/src/libqhull/stat.c similarity index 100% rename from xs/src/qhull/src/libqhull/stat.c rename to src/qhull/src/libqhull/stat.c diff --git a/xs/src/qhull/src/libqhull/stat.h b/src/qhull/src/libqhull/stat.h similarity index 100% rename from xs/src/qhull/src/libqhull/stat.h rename to src/qhull/src/libqhull/stat.h diff --git a/xs/src/qhull/src/libqhull/user.c b/src/qhull/src/libqhull/user.c similarity index 100% rename from xs/src/qhull/src/libqhull/user.c rename to src/qhull/src/libqhull/user.c diff --git a/xs/src/qhull/src/libqhull/user.h b/src/qhull/src/libqhull/user.h similarity index 100% rename from xs/src/qhull/src/libqhull/user.h rename to src/qhull/src/libqhull/user.h diff --git a/xs/src/qhull/src/libqhull/usermem.c b/src/qhull/src/libqhull/usermem.c similarity index 100% rename from xs/src/qhull/src/libqhull/usermem.c rename to src/qhull/src/libqhull/usermem.c diff --git a/xs/src/qhull/src/libqhull/userprintf.c b/src/qhull/src/libqhull/userprintf.c similarity index 100% rename from xs/src/qhull/src/libqhull/userprintf.c rename to src/qhull/src/libqhull/userprintf.c diff --git a/xs/src/qhull/src/libqhull/userprintf_rbox.c b/src/qhull/src/libqhull/userprintf_rbox.c similarity index 100% rename from xs/src/qhull/src/libqhull/userprintf_rbox.c rename to src/qhull/src/libqhull/userprintf_rbox.c diff --git a/xs/src/qhull/src/libqhull_r/Makefile b/src/qhull/src/libqhull_r/Makefile similarity index 100% rename from xs/src/qhull/src/libqhull_r/Makefile rename to src/qhull/src/libqhull_r/Makefile diff --git a/xs/src/qhull/src/libqhull_r/geom2_r.c b/src/qhull/src/libqhull_r/geom2_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/geom2_r.c rename to src/qhull/src/libqhull_r/geom2_r.c diff --git a/xs/src/qhull/src/libqhull_r/geom_r.c b/src/qhull/src/libqhull_r/geom_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/geom_r.c rename to src/qhull/src/libqhull_r/geom_r.c diff --git a/xs/src/qhull/src/libqhull_r/geom_r.h b/src/qhull/src/libqhull_r/geom_r.h similarity index 100% rename from xs/src/qhull/src/libqhull_r/geom_r.h rename to src/qhull/src/libqhull_r/geom_r.h diff --git a/xs/src/qhull/src/libqhull_r/global_r.c b/src/qhull/src/libqhull_r/global_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/global_r.c rename to src/qhull/src/libqhull_r/global_r.c diff --git a/xs/src/qhull/src/libqhull_r/index.htm b/src/qhull/src/libqhull_r/index.htm similarity index 100% rename from xs/src/qhull/src/libqhull_r/index.htm rename to src/qhull/src/libqhull_r/index.htm diff --git a/xs/src/qhull/src/libqhull_r/io_r.c b/src/qhull/src/libqhull_r/io_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/io_r.c rename to src/qhull/src/libqhull_r/io_r.c diff --git a/xs/src/qhull/src/libqhull_r/io_r.h b/src/qhull/src/libqhull_r/io_r.h similarity index 100% rename from xs/src/qhull/src/libqhull_r/io_r.h rename to src/qhull/src/libqhull_r/io_r.h diff --git a/xs/src/qhull/src/libqhull_r/libqhull_r.c b/src/qhull/src/libqhull_r/libqhull_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/libqhull_r.c rename to src/qhull/src/libqhull_r/libqhull_r.c diff --git a/xs/src/qhull/src/libqhull_r/libqhull_r.h b/src/qhull/src/libqhull_r/libqhull_r.h similarity index 100% rename from xs/src/qhull/src/libqhull_r/libqhull_r.h rename to src/qhull/src/libqhull_r/libqhull_r.h diff --git a/xs/src/qhull/src/libqhull_r/libqhull_r.pro b/src/qhull/src/libqhull_r/libqhull_r.pro similarity index 100% rename from xs/src/qhull/src/libqhull_r/libqhull_r.pro rename to src/qhull/src/libqhull_r/libqhull_r.pro diff --git a/xs/src/qhull/src/libqhull_r/mem_r.c b/src/qhull/src/libqhull_r/mem_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/mem_r.c rename to src/qhull/src/libqhull_r/mem_r.c diff --git a/xs/src/qhull/src/libqhull_r/mem_r.h b/src/qhull/src/libqhull_r/mem_r.h similarity index 100% rename from xs/src/qhull/src/libqhull_r/mem_r.h rename to src/qhull/src/libqhull_r/mem_r.h diff --git a/xs/src/qhull/src/libqhull_r/merge_r.c b/src/qhull/src/libqhull_r/merge_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/merge_r.c rename to src/qhull/src/libqhull_r/merge_r.c diff --git a/xs/src/qhull/src/libqhull_r/merge_r.h b/src/qhull/src/libqhull_r/merge_r.h similarity index 100% rename from xs/src/qhull/src/libqhull_r/merge_r.h rename to src/qhull/src/libqhull_r/merge_r.h diff --git a/xs/src/qhull/src/libqhull_r/poly2_r.c b/src/qhull/src/libqhull_r/poly2_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/poly2_r.c rename to src/qhull/src/libqhull_r/poly2_r.c diff --git a/xs/src/qhull/src/libqhull_r/poly_r.c b/src/qhull/src/libqhull_r/poly_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/poly_r.c rename to src/qhull/src/libqhull_r/poly_r.c diff --git a/xs/src/qhull/src/libqhull_r/poly_r.h b/src/qhull/src/libqhull_r/poly_r.h similarity index 100% rename from xs/src/qhull/src/libqhull_r/poly_r.h rename to src/qhull/src/libqhull_r/poly_r.h diff --git a/xs/src/qhull/src/libqhull_r/qh-geom_r.htm b/src/qhull/src/libqhull_r/qh-geom_r.htm similarity index 100% rename from xs/src/qhull/src/libqhull_r/qh-geom_r.htm rename to src/qhull/src/libqhull_r/qh-geom_r.htm diff --git a/xs/src/qhull/src/libqhull_r/qh-globa_r.htm b/src/qhull/src/libqhull_r/qh-globa_r.htm similarity index 100% rename from xs/src/qhull/src/libqhull_r/qh-globa_r.htm rename to src/qhull/src/libqhull_r/qh-globa_r.htm diff --git a/xs/src/qhull/src/libqhull_r/qh-io_r.htm b/src/qhull/src/libqhull_r/qh-io_r.htm similarity index 100% rename from xs/src/qhull/src/libqhull_r/qh-io_r.htm rename to src/qhull/src/libqhull_r/qh-io_r.htm diff --git a/xs/src/qhull/src/libqhull_r/qh-mem_r.htm b/src/qhull/src/libqhull_r/qh-mem_r.htm similarity index 100% rename from xs/src/qhull/src/libqhull_r/qh-mem_r.htm rename to src/qhull/src/libqhull_r/qh-mem_r.htm diff --git a/xs/src/qhull/src/libqhull_r/qh-merge_r.htm b/src/qhull/src/libqhull_r/qh-merge_r.htm similarity index 100% rename from xs/src/qhull/src/libqhull_r/qh-merge_r.htm rename to src/qhull/src/libqhull_r/qh-merge_r.htm diff --git a/xs/src/qhull/src/libqhull_r/qh-poly_r.htm b/src/qhull/src/libqhull_r/qh-poly_r.htm similarity index 100% rename from xs/src/qhull/src/libqhull_r/qh-poly_r.htm rename to src/qhull/src/libqhull_r/qh-poly_r.htm diff --git a/xs/src/qhull/src/libqhull_r/qh-qhull_r.htm b/src/qhull/src/libqhull_r/qh-qhull_r.htm similarity index 100% rename from xs/src/qhull/src/libqhull_r/qh-qhull_r.htm rename to src/qhull/src/libqhull_r/qh-qhull_r.htm diff --git a/xs/src/qhull/src/libqhull_r/qh-set_r.htm b/src/qhull/src/libqhull_r/qh-set_r.htm similarity index 100% rename from xs/src/qhull/src/libqhull_r/qh-set_r.htm rename to src/qhull/src/libqhull_r/qh-set_r.htm diff --git a/xs/src/qhull/src/libqhull_r/qh-stat_r.htm b/src/qhull/src/libqhull_r/qh-stat_r.htm similarity index 100% rename from xs/src/qhull/src/libqhull_r/qh-stat_r.htm rename to src/qhull/src/libqhull_r/qh-stat_r.htm diff --git a/xs/src/qhull/src/libqhull_r/qh-user_r.htm b/src/qhull/src/libqhull_r/qh-user_r.htm similarity index 100% rename from xs/src/qhull/src/libqhull_r/qh-user_r.htm rename to src/qhull/src/libqhull_r/qh-user_r.htm diff --git a/xs/src/qhull/src/libqhull_r/qhull_r-exports.def b/src/qhull/src/libqhull_r/qhull_r-exports.def similarity index 100% rename from xs/src/qhull/src/libqhull_r/qhull_r-exports.def rename to src/qhull/src/libqhull_r/qhull_r-exports.def diff --git a/xs/src/qhull/src/libqhull_r/qhull_ra.h b/src/qhull/src/libqhull_r/qhull_ra.h similarity index 100% rename from xs/src/qhull/src/libqhull_r/qhull_ra.h rename to src/qhull/src/libqhull_r/qhull_ra.h diff --git a/xs/src/qhull/src/libqhull_r/qset_r.c b/src/qhull/src/libqhull_r/qset_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/qset_r.c rename to src/qhull/src/libqhull_r/qset_r.c diff --git a/xs/src/qhull/src/libqhull_r/qset_r.h b/src/qhull/src/libqhull_r/qset_r.h similarity index 100% rename from xs/src/qhull/src/libqhull_r/qset_r.h rename to src/qhull/src/libqhull_r/qset_r.h diff --git a/xs/src/qhull/src/libqhull_r/random_r.c b/src/qhull/src/libqhull_r/random_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/random_r.c rename to src/qhull/src/libqhull_r/random_r.c diff --git a/xs/src/qhull/src/libqhull_r/random_r.h b/src/qhull/src/libqhull_r/random_r.h similarity index 100% rename from xs/src/qhull/src/libqhull_r/random_r.h rename to src/qhull/src/libqhull_r/random_r.h diff --git a/xs/src/qhull/src/libqhull_r/rboxlib_r.c b/src/qhull/src/libqhull_r/rboxlib_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/rboxlib_r.c rename to src/qhull/src/libqhull_r/rboxlib_r.c diff --git a/xs/src/qhull/src/libqhull_r/stat_r.c b/src/qhull/src/libqhull_r/stat_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/stat_r.c rename to src/qhull/src/libqhull_r/stat_r.c diff --git a/xs/src/qhull/src/libqhull_r/stat_r.h b/src/qhull/src/libqhull_r/stat_r.h similarity index 100% rename from xs/src/qhull/src/libqhull_r/stat_r.h rename to src/qhull/src/libqhull_r/stat_r.h diff --git a/xs/src/qhull/src/libqhull_r/user_r.c b/src/qhull/src/libqhull_r/user_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/user_r.c rename to src/qhull/src/libqhull_r/user_r.c diff --git a/xs/src/qhull/src/libqhull_r/user_r.h b/src/qhull/src/libqhull_r/user_r.h similarity index 100% rename from xs/src/qhull/src/libqhull_r/user_r.h rename to src/qhull/src/libqhull_r/user_r.h diff --git a/xs/src/qhull/src/libqhull_r/usermem_r.c b/src/qhull/src/libqhull_r/usermem_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/usermem_r.c rename to src/qhull/src/libqhull_r/usermem_r.c diff --git a/xs/src/qhull/src/libqhull_r/userprintf_r.c b/src/qhull/src/libqhull_r/userprintf_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/userprintf_r.c rename to src/qhull/src/libqhull_r/userprintf_r.c diff --git a/xs/src/qhull/src/libqhull_r/userprintf_rbox_r.c b/src/qhull/src/libqhull_r/userprintf_rbox_r.c similarity index 100% rename from xs/src/qhull/src/libqhull_r/userprintf_rbox_r.c rename to src/qhull/src/libqhull_r/userprintf_rbox_r.c diff --git a/xs/src/qhull/src/libqhullcpp/Coordinates.cpp b/src/qhull/src/libqhullcpp/Coordinates.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/Coordinates.cpp rename to src/qhull/src/libqhullcpp/Coordinates.cpp diff --git a/xs/src/qhull/src/libqhullcpp/Coordinates.h b/src/qhull/src/libqhullcpp/Coordinates.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/Coordinates.h rename to src/qhull/src/libqhullcpp/Coordinates.h diff --git a/xs/src/qhull/src/libqhullcpp/PointCoordinates.cpp b/src/qhull/src/libqhullcpp/PointCoordinates.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/PointCoordinates.cpp rename to src/qhull/src/libqhullcpp/PointCoordinates.cpp diff --git a/xs/src/qhull/src/libqhullcpp/PointCoordinates.h b/src/qhull/src/libqhullcpp/PointCoordinates.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/PointCoordinates.h rename to src/qhull/src/libqhullcpp/PointCoordinates.h diff --git a/xs/src/qhull/src/libqhullcpp/Qhull.cpp b/src/qhull/src/libqhullcpp/Qhull.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/Qhull.cpp rename to src/qhull/src/libqhullcpp/Qhull.cpp diff --git a/xs/src/qhull/src/libqhullcpp/Qhull.h b/src/qhull/src/libqhullcpp/Qhull.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/Qhull.h rename to src/qhull/src/libqhullcpp/Qhull.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullError.h b/src/qhull/src/libqhullcpp/QhullError.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullError.h rename to src/qhull/src/libqhullcpp/QhullError.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullFacet.cpp b/src/qhull/src/libqhullcpp/QhullFacet.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullFacet.cpp rename to src/qhull/src/libqhullcpp/QhullFacet.cpp diff --git a/xs/src/qhull/src/libqhullcpp/QhullFacet.h b/src/qhull/src/libqhullcpp/QhullFacet.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullFacet.h rename to src/qhull/src/libqhullcpp/QhullFacet.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullFacetList.cpp b/src/qhull/src/libqhullcpp/QhullFacetList.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullFacetList.cpp rename to src/qhull/src/libqhullcpp/QhullFacetList.cpp diff --git a/xs/src/qhull/src/libqhullcpp/QhullFacetList.h b/src/qhull/src/libqhullcpp/QhullFacetList.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullFacetList.h rename to src/qhull/src/libqhullcpp/QhullFacetList.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullFacetSet.cpp b/src/qhull/src/libqhullcpp/QhullFacetSet.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullFacetSet.cpp rename to src/qhull/src/libqhullcpp/QhullFacetSet.cpp diff --git a/xs/src/qhull/src/libqhullcpp/QhullFacetSet.h b/src/qhull/src/libqhullcpp/QhullFacetSet.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullFacetSet.h rename to src/qhull/src/libqhullcpp/QhullFacetSet.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullHyperplane.cpp b/src/qhull/src/libqhullcpp/QhullHyperplane.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullHyperplane.cpp rename to src/qhull/src/libqhullcpp/QhullHyperplane.cpp diff --git a/xs/src/qhull/src/libqhullcpp/QhullHyperplane.h b/src/qhull/src/libqhullcpp/QhullHyperplane.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullHyperplane.h rename to src/qhull/src/libqhullcpp/QhullHyperplane.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullIterator.h b/src/qhull/src/libqhullcpp/QhullIterator.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullIterator.h rename to src/qhull/src/libqhullcpp/QhullIterator.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullLinkedList.h b/src/qhull/src/libqhullcpp/QhullLinkedList.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullLinkedList.h rename to src/qhull/src/libqhullcpp/QhullLinkedList.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullPoint.cpp b/src/qhull/src/libqhullcpp/QhullPoint.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullPoint.cpp rename to src/qhull/src/libqhullcpp/QhullPoint.cpp diff --git a/xs/src/qhull/src/libqhullcpp/QhullPoint.h b/src/qhull/src/libqhullcpp/QhullPoint.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullPoint.h rename to src/qhull/src/libqhullcpp/QhullPoint.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullPointSet.cpp b/src/qhull/src/libqhullcpp/QhullPointSet.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullPointSet.cpp rename to src/qhull/src/libqhullcpp/QhullPointSet.cpp diff --git a/xs/src/qhull/src/libqhullcpp/QhullPointSet.h b/src/qhull/src/libqhullcpp/QhullPointSet.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullPointSet.h rename to src/qhull/src/libqhullcpp/QhullPointSet.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullPoints.cpp b/src/qhull/src/libqhullcpp/QhullPoints.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullPoints.cpp rename to src/qhull/src/libqhullcpp/QhullPoints.cpp diff --git a/xs/src/qhull/src/libqhullcpp/QhullPoints.h b/src/qhull/src/libqhullcpp/QhullPoints.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullPoints.h rename to src/qhull/src/libqhullcpp/QhullPoints.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullQh.cpp b/src/qhull/src/libqhullcpp/QhullQh.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullQh.cpp rename to src/qhull/src/libqhullcpp/QhullQh.cpp diff --git a/xs/src/qhull/src/libqhullcpp/QhullQh.h b/src/qhull/src/libqhullcpp/QhullQh.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullQh.h rename to src/qhull/src/libqhullcpp/QhullQh.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullRidge.cpp b/src/qhull/src/libqhullcpp/QhullRidge.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullRidge.cpp rename to src/qhull/src/libqhullcpp/QhullRidge.cpp diff --git a/xs/src/qhull/src/libqhullcpp/QhullRidge.h b/src/qhull/src/libqhullcpp/QhullRidge.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullRidge.h rename to src/qhull/src/libqhullcpp/QhullRidge.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullSet.cpp b/src/qhull/src/libqhullcpp/QhullSet.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullSet.cpp rename to src/qhull/src/libqhullcpp/QhullSet.cpp diff --git a/xs/src/qhull/src/libqhullcpp/QhullSet.h b/src/qhull/src/libqhullcpp/QhullSet.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullSet.h rename to src/qhull/src/libqhullcpp/QhullSet.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullSets.h b/src/qhull/src/libqhullcpp/QhullSets.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullSets.h rename to src/qhull/src/libqhullcpp/QhullSets.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullStat.cpp b/src/qhull/src/libqhullcpp/QhullStat.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullStat.cpp rename to src/qhull/src/libqhullcpp/QhullStat.cpp diff --git a/xs/src/qhull/src/libqhullcpp/QhullStat.h b/src/qhull/src/libqhullcpp/QhullStat.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullStat.h rename to src/qhull/src/libqhullcpp/QhullStat.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullVertex.cpp b/src/qhull/src/libqhullcpp/QhullVertex.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullVertex.cpp rename to src/qhull/src/libqhullcpp/QhullVertex.cpp diff --git a/xs/src/qhull/src/libqhullcpp/QhullVertex.h b/src/qhull/src/libqhullcpp/QhullVertex.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullVertex.h rename to src/qhull/src/libqhullcpp/QhullVertex.h diff --git a/xs/src/qhull/src/libqhullcpp/QhullVertexSet.cpp b/src/qhull/src/libqhullcpp/QhullVertexSet.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullVertexSet.cpp rename to src/qhull/src/libqhullcpp/QhullVertexSet.cpp diff --git a/xs/src/qhull/src/libqhullcpp/QhullVertexSet.h b/src/qhull/src/libqhullcpp/QhullVertexSet.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/QhullVertexSet.h rename to src/qhull/src/libqhullcpp/QhullVertexSet.h diff --git a/xs/src/qhull/src/libqhullcpp/RboxPoints.cpp b/src/qhull/src/libqhullcpp/RboxPoints.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/RboxPoints.cpp rename to src/qhull/src/libqhullcpp/RboxPoints.cpp diff --git a/xs/src/qhull/src/libqhullcpp/RboxPoints.h b/src/qhull/src/libqhullcpp/RboxPoints.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/RboxPoints.h rename to src/qhull/src/libqhullcpp/RboxPoints.h diff --git a/xs/src/qhull/src/libqhullcpp/RoadError.cpp b/src/qhull/src/libqhullcpp/RoadError.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/RoadError.cpp rename to src/qhull/src/libqhullcpp/RoadError.cpp diff --git a/xs/src/qhull/src/libqhullcpp/RoadError.h b/src/qhull/src/libqhullcpp/RoadError.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/RoadError.h rename to src/qhull/src/libqhullcpp/RoadError.h diff --git a/xs/src/qhull/src/libqhullcpp/RoadLogEvent.cpp b/src/qhull/src/libqhullcpp/RoadLogEvent.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/RoadLogEvent.cpp rename to src/qhull/src/libqhullcpp/RoadLogEvent.cpp diff --git a/xs/src/qhull/src/libqhullcpp/RoadLogEvent.h b/src/qhull/src/libqhullcpp/RoadLogEvent.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/RoadLogEvent.h rename to src/qhull/src/libqhullcpp/RoadLogEvent.h diff --git a/xs/src/qhull/src/libqhullcpp/functionObjects.h b/src/qhull/src/libqhullcpp/functionObjects.h similarity index 100% rename from xs/src/qhull/src/libqhullcpp/functionObjects.h rename to src/qhull/src/libqhullcpp/functionObjects.h diff --git a/xs/src/qhull/src/libqhullcpp/libqhullcpp.pro b/src/qhull/src/libqhullcpp/libqhullcpp.pro similarity index 100% rename from xs/src/qhull/src/libqhullcpp/libqhullcpp.pro rename to src/qhull/src/libqhullcpp/libqhullcpp.pro diff --git a/xs/src/qhull/src/libqhullcpp/qt-qhull.cpp b/src/qhull/src/libqhullcpp/qt-qhull.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/qt-qhull.cpp rename to src/qhull/src/libqhullcpp/qt-qhull.cpp diff --git a/xs/src/qhull/src/libqhullcpp/usermem_r-cpp.cpp b/src/qhull/src/libqhullcpp/usermem_r-cpp.cpp similarity index 100% rename from xs/src/qhull/src/libqhullcpp/usermem_r-cpp.cpp rename to src/qhull/src/libqhullcpp/usermem_r-cpp.cpp diff --git a/xs/src/qhull/src/libqhullstatic/libqhullstatic.pro b/src/qhull/src/libqhullstatic/libqhullstatic.pro similarity index 100% rename from xs/src/qhull/src/libqhullstatic/libqhullstatic.pro rename to src/qhull/src/libqhullstatic/libqhullstatic.pro diff --git a/xs/src/qhull/src/libqhullstatic_r/libqhullstatic_r.pro b/src/qhull/src/libqhullstatic_r/libqhullstatic_r.pro similarity index 100% rename from xs/src/qhull/src/libqhullstatic_r/libqhullstatic_r.pro rename to src/qhull/src/libqhullstatic_r/libqhullstatic_r.pro diff --git a/xs/src/qhull/src/qconvex/qconvex.c b/src/qhull/src/qconvex/qconvex.c similarity index 100% rename from xs/src/qhull/src/qconvex/qconvex.c rename to src/qhull/src/qconvex/qconvex.c diff --git a/xs/src/qhull/src/qconvex/qconvex.pro b/src/qhull/src/qconvex/qconvex.pro similarity index 100% rename from xs/src/qhull/src/qconvex/qconvex.pro rename to src/qhull/src/qconvex/qconvex.pro diff --git a/xs/src/qhull/src/qconvex/qconvex_r.c b/src/qhull/src/qconvex/qconvex_r.c similarity index 100% rename from xs/src/qhull/src/qconvex/qconvex_r.c rename to src/qhull/src/qconvex/qconvex_r.c diff --git a/xs/src/qhull/src/qdelaunay/qdelaun.c b/src/qhull/src/qdelaunay/qdelaun.c similarity index 100% rename from xs/src/qhull/src/qdelaunay/qdelaun.c rename to src/qhull/src/qdelaunay/qdelaun.c diff --git a/xs/src/qhull/src/qdelaunay/qdelaun_r.c b/src/qhull/src/qdelaunay/qdelaun_r.c similarity index 100% rename from xs/src/qhull/src/qdelaunay/qdelaun_r.c rename to src/qhull/src/qdelaunay/qdelaun_r.c diff --git a/xs/src/qhull/src/qdelaunay/qdelaunay.pro b/src/qhull/src/qdelaunay/qdelaunay.pro similarity index 100% rename from xs/src/qhull/src/qdelaunay/qdelaunay.pro rename to src/qhull/src/qdelaunay/qdelaunay.pro diff --git a/xs/src/qhull/src/qhalf/qhalf.c b/src/qhull/src/qhalf/qhalf.c similarity index 100% rename from xs/src/qhull/src/qhalf/qhalf.c rename to src/qhull/src/qhalf/qhalf.c diff --git a/xs/src/qhull/src/qhalf/qhalf.pro b/src/qhull/src/qhalf/qhalf.pro similarity index 100% rename from xs/src/qhull/src/qhalf/qhalf.pro rename to src/qhull/src/qhalf/qhalf.pro diff --git a/xs/src/qhull/src/qhalf/qhalf_r.c b/src/qhull/src/qhalf/qhalf_r.c similarity index 100% rename from xs/src/qhull/src/qhalf/qhalf_r.c rename to src/qhull/src/qhalf/qhalf_r.c diff --git a/xs/src/qhull/src/qhull-all.pro b/src/qhull/src/qhull-all.pro similarity index 100% rename from xs/src/qhull/src/qhull-all.pro rename to src/qhull/src/qhull-all.pro diff --git a/xs/src/qhull/src/qhull-app-c.pri b/src/qhull/src/qhull-app-c.pri similarity index 100% rename from xs/src/qhull/src/qhull-app-c.pri rename to src/qhull/src/qhull-app-c.pri diff --git a/xs/src/qhull/src/qhull-app-c_r.pri b/src/qhull/src/qhull-app-c_r.pri similarity index 100% rename from xs/src/qhull/src/qhull-app-c_r.pri rename to src/qhull/src/qhull-app-c_r.pri diff --git a/xs/src/qhull/src/qhull-app-cpp.pri b/src/qhull/src/qhull-app-cpp.pri similarity index 100% rename from xs/src/qhull/src/qhull-app-cpp.pri rename to src/qhull/src/qhull-app-cpp.pri diff --git a/xs/src/qhull/src/qhull-app-shared.pri b/src/qhull/src/qhull-app-shared.pri similarity index 100% rename from xs/src/qhull/src/qhull-app-shared.pri rename to src/qhull/src/qhull-app-shared.pri diff --git a/xs/src/qhull/src/qhull-app-shared_r.pri b/src/qhull/src/qhull-app-shared_r.pri similarity index 100% rename from xs/src/qhull/src/qhull-app-shared_r.pri rename to src/qhull/src/qhull-app-shared_r.pri diff --git a/xs/src/qhull/src/qhull-libqhull-src.pri b/src/qhull/src/qhull-libqhull-src.pri similarity index 100% rename from xs/src/qhull/src/qhull-libqhull-src.pri rename to src/qhull/src/qhull-libqhull-src.pri diff --git a/xs/src/qhull/src/qhull-libqhull-src_r.pri b/src/qhull/src/qhull-libqhull-src_r.pri similarity index 100% rename from xs/src/qhull/src/qhull-libqhull-src_r.pri rename to src/qhull/src/qhull-libqhull-src_r.pri diff --git a/xs/src/qhull/src/qhull-warn.pri b/src/qhull/src/qhull-warn.pri similarity index 100% rename from xs/src/qhull/src/qhull-warn.pri rename to src/qhull/src/qhull-warn.pri diff --git a/xs/src/qhull/src/qhull/qhull.pro b/src/qhull/src/qhull/qhull.pro similarity index 100% rename from xs/src/qhull/src/qhull/qhull.pro rename to src/qhull/src/qhull/qhull.pro diff --git a/xs/src/qhull/src/qhull/unix.c b/src/qhull/src/qhull/unix.c similarity index 100% rename from xs/src/qhull/src/qhull/unix.c rename to src/qhull/src/qhull/unix.c diff --git a/xs/src/qhull/src/qhull/unix_r.c b/src/qhull/src/qhull/unix_r.c similarity index 100% rename from xs/src/qhull/src/qhull/unix_r.c rename to src/qhull/src/qhull/unix_r.c diff --git a/xs/src/qhull/src/qhulltest/Coordinates_test.cpp b/src/qhull/src/qhulltest/Coordinates_test.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/Coordinates_test.cpp rename to src/qhull/src/qhulltest/Coordinates_test.cpp diff --git a/xs/src/qhull/src/qhulltest/PointCoordinates_test.cpp b/src/qhull/src/qhulltest/PointCoordinates_test.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/PointCoordinates_test.cpp rename to src/qhull/src/qhulltest/PointCoordinates_test.cpp diff --git a/xs/src/qhull/src/qhulltest/QhullFacetList_test.cpp b/src/qhull/src/qhulltest/QhullFacetList_test.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/QhullFacetList_test.cpp rename to src/qhull/src/qhulltest/QhullFacetList_test.cpp diff --git a/xs/src/qhull/src/qhulltest/QhullFacetSet_test.cpp b/src/qhull/src/qhulltest/QhullFacetSet_test.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/QhullFacetSet_test.cpp rename to src/qhull/src/qhulltest/QhullFacetSet_test.cpp diff --git a/xs/src/qhull/src/qhulltest/QhullFacet_test.cpp b/src/qhull/src/qhulltest/QhullFacet_test.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/QhullFacet_test.cpp rename to src/qhull/src/qhulltest/QhullFacet_test.cpp diff --git a/xs/src/qhull/src/qhulltest/QhullHyperplane_test.cpp b/src/qhull/src/qhulltest/QhullHyperplane_test.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/QhullHyperplane_test.cpp rename to src/qhull/src/qhulltest/QhullHyperplane_test.cpp diff --git a/xs/src/qhull/src/qhulltest/QhullLinkedList_test.cpp b/src/qhull/src/qhulltest/QhullLinkedList_test.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/QhullLinkedList_test.cpp rename to src/qhull/src/qhulltest/QhullLinkedList_test.cpp diff --git a/xs/src/qhull/src/qhulltest/QhullPointSet_test.cpp b/src/qhull/src/qhulltest/QhullPointSet_test.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/QhullPointSet_test.cpp rename to src/qhull/src/qhulltest/QhullPointSet_test.cpp diff --git a/xs/src/qhull/src/qhulltest/QhullPoint_test.cpp b/src/qhull/src/qhulltest/QhullPoint_test.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/QhullPoint_test.cpp rename to src/qhull/src/qhulltest/QhullPoint_test.cpp diff --git a/xs/src/qhull/src/qhulltest/QhullPoints_test.cpp b/src/qhull/src/qhulltest/QhullPoints_test.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/QhullPoints_test.cpp rename to src/qhull/src/qhulltest/QhullPoints_test.cpp diff --git a/xs/src/qhull/src/qhulltest/QhullRidge_test.cpp b/src/qhull/src/qhulltest/QhullRidge_test.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/QhullRidge_test.cpp rename to src/qhull/src/qhulltest/QhullRidge_test.cpp diff --git a/xs/src/qhull/src/qhulltest/QhullSet_test.cpp b/src/qhull/src/qhulltest/QhullSet_test.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/QhullSet_test.cpp rename to src/qhull/src/qhulltest/QhullSet_test.cpp diff --git a/xs/src/qhull/src/qhulltest/QhullVertexSet_test.cpp b/src/qhull/src/qhulltest/QhullVertexSet_test.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/QhullVertexSet_test.cpp rename to src/qhull/src/qhulltest/QhullVertexSet_test.cpp diff --git a/xs/src/qhull/src/qhulltest/QhullVertex_test.cpp b/src/qhull/src/qhulltest/QhullVertex_test.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/QhullVertex_test.cpp rename to src/qhull/src/qhulltest/QhullVertex_test.cpp diff --git a/xs/src/qhull/src/qhulltest/Qhull_test.cpp b/src/qhull/src/qhulltest/Qhull_test.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/Qhull_test.cpp rename to src/qhull/src/qhulltest/Qhull_test.cpp diff --git a/xs/src/qhull/src/qhulltest/RboxPoints_test.cpp b/src/qhull/src/qhulltest/RboxPoints_test.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/RboxPoints_test.cpp rename to src/qhull/src/qhulltest/RboxPoints_test.cpp diff --git a/xs/src/qhull/src/qhulltest/RoadTest.cpp b/src/qhull/src/qhulltest/RoadTest.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/RoadTest.cpp rename to src/qhull/src/qhulltest/RoadTest.cpp diff --git a/xs/src/qhull/src/qhulltest/RoadTest.h b/src/qhull/src/qhulltest/RoadTest.h similarity index 100% rename from xs/src/qhull/src/qhulltest/RoadTest.h rename to src/qhull/src/qhulltest/RoadTest.h diff --git a/xs/src/qhull/src/qhulltest/qhulltest.cpp b/src/qhull/src/qhulltest/qhulltest.cpp similarity index 100% rename from xs/src/qhull/src/qhulltest/qhulltest.cpp rename to src/qhull/src/qhulltest/qhulltest.cpp diff --git a/xs/src/qhull/src/qhulltest/qhulltest.pro b/src/qhull/src/qhulltest/qhulltest.pro similarity index 100% rename from xs/src/qhull/src/qhulltest/qhulltest.pro rename to src/qhull/src/qhulltest/qhulltest.pro diff --git a/xs/src/qhull/src/qvoronoi/qvoronoi.c b/src/qhull/src/qvoronoi/qvoronoi.c similarity index 100% rename from xs/src/qhull/src/qvoronoi/qvoronoi.c rename to src/qhull/src/qvoronoi/qvoronoi.c diff --git a/xs/src/qhull/src/qvoronoi/qvoronoi.pro b/src/qhull/src/qvoronoi/qvoronoi.pro similarity index 100% rename from xs/src/qhull/src/qvoronoi/qvoronoi.pro rename to src/qhull/src/qvoronoi/qvoronoi.pro diff --git a/xs/src/qhull/src/qvoronoi/qvoronoi_r.c b/src/qhull/src/qvoronoi/qvoronoi_r.c similarity index 100% rename from xs/src/qhull/src/qvoronoi/qvoronoi_r.c rename to src/qhull/src/qvoronoi/qvoronoi_r.c diff --git a/xs/src/qhull/src/rbox/rbox.c b/src/qhull/src/rbox/rbox.c similarity index 100% rename from xs/src/qhull/src/rbox/rbox.c rename to src/qhull/src/rbox/rbox.c diff --git a/xs/src/qhull/src/rbox/rbox.pro b/src/qhull/src/rbox/rbox.pro similarity index 100% rename from xs/src/qhull/src/rbox/rbox.pro rename to src/qhull/src/rbox/rbox.pro diff --git a/xs/src/qhull/src/rbox/rbox_r.c b/src/qhull/src/rbox/rbox_r.c similarity index 100% rename from xs/src/qhull/src/rbox/rbox_r.c rename to src/qhull/src/rbox/rbox_r.c diff --git a/xs/src/qhull/src/testqset/testqset.c b/src/qhull/src/testqset/testqset.c similarity index 100% rename from xs/src/qhull/src/testqset/testqset.c rename to src/qhull/src/testqset/testqset.c diff --git a/xs/src/qhull/src/testqset/testqset.pro b/src/qhull/src/testqset/testqset.pro similarity index 100% rename from xs/src/qhull/src/testqset/testqset.pro rename to src/qhull/src/testqset/testqset.pro diff --git a/xs/src/qhull/src/testqset_r/testqset_r.c b/src/qhull/src/testqset_r/testqset_r.c similarity index 100% rename from xs/src/qhull/src/testqset_r/testqset_r.c rename to src/qhull/src/testqset_r/testqset_r.c diff --git a/xs/src/qhull/src/testqset_r/testqset_r.pro b/src/qhull/src/testqset_r/testqset_r.pro similarity index 100% rename from xs/src/qhull/src/testqset_r/testqset_r.pro rename to src/qhull/src/testqset_r/testqset_r.pro diff --git a/xs/src/qhull/src/user_eg/user_eg.c b/src/qhull/src/user_eg/user_eg.c similarity index 100% rename from xs/src/qhull/src/user_eg/user_eg.c rename to src/qhull/src/user_eg/user_eg.c diff --git a/xs/src/qhull/src/user_eg/user_eg.pro b/src/qhull/src/user_eg/user_eg.pro similarity index 100% rename from xs/src/qhull/src/user_eg/user_eg.pro rename to src/qhull/src/user_eg/user_eg.pro diff --git a/xs/src/qhull/src/user_eg/user_eg_r.c b/src/qhull/src/user_eg/user_eg_r.c similarity index 100% rename from xs/src/qhull/src/user_eg/user_eg_r.c rename to src/qhull/src/user_eg/user_eg_r.c diff --git a/xs/src/qhull/src/user_eg2/user_eg2.c b/src/qhull/src/user_eg2/user_eg2.c similarity index 100% rename from xs/src/qhull/src/user_eg2/user_eg2.c rename to src/qhull/src/user_eg2/user_eg2.c diff --git a/xs/src/qhull/src/user_eg2/user_eg2.pro b/src/qhull/src/user_eg2/user_eg2.pro similarity index 100% rename from xs/src/qhull/src/user_eg2/user_eg2.pro rename to src/qhull/src/user_eg2/user_eg2.pro diff --git a/xs/src/qhull/src/user_eg2/user_eg2_r.c b/src/qhull/src/user_eg2/user_eg2_r.c similarity index 100% rename from xs/src/qhull/src/user_eg2/user_eg2_r.c rename to src/qhull/src/user_eg2/user_eg2_r.c diff --git a/xs/src/qhull/src/user_eg3/user_eg3.pro b/src/qhull/src/user_eg3/user_eg3.pro similarity index 100% rename from xs/src/qhull/src/user_eg3/user_eg3.pro rename to src/qhull/src/user_eg3/user_eg3.pro diff --git a/xs/src/qhull/src/user_eg3/user_eg3_r.cpp b/src/qhull/src/user_eg3/user_eg3_r.cpp similarity index 100% rename from xs/src/qhull/src/user_eg3/user_eg3_r.cpp rename to src/qhull/src/user_eg3/user_eg3_r.cpp diff --git a/src/semver/CMakeLists.txt b/src/semver/CMakeLists.txt new file mode 100644 index 0000000000..e3457bf291 --- /dev/null +++ b/src/semver/CMakeLists.txt @@ -0,0 +1,7 @@ +project(semver) +cmake_minimum_required(VERSION 2.6) + +add_library(semver STATIC + semver.c + semver.h +) diff --git a/xs/src/semver/semver.c b/src/semver/semver.c similarity index 100% rename from xs/src/semver/semver.c rename to src/semver/semver.c diff --git a/xs/src/semver/semver.h b/src/semver/semver.h similarity index 100% rename from xs/src/semver/semver.h rename to src/semver/semver.h diff --git a/src/slic3r.cpp b/src/slic3r.cpp index 085b396862..8174ba0a2b 100644 --- a/src/slic3r.cpp +++ b/src/slic3r.cpp @@ -12,8 +12,83 @@ #include #include +#include "slic3r/GUI/GUI.hpp" + using namespace Slic3r; +// wxWidgets "Hello world" Program +// For compilers that support precompilation, includes "wx/wx.h". +#include +#ifndef WX_PRECOMP + #include +#endif +class MyApp: public wxApp +{ +public: + virtual bool OnInit(); +}; +class MyFrame: public wxFrame +{ +public: + MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size); +private: + void OnHello(wxCommandEvent& event); + void OnExit(wxCommandEvent& event); + void OnAbout(wxCommandEvent& event); + wxDECLARE_EVENT_TABLE(); +}; +enum +{ + ID_Hello = 1 +}; +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) + EVT_MENU(ID_Hello, MyFrame::OnHello) + EVT_MENU(wxID_EXIT, MyFrame::OnExit) + EVT_MENU(wxID_ABOUT, MyFrame::OnAbout) +wxEND_EVENT_TABLE() +bool MyApp::OnInit() +{ + MyFrame *frame = new MyFrame( "Hello World", wxPoint(50, 50), wxSize(450, 340) ); + frame->Show( true ); + return true; +} +MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) + : wxFrame(NULL, wxID_ANY, title, pos, size) +{ + wxMenu *menuFile = new wxMenu; + menuFile->Append(ID_Hello, "&Hello...\tCtrl-H", + "Help string shown in status bar for this menu item"); + menuFile->AppendSeparator(); + menuFile->Append(wxID_EXIT); + wxMenu *menuHelp = new wxMenu; + menuHelp->Append(wxID_ABOUT); + wxMenuBar *menuBar = new wxMenuBar; + menuBar->Append( menuFile, "&File" ); + menuBar->Append( menuHelp, "&Help" ); + SetMenuBar( menuBar ); + CreateStatusBar(); + SetStatusText( "Welcome to wxWidgets!" ); + Slic3r::Model model; + ModelObject *object = model.add_object(); + SetStatusText(Slic3r::GUI::from_u8("HHuhuh")); +} + +void MyFrame::OnExit(wxCommandEvent& event) +{ + Close( true ); +} +void MyFrame::OnAbout(wxCommandEvent& event) +{ + wxMessageBox( "This is a wxWidgets' Hello world sample", + "About Hello World", wxOK | wxICON_INFORMATION ); +} +void MyFrame::OnHello(wxCommandEvent& event) +{ + wxLogMessage("Hello world from wxWidgets!"); +} + + +#if 1 int main(int argc, char **argv) { @@ -176,5 +251,11 @@ main(int argc, char **argv) } #endif + + MyApp *gui = new MyApp(); + + MyApp::SetInstance(gui); + wxEntry(argc, argv); return 0; } +#endif diff --git a/xs/src/slic3r/AppController.cpp b/src/slic3r/AppController.cpp similarity index 100% rename from xs/src/slic3r/AppController.cpp rename to src/slic3r/AppController.cpp diff --git a/xs/src/slic3r/AppController.hpp b/src/slic3r/AppController.hpp similarity index 100% rename from xs/src/slic3r/AppController.hpp rename to src/slic3r/AppController.hpp diff --git a/xs/src/slic3r/AppControllerWx.cpp b/src/slic3r/AppControllerWx.cpp similarity index 100% rename from xs/src/slic3r/AppControllerWx.cpp rename to src/slic3r/AppControllerWx.cpp diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt new file mode 100644 index 0000000000..e4dfd35ea5 --- /dev/null +++ b/src/slic3r/CMakeLists.txt @@ -0,0 +1,106 @@ +add_library(libslic3r_gui STATIC + ${LIBDIR}/slic3r/GUI/AboutDialog.cpp + ${LIBDIR}/slic3r/GUI/AboutDialog.hpp + ${LIBDIR}/slic3r/GUI/AppConfig.cpp + ${LIBDIR}/slic3r/GUI/AppConfig.hpp + ${LIBDIR}/slic3r/GUI/BackgroundSlicingProcess.cpp + ${LIBDIR}/slic3r/GUI/BackgroundSlicingProcess.hpp + ${LIBDIR}/slic3r/GUI/BitmapCache.cpp + ${LIBDIR}/slic3r/GUI/BitmapCache.hpp + ${LIBDIR}/slic3r/GUI/ConfigSnapshotDialog.cpp + ${LIBDIR}/slic3r/GUI/ConfigSnapshotDialog.hpp + ${LIBDIR}/slic3r/GUI/3DScene.cpp + ${LIBDIR}/slic3r/GUI/3DScene.hpp + ${LIBDIR}/slic3r/GUI/GLShader.cpp + ${LIBDIR}/slic3r/GUI/GLShader.hpp + ${LIBDIR}/slic3r/GUI/GLCanvas3D.hpp + ${LIBDIR}/slic3r/GUI/GLCanvas3D.cpp + ${LIBDIR}/slic3r/GUI/GLCanvas3DManager.hpp + ${LIBDIR}/slic3r/GUI/GLCanvas3DManager.cpp + ${LIBDIR}/slic3r/GUI/GLGizmo.hpp + ${LIBDIR}/slic3r/GUI/GLGizmo.cpp + ${LIBDIR}/slic3r/GUI/GLTexture.hpp + ${LIBDIR}/slic3r/GUI/GLTexture.cpp + ${LIBDIR}/slic3r/GUI/GLToolbar.hpp + ${LIBDIR}/slic3r/GUI/GLToolbar.cpp + ${LIBDIR}/slic3r/GUI/Preferences.cpp + ${LIBDIR}/slic3r/GUI/Preferences.hpp + ${LIBDIR}/slic3r/GUI/Preset.cpp + ${LIBDIR}/slic3r/GUI/Preset.hpp + ${LIBDIR}/slic3r/GUI/PresetBundle.cpp + ${LIBDIR}/slic3r/GUI/PresetBundle.hpp + ${LIBDIR}/slic3r/GUI/PresetHints.cpp + ${LIBDIR}/slic3r/GUI/PresetHints.hpp + ${LIBDIR}/slic3r/GUI/GUI.cpp + ${LIBDIR}/slic3r/GUI/GUI.hpp + ${LIBDIR}/slic3r/GUI/GUI_ObjectParts.cpp + ${LIBDIR}/slic3r/GUI/GUI_ObjectParts.hpp + ${LIBDIR}/slic3r/GUI/LambdaObjectDialog.cpp + ${LIBDIR}/slic3r/GUI/LambdaObjectDialog.hpp + ${LIBDIR}/slic3r/GUI/Tab.cpp + ${LIBDIR}/slic3r/GUI/Tab.hpp + ${LIBDIR}/slic3r/GUI/TabIface.cpp + ${LIBDIR}/slic3r/GUI/TabIface.hpp + ${LIBDIR}/slic3r/GUI/Field.cpp + ${LIBDIR}/slic3r/GUI/Field.hpp + ${LIBDIR}/slic3r/GUI/OptionsGroup.cpp + ${LIBDIR}/slic3r/GUI/OptionsGroup.hpp + ${LIBDIR}/slic3r/GUI/BedShapeDialog.cpp + ${LIBDIR}/slic3r/GUI/BedShapeDialog.hpp + ${LIBDIR}/slic3r/GUI/2DBed.cpp + ${LIBDIR}/slic3r/GUI/2DBed.hpp + ${LIBDIR}/slic3r/GUI/wxExtensions.cpp + ${LIBDIR}/slic3r/GUI/wxExtensions.hpp + ${LIBDIR}/slic3r/GUI/WipeTowerDialog.cpp + ${LIBDIR}/slic3r/GUI/WipeTowerDialog.hpp + ${LIBDIR}/slic3r/GUI/RammingChart.cpp + ${LIBDIR}/slic3r/GUI/RammingChart.hpp + ${LIBDIR}/slic3r/GUI/BonjourDialog.cpp + ${LIBDIR}/slic3r/GUI/BonjourDialog.hpp + ${LIBDIR}/slic3r/GUI/ButtonsDescription.cpp + ${LIBDIR}/slic3r/GUI/ButtonsDescription.hpp + ${LIBDIR}/slic3r/Config/Snapshot.cpp + ${LIBDIR}/slic3r/Config/Snapshot.hpp + ${LIBDIR}/slic3r/Config/Version.cpp + ${LIBDIR}/slic3r/Config/Version.hpp + ${LIBDIR}/slic3r/Utils/ASCIIFolding.cpp + ${LIBDIR}/slic3r/Utils/ASCIIFolding.hpp + ${LIBDIR}/slic3r/Utils/Serial.cpp + ${LIBDIR}/slic3r/Utils/Serial.hpp + ${LIBDIR}/slic3r/GUI/ConfigWizard.cpp + ${LIBDIR}/slic3r/GUI/ConfigWizard.hpp + ${LIBDIR}/slic3r/GUI/MsgDialog.cpp + ${LIBDIR}/slic3r/GUI/MsgDialog.hpp + ${LIBDIR}/slic3r/GUI/UpdateDialogs.cpp + ${LIBDIR}/slic3r/GUI/UpdateDialogs.hpp + ${LIBDIR}/slic3r/GUI/FirmwareDialog.cpp + ${LIBDIR}/slic3r/GUI/FirmwareDialog.hpp + ${LIBDIR}/slic3r/GUI/ProgressIndicator.hpp + ${LIBDIR}/slic3r/GUI/ProgressStatusBar.hpp + ${LIBDIR}/slic3r/GUI/ProgressStatusBar.cpp + ${LIBDIR}/slic3r/Utils/Http.cpp + ${LIBDIR}/slic3r/Utils/Http.hpp + ${LIBDIR}/slic3r/Utils/FixModelByWin10.cpp + ${LIBDIR}/slic3r/Utils/FixModelByWin10.hpp + ${LIBDIR}/slic3r/Utils/PrintHostSendDialog.cpp + ${LIBDIR}/slic3r/Utils/PrintHostSendDialog.hpp + ${LIBDIR}/slic3r/Utils/OctoPrint.cpp + ${LIBDIR}/slic3r/Utils/OctoPrint.hpp + ${LIBDIR}/slic3r/Utils/Duet.cpp + ${LIBDIR}/slic3r/Utils/Duet.hpp + ${LIBDIR}/slic3r/Utils/PrintHost.cpp + ${LIBDIR}/slic3r/Utils/PrintHost.hpp + ${LIBDIR}/slic3r/Utils/Bonjour.cpp + ${LIBDIR}/slic3r/Utils/Bonjour.hpp + ${LIBDIR}/slic3r/Utils/PresetUpdater.cpp + ${LIBDIR}/slic3r/Utils/PresetUpdater.hpp + ${LIBDIR}/slic3r/Utils/Time.cpp + ${LIBDIR}/slic3r/Utils/Time.hpp + ${LIBDIR}/slic3r/Utils/HexFile.cpp + ${LIBDIR}/slic3r/Utils/HexFile.hpp + ${LIBDIR}/slic3r/AppController.hpp + ${LIBDIR}/slic3r/AppController.cpp + ${LIBDIR}/slic3r/AppControllerWx.cpp +) + +target_link_libraries(libslic3r_gui libslic3r avrdude) diff --git a/xs/src/slic3r/Config/Snapshot.cpp b/src/slic3r/Config/Snapshot.cpp similarity index 100% rename from xs/src/slic3r/Config/Snapshot.cpp rename to src/slic3r/Config/Snapshot.cpp diff --git a/xs/src/slic3r/Config/Snapshot.hpp b/src/slic3r/Config/Snapshot.hpp similarity index 100% rename from xs/src/slic3r/Config/Snapshot.hpp rename to src/slic3r/Config/Snapshot.hpp diff --git a/xs/src/slic3r/Config/Version.cpp b/src/slic3r/Config/Version.cpp similarity index 100% rename from xs/src/slic3r/Config/Version.cpp rename to src/slic3r/Config/Version.cpp diff --git a/xs/src/slic3r/Config/Version.hpp b/src/slic3r/Config/Version.hpp similarity index 100% rename from xs/src/slic3r/Config/Version.hpp rename to src/slic3r/Config/Version.hpp diff --git a/xs/src/slic3r/GUI/2DBed.cpp b/src/slic3r/GUI/2DBed.cpp similarity index 100% rename from xs/src/slic3r/GUI/2DBed.cpp rename to src/slic3r/GUI/2DBed.cpp diff --git a/xs/src/slic3r/GUI/2DBed.hpp b/src/slic3r/GUI/2DBed.hpp similarity index 100% rename from xs/src/slic3r/GUI/2DBed.hpp rename to src/slic3r/GUI/2DBed.hpp diff --git a/xs/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp similarity index 100% rename from xs/src/slic3r/GUI/3DScene.cpp rename to src/slic3r/GUI/3DScene.cpp diff --git a/xs/src/slic3r/GUI/3DScene.hpp b/src/slic3r/GUI/3DScene.hpp similarity index 100% rename from xs/src/slic3r/GUI/3DScene.hpp rename to src/slic3r/GUI/3DScene.hpp diff --git a/xs/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp similarity index 100% rename from xs/src/slic3r/GUI/AboutDialog.cpp rename to src/slic3r/GUI/AboutDialog.cpp diff --git a/xs/src/slic3r/GUI/AboutDialog.hpp b/src/slic3r/GUI/AboutDialog.hpp similarity index 100% rename from xs/src/slic3r/GUI/AboutDialog.hpp rename to src/slic3r/GUI/AboutDialog.hpp diff --git a/xs/src/slic3r/GUI/AppConfig.cpp b/src/slic3r/GUI/AppConfig.cpp similarity index 100% rename from xs/src/slic3r/GUI/AppConfig.cpp rename to src/slic3r/GUI/AppConfig.cpp diff --git a/xs/src/slic3r/GUI/AppConfig.hpp b/src/slic3r/GUI/AppConfig.hpp similarity index 100% rename from xs/src/slic3r/GUI/AppConfig.hpp rename to src/slic3r/GUI/AppConfig.hpp diff --git a/xs/src/slic3r/GUI/BackgroundSlicingProcess.cpp b/src/slic3r/GUI/BackgroundSlicingProcess.cpp similarity index 100% rename from xs/src/slic3r/GUI/BackgroundSlicingProcess.cpp rename to src/slic3r/GUI/BackgroundSlicingProcess.cpp diff --git a/xs/src/slic3r/GUI/BackgroundSlicingProcess.hpp b/src/slic3r/GUI/BackgroundSlicingProcess.hpp similarity index 100% rename from xs/src/slic3r/GUI/BackgroundSlicingProcess.hpp rename to src/slic3r/GUI/BackgroundSlicingProcess.hpp diff --git a/xs/src/slic3r/GUI/BedShapeDialog.cpp b/src/slic3r/GUI/BedShapeDialog.cpp similarity index 100% rename from xs/src/slic3r/GUI/BedShapeDialog.cpp rename to src/slic3r/GUI/BedShapeDialog.cpp diff --git a/xs/src/slic3r/GUI/BedShapeDialog.hpp b/src/slic3r/GUI/BedShapeDialog.hpp similarity index 100% rename from xs/src/slic3r/GUI/BedShapeDialog.hpp rename to src/slic3r/GUI/BedShapeDialog.hpp diff --git a/xs/src/slic3r/GUI/BitmapCache.cpp b/src/slic3r/GUI/BitmapCache.cpp similarity index 100% rename from xs/src/slic3r/GUI/BitmapCache.cpp rename to src/slic3r/GUI/BitmapCache.cpp diff --git a/xs/src/slic3r/GUI/BitmapCache.hpp b/src/slic3r/GUI/BitmapCache.hpp similarity index 100% rename from xs/src/slic3r/GUI/BitmapCache.hpp rename to src/slic3r/GUI/BitmapCache.hpp diff --git a/xs/src/slic3r/GUI/BonjourDialog.cpp b/src/slic3r/GUI/BonjourDialog.cpp similarity index 100% rename from xs/src/slic3r/GUI/BonjourDialog.cpp rename to src/slic3r/GUI/BonjourDialog.cpp diff --git a/xs/src/slic3r/GUI/BonjourDialog.hpp b/src/slic3r/GUI/BonjourDialog.hpp similarity index 100% rename from xs/src/slic3r/GUI/BonjourDialog.hpp rename to src/slic3r/GUI/BonjourDialog.hpp diff --git a/xs/src/slic3r/GUI/ButtonsDescription.cpp b/src/slic3r/GUI/ButtonsDescription.cpp similarity index 100% rename from xs/src/slic3r/GUI/ButtonsDescription.cpp rename to src/slic3r/GUI/ButtonsDescription.cpp diff --git a/xs/src/slic3r/GUI/ButtonsDescription.hpp b/src/slic3r/GUI/ButtonsDescription.hpp similarity index 100% rename from xs/src/slic3r/GUI/ButtonsDescription.hpp rename to src/slic3r/GUI/ButtonsDescription.hpp diff --git a/xs/src/slic3r/GUI/ConfigExceptions.hpp b/src/slic3r/GUI/ConfigExceptions.hpp similarity index 100% rename from xs/src/slic3r/GUI/ConfigExceptions.hpp rename to src/slic3r/GUI/ConfigExceptions.hpp diff --git a/xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp b/src/slic3r/GUI/ConfigSnapshotDialog.cpp similarity index 100% rename from xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp rename to src/slic3r/GUI/ConfigSnapshotDialog.cpp diff --git a/xs/src/slic3r/GUI/ConfigSnapshotDialog.hpp b/src/slic3r/GUI/ConfigSnapshotDialog.hpp similarity index 100% rename from xs/src/slic3r/GUI/ConfigSnapshotDialog.hpp rename to src/slic3r/GUI/ConfigSnapshotDialog.hpp diff --git a/xs/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp similarity index 100% rename from xs/src/slic3r/GUI/ConfigWizard.cpp rename to src/slic3r/GUI/ConfigWizard.cpp diff --git a/xs/src/slic3r/GUI/ConfigWizard.hpp b/src/slic3r/GUI/ConfigWizard.hpp similarity index 100% rename from xs/src/slic3r/GUI/ConfigWizard.hpp rename to src/slic3r/GUI/ConfigWizard.hpp diff --git a/xs/src/slic3r/GUI/ConfigWizard_private.hpp b/src/slic3r/GUI/ConfigWizard_private.hpp similarity index 100% rename from xs/src/slic3r/GUI/ConfigWizard_private.hpp rename to src/slic3r/GUI/ConfigWizard_private.hpp diff --git a/xs/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp similarity index 100% rename from xs/src/slic3r/GUI/Field.cpp rename to src/slic3r/GUI/Field.cpp diff --git a/xs/src/slic3r/GUI/Field.hpp b/src/slic3r/GUI/Field.hpp similarity index 100% rename from xs/src/slic3r/GUI/Field.hpp rename to src/slic3r/GUI/Field.hpp diff --git a/xs/src/slic3r/GUI/FirmwareDialog.cpp b/src/slic3r/GUI/FirmwareDialog.cpp similarity index 100% rename from xs/src/slic3r/GUI/FirmwareDialog.cpp rename to src/slic3r/GUI/FirmwareDialog.cpp diff --git a/xs/src/slic3r/GUI/FirmwareDialog.hpp b/src/slic3r/GUI/FirmwareDialog.hpp similarity index 100% rename from xs/src/slic3r/GUI/FirmwareDialog.hpp rename to src/slic3r/GUI/FirmwareDialog.hpp diff --git a/xs/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp similarity index 100% rename from xs/src/slic3r/GUI/GLCanvas3D.cpp rename to src/slic3r/GUI/GLCanvas3D.cpp diff --git a/xs/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp similarity index 100% rename from xs/src/slic3r/GUI/GLCanvas3D.hpp rename to src/slic3r/GUI/GLCanvas3D.hpp diff --git a/xs/src/slic3r/GUI/GLCanvas3DManager.cpp b/src/slic3r/GUI/GLCanvas3DManager.cpp similarity index 100% rename from xs/src/slic3r/GUI/GLCanvas3DManager.cpp rename to src/slic3r/GUI/GLCanvas3DManager.cpp diff --git a/xs/src/slic3r/GUI/GLCanvas3DManager.hpp b/src/slic3r/GUI/GLCanvas3DManager.hpp similarity index 100% rename from xs/src/slic3r/GUI/GLCanvas3DManager.hpp rename to src/slic3r/GUI/GLCanvas3DManager.hpp diff --git a/xs/src/slic3r/GUI/GLGizmo.cpp b/src/slic3r/GUI/GLGizmo.cpp similarity index 100% rename from xs/src/slic3r/GUI/GLGizmo.cpp rename to src/slic3r/GUI/GLGizmo.cpp diff --git a/xs/src/slic3r/GUI/GLGizmo.hpp b/src/slic3r/GUI/GLGizmo.hpp similarity index 100% rename from xs/src/slic3r/GUI/GLGizmo.hpp rename to src/slic3r/GUI/GLGizmo.hpp diff --git a/xs/src/slic3r/GUI/GLShader.cpp b/src/slic3r/GUI/GLShader.cpp similarity index 100% rename from xs/src/slic3r/GUI/GLShader.cpp rename to src/slic3r/GUI/GLShader.cpp diff --git a/xs/src/slic3r/GUI/GLShader.hpp b/src/slic3r/GUI/GLShader.hpp similarity index 100% rename from xs/src/slic3r/GUI/GLShader.hpp rename to src/slic3r/GUI/GLShader.hpp diff --git a/xs/src/slic3r/GUI/GLTexture.cpp b/src/slic3r/GUI/GLTexture.cpp similarity index 100% rename from xs/src/slic3r/GUI/GLTexture.cpp rename to src/slic3r/GUI/GLTexture.cpp diff --git a/xs/src/slic3r/GUI/GLTexture.hpp b/src/slic3r/GUI/GLTexture.hpp similarity index 100% rename from xs/src/slic3r/GUI/GLTexture.hpp rename to src/slic3r/GUI/GLTexture.hpp diff --git a/xs/src/slic3r/GUI/GLToolbar.cpp b/src/slic3r/GUI/GLToolbar.cpp similarity index 100% rename from xs/src/slic3r/GUI/GLToolbar.cpp rename to src/slic3r/GUI/GLToolbar.cpp diff --git a/xs/src/slic3r/GUI/GLToolbar.hpp b/src/slic3r/GUI/GLToolbar.hpp similarity index 100% rename from xs/src/slic3r/GUI/GLToolbar.hpp rename to src/slic3r/GUI/GLToolbar.hpp diff --git a/xs/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp similarity index 99% rename from xs/src/slic3r/GUI/GUI.cpp rename to src/slic3r/GUI/GUI.cpp index decdb5691d..24d459921d 100644 --- a/xs/src/slic3r/GUI/GUI.cpp +++ b/src/slic3r/GUI/GUI.cpp @@ -46,6 +46,8 @@ #include "Tab.hpp" #include "TabIface.hpp" +#include "GUI_Preview.hpp" +#include "GUI_PreviewIface.hpp" #include "AboutDialog.hpp" #include "AppConfig.hpp" #include "ConfigSnapshotDialog.hpp" @@ -148,6 +150,8 @@ wxStaticBitmap *g_manifold_warning_icon = nullptr; bool g_show_print_info = false; bool g_show_manifold_warning_icon = false; +PreviewIface* g_preview = nullptr; + static void init_label_colours() { auto luma = get_colour_approx_luma(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); @@ -665,6 +669,17 @@ TabIface* get_preset_tab_iface(char *name) return new TabIface(nullptr); } +PreviewIface* create_preview_iface(wxNotebook* parent, DynamicPrintConfig* config, Print* print, GCodePreviewData* gcode_preview_data) +{ + if (g_preview == nullptr) + { + Preview* panel = new Preview(parent, config, print, gcode_preview_data); + g_preview = new PreviewIface(panel); + } + + return g_preview; +} + // opt_index = 0, by the reason of zero-index in ConfigOptionVector by default (in case only one element) void change_opt_value(DynamicPrintConfig& config, const t_config_option_key& opt_key, const boost::any& value, int opt_index /*= 0*/) { diff --git a/xs/src/slic3r/GUI/GUI.hpp b/src/slic3r/GUI/GUI.hpp similarity index 97% rename from xs/src/slic3r/GUI/GUI.hpp rename to src/slic3r/GUI/GUI.hpp index 998b572b98..8dfaf42c66 100644 --- a/xs/src/slic3r/GUI/GUI.hpp +++ b/src/slic3r/GUI/GUI.hpp @@ -39,6 +39,9 @@ class AppConfig; class PresetUpdater; class DynamicPrintConfig; class TabIface; +class PreviewIface; +class Print; +class GCodePreviewData; #define _(s) Slic3r::GUI::I18N::translate((s)) @@ -165,6 +168,8 @@ extern void open_preferences_dialog(int event_preferences); void create_preset_tabs(int event_value_change, int event_presets_changed); TabIface* get_preset_tab_iface(char *name); +PreviewIface* create_preview_iface(wxNotebook* notebook, DynamicPrintConfig* config, Print* print, GCodePreviewData* gcode_preview_data); + // add it at the end of the tab panel. void add_created_tab(Tab* panel, int event_value_change, int event_presets_changed); // Change option value in config diff --git a/xs/src/slic3r/GUI/GUI_ObjectParts.cpp b/src/slic3r/GUI/GUI_ObjectParts.cpp similarity index 100% rename from xs/src/slic3r/GUI/GUI_ObjectParts.cpp rename to src/slic3r/GUI/GUI_ObjectParts.cpp diff --git a/xs/src/slic3r/GUI/GUI_ObjectParts.hpp b/src/slic3r/GUI/GUI_ObjectParts.hpp similarity index 100% rename from xs/src/slic3r/GUI/GUI_ObjectParts.hpp rename to src/slic3r/GUI/GUI_ObjectParts.hpp diff --git a/xs/src/slic3r/GUI/LambdaObjectDialog.cpp b/src/slic3r/GUI/LambdaObjectDialog.cpp similarity index 100% rename from xs/src/slic3r/GUI/LambdaObjectDialog.cpp rename to src/slic3r/GUI/LambdaObjectDialog.cpp diff --git a/xs/src/slic3r/GUI/LambdaObjectDialog.hpp b/src/slic3r/GUI/LambdaObjectDialog.hpp similarity index 100% rename from xs/src/slic3r/GUI/LambdaObjectDialog.hpp rename to src/slic3r/GUI/LambdaObjectDialog.hpp diff --git a/xs/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp similarity index 100% rename from xs/src/slic3r/GUI/MsgDialog.cpp rename to src/slic3r/GUI/MsgDialog.cpp diff --git a/xs/src/slic3r/GUI/MsgDialog.hpp b/src/slic3r/GUI/MsgDialog.hpp similarity index 100% rename from xs/src/slic3r/GUI/MsgDialog.hpp rename to src/slic3r/GUI/MsgDialog.hpp diff --git a/xs/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp similarity index 100% rename from xs/src/slic3r/GUI/OptionsGroup.cpp rename to src/slic3r/GUI/OptionsGroup.cpp diff --git a/xs/src/slic3r/GUI/OptionsGroup.hpp b/src/slic3r/GUI/OptionsGroup.hpp similarity index 100% rename from xs/src/slic3r/GUI/OptionsGroup.hpp rename to src/slic3r/GUI/OptionsGroup.hpp diff --git a/xs/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp similarity index 100% rename from xs/src/slic3r/GUI/Preferences.cpp rename to src/slic3r/GUI/Preferences.cpp diff --git a/xs/src/slic3r/GUI/Preferences.hpp b/src/slic3r/GUI/Preferences.hpp similarity index 100% rename from xs/src/slic3r/GUI/Preferences.hpp rename to src/slic3r/GUI/Preferences.hpp diff --git a/xs/src/slic3r/GUI/Preset.cpp b/src/slic3r/GUI/Preset.cpp similarity index 100% rename from xs/src/slic3r/GUI/Preset.cpp rename to src/slic3r/GUI/Preset.cpp diff --git a/xs/src/slic3r/GUI/Preset.hpp b/src/slic3r/GUI/Preset.hpp similarity index 100% rename from xs/src/slic3r/GUI/Preset.hpp rename to src/slic3r/GUI/Preset.hpp diff --git a/xs/src/slic3r/GUI/PresetBundle.cpp b/src/slic3r/GUI/PresetBundle.cpp similarity index 100% rename from xs/src/slic3r/GUI/PresetBundle.cpp rename to src/slic3r/GUI/PresetBundle.cpp diff --git a/xs/src/slic3r/GUI/PresetBundle.hpp b/src/slic3r/GUI/PresetBundle.hpp similarity index 100% rename from xs/src/slic3r/GUI/PresetBundle.hpp rename to src/slic3r/GUI/PresetBundle.hpp diff --git a/xs/src/slic3r/GUI/PresetHints.cpp b/src/slic3r/GUI/PresetHints.cpp similarity index 100% rename from xs/src/slic3r/GUI/PresetHints.cpp rename to src/slic3r/GUI/PresetHints.cpp diff --git a/xs/src/slic3r/GUI/PresetHints.hpp b/src/slic3r/GUI/PresetHints.hpp similarity index 100% rename from xs/src/slic3r/GUI/PresetHints.hpp rename to src/slic3r/GUI/PresetHints.hpp diff --git a/xs/src/slic3r/GUI/ProgressIndicator.hpp b/src/slic3r/GUI/ProgressIndicator.hpp similarity index 100% rename from xs/src/slic3r/GUI/ProgressIndicator.hpp rename to src/slic3r/GUI/ProgressIndicator.hpp diff --git a/xs/src/slic3r/GUI/ProgressStatusBar.cpp b/src/slic3r/GUI/ProgressStatusBar.cpp similarity index 100% rename from xs/src/slic3r/GUI/ProgressStatusBar.cpp rename to src/slic3r/GUI/ProgressStatusBar.cpp diff --git a/xs/src/slic3r/GUI/ProgressStatusBar.hpp b/src/slic3r/GUI/ProgressStatusBar.hpp similarity index 98% rename from xs/src/slic3r/GUI/ProgressStatusBar.hpp rename to src/slic3r/GUI/ProgressStatusBar.hpp index 9a7f58eee7..7c2171a5e3 100644 --- a/xs/src/slic3r/GUI/ProgressStatusBar.hpp +++ b/src/slic3r/GUI/ProgressStatusBar.hpp @@ -4,7 +4,7 @@ #include #include -#include "../../callback.hpp" +#include "callback.hpp" class wxTimer; class wxGauge; diff --git a/xs/src/slic3r/GUI/RammingChart.cpp b/src/slic3r/GUI/RammingChart.cpp similarity index 100% rename from xs/src/slic3r/GUI/RammingChart.cpp rename to src/slic3r/GUI/RammingChart.cpp diff --git a/xs/src/slic3r/GUI/RammingChart.hpp b/src/slic3r/GUI/RammingChart.hpp similarity index 100% rename from xs/src/slic3r/GUI/RammingChart.hpp rename to src/slic3r/GUI/RammingChart.hpp diff --git a/xs/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp similarity index 100% rename from xs/src/slic3r/GUI/Tab.cpp rename to src/slic3r/GUI/Tab.cpp diff --git a/xs/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp similarity index 100% rename from xs/src/slic3r/GUI/Tab.hpp rename to src/slic3r/GUI/Tab.hpp diff --git a/xs/src/slic3r/GUI/TabIface.cpp b/src/slic3r/GUI/TabIface.cpp similarity index 100% rename from xs/src/slic3r/GUI/TabIface.cpp rename to src/slic3r/GUI/TabIface.cpp diff --git a/xs/src/slic3r/GUI/TabIface.hpp b/src/slic3r/GUI/TabIface.hpp similarity index 100% rename from xs/src/slic3r/GUI/TabIface.hpp rename to src/slic3r/GUI/TabIface.hpp diff --git a/xs/src/slic3r/GUI/UpdateDialogs.cpp b/src/slic3r/GUI/UpdateDialogs.cpp similarity index 100% rename from xs/src/slic3r/GUI/UpdateDialogs.cpp rename to src/slic3r/GUI/UpdateDialogs.cpp diff --git a/xs/src/slic3r/GUI/UpdateDialogs.hpp b/src/slic3r/GUI/UpdateDialogs.hpp similarity index 100% rename from xs/src/slic3r/GUI/UpdateDialogs.hpp rename to src/slic3r/GUI/UpdateDialogs.hpp diff --git a/xs/src/slic3r/GUI/Widget.hpp b/src/slic3r/GUI/Widget.hpp similarity index 100% rename from xs/src/slic3r/GUI/Widget.hpp rename to src/slic3r/GUI/Widget.hpp diff --git a/xs/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp similarity index 100% rename from xs/src/slic3r/GUI/WipeTowerDialog.cpp rename to src/slic3r/GUI/WipeTowerDialog.cpp diff --git a/xs/src/slic3r/GUI/WipeTowerDialog.hpp b/src/slic3r/GUI/WipeTowerDialog.hpp similarity index 100% rename from xs/src/slic3r/GUI/WipeTowerDialog.hpp rename to src/slic3r/GUI/WipeTowerDialog.hpp diff --git a/src/slic3r/GUI/callback.hpp b/src/slic3r/GUI/callback.hpp new file mode 100644 index 0000000000..ac92721a5b --- /dev/null +++ b/src/slic3r/GUI/callback.hpp @@ -0,0 +1,30 @@ +// I AM A PHONY PLACEHOLDER FOR THE PERL CALLBACK. +// GET RID OF ME! + +#ifndef slic3r_GUI_PerlCallback_phony_hpp_ +#define slic3r_GUI_PerlCallback_phony_hpp_ + +#include + +namespace Slic3r { + +class PerlCallback { +public: + PerlCallback(void *) {} + PerlCallback() {} + void register_callback(void *) {} + void deregister_callback() {} + void call() const {} + void call(int) const {} + void call(int, int) const {} + void call(const std::vector&) const {} + void call(double) const {} + void call(double, double) const {} + void call(double, double, double) const {} + void call(double, double, double, double) const {} + void call(bool b) const {} +}; + +} // namespace Slic3r + +#endif /* slic3r_GUI_PerlCallback_phony_hpp_ */ diff --git a/xs/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp similarity index 100% rename from xs/src/slic3r/GUI/wxExtensions.cpp rename to src/slic3r/GUI/wxExtensions.cpp diff --git a/xs/src/slic3r/GUI/wxExtensions.hpp b/src/slic3r/GUI/wxExtensions.hpp similarity index 100% rename from xs/src/slic3r/GUI/wxExtensions.hpp rename to src/slic3r/GUI/wxExtensions.hpp diff --git a/xs/src/slic3r/GUI/wxinit.h b/src/slic3r/GUI/wxinit.h similarity index 100% rename from xs/src/slic3r/GUI/wxinit.h rename to src/slic3r/GUI/wxinit.h diff --git a/xs/src/slic3r/Utils/ASCIIFolding.cpp b/src/slic3r/Utils/ASCIIFolding.cpp similarity index 100% rename from xs/src/slic3r/Utils/ASCIIFolding.cpp rename to src/slic3r/Utils/ASCIIFolding.cpp diff --git a/xs/src/slic3r/Utils/ASCIIFolding.hpp b/src/slic3r/Utils/ASCIIFolding.hpp similarity index 100% rename from xs/src/slic3r/Utils/ASCIIFolding.hpp rename to src/slic3r/Utils/ASCIIFolding.hpp diff --git a/xs/src/slic3r/Utils/Bonjour.cpp b/src/slic3r/Utils/Bonjour.cpp similarity index 100% rename from xs/src/slic3r/Utils/Bonjour.cpp rename to src/slic3r/Utils/Bonjour.cpp diff --git a/xs/src/slic3r/Utils/Bonjour.hpp b/src/slic3r/Utils/Bonjour.hpp similarity index 100% rename from xs/src/slic3r/Utils/Bonjour.hpp rename to src/slic3r/Utils/Bonjour.hpp diff --git a/xs/src/slic3r/Utils/Duet.cpp b/src/slic3r/Utils/Duet.cpp similarity index 100% rename from xs/src/slic3r/Utils/Duet.cpp rename to src/slic3r/Utils/Duet.cpp diff --git a/xs/src/slic3r/Utils/Duet.hpp b/src/slic3r/Utils/Duet.hpp similarity index 100% rename from xs/src/slic3r/Utils/Duet.hpp rename to src/slic3r/Utils/Duet.hpp diff --git a/xs/src/slic3r/Utils/FixModelByWin10.cpp b/src/slic3r/Utils/FixModelByWin10.cpp similarity index 100% rename from xs/src/slic3r/Utils/FixModelByWin10.cpp rename to src/slic3r/Utils/FixModelByWin10.cpp diff --git a/xs/src/slic3r/Utils/FixModelByWin10.hpp b/src/slic3r/Utils/FixModelByWin10.hpp similarity index 100% rename from xs/src/slic3r/Utils/FixModelByWin10.hpp rename to src/slic3r/Utils/FixModelByWin10.hpp diff --git a/xs/src/slic3r/Utils/HexFile.cpp b/src/slic3r/Utils/HexFile.cpp similarity index 100% rename from xs/src/slic3r/Utils/HexFile.cpp rename to src/slic3r/Utils/HexFile.cpp diff --git a/xs/src/slic3r/Utils/HexFile.hpp b/src/slic3r/Utils/HexFile.hpp similarity index 100% rename from xs/src/slic3r/Utils/HexFile.hpp rename to src/slic3r/Utils/HexFile.hpp diff --git a/xs/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp similarity index 100% rename from xs/src/slic3r/Utils/Http.cpp rename to src/slic3r/Utils/Http.cpp diff --git a/xs/src/slic3r/Utils/Http.hpp b/src/slic3r/Utils/Http.hpp similarity index 100% rename from xs/src/slic3r/Utils/Http.hpp rename to src/slic3r/Utils/Http.hpp diff --git a/xs/src/slic3r/Utils/OctoPrint.cpp b/src/slic3r/Utils/OctoPrint.cpp similarity index 100% rename from xs/src/slic3r/Utils/OctoPrint.cpp rename to src/slic3r/Utils/OctoPrint.cpp diff --git a/xs/src/slic3r/Utils/OctoPrint.hpp b/src/slic3r/Utils/OctoPrint.hpp similarity index 100% rename from xs/src/slic3r/Utils/OctoPrint.hpp rename to src/slic3r/Utils/OctoPrint.hpp diff --git a/xs/src/slic3r/Utils/PresetUpdater.cpp b/src/slic3r/Utils/PresetUpdater.cpp similarity index 100% rename from xs/src/slic3r/Utils/PresetUpdater.cpp rename to src/slic3r/Utils/PresetUpdater.cpp diff --git a/xs/src/slic3r/Utils/PresetUpdater.hpp b/src/slic3r/Utils/PresetUpdater.hpp similarity index 100% rename from xs/src/slic3r/Utils/PresetUpdater.hpp rename to src/slic3r/Utils/PresetUpdater.hpp diff --git a/xs/src/slic3r/Utils/PrintHost.cpp b/src/slic3r/Utils/PrintHost.cpp similarity index 100% rename from xs/src/slic3r/Utils/PrintHost.cpp rename to src/slic3r/Utils/PrintHost.cpp diff --git a/xs/src/slic3r/Utils/PrintHost.hpp b/src/slic3r/Utils/PrintHost.hpp similarity index 100% rename from xs/src/slic3r/Utils/PrintHost.hpp rename to src/slic3r/Utils/PrintHost.hpp diff --git a/xs/src/slic3r/Utils/PrintHostSendDialog.cpp b/src/slic3r/Utils/PrintHostSendDialog.cpp similarity index 100% rename from xs/src/slic3r/Utils/PrintHostSendDialog.cpp rename to src/slic3r/Utils/PrintHostSendDialog.cpp diff --git a/xs/src/slic3r/Utils/PrintHostSendDialog.hpp b/src/slic3r/Utils/PrintHostSendDialog.hpp similarity index 100% rename from xs/src/slic3r/Utils/PrintHostSendDialog.hpp rename to src/slic3r/Utils/PrintHostSendDialog.hpp diff --git a/xs/src/slic3r/Utils/Semver.hpp b/src/slic3r/Utils/Semver.hpp similarity index 100% rename from xs/src/slic3r/Utils/Semver.hpp rename to src/slic3r/Utils/Semver.hpp diff --git a/xs/src/slic3r/Utils/Serial.cpp b/src/slic3r/Utils/Serial.cpp similarity index 100% rename from xs/src/slic3r/Utils/Serial.cpp rename to src/slic3r/Utils/Serial.cpp diff --git a/xs/src/slic3r/Utils/Serial.hpp b/src/slic3r/Utils/Serial.hpp similarity index 100% rename from xs/src/slic3r/Utils/Serial.hpp rename to src/slic3r/Utils/Serial.hpp diff --git a/xs/src/slic3r/Utils/Time.cpp b/src/slic3r/Utils/Time.cpp similarity index 100% rename from xs/src/slic3r/Utils/Time.cpp rename to src/slic3r/Utils/Time.cpp diff --git a/xs/src/slic3r/Utils/Time.hpp b/src/slic3r/Utils/Time.hpp similarity index 100% rename from xs/src/slic3r/Utils/Time.hpp rename to src/slic3r/Utils/Time.hpp diff --git a/xs/CMakeLists.txt b/xs/CMakeLists.txt index 69e03779a2..92964c900a 100644 --- a/xs/CMakeLists.txt +++ b/xs/CMakeLists.txt @@ -1,435 +1,4 @@ -# Enable C++11 language standard. -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -# Enable C11 language standard. -set(CMAKE_C_STANDARD 11) -set(CMAKE_C_STANDARD_REQUIRED ON) - -# Add our own cmake module path. -list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules/) - -if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - # Workaround for an old CMake, which does not understand CMAKE_CXX_STANDARD. - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wno-reorder" ) - find_package(PkgConfig REQUIRED) -endif() - -if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUXX) - # Adding -fext-numeric-literals to enable GCC extensions on definitions of quad float literals, which are required by Boost. - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals" ) -endif() - -# Where all the bundled libraries reside? -set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/src/) -# For the bundled boost libraries (boost::nowide) -include_directories(${LIBDIR}) -# For libslic3r.h -include_directories(${LIBDIR}/libslic3r) -#set(CMAKE_INCLUDE_CURRENT_DIR ON) - -if(WIN32) - # BOOST_ALL_NO_LIB: Avoid the automatic linking of Boost libraries on Windows. Rather rely on explicit linking. - add_definitions(-D_USE_MATH_DEFINES -D_WIN32 -DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x601) - # -D_ITERATOR_DEBUG_LEVEL) - if(WIN10SDK_PATH) - message("Building with Win10 Netfabb STL fixing service support") - add_definitions(-DHAS_WIN10SDK) - include_directories("${WIN10SDK_PATH}/Include") - else() - message("Building without Win10 Netfabb STL fixing service support") - endif() -endif() - -add_definitions(-DwxUSE_UNICODE -D_UNICODE -DUNICODE -DWXINTL_NO_GETTEXT_MACRO) - -add_library(libslic3r STATIC - ${LIBDIR}/libslic3r/BoundingBox.cpp - ${LIBDIR}/libslic3r/BoundingBox.hpp - ${LIBDIR}/libslic3r/BridgeDetector.cpp - ${LIBDIR}/libslic3r/BridgeDetector.hpp - ${LIBDIR}/libslic3r/ClipperUtils.cpp - ${LIBDIR}/libslic3r/ClipperUtils.hpp - ${LIBDIR}/libslic3r/Config.cpp - ${LIBDIR}/libslic3r/Config.hpp - ${LIBDIR}/libslic3r/EdgeGrid.cpp - ${LIBDIR}/libslic3r/EdgeGrid.hpp - ${LIBDIR}/libslic3r/ExPolygon.cpp - ${LIBDIR}/libslic3r/ExPolygon.hpp - ${LIBDIR}/libslic3r/ExPolygonCollection.cpp - ${LIBDIR}/libslic3r/ExPolygonCollection.hpp - ${LIBDIR}/libslic3r/Extruder.cpp - ${LIBDIR}/libslic3r/Extruder.hpp - ${LIBDIR}/libslic3r/ExtrusionEntity.cpp - ${LIBDIR}/libslic3r/ExtrusionEntity.hpp - ${LIBDIR}/libslic3r/ExtrusionEntityCollection.cpp - ${LIBDIR}/libslic3r/ExtrusionEntityCollection.hpp - ${LIBDIR}/libslic3r/ExtrusionSimulator.cpp - ${LIBDIR}/libslic3r/ExtrusionSimulator.hpp - ${LIBDIR}/libslic3r/FileParserError.hpp - ${LIBDIR}/libslic3r/Fill/Fill.cpp - ${LIBDIR}/libslic3r/Fill/Fill.hpp - ${LIBDIR}/libslic3r/Fill/Fill3DHoneycomb.cpp - ${LIBDIR}/libslic3r/Fill/Fill3DHoneycomb.hpp - ${LIBDIR}/libslic3r/Fill/FillBase.cpp - ${LIBDIR}/libslic3r/Fill/FillBase.hpp - ${LIBDIR}/libslic3r/Fill/FillConcentric.cpp - ${LIBDIR}/libslic3r/Fill/FillConcentric.hpp - ${LIBDIR}/libslic3r/Fill/FillHoneycomb.cpp - ${LIBDIR}/libslic3r/Fill/FillHoneycomb.hpp - ${LIBDIR}/libslic3r/Fill/FillGyroid.cpp - ${LIBDIR}/libslic3r/Fill/FillGyroid.hpp - ${LIBDIR}/libslic3r/Fill/FillPlanePath.cpp - ${LIBDIR}/libslic3r/Fill/FillPlanePath.hpp - ${LIBDIR}/libslic3r/Fill/FillRectilinear.cpp - ${LIBDIR}/libslic3r/Fill/FillRectilinear.hpp - ${LIBDIR}/libslic3r/Fill/FillRectilinear2.cpp - ${LIBDIR}/libslic3r/Fill/FillRectilinear2.hpp - ${LIBDIR}/libslic3r/Fill/FillRectilinear3.cpp - ${LIBDIR}/libslic3r/Fill/FillRectilinear3.hpp - ${LIBDIR}/libslic3r/Flow.cpp - ${LIBDIR}/libslic3r/Flow.hpp - ${LIBDIR}/libslic3r/Format/3mf.cpp - ${LIBDIR}/libslic3r/Format/3mf.hpp - ${LIBDIR}/libslic3r/Format/AMF.cpp - ${LIBDIR}/libslic3r/Format/AMF.hpp - ${LIBDIR}/libslic3r/Format/OBJ.cpp - ${LIBDIR}/libslic3r/Format/OBJ.hpp - ${LIBDIR}/libslic3r/Format/objparser.cpp - ${LIBDIR}/libslic3r/Format/objparser.hpp - ${LIBDIR}/libslic3r/Format/PRUS.cpp - ${LIBDIR}/libslic3r/Format/PRUS.hpp - ${LIBDIR}/libslic3r/Format/STL.cpp - ${LIBDIR}/libslic3r/Format/STL.hpp - ${LIBDIR}/libslic3r/GCode/Analyzer.cpp - ${LIBDIR}/libslic3r/GCode/Analyzer.hpp - ${LIBDIR}/libslic3r/GCode/CoolingBuffer.cpp - ${LIBDIR}/libslic3r/GCode/CoolingBuffer.hpp - ${LIBDIR}/libslic3r/GCode/PostProcessor.cpp - ${LIBDIR}/libslic3r/GCode/PostProcessor.hpp - ${LIBDIR}/libslic3r/GCode/PressureEqualizer.cpp - ${LIBDIR}/libslic3r/GCode/PressureEqualizer.hpp - ${LIBDIR}/libslic3r/GCode/PreviewData.cpp - ${LIBDIR}/libslic3r/GCode/PreviewData.hpp - ${LIBDIR}/libslic3r/GCode/PrintExtents.cpp - ${LIBDIR}/libslic3r/GCode/PrintExtents.hpp - ${LIBDIR}/libslic3r/GCode/SpiralVase.cpp - ${LIBDIR}/libslic3r/GCode/SpiralVase.hpp - ${LIBDIR}/libslic3r/GCode/ToolOrdering.cpp - ${LIBDIR}/libslic3r/GCode/ToolOrdering.hpp - ${LIBDIR}/libslic3r/GCode/WipeTower.hpp - ${LIBDIR}/libslic3r/GCode/WipeTowerPrusaMM.cpp - ${LIBDIR}/libslic3r/GCode/WipeTowerPrusaMM.hpp - ${LIBDIR}/libslic3r/GCode.cpp - ${LIBDIR}/libslic3r/GCode.hpp - ${LIBDIR}/libslic3r/GCodeReader.cpp - ${LIBDIR}/libslic3r/GCodeReader.hpp - ${LIBDIR}/libslic3r/GCodeSender.cpp - ${LIBDIR}/libslic3r/GCodeSender.hpp - ${LIBDIR}/libslic3r/GCodeTimeEstimator.cpp - ${LIBDIR}/libslic3r/GCodeTimeEstimator.hpp - ${LIBDIR}/libslic3r/GCodeWriter.cpp - ${LIBDIR}/libslic3r/GCodeWriter.hpp - ${LIBDIR}/libslic3r/Geometry.cpp - ${LIBDIR}/libslic3r/Geometry.hpp - ${LIBDIR}/libslic3r/Int128.hpp -# ${LIBDIR}/libslic3r/KdTree.hpp - ${LIBDIR}/libslic3r/Layer.cpp - ${LIBDIR}/libslic3r/Layer.hpp - ${LIBDIR}/libslic3r/LayerRegion.cpp - ${LIBDIR}/libslic3r/libslic3r.h - ${LIBDIR}/libslic3r/Line.cpp - ${LIBDIR}/libslic3r/Line.hpp - ${LIBDIR}/libslic3r/Model.cpp - ${LIBDIR}/libslic3r/Model.hpp - ${LIBDIR}/libslic3r/ModelArrange.hpp - ${LIBDIR}/libslic3r/MotionPlanner.cpp - ${LIBDIR}/libslic3r/MotionPlanner.hpp - ${LIBDIR}/libslic3r/MultiPoint.cpp - ${LIBDIR}/libslic3r/MultiPoint.hpp - ${LIBDIR}/libslic3r/MutablePriorityQueue.hpp - ${LIBDIR}/libslic3r/PerimeterGenerator.cpp - ${LIBDIR}/libslic3r/PerimeterGenerator.hpp - ${LIBDIR}/libslic3r/PlaceholderParser.cpp - ${LIBDIR}/libslic3r/PlaceholderParser.hpp - ${LIBDIR}/libslic3r/Point.cpp - ${LIBDIR}/libslic3r/Point.hpp - ${LIBDIR}/libslic3r/Polygon.cpp - ${LIBDIR}/libslic3r/Polygon.hpp - ${LIBDIR}/libslic3r/Polyline.cpp - ${LIBDIR}/libslic3r/Polyline.hpp - ${LIBDIR}/libslic3r/PolylineCollection.cpp - ${LIBDIR}/libslic3r/PolylineCollection.hpp - ${LIBDIR}/libslic3r/Print.cpp - ${LIBDIR}/libslic3r/Print.hpp - ${LIBDIR}/libslic3r/PrintExport.hpp - ${LIBDIR}/libslic3r/PrintConfig.cpp - ${LIBDIR}/libslic3r/PrintConfig.hpp - ${LIBDIR}/libslic3r/PrintObject.cpp - ${LIBDIR}/libslic3r/PrintRegion.cpp - ${LIBDIR}/libslic3r/Slicing.cpp - ${LIBDIR}/libslic3r/Slicing.hpp - ${LIBDIR}/libslic3r/SlicingAdaptive.cpp - ${LIBDIR}/libslic3r/SlicingAdaptive.hpp - ${LIBDIR}/libslic3r/SupportMaterial.cpp - ${LIBDIR}/libslic3r/SupportMaterial.hpp - ${LIBDIR}/libslic3r/Surface.cpp - ${LIBDIR}/libslic3r/Surface.hpp - ${LIBDIR}/libslic3r/SurfaceCollection.cpp - ${LIBDIR}/libslic3r/SurfaceCollection.hpp - ${LIBDIR}/libslic3r/SVG.cpp - ${LIBDIR}/libslic3r/SVG.hpp - ${LIBDIR}/libslic3r/Technologies.hpp - ${LIBDIR}/libslic3r/TriangleMesh.cpp - ${LIBDIR}/libslic3r/TriangleMesh.hpp - ${LIBDIR}/libslic3r/SLABasePool.hpp - ${LIBDIR}/libslic3r/SLABasePool.cpp -# ${LIBDIR}/libslic3r/utils.cpp - ${LIBDIR}/libslic3r/Utils.hpp - -) - -add_library(libslic3r_gui STATIC - ${LIBDIR}/slic3r/GUI/AboutDialog.cpp - ${LIBDIR}/slic3r/GUI/AboutDialog.hpp - ${LIBDIR}/slic3r/GUI/AppConfig.cpp - ${LIBDIR}/slic3r/GUI/AppConfig.hpp - ${LIBDIR}/slic3r/GUI/BackgroundSlicingProcess.cpp - ${LIBDIR}/slic3r/GUI/BackgroundSlicingProcess.hpp - ${LIBDIR}/slic3r/GUI/BitmapCache.cpp - ${LIBDIR}/slic3r/GUI/BitmapCache.hpp - ${LIBDIR}/slic3r/GUI/ConfigSnapshotDialog.cpp - ${LIBDIR}/slic3r/GUI/ConfigSnapshotDialog.hpp - ${LIBDIR}/slic3r/GUI/3DScene.cpp - ${LIBDIR}/slic3r/GUI/3DScene.hpp - ${LIBDIR}/slic3r/GUI/GLShader.cpp - ${LIBDIR}/slic3r/GUI/GLShader.hpp - ${LIBDIR}/slic3r/GUI/GLCanvas3D.hpp - ${LIBDIR}/slic3r/GUI/GLCanvas3D.cpp - ${LIBDIR}/slic3r/GUI/GLCanvas3DManager.hpp - ${LIBDIR}/slic3r/GUI/GLCanvas3DManager.cpp - ${LIBDIR}/slic3r/GUI/GLGizmo.hpp - ${LIBDIR}/slic3r/GUI/GLGizmo.cpp - ${LIBDIR}/slic3r/GUI/GLTexture.hpp - ${LIBDIR}/slic3r/GUI/GLTexture.cpp - ${LIBDIR}/slic3r/GUI/GLToolbar.hpp - ${LIBDIR}/slic3r/GUI/GLToolbar.cpp - ${LIBDIR}/slic3r/GUI/Preferences.cpp - ${LIBDIR}/slic3r/GUI/Preferences.hpp - ${LIBDIR}/slic3r/GUI/Preset.cpp - ${LIBDIR}/slic3r/GUI/Preset.hpp - ${LIBDIR}/slic3r/GUI/PresetBundle.cpp - ${LIBDIR}/slic3r/GUI/PresetBundle.hpp - ${LIBDIR}/slic3r/GUI/PresetHints.cpp - ${LIBDIR}/slic3r/GUI/PresetHints.hpp - ${LIBDIR}/slic3r/GUI/GUI.cpp - ${LIBDIR}/slic3r/GUI/GUI.hpp - ${LIBDIR}/slic3r/GUI/GUI_ObjectParts.cpp - ${LIBDIR}/slic3r/GUI/GUI_ObjectParts.hpp - ${LIBDIR}/slic3r/GUI/LambdaObjectDialog.cpp - ${LIBDIR}/slic3r/GUI/LambdaObjectDialog.hpp - ${LIBDIR}/slic3r/GUI/Tab.cpp - ${LIBDIR}/slic3r/GUI/Tab.hpp - ${LIBDIR}/slic3r/GUI/TabIface.cpp - ${LIBDIR}/slic3r/GUI/TabIface.hpp - ${LIBDIR}/slic3r/GUI/Field.cpp - ${LIBDIR}/slic3r/GUI/Field.hpp - ${LIBDIR}/slic3r/GUI/OptionsGroup.cpp - ${LIBDIR}/slic3r/GUI/OptionsGroup.hpp - ${LIBDIR}/slic3r/GUI/BedShapeDialog.cpp - ${LIBDIR}/slic3r/GUI/BedShapeDialog.hpp - ${LIBDIR}/slic3r/GUI/2DBed.cpp - ${LIBDIR}/slic3r/GUI/2DBed.hpp - ${LIBDIR}/slic3r/GUI/wxExtensions.cpp - ${LIBDIR}/slic3r/GUI/wxExtensions.hpp - ${LIBDIR}/slic3r/GUI/WipeTowerDialog.cpp - ${LIBDIR}/slic3r/GUI/WipeTowerDialog.hpp - ${LIBDIR}/slic3r/GUI/RammingChart.cpp - ${LIBDIR}/slic3r/GUI/RammingChart.hpp - ${LIBDIR}/slic3r/GUI/BonjourDialog.cpp - ${LIBDIR}/slic3r/GUI/BonjourDialog.hpp - ${LIBDIR}/slic3r/GUI/ButtonsDescription.cpp - ${LIBDIR}/slic3r/GUI/ButtonsDescription.hpp - ${LIBDIR}/slic3r/Config/Snapshot.cpp - ${LIBDIR}/slic3r/Config/Snapshot.hpp - ${LIBDIR}/slic3r/Config/Version.cpp - ${LIBDIR}/slic3r/Config/Version.hpp - ${LIBDIR}/slic3r/Utils/ASCIIFolding.cpp - ${LIBDIR}/slic3r/Utils/ASCIIFolding.hpp - ${LIBDIR}/slic3r/Utils/Serial.cpp - ${LIBDIR}/slic3r/Utils/Serial.hpp - ${LIBDIR}/slic3r/GUI/ConfigWizard.cpp - ${LIBDIR}/slic3r/GUI/ConfigWizard.hpp - ${LIBDIR}/slic3r/GUI/MsgDialog.cpp - ${LIBDIR}/slic3r/GUI/MsgDialog.hpp - ${LIBDIR}/slic3r/GUI/UpdateDialogs.cpp - ${LIBDIR}/slic3r/GUI/UpdateDialogs.hpp - ${LIBDIR}/slic3r/GUI/FirmwareDialog.cpp - ${LIBDIR}/slic3r/GUI/FirmwareDialog.hpp - ${LIBDIR}/slic3r/GUI/ProgressIndicator.hpp - ${LIBDIR}/slic3r/GUI/ProgressStatusBar.hpp - ${LIBDIR}/slic3r/GUI/ProgressStatusBar.cpp - ${LIBDIR}/slic3r/Utils/Http.cpp - ${LIBDIR}/slic3r/Utils/Http.hpp - ${LIBDIR}/slic3r/Utils/FixModelByWin10.cpp - ${LIBDIR}/slic3r/Utils/FixModelByWin10.hpp - ${LIBDIR}/slic3r/Utils/PrintHostSendDialog.cpp - ${LIBDIR}/slic3r/Utils/PrintHostSendDialog.hpp - ${LIBDIR}/slic3r/Utils/OctoPrint.cpp - ${LIBDIR}/slic3r/Utils/OctoPrint.hpp - ${LIBDIR}/slic3r/Utils/Duet.cpp - ${LIBDIR}/slic3r/Utils/Duet.hpp - ${LIBDIR}/slic3r/Utils/PrintHost.cpp - ${LIBDIR}/slic3r/Utils/PrintHost.hpp - ${LIBDIR}/slic3r/Utils/Bonjour.cpp - ${LIBDIR}/slic3r/Utils/Bonjour.hpp - ${LIBDIR}/slic3r/Utils/PresetUpdater.cpp - ${LIBDIR}/slic3r/Utils/PresetUpdater.hpp - ${LIBDIR}/slic3r/Utils/Time.cpp - ${LIBDIR}/slic3r/Utils/Time.hpp - ${LIBDIR}/slic3r/Utils/HexFile.cpp - ${LIBDIR}/slic3r/Utils/HexFile.hpp - ${LIBDIR}/slic3r/AppController.hpp - ${LIBDIR}/slic3r/AppController.cpp - ${LIBDIR}/slic3r/AppControllerWx.cpp -) - -add_library(admesh STATIC - ${LIBDIR}/admesh/connect.cpp - ${LIBDIR}/admesh/normals.cpp - ${LIBDIR}/admesh/shared.cpp - ${LIBDIR}/admesh/stl.h - ${LIBDIR}/admesh/stl_io.cpp - ${LIBDIR}/admesh/stlinit.cpp - ${LIBDIR}/admesh/util.cpp -) - -add_library(miniz STATIC - ${LIBDIR}/miniz/miniz.h - ${LIBDIR}/miniz/miniz_common.h - ${LIBDIR}/miniz/miniz_tdef.h - ${LIBDIR}/miniz/miniz_tinfl.h - ${LIBDIR}/miniz/miniz_zip.h - ${LIBDIR}/miniz/miniz.cpp - ${LIBDIR}/miniz/miniz_tdef.cpp - ${LIBDIR}/miniz/miniz_tinfl.cpp - ${LIBDIR}/miniz/miniz_zip.cpp -) - -add_library(clipper STATIC - ${LIBDIR}/clipper.cpp - ${LIBDIR}/clipper.hpp -) - -add_library(polypartition STATIC - ${LIBDIR}/polypartition.cpp - ${LIBDIR}/polypartition.h -) - -add_library(poly2tri STATIC - ${LIBDIR}/poly2tri/common/shapes.cc - ${LIBDIR}/poly2tri/common/shapes.h - ${LIBDIR}/poly2tri/common/utils.h - ${LIBDIR}/poly2tri/poly2tri.h - ${LIBDIR}/poly2tri/sweep/advancing_front.cc - ${LIBDIR}/poly2tri/sweep/advancing_front.h - ${LIBDIR}/poly2tri/sweep/cdt.cc - ${LIBDIR}/poly2tri/sweep/cdt.h - ${LIBDIR}/poly2tri/sweep/sweep.cc - ${LIBDIR}/poly2tri/sweep/sweep.h - ${LIBDIR}/poly2tri/sweep/sweep_context.cc - ${LIBDIR}/poly2tri/sweep/sweep_context.h -) - -add_library(nowide STATIC - ${LIBDIR}/boost/nowide/args.hpp - ${LIBDIR}/boost/nowide/cenv.hpp - ${LIBDIR}/boost/nowide/config.hpp - ${LIBDIR}/boost/nowide/convert.hpp - ${LIBDIR}/boost/nowide/cstdio.hpp - ${LIBDIR}/boost/nowide/cstdlib.hpp - ${LIBDIR}/boost/nowide/filebuf.hpp - ${LIBDIR}/boost/nowide/fstream.hpp - ${LIBDIR}/boost/nowide/integration/filesystem.hpp - ${LIBDIR}/boost/nowide/iostream.cpp - ${LIBDIR}/boost/nowide/iostream.hpp - ${LIBDIR}/boost/nowide/stackstring.hpp - ${LIBDIR}/boost/nowide/system.hpp - ${LIBDIR}/boost/nowide/utf8_codecvt.hpp - ${LIBDIR}/boost/nowide/windows.hpp -) - -add_library(Shiny STATIC - ${LIBDIR}/Shiny/Shiny.h - ${LIBDIR}/Shiny/ShinyConfig.h - ${LIBDIR}/Shiny/ShinyData.h - ${LIBDIR}/Shiny/ShinyMacros.h - ${LIBDIR}/Shiny/ShinyManager.c - ${LIBDIR}/Shiny/ShinyManager.h - ${LIBDIR}/Shiny/ShinyNode.c - ${LIBDIR}/Shiny/ShinyNode.h - ${LIBDIR}/Shiny/ShinyNodePool.c - ${LIBDIR}/Shiny/ShinyNodePool.h - ${LIBDIR}/Shiny/ShinyNodeState.c - ${LIBDIR}/Shiny/ShinyNodeState.h - ${LIBDIR}/Shiny/ShinyOutput.c - ${LIBDIR}/Shiny/ShinyOutput.h - ${LIBDIR}/Shiny/ShinyPrereqs.h - ${LIBDIR}/Shiny/ShinyTools.c - ${LIBDIR}/Shiny/ShinyTools.h - ${LIBDIR}/Shiny/ShinyVersion.h - ${LIBDIR}/Shiny/ShinyZone.c - ${LIBDIR}/Shiny/ShinyZone.h -) - -add_library(semver STATIC - ${LIBDIR}/semver/semver.h - ${LIBDIR}/semver/semver.c -) - -# ############################################################################## -# Configure rasterizer target -# ############################################################################## - -find_package(PNG QUIET) - -option(RASTERIZER_FORCE_BUILTIN_LIBPNG "Force the usage of builting libpng instead of the system version." OFF) - -add_library(rasterizer STATIC - ${LIBDIR}/libslic3r/Rasterizer/Rasterizer.hpp - ${LIBDIR}/libslic3r/Rasterizer/Rasterizer.cpp -) - -if(PNG_FOUND AND NOT RASTERIZER_FORCE_BUILTIN_LIBPNG) - message(STATUS "Using system libpng.") - target_link_libraries(rasterizer PRIVATE ${PNG_LIBRARIES}) - target_include_directories(rasterizer PRIVATE ${PNG_INCLUDE_DIRS}) - target_compile_definitions(rasterizer PRIVATE ${PNG_DEFINITIONS}) -else() - set(ZLIB_LIBRARY "") - message(WARNING "Using builtin libpng. This can cause crashes on some platforms.") - add_subdirectory( ${LIBDIR}/png/zlib) - - set(ZLIB_INCLUDE_DIR - ${LIBDIR}/png/zlib - ${CMAKE_CURRENT_BINARY_DIR}/src/png/zlib - ) - - add_subdirectory( ${LIBDIR}/png/libpng ) - set_target_properties(zlibstatic PROPERTIES POSITION_INDEPENDENT_CODE ON) - set_target_properties(png_static PROPERTIES POSITION_INDEPENDENT_CODE ON) - - target_include_directories(rasterizer PRIVATE - ${LIBDIR}/png/libpng - ${CMAKE_CURRENT_BINARY_DIR}/src/png/libpng - ) - target_link_libraries(rasterizer PRIVATE png_static zlibstatic) - -endif() - -target_link_libraries(libslic3r rasterizer ) - -# ############################################################################## +project(XS) # Generate the Slic3r Perl module (XS) typemap file. set(MyTypemap ${CMAKE_CURRENT_BINARY_DIR}/typemap) @@ -461,12 +30,6 @@ set(XS_XSP_FILES ${XSP_DIR}/GCode.xsp ${XSP_DIR}/GCodeSender.xsp ${XSP_DIR}/Geometry.xsp - ${XSP_DIR}/GUI.xsp - ${XSP_DIR}/GUI_AppConfig.xsp - ${XSP_DIR}/GUI_BackgroundSlicingProcess.xsp - ${XSP_DIR}/GUI_3DScene.xsp - ${XSP_DIR}/GUI_Preset.xsp - ${XSP_DIR}/GUI_Tab.xsp ${XSP_DIR}/Layer.xsp ${XSP_DIR}/Line.xsp ${XSP_DIR}/Model.xsp @@ -481,10 +44,6 @@ set(XS_XSP_FILES ${XSP_DIR}/Surface.xsp ${XSP_DIR}/SurfaceCollection.xsp ${XSP_DIR}/TriangleMesh.xsp - ${XSP_DIR}/Utils_PrintHost.xsp - ${XSP_DIR}/Utils_PresetUpdater.xsp - ${XSP_DIR}/AppController.xsp - ${XSP_DIR}/ProgressStatusBar.xsp ${XSP_DIR}/XS.xsp ) foreach (file ${XS_XSP_FILES}) @@ -515,46 +74,38 @@ else() endif() add_library(XS ${XS_SHARED_LIBRARY_TYPE} ${XS_MAIN_CPP} - ${LIBDIR}/libslic3r/utils.cpp - ${LIBDIR}/slic3r/GUI/wxPerlIface.cpp - ${LIBDIR}/perlglue.cpp - ${LIBDIR}/callback.cpp - ${LIBDIR}/callback.hpp - ${LIBDIR}/ppport.h - ${LIBDIR}/xsinit.h - ${CMAKE_CURRENT_LIST_DIR}/xsp/my.map +# ${LIBDIR}/libslic3r/utils.cpp +# ${LIBDIR}/slic3r/GUI/wxPerlIface.cpp + src/perlglue.cpp +# src/callback.cpp +# src/callback.hpp + src/ppport.h + src/xsinit.h + xsp/my.map # mytype.map is empty. Is it required by Build.PL or the Perl xspp module? - ${CMAKE_CURRENT_LIST_DIR}/xsp/mytype.map + xsp/mytype.map # Used by Perl xsubpp to generate XS.cpp - ${CMAKE_CURRENT_LIST_DIR}/xsp/typemap.xspt + xsp/typemap.xspt ) if(APPLE) set_target_properties(XS PROPERTIES BUNDLE TRUE) # Ignore undefined symbols of the perl interpreter, they will be found in the caller image. target_link_libraries(XS "-undefined dynamic_lookup") endif() -target_link_libraries(XS libslic3r libslic3r_gui admesh miniz clipper nowide polypartition poly2tri semver avrdude qhull) +target_link_libraries(XS libslic3r admesh miniz clipper nowide polypartition poly2tri semver avrdude qhull) if(SLIC3R_PROFILE) target_link_libraries(XS Shiny) endif() -# Add the OpenGL and GLU libraries. -if (SLIC3R_GUI) - if (MSVC) - target_link_libraries(XS user32.lib Setupapi.lib OpenGL32.Lib GlU32.Lib) - elseif (MINGW) - target_link_libraries(XS -lopengl32) - elseif (APPLE) - target_link_libraries(XS "-framework OpenGL") - else () - target_link_libraries(XS -lGL -lGLU) - endif () -endif () - target_include_directories(XS PRIVATE src src/libslic3r) # Local include directories target_compile_definitions(XS PRIVATE -DSLIC3RXS) set_target_properties(XS PROPERTIES PREFIX "") # Prevent cmake from generating libXS.so instead of XS.so +target_link_libraries(XS ${Boost_LIBRARIES}) +# target_link_libraries(XS ${wxWidgets_LIBRARIES}) +# target_link_libraries(XS ${CURL_LIBRARIES}) +# target_link_libraries(XS ${OPENSSL_LIBRARIES}) + if (APPLE) # add_compile_options(-stdlib=libc++) # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE) @@ -578,56 +129,19 @@ if (MSVC AND SLIC3R_MSVC_PDB AND "${CMAKE_BUILD_TYPE}" STREQUAL "Release") ) endif() -## Configuration flags -if (SLIC3R_GUI) - message("Slic3r will be built with GUI support") - target_compile_definitions(XS PRIVATE -DSLIC3R_GUI) -endif () - -if (SLIC3R_PROFILE) - message("Slic3r will be built with a Shiny invasive profiler") - add_definitions(-DSLIC3R_PROFILE) -endif () - if (CMAKE_BUILD_TYPE MATCHES DEBUG) target_compile_definitions(XS PRIVATE -DSLIC3R_DEBUG -DDEBUG -D_DEBUG) else () target_compile_definitions(XS PRIVATE -DNDEBUG) endif () -# Perl specific stuff -find_package(PerlLibs REQUIRED) -set(PerlEmbed_DEBUG 1) -find_package(PerlEmbed REQUIRED) target_include_directories(XS PRIVATE ${PERL_INCLUDE_PATH}) target_compile_options(XS PRIVATE ${PerlEmbed_CCFLAGS}) -# If the Perl is compiled with optimization off, disable optimization over the whole project. -if (WIN32 AND ";${PerlEmbed_CCFLAGS};" MATCHES ";[-/]Od;") - message(STATUS "Perl compiled without optimization. Disabling optimization for the Slic3r build.") - message("Old CMAKE_CXX_FLAGS_RELEASE: ${CMAKE_CXX_FLAGS_RELEASE}") - message("Old CMAKE_CXX_FLAGS_RELWITHDEBINFO: ${CMAKE_CXX_FLAGS_RELEASE}") - message("Old CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS_RELEASE}") - set(CMAKE_CXX_FLAGS_RELEASE "/MD /Od /Zi /EHsc /DNDEBUG /DWIN32 /DTBB_USE_ASSERT") - set(CMAKE_C_FLAGS_RELEASE "/MD /Od /Zi /DNDEBUG /DWIN32 /DTBB_USE_ASSERT") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /Od /Zi /EHsc /DNDEBUG /DWIN32 /DTBB_USE_ASSERT") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "/MD /Od /Zi /DNDEBUG /DWIN32 /DTBB_USE_ASSERT") - set(CMAKE_CXX_FLAGS "/MD /Od /Zi /EHsc /DNDEBUG /DWIN32 /DTBB_USE_ASSERT") - set(CMAKE_C_FLAGS "/MD /Od /Zi /DNDEBUG /DWIN32 /DTBB_USE_ASSERT") -endif() -# The following line will add -fPIC on Linux to make the XS.so rellocable. -add_definitions(${PerlEmbed_CCCDLFLAGS}) + if (WIN32) target_link_libraries(XS ${PERL_LIBRARY}) endif() -add_subdirectory(src/avrdude) - -add_subdirectory(src/qhull) -include_directories(${LIBDIR}/qhull/src) -message(STATUS ${LIBDIR}/qhull/src) - -## REQUIRED packages - # Find and configure boost if(SLIC3R_STATIC) # Use static boost libraries. @@ -635,136 +149,22 @@ if(SLIC3R_STATIC) # Use boost libraries linked statically to the C++ runtime. # set(Boost_USE_STATIC_RUNTIME ON) endif() -#set(Boost_DEBUG ON) -find_package(Boost REQUIRED COMPONENTS system filesystem thread log locale regex) -if(Boost_FOUND) - include_directories(${Boost_INCLUDE_DIRS}) - target_link_libraries(XS ${Boost_LIBRARIES}) - if (APPLE) - # BOOST_ASIO_DISABLE_KQUEUE : prevents a Boost ASIO bug on OS X: https://svn.boost.org/trac/boost/ticket/5339 - add_definitions(-DBOOST_ASIO_DISABLE_KQUEUE) - endif() - if(NOT SLIC3R_STATIC) - add_definitions(-DBOOST_LOG_DYN_LINK) - endif() -endif() -# Find and configure intel-tbb -if(SLIC3R_STATIC) - set(TBB_STATIC 1) -endif() -set(TBB_DEBUG 1) -find_package(TBB REQUIRED) -include_directories(${TBB_INCLUDE_DIRS}) -add_definitions(${TBB_DEFINITIONS}) -if(MSVC) - # Suppress implicit linking of the TBB libraries by the Visual Studio compiler. - add_definitions(-D__TBB_NO_IMPLICIT_LINKAGE) -endif() -# The Intel TBB library will use the std::exception_ptr feature of C++11. -add_definitions(-DTBB_USE_CAPTURED_EXCEPTION=0) +target_link_libraries(XS ${Boost_LIBRARIES}) target_link_libraries(XS ${TBB_LIBRARIES}) - -# Find and configure wxWidgets -if (SLIC3R_PRUSACONTROL) - set(wxWidgets_UseAlienWx 1) - if (wxWidgets_UseAlienWx) - set(AlienWx_DEBUG 1) - find_package(AlienWx REQUIRED COMPONENTS base core adv html gl) - include_directories(${AlienWx_INCLUDE_DIRS}) - #add_compile_options(${AlienWx_CXX_FLAGS}) - add_definitions(${AlienWx_DEFINITIONS}) - set(wxWidgets_LIBRARIES ${AlienWx_LIBRARIES}) - # On Linux / gtk, we need to have a direct access to gtk+ for some workarounds. - if (AlienWx_GUI_TOOLKIT STREQUAL "gtk2") - pkg_check_modules(GTK2 gtk+-2.0) - include_directories(${GTK2_INCLUDE_DIRS}) - endif() - if (AlienWx_GUI_TOOLKIT STREQUAL "gtk3") - pkg_check_modules(GTK3 gtk+-3.0) - include_directories(${GTK3_INCLUDE_DIRS}) - endif() - else () - find_package(wxWidgets REQUIRED COMPONENTS base core adv html gl) - include(${wxWidgets_USE_FILE}) - endif () - add_definitions(-DSLIC3R_GUI -DSLIC3R_PRUS) - target_link_libraries(XS ${wxWidgets_LIBRARIES}) -endif() - -find_package(CURL REQUIRED) -include_directories(${CURL_INCLUDE_DIRS}) -target_link_libraries(XS ${CURL_LIBRARIES}) - -if (SLIC3R_STATIC) - if (NOT APPLE) - # libcurl is always linked dynamically to the system libcurl on OSX. - # On other systems, libcurl is linked statically if SLIC3R_STATIC is set. - add_definitions(-DCURL_STATICLIB) - endif() - if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - # As of now, our build system produces a statically linked libcurl, - # which links the OpenSSL library dynamically. - find_package(OpenSSL REQUIRED) - message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}") - message("OpenSSL libraries: ${OPENSSL_LIBRARIES}") - include_directories(${OPENSSL_INCLUDE_DIR}) - target_link_libraries(XS ${OPENSSL_LIBRARIES}) - endif() -endif() - -## OPTIONAL packages - -# Find eigen3 or use bundled version -if (NOT SLIC3R_STATIC) - find_package(Eigen3) -endif () -if (NOT Eigen3_FOUND) - set(Eigen3_FOUND 1) - set(EIGEN3_INCLUDE_DIR ${LIBDIR}/eigen/) -endif () -include_directories(${EIGEN3_INCLUDE_DIR}) - -# Find expat or use bundled version -# Always use the system libexpat on Linux. -if (NOT SLIC3R_STATIC OR CMAKE_SYSTEM_NAME STREQUAL "Linux") - find_package(EXPAT) -endif () -if (NOT EXPAT_FOUND) - add_library(expat STATIC - ${LIBDIR}/expat/xmlparse.c - ${LIBDIR}/expat/xmlrole.c - ${LIBDIR}/expat/xmltok.c - ) - set(EXPAT_FOUND 1) - set(EXPAT_INCLUDE_DIRS ${LIBDIR}/expat/) - set(EXPAT_LIBRARIES expat) -endif () -include_directories(${EXPAT_INCLUDE_DIRS}) +# target_link_libraries(XS ${wxWidgets_LIBRARIES}) target_link_libraries(XS ${EXPAT_LIBRARIES}) +# target_link_libraries(XS ${GLEW_LIBRARIES}) -# Find glew or use bundled version -if (NOT SLIC3R_STATIC) - find_package(GLEW) -endif () -if (NOT GLEW_FOUND) - add_library(glew STATIC ${LIBDIR}/glew/src/glew.c) - set(GLEW_FOUND 1) - set(GLEW_INCLUDE_DIRS ${LIBDIR}/glew/include/) - set(GLEW_LIBRARIES glew) - add_definitions(-DGLEW_STATIC) -endif () -include_directories(${GLEW_INCLUDE_DIRS}) -target_link_libraries(XS ${GLEW_LIBRARIES}) # Install the XS.pm and XS.{so,dll,bundle} into the local-lib directory. -set(PERL_LOCAL_LIB_DIR "${PROJECT_SOURCE_DIR}/local-lib/lib/perl5/${PerlEmbed_ARCHNAME}") +set(PERL_LOCAL_LIB_DIR "../local-lib/lib/perl5/${PerlEmbed_ARCHNAME}") add_custom_command( TARGET XS POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${PERL_LOCAL_LIB_DIR}/auto/Slic3r/XS/" COMMAND ${CMAKE_COMMAND} -E copy "$" "${PERL_LOCAL_LIB_DIR}/auto/Slic3r/XS/" COMMAND ${CMAKE_COMMAND} -E make_directory "${PERL_LOCAL_LIB_DIR}/Slic3r/" - COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_SOURCE_DIR}/xs/lib/Slic3r/XS.pm" "${PERL_LOCAL_LIB_DIR}/Slic3r/" + COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/lib/Slic3r/XS.pm" "${PERL_LOCAL_LIB_DIR}/Slic3r/" COMMENT "Installing XS.pm and XS.{so,dll,bundle} into the local-lib directory ..." ) if(APPLE) @@ -775,23 +175,11 @@ if(APPLE) ) endif() -# Create a slic3r executable -add_executable(slic3r EXCLUDE_FROM_ALL ${PROJECT_SOURCE_DIR}/src/slic3r.cpp) target_include_directories(XS PRIVATE src src/libslic3r) -target_link_libraries(slic3r libslic3r libslic3r_gui admesh miniz ${Boost_LIBRARIES} clipper ${EXPAT_LIBRARIES} ${GLEW_LIBRARIES} polypartition poly2tri ${TBB_LIBRARIES} ${wxWidgets_LIBRARIES}) - -add_executable(slabasebed EXCLUDE_FROM_ALL ${PROJECT_SOURCE_DIR}/src/slabasebed.cpp) -target_include_directories(slabasebed PRIVATE src src/libslic3r) -target_link_libraries(slabasebed libslic3r libslic3r_gui qhull admesh miniz ${Boost_LIBRARIES} clipper ${EXPAT_LIBRARIES} ${GLEW_LIBRARIES} polypartition poly2tri ${TBB_LIBRARIES} ${wxWidgets_LIBRARIES} ${CMAKE_DL_LIBS}) if(SLIC3R_PROFILE) target_link_libraries(Shiny) endif() -if (APPLE) - target_link_libraries(slic3r "-framework IOKit" "-framework CoreFoundation" -lc++) -elseif (NOT MSVC) - target_link_libraries(slic3r -lstdc++) -endif () if (MSVC) # Here we associate some additional properties with the MSVC project to enable compilation and debugging out of the box. @@ -799,35 +187,10 @@ if (MSVC) string(REPLACE "/" "\\" PROPS_PERL_BIN_PATH "${PROPS_PERL_BIN_PATH}") string(REPLACE "/" "\\" PROPS_PERL_EXECUTABLE "${PERL_EXECUTABLE}") string(REPLACE "/" "\\" PROPS_CMAKE_SOURCE_DIR "${CMAKE_SOURCE_DIR}") - configure_file("${PROJECT_SOURCE_DIR}/cmake/msvc/xs.wperl.props.in" "${CMAKE_BINARY_DIR}/xs.wperl.props" NEWLINE_STYLE CRLF) + configure_file("../cmake/msvc/xs.wperl.props.in" "${CMAKE_BINARY_DIR}/xs.wperl.props" NEWLINE_STYLE CRLF) set_target_properties(XS PROPERTIES VS_USER_PROPS "${CMAKE_BINARY_DIR}/xs.wperl.props") endif() -# l10n -set(L10N_DIR "${PROJECT_SOURCE_DIR}/resources/localization") -add_custom_target(pot - COMMAND xgettext --keyword=L --from-code=UTF-8 --debug - -f "${L10N_DIR}/list.txt" - -o "${L10N_DIR}/Slic3rPE.pot" - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - COMMENT "Generate pot file from strings in the source tree" -) - -# ############################################################################## -# Adding libnest2d project for bin packing... -# ############################################################################## - -set(LIBNEST2D_UNITTESTS ON CACHE BOOL "Force generating unittests for libnest2d") - -add_subdirectory(${LIBDIR}/libnest2d) -target_compile_definitions(libslic3r PUBLIC -DUSE_TBB) -target_include_directories(libslic3r PUBLIC BEFORE ${LIBNEST2D_INCLUDES}) -target_include_directories(libslic3r_gui PUBLIC BEFORE ${LIBNEST2D_INCLUDES}) - -message(STATUS "Libnest2D Libraries: ${LIBNEST2D_LIBRARIES}") -target_link_libraries(libslic3r ${LIBNEST2D_LIBRARIES}) -# ############################################################################## - # Installation install(TARGETS XS DESTINATION ${PERL_VENDORARCH}/auto/Slic3r/XS) install(FILES lib/Slic3r/XS.pm DESTINATION ${PERL_VENDORLIB}/Slic3r) diff --git a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s01.html~ b/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s01.html~ deleted file mode 100644 index 20b5c4514d..0000000000 --- a/xs/src/avrdude/atmel-docs/EDBG/protocoldocs/ch03s01s01.html~ +++ /dev/null @@ -1,215 +0,0 @@ - - - - -QUERY - - Atmel EDBG-based Tools Protocols

Table of Contents

EDBG QUERY contexts

Used to discover the capabilities of the tool.

For lists of valid query types, see the section called “EDBG QUERY contexts”

-

Table 35. Query

FieldSizeDescription
QUERY (0x00)1 byteCommand ID
Version (0x00)1 byteCommand version
Query context1 byteType of query to execute


-

Responses:

-

-

Prev Up Next
 Home 
\ No newline at end of file diff --git a/xs/src/libnest2d/tools/benchmark.h b/xs/src/libnest2d/tools/benchmark.h deleted file mode 100644 index 19870b37b1..0000000000 --- a/xs/src/libnest2d/tools/benchmark.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) Tamás Mészáros - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#ifndef INCLUDE_BENCHMARK_H_ -#define INCLUDE_BENCHMARK_H_ - -#include -#include - -/** - * A class for doing benchmarks. - */ -class Benchmark { - typedef std::chrono::high_resolution_clock Clock; - typedef Clock::duration Duration; - typedef Clock::time_point TimePoint; - - TimePoint t1, t2; - Duration d; - - inline double to_sec(Duration d) { - return d.count() * double(Duration::period::num) / Duration::period::den; - } - -public: - - /** - * Measure time from the moment of this call. - */ - void start() { t1 = Clock::now(); } - - /** - * Measure time to the moment of this call. - */ - void stop() { t2 = Clock::now(); } - - /** - * Get the time elapsed between a start() end a stop() call. - * @return Returns the elapsed time in seconds. - */ - double getElapsedSec() { d = t2 - t1; return to_sec(d); } -}; - - -#endif /* INCLUDE_BENCHMARK_H_ */ diff --git a/xs/src/slic3r/GUI/wxPerlIface.cpp b/xs/src/slic3r/GUI/wxPerlIface.cpp deleted file mode 100644 index 216ca4b3b8..0000000000 --- a/xs/src/slic3r/GUI/wxPerlIface.cpp +++ /dev/null @@ -1,97 +0,0 @@ -// Derived from the following: - -///////////////////////////////////////////////////////////////////////////// -// Name: cpp/helpers.cpp -// Purpose: implementation for helpers.h -// Author: Mattia Barbon -// Modified by: -// Created: 29/10/2000 -// RCS-ID: $Id: helpers.cpp 3397 2012-09-30 02:26:07Z mdootson $ -// Copyright: (c) 2000-2011 Mattia Barbon -// Licence: This program is free software; you can redistribute it and/or -// modify it under the same terms as Perl itself -///////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -extern "C" { -#endif -#include "EXTERN.h" -#include "perl.h" -#include "XSUB.h" -#include "ppport.h" -#undef do_open -#undef do_close -#ifdef __cplusplus -} -#endif - -//#include - -// ---------------------------------------------------------------------------- -// Utility functions for working with MAGIC -// ---------------------------------------------------------------------------- - -struct my_magic -{ - my_magic() : object( NULL ), deleteable( true ) { } - - void* object; - bool deleteable; -}; - -//STATIC MGVTBL my_vtbl = { 0, 0, 0, 0, 0, 0, 0, 0 }; - -my_magic* wxPli_get_magic( pTHX_ SV* rv ) -{ - // check for reference - if( !SvROK( rv ) ) - return NULL; - SV* ref = SvRV( rv ); - - // if it isn't a SvPVMG, then it can't have MAGIC - // so it is deleteable - if( !ref || SvTYPE( ref ) < SVt_PVMG ) - return NULL; - - // search for '~' / PERL_MAGIC_ext magic, and check the value -// MAGIC* magic = mg_findext( ref, PERL_MAGIC_ext, &my_vtbl ); - MAGIC* magic = mg_find( ref, '~' ); - if( !magic ) - return NULL; - - return (my_magic*)magic->mg_ptr; -} - -// gets 'this' pointer from a blessed scalar/hash reference -void* wxPli_sv_2_object( pTHX_ SV* scalar, const char* classname ) -{ - // is it correct to use undef as 'NULL'? - if( !SvOK( scalar ) ) - { - return NULL; - } - - if( !SvROK( scalar ) ) - croak( "variable is not an object: it must have type %s", classname ); - - if( !classname || sv_derived_from( scalar, (char*) classname ) ) - { - SV* ref = SvRV( scalar ); - - my_magic* mg = wxPli_get_magic( aTHX_ scalar ); - - // rationale: if this is an hash-ish object, it always - // has both mg and mg->object; if however this is a - // scalar-ish object that has been marked/unmarked deletable - // it has mg, but not mg->object - if( !mg || !mg->object ) - return INT2PTR( void*, SvOK( ref ) ? SvIV( ref ) : 0 ); - - return mg->object; - } - else - { - croak( "variable is not of type %s", classname ); - return NULL; // dummy, for compiler - } -}