updated to version 0.2.3

arendvw · Jul 22, 2019 · 1d54fc4 · 1d54fc4
1 parent e9e1c77
commit 1d54fc4
Show file tree

Hide file tree

Showing 21 changed files with 4,447 additions and 4,414 deletions.
diff --git a/ClipperComponents/ClipperComponents.csproj b/ClipperComponents/ClipperComponents.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>StudioAvw.Clipper.Components</RootNamespace>
     <AssemblyName>ClipperComponents</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -21,6 +21,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,18 +31,17 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="GH_IO">
-      <HintPath>..\..\..\..\..\..\Grasshopper\grasshopper_0.9.76.0\GH_IO.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\..\..\..\..\..\_GRASSHOPPER\0.9.76.0\GH_IO.dll</HintPath>
     </Reference>
     <Reference Include="Grasshopper">
-      <HintPath>..\..\..\..\..\..\Grasshopper\grasshopper_0.9.76.0\Grasshopper.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\..\..\..\..\..\_GRASSHOPPER\0.9.76.0\Grasshopper.dll</HintPath>
     </Reference>
     <Reference Include="RhinoCommon">
-      <HintPath>C:\Program Files\Rhinoceros 5.0 (64-bit)\System\RhinoCommon.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files\Rhinoceros 5 (64-bit)\System\RhinoCommon.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
@@ -71,6 +72,14 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
+    <Compile Include="Triangulator\CyclicalList.cs" />
+    <Compile Include="Triangulator\IndexableCyclicalLinkedList.cs" />
+    <Compile Include="Triangulator\LineSegment.cs" />
+    <Compile Include="Triangulator\MeshPolygons.cs" />
+    <Compile Include="Triangulator\Triangle.cs" />
+    <Compile Include="Triangulator\Triangulator.cs" />
+    <Compile Include="Triangulator\Vector2.cs" />
+    <Compile Include="Triangulator\Vertex.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ClipperTools\ClipperTools.csproj">

