From f7f8954966382a3cbf9d9994ee148f3320de221e Mon Sep 17 00:00:00 2001
From: Rob van Geloven <rob@vangeloven.net>
Date: Fri, 29 Jul 2016 13:36:44 +0200
Subject: [PATCH] Convert project to PCL

---
 .gitignore                                    |  1 +
 .../Extensions/ListExtensions.cs              | 20 +++++++++++++
 .../Extensions/StringExtensions.cs            |  2 +-
 source/FileFormatWavefront/FileFormatMtl.cs   | 22 ++++++++++----
 source/FileFormatWavefront/FileFormatObj.cs   | 14 +++++----
 .../FileFormatWavefront.csproj                | 29 +++++++++++++------
 source/FileFormatWavefront/FileLoadResult.cs  |  1 +
 source/FileFormatWavefront/Model/Face.cs      |  1 +
 source/FileFormatWavefront/Model/Group.cs     |  3 +-
 source/FileFormatWavefront/Model/Scene.cs     |  3 +-
 .../FileFormatWavefront/Model/TextureMap.cs   |  3 +-
 source/FileFormatWavefront/packages.config    |  5 ++++
 12 files changed, 81 insertions(+), 23 deletions(-)
 create mode 100644 source/FileFormatWavefront/Extensions/ListExtensions.cs
 create mode 100644 source/FileFormatWavefront/packages.config

diff --git a/.gitignore b/.gitignore
index 122f78b..7375c1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -151,3 +151,4 @@ $RECYCLE.BIN/
 build/1.*
 build/nuspec/FileFormatWavefront/lib
 build/nuspec/FileFormatWavefront/lib/
+/source/packages
diff --git a/source/FileFormatWavefront/Extensions/ListExtensions.cs b/source/FileFormatWavefront/Extensions/ListExtensions.cs
new file mode 100644
index 0000000..11fb792
--- /dev/null
+++ b/source/FileFormatWavefront/Extensions/ListExtensions.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace FileFormatWavefront.Extensions
+{
+    internal static class ListExtensions
+    {
+        /// <summary>
+        ///  Returns a read-only IList&lt;T&gt; wrapper for the current collection.
+        /// </summary>
+        /// <returns>A ReadOnlyCollection&lt;T&gt; that acts as a read-only
+        /// wrapper around the current IList&lt;T&gt;.
+        /// </returns>
+        public static ReadOnlyCollection<T> AsReadOnly<T>(this List<T> list)
+        {
+            return new ReadOnlyCollection<T>(list);
+        }
+    }
+}
diff --git a/source/FileFormatWavefront/Extensions/StringExtensions.cs b/source/FileFormatWavefront/Extensions/StringExtensions.cs
index 4c2bc61..0e28549 100644
--- a/source/FileFormatWavefront/Extensions/StringExtensions.cs
+++ b/source/FileFormatWavefront/Extensions/StringExtensions.cs
@@ -16,7 +16,7 @@ internal static class StringExtensions
         /// <returns>True if the string matches the linetype.</returns>
         public static bool IsLineType(this string @this, string lineType)
         {
-            return string.Equals(@this, lineType, StringComparison.InvariantCultureIgnoreCase);
+            return string.Equals(@this, lineType, StringComparison.OrdinalIgnoreCase);
         }
     }
 }
\ No newline at end of file
diff --git a/source/FileFormatWavefront/FileFormatMtl.cs b/source/FileFormatWavefront/FileFormatMtl.cs
index 368b334..cd2634f 100644
--- a/source/FileFormatWavefront/FileFormatMtl.cs
+++ b/source/FileFormatWavefront/FileFormatMtl.cs
@@ -1,11 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using FileFormatWavefront.Extensions;
 using FileFormatWavefront.Internals;
 using FileFormatWavefront.Model;
+using PCLStorage;
+using Splat;
 
 namespace FileFormatWavefront
 {
@@ -23,10 +24,18 @@ public static class FileFormatMtl
         /// <returns>The results of the file load.</returns>
         public static FileLoadResult<List<Material>> Load(string path, bool loadTextureImages)
         {
+            var file = FileSystem.Current.GetFileFromPathAsync(path).Result;
+
+            if (file == null) throw new FileNotFoundException("File not found", path);
+
             //  Create a streamreader and read the data.
-            using(var stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read))
-            using (var streamReader = new StreamReader(stream))
-                return Read(streamReader, path, loadTextureImages);
+            using (var stream = file.OpenAsync(FileAccess.Read).Result)
+            {
+                using(var streamReader = new StreamReader(stream))
+                {
+                    return Read(streamReader, path, loadTextureImages);
+                }
+            }
         }
 
         /// <summary>
