Skip to content

Commit 558d3f9

Browse files
skyrpexskyrpex
committed
Merge with v5.1.6
1 parent b40c167 commit 558d3f9

File tree

141 files changed

+34184
-29563
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+34184
-29563
lines changed

‎Beziers/Beziers.cs‎

Lines changed: 666 additions & 0 deletions
Large diffs are not rendered by default.

‎Beziers/Beziers.pas‎

Lines changed: 899 additions & 0 deletions
Large diffs are not rendered by default.

‎Beziers/beziers.cpp‎

Lines changed: 729 additions & 0 deletions
Large diffs are not rendered by default.

‎Beziers/beziers.hpp‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*******************************************************************************
2+
* *
3+
* Author : Angus Johnson *
4+
* Version : 1.0 *
5+
* Date : 27 August 2013 *
6+
* Website : http://www.angusj.com *
7+
* Copyright : Angus Johnson 2010-2013 *
8+
* *
9+
* License: *
10+
* Use, modification & distribution is subject to Boost Software License Ver 1. *
11+
* http://www.boost.org/LICENSE_1_0.txt *
12+
* *
13+
*******************************************************************************/
14+
15+
#ifndef beziers_hpp
16+
#define beziers_hpp
17+
18+
#include <vector>
19+
#include "clipper.hpp"
20+
21+
namespace BezierLib {
22+
23+
using namespace ClipperLib;
24+
25+
enum BezierType {CubicBezier, QuadBezier};
26+
const double DefaultPrecision = 0.5;
27+
28+
class Bezier;
29+
30+
class BezierList
31+
{
32+
private:
33+
std::vector <Bezier*> m_Beziers;
34+
double m_Precision;
35+
public:
36+
BezierList(double precision = DefaultPrecision);
37+
~BezierList();
38+
void AddPath(const Path ctrlPts, BezierType bezType);
39+
void AddPaths(const Paths ctrlPts, BezierType bezType);
40+
void Clear();
41+
42+
void GetCtrlPts(int index, Path& path);
43+
BezierType GetBezierType(int index);
44+
void GetFlattenedPath(int index, Path& path);
45+
void GetFlattenedPaths(Paths& paths);
46+
47+
static void Flatten(const Path& in_path, Path& out_path,
48+
BezierType bezType, double precision = DefaultPrecision);
49+
static void Flatten(const Paths& in_paths, Paths& out_paths,
50+
BezierType bezType, double precision = DefaultPrecision);
51+
static void CSplineToCBezier(const Path& in_path, Path& out_path);
52+
static void QSplineToQBezier(const Path& in_path, Path& out_path);
53+
54+
void Reconstruct(cInt z1, cInt z2, Path& path);
55+
double Precision();
56+
void Precision(double value);
57+
};
58+
59+
} //BezierLib namespace
60+
#endif //bezier_hpp

