wip

diff --git a/Crow/Crow.csproj b/Crow/Crow.csproj
index 8b4a6f7f2c6f7d097eba9e4d9047374677870832..1fa7c4388e78fefb31f26980c1be0c56f93b0c73 100644 (file)
--- a/Crow/Crow.csproj
+++ b/Crow/Crow.csproj
@@ -52,6 +52,9 @@
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Drawing" />
+    <Reference Include="VK">
+      <HintPath>..\..\packages\Vulkan.0.1.2.5-alpha\lib\netstandard2.0\VK.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -188,5 +191,6 @@
     <EmbeddedResource Include="Images\Icons\Cursors\sb_v_double_arrow" />
     <EmbeddedResource Include="Images\Icons\Cursors\top_left_corner" />
     <EmbeddedResource Include="Images\Icons\Cursors\top_right_corner" />
+    <None Include="packages.config" />
   </ItemGroup>
 </Project>

diff --git a/Crow/packages.config b/Crow/packages.config
new file mode 100644 (file)
index 0000000..16d6f60
--- /dev/null
+++ b/Crow/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Vulkan" version="0.1.2.5-alpha" targetFramework="net461" />
+</packages>
\ No newline at end of file

diff --git a/Crow/src/Colors.cs b/Crow/src/Colors.cs
index 8b91807413a4c4c8f9908b4def63c2c0b0e003c5..7dea8700d13bcedc3e8506d4af0bdde1c9aae1dd 100644 (file)
--- a/Crow/src/Colors.cs
+++ b/Crow/src/Colors.cs
@@ -42,7 +42,7 @@ namespace Crow
        public struct Color
     {
                #region CTOR
-               public Color(double _R, double _G, double _B, double _A)
+               public Color(double _R, double _G, double _B, double _A = 1)
                {
                        A = _A.Clamp(0,1);
                        R = _R.Clamp(0,1);

diff --git a/Crow/src/Interface.cs b/Crow/src/Interface.cs
index 9c978cb59c8f083be45f6566dc562b9d340403d9..36b3d9c68c15a23833dc649014354a1a4a97f009 100644 (file)
--- a/Crow/src/Interface.cs
+++ b/Crow/src/Interface.cs
@@ -750,7 +750,7 @@ namespace Crow
                                if (!clipping.IsEmpty) {
                                        IsDirty = true;
 
-                                       clipping.clear (ctx);
+                                       clipping.clearAndClip (ctx);
 
                                        for (int i = GraphicTree.Count - 1; i >= 0; i--) {
                                                Widget p = GraphicTree[i];
@@ -785,7 +785,7 @@ namespace Crow
                                        clipping.stroke (ctx, Color.Magenta.AdjustAlpha (0.5));
                                        ctx.Stroke ();
 #endif
-
+                                       //clipping.stroke (ctx, new Color (1, 0, 0));
                                        clipping.Reset ();
                                        //}
                                        //surf.WriteToPng (@"/mnt/data/test.png");

diff --git a/MDCrow/obj/MDCrow.csproj.nuget.cache b/MDCrow/obj/MDCrow.csproj.nuget.cache
deleted file mode 100644 (file)
index 5dc86cb..0000000
--- a/MDCrow/obj/MDCrow.csproj.nuget.cache
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "version": 1,
-  "dgSpecHash": "NOLr8yug3fyGzNdtnGuiu+nsOLipm7yDza0aE769gwIvmZfTjFbAmOPxIueJkGAXWMxx8sw4H+nYZROzeSVvUQ==",
-  "success": true
-}
\ No newline at end of file

diff --git a/MDCrow/obj/MDCrow.csproj.nuget.g.props b/MDCrow/obj/MDCrow.csproj.nuget.g.props
deleted file mode 100644 (file)
index ce1dceb..0000000
--- a/MDCrow/obj/MDCrow.csproj.nuget.g.props
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
-    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">/mnt/devel/gts/crow/MDCrow/obj/project.assets.json</ProjectAssetsFile>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/home/jp/.nuget/packages/</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/home/jp/.nuget/packages/;/usr/share/dotnet/sdk/NuGetFallbackFolder</NuGetPackageFolders>
-    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.7.0</NuGetToolVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)monodevelop.addins/0.4.7/build/MonoDevelop.Addins.props" Condition="Exists('$(NuGetPackageRoot)monodevelop.addins/0.4.7/build/MonoDevelop.Addins.props')" />
-  </ImportGroup>
-</Project>
\ No newline at end of file

diff --git a/MDCrow/obj/MDCrow.csproj.nuget.g.targets b/MDCrow/obj/MDCrow.csproj.nuget.g.targets
deleted file mode 100644 (file)
index 175c03f..0000000
--- a/MDCrow/obj/MDCrow.csproj.nuget.g.targets
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)monodevelop.addins/0.4.7/build/MonoDevelop.Addins.targets" Condition="Exists('$(NuGetPackageRoot)monodevelop.addins/0.4.7/build/MonoDevelop.Addins.targets')" />
-  </ImportGroup>
-</Project>
\ No newline at end of file

diff --git a/MDCrow/obj/project.assets.json b/MDCrow/obj/project.assets.json
deleted file mode 100644 (file)
index d32ce72..0000000
--- a/MDCrow/obj/project.assets.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "version": 3,
-  "targets": {
-    ".NETFramework,Version=v4.6.1": {
-      "MonoDevelop.Addins/0.4.7": {
-        "type": "package",
-        "build": {
-          "build/MonoDevelop.Addins.props": {},
-          "build/MonoDevelop.Addins.targets": {}
-        }
-      },
-      "Crow/1.0.0": {
-        "type": "project",
-        "compile": {
-          "bin/placeholder/Crow.dll": {}
-        },
-        "runtime": {
-          "bin/placeholder/Crow.dll": {}
-        }
-      }
-    }
-  },
-  "libraries": {
-    "MonoDevelop.Addins/0.4.7": {
-      "sha512": "eUqhwtcw224cx8OjkGaCwVsl4UO78X4nE3r1PpQVGaJWopwaUvKbyDfNmGxpDAKO5/+K4v3Dxxuz5zhFpz+6hQ==",
-      "type": "package",
-      "path": "monodevelop.addins/0.4.7",
-      "files": [
-        ".signature.p7s",
-        "build/ICSharpCode.SharpZipLib.dll",
-        "build/Mono.Addins.CecilReflector.dll",
-        "build/Mono.Addins.Setup.dll",
-        "build/Mono.Addins.dll",
-        "build/Mono.Cecil.Mdb.dll",
-        "build/Mono.Cecil.Pdb.dll",
-        "build/Mono.Cecil.Rocks.dll",
-        "build/Mono.Cecil.dll",
-        "build/MonoDevelop.Addins.Tasks.dll",
-        "build/MonoDevelop.Addins.Tasks.pdb",
-        "build/MonoDevelop.Addins.props",
-        "build/MonoDevelop.Addins.targets",
-        "monodevelop.addins.0.4.7.nupkg.sha512",
-        "monodevelop.addins.nuspec"
-      ]
-    },
-    "Crow/1.0.0": {
-      "type": "project",
-      "path": "../Crow/Crow.csproj",
-      "msbuildProject": "../Crow/Crow.csproj"
-    }
-  },
-  "projectFileDependencyGroups": {
-    ".NETFramework,Version=v4.6.1": [
-      "Crow >= 1.0.0",
-      "MonoDevelop.Addins >= 0.4.7"
-    ]
-  },
-  "packageFolders": {
-    "/home/jp/.nuget/packages/": {},
-    "/usr/share/dotnet/sdk/NuGetFallbackFolder": {}
-  },
-  "project": {
-    "version": "1.0.0",
-    "restore": {
-      "projectUniqueName": "/mnt/devel/gts/crow/MDCrow/MDCrow.csproj",
-      "projectName": "MDCrow",
-      "projectPath": "/mnt/devel/gts/crow/MDCrow/MDCrow.csproj",
-      "packagesPath": "/home/jp/.nuget/packages/",
-      "outputPath": "/mnt/devel/gts/crow/MDCrow/obj",
-      "projectStyle": "PackageReference",
-      "fallbackFolders": [
-        "/usr/share/dotnet/sdk/NuGetFallbackFolder"
-      ],
-      "configFilePaths": [
-        "/mnt/devel/gts/crow/.nuget/NuGet.config",
-        "/home/jp/.config/NuGet/NuGet.Config"
-      ],
-      "originalTargetFrameworks": [
-        "net461"
-      ],
-      "sources": {
-        "/mnt/devel/gts/crow-xlib/build/Debug": {},
-        "https://api.nuget.org/v3/index.json": {}
-      },
-      "frameworks": {
-        "net461": {
-          "projectReferences": {
-            "/mnt/devel/gts/crow/Crow/Crow.csproj": {
-              "projectPath": "/mnt/devel/gts/crow/Crow/Crow.csproj"
-            }
-          }
-        }
-      },
-      "warningProperties": {
-        "warnAsError": [
-          "NU1605"
-        ]
-      }
-    },
-    "frameworks": {
-      "net461": {
-        "dependencies": {
-          "MonoDevelop.Addins": {
-            "target": "Package",
-            "version": "[0.4.7, )"
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file