From 833a6276be95ee1f7de115ffc89d3d92d11aa30e Mon Sep 17 00:00:00 2001 From: Alexey 'Cluster' Avdyukhin Date: Mon, 31 Oct 2022 11:12:24 +0400 Subject: Tests fix. --- Benchmarks/Program.cs | 4 ++-- Tests/Program.cs | 4 ++-- Tests/References/sprites2_pattern_0.bin | Bin 224 -> 256 bytes Tests/References/sprites2_sprites.csv | 24 ++++++++---------------- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/Benchmarks/Program.cs b/Benchmarks/Program.cs index 7e0b666..ff6a079 100644 --- a/Benchmarks/Program.cs +++ b/Benchmarks/Program.cs @@ -184,7 +184,7 @@ namespace com.clusterrr.Famicom.NesTiler.Benchmarks public void Sprites8x16() { var imagePath = Path.Combine(ImagesPath, "sprites2.png"); - DoBenchmarkSprites8x8(imagePath); + DoBenchmarkSprites8x16(imagePath); } private string PatternTablePath(string prefix, int number) => $"{prefix}_pattern_{number}.bin"; @@ -345,7 +345,7 @@ namespace com.clusterrr.Famicom.NesTiler.Benchmarks { var prefix = Path.GetFileNameWithoutExtension(imagePath); var args = new string[] { - "--mode", "sprites8x8", "--enable-palettes", "0", + "--mode", "sprites8x16", "--enable-palettes", "0", "--in-0", imagePath, "--out-pattern-table-0", PatternTablePath(prefix, 0), "--out-palette-0", PalettePath(prefix, 0), diff --git a/Tests/Program.cs b/Tests/Program.cs index 0eb3d53..de69144 100644 --- a/Tests/Program.cs +++ b/Tests/Program.cs @@ -167,7 +167,7 @@ namespace com.clusterrr.Famicom.NesTiler.Tests public void Sprites8x16() { var imagePath = Path.Combine(ImagesPath, "sprites2.png"); - DoTestSprites8x8(imagePath); + DoTestSprites8x16(imagePath); } private string PatternTablePath(string prefix, int number) => $"{prefix}_pattern_{number}.bin"; @@ -420,7 +420,7 @@ namespace com.clusterrr.Famicom.NesTiler.Tests { var prefix = Path.GetFileNameWithoutExtension(imagePath); var args = new string[] { - "--mode", "sprites8x8", + "--mode", "sprites8x16", "--enable-palettes", "0", "--in-0", imagePath, "--out-pattern-table-0", PatternTablePath(prefix, 0), diff --git a/Tests/References/sprites2_pattern_0.bin b/Tests/References/sprites2_pattern_0.bin index 50c6b50..30dac2d 100644 Binary files a/Tests/References/sprites2_pattern_0.bin and b/Tests/References/sprites2_pattern_0.bin differ diff --git a/Tests/References/sprites2_sprites.csv b/Tests/References/sprites2_sprites.csv index b50c23c..9bdf7b7 100644 --- a/Tests/References/sprites2_sprites.csv +++ b/Tests/References/sprites2_sprites.csv @@ -1,17 +1,9 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,palette_id -0,Images\sprites2.png,0,0,0,0,8,8,0,0 -0,Images\sprites2.png,0,1,8,0,8,8,2,0 -0,Images\sprites2.png,0,2,16,0,8,8,4,0 -0,Images\sprites2.png,0,3,24,0,8,8,6,0 -0,Images\sprites2.png,0,4,32,0,8,8,0,0 -0,Images\sprites2.png,0,5,40,0,8,8,2,0 -0,Images\sprites2.png,0,6,48,0,8,8,8,0 -0,Images\sprites2.png,0,7,56,0,8,8,10,0 -0,Images\sprites2.png,1,0,0,8,8,8,12,0 -0,Images\sprites2.png,1,1,8,8,8,8,14,0 -0,Images\sprites2.png,1,2,16,8,8,8,16,0 -0,Images\sprites2.png,1,3,24,8,8,8,18,0 -0,Images\sprites2.png,1,4,32,8,8,8,20,0 -0,Images\sprites2.png,1,5,40,8,8,8,22,0 -0,Images\sprites2.png,1,6,48,8,8,8,24,0 -0,Images\sprites2.png,1,7,56,8,8,8,26,0 +0,Images\sprites2.png,0,0,0,0,8,16,0,0 +0,Images\sprites2.png,0,1,8,0,8,16,2,0 +0,Images\sprites2.png,0,2,16,0,8,16,4,0 +0,Images\sprites2.png,0,3,24,0,8,16,6,0 +0,Images\sprites2.png,0,4,32,0,8,16,8,0 +0,Images\sprites2.png,0,5,40,0,8,16,10,0 +0,Images\sprites2.png,0,6,48,0,8,16,12,0 +0,Images\sprites2.png,0,7,56,0,8,16,14,0 -- cgit v1.2.3