Removed usage of G3_USING_UNITY preprocessor definition, and added an assembly reference to UnityEngine.dll

Author: GeoSpark

.idea/.idea.geometry3Sharp.dir/.idea/contentModel.xml

@@ -2,7 +2,7 @@
 
 Open-Source (Boost-license) C# library for geometric computing. 
 
-geometry3Sharp is compatible with Unity. Set the G3_USING_UNITY Scripting Define and you will have transparent interop between g3 and Unity vector types (*see details at the very bottom of this README*). Although the library is written for C# 4.5, if you are using the .NET 3.5 Unity runtime, it will still work, just with a few missing features.
+geometry3Sharp is compatible with Unity.
 
 Currently there is a small amount of unsafe code, however this code is only used in a few fast-buffer-copy routines, which can be deleted if you need a safe version (eg for Unity web player).
 
@@ -381,10 +381,8 @@ Several tutorials for using g3Sharp have been posted on the Gradientspace blog:
 # Unity Interop
 
 geometry3Sharp supports transparent conversion with Unity types.
-To enable this, define **G3_USING_UNITY** in your Unity project, by adding this
-string to the **Scripting Define Symbols** box in the **Player Settings**.  
 
-Once enabled, code like this will work transparently:
+Code like this will work transparently:
 
 ~~~~
 Vector3 unityVec;

.idea/.idea.geometry3Sharp.dir/.idea/indexLayout.xml

@@ -1,8 +1,6 @@
 using System;
 
-#if G3_USING_UNITY
 using UnityEngine;
-#endif
 
 namespace g3
 {
@@ -33,7 +31,6 @@ public byte this[int key]
         }
 
 
-#if G3_USING_UNITY
         public static implicit operator Colorb(UnityEngine.Color32 c)
         {
             return new Colorb(c.r, c.g, c.b, c.a);
@@ -42,7 +39,6 @@ public static implicit operator Color32(Colorb c)
         {
             return new Color32(c.r, c.g, c.b, c.a);
         }
-#endif
 
     }
 }

.idea/.idea.geometry3Sharp.dir/.idea/modules.xml

@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-#if G3_USING_UNITY
 using UnityEngine;
-#endif
 
 namespace g3
 {
@@ -244,7 +242,6 @@ public static implicit operator Colorf(Vector3f c)
 
 
 
-#if G3_USING_UNITY
         public static implicit operator Colorf(UnityEngine.Color c)
         {
             return new Colorf(c.r, c.g, c.b, c.a);
@@ -258,7 +255,6 @@ public static implicit operator Color32(Colorf c)
             Colorb cb = c.ToBytes();
             return new Color32(cb.r, cb.g, cb.b, cb.a);
         }
-#endif
 
     }
 }

.idea/.idea.geometry3Sharp.dir/.idea/projectSettingsUpdater.xml

@@ -513,11 +513,7 @@ static public byte[] ToBytes(double[] array)
         static public byte[] CompressZLib(byte[] buffer, bool bFast)
         {
             MemoryStream ms = new MemoryStream();
-#if G3_USING_UNITY && (NET_2_0 || NET_2_0_SUBSET)
-            DeflateStream zip = new DeflateStream(ms, CompressionMode.Compress);
-#else
             DeflateStream zip = new DeflateStream(ms, (bFast) ? CompressionLevel.Fastest : CompressionLevel.Optimal, true);
-#endif
             zip.Write(buffer, 0, buffer.Length);
             zip.Close();
             ms.Position = 0;

.idea/.idea.geometry3Sharp.dir/.idea/vcs.xml

@@ -186,11 +186,7 @@ public static string MakeVec3FormatString(int i0, int i1, int i2, int nPrecision
 
         static public string ToSecMilli(TimeSpan t)
         {
-#if G3_USING_UNITY
-            return string.Format("{0}", t.TotalSeconds);
-#else
             return string.Format("{0:F5}", t.TotalSeconds);
-#endif
         }
 
 

.idea/.idea.geometry3Sharp.dir/.idea/workspace.xml

@@ -4,9 +4,7 @@
 using System.Text;
 using System.Threading;
 
-#if !(NET_2_0 || NET_2_0_SUBSET)
 using System.Threading.Tasks;
-#endif
 
 namespace g3
 {
@@ -20,11 +18,7 @@ public static void ForEach_Sequential<T>(IEnumerable<T> source, Action<T> body)
         }
         public static void ForEach<T>( IEnumerable<T> source, Action<T> body )
         {
-#if G3_USING_UNITY && (NET_2_0 || NET_2_0_SUBSET)
-            for_each<T>(source, body);
-#else
             Parallel.ForEach<T>(source, body);
-#endif
         }
 
 
@@ -274,37 +268,6 @@ public int Count {
 
 
 
-#if G3_USING_UNITY && (NET_2_0 || NET_2_0_SUBSET)
-
-    /*
-     * .NET 3.5 (default in Unity) does not have SpinLock object, which we
-     * are using in a few places. So provide a wrapper around Monitor.
-     * Note that this is class and SpinLock is a struct, so this may cause
-     * disasters, but at least things build...
-     */
-    public class SpinLock
-    {
-        object o;
-        public SpinLock()
-        {
-            o = new object();
-        }
-
-        public void Enter(ref bool entered)
-        {
-            Monitor.Enter(o);
-            entered = true;
-        }
-
-        public void Exit()
-        {
-            Monitor.Exit(o);
-        }
-
-    }
-
-
-#endif
 
 
 }

.idea/.idea.geometry3Sharp.dir/riderModule.iml

@@ -1,5 +1,5 @@
 {
-    "name": "geometry3Sharp",
+    "name": "com.gradientspace.geometry3sharp",
     "references": [],
     "optionalUnityReferences": [],
     "includePlatforms": [],

README.md

@@ -43,6 +43,9 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
+    <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>C:\Program Files\Unity\Hub\Editor\2019.2.10f1\Editor\Data\Managed\UnityEngine.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="approximation\BiArcFit2.cs" />
@@ -345,9 +348,6 @@
     <Compile Include="solvers\CholeskyDecomposition.cs" />
     <Compile Include="spatial\Bitmap2.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="interfaces\" />
-  </ItemGroup>
   <ItemGroup>
     <None Include=".gitignore" />
     <None Include="LICENSE" />