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

Underanalyzer: Fix incorrect data type in tiles #2037

Merged
merged 2 commits into from
Feb 12, 2025
Merged

Underanalyzer: Fix incorrect data type in tiles #2037

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
682ec9d
Fix incorrect data type in tiles
crystallizedsparkle Feb 10, 2025
4214591
Remove int casts, change underlying structures
colinator27 Feb 10, 2025
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
8 changes: 4 additions & 4 deletions UndertaleModLib/Models/UndertaleRoom.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,12 +1196,12 @@ public UndertaleNamedResource ObjectDefinition
/// <summary>
/// The x coordinate of the tile in <see cref="ObjectDefinition"/>.
/// </summary>
public uint SourceX { get; set; }
public int SourceX { get; set; }

/// <summary>
/// The y coordinate of the tile in <see cref="ObjectDefinition"/>.
/// </summary>
public uint SourceY { get; set; }
public int SourceY { get; set; }

/// <summary>
/// The width of the tile.
Expand Down Expand Up @@ -1283,8 +1283,8 @@ public void Unserialize(UndertaleReader reader)
_spriteDefinition = reader.ReadUndertaleObject<UndertaleResourceById<UndertaleSprite, UndertaleChunkSPRT>>();
else
_backgroundDefinition = reader.ReadUndertaleObject<UndertaleResourceById<UndertaleBackground, UndertaleChunkBGND>>();
SourceX = reader.ReadUInt32();
SourceY = reader.ReadUInt32();
SourceX = reader.ReadInt32();
SourceY = reader.ReadInt32();
Width = reader.ReadUInt32();
Height = reader.ReadUInt32();
TileDepth = reader.ReadInt32();
Expand Down
16 changes: 8 additions & 8 deletions UndertaleModTool/Converters/UndertaleCachedImageLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class UndertaleCachedImageLoader : IValueConverter
private static extern bool DeleteObject([In] IntPtr hObject);

private static readonly ConcurrentDictionary<string, ImageSource> imageCache = new();
private static readonly ConcurrentDictionary<Tuple<string, Tuple<uint, uint, uint, uint>>, ImageSource> tileCache = new();
private static readonly ConcurrentDictionary<Tuple<string, Tuple<int, int, uint, uint>>, ImageSource> tileCache = new();
private static readonly MainWindow mainWindow = Application.Current.MainWindow as MainWindow;

private static bool _reuseTileBuffer;
Expand All @@ -59,7 +59,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
bool generate = false;

string par;
List<Tuple<uint, uint, uint, uint>> tileRectList = null;
List<Tuple<int, int, uint, uint>> tileRectList = null;
if (parameter is string)
{
par = parameter as string;
Expand All @@ -68,10 +68,10 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
cacheEnabled = !par.Contains("nocache");
generate = par.Contains("generate");
}
else if (parameter is List<Tuple<uint, uint, uint, uint>>)
else if (parameter is List<Tuple<int, int, uint, uint>>)
{
generate = true;
tileRectList = parameter as List<Tuple<uint, uint, uint, uint>>;
tileRectList = parameter as List<Tuple<int, int, uint, uint>>;
}

