Texture Scaling for clothing (#39714)

scale
This commit is contained in:
InsoPL
2025-09-01 17:31:11 +02:00
committed by GitHub
parent 2624647e71
commit 831d384ff5
2 changed files with 9 additions and 3 deletions

View File

@@ -1,12 +1,10 @@
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Linq; using System.Linq;
using System.Numerics;
using Content.Client.DisplacementMap; using Content.Client.DisplacementMap;
using Content.Client.Inventory; using Content.Client.Inventory;
using Content.Shared.Clothing; using Content.Shared.Clothing;
using Content.Shared.Clothing.Components; using Content.Shared.Clothing.Components;
using Content.Shared.Clothing.EntitySystems; using Content.Shared.Clothing.EntitySystems;
using Content.Shared.DisplacementMap;
using Content.Shared.Humanoid; using Content.Shared.Humanoid;
using Content.Shared.Inventory; using Content.Shared.Inventory;
using Content.Shared.Inventory.Events; using Content.Shared.Inventory.Events;
@@ -14,7 +12,6 @@ using Content.Shared.Item;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.Graphics; using Robust.Client.Graphics;
using Robust.Client.ResourceManagement; using Robust.Client.ResourceManagement;
using Robust.Shared.Serialization.Manager;
using Robust.Shared.Serialization.TypeSerializers.Implementations; using Robust.Shared.Serialization.TypeSerializers.Implementations;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using static Robust.Client.GameObjects.SpriteComponent; using static Robust.Client.GameObjects.SpriteComponent;
@@ -177,6 +174,7 @@ public sealed class ClientClothingSystem : ClothingSystem
var layer = new PrototypeLayerData(); var layer = new PrototypeLayerData();
layer.RsiPath = rsi.Path.ToString(); layer.RsiPath = rsi.Path.ToString();
layer.State = state; layer.State = state;
layer.Scale = clothing.Scale;
layers = new() { layer }; layers = new() { layer };
return true; return true;

View File

@@ -1,4 +1,5 @@
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Numerics;
using Content.Shared.Clothing.EntitySystems; using Content.Shared.Clothing.EntitySystems;
using Content.Shared.DoAfter; using Content.Shared.DoAfter;
using Content.Shared.Inventory; using Content.Shared.Inventory;
@@ -92,6 +93,13 @@ public sealed partial class ClothingComponent : Component
/// </summary> /// </summary>
[DataField] [DataField]
public TimeSpan StripDelay = TimeSpan.Zero; public TimeSpan StripDelay = TimeSpan.Zero;
/// <summary>
/// A scale applied to all layers.
/// </summary>
///
[DataField]
public Vector2 Scale = Vector2.One;
} }
public enum ClothingMask : byte public enum ClothingMask : byte