Skip to content

fix(2376): load textures for tileset resources that are waiting after the tilesets are loaded #2462

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

Merged
pandinocoder merged 1 commit into from
Jan 11, 2025
Merged

fix(2376): load textures for tileset resources that are waiting after the tilesets are loaded #2462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
154 changes: 96 additions & 58 deletions Intersect.Client.Core/Entities/Resource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,31 +36,46 @@ public override string Sprite
get => mMySprite;
set
{
if (value == mMySprite)
{
return;
}

if (BaseResource == null)
{
return;
}

mMySprite = value;
if (IsDead && BaseResource.Exhausted.GraphicFromTileset ||
!IsDead && BaseResource.Initial.GraphicFromTileset)
ReloadSpriteTexture();
}
}

private void ReloadSpriteTexture()
{
if (BaseResource == null)
{
return;
}

if (IsDead && BaseResource.Exhausted.GraphicFromTileset ||
!IsDead && BaseResource.Initial.GraphicFromTileset)
{
if (GameContentManager.Current.TilesetsLoaded)
{
if (GameContentManager.Current.TilesetsLoaded)
{
Texture = Globals.ContentManager.GetTexture(Framework.Content.TextureType.Tileset, mMySprite);
}
else
{
_waitingForTilesets = true;
}
Texture = Globals.ContentManager.GetTexture(Framework.Content.TextureType.Tileset, mMySprite);
}
else
{
Texture = Globals.ContentManager.GetTexture(Framework.Content.TextureType.Resource, mMySprite);
_waitingForTilesets = true;
}

mHasRenderBounds = false;
}
else
{
Texture = Globals.ContentManager.GetTexture(Framework.Content.TextureType.Resource, mMySprite);
}

mHasRenderBounds = false;
}

public override void Load(EntityPacket? packet)
Expand Down Expand Up @@ -114,15 +129,20 @@ public override bool Update()

return false;
}
else

if (!Maps.MapInstance.TryGet(MapId, out var map) || !map.InView())
{
var map = Maps.MapInstance.Get(MapId);
LatestMap = map;
if (map == null || !map.InView())
{
Globals.EntitiesToDispose.Add(Id);
Globals.EntitiesToDispose.Add(Id);

return false;
return false;
}

if (_waitingForTilesets)
{
if (GameContentManager.Current.TilesetsLoaded)
{
ReloadSpriteTexture();
}
}

Expand Down Expand Up @@ -172,7 +192,17 @@ public override bool Update()
_ = renderList.Remove(this);
}

if (map == null || Globals.Me == null || Globals.Me.MapInstance == null || Globals.MapGrid == default)
if (map == null)
{
return null;
}

if (Globals.MapGrid == default)
{
return null;
}

if (Globals.Me?.MapInstance == null)
{
return null;
}
Expand Down Expand Up @@ -227,62 +257,70 @@ public override bool Update()

private void CalculateRenderBounds()
{
var map = MapInstance;
if (map == null || BaseResource == default)
if (BaseResource == default)
{
return;
}

if (_waitingForTilesets && !GameContentManager.Current.TilesetsLoaded)
if (MapInstance is not { } map)
{
return;
}

if (_waitingForTilesets && GameContentManager.Current.TilesetsLoaded)
if (_waitingForTilesets)
{
_waitingForTilesets = false;
}

if (Texture != null)
{
mSrcRectangle.X = 0;
mSrcRectangle.Y = 0;
if (IsDead && BaseResource.Exhausted.GraphicFromTileset)
{
mSrcRectangle.X = BaseResource.Exhausted.X * Options.TileWidth;
mSrcRectangle.Y = BaseResource.Exhausted.Y * Options.TileHeight;
mSrcRectangle.Width = (BaseResource.Exhausted.Width + 1) * Options.TileWidth;
mSrcRectangle.Height = (BaseResource.Exhausted.Height + 1) * Options.TileHeight;
}
else if (!IsDead && BaseResource.Initial.GraphicFromTileset)
if (GameContentManager.Current.TilesetsLoaded)
{
mSrcRectangle.X = BaseResource.Initial.X * Options.TileWidth;
mSrcRectangle.Y = BaseResource.Initial.Y * Options.TileHeight;
mSrcRectangle.Width = (BaseResource.Initial.Width + 1) * Options.TileWidth;
mSrcRectangle.Height = (BaseResource.Initial.Height + 1) * Options.TileHeight;
_waitingForTilesets = false;
}
else
{
mSrcRectangle.Width = Texture.Width;
mSrcRectangle.Height = Texture.Height;
return;
}
}

mDestRectangle.Width = mSrcRectangle.Width;
mDestRectangle.Height = mSrcRectangle.Height;
mDestRectangle.Y = (int) (map.Y + Y * Options.TileHeight + OffsetY);
mDestRectangle.X = (int) (map.X + X * Options.TileWidth + OffsetX);
if (mSrcRectangle.Height > Options.TileHeight)
{
mDestRectangle.Y -= mSrcRectangle.Height - Options.TileHeight;
}
if (Texture == null)
{
return;
}

if (mSrcRectangle.Width > Options.TileWidth)
{
mDestRectangle.X -= (mSrcRectangle.Width - Options.TileWidth) / 2;
}
mSrcRectangle.X = 0;
mSrcRectangle.Y = 0;
if (IsDead && BaseResource.Exhausted.GraphicFromTileset)
{
mSrcRectangle.X = BaseResource.Exhausted.X * Options.TileWidth;
mSrcRectangle.Y = BaseResource.Exhausted.Y * Options.TileHeight;
mSrcRectangle.Width = (BaseResource.Exhausted.Width + 1) * Options.TileWidth;
mSrcRectangle.Height = (BaseResource.Exhausted.Height + 1) * Options.TileHeight;
}
else if (!IsDead && BaseResource.Initial.GraphicFromTileset)
{
mSrcRectangle.X = BaseResource.Initial.X * Options.TileWidth;
mSrcRectangle.Y = BaseResource.Initial.Y * Options.TileHeight;
mSrcRectangle.Width = (BaseResource.Initial.Width + 1) * Options.TileWidth;
mSrcRectangle.Height = (BaseResource.Initial.Height + 1) * Options.TileHeight;
}
else
{
mSrcRectangle.Width = Texture.Width;
mSrcRectangle.Height = Texture.Height;
}

mDestRectangle.Width = mSrcRectangle.Width;
mDestRectangle.Height = mSrcRectangle.Height;
mDestRectangle.Y = (int) (map.Y + Y * Options.TileHeight + OffsetY);
mDestRectangle.X = (int) (map.X + X * Options.TileWidth + OffsetX);
if (mSrcRectangle.Height > Options.TileHeight)
{
mDestRectangle.Y -= mSrcRectangle.Height - Options.TileHeight;
}

mHasRenderBounds = true;
if (mSrcRectangle.Width > Options.TileWidth)
{
mDestRectangle.X -= (mSrcRectangle.Width - Options.TileWidth) / 2;
}

mHasRenderBounds = true;
}

//Rendering Resources
Expand Down
2 changes: 1 addition & 1 deletion Intersect.Client.Framework/File Management/GameContentManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public enum UI
/// </summary>
public IAssetPacker MusicPacks { get; set; }

public bool TilesetsLoaded = false;
public bool TilesetsLoaded { get; set; } = false;

public ContentWatcher ContentWatcher { get; protected set; }

Expand Down
Loading