tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to TG hair sprites.

Browse Source 
This removes the need for a separate shader because they're multiply-based instead of additive like /vg/ or Bay.
This commit is contained in:
Pieter-Jan Briers
2020-01-12 02:04:13 +01:00
parent 9c0a670525
commit e0a4735fe2
271 changed files with 162 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Content.Client/GameObjects/Components/Mobs/HairComponent.cs
View File

@@ -1,48 +1,18 @@
using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.Preferences.Appearance;
using Robust.Client.GameObjects;
using Robust.Client.Graphics.Shaders;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
namespace Content.Client.GameObjects.Components.Mobs
{
[RegisterComponent]
public sealed class HairComponent : SharedHairComponent
{
private const string HairShaderName = "hair";
private const string HairColorParameter = "hairColor";
#pragma warning disable 649
[Dependency] private readonly IPrototypeManager _prototypeManager;
#pragma warning restore 649
private ShaderInstance _facialHairShader;
private ShaderInstance _hairShader;
public override void Initialize()
{
base.Initialize();
var shaderProto = _prototypeManager.Index<ShaderPrototype>(HairShaderName);
_facialHairShader = shaderProto.InstanceUnique();
_hairShader = shaderProto.InstanceUnique();
}
protected override void Startup()
{
base.Startup();
if (Owner.TryGetComponent(out ISpriteComponent sprite))
{
sprite.LayerSetShader(HumanoidVisualLayers.Hair, _hairShader);
sprite.LayerSetShader(HumanoidVisualLayers.FacialHair, _facialHairShader);
}
UpdateHairStyle();
}
@@ -90,8 +60,8 @@ namespace Content.Client.GameObjects.Components.Mobs
{
var sprite = Owner.GetComponent<SpriteComponent>();
_hairShader?.SetParameter(HairColorParameter, HairColor);
_facialHairShader?.SetParameter(HairColorParameter, FacialHairColor);
sprite.LayerSetColor(HumanoidVisualLayers.Hair, HairColor);
sprite.LayerSetColor(HumanoidVisualLayers.FacialHair, FacialHairColor);
sprite.LayerSetState(HumanoidVisualLayers.Hair,
HairStyles.HairStylesMap[HairStyleName ?? HairStyles.DefaultHairStyle]);