Skip to content

Commit e67e362

Browse files
guFalconguFalcon
authored
Merge pull request #1 from UnterrainerInformatik/develop
Develop
2 parents 05fcd3e + c59ad3d commit e67e362

23 files changed

+182
-85
lines changed

‎.travis.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
########################
2+
### VARIABLES NEEDED ###
3+
########################
4+
# SOLUTION_NAME The name without file-ending
5+
# DEPLOY_BUILD Which build you want to pack and push to nuget('Debug' or 'Release')
6+
# NUGET Whether or not to deploy the result as a nuget-package (true if set)
7+
# If you don't want to deploy, unset it (or set it to 'false')
8+
#
9+
### Deploy
10+
# NUGET_API_KEY Your key from nuget.org
11+
# NUGET_PROJECT_FILENAME The name without file-ending
12+
# NUGET_PROJECT_PATH The path to your project (starting at git-repo-root; which is /)
13+
#
14+
####################
15+
### GENERAL INFO ###
16+
####################
17+
# git/depth: false is needed for minver
18+
19+
language: csharp
20+
solution: $SOLUTION_NAME.sln
21+
git:
22+
depth: false
23+
install:
24+
- git clone https://github.com/UnterrainerInformatik/Travis-Scripts.git travis
25+
- source travis/functions.sh
26+
- tr_setProjectSubdir .NET
27+
- source $TRAVIS/install.sh
28+
before_script:
29+
- source $TRAVIS/before_script.sh
30+
script:
31+
- source $TRAVIS/script.sh
32+
deploy:
33+
skip_cleanup: true
34+
provider: script
35+
script:
36+
- ./$TRAVIS/deploy.sh
37+
on:
38+
branch: master

‎BloomEffectRenderer.sln‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28307.1000
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BloomEffectRenderer", "BloomEffectRenderer\BloomEffectRenderer.csproj", "{FEAB11E2-F0C6-4EDC-8B07-1CF9018728AB}"
77
EndProject
@@ -25,4 +25,7 @@ Global
2525
GlobalSection(SolutionProperties) = preSolution
2626
HideSolutionNode = FALSE
2727
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {3740BBB4-74EF-48BC-AF1A-29D8C3E7621F}
30+
EndGlobalSection
2831
EndGlobal

‎BloomEffectRenderer.sln.DotSettings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ For more information, please refer to <http://unlicense.org>
4545
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
4646
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
4747
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
48+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
4849
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
4950
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
5051
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>

‎BloomEffectRenderer/BloomEffectRenderer.csproj‎

Lines changed: 13 additions & 24 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,23 @@
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>
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>
5959
</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>
60+
<Reference Include="MonoGame.Framework, Version=3.7.1.189, Culture=neutral, processorArchitecture=MSIL">
61+
<HintPath>..\packages\MonoGame.Framework.Portable.3.7.1.189\lib\portable-net45+win8+wpa81\MonoGame.Framework.dll</HintPath>
6362
</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>
67-
</Reference>
68-
<Reference Include="MonoGame.Framework, Version=3.6.0.1625, Culture=neutral, processorArchitecture=MSIL">
69-
<HintPath>..\packages\MonoGame.Framework.Portable.3.6.0.1625\lib\portable-net45+win8+wpa81\MonoGame.Framework.dll</HintPath>
70-
<Private>True</Private>
71-
</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>
63+
<Reference Include="ShaderTools, Version=1.0.2.1, Culture=neutral, processorArchitecture=MSIL">
64+
<HintPath>..\packages\ShaderTools.1.0.2.1\lib\portable45-net45+win8+wpa81\ShaderTools.dll</HintPath>
7965
</Reference>
8066
</ItemGroup>
8167
<ItemGroup>
82-
<Content Include="Effects\Resources\BloomCombine.fx" />
83-
<Content Include="Effects\Resources\BloomExtract.fx" />
84-
<Content Include="Effects\Resources\GaussianBlur.fx" />
68+
<None Include="Effects\Resources\BloomCombine.fx" />
69+
<None Include="Effects\Resources\BloomExtract.fx" />
70+
<None Include="Effects\Resources\GaussianBlur.fx" />
71+
</ItemGroup>
72+
<ItemGroup>
73+
<Content Include="icon.png" />
8574
</ItemGroup>
8675
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
8776
<!-- 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>

‎icon.png‎ renamed to ‎BloomEffectRenderer/icon.png‎

File renamed without changes.

‎BloomEffectRenderer/packages.config‎

Lines changed: 3 additions & 7 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" />
6-
<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" />
3+
<package id="Faders" version="1.1.1.1" targetFramework="portable45-net45+win8+wpa81" />
4+
<package id="MonoGame.Framework.Portable" version="3.7.1.189" targetFramework="portable45-net45+win8+wpa81" />
5+
<package id="ShaderTools" version="1.0.2.1" targetFramework="portable45-net45+win8+wpa81" />
106
</packages>

0 commit comments

Comments
 (0)