@@ -180,7 +189,10 @@ private static TextureMap ReadTextureMap(string fileName, int lineNumber, List<M
             try
             {
                 var path = Path.Combine(Path.GetDirectoryName(fileName), textureFileName);
-                textureMap.Image = Image.FromFile(path);
+                var file = FileSystem.Current.GetFileFromPathAsync(path).Result;
+
+                using (var stream = file.OpenAsync(FileAccess.Read).Result)
+                    textureMap.Image = BitmapLoader.Current.Load(stream, null /*original width*/, null /*original height*/).Result;
             }
             catch (Exception exception)
             {
diff --git a/source/FileFormatWavefront/FileFormatObj.cs b/source/FileFormatWavefront/FileFormatObj.cs
index 178accf..3d4bbbc 100644
--- a/source/FileFormatWavefront/FileFormatObj.cs
+++ b/source/FileFormatWavefront/FileFormatObj.cs
@@ -5,6 +5,7 @@
 using FileFormatWavefront.Extensions;
 using FileFormatWavefront.Internals;
 using FileFormatWavefront.Model;
+using PCLStorage;
 
 namespace FileFormatWavefront
 {
@@ -24,13 +25,16 @@ public static class FileFormatObj
         /// </returns>
         public static FileLoadResult<Scene> Load(string path, bool loadTextureImages)
         {
-            //  Create a stream reader.
-            using (var stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read))
+            var file = FileSystem.Current.GetFileFromPathAsync(path).Result;
+
+            if (file == null) throw new FileNotFoundException("File not found", path);
+
+            //  Create a streamreader and read the data.
+            using (var stream = file.OpenAsync(FileAccess.Read).Result)
             {
-                using (var reader = new StreamReader(stream))
+                using (var streamReader = new StreamReader(stream))
                 {
-                    //  Read the scene.
-                    return ReadScene(reader, path, loadTextureImages);
+                    return ReadScene(streamReader, path, loadTextureImages);
                 }
             }
         }
diff --git a/source/FileFormatWavefront/FileFormatWavefront.csproj b/source/FileFormatWavefront/FileFormatWavefront.csproj
index da8472b..f9de166 100644
--- a/source/FileFormatWavefront/FileFormatWavefront.csproj
+++ b/source/FileFormatWavefront/FileFormatWavefront.csproj
@@ -11,6 +11,9 @@
     <AssemblyName>FileFormatWavefront</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -31,16 +34,21 @@
     <DocumentationFile>bin\Release\FileFormatWavefront.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <Reference Include="PCLStorage, Version=1.0.2.0, Culture=neutral, PublicKeyToken=286fe515a2c35b64, processorArchitecture=MSIL">
+      <HintPath>..\packages\PCLStorage.1.0.2\lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="PCLStorage.Abstractions, Version=1.0.2.0, Culture=neutral, PublicKeyToken=286fe515a2c35b64, processorArchitecture=MSIL">
+      <HintPath>..\packages\PCLStorage.1.0.2\lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Extensions\ListExtensions.cs" />
     <Compile Include="FileFormatObj.cs" />
     <Compile Include="FileFormatMtl.cs" />
     <Compile Include="FileLoadResult.cs" />
@@ -59,7 +67,10 @@
     <Compile Include="Model\Vertex.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/FileFormatWavefront/FileLoadResult.cs b/source/FileFormatWavefront/FileLoadResult.cs
index 46c7346..88ff9f2 100644
--- a/source/FileFormatWavefront/FileLoadResult.cs
+++ b/source/FileFormatWavefront/FileLoadResult.cs
@@ -1,3 +1,4 @@
+using FileFormatWavefront.Extensions;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
diff --git a/source/FileFormatWavefront/Model/Face.cs b/source/FileFormatWavefront/Model/Face.cs
index eae416c..8ff420b 100644
--- a/source/FileFormatWavefront/Model/Face.cs
+++ b/source/FileFormatWavefront/Model/Face.cs
@@ -1,3 +1,4 @@
+using FileFormatWavefront.Extensions;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
diff --git a/source/FileFormatWavefront/Model/Group.cs b/source/FileFormatWavefront/Model/Group.cs
index 4a07d9b..4d1ee78 100644
--- a/source/FileFormatWavefront/Model/Group.cs
+++ b/source/FileFormatWavefront/Model/Group.cs
@@ -1,4 +1,5 @@
-using System;
+using FileFormatWavefront.Extensions;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
diff --git a/source/FileFormatWavefront/Model/Scene.cs b/source/FileFormatWavefront/Model/Scene.cs
index 4be4e62..98771e8 100644
--- a/source/FileFormatWavefront/Model/Scene.cs
+++ b/source/FileFormatWavefront/Model/Scene.cs
@@ -1,4 +1,5 @@
-using System;
+using FileFormatWavefront.Extensions;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
diff --git a/source/FileFormatWavefront/Model/TextureMap.cs b/source/FileFormatWavefront/Model/TextureMap.cs
index f394bd4..4ef20a7 100644
--- a/source/FileFormatWavefront/Model/TextureMap.cs
+++ b/source/FileFormatWavefront/Model/TextureMap.cs
@@ -1,3 +1,4 @@
+using Splat;
 using System.Drawing;
 
 namespace FileFormatWavefront.Model
@@ -16,6 +17,6 @@ public class TextureMap
         /// Gets the texture image.
         /// Note that this is only set if the file is loaded with the 'loadTextureImages' option set to <c>true</c>.
         /// </summary>
-        public Image Image { get; internal set; } 
+        public IBitmap Image { get; internal set; } 
     }
 }
\ No newline at end of file
diff --git a/source/FileFormatWavefront/packages.config b/source/FileFormatWavefront/packages.config
new file mode 100644
index 0000000..de86f6f
--- /dev/null
+++ b/source/FileFormatWavefront/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="PCLStorage" version="1.0.2" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Splat" version="1.6.2" targetFramework="portable45-net45+win8+wpa81" />
+</packages>
\ No newline at end of file