wip

diff --git a/.gitignore b/.gitignore
index e3dbba2de4a89ce2a566687f5f45d16663d152eb..fcf4a26da4072b37bf7d9bc8f98557e54d0b6589 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,27 +2,11 @@
 build
 Win_x86
 Crow.userprefs
-Debug
 packages
 *.nupkg
 *.user
 .vs/
 /GOLib.suo
 /tmp
-/bin/*
-/obj/*
-/GOLib.userprefs
-/Tests/obj/*
-CrowIDE/obj
-Crow/obj
-/Tests/bin/*
-/UnitTest/obj
-/UnitTest/bin
-MonoDevelop.GOLib/bin/
-MonoDevelop.GOLib/build/
-MonoDevelop.GOLib/obj/
-Tests/Tests.sln
-Tests/Tests.userprefs
-src/GraphicObjects/Panel.cs
-src/GraphicObjects/VerticalWrappingWidget.cs
-src/GraphicObjects/HorizontalWrappingWidget.cs
+bin
+obj

diff --git a/Crow/Default.style b/Crow/Default.style
index b924b2190b336aeb1b757d7fea322d8f9f03dd0b..309c99ae6537a5a787ab548e312d4c06bbf656fb 100644 (file)
--- a/Crow/Default.style
+++ b/Crow/Default.style
@@ -57,8 +57,8 @@ MenuItem {
        //Background = "vgradient|0:DimGrey|1:Black";
        //Background = "Transparent";
        Foreground = "LightGrey";
-       //MouseEnter = "{Background=SteelBlue;}";
-       //MouseLeave = "{Background=Transparent;}";
+       MouseEnter = "{Background=SteelBlue;}";
+       MouseLeave = "{Background=Transparent;}";
        //MouseEnter = "{Background = vgradient|0:SteelBlue|1:Jet;Foreground=White;}";
        //MouseLeave = "{Foreground=LightGrey;Background=Transparent;}";
        SelectionBackground = "Transparent";

diff --git a/Crow/src/GraphicObjects/SaturationValueSelector.cs b/Crow/src/GraphicObjects/SaturationValueSelector.cs
index 68c497b3a7f9562134d3a17aa4e8dc6e498a66d7..88eaff099cd4f2ae79c03d49b5c42663b5baad02 100644 (file)
--- a/Crow/src/GraphicObjects/SaturationValueSelector.cs
+++ b/Crow/src/GraphicObjects/SaturationValueSelector.cs
@@ -106,7 +106,7 @@ namespace Crow
                        ctx.Arc (mousePos.X, mousePos.Y, 3.5, 0, Math.PI * 2.0);
                        ctx.LineWidth = 0.5;
                        ctx.Stroke ();
-                       ctx.Translate (-0.5, -0.5);
+                       ctx.Translate (-1.0, -1.0);
                        ctx.Arc (mousePos.X, mousePos.Y, 3.5, 0, Math.PI * 2.0);
                        ctx.SetSourceColor (Color.White);
                        ctx.Stroke ();

diff --git a/Crow/src/vkvg/Context.cs b/Crow/src/vkvg/Context.cs
index 9566caff00662d2b95a9150b95752c73fcaf4e44..6b71b3a25f1148f56421ff3329a68097c98eb4fc 100644 (file)
--- a/Crow/src/vkvg/Context.cs
+++ b/Crow/src/vkvg/Context.cs
@@ -4,7 +4,7 @@
 // Author:
 //       Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
 //
-// Copyright (c) 2018 jp
+// Copyright (c) 2018-2019 jp
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -25,10 +25,8 @@
 // THE SOFTWARE.
 using System;
 using System.Text;
-using Crow;
 
-namespace vkvg
-{
+namespace vkvg {
        public class Context: IDisposable
        {
 
@@ -179,10 +177,6 @@ namespace vkvg
                public void ClosePath () {
                        NativeMethods.vkvg_close_path (handle);
                }
-
-//             public void Rectangle (float x, float y, float width, float height){
-//                     NativeMethods.vkvg_rectangle ();
-//             }
                public void MoveTo (PointD p){
                        NativeMethods.vkvg_move_to (handle, (float)p.X, (float)p.Y);
                }

diff --git a/Crow/src/vkvg/Enums.cs b/Crow/src/vkvg/Enums.cs
index f6fedd54052b542748cb3c66006fa1c154662a52..a72b0784c731b62b05c955d8020d5afcc419e845 100644 (file)
--- a/Crow/src/vkvg/Enums.cs
+++ b/Crow/src/vkvg/Enums.cs
@@ -4,7 +4,7 @@
 // Author:
 //       Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
 //
-// Copyright (c) 2013-2017 Jean-Philippe Bruyère
+// Copyright (c) 2013-2019 Jean-Philippe Bruyère
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/Crow/src/vkvg/NativeMethods.cs b/Crow/src/vkvg/NativeMethods.cs
index 4f137ccdc752891ca5f31b40cec9c13fb4fc2725..7039a9afda825da8d369692c2fd7192aa6add6c4 100644 (file)
--- a/Crow/src/vkvg/NativeMethods.cs
+++ b/Crow/src/vkvg/NativeMethods.cs
@@ -4,7 +4,7 @@
 // Author:
 //       Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
 //
-// Copyright (c) 2018 jp
+// Copyright (c) 2018-2019 Jean-Philippe Bruyère
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -197,7 +197,7 @@ namespace vkvg
                internal static extern void vkvg_pattern_destroy (IntPtr pat);
 
                [DllImport (libvkvg, CallingConvention=CallingConvention.Cdecl)]
-               internal static extern void vkvg_patter_add_color_stop (IntPtr pat, float offset, float r, float g, float b, float a);
+               internal static extern void vkvg_pattern_add_color_stop (IntPtr pat, float offset, float r, float g, float b, float a);
                [DllImport (libvkvg, CallingConvention=CallingConvention.Cdecl)]
                internal static extern void vkvg_pattern_set_extend (IntPtr pat, Extend extend);
                [DllImport (libvkvg, CallingConvention=CallingConvention.Cdecl)]

diff --git a/Crow/src/vkvg/Pattern.cs b/Crow/src/vkvg/Pattern.cs
index 096a7e5a0d695a2c9d51e628cfaccb297e79c876..7ca3df2fc5537de31123cacc0423fea2954bb9de 100644 (file)
--- a/Crow/src/vkvg/Pattern.cs
+++ b/Crow/src/vkvg/Pattern.cs
@@ -4,7 +4,7 @@
 // Author:
 //       Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
 //
-// Copyright (c) 2019 jp
+// Copyright (c) 2019 Jean-Philippe Bruyère
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -76,10 +76,10 @@ namespace vkvg {
                }
 
                public void AddColorStop (float offset, float r, float g, float b, float a = 1f) {
-                       NativeMethods.vkvg_patter_add_color_stop (handle, offset, r, g, b, a);
+                       NativeMethods.vkvg_pattern_add_color_stop (handle, offset, r, g, b, a);
                }
                public void AddColorStop (float offset, Crow.Color c) {
-                       NativeMethods.vkvg_patter_add_color_stop (Handle, offset, (float)c.R, (float)c.G, (float)c.B, (float)c.A);
+                       NativeMethods.vkvg_pattern_add_color_stop (Handle, offset, (float)c.R, (float)c.G, (float)c.B, (float)c.A);
                }
 
                #region IDisposable implementation

diff --git a/Samples/HelloWorld/HelloWorld.csproj b/Samples/HelloWorld/HelloWorld.csproj
index a56481e6518061db9122cba28b2a36caf0753cbc..64976e458e4351bea80c0b2412c8eac103ac1283 100644 (file)
--- a/Samples/HelloWorld/HelloWorld.csproj
+++ b/Samples/HelloWorld/HelloWorld.csproj
@@ -1,63 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)netfx.props" />
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
-    <OutputPath>$(SolutionDir)build\$(Configuration)\samples\</OutputPath>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1F18E74F-BCC9-481C-8888-89D81CBB30BE}</ProjectGuid>
+    <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
+    <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
+    <OutputType>Exe</OutputType>        
+    <RepositoryUrl>https://github.com/jpbruyere/Crow</RepositoryUrl>
+    <License>https://opensource.org/licenses/MIT</License>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <EnableDefaultNoneItems>false</EnableDefaultNoneItems>     
     <ReleaseVersion>0.8.0</ReleaseVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="*.cs" />
+            
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
+    <Reference Include="System" />
+  </ItemGroup>    
+
+  <ItemGroup>  
+    <ProjectReference Include="..\..\Crow\Crow.csproj" />
+  </ItemGroup>    
+    
+  <ItemGroup>    
+    <Datas Include="..\data\**\*.*">      
+      <Link>data\%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Datas>
     <EmbeddedResource Include="ui\**\*.*">
       <LogicalName>HelloWorld.%(Filename)%(Extension)</LogicalName>
-    </EmbeddedResource>        
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="glTFLoader">
-      <HintPath>..\..\packages\glTF2Loader.1.1.3-alpha\lib\net35\glTFLoader.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Numerics.Vectors">
-      <HintPath>..\..\packages\System.Numerics.Vectors.4.6.0-preview4.19212.13\lib\net46\System.Numerics.Vectors.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0-preview4.19212.13\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="VK">
-      <HintPath>..\..\packages\Vulkan.0.1.2.6\lib\netstandard2.0\VK.dll</HintPath>
-    </Reference>
-    <Reference Include="CVKL-dotnet">
-      <HintPath>..\..\packages\CVKL.0.1.2\lib\netstandard2.0\CVKL-dotnet.dll</HintPath>
-    </Reference>
-  </ItemGroup> 
-  <ItemGroup>
-    <ProjectReference Include="..\..\Crow\Crow.csproj">
-      <Project>{C2980F9B-4798-4C05-99E2-E174810F7C7B}</Project>
-      <Name>Crow</Name>
-    </ProjectReference>
-  </ItemGroup>
+    </EmbeddedResource>                
+  </ItemGroup>     
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="CVKL" Version="0.1.3-beta" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file

diff --git a/Samples/HelloWorld/main.cs b/Samples/HelloWorld/main.cs
index 633ab13c4280e35f5b0315fb72d70e1400b892f3..3255220076d6286abcca74ff111fdbcddf3312d4 100644 (file)
--- a/Samples/HelloWorld/main.cs
+++ b/Samples/HelloWorld/main.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Threading;
-using Crow;
-using CVKL;
-using VK;
+using Crow;
 
 namespace HelloWorld
 {

diff --git a/Samples/HelloWorld/packages.config b/Samples/HelloWorld/packages.config
deleted file mode 100644 (file)
index fba81eb..0000000
--- a/Samples/HelloWorld/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CVKL" version="0.1.2" targetFramework="net471" />
-  <package id="glTF2Loader" version="1.1.3-alpha" targetFramework="net471" />
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" />
-  <package id="System.Numerics.Vectors" version="4.6.0-preview4.19212.13" targetFramework="net471" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0-preview4.19212.13" targetFramework="net471" />
-  <package id="Vulkan" version="0.1.2.6" targetFramework="net471" />
-</packages>
\ No newline at end of file