nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Veldrid support

Browse source 
- Alt Veldrid platform config
This commit is contained in:
John Lewin 2018-08-15 10:02:08 -07:00
parent 4028cb57c7
commit f1aab76978
4 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
MatterControl.csproj
View file

@ -639,6 +639,7 @@
<ItemGroup>
<EmbeddedResource Include="config.json">
<LogicalName>config.json</LogicalName>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Utilities\InspectForm.resx">
<DependentUpon>InspectForm.cs</DependentUpon>
@ -702,6 +703,10 @@
<Project>{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}</Project>
<Name>VectorMath</Name>
</ProjectReference>
<ProjectReference Include="Submodules\agg-sharp\Veldrid\MatterHackers.Veldrid.csproj">
<Project>{0d815605-6bd0-4068-86b9-18ac248109e1}</Project>
<Name>MatterHackers.Veldrid</Name>
</ProjectReference>
<ProjectReference Include="Submodules\MatterSlice\MatterSlice.csproj">
<Project>{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}</Project>
<Name>MatterSlice</Name>

21
MatterControl.sln
View file

@ -25,7 +25,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl", "MatterCont
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tesselate", "Submodules\agg-sharp\Tesselate\Tesselate.csproj", "{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlatformWin32", "Submodules\agg-sharp\PlatformWin32\PlatformWin32.csproj", "{670BDDFF-927B-425D-9DD1-22ACB14356EB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlatformWin32", "Submodules\agg-sharp\PlatformWin32\PlatformWin32.csproj", "{670BDDFF-927B-425D-9DD1-22ACB14356EB}"
ProjectSection(ProjectDependencies) = postProject
{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD} = {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}
{74F6BB6C-9D02-4512-A59A-21940E35C532} = {74F6BB6C-9D02-4512-A59A-21940E35C532}
@ -34,11 +34,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlatformWin32", "Submodules
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VectorMath", "Submodules\agg-sharp\VectorMath\VectorMath.csproj", "{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenderOpenGl", "Submodules\agg-sharp\RenderOpenGl\RenderOpenGl.csproj", "{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenderOpenGl", "Submodules\agg-sharp\RenderOpenGl\RenderOpenGl.csproj", "{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gui", "Submodules\agg-sharp\Gui\Gui.csproj", "{74F6BB6C-9D02-4512-A59A-21940E35C532}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Csg", "Submodules\agg-sharp\Csg\Csg.csproj", "{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Csg", "Submodules\agg-sharp\Csg\Csg.csproj", "{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PolygonMesh", "Submodules\agg-sharp\PolygonMesh\PolygonMesh.csproj", "{86F6AAF2-9B50-40B8-A427-1897D76471C5}"
EndProject
@ -50,7 +50,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RayTracer", "Submodules\agg
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Localizations", "Submodules\agg-sharp\Localizations\Localizations.csproj", "{CA96058C-1A37-465D-A357-D6D695B13D25}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessing", "Submodules\agg-sharp\ImageProcessing\ImageProcessing.csproj", "{036BCCBA-52D8-457C-84AE-8821F209FE4A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageProcessing", "Submodules\agg-sharp\ImageProcessing\ImageProcessing.csproj", "{036BCCBA-52D8-457C-84AE-8821F209FE4A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clipper_library", "Submodules\agg-sharp\clipper_library\clipper_library.csproj", "{9B062971-A88E-4A3D-B3C9-12B78D15FA66}"
EndProject
@ -76,7 +76,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agg.Tests", "Submodules\agg
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterSlice.Tests", "Submodules\MatterSlice\Tests\MatterSlice.Tests\MatterSlice.Tests.csproj", "{8CD15B23-D30F-470E-99BA-9276FB7CABD4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuiAutomation", "Submodules\agg-sharp\GuiAutomation\GuiAutomation.csproj", "{E9102310-0029-4D8F-B1E9-88FBA6147D45}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GuiAutomation", "Submodules\agg-sharp\GuiAutomation\GuiAutomation.csproj", "{E9102310-0029-4D8F-B1E9-88FBA6147D45}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataConverters2D", "Submodules\agg-sharp\DataConverters2D\DataConverters2D.csproj", "{94838988-523C-4B11-AD82-8B9B76F23A31}"
EndProject
@ -104,6 +104,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Typography.GlyphLayout", "S
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Typography.OpenFont", "Submodules\agg-sharp\Typography.OpenFont\Typography.OpenFont.csproj", "{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterHackers.Veldrid", "Submodules\agg-sharp\Veldrid\MatterHackers.Veldrid.csproj", "{20FDB5BC-C55E-4157-A2E0-4F61A65EE22B}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Submodules\agg-sharp\Typography.GlyphLayout\Typography.GlyphLayout.projitems*{657dbc6d-c3ea-4398-a3fa-ddb73c14f71b}*SharedItemsImports = 4
@ -396,6 +398,14 @@ Global
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Release|Any CPU.Build.0 = Release|Any CPU
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{20FDB5BC-C55E-4157-A2E0-4F61A65EE22B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{20FDB5BC-C55E-4157-A2E0-4F61A65EE22B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{20FDB5BC-C55E-4157-A2E0-4F61A65EE22B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{20FDB5BC-C55E-4157-A2E0-4F61A65EE22B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{20FDB5BC-C55E-4157-A2E0-4F61A65EE22B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{20FDB5BC-C55E-4157-A2E0-4F61A65EE22B}.Release|Any CPU.Build.0 = Release|Any CPU
{20FDB5BC-C55E-4157-A2E0-4F61A65EE22B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{20FDB5BC-C55E-4157-A2E0-4F61A65EE22B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -434,6 +444,7 @@ Global
{97D5ADE3-C1B4-4B46-8A3E-718A4F7F079F} = {FED00F38-E911-45E1-A788-26980E84C3D6}
{DE958333-2467-409D-904D-92C9CCD0BA52} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
{20FDB5BC-C55E-4157-A2E0-4F61A65EE22B} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {42D74E06-00EA-43D2-A05B-9BEAD4A2C8A0}

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit a1abe3d70bc2a04805ca6cde4c8743a96e3cbaaf
Subproject commit 9d94b9a38e859eccf57f08a8fe955c9de2c30c66

10
config-veldrid.json Normal file
View file

@ -0,0 +1,10 @@
{
"ProviderTypes": {
"OsInformationProvider": "MatterHackers.Agg.Platform.WinformsInformationProvider, agg_platform_win32",
"DialogProvider": "MatterHackers.Agg.Platform.WinformsFileDialogProvider, agg_platform_win32",
"SystemWindow": "MatterHackers.Veldrid.VeldridSystemWindow, MatterHackers.Veldrid",
"SystemWindowProvider": "MatterHackers.Veldrid.VeldridWindowProvider, MatterHackers.Veldrid",
"ImageIOProvider": "MatterHackers.Agg.Image.ImageIOWindowsPlugin, agg_platform_win32",
"StaticDataProvider": "MatterHackers.Agg.FileSystemStaticData, agg_platform_win32"
}
}