Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixes for current gtksharp, skiasharp
- Loading branch information
Showing
14 changed files
with
120 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<configuration> | ||
<runtime> | ||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
<dependentAssembly> | ||
<assemblyIdentity name="Mono.Cairo" publicKeyToken="0738eb9f132ed756" culture="neutral"/> | ||
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/> | ||
<assemblyIdentity name="Mono.Cairo" publicKeyToken="0738eb9f132ed756" culture="neutral" /> | ||
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> | ||
</dependentAssembly> | ||
</assemblyBinding> | ||
</runtime> | ||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration> | ||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="SkiaSharp" version="1.56.2" targetFramework="net452" /> | ||
<package id="SkiaSharp.Views" version="1.56.2" targetFramework="net452" /> | ||
<package id="SkiaSharp" version="1.60.2" targetFramework="net46" /> | ||
<package id="SkiaSharp.Views" version="1.60.2" targetFramework="net46" /> | ||
<package id="Svg" version="2.3.0" targetFramework="net452" /> | ||
</packages> |
Submodule geometry3Sharp
updated
23 files
+12 −0 | core/IndexPriorityQueue.cs | |
+19 −7 | core/ProfileUtil.cs | |
+3 −3 | distance/DistPoint3Triangle3.cs | |
+1 −1 | distance/DistRay3Segment3.cs | |
+8 −0 | geometry3Sharp.asmdef | |
+7 −1 | implicit/GridImplicits3d.cs | |
+195 −6 | implicit/Implicit3d.cs | |
+3 −1 | io/OBJWriter.cs | |
+1 −0 | io/StandardMeshWriter.cs | |
+4 −2 | mesh/DMesh3.cs | |
+3 −1 | mesh/MeshConstraintUtil.cs | |
+89 −0 | mesh/MeshEditor.cs | |
+59 −2 | mesh/MeshMeasurements.cs | |
+5 −0 | mesh/MeshRefinerBase.cs | |
+2 −0 | mesh/MeshWeights.cs | |
+38 −28 | mesh/Reducer.cs | |
+0 −50 | mesh/Remesher.cs | |
+2 −0 | mesh_generators/MeshGenerators.cs | |
+4 −0 | mesh_selection/MeshBoundaryLoops.cs | |
+8 −4 | queries/MeshQueries.cs | |
+14 −0 | spatial/DMeshAABBTree.cs | |
+9 −1 | spatial/DenseGrid3.cs | |
+385 −16 | spatial/MeshSignedDistanceGrid.cs |
Submodule gsGCode
updated
10 files
+1 −1 | assemblers/MakerbotAssembler.cs | |
+2 −2 | assemblers/RepRapAssembler.cs | |
+10 −0 | gsGCode.asmdef | |
+5 −1 | settings/AdditiveSettings.cs | |
+7 −0 | settings/FlashforgeSettings.cs | |
+8 −0 | settings/MakerbotSettings.cs | |
+57 −1 | settings/MonopriceSettings.cs | |
+59 −4 | settings/PrintrbotSettings.cs | |
+57 −5 | settings/PrusaSettings.cs | |
+5 −0 | settings/RepRapSettings.cs |
Submodule gsSlicer
updated
5 files
+65 −22 | generators/ThreeAxisPrintGenerator.cs | |
+10 −0 | gsSlicer.asmdef | |
+39 −16 | slicing/MeshPlanarSlicer.cs | |
+7 −7 | thirdparty/clipper_library/ClipperUtil.cs | |
+2 −0 | utility/LayersDetector.cs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
using System; | ||
using System.Collections.Generic; | ||
using System.Linq; | ||
using System.Text; | ||
using System.Threading.Tasks; | ||
using System.IO; | ||
using g3; | ||
|
||
namespace SliceViewer | ||
{ | ||
public static class GtkUtil | ||
{ | ||
/// <summary> | ||
/// Fix some issues w/ GtkSharp DLLs on windows. | ||
/// see: https://github.com/picoe/Eto/issues/442 | ||
/// https://forums.xamarin.com/discussion/15568/unable-to-load-dll-libgtk-win32-2-0-0-dll | ||
/// https://forums.xamarin.com/discussion/2091/cannot-run-gtk-project | ||
/// https://github.com/mono/monodevelop/commit/ad672ce79a50ce844398ae30cce8005163e41d0e | ||
/// </summary> | ||
public static bool CheckWindowsGtk() | ||
{ | ||
if (Util.IsRunningOnMono()) | ||
return true; | ||
|
||
string location = null; | ||
Version version = null; | ||
Version minVersion = new Version(2, 12, 22); | ||
using (var key = Microsoft.Win32.Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Xamarin\GtkSharp\InstallFolder")) { | ||
if (key != null) | ||
location = key.GetValue(null) as string; | ||
} | ||
using (var key = Microsoft.Win32.Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Xamarin\GtkSharp\Version")) { | ||
if (key != null) | ||
Version.TryParse(key.GetValue(null) as string, out version); | ||
} | ||
//TODO: check build version of GTK# dlls in GAC | ||
if (version == null || version < minVersion || location == null || !File.Exists(Path.Combine(location, "bin", "libgtk-win32-2.0-0.dll"))) { | ||
Console.WriteLine("Did not find required GTK# installation"); | ||
// string url = "http://monodevelop.com/Download"; | ||
// string caption = "Fatal Error"; | ||
// string message = | ||
// "{0} did not find the required version of GTK#. Please click OK to open the download page, where " + | ||
// "you can download and install the latest version."; | ||
// if (DisplayWindowsOkCancelMessage ( | ||
// string.Format (message, BrandingService.ApplicationName, url), caption) | ||
// ) { | ||
// Process.Start (url); | ||
// } | ||
return false; | ||
} | ||
Console.WriteLine("Found GTK# version " + version); | ||
var path = Path.Combine(location, @"bin"); | ||
Console.WriteLine("SetDllDirectory(\"{0}\") ", path); | ||
try { | ||
if (SetDllDirectory(path)) { | ||
return true; | ||
} | ||
} catch (EntryPointNotFoundException) { | ||
} | ||
// this shouldn't happen unless something is weird in Windows | ||
Console.WriteLine("Unable to set GTK+ dll directory"); | ||
return true; | ||
} | ||
|
||
[System.Runtime.InteropServices.DllImport("kernel32.dll", CharSet = System.Runtime.InteropServices.CharSet.Unicode, SetLastError = true)] | ||
[return: System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.Bool)] | ||
static extern bool SetDllDirectory(string lpPathName); | ||
} | ||
|
||
|
||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<configuration> | ||
<runtime> | ||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
<dependentAssembly> | ||
<assemblyIdentity name="Mono.Cairo" publicKeyToken="0738eb9f132ed756" culture="neutral"/> | ||
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/> | ||
<assemblyIdentity name="Mono.Cairo" publicKeyToken="0738eb9f132ed756" culture="neutral" /> | ||
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> | ||
</dependentAssembly> | ||
</assemblyBinding> | ||
</runtime> | ||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration> | ||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="SkiaSharp" version="1.56.2" targetFramework="net452" /> | ||
<package id="SkiaSharp.Views" version="1.56.2" targetFramework="net452" /> | ||
<package id="SkiaSharp" version="1.60.2" targetFramework="net46" /> | ||
<package id="SkiaSharp.Views" version="1.60.2" targetFramework="net46" /> | ||
<package id="Svg" version="2.3.0" targetFramework="net452" /> | ||
</packages> |