diff --git a/ClipperComponents/Helpers/DataAccessHelper.cs b/ClipperComponents/Helpers/DataAccessHelper.cs
@@ -14,7 +14,7 @@ static class DataAccessHelper {
     /// <param name="da"></param>
     /// <param name="position"></param>
     /// <returns></returns>
-    static public T Fetch<T>(this IGH_DataAccess da, int position) {
+    public static T Fetch<T>(this IGH_DataAccess da, int position) {
 
       T temp = default(T);
       da.GetData<T>(position, ref temp);
@@ -27,7 +27,7 @@ static public T Fetch<T>(this IGH_DataAccess da, int position) {
     /// <param name="da"></param>
     /// <param name="name"></param>
     /// <returns></returns>
-    static public T Fetch<T>(this IGH_DataAccess da, string name) {
+    public static T Fetch<T>(this IGH_DataAccess da, string name) {
       T temp = default(T);
       da.GetData<T>(name, ref temp);
       return temp;
@@ -40,7 +40,7 @@ static public T Fetch<T>(this IGH_DataAccess da, string name) {
     /// <param name="da"></param>
     /// <param name="position"></param>
     /// <returns></returns>
-    static public List<T> FetchList<T>(this IGH_DataAccess da, int position) {
+    public static List<T> FetchList<T>(this IGH_DataAccess da, int position) {
       List<T> temp = new List<T>();
       da.GetDataList<T>(position, temp);
       return temp;
@@ -53,7 +53,7 @@ static public List<T> FetchList<T>(this IGH_DataAccess da, int position) {
     /// <param name="da"></param>
     /// <param name="name"></param>
     /// <returns></returns>
-    static public List<T> FetchList<T>(this IGH_DataAccess da, string name) {
+    public static List<T> FetchList<T>(this IGH_DataAccess da, string name) {
       List<T> temp = new List<T>();
       da.GetDataList<T>(name, temp);
       return temp;
@@ -65,7 +65,7 @@ static public List<T> FetchList<T>(this IGH_DataAccess da, string name) {
     /// <param name="da"></param>
     /// <param name="position"></param>
     /// <returns></returns>
-    static public GH_Structure<T> FetchTree<T>(this IGH_DataAccess da, int position) where T : IGH_Goo {
+    public static GH_Structure<T> FetchTree<T>(this IGH_DataAccess da, int position) where T : IGH_Goo {
       GH_Structure<T> temp;
       da.GetDataTree<T>(position, out temp);
       return temp;
@@ -78,7 +78,7 @@ static public GH_Structure<T> FetchTree<T>(this IGH_DataAccess da, int position)
     /// <param name="da"></param>
     /// <param name="name"></param>
     /// <returns></returns>
-    static public GH_Structure<T> FetchTree<T>(this IGH_DataAccess da, string name) where T : IGH_Goo {
+    public static GH_Structure<T> FetchTree<T>(this IGH_DataAccess da, string name) where T : IGH_Goo {
       GH_Structure<T> temp;
       da.GetDataTree<T>(name, out temp);
       return temp;

diff --git a/ClipperComponents/Icons.Designer.cs b/ClipperComponents/Icons.Designer.cs
diff --git a/ClipperComponents/Properties/AssemblyInfo.cs b/ClipperComponents/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("StudioAvw")]
 [assembly: AssemblyProduct("ClipperPlugin")]
-[assembly: AssemblyCopyright("Copyright © 2014 Arend van Waart / Boost Open Source Licence")]
+[assembly: AssemblyCopyright("Copyright © 2017 Arend van Waart / Boost Open Source Licence")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.2.1")]
-[assembly: AssemblyFileVersion("0.0.2.1")]
+[assembly: AssemblyVersion("0.0.2.3")]
+[assembly: AssemblyFileVersion("0.0.2.3")]
diff --git a/ClipperComponents/Properties/Settings.Designer.cs b/ClipperComponents/Properties/Settings.Designer.cs
diff --git a/ClipperPlugin/ClipperPlugin.cs b/ClipperPlugin/ClipperPlugin.cs
@@ -1,6 +1,4 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-using Rhino.PlugIns;
+using Rhino.PlugIns;
 
 namespace ClipperPlugin {
 

diff --git a/ClipperPlugin/ClipperPlugin.csproj b/ClipperPlugin/ClipperPlugin.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ClipperPlugin</RootNamespace>
     <AssemblyName>ClipperPlugin</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <TargetFrameworkProfile />
@@ -40,18 +40,18 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="RhinoCommon">
+      <HintPath>..\..\..\..\..\..\Program Files\Rhinoceros 5 (64-bit)\System\RhinoCommon.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="RhinoCommon">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files\Rhinoceros 5.0 (64-bit)\System\rhinocommon.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ClipperPlugin.cs" />
@@ -86,6 +86,7 @@ Erase "$(TargetPath)"</PostBuildEvent>
     </StartArguments>
     <StartAction>Program</StartAction>
     <StartProgram>C:\Program Files (x86)\Rhinoceros 5.0\System\Rhino4.exe</StartProgram>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <FallbackCulture>en-US</FallbackCulture>
@@ -95,5 +96,6 @@ Erase "$(TargetPath)"</PostBuildEvent>
     <StartArguments>
     </StartArguments>
     <StartAction>Program</StartAction>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
 </Project>
diff --git a/ClipperPlugin/Properties/AssemblyInfo.cs b/ClipperPlugin/Properties/AssemblyInfo.cs
@@ -13,7 +13,6 @@
 [assembly: PlugInDescription(DescriptionType.UpdateUrl, @"http://www.food4rhino.com/project/clipper")]
 [assembly: PlugInDescription(DescriptionType.WebSite, @"http://www.food4rhino.com/project/clipper")]
 
-
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
@@ -22,7 +21,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("StudioAvw")]
 [assembly: AssemblyProduct("ClipperPlugin")]
-[assembly: AssemblyCopyright("Copyright © 2014 Arend van Waart / Boost Open Source Licence")]
+[assembly: AssemblyCopyright("Copyright © 2017 Arend van Waart / Boost Open Source Licence")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -44,6 +43,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.2.1")]
-[assembly: AssemblyFileVersion("0.0.2.1")]
+[assembly: AssemblyVersion("0.0.2.3")]
+[assembly: AssemblyFileVersion("0.0.2.3")]
 [assembly: AssemblyInformationalVersion("2")]
diff --git a/ClipperTools/ClipperTools.csproj b/ClipperTools/ClipperTools.csproj
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="RhinoCommon">
-      <HintPath>C:\Program Files\Rhinoceros 5.0 (64-bit)\System\RhinoCommon.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files\Rhinoceros 5 (64-bit)\System\RhinoCommon.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/ClipperTools/Geometry.cs b/ClipperTools/Geometry.cs
@@ -453,7 +453,6 @@ public static Polyline ToPolyline(this List<IntPoint> path, Plane pln, bool clos
     public static Polyline ToPolyline(this List<IntPoint> path, Plane pln, double tolerance, bool closed)
     {
       List<Point3d> polylinepts = new List<Point3d>();
-
       foreach (IntPoint pt in path)
       {
         polylinepts.Add(pln.PointAt(pt.X*tolerance, pt.Y*tolerance));

diff --git a/ClipperTools/Properties/AssemblyInfo.cs b/ClipperTools/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ClipperTools")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyCopyright("Copyright ©  Angus Johnson 2010-2015 / Modification by Arend van Waart ")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.2.1")]
-[assembly: AssemblyFileVersion("0.0.2.1")]
+[assembly: AssemblyVersion("0.0.2.3")]
+[assembly: AssemblyFileVersion("0.0.2.3")]