diff --git a/Core/ParticleEffect.cs b/Core/ParticleEffect.cs
index 799b6f3..44f4f5c 100644
--- 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;
}
-
}
}
\ No newline at end of file
diff --git a/Demo/Demo.csproj b/Demo/Demo.csproj
index 1c59ea9..37fac96 100644
--- a/Demo/Demo.csproj
+++ b/Demo/Demo.csproj
@@ -51,8 +51,8 @@
$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\MonoGame.Framework.dll
-
- ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll
+
+ ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
diff --git a/Demo/libs/Newtonsoft.Json.dll b/Demo/libs/Newtonsoft.Json.dll
deleted file mode 100644
index 8069902..0000000
Binary files a/Demo/libs/Newtonsoft.Json.dll and /dev/null differ
diff --git a/Demo/libs/VenusParticleEngine.dll b/Demo/libs/VenusParticleEngine.dll
index 715c445..0d66679 100644
Binary files a/Demo/libs/VenusParticleEngine.dll and b/Demo/libs/VenusParticleEngine.dll differ
diff --git a/Demo/libs/VenusParticleEngine.pdb b/Demo/libs/VenusParticleEngine.pdb
index 2ca4367..5e09a13 100644
Binary files a/Demo/libs/VenusParticleEngine.pdb and b/Demo/libs/VenusParticleEngine.pdb differ
diff --git a/Demo/packages.config b/Demo/packages.config
index c8b3ae6..91071af 100644
--- a/Demo/packages.config
+++ b/Demo/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/Venus Particle Engine.sln b/Venus Particle Engine.sln
index 895033b..c2d7dc1 100644
--- 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
index 401b8f4..cf52f13 100644
--- a/VenusParticleEngine.csproj
+++ b/VenusParticleEngine.csproj
@@ -100,7 +100,6 @@
-