‎C#/ConsoleDemo/ConsoleDemo.sln‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual C# Express 2010
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleDemo", "ConsoleDemo\ConsoleDemo.csproj", "{185E6664-6A68-4377-99BE-4D4BFED19298}"
5-
ProjectSection(ProjectDependencies) = postProject
6-
{9B062971-A88E-4A3D-B3C9-12B78D15FA66} = {9B062971-A88E-4A3D-B3C9-12B78D15FA66}
7-
EndProjectSection
8-
EndProject
9-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clipper_library", "..\clipper_library\clipper_library.csproj", "{9B062971-A88E-4A3D-B3C9-12B78D15FA66}"
10-
EndProject
11-
Global
12-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
13-
Debug|Any CPU = Debug|Any CPU
14-
Debug|Mixed Platforms = Debug|Mixed Platforms
15-
Debug|x86 = Debug|x86
16-
Release|Any CPU = Release|Any CPU
17-
Release|Mixed Platforms = Release|Mixed Platforms
18-
Release|x86 = Release|x86
19-
EndGlobalSection
20-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
21-
{185E6664-6A68-4377-99BE-4D4BFED19298}.Debug|Any CPU.ActiveCfg = Debug|x86
22-
{185E6664-6A68-4377-99BE-4D4BFED19298}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
23-
{185E6664-6A68-4377-99BE-4D4BFED19298}.Debug|Mixed Platforms.Build.0 = Debug|x86
24-
{185E6664-6A68-4377-99BE-4D4BFED19298}.Debug|x86.ActiveCfg = Debug|x86
25-
{185E6664-6A68-4377-99BE-4D4BFED19298}.Debug|x86.Build.0 = Debug|x86
26-
{185E6664-6A68-4377-99BE-4D4BFED19298}.Release|Any CPU.ActiveCfg = Release|x86
27-
{185E6664-6A68-4377-99BE-4D4BFED19298}.Release|Mixed Platforms.ActiveCfg = Release|x86
28-
{185E6664-6A68-4377-99BE-4D4BFED19298}.Release|Mixed Platforms.Build.0 = Release|x86
29-
{185E6664-6A68-4377-99BE-4D4BFED19298}.Release|x86.ActiveCfg = Release|x86
30-
{185E6664-6A68-4377-99BE-4D4BFED19298}.Release|x86.Build.0 = Release|x86
31-
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32-
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|Any CPU.Build.0 = Debug|Any CPU
33-
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
34-
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
35-
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|x86.ActiveCfg = Debug|Any CPU
36-
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Release|Any CPU.ActiveCfg = Release|Any CPU
37-
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Release|Any CPU.Build.0 = Release|Any CPU
38-
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
39-
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Release|Mixed Platforms.Build.0 = Release|Any CPU
40-
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Release|x86.ActiveCfg = Release|Any CPU
41-
EndGlobalSection
42-
GlobalSection(SolutionProperties) = preSolution
43-
HideSolutionNode = FALSE
44-
EndGlobalSection
45-
EndGlobal
1+
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual C# Express 2010
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleDemo", "ConsoleDemo\ConsoleDemo.csproj", "{185E6664-6A68-4377-99BE-4D4BFED19298}"
5+
ProjectSection(ProjectDependencies) = postProject
6+
{9B062971-A88E-4A3D-B3C9-12B78D15FA66} = {9B062971-A88E-4A3D-B3C9-12B78D15FA66}
7+
EndProjectSection
8+
EndProject
9+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clipper_library", "..\clipper_library\clipper_library.csproj", "{9B062971-A88E-4A3D-B3C9-12B78D15FA66}"
10+
EndProject
11+
Global
12+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
13+
Debug|Any CPU = Debug|Any CPU
14+
Debug|Mixed Platforms = Debug|Mixed Platforms
15+
Debug|x86 = Debug|x86
16+
Release|Any CPU = Release|Any CPU
17+
Release|Mixed Platforms = Release|Mixed Platforms
18+
Release|x86 = Release|x86
19+
EndGlobalSection
20+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
21+
{185E6664-6A68-4377-99BE-4D4BFED19298}.Debug|Any CPU.ActiveCfg = Debug|x86
22+
{185E6664-6A68-4377-99BE-4D4BFED19298}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
23+
{185E6664-6A68-4377-99BE-4D4BFED19298}.Debug|Mixed Platforms.Build.0 = Debug|x86
24+
{185E6664-6A68-4377-99BE-4D4BFED19298}.Debug|x86.ActiveCfg = Debug|x86
25+
{185E6664-6A68-4377-99BE-4D4BFED19298}.Debug|x86.Build.0 = Debug|x86
26+
{185E6664-6A68-4377-99BE-4D4BFED19298}.Release|Any CPU.ActiveCfg = Release|x86
27+
{185E6664-6A68-4377-99BE-4D4BFED19298}.Release|Mixed Platforms.ActiveCfg = Release|x86
28+
{185E6664-6A68-4377-99BE-4D4BFED19298}.Release|Mixed Platforms.Build.0 = Release|x86
29+
{185E6664-6A68-4377-99BE-4D4BFED19298}.Release|x86.ActiveCfg = Release|x86
30+
{185E6664-6A68-4377-99BE-4D4BFED19298}.Release|x86.Build.0 = Release|x86
31+
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32+
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|Any CPU.Build.0 = Debug|Any CPU
33+
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
34+
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
35+
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|x86.ActiveCfg = Debug|Any CPU
36+
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Release|Any CPU.ActiveCfg = Release|Any CPU
37+
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Release|Any CPU.Build.0 = Release|Any CPU
38+
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
39+
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Release|Mixed Platforms.Build.0 = Release|Any CPU
40+
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Release|x86.ActiveCfg = Release|Any CPU
41+
EndGlobalSection
42+
GlobalSection(SolutionProperties) = preSolution
43+
HideSolutionNode = FALSE
44+
EndGlobalSection
45+
EndGlobal

