Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimize DreamIcon.UpdateAnimation() #1572

Merged
merged 2 commits into from
Dec 27, 2023
Merged

Optimize DreamIcon.UpdateAnimation() #1572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b091f01
Optimize `DreamIcon.UpdateAnimation()`
wixoaGit Dec 27, 2023
2cb20be
Some file-scoped namespaces
wixoaGit Dec 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
311 changes: 156 additions & 155 deletions OpenDreamClient/Rendering/ClientAppearanceSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,194 +5,195 @@
using Robust.Shared.Prototypes;
using OpenDreamClient.Resources;
using OpenDreamClient.Resources.ResourceTypes;
using Robust.Shared.Timing;

namespace OpenDreamClient.Rendering;

internal sealed class ClientAppearanceSystem : SharedAppearanceSystem {
private Dictionary<int, IconAppearance> _appearances = new();
private readonly Dictionary<int, List<Action<IconAppearance>>> _appearanceLoadCallbacks = new();
private readonly Dictionary<int, DreamIcon> _turfIcons = new();
private readonly Dictionary<DreamFilter, ShaderInstance> _filterShaders = new();

[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IDreamResourceManager _dreamResourceManager = default!;
[Dependency] private readonly TransformSystem _transformSystem = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;

public override void Initialize() {
SubscribeNetworkEvent<AllAppearancesEvent>(OnAllAppearances);
SubscribeNetworkEvent<NewAppearanceEvent>(OnNewAppearance);
SubscribeNetworkEvent<AnimationEvent>(OnAnimation);
SubscribeLocalEvent<DMISpriteComponent, WorldAABBEvent>(OnWorldAABB);
}

namespace OpenDreamClient.Rendering {
internal sealed class ClientAppearanceSystem : SharedAppearanceSystem {
private Dictionary<int, IconAppearance> _appearances = new();
private readonly Dictionary<int, List<Action<IconAppearance>>> _appearanceLoadCallbacks = new();
private readonly Dictionary<int, DreamIcon> _turfIcons = new();
private readonly Dictionary<DreamFilter, ShaderInstance> _filterShaders = new();

[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IDreamResourceManager _dreamResourceManager = default!;
[Dependency] private readonly TransformSystem _transformSystem = default!;

public override void Initialize() {
SubscribeNetworkEvent<AllAppearancesEvent>(OnAllAppearances);
SubscribeNetworkEvent<NewAppearanceEvent>(OnNewAppearance);
SubscribeNetworkEvent<AnimationEvent>(OnAnimation);
SubscribeLocalEvent<DMISpriteComponent, WorldAABBEvent>(OnWorldAABB);
}
public override void Shutdown() {
_appearances.Clear();
_appearanceLoadCallbacks.Clear();
_turfIcons.Clear();
}

public override void Shutdown() {
_appearances.Clear();
_appearanceLoadCallbacks.Clear();
_turfIcons.Clear();
public void LoadAppearance(int appearanceId, Action<IconAppearance> loadCallback) {
if (_appearances.TryGetValue(appearanceId, out var appearance)) {
loadCallback(appearance);
}

public void LoadAppearance(int appearanceId, Action<IconAppearance> loadCallback) {
if (_appearances.TryGetValue(appearanceId, out var appearance)) {
loadCallback(appearance);
}

if (!_appearanceLoadCallbacks.ContainsKey(appearanceId)) {
_appearanceLoadCallbacks.Add(appearanceId, new());
}

_appearanceLoadCallbacks[appearanceId].Add(loadCallback);
if (!_appearanceLoadCallbacks.ContainsKey(appearanceId)) {
_appearanceLoadCallbacks.Add(appearanceId, new());
}

public DreamIcon GetTurfIcon(int turfId) {
int appearanceId = turfId - 1;
_appearanceLoadCallbacks[appearanceId].Add(loadCallback);
}

if (!_turfIcons.TryGetValue(appearanceId, out var icon)) {
icon = new DreamIcon(appearanceId);
_turfIcons.Add(appearanceId, icon);
}
public DreamIcon GetTurfIcon(int turfId) {
int appearanceId = turfId - 1;

return icon;
if (!_turfIcons.TryGetValue(appearanceId, out var icon)) {
icon = new DreamIcon(_gameTiming, this, appearanceId);
_turfIcons.Add(appearanceId, icon);
}

private void OnAllAppearances(AllAppearancesEvent e, EntitySessionEventArgs session) {
_appearances = e.Appearances;
return icon;
}

foreach (KeyValuePair<int, IconAppearance> pair in _appearances) {
if (_appearanceLoadCallbacks.TryGetValue(pair.Key, out var callbacks)) {
foreach (var callback in callbacks) callback(pair.Value);
}
private void OnAllAppearances(AllAppearancesEvent e, EntitySessionEventArgs session) {
_appearances = e.Appearances;

foreach (KeyValuePair<int, IconAppearance> pair in _appearances) {
if (_appearanceLoadCallbacks.TryGetValue(pair.Key, out var callbacks)) {
foreach (var callback in callbacks) callback(pair.Value);
}
}
}

private void OnNewAppearance(NewAppearanceEvent e) {
_appearances[e.AppearanceId] = e.Appearance;
private void OnNewAppearance(NewAppearanceEvent e) {
_appearances[e.AppearanceId] = e.Appearance;

if (_appearanceLoadCallbacks.TryGetValue(e.AppearanceId, out var callbacks)) {
foreach (var callback in callbacks) callback(e.Appearance);
}
if (_appearanceLoadCallbacks.TryGetValue(e.AppearanceId, out var callbacks)) {
foreach (var callback in callbacks) callback(e.Appearance);
}
}

private void OnAnimation(AnimationEvent e) {
EntityUid ent = _entityManager.GetEntity(e.Entity);
if (!_entityManager.TryGetComponent<DMISpriteComponent>(ent, out var sprite))
return;
private void OnAnimation(AnimationEvent e) {
EntityUid ent = _entityManager.GetEntity(e.Entity);
if (!_entityManager.TryGetComponent<DMISpriteComponent>(ent, out var sprite))
return;

LoadAppearance(e.TargetAppearanceId, targetAppearance => {
sprite.Icon.StartAppearanceAnimation(targetAppearance, e.Duration);
});
}
LoadAppearance(e.TargetAppearanceId, targetAppearance => {
sprite.Icon.StartAppearanceAnimation(targetAppearance, e.Duration);
});
}

private void OnWorldAABB(EntityUid uid, DMISpriteComponent comp, ref WorldAABBEvent e) {
Box2? aabb = null;
private void OnWorldAABB(EntityUid uid, DMISpriteComponent comp, ref WorldAABBEvent e) {
Box2? aabb = null;

comp.Icon.GetWorldAABB(_transformSystem.GetWorldPosition(uid), ref aabb);
if (aabb != null)
e.AABB = aabb.Value;
}
comp.Icon.GetWorldAABB(_transformSystem.GetWorldPosition(uid), ref aabb);
if (aabb != null)
e.AABB = aabb.Value;
}

public void ResetFilterUsageFlags() {
foreach (DreamFilter key in _filterShaders.Keys) {
key.Used = false;
}
public void ResetFilterUsageFlags() {
foreach (DreamFilter key in _filterShaders.Keys) {
key.Used = false;
}
}

public void CleanUpUnusedFilters() {
foreach (DreamFilter key in _filterShaders.Keys) {
if (!key.Used)
_filterShaders.Remove(key);
}
public void CleanUpUnusedFilters() {
foreach (DreamFilter key in _filterShaders.Keys) {
if (!key.Used)
_filterShaders.Remove(key);
}
}

public ShaderInstance GetFilterShader(DreamFilter filter, Dictionary<string, IRenderTexture> renderSourceLookup) {
if (!_filterShaders.TryGetValue(filter, out var instance)) {
var protoManager = IoCManager.Resolve<IPrototypeManager>();

instance = protoManager.Index<ShaderPrototype>(filter.FilterType).InstanceUnique();
switch (filter) {
case DreamFilterAlpha alpha:
instance.SetParameter("x",alpha.X);
instance.SetParameter("y",alpha.Y);
instance.SetParameter("flags",alpha.Flags);
break;
case DreamFilterAngularBlur angularBlur:
break;
case DreamFilterBloom bloom:
break;
case DreamFilterBlur blur:
instance.SetParameter("size", blur.Size);
break;
case DreamFilterColor color: {
//Since SWSL doesn't support 4x5 matrices, we need to get a bit silly.
instance.SetParameter("colorMatrix", color.Color.GetMatrix4());
instance.SetParameter("offsetVector", color.Color.GetOffsetVector());
//TODO: Support the alternative colour mappings.
break;
}
case DreamFilterDisplace displace:
instance.SetParameter("size", displace.Size);
instance.SetParameter("x", displace.X);
instance.SetParameter("y", displace.Y);
break;
case DreamFilterDropShadow dropShadow:
instance.SetParameter("size", dropShadow.Size);
instance.SetParameter("x", dropShadow.X);
instance.SetParameter("y", dropShadow.Y);
instance.SetParameter("shadow_color", dropShadow.Color);
// TODO: offset
break;
case DreamFilterLayer layer:
break;
case DreamFilterMotionBlur motionBlur:
break;
case DreamFilterOutline outline:
instance.SetParameter("size", outline.Size);
instance.SetParameter("color", outline.Color);
instance.SetParameter("flags", outline.Flags);
break;
case DreamFilterRadialBlur radialBlur:
break;
case DreamFilterRays rays:
break;
case DreamFilterRipple ripple:
break;
case DreamFilterWave wave:
break;
case DreamFilterGreyscale greyscale:
break;
}
}
public ShaderInstance GetFilterShader(DreamFilter filter, Dictionary<string, IRenderTexture> renderSourceLookup) {
if (!_filterShaders.TryGetValue(filter, out var instance)) {
var protoManager = IoCManager.Resolve<IPrototypeManager>();

// Texture parameters need reset because different render targets can be used each frame
instance = protoManager.Index<ShaderPrototype>(filter.FilterType).InstanceUnique();
switch (filter) {
case DreamFilterAlpha alpha:
if (!string.IsNullOrEmpty(alpha.RenderSource) && renderSourceLookup.TryGetValue(alpha.RenderSource, out var renderSourceTexture))
instance.SetParameter("mask_texture", renderSourceTexture.Texture);
else if (alpha.Icon != 0) {
_dreamResourceManager.LoadResourceAsync<DMIResource>(alpha.Icon, rsc => {
instance.SetParameter("mask_texture", rsc.Texture);
});
} else {
instance.SetParameter("mask_texture", Texture.Transparent);
}

instance.SetParameter("x",alpha.X);
instance.SetParameter("y",alpha.Y);
instance.SetParameter("flags",alpha.Flags);
break;
case DreamFilterAngularBlur angularBlur:
break;
case DreamFilterBloom bloom:
break;
case DreamFilterBlur blur:
instance.SetParameter("size", blur.Size);
break;
case DreamFilterColor color: {
//Since SWSL doesn't support 4x5 matrices, we need to get a bit silly.
instance.SetParameter("colorMatrix", color.Color.GetMatrix4());
instance.SetParameter("offsetVector", color.Color.GetOffsetVector());
//TODO: Support the alternative colour mappings.
break;
}
case DreamFilterDisplace displace:
if (!string.IsNullOrEmpty(displace.RenderSource) && renderSourceLookup.TryGetValue(displace.RenderSource, out renderSourceTexture)) {
instance.SetParameter("displacement_map", renderSourceTexture.Texture);
} else if (displace.Icon != 0) {
_dreamResourceManager.LoadResourceAsync<DMIResource>(displace.Icon, rsc => {
instance.SetParameter("displacement_map", rsc.Texture);
});
} else {
instance.SetParameter("displacement_map", Texture.Transparent);
}

instance.SetParameter("size", displace.Size);
instance.SetParameter("x", displace.X);
instance.SetParameter("y", displace.Y);
break;
case DreamFilterDropShadow dropShadow:
instance.SetParameter("size", dropShadow.Size);
instance.SetParameter("x", dropShadow.X);
instance.SetParameter("y", dropShadow.Y);
instance.SetParameter("shadow_color", dropShadow.Color);
// TODO: offset
break;
case DreamFilterLayer layer:
break;
case DreamFilterMotionBlur motionBlur:
break;
case DreamFilterOutline outline:
instance.SetParameter("size", outline.Size);
instance.SetParameter("color", outline.Color);
instance.SetParameter("flags", outline.Flags);
break;
case DreamFilterRadialBlur radialBlur:
break;
case DreamFilterRays rays:
break;
case DreamFilterRipple ripple:
break;
case DreamFilterWave wave:
break;
case DreamFilterGreyscale greyscale:
break;
}
}

filter.Used = true;
_filterShaders[filter] = instance;
return instance;
// Texture parameters need reset because different render targets can be used each frame
switch (filter) {
case DreamFilterAlpha alpha:
if (!string.IsNullOrEmpty(alpha.RenderSource) && renderSourceLookup.TryGetValue(alpha.RenderSource, out var renderSourceTexture))
instance.SetParameter("mask_texture", renderSourceTexture.Texture);
else if (alpha.Icon != 0) {
_dreamResourceManager.LoadResourceAsync<DMIResource>(alpha.Icon, rsc => {
instance.SetParameter("mask_texture", rsc.Texture);
});
} else {
instance.SetParameter("mask_texture", Texture.Transparent);
}

break;
case DreamFilterDisplace displace:
if (!string.IsNullOrEmpty(displace.RenderSource) && renderSourceLookup.TryGetValue(displace.RenderSource, out renderSourceTexture)) {
instance.SetParameter("displacement_map", renderSourceTexture.Texture);
} else if (displace.Icon != 0) {
_dreamResourceManager.LoadResourceAsync<DMIResource>(displace.Icon, rsc => {
instance.SetParameter("displacement_map", rsc.Texture);
});
} else {
instance.SetParameter("displacement_map", Texture.Transparent);
}

break;
}

filter.Used = true;
_filterShaders[filter] = instance;
return instance;
}
}

Loading
Loading