diff --git a/.gitmodules b/.gitmodules index 2a3a5610c..b77c83579 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,12 +4,3 @@ [submodule "Submodules/agg-sharp"] path = Submodules/agg-sharp url = https://github.com/MatterHackers/agg-sharp.git -[submodule "Submodules/geometry3Sharp"] - path = Submodules/geometry3Sharp - url = https://github.com/MatterHackers/geometry3Sharp -[submodule "Submodules/gsGCode"] - path = Submodules/gsGCode - url = https://github.com/MatterHackers/gsGCode -[submodule "Submodules/gsSlicer"] - path = Submodules/gsSlicer - url = https://github.com/MatterHackers/gsSlicer diff --git a/MatterControl.sln b/MatterControl.sln index 3c683c426..f36386b4d 100644 --- a/MatterControl.sln +++ b/MatterControl.sln @@ -58,8 +58,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl.AutomationTes EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{FED00F38-E911-45E1-A788-26980E84C3D6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net3dBool", "Submodules\agg-sharp\PolygonMesh\Net3dBool\Net3dBool.csproj", "{7EE4636D-8A92-4015-9562-7FCD6ADD0645}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MatterSlice", "MatterSlice", "{57647FCB-8F00-4C05-972C-3CF6ACD12A63}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pathfinding", "Submodules\MatterSlice\Pathfinding\Pathfinding.csproj", "{8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB}" @@ -90,18 +88,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.PartSheet", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.MeshOperations", "MatterControl.MeshOperations\MatterControl.MeshOperations.csproj", "{8A33EE41-BEFA-499F-9184-1B8D0C8A4600}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gsSlicer", "gsSlicer", "{19D0D43D-0007-412B-980A-445EA6E8AD94}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clipper_library", "Submodules\gsSlicer\thirdparty\clipper_library\clipper_library.csproj", "{E75C6D22-D942-47C9-9591-1F83BA2C4762}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "geometry3Sharp", "Submodules\geometry3Sharp\geometry3Sharp.csproj", "{A27598CF-B162-4083-88B9-6B8902348107}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "gsGCode", "Submodules\gsGCode\gsGCode.csproj", "{1BB917A2-56AF-4A43-A99F-FF073F53A113}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "gsSlicer", "Submodules\gsSlicer\gsSlicer.csproj", "{B3B79E5B-B7E2-4DE8-9810-666B0037D86F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.gsSlicer", "MatterHackers.gsSlicer\MatterControl.gsSlicer.csproj", "{C4F5AB29-8AED-4183-9562-9CA428E736B3}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Typography", "Typography", "{FDD3A966-672B-42D8-86D5-D749B09A9060}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Typography.GlyphLayout", "Submodules\agg-sharp\Typography\Typography.GlyphLayout\Typography.GlyphLayout.shproj", "{D8861CF8-C506-472B-8A57-632BD6CA6496}" @@ -116,6 +102,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GLFW.NETStandard", "Submodu EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.SLA", "MatterControl.SLA\MatterControl.SLA.csproj", "{34383A75-1831-4816-A38A-AB06B969D7C7}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "geometry3Sharp", "Submodules\agg-sharp\geometry3Sharp\geometry3Sharp.csproj", "{3A25C796-F676-4422-8F30-01D4FDB240F1}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution Submodules\agg-sharp\Typography\Typography.OpenFont\Typography.OpenFont.projitems*{235a071b-8d06-40ae-a5c5-b1ce59715ee9}*SharedItemsImports = 13 @@ -306,14 +294,6 @@ Global {418E7058-92EE-4329-86BA-AC26B65AFB25}.Release|Any CPU.Build.0 = Release|Any CPU {418E7058-92EE-4329-86BA-AC26B65AFB25}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {418E7058-92EE-4329-86BA-AC26B65AFB25}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {7EE4636D-8A92-4015-9562-7FCD6ADD0645}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7EE4636D-8A92-4015-9562-7FCD6ADD0645}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7EE4636D-8A92-4015-9562-7FCD6ADD0645}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {7EE4636D-8A92-4015-9562-7FCD6ADD0645}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {7EE4636D-8A92-4015-9562-7FCD6ADD0645}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7EE4636D-8A92-4015-9562-7FCD6ADD0645}.Release|Any CPU.Build.0 = Release|Any CPU - {7EE4636D-8A92-4015-9562-7FCD6ADD0645}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {7EE4636D-8A92-4015-9562-7FCD6ADD0645}.Release|Mixed Platforms.Build.0 = Release|Any CPU {8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB}.Debug|Any CPU.Build.0 = Debug|Any CPU {8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -426,46 +406,6 @@ Global {8A33EE41-BEFA-499F-9184-1B8D0C8A4600}.Release|Any CPU.Build.0 = Release|Any CPU {8A33EE41-BEFA-499F-9184-1B8D0C8A4600}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {8A33EE41-BEFA-499F-9184-1B8D0C8A4600}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {E75C6D22-D942-47C9-9591-1F83BA2C4762}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E75C6D22-D942-47C9-9591-1F83BA2C4762}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E75C6D22-D942-47C9-9591-1F83BA2C4762}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {E75C6D22-D942-47C9-9591-1F83BA2C4762}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {E75C6D22-D942-47C9-9591-1F83BA2C4762}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E75C6D22-D942-47C9-9591-1F83BA2C4762}.Release|Any CPU.Build.0 = Release|Any CPU - {E75C6D22-D942-47C9-9591-1F83BA2C4762}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {E75C6D22-D942-47C9-9591-1F83BA2C4762}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A27598CF-B162-4083-88B9-6B8902348107}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A27598CF-B162-4083-88B9-6B8902348107}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A27598CF-B162-4083-88B9-6B8902348107}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A27598CF-B162-4083-88B9-6B8902348107}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A27598CF-B162-4083-88B9-6B8902348107}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A27598CF-B162-4083-88B9-6B8902348107}.Release|Any CPU.Build.0 = Release|Any CPU - {A27598CF-B162-4083-88B9-6B8902348107}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A27598CF-B162-4083-88B9-6B8902348107}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {1BB917A2-56AF-4A43-A99F-FF073F53A113}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1BB917A2-56AF-4A43-A99F-FF073F53A113}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1BB917A2-56AF-4A43-A99F-FF073F53A113}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1BB917A2-56AF-4A43-A99F-FF073F53A113}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1BB917A2-56AF-4A43-A99F-FF073F53A113}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1BB917A2-56AF-4A43-A99F-FF073F53A113}.Release|Any CPU.Build.0 = Release|Any CPU - {1BB917A2-56AF-4A43-A99F-FF073F53A113}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {1BB917A2-56AF-4A43-A99F-FF073F53A113}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {B3B79E5B-B7E2-4DE8-9810-666B0037D86F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3B79E5B-B7E2-4DE8-9810-666B0037D86F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3B79E5B-B7E2-4DE8-9810-666B0037D86F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {B3B79E5B-B7E2-4DE8-9810-666B0037D86F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B3B79E5B-B7E2-4DE8-9810-666B0037D86F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3B79E5B-B7E2-4DE8-9810-666B0037D86F}.Release|Any CPU.Build.0 = Release|Any CPU - {B3B79E5B-B7E2-4DE8-9810-666B0037D86F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {B3B79E5B-B7E2-4DE8-9810-666B0037D86F}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C4F5AB29-8AED-4183-9562-9CA428E736B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4F5AB29-8AED-4183-9562-9CA428E736B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4F5AB29-8AED-4183-9562-9CA428E736B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C4F5AB29-8AED-4183-9562-9CA428E736B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C4F5AB29-8AED-4183-9562-9CA428E736B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4F5AB29-8AED-4183-9562-9CA428E736B3}.Release|Any CPU.Build.0 = Release|Any CPU - {C4F5AB29-8AED-4183-9562-9CA428E736B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C4F5AB29-8AED-4183-9562-9CA428E736B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU {B112455B-E42E-4718-821F-862884B9C07C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B112455B-E42E-4718-821F-862884B9C07C}.Debug|Any CPU.Build.0 = Debug|Any CPU {B112455B-E42E-4718-821F-862884B9C07C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -498,6 +438,14 @@ Global {34383A75-1831-4816-A38A-AB06B969D7C7}.Release|Any CPU.Build.0 = Release|Any CPU {34383A75-1831-4816-A38A-AB06B969D7C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {34383A75-1831-4816-A38A-AB06B969D7C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {3A25C796-F676-4422-8F30-01D4FDB240F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3A25C796-F676-4422-8F30-01D4FDB240F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3A25C796-F676-4422-8F30-01D4FDB240F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {3A25C796-F676-4422-8F30-01D4FDB240F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3A25C796-F676-4422-8F30-01D4FDB240F1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3A25C796-F676-4422-8F30-01D4FDB240F1}.Release|Any CPU.Build.0 = Release|Any CPU + {3A25C796-F676-4422-8F30-01D4FDB240F1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {3A25C796-F676-4422-8F30-01D4FDB240F1}.Release|Mixed Platforms.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -525,7 +473,6 @@ Global {E9102310-0029-4D8F-B1E9-88FBA6147D45} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} {94838988-523C-4B11-AD82-8B9B76F23A31} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} {418E7058-92EE-4329-86BA-AC26B65AFB25} = {FBE6DF29-85A9-4A8B-B739-35BE4CA0A9B7} - {7EE4636D-8A92-4015-9562-7FCD6ADD0645} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} {8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63} {23EC3364-7C93-4169-9AB2-7181C66004C0} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63} {2C564BE1-352D-4DDB-8226-F0981F983C60} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63} @@ -538,11 +485,6 @@ Global {50505F12-985B-4C5F-8DAB-D5BEA734CD51} = {FED00F38-E911-45E1-A788-26980E84C3D6} {312CE0DD-0F8F-4366-96A4-44D0AAEF60AA} = {FED00F38-E911-45E1-A788-26980E84C3D6} {8A33EE41-BEFA-499F-9184-1B8D0C8A4600} = {FED00F38-E911-45E1-A788-26980E84C3D6} - {E75C6D22-D942-47C9-9591-1F83BA2C4762} = {19D0D43D-0007-412B-980A-445EA6E8AD94} - {A27598CF-B162-4083-88B9-6B8902348107} = {19D0D43D-0007-412B-980A-445EA6E8AD94} - {1BB917A2-56AF-4A43-A99F-FF073F53A113} = {19D0D43D-0007-412B-980A-445EA6E8AD94} - {B3B79E5B-B7E2-4DE8-9810-666B0037D86F} = {19D0D43D-0007-412B-980A-445EA6E8AD94} - {C4F5AB29-8AED-4183-9562-9CA428E736B3} = {19D0D43D-0007-412B-980A-445EA6E8AD94} {FDD3A966-672B-42D8-86D5-D749B09A9060} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} {D8861CF8-C506-472B-8A57-632BD6CA6496} = {FDD3A966-672B-42D8-86D5-D749B09A9060} {B112455B-E42E-4718-821F-862884B9C07C} = {FDD3A966-672B-42D8-86D5-D749B09A9060} @@ -550,6 +492,7 @@ Global {5AC2F31C-BD33-4BD1-8A90-D6A23941A74F} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} {7ECC040E-19FC-4E10-B314-412CF7AB2170} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} {34383A75-1831-4816-A38A-AB06B969D7C7} = {FED00F38-E911-45E1-A788-26980E84C3D6} + {3A25C796-F676-4422-8F30-01D4FDB240F1} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {42D74E06-00EA-43D2-A05B-9BEAD4A2C8A0} diff --git a/MatterControlLib/MatterControlLib.csproj b/MatterControlLib/MatterControlLib.csproj index 2cd0d9efb..f282c906c 100644 --- a/MatterControlLib/MatterControlLib.csproj +++ b/MatterControlLib/MatterControlLib.csproj @@ -69,6 +69,7 @@ + @@ -80,7 +81,6 @@ - diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 95008e620..bc94a222b 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 95008e620632d616736d75932c2fe0a0d78e1621 +Subproject commit bc94a222bc72fff6e85b0d6fee6aab5d0a97de4c diff --git a/Submodules/geometry3Sharp b/Submodules/geometry3Sharp deleted file mode 160000 index 5d5639d79..000000000 --- a/Submodules/geometry3Sharp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5d5639d79646300ff6fb2911bfcef246eac140d2 diff --git a/Submodules/gsGCode b/Submodules/gsGCode deleted file mode 160000 index eb104d7a9..000000000 --- a/Submodules/gsGCode +++ /dev/null @@ -1 +0,0 @@ -Subproject commit eb104d7a91ff4b1c91f12fe56cf6549f0708a564 diff --git a/Submodules/gsSlicer b/Submodules/gsSlicer deleted file mode 160000 index 6f1311075..000000000 --- a/Submodules/gsSlicer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6f1311075961588a2dc6c6f51ef427fbb65fb6f0