Tile tile = null;
Expand Down Expand Up @@ -200,7 +200,7 @@ private ImageSource CreateSpriteSource(in Rectangle rect, in UndertaleTexturePag

return spriteSrc;
}
private void ProcessTileSet(string textureName, Bitmap bmp, List<Tuple<uint, uint, uint, uint>> tileRectList, int targetX, int targetY)
private void ProcessTileSet(string textureName, Bitmap bmp, List<Tuple<int, int, uint, uint>> tileRectList, int targetX, int targetY)
{
BitmapData data = bmp.LockBits(new Rectangle(0, 0, bmp.Width, bmp.Height), ImageLockMode.ReadOnly, bmp.PixelFormat);
int depth = Image.GetPixelFormatSize(data.PixelFormat) / 8;
Expand All @@ -224,8 +224,8 @@ private void ProcessTileSet(string textureName, Bitmap bmp, List<Tuple<uint, uin

_ = Parallel.ForEach(tileRectList, (tileRect) =>
{
int origX = (int)tileRect.Item1;
int origY = (int)tileRect.Item2;
int origX = tileRect.Item1;
int origY = tileRect.Item2;
int x = origX - targetX;
int y = origY - targetY;
int w = (int)tileRect.Item3;
Expand Down Expand Up @@ -272,7 +272,7 @@ private void ProcessTileSet(string textureName, Bitmap bmp, List<Tuple<uint, uin

spriteSrc.Freeze(); // allow UI thread access

Tuple<string, Tuple<uint, uint, uint, uint>> tileKey = new(textureName, new((uint)origX, (uint)origY, (uint)w, (uint)h));
Tuple<string, Tuple<int, int, uint, uint>> tileKey = new(textureName, new(origX, origY, (uint)w, (uint)h));
tileCache.TryAdd(tileKey, spriteSrc);
});

Expand Down
22 changes: 11 additions & 11 deletions UndertaleModTool/Editors/UndertaleRoomEditor/UndertaleRoomEditor.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,8 +790,8 @@ private void RectangleTile_MouseDown(object sender, MouseButtonEventArgs e)
Point gridMouseCoordinates = GetGridMouseCoordinates(mousePos, room);
scaleOriginX = gridMouseCoordinates.X;
scaleOriginY = gridMouseCoordinates.Y;
clickedTile.SourceX = (uint)gridMouseCoordinates.X;
clickedTile.SourceY = (uint)gridMouseCoordinates.Y;
clickedTile.SourceX = (int)gridMouseCoordinates.X;
clickedTile.SourceY = (int)gridMouseCoordinates.Y;
clickedTile.Width = (uint)room.GridWidth;
clickedTile.Height = (uint)room.GridHeight;
}
Expand All @@ -818,19 +818,19 @@ private void RectangleTile_MouseMove(object sender, MouseEventArgs e)
clickedTile.Height = (uint)Math.Clamp(Math.Abs(differenceY), 0, clickedTile.Tpag.BoundingHeight) + (uint)room.GridHeight;

if (differenceX < 0)
clickedTile.SourceX = (uint)gridMouseCoordinates.X;
clickedTile.SourceX = (int)gridMouseCoordinates.X;
else
clickedTile.SourceX = (uint)scaleOriginX;
clickedTile.SourceX = (int)scaleOriginX;

if (differenceY < 0)
clickedTile.SourceY = (uint)gridMouseCoordinates.Y;
clickedTile.SourceY = (int)gridMouseCoordinates.Y;
else
clickedTile.SourceY = (uint)scaleOriginY;
clickedTile.SourceY = (int)scaleOriginY;
}
else
{
clickedTile.SourceX = (uint)gridMouseCoordinates.X;
clickedTile.SourceY = (uint)gridMouseCoordinates.Y;
clickedTile.SourceX = (int)gridMouseCoordinates.X;
clickedTile.SourceY = (int)gridMouseCoordinates.Y;
}
}

Expand Down Expand Up @@ -1723,7 +1723,7 @@ public static void GenerateSpriteCache(UndertaleRoom room)
UndertaleCachedImageLoader loader = new();

List<Tile> tiles = null;
List<Tuple<UndertaleTexturePageItem, List<Tuple<uint, uint, uint, uint>>>> tileTextures = null;
List<Tuple<UndertaleTexturePageItem, List<Tuple<int, int, uint, uint>>>> tileTextures = null;
List<object> allObjects = new();
if (room.Flags.HasFlag(RoomEntryFlags.IsGMS2))
{
Expand Down Expand Up @@ -1767,9 +1767,9 @@ public static void GenerateSpriteCache(UndertaleRoom room)
.Where(x => x.Key != "0")
.Select(x =>
{
return new Tuple<UndertaleTexturePageItem, List<Tuple<uint, uint, uint, uint>>>(
return new Tuple<UndertaleTexturePageItem, List<Tuple<int, int, uint, uint>>>(
x.First().Tpag,
x.Select(tile => new Tuple<uint, uint, uint, uint>(tile.SourceX, tile.SourceY, tile.Width, tile.Height))
x.Select(tile => new Tuple<int, int, uint, uint>(tile.SourceX, tile.SourceY, tile.Width, tile.Height))
.Distinct()
.ToList());
})
Expand Down