‎C#/ConsoleDemo/ConsoleDemo/ConsoleDemo.csproj‎

Lines changed: 102 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,103 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{185E6664-6A68-4377-99BE-4D4BFED19298}</ProjectGuid>
9-
<OutputType>Exe</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>ConsoleDemo</RootNamespace>
12-
<AssemblyName>ConsoleDemo</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
15-
<FileAlignment>512</FileAlignment>
16-
<PublishUrl>publish\</PublishUrl>
17-
<Install>true</Install>
18-
<InstallFrom>Disk</InstallFrom>
19-
<UpdateEnabled>false</UpdateEnabled>
20-
<UpdateMode>Foreground</UpdateMode>
21-
<UpdateInterval>7</UpdateInterval>
22-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
23-
<UpdatePeriodically>false</UpdatePeriodically>
24-
<UpdateRequired>false</UpdateRequired>
25-
<MapFileExtensions>true</MapFileExtensions>
26-
<ApplicationRevision>0</ApplicationRevision>
27-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
28-
<IsWebBootstrapper>false</IsWebBootstrapper>
29-
<UseApplicationTrust>false</UseApplicationTrust>
30-
<BootstrapperEnabled>true</BootstrapperEnabled>
31-
</PropertyGroup>
32-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
33-
<PlatformTarget>x86</PlatformTarget>
34-
<DebugSymbols>true</DebugSymbols>
35-
<DebugType>full</DebugType>
36-
<Optimize>false</Optimize>
37-
<OutputPath>bin\Debug\</OutputPath>
38-
<DefineConstants>DEBUG;TRACE</DefineConstants>
39-
<ErrorReport>prompt</ErrorReport>
40-
<WarningLevel>4</WarningLevel>
41-
<UseVSHostingProcess>true</UseVSHostingProcess>
42-
</PropertyGroup>
43-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
44-
<PlatformTarget>x86</PlatformTarget>
45-
<DebugType>pdbonly</DebugType>
46-
<Optimize>true</Optimize>
47-
<OutputPath>bin\Release\</OutputPath>
48-
<DefineConstants>TRACE</DefineConstants>
49-
<ErrorReport>prompt</ErrorReport>
50-
<WarningLevel>4</WarningLevel>
51-
<UseVSHostingProcess>true</UseVSHostingProcess>
52-
</PropertyGroup>
53-
<ItemGroup>
54-
<Reference Include="System" />
55-
<Reference Include="System.Core" />
56-
<Reference Include="System.Drawing" />
57-
<Reference Include="System.Xml.Linq" />
58-
<Reference Include="System.Data.DataSetExtensions" />
59-
<Reference Include="Microsoft.CSharp" />
60-
<Reference Include="System.Data" />
61-
<Reference Include="System.Xml" />
62-
</ItemGroup>
63-
<ItemGroup>
64-
<Compile Include="Program.cs" />
65-
<Compile Include="Properties\AssemblyInfo.cs" />
66-
</ItemGroup>
67-
<ItemGroup>
68-
<BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
69-
<Visible>False</Visible>
70-
<ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName>
71-
<Install>true</Install>
72-
</BootstrapperPackage>
73-
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
74-
<Visible>False</Visible>
75-
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
76-
<Install>false</Install>
77-
</BootstrapperPackage>
78-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
79-
<Visible>False</Visible>
80-
<ProductName>.NET Framework 3.5 SP1</ProductName>
81-
<Install>false</Install>
82-
</BootstrapperPackage>
83-
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
84-
<Visible>False</Visible>
85-
<ProductName>Windows Installer 3.1</ProductName>
86-
<Install>true</Install>
87-
</BootstrapperPackage>
88-
</ItemGroup>
89-
<ItemGroup>
90-
<ProjectReference Include="..\..\clipper_library\clipper_library.csproj">
91-
<Project>{9B062971-A88E-4A3D-B3C9-12B78D15FA66}</Project>
92-
<Name>clipper_library</Name>
93-
</ProjectReference>
94-
</ItemGroup>
95-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
96-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
97-
Other similar extension points exist, see Microsoft.Common.targets.
98-
<Target Name="BeforeBuild">
99-
</Target>
100-
<Target Name="AfterBuild">
101-
</Target>
102-
-->
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6+
<ProductVersion>8.0.30703</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{185E6664-6A68-4377-99BE-4D4BFED19298}</ProjectGuid>
9+
<OutputType>Exe</OutputType>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<RootNamespace>ConsoleDemo</RootNamespace>
12+
<AssemblyName>ConsoleDemo</AssemblyName>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14+
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
15+
<FileAlignment>512</FileAlignment>
16+
<PublishUrl>publish\</PublishUrl>
17+
<Install>true</Install>
18+
<InstallFrom>Disk</InstallFrom>
19+
<UpdateEnabled>false</UpdateEnabled>
20+
<UpdateMode>Foreground</UpdateMode>
21+
<UpdateInterval>7</UpdateInterval>
22+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
23+
<UpdatePeriodically>false</UpdatePeriodically>
24+
<UpdateRequired>false</UpdateRequired>
25+
<MapFileExtensions>true</MapFileExtensions>
26+
<ApplicationRevision>0</ApplicationRevision>
27+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
28+
<IsWebBootstrapper>false</IsWebBootstrapper>
29+
<UseApplicationTrust>false</UseApplicationTrust>
30+
<BootstrapperEnabled>true</BootstrapperEnabled>
31+
</PropertyGroup>
32+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
33+
<PlatformTarget>x86</PlatformTarget>
34+
<DebugSymbols>true</DebugSymbols>
35+
<DebugType>full</DebugType>
36+
<Optimize>false</Optimize>
37+
<OutputPath>bin\Debug\</OutputPath>
38+
<DefineConstants>DEBUG;TRACE</DefineConstants>
39+
<ErrorReport>prompt</ErrorReport>
40+
<WarningLevel>4</WarningLevel>
41+
<UseVSHostingProcess>true</UseVSHostingProcess>
42+
</PropertyGroup>
43+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
44+
<PlatformTarget>x86</PlatformTarget>
45+
<DebugType>pdbonly</DebugType>
46+
<Optimize>true</Optimize>
47+
<OutputPath>bin\Release\</OutputPath>
48+
<DefineConstants>TRACE</DefineConstants>
49+
<ErrorReport>prompt</ErrorReport>
50+
<WarningLevel>4</WarningLevel>
51+
<UseVSHostingProcess>true</UseVSHostingProcess>
52+
</PropertyGroup>
53+
<ItemGroup>
54+
<Reference Include="System" />
55+
<Reference Include="System.Core" />
56+
<Reference Include="System.Drawing" />
57+
<Reference Include="System.Xml.Linq" />
58+
<Reference Include="System.Data.DataSetExtensions" />
59+
<Reference Include="Microsoft.CSharp" />
60+
<Reference Include="System.Data" />
61+
<Reference Include="System.Xml" />
62+
</ItemGroup>
63+
<ItemGroup>
64+
<Compile Include="Program.cs" />
65+
<Compile Include="Properties\AssemblyInfo.cs" />
66+
</ItemGroup>
67+
<ItemGroup>
68+
<BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
69+
<Visible>False</Visible>
70+
<ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName>
71+
<Install>true</Install>
72+
</BootstrapperPackage>
73+
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
74+
<Visible>False</Visible>
75+
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
76+
<Install>false</Install>
77+
</BootstrapperPackage>
78+
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
79+
<Visible>False</Visible>
80+
<ProductName>.NET Framework 3.5 SP1</ProductName>
81+
<Install>false</Install>
82+
</BootstrapperPackage>
83+
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
84+
<Visible>False</Visible>
85+
<ProductName>Windows Installer 3.1</ProductName>
86+
<Install>true</Install>
87+
</BootstrapperPackage>
88+
</ItemGroup>
89+
<ItemGroup>
90+
<ProjectReference Include="..\..\clipper_library\clipper_library.csproj">
91+
<Project>{9B062971-A88E-4A3D-B3C9-12B78D15FA66}</Project>
92+
<Name>clipper_library</Name>
93+
</ProjectReference>
94+
</ItemGroup>
95+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
96+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
97+
Other similar extension points exist, see Microsoft.Common.targets.
98+
<Target Name="BeforeBuild">
99+
</Target>
100+
<Target Name="AfterBuild">
101+
</Target>
102+
-->
103103
</Project>

0 commit comments

Comments
 (0)