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

Character editor flicker fix (#7002)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Leeroy
2022-03-28 11:31:23 +03:00
committed by GitHub
parent 435af224c8
commit bd12fae93a
1 changed files with 56 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
View File

@@ -79,9 +79,15 @@ namespace Content.Client.Preferences.UI
private readonly List<SpeciesPrototype> _speciesList; private readonly List<SpeciesPrototype> _speciesList;
private readonly List<AntagPreferenceSelector> _antagPreferences; private readonly List<AntagPreferenceSelector> _antagPreferences;
private EntityUid _previewDummy;
private Control _previewSpriteControl => CSpriteViewFront; private Control _previewSpriteControl => CSpriteViewFront;
private Control _previewSpriteSideControl => CSpriteViewSide; private Control _previewSpriteSideControl => CSpriteViewSide;
private EntityUid? _previewDummy;
/// <summary>
/// Used to avoid unnecessarily re-creating the entity.
/// </summary>
private string? _lastSpecies;
private SpriteView? _previewSprite; private SpriteView? _previewSprite;
private SpriteView? _previewSpriteSide; private SpriteView? _previewSpriteSide;
@@ -487,19 +493,31 @@ namespace Content.Client.Preferences.UI
if (!disposing) if (!disposing)
return; return;
_entMan.DeleteEntity(_previewDummy); if (_previewDummy != null)
_entMan.DeleteEntity(_previewDummy.Value);
_preferencesManager.OnServerDataLoaded -= LoadServerData; _preferencesManager.OnServerDataLoaded -= LoadServerData;
} }
private void RebuildSpriteView() private void RebuildSpriteView()
{ {
var dollProto = _prototypeManager.Index<SpeciesPrototype>(Profile?.Species ?? SpeciesManager.DefaultSpecies).DollPrototype; var species = Profile?.Species ?? SpeciesManager.DefaultSpecies;
if (_lastSpecies != species)
{
var dollProto = _prototypeManager.Index<SpeciesPrototype>(species).DollPrototype;
if (_previewDummy != null)
_entMan.DeleteEntity(_previewDummy!.Value);
_previewDummy = _entMan.SpawnEntity(dollProto, MapCoordinates.Nullspace); _previewDummy = _entMan.SpawnEntity(dollProto, MapCoordinates.Nullspace);
_lastSpecies = species;
}
var sprite = _entMan.GetComponent<SpriteComponent>(_previewDummy); var sprite = _entMan.GetComponent<SpriteComponent>(_previewDummy!.Value);
_previewSpriteControl.DisposeAllChildren();
if (_previewSprite == null)
{
// Front // Front
_previewSprite = new SpriteView _previewSprite = new SpriteView
{ {
@@ -510,10 +528,14 @@ namespace Content.Client.Preferences.UI
SizeFlagsStretchRatio = 1 SizeFlagsStretchRatio = 1
}; };
_previewSpriteControl.AddChild(_previewSprite); _previewSpriteControl.AddChild(_previewSprite);
}
else
{
_previewSprite.Sprite = sprite;
}
_previewSpriteSideControl.DisposeAllChildren(); if (_previewSpriteSide == null)
{
// Side
_previewSpriteSide = new SpriteView _previewSpriteSide = new SpriteView
{ {
Sprite = sprite, Sprite = sprite,
@@ -524,6 +546,11 @@ namespace Content.Client.Preferences.UI
}; };
_previewSpriteSideControl.AddChild(_previewSpriteSide); _previewSpriteSideControl.AddChild(_previewSpriteSide);
} }
else
{
_previewSpriteSide.Sprite = sprite;
}
}
private void LoadServerData() private void LoadServerData()
{ {
@@ -732,8 +759,8 @@ namespace Content.Client.Preferences.UI
return; return;
RebuildSpriteView(); RebuildSpriteView();
EntitySystem.Get<SharedHumanoidAppearanceSystem>().UpdateFromProfile(_previewDummy, Profile); EntitySystem.Get<SharedHumanoidAppearanceSystem>().UpdateFromProfile(_previewDummy!.Value, Profile);
LobbyCharacterPreviewPanel.GiveDummyJobClothes(_previewDummy, Profile); LobbyCharacterPreviewPanel.GiveDummyJobClothes(_previewDummy!.Value, Profile);
} }
public void UpdateControls() public void UpdateControls()