]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
ParallaxControl UI Dehardcode (#36071)
authorEd <96445749+TheShuEd@users.noreply.github.com>
Sun, 13 Apr 2025 12:44:44 +0000 (15:44 +0300)
committerGitHub <noreply@github.com>
Sun, 13 Apr 2025 12:44:44 +0000 (22:44 +1000)
* Parallax Control Improve

* Update MainMenuControl.xaml

* PJBControl.cs

Content.Client/Info/RulesPopup.xaml
Content.Client/Launcher/LauncherConnectingGui.xaml
Content.Client/MainMenu/UI/MainMenuControl.xaml
Content.Client/Parallax/ParallaxControl.cs
Content.Client/Replay/UI/Loading/LoadingScreenControl.xaml
Content.Client/Replay/UI/Loading/ReplayLoadingFailedControl.xaml
Content.Replay/Menu/ReplayMainMenuControl.xaml

index ca1e35f08ed2c33403ab5b7d946f8f993c14fb9c..80ed415550843c774e732bee0d63c66ffc321672 100644 (file)
@@ -3,7 +3,7 @@
          xmlns:info="clr-namespace:Content.Client.Info"
          VerticalExpand="True" HorizontalExpand="True"
          MouseFilter="Stop">
-    <parallax:ParallaxControl />
+    <parallax:ParallaxControl SpeedX="20"/>
     <Control VerticalExpand="True"
              MaxWidth="800"
              MaxHeight="900">
index 2cb349d4e77bdc209411bd3751f38ffd42d7f442..34b32f84fea3aefae52558a546989fb1b385cdb2 100644 (file)
@@ -3,7 +3,7 @@
          xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
          xmlns:parallax="clr-namespace:Content.Client.Parallax"
          xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
-    <parallax:ParallaxControl />
+    <parallax:ParallaxControl SpeedX="20"/>
     <Control HorizontalAlignment="Center" VerticalAlignment="Center">
         <PanelContainer StyleClasses="AngleRect" />
         <BoxContainer Orientation="Vertical" MinSize="300 200">
index d6c3f4b94155b9167f480d0ae8659e694665fb52..5aa59017832686ddb27fb64529ec5d8235ea17b2 100644 (file)
@@ -1,7 +1,12 @@
 <Control xmlns="https://spacestation14.io"
          xmlns:pllax="clr-namespace:Content.Client.Parallax"
          xmlns:clog="clr-namespace:Content.Client.Changelog">
-    <pllax:ParallaxControl />
+    <pllax:ParallaxControl
+        ParallaxPrototype="TrainStation"
+        SpeedX="5"
+        SpeedY="20"
+        ScaleX="3"
+        ScaleY="3"/>
     <BoxContainer Name="VBox"
                   Orientation="Vertical"
                   HorizontalAlignment="Center"
index 8f56857214ade8157f56abc40482be2de12c608d..99f39a1d445e813d35e44639a7e127b0c01e0905 100644 (file)
@@ -1,7 +1,9 @@
 using System.Numerics;
+using Content.Client.Parallax.Data;
 using Content.Client.Parallax.Managers;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
@@ -17,27 +19,50 @@ public sealed class ParallaxControl : Control
     [Dependency] private readonly IParallaxManager _parallaxManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
 
+    private string _parallaxPrototype = "FastSpace";
+
     [ViewVariables(VVAccess.ReadWrite)] public Vector2 Offset { get; set; }
+    [ViewVariables(VVAccess.ReadWrite)] public float SpeedX { get; set; } = 0.0f;
+    [ViewVariables(VVAccess.ReadWrite)] public float SpeedY { get; set; } = 0.0f;
+    [ViewVariables(VVAccess.ReadWrite)] public float ScaleX { get; set; } = 1.0f;
+    [ViewVariables(VVAccess.ReadWrite)] public float ScaleY { get; set; } = 1.0f;
+    [ViewVariables(VVAccess.ReadWrite)] public string ParallaxPrototype
+    {
+        get => _parallaxPrototype;
+        set
+        {
+            _parallaxPrototype = value;
+            _parallaxManager.LoadParallaxByName(value);
+        }
+    }
 
     public ParallaxControl()
     {
         IoCManager.InjectDependencies(this);
 
         Offset = new Vector2(_random.Next(0, 1000), _random.Next(0, 1000));
+
         RectClipContent = true;
-        _parallaxManager.LoadParallaxByName("FastSpace");
+        _parallaxManager.LoadParallaxByName(_parallaxPrototype);
     }
 
     protected override void Draw(DrawingHandleScreen handle)
     {
-        foreach (var layer in _parallaxManager.GetParallaxLayers("FastSpace"))
+        var currentTime = (float) _timing.RealTime.TotalSeconds;
+        var offset = Offset + new Vector2(currentTime * SpeedX, currentTime * SpeedY);
+
+        foreach (var layer in _parallaxManager.GetParallaxLayers(_parallaxPrototype))
         {
             var tex = layer.Texture;
-            var texSize = (tex.Size.X * (int) Size.X, tex.Size.Y * (int) Size.X) * layer.Config.Scale.Floored() / 1920;
+            var texSize = new Vector2i(
+                (int)(tex.Size.X * Size.X * layer.Config.Scale.X / 1920 * ScaleX),
+                (int)(tex.Size.Y * Size.X * layer.Config.Scale.Y / 1920 * ScaleY)
+            );
             var ourSize = PixelSize;
 
-            var currentTime = (float) _timing.RealTime.TotalSeconds;
-            var offset = Offset + new Vector2(currentTime * 100f, currentTime * 0f);
+            //Protection from division by zero.
+            texSize.X = Math.Max(texSize.X, 1);
+            texSize.Y = Math.Max(texSize.Y, 1);
 
             if (layer.Config.Tiled)
             {
index 58f353a5ffb546d391ff2739c1ac85e59cd0e5bc..0ad05435ccdee94914b999926f328fd6ff83951d 100644 (file)
@@ -1,6 +1,6 @@
 <Control xmlns="https://spacestation14.io"
          xmlns:pllax="clr-namespace:Content.Client.Parallax">
-    <pllax:ParallaxControl />
+    <pllax:ParallaxControl SpeedX="20"/>
     <PanelContainer Name="Background"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center">
index 5f77a66e535e69b62f054ed1f06c9a1e7be9d81b..8967b948e065c826d0a9abdc497a8eaeec89f245 100644 (file)
@@ -1,6 +1,6 @@
 <Control xmlns="https://spacestation14.io"
          xmlns:pllax="clr-namespace:Content.Client.Parallax">
-    <pllax:ParallaxControl />
+    <pllax:ParallaxControl SpeedX="20"/>
     <Control HorizontalAlignment="Center" VerticalAlignment="Center">
         <PanelContainer StyleClasses="AngleRect" />
         <BoxContainer Orientation="Vertical" SetSize="800 600" Margin="2">
index f26db1121f15ceb5002ce7296d89b9f4c8b65958..9eeafd95deacafca792e6ac4d77c388c4f3f7d51 100644 (file)
@@ -3,7 +3,7 @@
          xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls;assembly=Content.Client"
          xmlns:style="clr-namespace:Content.Client.Stylesheets;assembly=Content.Client"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <pllax:ParallaxControl />
+    <pllax:ParallaxControl SpeedX="20"/>
     <LayoutContainer>
         <BoxContainer Name="VBox" Orientation="Vertical" StyleIdentifier="mainMenuVBox">
             <TextureRect Name="Logo" Stretch="KeepCentered" />