Merge branch 'master' into speciesmerge

# Conflicts: # Content.Client/EntryPoint.cs # engine
space-wizards · Dec 10, 2018 · 6617153 · 6617153
1 parent 1939563
commit 6617153
Show file tree

Hide file tree

Showing 15 changed files with 778 additions and 12 deletions.
diff --git a/BuildChecker/BuildChecker.csproj b/BuildChecker/BuildChecker.csproj
@@ -17,7 +17,7 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
     <Python>python3</Python>
     <Python Condition="'$(OS)'=='Windows_NT' Or '$(OS)'=='Windows'">py -3</Python>
     <ProjectGuid>{C899FCA4-7037-4E49-ABC2-44DE72487110}</ProjectGuid>
-    <TargetFrameworkMoniker>.NETFramework, Version=v4.5.1</TargetFrameworkMoniker>
+    <TargetFrameworkMoniker>.NETFramework, Version=v4.7.1</TargetFrameworkMoniker>
   </PropertyGroup>
   <PropertyGroup>
     <OutputType>Library</OutputType>

diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Content.Client</RootNamespace>
     <AssemblyName>Content.Client</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ContentAssemblyTarget>..\engine\bin\Client\Resources\Assemblies\</ContentAssemblyTarget>
     <LangVersion>7.2</LangVersion>
@@ -53,8 +53,12 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Nett" Version="0.9.0" />
+    <PackageReference Include="SixLabors.Core" Version="1.0.0-beta0006" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0005" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="YamlDotNet" Version="5.0.1" />
+    <PackageReference Include="SharpZipLib" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -87,6 +91,10 @@
     <Compile Include="Interfaces\IClientGameTicker.cs" />
     <Compile Include="Interfaces\IClientNotifyManager.cs" />
     <Compile Include="ClientNotifyManager.cs" />
+    <Compile Include="Interfaces\Parallax\IParallaxManager.cs" />
+    <Compile Include="Parallax\ParallaxGenerator.cs" />
+    <Compile Include="Parallax\ParallaxManager.cs" />
+    <Compile Include="Parallax\ParallaxOverlay.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="GameObjects\Components\Items\ClientHandsComponent.cs" />
     <Compile Include="Interfaces\GameObjects\Components\Items\IHandsComponent.cs" />
@@ -118,7 +126,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\SS14.Content.targets" />
-  <Target Name="AfterBuild" DependsOnTargets="CopyContentAssemblies" />
+  <!--<Target Name="AfterBuild" DependsOnTargets="CopyContentAssemblies" />-->
   <ItemGroup>
     <!-- Files to be copied into Client/Assemblies -->
     <ContentAssemblies Include="$(OutputPath)Content.Client.dll" />
@@ -137,4 +145,4 @@
     <Compile Include="Construction\ConstructionPlacementHijack.cs" />
     <Compile Include="GameObjects\Components\IconSmoothing\IconSmoothComponent.cs" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs
@@ -9,9 +9,12 @@
 using Content.Client.Input;
 using Content.Client.Interfaces;
 using Content.Client.Interfaces.GameObjects;
+using Content.Client.Interfaces.Parallax;
+using Content.Client.Parallax;
 using Content.Shared.Interfaces;
 using SS14.Client;
 using SS14.Client.Interfaces;
+using SS14.Client.Interfaces.Graphics.Overlays;
 using SS14.Client.Interfaces.Input;
 using SS14.Client.Player;
 using SS14.Client.Utility;
@@ -89,7 +92,9 @@ public override void Init()
             IoCManager.Register<IClientNotifyManager, ClientNotifyManager>();
             IoCManager.Register<ISharedNotifyManager, ClientNotifyManager>();
             IoCManager.Register<IClientGameTicker, ClientGameTicker>();
+            IoCManager.Register<IParallaxManager, ParallaxManager>();
             IoCManager.BuildGraph();
+            IoCManager.Resolve<IParallaxManager>().LoadParallax();
 
             IoCManager.Resolve<IBaseClient>().PlayerJoinedServer += SubscribePlayerAttachmentEvents;
         }
@@ -140,6 +145,7 @@ public override void PostInit()
 
             IoCManager.Resolve<IClientNotifyManager>().Initialize();
             IoCManager.Resolve<IClientGameTicker>().Initialize();
+            IoCManager.Resolve<IOverlayManager>().AddOverlay(new ParallaxOverlay());
         }
 
         public override void Update(AssemblyLoader.UpdateLevel level, float frameTime)

diff --git a/Content.Client/Interfaces/Parallax/IParallaxManager.cs b/Content.Client/Interfaces/Parallax/IParallaxManager.cs
@@ -0,0 +1,12 @@
+using System;
+using SS14.Client.Graphics;
+
+namespace Content.Client.Interfaces.Parallax
+{
+    public interface IParallaxManager
+    {
+        event Action<Texture> OnTextureLoaded;
+        Texture ParallaxTexture { get; }
+        void LoadParallax();
+    }
+}