fix json

mmbelkiman · Mar 9, 2019 · f095ad3 · f095ad3
1 parent 58f2b3c
commit f095ad3
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 8 deletions.
diff --git a/Core/ParticleEffect.cs b/Core/ParticleEffect.cs
@@ -1,11 +1,11 @@
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
-using VenusParticleEngine.Core.Modifiers;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using VenusParticleEngine.Core.Modifiers;
 
 namespace VenusParticleEngine.Core
 {
@@ -34,7 +34,7 @@ public static ParticleEffect ReadFromJson(string jsonPath, string jsonString, Gr
             }
             catch (Exception e)
             {
-                Console.WriteLine(e.Message);
+                Console.WriteLine("Venus Particle Engine : ParticleEffect => " + e.Message);
                 return null;
             }
         }
@@ -54,10 +54,17 @@ public static ParticleEffect ReadFromJsonFile(string filePath, GraphicsDevice gr
                 pf.UpdateEmmitersTexture(jsonPath, graphicsDevice, content);
                 return pf;
             }
+            catch (Exception e)
+            {
+                Console.WriteLine("Venus Particle Engine : ParticleEffect => " + e.Message);
+                return null;
+            }
             finally
             {
                 if (reader != null)
+                {
                     reader.Close();
+                }
             }
         }
 
@@ -189,6 +196,5 @@ public void PlayPause()
         {
             active = !active;
         }
-
     }
 }
diff --git a/Demo/Demo.csproj b/Demo/Demo.csproj
@@ -51,8 +51,8 @@
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\MonoGame.Framework.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />

diff --git a/Demo/libs/Newtonsoft.Json.dll b/Demo/libs/Newtonsoft.Json.dll
diff --git a/Demo/libs/VenusParticleEngine.dll b/Demo/libs/VenusParticleEngine.dll
diff --git a/Demo/libs/VenusParticleEngine.pdb b/Demo/libs/VenusParticleEngine.pdb
diff --git a/Demo/packages.config b/Demo/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net452" />
 </packages>
diff --git a/Venus Particle Engine.sln b/Venus Particle Engine.sln
@@ -16,7 +16,6 @@ Global
 		{BCBB56D3-7F48-463E-8411-79A515087D3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BCBB56D3-7F48-463E-8411-79A515087D3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BCBB56D3-7F48-463E-8411-79A515087D3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BCBB56D3-7F48-463E-8411-79A515087D3C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{86648003-7D73-40FE-89F5-71E65BC7C9D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{86648003-7D73-40FE-89F5-71E65BC7C9D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{86648003-7D73-40FE-89F5-71E65BC7C9D0}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/VenusParticleEngine.csproj b/VenusParticleEngine.csproj
@@ -100,7 +100,6 @@
     <Compile Include="Core\RenderingOrder.cs" />
     <Compile Include="Core\SpriteBatchRender.cs" />
     <Compile Include="Core\SpritebatchRenderer.cs" />
-    <Compile Include="Core\Utils\MiniJson.cs" />
     <Compile Include="Core\Vector.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>