-
-
Notifications
You must be signed in to change notification settings - Fork 159
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Refactors getting static tiles to use enumerators (#1611)
### Summary
* Refactors getting static/multi tiles to not use allocations.
* `TileList` is now only used during bootstrapping and uses rented buffers to eliminate extra allocations.
* Replaces `StaticTile[] GetStaticTiles` with:
```cs
Map.StaticTileEnumerable GetStaticTiles(int x, int y);
Map.StaticTileEnumerable GetStaticAndMultiTiles(int x, int y);
Map.StaticTileEnumerable GetMultiTiles(int x, int y);
```
* Removes `Synchronized` and `lock` from TileMatrix. It is no longer considered a multi-thread safe system.- Loading branch information
1 parent
3b1637b
commit f21c968
Showing
23 changed files
with
357 additions
and
510 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| /************************************************************************* | ||
| * ModernUO * | ||
| * Copyright 2019-2023 - ModernUO Development Team * | ||
| * Email: [email protected] * | ||
| * File: Map.StaticTileEnumerator.cs * | ||
| * * | ||
| * This program is free software: you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation, either version 3 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| * You should have received a copy of the GNU General Public License * | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. * | ||
| *************************************************************************/ | ||
|
|
||
| using System.Runtime.CompilerServices; | ||
| using Server.Items; | ||
|
|
||
| namespace Server; | ||
|
|
||
| public partial class Map | ||
| { | ||
| public ref struct StaticTileEnumerable | ||
| { | ||
| public static StaticTileEnumerable Empty | ||
| { | ||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
| get => new(); | ||
| } | ||
|
|
||
| private readonly Map _map; | ||
| private readonly Point2D _location; | ||
| private readonly bool _includeStatics; | ||
| private readonly bool _includeMultis; | ||
|
|
||
| public StaticTileEnumerable(Map map, Point2D loc, bool includeStatics = true, bool includeMultis = true) | ||
| { | ||
| _map = map; | ||
| _location = loc; | ||
| _includeStatics = includeStatics; | ||
| _includeMultis = includeMultis; | ||
| } | ||
|
|
||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
| public StaticTileEnumerator GetEnumerator() => new(_map, _location, _includeStatics, _includeMultis); | ||
| } | ||
|
|
||
| public ref struct StaticTileEnumerator | ||
| { | ||
| private readonly Map _map; | ||
| private readonly Point2D _point; | ||
|
|
||
| private StaticTile[] _tiles; | ||
| private MultiSectorEnumerator<BaseMulti> _multis; | ||
| private BaseMulti _currentMulti; | ||
|
|
||
| private int _index; | ||
|
|
||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
| public StaticTileEnumerator(Map map, Point2D p, bool includeStatics, bool includeMultis) | ||
| { | ||
| _map = map; | ||
| _point = p; | ||
|
|
||
| if (_map == null) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| if (includeStatics) | ||
| { | ||
| var tiles = map.Tiles.GetStaticBlock(p.X >> SectorShift, p.Y >> SectorShift); | ||
| _tiles = tiles[p.X & 0x7][p.Y & 0x7]; | ||
| _index = -1; | ||
| } | ||
|
|
||
| _multis = includeMultis | ||
| ? _map.GetMultisInSector(p).GetEnumerator() | ||
| : MultiSectorEnumerable<BaseMulti>.Empty.GetEnumerator(); | ||
| } | ||
|
|
||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
| private bool SetMulti() | ||
| { | ||
| ref var multis = ref _multis; | ||
| ref readonly var p = ref _point; | ||
|
|
||
| if (multis.MoveNext()) | ||
| { | ||
| var multi = multis.Current; | ||
| _currentMulti = multi; | ||
| var components = multi!.Components; | ||
| var location = multi!.Location; | ||
|
|
||
| int offsetX = p.X - location.X - components.Min.X; | ||
| int offsetY = p.Y - location.Y - components.Min.Y; | ||
|
|
||
| if (offsetX >= 0 && offsetY >= 0 && offsetX < components.Width && offsetY < components.Height) | ||
| { | ||
| _tiles = multi.Components.Tiles[offsetX][offsetY]; | ||
| _index = -1; | ||
| return SetTile(); | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
| private bool SetTile() => _tiles != null && ++_index < _tiles.Length; | ||
|
|
||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
| public bool MoveNext() => _map != null && (SetTile() || SetMulti()); | ||
|
|
||
| public StaticTile Current | ||
| { | ||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
| get | ||
| { | ||
| if (_currentMulti == null) | ||
| { | ||
| return _tiles[_index]; | ||
| } | ||
|
|
||
| var location = _currentMulti.Location; | ||
| ref readonly var tile = ref _tiles[_index]; | ||
| return new StaticTile | ||
| { | ||
| m_ID = tile.m_ID, | ||
| X = tile.m_X, | ||
| Y = tile.m_Y, | ||
| Z = tile.m_Z + location.Z, | ||
| m_Hue = tile.m_Hue | ||
| }; | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.