Skip to content

Commit 7967ccc

Browse files
guFalconguFalcon
committed
Update project
1 parent 86753da commit 7967ccc

File tree

11 files changed

+111
-64
lines changed

11 files changed

+111
-64
lines changed

‎BloomEffectRenderer/BloomEffectRenderer.csproj‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<EmbeddedResource Include="Effects\Resources\GaussianBlur.dx11.mgfxo" />
4343
<EmbeddedResource Include="Effects\Resources\GaussianBlur.ogl.mgfxo" />
4444
<None Include="app.config" />
45+
<None Include="BloomEffectRenderer.nuspec" />
4546
<None Include="Effects\Resources\RebuildEffects.bat" />
4647
<None Include="packages.config" />
4748
</ItemGroup>
@@ -53,35 +54,21 @@
5354
<Compile Include="RenderPhase.cs" />
5455
</ItemGroup>
5556
<ItemGroup>
56-
<Reference Include="Faders, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
57-
<HintPath>..\packages\Faders.1.1.0\lib\portable45-net45+win8+wpa81\Faders.dll</HintPath>
58-
<Private>True</Private>
59-
</Reference>
60-
<Reference Include="InputStateManager, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
61-
<HintPath>..\packages\InputStateManager.1.1.0.2\lib\portable45-net45+win8+wpa81\InputStateManager.dll</HintPath>
62-
<Private>True</Private>
63-
</Reference>
64-
<Reference Include="JetBrains.Annotations, Version=11.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
65-
<HintPath>..\packages\JetBrains.Annotations.11.1.0\lib\portable40-net40+sl5+win8+wp8+wpa81\JetBrains.Annotations.dll</HintPath>
66-
<Private>True</Private>
57+
<Reference Include="Faders, Version=1.1.1.1, Culture=neutral, processorArchitecture=MSIL">
58+
<HintPath>..\packages\Faders.1.1.1.1\lib\portable45-net45+win8+wpa81\Faders.dll</HintPath>
6759
</Reference>
6860
<Reference Include="MonoGame.Framework, Version=3.6.0.1625, Culture=neutral, processorArchitecture=MSIL">
6961
<HintPath>..\packages\MonoGame.Framework.Portable.3.6.0.1625\lib\portable-net45+win8+wpa81\MonoGame.Framework.dll</HintPath>
7062
<Private>True</Private>
7163
</Reference>
72-
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
73-
<HintPath>..\packages\NUnit.3.6.1\lib\portable-net45+win8+wp8+wpa81\nunit.framework.dll</HintPath>
74-
<Private>True</Private>
75-
</Reference>
76-
<Reference Include="ShaderTools, Version=1.0.1.1, Culture=neutral, processorArchitecture=MSIL">
77-
<HintPath>..\packages\ShaderTools.1.0.1.1\lib\portable45-net45+win8+wpa81\ShaderTools.dll</HintPath>
78-
<Private>True</Private>
64+
<Reference Include="ShaderTools, Version=1.0.2.1, Culture=neutral, processorArchitecture=MSIL">
65+
<HintPath>..\packages\ShaderTools.1.0.2.1\lib\portable45-net45+win8+wpa81\ShaderTools.dll</HintPath>
7966
</Reference>
8067
</ItemGroup>
8168
<ItemGroup>
82-
<Content Include="Effects\Resources\BloomCombine.fx" />
83-
<Content Include="Effects\Resources\BloomExtract.fx" />
84-
<Content Include="Effects\Resources\GaussianBlur.fx" />
69+
<None Include="Effects\Resources\BloomCombine.fx" />
70+
<None Include="Effects\Resources\BloomExtract.fx" />
71+
<None Include="Effects\Resources\GaussianBlur.fx" />
8572
</ItemGroup>
8673
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
8774
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎BloomEffectRenderer/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System.Resources;
22
using System.Reflection;
3-
using System.Runtime.CompilerServices;
4-
using System.Runtime.InteropServices;
53

64
// General Information about an assembly is controlled through the following
75
// set of attributes. Change these attribute values to modify the information
@@ -26,5 +24,5 @@
2624
// You can specify all the values or you can default the Build and Revision Numbers
2725
// by using the '*' as shown below:
2826
// [assembly: AssemblyVersion("1.0.*")]
29-
[assembly: AssemblyVersion("1.1.1.0")]
30-
[assembly: AssemblyFileVersion("1.1.1.0")]
27+
[assembly: AssemblyVersion("1.1.2.1")]
28+
[assembly: AssemblyFileVersion("1.1.2.1")]

