F ultraviolet renderer (#85)

* Improve examples * Fix UV Game * Upgrade Json.NET * Update solution file * Update headers
loodakrawa · Jun 15, 2017 · 1867104 · 1867104
1 parent c318d5f
commit 1867104
Show file tree

Hide file tree

Showing 69 changed files with 1,770 additions and 1,077 deletions.
diff --git a/...oGame/SpriterDotNet.MonoGame.Debug.nuspec → Meta/SpriterDotNet.MonoGame.Debug.nuspec b/...oGame/SpriterDotNet.MonoGame.Debug.nuspec → Meta/SpriterDotNet.MonoGame.Debug.nuspec
diff --git a/...et.MonoGame/SpriterDotNet.MonoGame.nuspec → Meta/SpriterDotNet.MonoGame.nuspec b/...et.MonoGame/SpriterDotNet.MonoGame.nuspec → Meta/SpriterDotNet.MonoGame.nuspec
diff --git a/SpriterDotNet.Example.Content/Content.mgcb b/SpriterDotNet.Example.Content/Content.mgcb
@@ -10,14 +10,18 @@
 
 #-------------------------------- References --------------------------------#
 
-/reference:..\SpriterDotNet.MonoGame.Importer\bin\Debug\SpriterDotNet.MonoGame.Importer.dll
-/reference:..\SpriterDotNet.MonoGame.Importer\bin\Release\SpriterDotNet.MonoGame.Importer.dll
+/reference:Lib\Newtonsoft.Json.dll
+/reference:Lib\System.IO.FileSystem.dll
+/reference:Lib\System.Xml.ReaderWriter.dll
+/reference:..\SpriterDotNet.MonoGame.Importer\bin\Debug\netstandard1.4\SpriterDotNet.MonoGame.Importer.dll
+/reference:..\SpriterDotNet.MonoGame.Importer\bin\Release\netstandard1.4\SpriterDotNet.MonoGame.Importer.dll
 
 #---------------------------------- Content ---------------------------------#
 
 #begin Status.spritefont
 /importer:FontDescriptionImporter
 /processor:FontDescriptionProcessor
+/processorParam:PremultiplyAlpha=True
 /processorParam:TextureFormat=Compressed
 /build:Status.spritefont
 

diff --git a/SpriterDotNet.Example.Content/Lib/Newtonsoft.Json.dll b/SpriterDotNet.Example.Content/Lib/Newtonsoft.Json.dll
diff --git a/SpriterDotNet.Example.Content/Lib/System.IO.FileSystem.dll b/SpriterDotNet.Example.Content/Lib/System.IO.FileSystem.dll
diff --git a/SpriterDotNet.Example.Content/Lib/System.Xml.ReaderWriter.dll b/SpriterDotNet.Example.Content/Lib/System.Xml.ReaderWriter.dll
diff --git a/SpriterDotNet.Example.MonoGame.Android/MainActivity.cs b/SpriterDotNet.Example.MonoGame.Android/MainActivity.cs
@@ -1,12 +1,17 @@
-using Android.App;
+// Copyright (C) The original author or authors
+//
+// This software may be modified and distributed under the terms
+// of the zlib license.  See the LICENSE file for details.
+
+using Android.App;
 using Android.Views;
 using Android.OS;
 using Android.Content.PM;
 using Microsoft.Xna.Framework;
 
 namespace SpriterDotNet.Example.MonoGame.Android
 {
-    [Activity(Label = "SpriterDotNet.MonoGame.Example.Android",
+    [Activity(Label = "SpriterDotNet.Example.MonoGame.Android",
            MainLauncher = true,
            Icon = "@drawable/icon",
            ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.KeyboardHidden
@@ -17,7 +22,7 @@ protected override void OnCreate(Bundle bundle)
         {
             base.OnCreate(bundle);
 
-            var g = new SpriterGame();
+            var g = new ExampleGame();
             SetContentView((View)g.Services.GetService(typeof(View)));
             g.Run();
         }

diff --git a/SpriterDotNet.Example.MonoGame.Android/Properties/AndroidManifest.xml b/SpriterDotNet.Example.MonoGame.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="SpriterDotNet.MonoGame.Example.Android" android:versionCode="1" android:versionName="1.0">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="SpriterDotNet.Example.MonoGame..Android" android:versionCode="1" android:versionName="1.0">
 	<uses-sdk />
-	<application android:label="SpriterDotNet.MonoGame.Example.Android"></application>
+	<application android:label="SpriterDotNet.Example.MonoGame.Android"></application>
 </manifest>
diff --git a/SpriterDotNet.Example.MonoGame.Android/Properties/AssemblyInfo.cs b/SpriterDotNet.Example.MonoGame.Android/Properties/AssemblyInfo.cs
@@ -1,30 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using Android.App;
 
-// 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.
-[assembly: AssemblyTitle("SpriterDotNet.MonoGame.Example.Android")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SpriterDotNet.MonoGame.Example.Android")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// 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: AssemblyTitle("SpriterDotNet.Example.MonoGame.Android")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: ComVisible(false)]
diff --git a/SpriterDotNet.Example.MonoGame.Android/Resources/AboutResources.txt b/SpriterDotNet.Example.MonoGame.Android/Resources/AboutResources.txt
diff --git a/SpriterDotNet.Example.MonoGame.Android/Resources/Resource.Designer.cs b/SpriterDotNet.Example.MonoGame.Android/Resources/Resource.Designer.cs
diff --git a/SpriterDotNet.Example.MonoGame.Android/Resources/layout/Main.axml b/SpriterDotNet.Example.MonoGame.Android/Resources/layout/Main.axml
diff --git a/SpriterDotNet.Example.MonoGame.Android/Resources/values/Strings.xml b/SpriterDotNet.Example.MonoGame.Android/Resources/values/Strings.xml
diff --git a/SpriterDotNet.Example.MonoGame.Android/SpriterDotNet.Example.MonoGame.Android.csproj b/SpriterDotNet.Example.MonoGame.Android/SpriterDotNet.Example.MonoGame.Android.csproj
@@ -50,21 +50,13 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
-    <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <MonoGameContentReference Include="..\SpriterDotNet.Example.Content\Content.mgcb">
       <Link>Content\Content.mgcb</Link>
     </MonoGameContentReference>
     <None Include="packages.config" />
-    <None Include="Resources\AboutResources.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\layout\Main.axml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\values\Strings.xml" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\Icon.png" />

diff --git a/SpriterDotNet.Example.MonoGame.DesktopGL/Program.cs b/SpriterDotNet.Example.MonoGame.DesktopGL/Program.cs
@@ -12,7 +12,7 @@ public static class Program
         [STAThread]
         static void Main()
         {
-            using (SpriterGame game = new SpriterGame())
+            using (ExampleGame game = new ExampleGame())
             {
                 game.Run();
             }

diff --git a/SpriterDotNet.Example.MonoGame.DesktopGL/Properties/AssemblyInfo.cs b/SpriterDotNet.Example.MonoGame.DesktopGL/Properties/AssemblyInfo.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("SpriterDotNet.MonoGame.Example.DesktopGL")]
+[assembly: AssemblyTitle("SpriterDotNet.Example.MonoGame.DesktopGL")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: ComVisible(false)]
diff --git a/SpriterDotNet.Example.MonoGame.DesktopGL/SpriterDotNet.Example.MonoGame.DesktopGL.csproj b/SpriterDotNet.Example.MonoGame.DesktopGL/SpriterDotNet.Example.MonoGame.DesktopGL.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,11 +9,12 @@
     <ProjectGuid>{8131DBF8-A78A-46FB-81F0-49AE47F4F492}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SpriterDotNet.MonoGame.Example.DesktopGL</RootNamespace>
-    <AssemblyName>SpriterDotNet.MonoGame.Example.DesktopGL</AssemblyName>
+    <RootNamespace>SpriterDotNet.Example.MonoGame.DesktopGL</RootNamespace>
+    <AssemblyName>SpriterDotNet.Example.MonoGame.DesktopGL</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MonoGamePlatform>DesktopGL</MonoGamePlatform>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Icon.ico</ApplicationIcon>
@@ -56,11 +57,6 @@
     <EmbeddedResource Include="Icon.ico" />
     <EmbeddedResource Include="Icon.bmp" />
   </ItemGroup>
-  <ItemGroup>
-    <MonoGameContentReference Include="..\SpriterDotNet.Example.Content\Content.mgcb">
-      <Link>Content\Content.mgcb</Link>
-    </MonoGameContentReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\x86\SDL2.dll">
       <Link>x86\SDL2.dll</Link>
@@ -108,6 +104,11 @@
     </None>
     <None Include="app.manifest" />
   </ItemGroup>
+  <ItemGroup>
+    <MonoGameContentReference Include="..\SpriterDotNet.Example.Content\Content.mgcb">
+      <Link>Content\Content.mgcb</Link>
+    </MonoGameContentReference>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SpriterDotNet.MonoGame\SpriterDotNet.MonoGame.csproj">
       <Project>{10c1ed31-6945-4617-85ad-d2575550149d}</Project>

diff --git a/SpriterDotNet.Example.MonoGame.WindowsDX/Program.cs b/SpriterDotNet.Example.MonoGame.WindowsDX/Program.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The original author or authors
+// Copyright (C) The original author or authors
 //
 // This software may be modified and distributed under the terms
 // of the zlib license.  See the LICENSE file for details.
@@ -12,7 +12,7 @@ public static class Program
         [STAThread]
         static void Main()
         {
-            using (SpriterGame game = new SpriterGame())
+            using (ExampleGame game = new ExampleGame())
             {
                 game.Run();
             }

diff --git a/SpriterDotNet.Example.MonoGame.WindowsDX/Properties/AssemblyInfo.cs b/SpriterDotNet.Example.MonoGame.WindowsDX/Properties/AssemblyInfo.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("SpriterDotNet.MonoGame.Example.WindowsDX")]
+[assembly: AssemblyTitle("SpriterDotNet.Example.MonoGame.WindowsDX")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: ComVisible(false)]
diff --git a/SpriterDotNet.Example.MonoGame.WindowsDX/SpriterDotNet.Example.MonoGame.WindowsDX.csproj b/SpriterDotNet.Example.MonoGame.WindowsDX/SpriterDotNet.Example.MonoGame.WindowsDX.csproj
@@ -12,7 +12,7 @@
     <MonoGamePlatform>Windows</MonoGamePlatform>
     <MonoGameContentBuilderExe>
     </MonoGameContentBuilderExe>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -71,7 +71,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Icon.ico" />
-    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/SpriterDotNet.Example.MonoGame.WindowsDX/app.config b/SpriterDotNet.Example.MonoGame.WindowsDX/app.config