From 21385e9b2d88f2a68fad67a71ba2ce1448940fdf Mon Sep 17 00:00:00 2001 From: Karma Riuk Date: Wed, 9 Aug 2023 19:51:23 +0200 Subject: [PATCH] implemented image reader --- go.mod | 1 + go.sum | 33 ++++++++++++ io/reader/image.go | 73 ++++++++++++++++++++++++-- io/reader/image_test.go | 112 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 215 insertions(+), 4 deletions(-) create mode 100644 io/reader/image_test.go diff --git a/go.mod b/go.mod index b060f9c..100cb06 100644 --- a/go.mod +++ b/go.mod @@ -10,4 +10,5 @@ require ( require ( github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/mazznoer/csscolorparser v0.1.2 // indirect + golang.org/x/image v0.11.0 ) diff --git a/go.sum b/go.sum index 247b345..fa99ae0 100644 --- a/go.sum +++ b/go.sum @@ -4,5 +4,38 @@ github.com/mazznoer/colorgrad v0.9.1 h1:MB80JYVndKWSMEM1beNqnuOowWGhoQc3DXWXkFp6 github.com/mazznoer/colorgrad v0.9.1/go.mod h1:WX2R9wt9B47+txJZVVpM9LY+LAGIdi4lTI5wIyreDH4= github.com/mazznoer/csscolorparser v0.1.2 h1:/UBHuQg792ePmGFzTQAC9u+XbFr7/HzP/Gj70Phyz2A= github.com/mazznoer/csscolorparser v0.1.2/go.mod h1:Aj22+L/rYN/Y6bj3bYqO3N6g1dtdHtGfQ32xZ5PJQic= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b h1:r+vk0EmXNmekl0S0BascoeeoHk/L7wmaW2QF90K+kYI= golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/image v0.11.0 h1:ds2RoQvBvYTiJkwpSFDwCcDFNX7DqjL2WsUgTNk0Ooo= +golang.org/x/image v0.11.0/go.mod h1:bglhjqbqVuEb9e9+eNR45Jfu7D+T4Qan+NhQk8Ck2P8= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/io/reader/image.go b/io/reader/image.go index f790a40..d02e879 100644 --- a/io/reader/image.go +++ b/io/reader/image.go @@ -1,9 +1,74 @@ package reader -import "maze-solver/maze" +import ( + "image" + "image/color" + "image/png" + "os" -type ImageReader struct{} + "golang.org/x/image/draw" +) -func (r *ImageReader) Read(filename string) (*maze.Maze, error) { - return nil, nil +type ImageReader struct { + Filename string + PathColor, WallColor color.Color + CellWidth, CellHeight int +} + +func (r *ImageReader) Read() (*RawMaze, error) { + image, err := r.getShrunkImage() + if err != nil { + return nil, err + } + + width, height := image.Bounds().Max.X, image.Bounds().Max.Y + ret := &RawMaze{ + Width: width, + Height: height, + Data: make([][]byte, height), + } + + n_chunks := width/CHUNK_SIZE + 1 + + for i := 0; i < height; i++ { + ret.Data[i] = make([]byte, n_chunks) + } + + for y := 0; y < height; y++ { + for i := 0; i < n_chunks; i++ { + var chunk byte = 0 // all walls + + end_index := min((i+1)*CHUNK_SIZE, width) + + for x := i * CHUNK_SIZE; x < end_index; x++ { + c := image.At(x, y) + if c == r.PathColor { + chunk |= 1 << (CHUNK_SIZE - 1 - (x - i*CHUNK_SIZE)) + } + } + + ret.Data[y][i] = chunk + } + } + + return ret, nil +} + +func (r *ImageReader) getShrunkImage() (*image.RGBA, error) { + input, err := os.Open(r.Filename) + if err != nil { + return nil, err + } + defer input.Close() + + // Decode the image (from PNG to image.Image): + src, _ := png.Decode(input) + + // Set the expected size that you want: + dst := image.NewRGBA(image.Rect(0, 0, src.Bounds().Max.X/r.CellWidth, src.Bounds().Max.Y/r.CellHeight)) + + // Resize: + draw.NearestNeighbor.Scale(dst, dst.Rect, src, src.Bounds(), draw.Over, nil) + + return dst, nil } diff --git a/io/reader/image_test.go b/io/reader/image_test.go new file mode 100644 index 0000000..9dbc24a --- /dev/null +++ b/io/reader/image_test.go @@ -0,0 +1,112 @@ +package reader + +import ( + "image/color" + "maze-solver/utils" + "testing" +) + +func TestImageReader(t *testing.T) { + white := color.RGBA{255, 255, 255, 255} + black := color.RGBA{0, 0, 0, 255} + tests := []struct { + name string + width, height int + cellWidth, cellHeight int + pathColor, wallColor color.Color + filename string + expected [][]byte + }{ + { + "Trivial", + 5, 3, + 40, 40, + white, black, + "../../assets/trivial.png", + [][]byte{ + {0b_00100_000}, + {0b_01110_000}, + {0b_00010_000}, + }, + }, + { + "Trivial Bigger", + 7, 5, + 40, 40, + white, black, + "../../assets/bigger.png", + [][]byte{ + {0b_0001000_0}, + {0b_0001000_0}, + {0b_0111110_0}, + {0b_0000010_0}, + {0b_0000010_0}, + }, + }, + { + "Bigger Staggered", + 7, 5, + 40, 40, + + white, black, + "../../assets/bigger_staggered.png", + [][]byte{ + {0b_0001000_0}, + {0b_0001000_0}, + {0b_0111110_0}, + {0b_0000100_0}, + {0b_0000100_0}, + }, + }, + { + "Normal", + 11, 11, + 40, 40, + white, black, + "../../assets/normal.png", + [][]byte{ + {0b_00000100, 0b000_00000}, + {0b_01111101, 0b110_00000}, + {0b_00000100, 0b010_00000}, + {0b_01110111, 0b110_00000}, + {0b_01010000, 0b010_00000}, + {0b_01011111, 0b110_00000}, + {0b_00010001, 0b010_00000}, + {0b_01110111, 0b010_00000}, + {0b_01000000, 0b010_00000}, + {0b_01111101, 0b110_00000}, + {0b_00000100, 0b000_00000}, + }, + }, + } + + for _, test := range tests { + reader := ImageReader{ + Filename: test.filename, + PathColor: test.pathColor, + WallColor: test.wallColor, + CellWidth: test.cellWidth, + CellHeight: test.cellHeight, + } + got, err := reader.Read() + if err != nil { + t.Fatalf("%s: got error while reading, got\n%v", test.filename, err) + } + + utils.AssertEqual(t, got.Width, test.width, "%s: width of raw maze don't match", test.name) + utils.AssertEqual(t, got.Height, test.height, "%s: height of raw maze don't match", test.name) + utils.AssertEqual(t, len(got.Data), len(test.expected), "%s: don't have the same number of rows", test.name) + + for y, line_exp := range test.expected { + line_got := got.Data[y] + utils.AssertEqual(t, len(line_got), len(line_exp), "%s (line %v): don't have same number of chunks", test.name, y) + + for i, chunk_exp := range line_exp { + chunk_got := line_got[i] + if chunk_got != chunk_exp { + t.Fatalf("%s (line %v): chunk %v don't coincide, %08b, want %08b", test.name, y, i, chunk_got, chunk_exp) + } + } + } + } +}