commit ef701f96

Poul Sander · 2022-04-30 09:00
ef701f965dffc53de360ac86cecbde35157863f6 patch · browse files
parent c9d63b0454314f06e0493dd969968d5649ba9958

Add a collection

Changed files

A	data/collections/fairy_tales/Cinderella (1918).jpg
A	data/collections/fairy_tales/Little Red Riding Hood (1919).jpg
A	data/collections/fairy_tales/Puss In Boots (1921).jpg
A	data/collections/fairy_tales/README.md
A	data/collections/fairy_tales/Snow White And The Seven Dwarfs (1920).jpg
A	data/collections/fairy_tales/The Three Bears (1918).jpg
A	data/collections/fairy_tales/The Three Little Pigs (1920).jpg
M	src/PuzzleSingleImageState.hpp before

diff --git a/data/collections/fairy_tales/Cinderella (1918).jpg b/data/collections/fairy_tales/Cinderella (1918).jpg new file mode 100644 index 0000000..790c1f7

Binary files /dev/null and b/data/collections/fairy_tales/Cinderella (1918).jpg differ

diff --git a/data/collections/fairy_tales/Little Red Riding Hood (1919).jpg b/data/collections/fairy_tales/Little Red Riding Hood (1919).jpg new file mode 100644 index 0000000..a5627f5

Binary files /dev/null and b/data/collections/fairy_tales/Little Red Riding Hood (1919).jpg differ

diff --git a/data/collections/fairy_tales/Puss In Boots (1921).jpg b/data/collections/fairy_tales/Puss In Boots (1921).jpg new file mode 100644 index 0000000..0a112e4

Binary files /dev/null and b/data/collections/fairy_tales/Puss In Boots (1921).jpg differ

diff --git a/data/collections/fairy_tales/README.md b/data/collections/fairy_tales/README.md new file mode 100644 index 0000000..7f5c687 --- /dev/null +++ b/data/collections/fairy_tales/README.md

@@ -0,0 +1,11 @@

+Sample collection for sago_multi_scrambler_puzzle

+'Cinderella (1918).jpg' from https://artvee.com/dl/cinderella#00

+'Little Red Riding Hood (1919).jpg' from https://artvee.com/dl/little-red-riding-hood-2

+'Puss In Boots (1921).jpg' from https://artvee.com/dl/puss-in-boots/#00

+'Snow White And The Seven Dwarfs (1920).jpg' from https://artvee.com/dl/snow-white-and-the-seven-dwarfs#00

+'The Three Bears (1918).jpg' from https://artvee.com/dl/the-three-bears#00

+'The Three Little Pigs (1920).jpg' from https://artvee.com/dl/the-three-little-pigs#00

+Auther: Elizabeth Tyler Wolcott (American, 1892-1952)

diff --git a/data/collections/fairy_tales/Snow White And The Seven Dwarfs (1920).jpg b/data/collections/fairy_tales/Snow White And The Seven Dwarfs (1920).jpg new file mode 100644 index 0000000..0833df2

Binary files /dev/null and b/data/collections/fairy_tales/Snow White And The Seven Dwarfs (1920).jpg differ

diff --git a/data/collections/fairy_tales/The Three Bears (1918).jpg b/data/collections/fairy_tales/The Three Bears (1918).jpg new file mode 100644 index 0000000..303b263

Binary files /dev/null and b/data/collections/fairy_tales/The Three Bears (1918).jpg differ

diff --git a/data/collections/fairy_tales/The Three Little Pigs (1920).jpg b/data/collections/fairy_tales/The Three Little Pigs (1920).jpg new file mode 100644 index 0000000..e034f09

Binary files /dev/null and b/data/collections/fairy_tales/The Three Little Pigs (1920).jpg differ

diff --git a/src/PuzzleSingleImageState.hpp b/src/PuzzleSingleImageState.hpp index e849653..82a8713 100644 --- a/src/PuzzleSingleImageState.hpp +++ b/src/PuzzleSingleImageState.hpp

@@ -55,7 +55,7 @@ private:

const int resized_image_height = 700;

int resized_image_width = 1;

std::vector<SDL_Rect> pieces;

- int min_piece_size = 140;

+ int min_piece_size = 120;

bool shuffeled = false;

std::vector<size_t> shuffeled_pieces;

int marked_piece = -1;