‎BloomEffectRenderer/RenderPhase.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,8 @@
2525
// For more information, please refer to <http://unlicense.org>
2626
// ***************************************************************************
2727

28-
using JetBrains.Annotations;
29-
3028
namespace BloomEffectRenderer
3129
{
32-
[PublicAPI]
3330
public enum RenderPhase
3431
{
3532
/// <summary>

‎BloomEffectRenderer/Renderer.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,12 @@
2626
// ***************************************************************************
2727

2828
using System;
29-
using JetBrains.Annotations;
3029
using Microsoft.Xna.Framework;
3130
using Microsoft.Xna.Framework.Graphics;
3231
using ShaderTools;
3332

3433
namespace BloomEffectRenderer
3534
{
36-
[PublicAPI]
3735
public class Renderer
3836
{
3937
public RenderTarget2D BloomRenderTarget1 { get; private set; }

‎BloomEffectRenderer/Setting.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,13 @@
2525
// For more information, please refer to <http://unlicense.org>
2626
// ***************************************************************************
2727

28-
using Intervals;
29-
using JetBrains.Annotations;
28+
using Faders;
3029

3130
namespace BloomEffectRenderer
3231
{
3332
/// <summary>
3433
/// Class holds all the settings used to tweak the bloom effect.
3534
/// </summary>
36-
[PublicAPI]
3735
public class Setting
3836
{
3937
/// <summary>

‎BloomEffectRenderer/packages.config‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Faders" version="1.1.0" targetFramework="portable45-net45+win8+wpa81" />
4-
<package id="InputStateManager" version="1.1.0.2" targetFramework="portable45-net45+win8+wpa81" />
5-
<package id="JetBrains.Annotations" version="11.1.0" targetFramework="portable45-net45+win8+wpa81" />
3+
<package id="Faders" version="1.1.1.1" targetFramework="portable45-net45+win8+wpa81" />
64
<package id="MonoGame.Framework.Portable" version="3.6.0.1625" targetFramework="portable45-net45+win8+wpa81" />
7-
<package id="NUnit" version="3.6.1" targetFramework="portable45-net45+win8+wpa81" />
8-
<package id="ShaderTools" version="1.0.1.1" targetFramework="portable45-net45+win8+wpa81" />
9-
<package id="System.Runtime" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
5+
<package id="ShaderTools" version="1.0.2.1" targetFramework="portable45-net45+win8+wpa81" />
106
</packages>

‎Dependencies.dgml‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<DirectedGraph xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.microsoft.com/vs/2009/dgml">
3+
<Nodes>
4+
<Node Id="BloomEffectRenderer" Category="Project" />
5+
<Node Id="TestGame" Category="Project" />
6+
<Node Id="Faders 1.1.0" Category="Package" />
7+
<Node Id="InputStateManager 1.1.0.2" Category="Package" />
8+
<Node Id="JetBrains.Annotations 11.1.0" Category="Package" />
9+
<Node Id="MonoGame.Framework.Portable 3.6.0.1625" Category="Package" />
10+
<Node Id="NUnit 3.6.1" Category="Package" />
11+
<Node Id="ShaderTools 1.0.1.1" Category="Package" />
12+
<Node Id="System.Runtime 4.3.0" Category="Package" />
13+
<Node Id="MonoGame.Framework.DesktopGL 3.6.0.1625" Category="Package" />
14+
<Node Id="MonoGameDemoTools 1.1.0.6" Category="Package" />
15+
<Node Id="Faders" Label="Faders" Group="Expanded" Category="PackageGroup" />
16+
<Node Id="InputStateManager" Label="InputStateManager" Group="Expanded" Category="PackageGroup" />
17+
<Node Id="JetBrains.Annotations" Label="JetBrains.Annotations" Group="Expanded" Category="PackageGroup" />
18+
<Node Id="MonoGame.Framework.Portable" Label="MonoGame.Framework.Portable" Group="Expanded" Category="PackageGroup" />
19+
<Node Id="NUnit" Label="NUnit" Group="Expanded" Category="PackageGroup" />
20+
<Node Id="ShaderTools" Label="ShaderTools" Group="Expanded" Category="PackageGroup" />
21+
<Node Id="System.Runtime" Label="System.Runtime" Group="Expanded" Category="PackageGroup" />
22+
<Node Id="MonoGame.Framework.DesktopGL" Label="MonoGame.Framework.DesktopGL" Group="Expanded" Category="PackageGroup" />
23+
<Node Id="MonoGameDemoTools" Label="MonoGameDemoTools" Group="Expanded" Category="PackageGroup" />
24+
<Node Id="GlobalAssemblyCache" Label="Global Assembly Cache" Group="Collapsed" Category="GAC Library" />
25+
<Node Id="LocalLibraries" Label="Local Libraries" Group="Expanded" Category="Libraries" />
26+
<Node Id="System" Category="GAC Library" />
27+
<Node Id="System.ComponentModel.Composition" Category="GAC Library" />
28+
<Node Id="System.Xml" Category="GAC Library" />
29+
<Node Id="BloomEffectRenderer" Label="BloomEffectRenderer" Group="Expanded" Category="Solution" />
30+
</Nodes>
31+
<Links>
32+
<Link Source="Faders" Target="Faders 1.1.0" Category="Contains" />
33+
<Link Source="InputStateManager" Target="InputStateManager 1.1.0.2" Category="Contains" />
34+
<Link Source="JetBrains.Annotations" Target="JetBrains.Annotations 11.1.0" Category="Contains" />
35+
<Link Source="MonoGame.Framework.Portable" Target="MonoGame.Framework.Portable 3.6.0.1625" Category="Contains" />
36+
<Link Source="NUnit" Target="NUnit 3.6.1" Category="Contains" />
37+
<Link Source="ShaderTools" Target="ShaderTools 1.0.1.1" Category="Contains" />
38+
<Link Source="System.Runtime" Target="System.Runtime 4.3.0" Category="Contains" />
39+
<Link Source="MonoGame.Framework.DesktopGL" Target="MonoGame.Framework.DesktopGL 3.6.0.1625" Category="Contains" />
40+
<Link Source="MonoGameDemoTools" Target="MonoGameDemoTools 1.1.0.6" Category="Contains" />
41+
<Link Source="GlobalAssemblyCache" Target="System" Category="Contains" />
42+
<Link Source="GlobalAssemblyCache" Target="System.ComponentModel.Composition" Category="Contains" />
43+
<Link Source="GlobalAssemblyCache" Target="System.Xml" Category="Contains" />
44+
<Link Source="BloomEffectRenderer" Target="BloomEffectRenderer" Category="Contains" />
45+
<Link Source="BloomEffectRenderer" Target="Faders 1.1.0" Category="Installed Package" />
46+
<Link Source="BloomEffectRenderer" Target="InputStateManager 1.1.0.2" Category="Installed Package" />
47+
<Link Source="BloomEffectRenderer" Target="JetBrains.Annotations 11.1.0" Category="Installed Package" />
48+
<Link Source="BloomEffectRenderer" Target="MonoGame.Framework.Portable 3.6.0.1625" Category="Installed Package" />
49+
<Link Source="BloomEffectRenderer" Target="NUnit 3.6.1" Category="Installed Package" />
50+
<Link Source="BloomEffectRenderer" Target="ShaderTools 1.0.1.1" Category="Installed Package" />
51+
<Link Source="BloomEffectRenderer" Target="System.Runtime 4.3.0" Category="Installed Package" />
52+
<Link Source="BloomEffectRenderer" Target="TestGame" Category="Contains" />
53+
<Link Source="TestGame" Target="BloomEffectRenderer" Category="Project Reference" />
54+
<Link Source="TestGame" Target="Faders 1.1.0" Category="Installed Package" />
55+
<Link Source="TestGame" Target="InputStateManager 1.1.0.2" Category="Installed Package" />
56+
<Link Source="TestGame" Target="JetBrains.Annotations 11.1.0" Category="Installed Package" />
57+
<Link Source="TestGame" Target="MonoGame.Framework.DesktopGL 3.6.0.1625" Category="Installed Package" />
58+
<Link Source="TestGame" Target="MonoGame.Framework.Portable 3.6.0.1625" Category="Installed Package" />
59+
<Link Source="TestGame" Target="MonoGameDemoTools 1.1.0.6" Category="Installed Package" />
60+
<Link Source="TestGame" Target="NUnit 3.6.1" Category="Installed Package" />
61+
<Link Source="TestGame" Target="System.Runtime 4.3.0" Category="Installed Package" />
62+
<Link Source="TestGame" Target="System" Category="Library Reference" />
63+
<Link Source="TestGame" Target="System.ComponentModel.Composition" Category="Library Reference" />
64+
<Link Source="TestGame" Target="System.Xml" Category="Library Reference" />
65+
</Links>
66+
<Styles>
67+
<Style TargetType="Node" GroupLabel="Project" ValueLabel="True">
68+
<Condition Expression="HasCategory('Project')" />
69+
<Setter Property="Background" Value="Blue" />
70+
</Style>
71+
<Style TargetType="Node" GroupLabel="Package" ValueLabel="True">
72+
<Condition Expression="HasCategory('Package')" />
73+
<Setter Property="Background" Value="Purple" />
74+
</Style>
75+
<Style TargetType="Node" GroupLabel="PackageGroup" ValueLabel="True">
76+
<Condition Expression="HasCategory('PackageGroup')" />
77+
<Setter Property="Background" Value="Plum" />
78+
</Style>
79+
<Style TargetType="Node" GroupLabel="Library" ValueLabel="True">
80+
<Condition Expression="HasCategory('Library')" />
81+
<Setter Property="Background" Value="Green" />
82+
</Style>
83+
<Style TargetType="Node" GroupLabel="GAC Library" ValueLabel="True">
84+
<Condition Expression="HasCategory('GAC Library')" />
85+
<Setter Property="Background" Value="LightGreen" />
86+
</Style>
87+
</Styles>
88+
</DirectedGraph>

‎TestGame/Game1.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ protected override void UnloadContent()
125125
protected override void Update(GameTime gameTime)
126126
{
127127
Input.Update();
128-
if (Input.Pad.Is.Press(Buttons.Back) || Input.Key.Is.Press(Keys.Escape))
128+
if (Input.Pad().Is.Press(Buttons.Back) || Input.Key.Is.Press(Keys.Escape))
129129
Exit();
130130

131131
HandleInput();

‎TestGame/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Reflection;
2-
using System.Runtime.CompilerServices;
32
using System.Runtime.InteropServices;
43

54
// General Information about an assembly is controlled through the following

‎TestGame/TestGame.csproj‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,29 +47,18 @@
4747
<Compile Include="Properties\AssemblyInfo.cs" />
4848
</ItemGroup>
4949
<ItemGroup>
50-
<Reference Include="Faders, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Faders.1.1.0\lib\portable45-net45+win8+wpa81\Faders.dll</HintPath>
52-
<Private>True</Private>
53-
</Reference>
54-
<Reference Include="InputStateManager, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\packages\InputStateManager.1.1.0.2\lib\portable45-net45+win8+wpa81\InputStateManager.dll</HintPath>
56-
<Private>True</Private>
50+
<Reference Include="Faders, Version=1.1.1.1, Culture=neutral, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Faders.1.1.1.1\lib\portable45-net45+win8+wpa81\Faders.dll</HintPath>
5752
</Reference>
58-
<Reference Include="JetBrains.Annotations, Version=11.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
59-
<HintPath>..\packages\JetBrains.Annotations.11.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
60-
<Private>True</Private>
53+
<Reference Include="InputStateManager, Version=1.2.1.4, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\packages\InputStateManager.1.2.1.4\lib\portable45-net45+win8+wpa81\InputStateManager.dll</HintPath>
6155
</Reference>
6256
<Reference Include="MonoGame.Framework, Version=3.6.0.1625, Culture=neutral, processorArchitecture=MSIL">
6357
<HintPath>..\packages\MonoGame.Framework.DesktopGL.3.6.0.1625\lib\net40\MonoGame.Framework.dll</HintPath>
6458
<Private>True</Private>
6559
</Reference>
66-
<Reference Include="MonoGameDemoTools, Version=1.1.0.6, Culture=neutral, processorArchitecture=MSIL">
67-
<HintPath>..\packages\MonoGameDemoTools.1.1.0.6\lib\portable45-net45+win8+wpa81\MonoGameDemoTools.dll</HintPath>
68-
<Private>True</Private>
69-
</Reference>
70-
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
71-
<HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
72-
<Private>True</Private>
60+
<Reference Include="MonoGameDemoTools, Version=1.1.1.1, Culture=neutral, processorArchitecture=MSIL">
61+
<HintPath>..\packages\MonoGameDemoTools.1.1.1.1\lib\portable45-net45+win8+wpa81\MonoGameDemoTools.dll</HintPath>
7362
</Reference>
7463
<Reference Include="System" />
7564
<Reference Include="System.ComponentModel.Composition" />

0 commit comments

Comments
 (0)