diff --git a/app/src/main/assets/dummy.png b/app/src/main/assets/dummy.png index 3745c63..eb5f4c9 100644 Binary files a/app/src/main/assets/dummy.png and b/app/src/main/assets/dummy.png differ diff --git a/app/src/main/assets/shaders/texture.frag b/app/src/main/assets/shaders/texture.frag index 279a508..7fb8a9a 100644 --- a/app/src/main/assets/shaders/texture.frag +++ b/app/src/main/assets/shaders/texture.frag @@ -16,8 +16,8 @@ layout (location = 0) out vec4 outFragColor; void main() { - vec2 pos = vec2(pushConstants.ux/2048.f, pushConstants.uy/2048.f); - vec2 uv = pos + vec2(inUV.x/8.f, inUV.y/8.f); + vec2 pos = vec2(pushConstants.ux/4096.f, pushConstants.uy/2048.f); + vec2 uv = pos + vec2(inUV.x/8.f, inUV.y/4.f); vec4 color = texture(samplerColor, uv); outFragColor = color; diff --git a/app/src/main/assets/shaders/texture.frag.spv b/app/src/main/assets/shaders/texture.frag.spv index c048ea3..c9188ac 100644 Binary files a/app/src/main/assets/shaders/texture.frag.spv and b/app/src/main/assets/shaders/texture.frag.spv differ diff --git a/example/src/main/assets/pic/11ex.png b/example/src/main/assets/pic/11ex.png index c0af166..b39ce4a 100644 Binary files a/example/src/main/assets/pic/11ex.png and b/example/src/main/assets/pic/11ex.png differ diff --git a/example/src/main/assets/pic/12ex.png b/example/src/main/assets/pic/12ex.png index 5f47799..b86d959 100644 Binary files a/example/src/main/assets/pic/12ex.png and b/example/src/main/assets/pic/12ex.png differ diff --git a/example/src/main/assets/pic/13ex.png b/example/src/main/assets/pic/13ex.png index 6916c9d..1332aac 100644 Binary files a/example/src/main/assets/pic/13ex.png and b/example/src/main/assets/pic/13ex.png differ diff --git a/example/src/main/assets/pic/14/000007.png b/example/src/main/assets/pic/14/000007.png deleted file mode 100644 index 85c4e55..0000000 Binary files a/example/src/main/assets/pic/14/000007.png and /dev/null differ diff --git a/example/src/main/assets/pic/14/000015.png b/example/src/main/assets/pic/14/000015.png deleted file mode 100644 index c2f417d..0000000 Binary files a/example/src/main/assets/pic/14/000015.png and /dev/null differ diff --git a/example/src/main/assets/pic/14/000019.png b/example/src/main/assets/pic/14/000019.png deleted file mode 100644 index e6939bd..0000000 Binary files a/example/src/main/assets/pic/14/000019.png and /dev/null differ diff --git a/example/src/main/assets/pic/14/000026.png b/example/src/main/assets/pic/14/000026.png deleted file mode 100644 index 36db1b2..0000000 Binary files a/example/src/main/assets/pic/14/000026.png and /dev/null differ diff --git a/example/src/main/assets/pic/14/000028.png b/example/src/main/assets/pic/14/000028.png deleted file mode 100644 index 9abcd31..0000000 Binary files a/example/src/main/assets/pic/14/000028.png and /dev/null differ diff --git a/example/src/main/assets/pic/14/000031.png b/example/src/main/assets/pic/14/000031.png deleted file mode 100644 index e217028..0000000 Binary files a/example/src/main/assets/pic/14/000031.png and /dev/null differ diff --git a/example/src/main/assets/pic/14ex.png b/example/src/main/assets/pic/14ex.png index be311be..d84aa8e 100644 Binary files a/example/src/main/assets/pic/14ex.png and b/example/src/main/assets/pic/14ex.png differ diff --git a/example/src/main/assets/pic/1ex.png b/example/src/main/assets/pic/1ex.png index 5e37243..edb6fb5 100644 Binary files a/example/src/main/assets/pic/1ex.png and b/example/src/main/assets/pic/1ex.png differ diff --git a/example/src/main/assets/pic/21/000008.png b/example/src/main/assets/pic/21/000008.png deleted file mode 100644 index 25a67a3..0000000 Binary files a/example/src/main/assets/pic/21/000008.png and /dev/null differ diff --git a/example/src/main/assets/pic/21/000019.png b/example/src/main/assets/pic/21/000019.png deleted file mode 100644 index eb34f23..0000000 Binary files a/example/src/main/assets/pic/21/000019.png and /dev/null differ diff --git a/example/src/main/assets/pic/21/000022.png b/example/src/main/assets/pic/21/000022.png deleted file mode 100644 index d9a02b7..0000000 Binary files a/example/src/main/assets/pic/21/000022.png and /dev/null differ diff --git a/example/src/main/assets/pic/21/000027.png b/example/src/main/assets/pic/21/000027.png deleted file mode 100644 index 535e069..0000000 Binary files a/example/src/main/assets/pic/21/000027.png and /dev/null differ diff --git a/example/src/main/assets/pic/21/000031.png b/example/src/main/assets/pic/21/000031.png deleted file mode 100644 index 126896d..0000000 Binary files a/example/src/main/assets/pic/21/000031.png and /dev/null differ diff --git a/example/src/main/assets/pic/21/000034.png b/example/src/main/assets/pic/21/000034.png deleted file mode 100644 index 60c876a..0000000 Binary files a/example/src/main/assets/pic/21/000034.png and /dev/null differ diff --git a/example/src/main/assets/pic/21ex.png b/example/src/main/assets/pic/21ex.png index 0e7cfa4..509b93a 100644 Binary files a/example/src/main/assets/pic/21ex.png and b/example/src/main/assets/pic/21ex.png differ diff --git a/example/src/main/assets/pic/2ex.png b/example/src/main/assets/pic/2ex.png index 5e37243..edb6fb5 100644 Binary files a/example/src/main/assets/pic/2ex.png and b/example/src/main/assets/pic/2ex.png differ diff --git a/example/src/main/assets/pic/3ex.png b/example/src/main/assets/pic/3ex.png index 5e37243..edb6fb5 100644 Binary files a/example/src/main/assets/pic/3ex.png and b/example/src/main/assets/pic/3ex.png differ diff --git a/example/src/main/assets/pic/4ex.png b/example/src/main/assets/pic/4ex.png index 536e0a2..9e4a3d1 100644 Binary files a/example/src/main/assets/pic/4ex.png and b/example/src/main/assets/pic/4ex.png differ diff --git a/example/src/main/assets/pic/54ex.png b/example/src/main/assets/pic/54ex.png index 5e37243..edb6fb5 100644 Binary files a/example/src/main/assets/pic/54ex.png and b/example/src/main/assets/pic/54ex.png differ diff --git a/example/src/main/assets/pic/55ex.png b/example/src/main/assets/pic/55ex.png index 5e37243..edb6fb5 100644 Binary files a/example/src/main/assets/pic/55ex.png and b/example/src/main/assets/pic/55ex.png differ diff --git a/example/src/main/assets/pic/56/000008.png b/example/src/main/assets/pic/56/000008.png deleted file mode 100644 index 90bfae8..0000000 Binary files a/example/src/main/assets/pic/56/000008.png and /dev/null differ diff --git a/example/src/main/assets/pic/56/000010.png b/example/src/main/assets/pic/56/000010.png deleted file mode 100644 index 4445e76..0000000 Binary files a/example/src/main/assets/pic/56/000010.png and /dev/null differ diff --git a/example/src/main/assets/pic/56/000013.png b/example/src/main/assets/pic/56/000013.png deleted file mode 100644 index 5451354..0000000 Binary files a/example/src/main/assets/pic/56/000013.png and /dev/null differ diff --git a/example/src/main/assets/pic/56/000021.png b/example/src/main/assets/pic/56/000021.png deleted file mode 100644 index 85fd249..0000000 Binary files a/example/src/main/assets/pic/56/000021.png and /dev/null differ diff --git a/example/src/main/assets/pic/56/000026.png b/example/src/main/assets/pic/56/000026.png deleted file mode 100644 index 9f2eeea..0000000 Binary files a/example/src/main/assets/pic/56/000026.png and /dev/null differ diff --git a/example/src/main/assets/pic/56/000028.png b/example/src/main/assets/pic/56/000028.png deleted file mode 100644 index 6cd5a05..0000000 Binary files a/example/src/main/assets/pic/56/000028.png and /dev/null differ diff --git a/example/src/main/assets/pic/56/000031.png b/example/src/main/assets/pic/56/000031.png deleted file mode 100644 index 42f8017..0000000 Binary files a/example/src/main/assets/pic/56/000031.png and /dev/null differ diff --git a/example/src/main/assets/pic/56ex.png b/example/src/main/assets/pic/56ex.png index 030dd0e..66aeba0 100644 Binary files a/example/src/main/assets/pic/56ex.png and b/example/src/main/assets/pic/56ex.png differ diff --git a/example/src/main/assets/pic/59ex.png b/example/src/main/assets/pic/59ex.png index 70140b3..1d3bb35 100644 Binary files a/example/src/main/assets/pic/59ex.png and b/example/src/main/assets/pic/59ex.png differ diff --git a/example/src/main/assets/pic/5ex.png b/example/src/main/assets/pic/5ex.png index 6c4811f..4b48dd0 100644 Binary files a/example/src/main/assets/pic/5ex.png and b/example/src/main/assets/pic/5ex.png differ diff --git a/example/src/main/assets/pic/6/000001.png b/example/src/main/assets/pic/6/000001.png deleted file mode 100644 index 58adf36..0000000 Binary files a/example/src/main/assets/pic/6/000001.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000003.png b/example/src/main/assets/pic/6/000003.png deleted file mode 100644 index 44fd666..0000000 Binary files a/example/src/main/assets/pic/6/000003.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000005.png b/example/src/main/assets/pic/6/000005.png deleted file mode 100644 index 139b289..0000000 Binary files a/example/src/main/assets/pic/6/000005.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000007.png b/example/src/main/assets/pic/6/000007.png deleted file mode 100644 index a2dd8a3..0000000 Binary files a/example/src/main/assets/pic/6/000007.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000009.png b/example/src/main/assets/pic/6/000009.png deleted file mode 100644 index 76431c6..0000000 Binary files a/example/src/main/assets/pic/6/000009.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000011.png b/example/src/main/assets/pic/6/000011.png deleted file mode 100644 index 447e08b..0000000 Binary files a/example/src/main/assets/pic/6/000011.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000013.png b/example/src/main/assets/pic/6/000013.png deleted file mode 100644 index c08f21e..0000000 Binary files a/example/src/main/assets/pic/6/000013.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000015.png b/example/src/main/assets/pic/6/000015.png deleted file mode 100644 index 67ec8a4..0000000 Binary files a/example/src/main/assets/pic/6/000015.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000017.png b/example/src/main/assets/pic/6/000017.png deleted file mode 100644 index b84cfc6..0000000 Binary files a/example/src/main/assets/pic/6/000017.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000019.png b/example/src/main/assets/pic/6/000019.png deleted file mode 100644 index b05ddc4..0000000 Binary files a/example/src/main/assets/pic/6/000019.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000021.png b/example/src/main/assets/pic/6/000021.png deleted file mode 100644 index 20df539..0000000 Binary files a/example/src/main/assets/pic/6/000021.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000023.png b/example/src/main/assets/pic/6/000023.png deleted file mode 100644 index 30eb5ae..0000000 Binary files a/example/src/main/assets/pic/6/000023.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000025.png b/example/src/main/assets/pic/6/000025.png deleted file mode 100644 index 049d4b2..0000000 Binary files a/example/src/main/assets/pic/6/000025.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000027.png b/example/src/main/assets/pic/6/000027.png deleted file mode 100644 index c08f21e..0000000 Binary files a/example/src/main/assets/pic/6/000027.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000029.png b/example/src/main/assets/pic/6/000029.png deleted file mode 100644 index fc102f6..0000000 Binary files a/example/src/main/assets/pic/6/000029.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000031.png b/example/src/main/assets/pic/6/000031.png deleted file mode 100644 index 759dd35..0000000 Binary files a/example/src/main/assets/pic/6/000031.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000033.png b/example/src/main/assets/pic/6/000033.png deleted file mode 100644 index 03ba95d..0000000 Binary files a/example/src/main/assets/pic/6/000033.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000035.png b/example/src/main/assets/pic/6/000035.png deleted file mode 100644 index 6c7c72c..0000000 Binary files a/example/src/main/assets/pic/6/000035.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000037.png b/example/src/main/assets/pic/6/000037.png deleted file mode 100644 index b8c6622..0000000 Binary files a/example/src/main/assets/pic/6/000037.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000039.png b/example/src/main/assets/pic/6/000039.png deleted file mode 100644 index 79e3780..0000000 Binary files a/example/src/main/assets/pic/6/000039.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000041.png b/example/src/main/assets/pic/6/000041.png deleted file mode 100644 index c08f21e..0000000 Binary files a/example/src/main/assets/pic/6/000041.png and /dev/null differ diff --git a/example/src/main/assets/pic/62ex.png b/example/src/main/assets/pic/62ex.png index 58547ca..efa1124 100644 Binary files a/example/src/main/assets/pic/62ex.png and b/example/src/main/assets/pic/62ex.png differ diff --git a/example/src/main/assets/pic/65/000008.png b/example/src/main/assets/pic/65/000008.png deleted file mode 100644 index e292b9e..0000000 Binary files a/example/src/main/assets/pic/65/000008.png and /dev/null differ diff --git a/example/src/main/assets/pic/65/000010.png b/example/src/main/assets/pic/65/000010.png deleted file mode 100644 index 86c7676..0000000 Binary files a/example/src/main/assets/pic/65/000010.png and /dev/null differ diff --git a/example/src/main/assets/pic/65/000013.png b/example/src/main/assets/pic/65/000013.png deleted file mode 100644 index 2c25e6a..0000000 Binary files a/example/src/main/assets/pic/65/000013.png and /dev/null differ diff --git a/example/src/main/assets/pic/65/000020.png b/example/src/main/assets/pic/65/000020.png deleted file mode 100644 index 8226bd3..0000000 Binary files a/example/src/main/assets/pic/65/000020.png and /dev/null differ diff --git a/example/src/main/assets/pic/65/000028.png b/example/src/main/assets/pic/65/000028.png deleted file mode 100644 index 84da3a6..0000000 Binary files a/example/src/main/assets/pic/65/000028.png and /dev/null differ diff --git a/example/src/main/assets/pic/65/000031.png b/example/src/main/assets/pic/65/000031.png deleted file mode 100644 index 381fe82..0000000 Binary files a/example/src/main/assets/pic/65/000031.png and /dev/null differ diff --git a/example/src/main/assets/pic/65ex.png b/example/src/main/assets/pic/65ex.png index c053200..453568b 100644 Binary files a/example/src/main/assets/pic/65ex.png and b/example/src/main/assets/pic/65ex.png differ diff --git a/example/src/main/assets/pic/68ex.png b/example/src/main/assets/pic/68ex.png index 6951ff2..3d53730 100644 Binary files a/example/src/main/assets/pic/68ex.png and b/example/src/main/assets/pic/68ex.png differ diff --git a/example/src/main/assets/pic/69ex.png b/example/src/main/assets/pic/69ex.png index 5e37243..edb6fb5 100644 Binary files a/example/src/main/assets/pic/69ex.png and b/example/src/main/assets/pic/69ex.png differ diff --git a/example/src/main/assets/pic/6ex.png b/example/src/main/assets/pic/6ex.png index ce0bdd2..261b49c 100644 Binary files a/example/src/main/assets/pic/6ex.png and b/example/src/main/assets/pic/6ex.png differ diff --git a/example/src/main/assets/pic/7/000001.png b/example/src/main/assets/pic/7/000001.png deleted file mode 100644 index 3f5f4f9..0000000 Binary files a/example/src/main/assets/pic/7/000001.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000003.png b/example/src/main/assets/pic/7/000003.png deleted file mode 100644 index e32cea1..0000000 Binary files a/example/src/main/assets/pic/7/000003.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000005.png b/example/src/main/assets/pic/7/000005.png deleted file mode 100644 index 299144d..0000000 Binary files a/example/src/main/assets/pic/7/000005.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000007.png b/example/src/main/assets/pic/7/000007.png deleted file mode 100644 index 0206539..0000000 Binary files a/example/src/main/assets/pic/7/000007.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000009.png b/example/src/main/assets/pic/7/000009.png deleted file mode 100644 index 9de5f00..0000000 Binary files a/example/src/main/assets/pic/7/000009.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000011.png b/example/src/main/assets/pic/7/000011.png deleted file mode 100644 index 838c033..0000000 Binary files a/example/src/main/assets/pic/7/000011.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000013.png b/example/src/main/assets/pic/7/000013.png deleted file mode 100644 index 5960d85..0000000 Binary files a/example/src/main/assets/pic/7/000013.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000015.png b/example/src/main/assets/pic/7/000015.png deleted file mode 100644 index 4d73872..0000000 Binary files a/example/src/main/assets/pic/7/000015.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000017.png b/example/src/main/assets/pic/7/000017.png deleted file mode 100644 index 980d610..0000000 Binary files a/example/src/main/assets/pic/7/000017.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000019.png b/example/src/main/assets/pic/7/000019.png deleted file mode 100644 index 5ee30cf..0000000 Binary files a/example/src/main/assets/pic/7/000019.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000021.png b/example/src/main/assets/pic/7/000021.png deleted file mode 100644 index f8915bd..0000000 Binary files a/example/src/main/assets/pic/7/000021.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000023.png b/example/src/main/assets/pic/7/000023.png deleted file mode 100644 index eebbc71..0000000 Binary files a/example/src/main/assets/pic/7/000023.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000025.png b/example/src/main/assets/pic/7/000025.png deleted file mode 100644 index ed435cb..0000000 Binary files a/example/src/main/assets/pic/7/000025.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000027.png b/example/src/main/assets/pic/7/000027.png deleted file mode 100644 index 06d8b99..0000000 Binary files a/example/src/main/assets/pic/7/000027.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000029.png b/example/src/main/assets/pic/7/000029.png deleted file mode 100644 index 3367939..0000000 Binary files a/example/src/main/assets/pic/7/000029.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000031.png b/example/src/main/assets/pic/7/000031.png deleted file mode 100644 index f42c808..0000000 Binary files a/example/src/main/assets/pic/7/000031.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000033.png b/example/src/main/assets/pic/7/000033.png deleted file mode 100644 index 4489b61..0000000 Binary files a/example/src/main/assets/pic/7/000033.png and /dev/null differ diff --git a/example/src/main/assets/pic/70ex.png b/example/src/main/assets/pic/70ex.png index 5e37243..edb6fb5 100644 Binary files a/example/src/main/assets/pic/70ex.png and b/example/src/main/assets/pic/70ex.png differ diff --git a/example/src/main/assets/pic/71ex.png b/example/src/main/assets/pic/71ex.png index 738912f..e845f2f 100644 Binary files a/example/src/main/assets/pic/71ex.png and b/example/src/main/assets/pic/71ex.png differ diff --git a/example/src/main/assets/pic/76ex.png b/example/src/main/assets/pic/76ex.png index a31d15e..81b0e58 100644 Binary files a/example/src/main/assets/pic/76ex.png and b/example/src/main/assets/pic/76ex.png differ diff --git a/example/src/main/assets/pic/77ex.png b/example/src/main/assets/pic/77ex.png index a1e4ada..2d3c7ab 100644 Binary files a/example/src/main/assets/pic/77ex.png and b/example/src/main/assets/pic/77ex.png differ diff --git a/example/src/main/assets/pic/78/000008.png b/example/src/main/assets/pic/78/000008.png deleted file mode 100644 index 588313a..0000000 Binary files a/example/src/main/assets/pic/78/000008.png and /dev/null differ diff --git a/example/src/main/assets/pic/78/000013.png b/example/src/main/assets/pic/78/000013.png deleted file mode 100644 index f1c7e43..0000000 Binary files a/example/src/main/assets/pic/78/000013.png and /dev/null differ diff --git a/example/src/main/assets/pic/78/000015.png b/example/src/main/assets/pic/78/000015.png deleted file mode 100644 index 1ddbdcc..0000000 Binary files a/example/src/main/assets/pic/78/000015.png and /dev/null differ diff --git a/example/src/main/assets/pic/78/000020.png b/example/src/main/assets/pic/78/000020.png deleted file mode 100644 index 54416c7..0000000 Binary files a/example/src/main/assets/pic/78/000020.png and /dev/null differ diff --git a/example/src/main/assets/pic/78/000025.png b/example/src/main/assets/pic/78/000025.png deleted file mode 100644 index 6f24551..0000000 Binary files a/example/src/main/assets/pic/78/000025.png and /dev/null differ diff --git a/example/src/main/assets/pic/78/000028.png b/example/src/main/assets/pic/78/000028.png deleted file mode 100644 index afe5e25..0000000 Binary files a/example/src/main/assets/pic/78/000028.png and /dev/null differ diff --git a/example/src/main/assets/pic/78/000033.png b/example/src/main/assets/pic/78/000033.png deleted file mode 100644 index ff8f328..0000000 Binary files a/example/src/main/assets/pic/78/000033.png and /dev/null differ diff --git a/example/src/main/assets/pic/78ex.png b/example/src/main/assets/pic/78ex.png index 2f10bbd..2d0ca06 100644 Binary files a/example/src/main/assets/pic/78ex.png and b/example/src/main/assets/pic/78ex.png differ diff --git a/example/src/main/assets/pic/7ex.png b/example/src/main/assets/pic/7ex.png index a6c26e0..622a9c7 100644 Binary files a/example/src/main/assets/pic/7ex.png and b/example/src/main/assets/pic/7ex.png differ diff --git a/example/src/main/assets/pic/80ex.png b/example/src/main/assets/pic/80ex.png index 93b0bd8..b31b956 100644 Binary files a/example/src/main/assets/pic/80ex.png and b/example/src/main/assets/pic/80ex.png differ diff --git a/example/src/main/assets/pic/81ex.png b/example/src/main/assets/pic/81ex.png index 9f22535..86ec84a 100644 Binary files a/example/src/main/assets/pic/81ex.png and b/example/src/main/assets/pic/81ex.png differ diff --git a/example/src/main/assets/pic/motion_data.json b/example/src/main/assets/pic/motion_data.json index 2851195..6c910cb 100644 --- a/example/src/main/assets/pic/motion_data.json +++ b/example/src/main/assets/pic/motion_data.json @@ -1,616 +1,546 @@ -{ - "1": [ - "000000.png" - ], - "2": [ - "000000.png" - ], - "3": [ - "000000.png" - ], - "4": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png", - "000024.png", - "000025.png", - "000026.png", - "000027.png", - "000028.png", - "000029.png", - "000030.png", - "000031.png" - ], - "5": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png", - "000024.png", - "000025.png", - "000026.png", - "000027.png", - "000028.png", - "000029.png", - "000030.png", - "000031.png" - ], - "6": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png", - "000024.png", - "000025.png", - "000026.png", - "000027.png", - "000028.png", - "000029.png", - "000030.png", - "000031.png", - "000032.png", - "000033.png", - "000034.png", - "000035.png", - "000036.png", - "000037.png", - "000038.png", - "000039.png", - "000040.png", - "000041.png" - ], - "7": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png", - "000024.png", - "000025.png", - "000026.png", - "000027.png", - "000028.png", - "000029.png", - "000030.png", - "000031.png", - "000032.png", - "000033.png", - "000034.png", - "000035.png" - ], - "11": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png" - ], - "12": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png" - ], - "13": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png", - "000024.png", - "000025.png", - "000026.png", - "000027.png", - "000028.png", - "000029.png", - "000030.png", - "000031.png" - ], - "14": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png", - "000024.png", - "000025.png", - "000026.png", - "000027.png", - "000028.png", - "000029.png", - "000030.png", - "000031.png", - "000032.png", - "000033.png", - "000034.png", - "000035.png" - ], - "21": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png", - "000024.png", - "000025.png", - "000026.png", - "000027.png", - "000028.png", - "000029.png", - "000030.png", - "000031.png", - "000032.png", - "000033.png", - "000034.png", - "000035.png" - ], - "54": [ - "000000.png" - ], - "55": [ - "000000.png" - ], - "56": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png", - "000024.png", - "000025.png", - "000026.png", - "000027.png", - "000028.png", - "000029.png", - "000030.png", - "000031.png", - "000032.png", - "000033.png", - "000034.png", - "000035.png" - ], - "59": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png" - ], - "62": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png", - "000024.png", - "000025.png", - "000026.png", - "000027.png", - "000028.png", - "000029.png", - "000030.png", - "000031.png" - ], - "65": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png", - "000024.png", - "000025.png", - "000026.png", - "000027.png", - "000028.png", - "000029.png", - "000030.png", - "000031.png", - "000032.png", - "000033.png", - "000034.png", - "000035.png" - ], - "68": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png", - "000024.png", - "000025.png", - "000026.png", - "000027.png", - "000028.png", - "000029.png", - "000030.png", - "000031.png" - ], - "69": [ - "000000.png" - ], - "70": [ - "000000.png" - ], - "71": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png", - "000024.png", - "000025.png", - "000026.png", - "000027.png", - "000028.png", - "000029.png", - "000030.png", - "000031.png" - ], - "76": [ - "76.png" - ], - "77": [ - "77.png" - ], - "78": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png", - "000024.png", - "000025.png", - "000026.png", - "000027.png", - "000028.png", - "000029.png", - "000030.png", - "000031.png", - "000032.png", - "000033.png", - "000034.png", - "000035.png" - ], - "80": [ - "80.png" - ], - "81": [ - "000000.png", - "000001.png", - "000002.png", - "000003.png", - "000004.png", - "000005.png", - "000006.png", - "000007.png", - "000008.png", - "000009.png", - "000010.png", - "000011.png", - "000012.png", - "000013.png", - "000014.png", - "000015.png", - "000016.png", - "000017.png", - "000018.png", - "000019.png", - "000020.png", - "000021.png", - "000022.png", - "000023.png", - "000024.png", - "000025.png", - "000026.png", - "000027.png" - ] +{ + "1": [ + "000000.png" + ], + "2": [ + "000000.png" + ], + "3": [ + "000000.png" + ], + "4": [ + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png" + ], + "5": [ + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png" + ], + "6": [ + "000000.png", + "000002.png", + "000004.png", + "000006.png", + "000008.png", + "000010.png", + "000012.png", + "000014.png", + "000016.png", + "000018.png", + "000020.png", + "000022.png", + "000024.png", + "000026.png", + "000028.png", + "000030.png", + "000032.png", + "000034.png", + "000036.png", + "000038.png", + "000040.png" + ], + "7": [ + "000000.png", + "000002.png", + "000004.png", + "000006.png", + "000008.png", + "000010.png", + "000012.png", + "000014.png", + "000016.png", + "000018.png", + "000020.png", + "000022.png", + "000024.png", + "000026.png", + "000028.png", + "000030.png", + "000032.png", + "000034.png", + "000035.png" + ], + "11": [ + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png" + ], + "12": [ + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png" + ], + "13": [ + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png" + ], + "14": [ + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000016.png", + "000017.png", + "000018.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000027.png", + "000029.png", + "000030.png", + "000032.png", + "000033.png", + "000034.png", + "000035.png" + ], + "21": [ + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000020.png", + "000021.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000028.png", + "000029.png", + "000030.png", + "000032.png", + "000033.png", + "000035.png" + ], + "54": [ + "000000.png" + ], + "55": [ + "000000.png" + ], + "56": [ + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000009.png", + "000011.png", + "000012.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000027.png", + "000029.png", + "000030.png", + "000032.png", + "000033.png", + "000034.png", + "000035.png" + ], + "59": [ + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png" + ], + "62": [ + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png" + ], + "65": [ + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000009.png", + "000011.png", + "000012.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000029.png", + "000030.png", + "000032.png", + "000033.png", + "000034.png", + "000035.png" + ], + "68": [ + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png" + ], + "69": [ + "000000.png" + ], + "70": [ + "000000.png" + ], + "71": [ + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png" + ], + "76": [ + "76.png" + ], + "77": [ + "77.png" + ], + "78": [ + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000014.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000026.png", + "000027.png", + "000029.png", + "000030.png", + "000031.png", + "000032.png", + "000034.png", + "000035.png" + ], + "80": [ + "80.png" + ], + "81": [ + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png" + ] } \ No newline at end of file diff --git a/example/src/main/assets/pic/motion_data_ex.json b/example/src/main/assets/pic/motion_data_ex.json index 5a52f07..d511ceb 100644 --- a/example/src/main/assets/pic/motion_data_ex.json +++ b/example/src/main/assets/pic/motion_data_ex.json @@ -23,128 +23,128 @@ "y": 0 }, "000001.png": { - "x": 256, - "y": 0 - }, - "000002.png": { "x": 512, "y": 0 }, - "000003.png": { - "x": 768, - "y": 0 - }, - "000004.png": { + "000002.png": { "x": 1024, "y": 0 }, - "000005.png": { - "x": 1280, - "y": 0 - }, - "000006.png": { + "000003.png": { "x": 1536, "y": 0 }, + "000004.png": { + "x": 2048, + "y": 0 + }, + "000005.png": { + "x": 2560, + "y": 0 + }, + "000006.png": { + "x": 3072, + "y": 0 + }, "000007.png": { - "x": 1792, + "x": 3584, "y": 0 }, "000008.png": { "x": 0, - "y": 256 + "y": 512 }, "000009.png": { - "x": 256, - "y": 256 + "x": 512, + "y": 512 }, "000010.png": { - "x": 512, - "y": 256 + "x": 1024, + "y": 512 }, "000011.png": { - "x": 768, - "y": 256 + "x": 1536, + "y": 512 }, "000012.png": { - "x": 1024, - "y": 256 + "x": 2048, + "y": 512 }, "000013.png": { - "x": 1280, - "y": 256 + "x": 2560, + "y": 512 }, "000014.png": { - "x": 1536, - "y": 256 + "x": 3072, + "y": 512 }, "000015.png": { - "x": 1792, - "y": 256 + "x": 3584, + "y": 512 }, "000016.png": { "x": 0, - "y": 512 + "y": 1024 }, "000017.png": { - "x": 256, - "y": 512 + "x": 512, + "y": 1024 }, "000018.png": { - "x": 512, - "y": 512 + "x": 1024, + "y": 1024 }, "000019.png": { - "x": 768, - "y": 512 + "x": 1536, + "y": 1024 }, "000020.png": { - "x": 1024, - "y": 512 + "x": 2048, + "y": 1024 }, "000021.png": { - "x": 1280, - "y": 512 + "x": 2560, + "y": 1024 }, "000022.png": { - "x": 1536, - "y": 512 + "x": 3072, + "y": 1024 }, "000023.png": { - "x": 1792, - "y": 512 + "x": 3584, + "y": 1024 }, "000024.png": { "x": 0, - "y": 768 + "y": 1536 }, "000025.png": { - "x": 256, - "y": 768 + "x": 512, + "y": 1536 }, "000026.png": { - "x": 512, - "y": 768 + "x": 1024, + "y": 1536 }, "000027.png": { - "x": 768, - "y": 768 + "x": 1536, + "y": 1536 }, "000028.png": { - "x": 1024, - "y": 768 + "x": 2048, + "y": 1536 }, "000029.png": { - "x": 1280, - "y": 768 + "x": 2560, + "y": 1536 }, "000030.png": { - "x": 1536, - "y": 768 + "x": 3072, + "y": 1536 }, "000031.png": { - "x": 1792, - "y": 768 + "x": 3584, + "y": 1536 } }, "5": { @@ -153,128 +153,128 @@ "y": 0 }, "000001.png": { - "x": 256, - "y": 0 - }, - "000002.png": { "x": 512, "y": 0 }, - "000003.png": { - "x": 768, - "y": 0 - }, - "000004.png": { + "000002.png": { "x": 1024, "y": 0 }, - "000005.png": { - "x": 1280, - "y": 0 - }, - "000006.png": { + "000003.png": { "x": 1536, "y": 0 }, + "000004.png": { + "x": 2048, + "y": 0 + }, + "000005.png": { + "x": 2560, + "y": 0 + }, + "000006.png": { + "x": 3072, + "y": 0 + }, "000007.png": { - "x": 1792, + "x": 3584, "y": 0 }, "000008.png": { "x": 0, - "y": 256 + "y": 512 }, "000009.png": { - "x": 256, - "y": 256 + "x": 512, + "y": 512 }, "000010.png": { - "x": 512, - "y": 256 + "x": 1024, + "y": 512 }, "000011.png": { - "x": 768, - "y": 256 + "x": 1536, + "y": 512 }, "000012.png": { - "x": 1024, - "y": 256 + "x": 2048, + "y": 512 }, "000013.png": { - "x": 1280, - "y": 256 + "x": 2560, + "y": 512 }, "000014.png": { - "x": 1536, - "y": 256 + "x": 3072, + "y": 512 }, "000015.png": { - "x": 1792, - "y": 256 + "x": 3584, + "y": 512 }, "000016.png": { "x": 0, - "y": 512 + "y": 1024 }, "000017.png": { - "x": 256, - "y": 512 + "x": 512, + "y": 1024 }, "000018.png": { - "x": 512, - "y": 512 + "x": 1024, + "y": 1024 }, "000019.png": { - "x": 768, - "y": 512 + "x": 1536, + "y": 1024 }, "000020.png": { - "x": 1024, - "y": 512 + "x": 2048, + "y": 1024 }, "000021.png": { - "x": 1280, - "y": 512 + "x": 2560, + "y": 1024 }, "000022.png": { - "x": 1536, - "y": 512 + "x": 3072, + "y": 1024 }, "000023.png": { - "x": 1792, - "y": 512 + "x": 3584, + "y": 1024 }, "000024.png": { "x": 0, - "y": 768 + "y": 1536 }, "000025.png": { - "x": 256, - "y": 768 + "x": 512, + "y": 1536 }, "000026.png": { - "x": 512, - "y": 768 + "x": 1024, + "y": 1536 }, "000027.png": { - "x": 768, - "y": 768 + "x": 1536, + "y": 1536 }, "000028.png": { - "x": 1024, - "y": 768 + "x": 2048, + "y": 1536 }, "000029.png": { - "x": 1280, - "y": 768 + "x": 2560, + "y": 1536 }, "000030.png": { - "x": 1536, - "y": 768 + "x": 3072, + "y": 1536 }, "000031.png": { - "x": 1792, - "y": 768 + "x": 3584, + "y": 1536 } }, "6": { @@ -282,169 +282,85 @@ "x": 0, "y": 0 }, - "000001.png": { - "x": 256, - "y": 0 - }, "000002.png": { "x": 512, "y": 0 }, - "000003.png": { - "x": 768, - "y": 0 - }, "000004.png": { "x": 1024, "y": 0 }, - "000005.png": { - "x": 1280, - "y": 0 - }, "000006.png": { "x": 1536, "y": 0 }, - "000007.png": { - "x": 1792, + "000008.png": { + "x": 2048, "y": 0 }, - "000008.png": { - "x": 0, - "y": 256 - }, - "000009.png": { - "x": 256, - "y": 256 - }, "000010.png": { - "x": 512, - "y": 256 - }, - "000011.png": { - "x": 768, - "y": 256 + "x": 2560, + "y": 0 }, "000012.png": { - "x": 1024, - "y": 256 - }, - "000013.png": { - "x": 1280, - "y": 256 + "x": 3072, + "y": 0 }, "000014.png": { - "x": 1536, - "y": 256 - }, - "000015.png": { - "x": 1792, - "y": 256 + "x": 3584, + "y": 0 }, "000016.png": { "x": 0, "y": 512 }, - "000017.png": { - "x": 256, - "y": 512 - }, "000018.png": { "x": 512, "y": 512 }, - "000019.png": { - "x": 768, - "y": 512 - }, "000020.png": { "x": 1024, "y": 512 }, - "000021.png": { - "x": 1280, - "y": 512 - }, "000022.png": { "x": 1536, "y": 512 }, - "000023.png": { - "x": 1792, + "000024.png": { + "x": 2048, "y": 512 }, - "000024.png": { - "x": 0, - "y": 768 - }, - "000025.png": { - "x": 256, - "y": 768 - }, "000026.png": { - "x": 512, - "y": 768 - }, - "000027.png": { - "x": 768, - "y": 768 + "x": 2560, + "y": 512 }, "000028.png": { - "x": 1024, - "y": 768 - }, - "000029.png": { - "x": 1280, - "y": 768 + "x": 3072, + "y": 512 }, "000030.png": { - "x": 1536, - "y": 768 - }, - "000031.png": { - "x": 1792, - "y": 768 + "x": 3584, + "y": 512 }, "000032.png": { "x": 0, "y": 1024 }, - "000033.png": { - "x": 256, - "y": 1024 - }, "000034.png": { "x": 512, "y": 1024 }, - "000035.png": { - "x": 768, - "y": 1024 - }, "000036.png": { "x": 1024, "y": 1024 }, - "000037.png": { - "x": 1280, - "y": 1024 - }, "000038.png": { "x": 1536, "y": 1024 }, - "000039.png": { - "x": 1792, - "y": 1024 - }, "000040.png": { - "x": 0, - "y": 1280 - }, - "000041.png": { - "x": 256, - "y": 1280 + "x": 2048, + "y": 1024 } }, "7": { @@ -452,144 +368,76 @@ "x": 0, "y": 0 }, - "000001.png": { - "x": 256, - "y": 0 - }, "000002.png": { "x": 512, "y": 0 }, - "000003.png": { - "x": 768, - "y": 0 - }, "000004.png": { "x": 1024, "y": 0 }, - "000005.png": { - "x": 1280, - "y": 0 - }, "000006.png": { "x": 1536, "y": 0 }, - "000007.png": { - "x": 1792, + "000008.png": { + "x": 2048, "y": 0 }, - "000008.png": { - "x": 0, - "y": 256 - }, - "000009.png": { - "x": 256, - "y": 256 - }, "000010.png": { - "x": 512, - "y": 256 - }, - "000011.png": { - "x": 768, - "y": 256 + "x": 2560, + "y": 0 }, "000012.png": { - "x": 1024, - "y": 256 - }, - "000013.png": { - "x": 1280, - "y": 256 + "x": 3072, + "y": 0 }, "000014.png": { - "x": 1536, - "y": 256 - }, - "000015.png": { - "x": 1792, - "y": 256 + "x": 3584, + "y": 0 }, "000016.png": { "x": 0, "y": 512 }, - "000017.png": { - "x": 256, - "y": 512 - }, "000018.png": { "x": 512, "y": 512 }, - "000019.png": { - "x": 768, - "y": 512 - }, "000020.png": { "x": 1024, "y": 512 }, - "000021.png": { - "x": 1280, - "y": 512 - }, "000022.png": { "x": 1536, "y": 512 }, - "000023.png": { - "x": 1792, + "000024.png": { + "x": 2048, "y": 512 }, - "000024.png": { - "x": 0, - "y": 768 - }, - "000025.png": { - "x": 256, - "y": 768 - }, "000026.png": { - "x": 512, - "y": 768 - }, - "000027.png": { - "x": 768, - "y": 768 + "x": 2560, + "y": 512 }, "000028.png": { - "x": 1024, - "y": 768 - }, - "000029.png": { - "x": 1280, - "y": 768 + "x": 3072, + "y": 512 }, "000030.png": { - "x": 1536, - "y": 768 - }, - "000031.png": { - "x": 1792, - "y": 768 + "x": 3584, + "y": 512 }, "000032.png": { "x": 0, "y": 1024 }, - "000033.png": { - "x": 256, - "y": 1024 - }, "000034.png": { "x": 512, "y": 1024 }, "000035.png": { - "x": 768, + "x": 1024, "y": 1024 } }, @@ -599,96 +447,96 @@ "y": 0 }, "000001.png": { - "x": 256, - "y": 0 - }, - "000002.png": { "x": 512, "y": 0 }, - "000003.png": { - "x": 768, - "y": 0 - }, - "000004.png": { + "000002.png": { "x": 1024, "y": 0 }, - "000005.png": { - "x": 1280, - "y": 0 - }, - "000006.png": { + "000003.png": { "x": 1536, "y": 0 }, + "000004.png": { + "x": 2048, + "y": 0 + }, + "000005.png": { + "x": 2560, + "y": 0 + }, + "000006.png": { + "x": 3072, + "y": 0 + }, "000007.png": { - "x": 1792, + "x": 3584, "y": 0 }, "000008.png": { "x": 0, - "y": 256 + "y": 512 }, "000009.png": { - "x": 256, - "y": 256 + "x": 512, + "y": 512 }, "000010.png": { - "x": 512, - "y": 256 + "x": 1024, + "y": 512 }, "000011.png": { - "x": 768, - "y": 256 + "x": 1536, + "y": 512 }, "000012.png": { - "x": 1024, - "y": 256 + "x": 2048, + "y": 512 }, "000013.png": { - "x": 1280, - "y": 256 + "x": 2560, + "y": 512 }, "000014.png": { - "x": 1536, - "y": 256 + "x": 3072, + "y": 512 }, "000015.png": { - "x": 1792, - "y": 256 + "x": 3584, + "y": 512 }, "000016.png": { "x": 0, - "y": 512 + "y": 1024 }, "000017.png": { - "x": 256, - "y": 512 + "x": 512, + "y": 1024 }, "000018.png": { - "x": 512, - "y": 512 + "x": 1024, + "y": 1024 }, "000019.png": { - "x": 768, - "y": 512 + "x": 1536, + "y": 1024 }, "000020.png": { - "x": 1024, - "y": 512 + "x": 2048, + "y": 1024 }, "000021.png": { - "x": 1280, - "y": 512 + "x": 2560, + "y": 1024 }, "000022.png": { - "x": 1536, - "y": 512 + "x": 3072, + "y": 1024 }, "000023.png": { - "x": 1792, - "y": 512 + "x": 3584, + "y": 1024 } }, "12": { @@ -697,96 +545,96 @@ "y": 0 }, "000001.png": { - "x": 256, - "y": 0 - }, - "000002.png": { "x": 512, "y": 0 }, - "000003.png": { - "x": 768, - "y": 0 - }, - "000004.png": { + "000002.png": { "x": 1024, "y": 0 }, - "000005.png": { - "x": 1280, - "y": 0 - }, - "000006.png": { + "000003.png": { "x": 1536, "y": 0 }, + "000004.png": { + "x": 2048, + "y": 0 + }, + "000005.png": { + "x": 2560, + "y": 0 + }, + "000006.png": { + "x": 3072, + "y": 0 + }, "000007.png": { - "x": 1792, + "x": 3584, "y": 0 }, "000008.png": { "x": 0, - "y": 256 + "y": 512 }, "000009.png": { - "x": 256, - "y": 256 + "x": 512, + "y": 512 }, "000010.png": { - "x": 512, - "y": 256 + "x": 1024, + "y": 512 }, "000011.png": { - "x": 768, - "y": 256 + "x": 1536, + "y": 512 }, "000012.png": { - "x": 1024, - "y": 256 + "x": 2048, + "y": 512 }, "000013.png": { - "x": 1280, - "y": 256 + "x": 2560, + "y": 512 }, "000014.png": { - "x": 1536, - "y": 256 + "x": 3072, + "y": 512 }, "000015.png": { - "x": 1792, - "y": 256 + "x": 3584, + "y": 512 }, "000016.png": { "x": 0, - "y": 512 + "y": 1024 }, "000017.png": { - "x": 256, - "y": 512 + "x": 512, + "y": 1024 }, "000018.png": { - "x": 512, - "y": 512 + "x": 1024, + "y": 1024 }, "000019.png": { - "x": 768, - "y": 512 + "x": 1536, + "y": 1024 }, "000020.png": { - "x": 1024, - "y": 512 + "x": 2048, + "y": 1024 }, "000021.png": { - "x": 1280, - "y": 512 + "x": 2560, + "y": 1024 }, "000022.png": { - "x": 1536, - "y": 512 + "x": 3072, + "y": 1024 }, "000023.png": { - "x": 1792, - "y": 512 + "x": 3584, + "y": 1024 } }, "13": { @@ -795,128 +643,128 @@ "y": 0 }, "000001.png": { - "x": 256, - "y": 0 - }, - "000002.png": { "x": 512, "y": 0 }, - "000003.png": { - "x": 768, - "y": 0 - }, - "000004.png": { + "000002.png": { "x": 1024, "y": 0 }, - "000005.png": { - "x": 1280, - "y": 0 - }, - "000006.png": { + "000003.png": { "x": 1536, "y": 0 }, + "000004.png": { + "x": 2048, + "y": 0 + }, + "000005.png": { + "x": 2560, + "y": 0 + }, + "000006.png": { + "x": 3072, + "y": 0 + }, "000007.png": { - "x": 1792, + "x": 3584, "y": 0 }, "000008.png": { "x": 0, - "y": 256 + "y": 512 }, "000009.png": { - "x": 256, - "y": 256 + "x": 512, + "y": 512 }, "000010.png": { - "x": 512, - "y": 256 + "x": 1024, + "y": 512 }, "000011.png": { - "x": 768, - "y": 256 + "x": 1536, + "y": 512 }, "000012.png": { - "x": 1024, - "y": 256 + "x": 2048, + "y": 512 }, "000013.png": { - "x": 1280, - "y": 256 + "x": 2560, + "y": 512 }, "000014.png": { - "x": 1536, - "y": 256 + "x": 3072, + "y": 512 }, "000015.png": { - "x": 1792, - "y": 256 + "x": 3584, + "y": 512 }, "000016.png": { "x": 0, - "y": 512 + "y": 1024 }, "000017.png": { - "x": 256, - "y": 512 + "x": 512, + "y": 1024 }, "000018.png": { - "x": 512, - "y": 512 + "x": 1024, + "y": 1024 }, "000019.png": { - "x": 768, - "y": 512 + "x": 1536, + "y": 1024 }, "000020.png": { - "x": 1024, - "y": 512 + "x": 2048, + "y": 1024 }, "000021.png": { - "x": 1280, - "y": 512 + "x": 2560, + "y": 1024 }, "000022.png": { - "x": 1536, - "y": 512 + "x": 3072, + "y": 1024 }, "000023.png": { - "x": 1792, - "y": 512 + "x": 3584, + "y": 1024 }, "000024.png": { "x": 0, - "y": 768 + "y": 1536 }, "000025.png": { - "x": 256, - "y": 768 + "x": 512, + "y": 1536 }, "000026.png": { - "x": 512, - "y": 768 + "x": 1024, + "y": 1536 }, "000027.png": { - "x": 768, - "y": 768 + "x": 1536, + "y": 1536 }, "000028.png": { - "x": 1024, - "y": 768 + "x": 2048, + "y": 1536 }, "000029.png": { - "x": 1280, - "y": 768 + "x": 2560, + "y": 1536 }, "000030.png": { - "x": 1536, - "y": 768 + "x": 3072, + "y": 1536 }, "000031.png": { - "x": 1792, - "y": 768 + "x": 3584, + "y": 1536 } }, "14": { @@ -925,144 +773,120 @@ "y": 0 }, "000001.png": { - "x": 256, + "x": 512, "y": 0 }, "000002.png": { - "x": 512, + "x": 1024, "y": 0 }, "000003.png": { - "x": 768, + "x": 1536, "y": 0 }, "000004.png": { - "x": 1024, + "x": 2048, "y": 0 }, "000005.png": { - "x": 1280, + "x": 2560, "y": 0 }, "000006.png": { - "x": 1536, - "y": 0 - }, - "000007.png": { - "x": 1792, + "x": 3072, "y": 0 }, "000008.png": { - "x": 0, - "y": 256 + "x": 3584, + "y": 0 }, "000009.png": { - "x": 256, - "y": 256 + "x": 0, + "y": 512 }, "000010.png": { "x": 512, - "y": 256 + "y": 512 }, "000011.png": { - "x": 768, - "y": 256 + "x": 1024, + "y": 512 }, "000012.png": { - "x": 1024, - "y": 256 + "x": 1536, + "y": 512 }, "000013.png": { - "x": 1280, - "y": 256 + "x": 2048, + "y": 512 }, "000014.png": { - "x": 1536, - "y": 256 - }, - "000015.png": { - "x": 1792, - "y": 256 + "x": 2560, + "y": 512 }, "000016.png": { - "x": 0, + "x": 3072, "y": 512 }, "000017.png": { - "x": 256, + "x": 3584, "y": 512 }, "000018.png": { - "x": 512, - "y": 512 - }, - "000019.png": { - "x": 768, - "y": 512 + "x": 0, + "y": 1024 }, "000020.png": { - "x": 1024, - "y": 512 + "x": 512, + "y": 1024 }, "000021.png": { - "x": 1280, - "y": 512 + "x": 1024, + "y": 1024 }, "000022.png": { "x": 1536, - "y": 512 + "y": 1024 }, "000023.png": { - "x": 1792, - "y": 512 + "x": 2048, + "y": 1024 }, "000024.png": { - "x": 0, - "y": 768 + "x": 2560, + "y": 1024 }, "000025.png": { - "x": 256, - "y": 768 - }, - "000026.png": { - "x": 512, - "y": 768 + "x": 3072, + "y": 1024 }, "000027.png": { - "x": 768, - "y": 768 - }, - "000028.png": { - "x": 1024, - "y": 768 + "x": 3584, + "y": 1024 }, "000029.png": { - "x": 1280, - "y": 768 + "x": 0, + "y": 1536 }, "000030.png": { - "x": 1536, - "y": 768 - }, - "000031.png": { - "x": 1792, - "y": 768 + "x": 512, + "y": 1536 }, "000032.png": { - "x": 0, - "y": 1024 + "x": 1024, + "y": 1536 }, "000033.png": { - "x": 256, - "y": 1024 + "x": 1536, + "y": 1536 }, "000034.png": { - "x": 512, - "y": 1024 + "x": 2048, + "y": 1536 }, "000035.png": { - "x": 768, - "y": 1024 + "x": 2560, + "y": 1536 } }, "21": { @@ -1071,144 +895,120 @@ "y": 0 }, "000001.png": { - "x": 256, + "x": 512, "y": 0 }, "000002.png": { - "x": 512, + "x": 1024, "y": 0 }, "000003.png": { - "x": 768, + "x": 1536, "y": 0 }, "000004.png": { - "x": 1024, + "x": 2048, "y": 0 }, "000005.png": { - "x": 1280, + "x": 2560, "y": 0 }, "000006.png": { - "x": 1536, + "x": 3072, "y": 0 }, "000007.png": { - "x": 1792, + "x": 3584, "y": 0 }, - "000008.png": { - "x": 0, - "y": 256 - }, "000009.png": { - "x": 256, - "y": 256 + "x": 0, + "y": 512 }, "000010.png": { "x": 512, - "y": 256 + "y": 512 }, "000011.png": { - "x": 768, - "y": 256 + "x": 1024, + "y": 512 }, "000012.png": { - "x": 1024, - "y": 256 + "x": 1536, + "y": 512 }, "000013.png": { - "x": 1280, - "y": 256 + "x": 2048, + "y": 512 }, "000014.png": { - "x": 1536, - "y": 256 + "x": 2560, + "y": 512 }, "000015.png": { - "x": 1792, - "y": 256 + "x": 3072, + "y": 512 }, "000016.png": { - "x": 0, + "x": 3584, "y": 512 }, "000017.png": { - "x": 256, - "y": 512 + "x": 0, + "y": 1024 }, "000018.png": { "x": 512, - "y": 512 - }, - "000019.png": { - "x": 768, - "y": 512 + "y": 1024 }, "000020.png": { "x": 1024, - "y": 512 + "y": 1024 }, "000021.png": { - "x": 1280, - "y": 512 - }, - "000022.png": { "x": 1536, - "y": 512 + "y": 1024 }, "000023.png": { - "x": 1792, - "y": 512 + "x": 2048, + "y": 1024 }, "000024.png": { - "x": 0, - "y": 768 + "x": 2560, + "y": 1024 }, "000025.png": { - "x": 256, - "y": 768 + "x": 3072, + "y": 1024 }, "000026.png": { - "x": 512, - "y": 768 - }, - "000027.png": { - "x": 768, - "y": 768 + "x": 3584, + "y": 1024 }, "000028.png": { - "x": 1024, - "y": 768 + "x": 0, + "y": 1536 }, "000029.png": { - "x": 1280, - "y": 768 + "x": 512, + "y": 1536 }, "000030.png": { - "x": 1536, - "y": 768 - }, - "000031.png": { - "x": 1792, - "y": 768 + "x": 1024, + "y": 1536 }, "000032.png": { - "x": 0, - "y": 1024 + "x": 1536, + "y": 1536 }, "000033.png": { - "x": 256, - "y": 1024 - }, - "000034.png": { - "x": 512, - "y": 1024 + "x": 2048, + "y": 1536 }, "000035.png": { - "x": 768, - "y": 1024 + "x": 2560, + "y": 1536 } }, "54": { @@ -1229,144 +1029,116 @@ "y": 0 }, "000001.png": { - "x": 256, + "x": 512, "y": 0 }, "000002.png": { - "x": 512, + "x": 1024, "y": 0 }, "000003.png": { - "x": 768, + "x": 1536, "y": 0 }, "000004.png": { - "x": 1024, + "x": 2048, "y": 0 }, "000005.png": { - "x": 1280, + "x": 2560, "y": 0 }, "000006.png": { - "x": 1536, + "x": 3072, "y": 0 }, "000007.png": { - "x": 1792, + "x": 3584, "y": 0 }, - "000008.png": { - "x": 0, - "y": 256 - }, "000009.png": { - "x": 256, - "y": 256 - }, - "000010.png": { - "x": 512, - "y": 256 + "x": 0, + "y": 512 }, "000011.png": { - "x": 768, - "y": 256 + "x": 512, + "y": 512 }, "000012.png": { "x": 1024, - "y": 256 - }, - "000013.png": { - "x": 1280, - "y": 256 + "y": 512 }, "000014.png": { "x": 1536, - "y": 256 + "y": 512 }, "000015.png": { - "x": 1792, - "y": 256 + "x": 2048, + "y": 512 }, "000016.png": { - "x": 0, + "x": 2560, "y": 512 }, "000017.png": { - "x": 256, + "x": 3072, "y": 512 }, "000018.png": { - "x": 512, + "x": 3584, "y": 512 }, "000019.png": { - "x": 768, - "y": 512 + "x": 0, + "y": 1024 }, "000020.png": { - "x": 1024, - "y": 512 - }, - "000021.png": { - "x": 1280, - "y": 512 + "x": 512, + "y": 1024 }, "000022.png": { - "x": 1536, - "y": 512 + "x": 1024, + "y": 1024 }, "000023.png": { - "x": 1792, - "y": 512 + "x": 1536, + "y": 1024 }, "000024.png": { - "x": 0, - "y": 768 + "x": 2048, + "y": 1024 }, "000025.png": { - "x": 256, - "y": 768 - }, - "000026.png": { - "x": 512, - "y": 768 + "x": 2560, + "y": 1024 }, "000027.png": { - "x": 768, - "y": 768 - }, - "000028.png": { - "x": 1024, - "y": 768 + "x": 3072, + "y": 1024 }, "000029.png": { - "x": 1280, - "y": 768 + "x": 3584, + "y": 1024 }, "000030.png": { - "x": 1536, - "y": 768 - }, - "000031.png": { - "x": 1792, - "y": 768 + "x": 0, + "y": 1536 }, "000032.png": { - "x": 0, - "y": 1024 + "x": 512, + "y": 1536 }, "000033.png": { - "x": 256, - "y": 1024 + "x": 1024, + "y": 1536 }, "000034.png": { - "x": 512, - "y": 1024 + "x": 1536, + "y": 1536 }, "000035.png": { - "x": 768, - "y": 1024 + "x": 2048, + "y": 1536 } }, "59": { @@ -1375,96 +1147,96 @@ "y": 0 }, "000001.png": { - "x": 256, - "y": 0 - }, - "000002.png": { "x": 512, "y": 0 }, - "000003.png": { - "x": 768, - "y": 0 - }, - "000004.png": { + "000002.png": { "x": 1024, "y": 0 }, - "000005.png": { - "x": 1280, - "y": 0 - }, - "000006.png": { + "000003.png": { "x": 1536, "y": 0 }, + "000004.png": { + "x": 2048, + "y": 0 + }, + "000005.png": { + "x": 2560, + "y": 0 + }, + "000006.png": { + "x": 3072, + "y": 0 + }, "000007.png": { - "x": 1792, + "x": 3584, "y": 0 }, "000008.png": { "x": 0, - "y": 256 + "y": 512 }, "000009.png": { - "x": 256, - "y": 256 + "x": 512, + "y": 512 }, "000010.png": { - "x": 512, - "y": 256 + "x": 1024, + "y": 512 }, "000011.png": { - "x": 768, - "y": 256 + "x": 1536, + "y": 512 }, "000012.png": { - "x": 1024, - "y": 256 + "x": 2048, + "y": 512 }, "000013.png": { - "x": 1280, - "y": 256 + "x": 2560, + "y": 512 }, "000014.png": { - "x": 1536, - "y": 256 + "x": 3072, + "y": 512 }, "000015.png": { - "x": 1792, - "y": 256 + "x": 3584, + "y": 512 }, "000016.png": { "x": 0, - "y": 512 + "y": 1024 }, "000017.png": { - "x": 256, - "y": 512 + "x": 512, + "y": 1024 }, "000018.png": { - "x": 512, - "y": 512 + "x": 1024, + "y": 1024 }, "000019.png": { - "x": 768, - "y": 512 + "x": 1536, + "y": 1024 }, "000020.png": { - "x": 1024, - "y": 512 + "x": 2048, + "y": 1024 }, "000021.png": { - "x": 1280, - "y": 512 + "x": 2560, + "y": 1024 }, "000022.png": { - "x": 1536, - "y": 512 + "x": 3072, + "y": 1024 }, "000023.png": { - "x": 1792, - "y": 512 + "x": 3584, + "y": 1024 } }, "62": { @@ -1473,128 +1245,128 @@ "y": 0 }, "000001.png": { - "x": 256, - "y": 0 - }, - "000002.png": { "x": 512, "y": 0 }, - "000003.png": { - "x": 768, - "y": 0 - }, - "000004.png": { + "000002.png": { "x": 1024, "y": 0 }, - "000005.png": { - "x": 1280, - "y": 0 - }, - "000006.png": { + "000003.png": { "x": 1536, "y": 0 }, + "000004.png": { + "x": 2048, + "y": 0 + }, + "000005.png": { + "x": 2560, + "y": 0 + }, + "000006.png": { + "x": 3072, + "y": 0 + }, "000007.png": { - "x": 1792, + "x": 3584, "y": 0 }, "000008.png": { "x": 0, - "y": 256 + "y": 512 }, "000009.png": { - "x": 256, - "y": 256 + "x": 512, + "y": 512 }, "000010.png": { - "x": 512, - "y": 256 + "x": 1024, + "y": 512 }, "000011.png": { - "x": 768, - "y": 256 + "x": 1536, + "y": 512 }, "000012.png": { - "x": 1024, - "y": 256 + "x": 2048, + "y": 512 }, "000013.png": { - "x": 1280, - "y": 256 + "x": 2560, + "y": 512 }, "000014.png": { - "x": 1536, - "y": 256 + "x": 3072, + "y": 512 }, "000015.png": { - "x": 1792, - "y": 256 + "x": 3584, + "y": 512 }, "000016.png": { "x": 0, - "y": 512 + "y": 1024 }, "000017.png": { - "x": 256, - "y": 512 + "x": 512, + "y": 1024 }, "000018.png": { - "x": 512, - "y": 512 + "x": 1024, + "y": 1024 }, "000019.png": { - "x": 768, - "y": 512 + "x": 1536, + "y": 1024 }, "000020.png": { - "x": 1024, - "y": 512 + "x": 2048, + "y": 1024 }, "000021.png": { - "x": 1280, - "y": 512 + "x": 2560, + "y": 1024 }, "000022.png": { - "x": 1536, - "y": 512 + "x": 3072, + "y": 1024 }, "000023.png": { - "x": 1792, - "y": 512 + "x": 3584, + "y": 1024 }, "000024.png": { "x": 0, - "y": 768 + "y": 1536 }, "000025.png": { - "x": 256, - "y": 768 + "x": 512, + "y": 1536 }, "000026.png": { - "x": 512, - "y": 768 + "x": 1024, + "y": 1536 }, "000027.png": { - "x": 768, - "y": 768 + "x": 1536, + "y": 1536 }, "000028.png": { - "x": 1024, - "y": 768 + "x": 2048, + "y": 1536 }, "000029.png": { - "x": 1280, - "y": 768 + "x": 2560, + "y": 1536 }, "000030.png": { - "x": 1536, - "y": 768 + "x": 3072, + "y": 1536 }, "000031.png": { - "x": 1792, - "y": 768 + "x": 3584, + "y": 1536 } }, "65": { @@ -1603,144 +1375,120 @@ "y": 0 }, "000001.png": { - "x": 256, + "x": 512, "y": 0 }, "000002.png": { - "x": 512, + "x": 1024, "y": 0 }, "000003.png": { - "x": 768, + "x": 1536, "y": 0 }, "000004.png": { - "x": 1024, + "x": 2048, "y": 0 }, "000005.png": { - "x": 1280, + "x": 2560, "y": 0 }, "000006.png": { - "x": 1536, + "x": 3072, "y": 0 }, "000007.png": { - "x": 1792, + "x": 3584, "y": 0 }, - "000008.png": { - "x": 0, - "y": 256 - }, "000009.png": { - "x": 256, - "y": 256 - }, - "000010.png": { - "x": 512, - "y": 256 + "x": 0, + "y": 512 }, "000011.png": { - "x": 768, - "y": 256 + "x": 512, + "y": 512 }, "000012.png": { "x": 1024, - "y": 256 - }, - "000013.png": { - "x": 1280, - "y": 256 + "y": 512 }, "000014.png": { "x": 1536, - "y": 256 + "y": 512 }, "000015.png": { - "x": 1792, - "y": 256 + "x": 2048, + "y": 512 }, "000016.png": { - "x": 0, + "x": 2560, "y": 512 }, "000017.png": { - "x": 256, + "x": 3072, "y": 512 }, "000018.png": { - "x": 512, + "x": 3584, "y": 512 }, "000019.png": { - "x": 768, - "y": 512 - }, - "000020.png": { - "x": 1024, - "y": 512 + "x": 0, + "y": 1024 }, "000021.png": { - "x": 1280, - "y": 512 + "x": 512, + "y": 1024 }, "000022.png": { - "x": 1536, - "y": 512 + "x": 1024, + "y": 1024 }, "000023.png": { - "x": 1792, - "y": 512 + "x": 1536, + "y": 1024 }, "000024.png": { - "x": 0, - "y": 768 + "x": 2048, + "y": 1024 }, "000025.png": { - "x": 256, - "y": 768 + "x": 2560, + "y": 1024 }, "000026.png": { - "x": 512, - "y": 768 + "x": 3072, + "y": 1024 }, "000027.png": { - "x": 768, - "y": 768 - }, - "000028.png": { - "x": 1024, - "y": 768 + "x": 3584, + "y": 1024 }, "000029.png": { - "x": 1280, - "y": 768 + "x": 0, + "y": 1536 }, "000030.png": { - "x": 1536, - "y": 768 - }, - "000031.png": { - "x": 1792, - "y": 768 + "x": 512, + "y": 1536 }, "000032.png": { - "x": 0, - "y": 1024 + "x": 1024, + "y": 1536 }, "000033.png": { - "x": 256, - "y": 1024 + "x": 1536, + "y": 1536 }, "000034.png": { - "x": 512, - "y": 1024 + "x": 2048, + "y": 1536 }, "000035.png": { - "x": 768, - "y": 1024 + "x": 2560, + "y": 1536 } }, "68": { @@ -1749,128 +1497,128 @@ "y": 0 }, "000001.png": { - "x": 256, - "y": 0 - }, - "000002.png": { "x": 512, "y": 0 }, - "000003.png": { - "x": 768, - "y": 0 - }, - "000004.png": { + "000002.png": { "x": 1024, "y": 0 }, - "000005.png": { - "x": 1280, - "y": 0 - }, - "000006.png": { + "000003.png": { "x": 1536, "y": 0 }, + "000004.png": { + "x": 2048, + "y": 0 + }, + "000005.png": { + "x": 2560, + "y": 0 + }, + "000006.png": { + "x": 3072, + "y": 0 + }, "000007.png": { - "x": 1792, + "x": 3584, "y": 0 }, "000008.png": { "x": 0, - "y": 256 + "y": 512 }, "000009.png": { - "x": 256, - "y": 256 + "x": 512, + "y": 512 }, "000010.png": { - "x": 512, - "y": 256 + "x": 1024, + "y": 512 }, "000011.png": { - "x": 768, - "y": 256 + "x": 1536, + "y": 512 }, "000012.png": { - "x": 1024, - "y": 256 + "x": 2048, + "y": 512 }, "000013.png": { - "x": 1280, - "y": 256 + "x": 2560, + "y": 512 }, "000014.png": { - "x": 1536, - "y": 256 + "x": 3072, + "y": 512 }, "000015.png": { - "x": 1792, - "y": 256 + "x": 3584, + "y": 512 }, "000016.png": { "x": 0, - "y": 512 + "y": 1024 }, "000017.png": { - "x": 256, - "y": 512 + "x": 512, + "y": 1024 }, "000018.png": { - "x": 512, - "y": 512 + "x": 1024, + "y": 1024 }, "000019.png": { - "x": 768, - "y": 512 + "x": 1536, + "y": 1024 }, "000020.png": { - "x": 1024, - "y": 512 + "x": 2048, + "y": 1024 }, "000021.png": { - "x": 1280, - "y": 512 + "x": 2560, + "y": 1024 }, "000022.png": { - "x": 1536, - "y": 512 + "x": 3072, + "y": 1024 }, "000023.png": { - "x": 1792, - "y": 512 + "x": 3584, + "y": 1024 }, "000024.png": { "x": 0, - "y": 768 + "y": 1536 }, "000025.png": { - "x": 256, - "y": 768 + "x": 512, + "y": 1536 }, "000026.png": { - "x": 512, - "y": 768 + "x": 1024, + "y": 1536 }, "000027.png": { - "x": 768, - "y": 768 + "x": 1536, + "y": 1536 }, "000028.png": { - "x": 1024, - "y": 768 + "x": 2048, + "y": 1536 }, "000029.png": { - "x": 1280, - "y": 768 + "x": 2560, + "y": 1536 }, "000030.png": { - "x": 1536, - "y": 768 + "x": 3072, + "y": 1536 }, "000031.png": { - "x": 1792, - "y": 768 + "x": 3584, + "y": 1536 } }, "69": { @@ -1891,128 +1639,128 @@ "y": 0 }, "000001.png": { - "x": 256, - "y": 0 - }, - "000002.png": { "x": 512, "y": 0 }, - "000003.png": { - "x": 768, - "y": 0 - }, - "000004.png": { + "000002.png": { "x": 1024, "y": 0 }, - "000005.png": { - "x": 1280, - "y": 0 - }, - "000006.png": { + "000003.png": { "x": 1536, "y": 0 }, + "000004.png": { + "x": 2048, + "y": 0 + }, + "000005.png": { + "x": 2560, + "y": 0 + }, + "000006.png": { + "x": 3072, + "y": 0 + }, "000007.png": { - "x": 1792, + "x": 3584, "y": 0 }, "000008.png": { "x": 0, - "y": 256 + "y": 512 }, "000009.png": { - "x": 256, - "y": 256 + "x": 512, + "y": 512 }, "000010.png": { - "x": 512, - "y": 256 + "x": 1024, + "y": 512 }, "000011.png": { - "x": 768, - "y": 256 + "x": 1536, + "y": 512 }, "000012.png": { - "x": 1024, - "y": 256 + "x": 2048, + "y": 512 }, "000013.png": { - "x": 1280, - "y": 256 + "x": 2560, + "y": 512 }, "000014.png": { - "x": 1536, - "y": 256 + "x": 3072, + "y": 512 }, "000015.png": { - "x": 1792, - "y": 256 + "x": 3584, + "y": 512 }, "000016.png": { "x": 0, - "y": 512 + "y": 1024 }, "000017.png": { - "x": 256, - "y": 512 + "x": 512, + "y": 1024 }, "000018.png": { - "x": 512, - "y": 512 + "x": 1024, + "y": 1024 }, "000019.png": { - "x": 768, - "y": 512 + "x": 1536, + "y": 1024 }, "000020.png": { - "x": 1024, - "y": 512 + "x": 2048, + "y": 1024 }, "000021.png": { - "x": 1280, - "y": 512 + "x": 2560, + "y": 1024 }, "000022.png": { - "x": 1536, - "y": 512 + "x": 3072, + "y": 1024 }, "000023.png": { - "x": 1792, - "y": 512 + "x": 3584, + "y": 1024 }, "000024.png": { "x": 0, - "y": 768 + "y": 1536 }, "000025.png": { - "x": 256, - "y": 768 + "x": 512, + "y": 1536 }, "000026.png": { - "x": 512, - "y": 768 + "x": 1024, + "y": 1536 }, "000027.png": { - "x": 768, - "y": 768 + "x": 1536, + "y": 1536 }, "000028.png": { - "x": 1024, - "y": 768 + "x": 2048, + "y": 1536 }, "000029.png": { - "x": 1280, - "y": 768 + "x": 2560, + "y": 1536 }, "000030.png": { - "x": 1536, - "y": 768 + "x": 3072, + "y": 1536 }, "000031.png": { - "x": 1792, - "y": 768 + "x": 3584, + "y": 1536 } }, "76": { @@ -2033,144 +1781,116 @@ "y": 0 }, "000001.png": { - "x": 256, + "x": 512, "y": 0 }, "000002.png": { - "x": 512, + "x": 1024, "y": 0 }, "000003.png": { - "x": 768, + "x": 1536, "y": 0 }, "000004.png": { - "x": 1024, + "x": 2048, "y": 0 }, "000005.png": { - "x": 1280, + "x": 2560, "y": 0 }, "000006.png": { - "x": 1536, + "x": 3072, "y": 0 }, "000007.png": { - "x": 1792, + "x": 3584, "y": 0 }, - "000008.png": { - "x": 0, - "y": 256 - }, "000009.png": { - "x": 256, - "y": 256 + "x": 0, + "y": 512 }, "000010.png": { "x": 512, - "y": 256 + "y": 512 }, "000011.png": { - "x": 768, - "y": 256 + "x": 1024, + "y": 512 }, "000012.png": { - "x": 1024, - "y": 256 - }, - "000013.png": { - "x": 1280, - "y": 256 + "x": 1536, + "y": 512 }, "000014.png": { - "x": 1536, - "y": 256 - }, - "000015.png": { - "x": 1792, - "y": 256 + "x": 2048, + "y": 512 }, "000016.png": { - "x": 0, + "x": 2560, "y": 512 }, "000017.png": { - "x": 256, + "x": 3072, "y": 512 }, "000018.png": { - "x": 512, + "x": 3584, "y": 512 }, "000019.png": { - "x": 768, - "y": 512 - }, - "000020.png": { - "x": 1024, - "y": 512 + "x": 0, + "y": 1024 }, "000021.png": { - "x": 1280, - "y": 512 + "x": 512, + "y": 1024 }, "000022.png": { - "x": 1536, - "y": 512 + "x": 1024, + "y": 1024 }, "000023.png": { - "x": 1792, - "y": 512 + "x": 1536, + "y": 1024 }, "000024.png": { - "x": 0, - "y": 768 - }, - "000025.png": { - "x": 256, - "y": 768 + "x": 2048, + "y": 1024 }, "000026.png": { - "x": 512, - "y": 768 + "x": 2560, + "y": 1024 }, "000027.png": { - "x": 768, - "y": 768 - }, - "000028.png": { - "x": 1024, - "y": 768 + "x": 3072, + "y": 1024 }, "000029.png": { - "x": 1280, - "y": 768 + "x": 3584, + "y": 1024 }, "000030.png": { - "x": 1536, - "y": 768 + "x": 0, + "y": 1536 }, "000031.png": { - "x": 1792, - "y": 768 + "x": 512, + "y": 1536 }, "000032.png": { - "x": 0, - "y": 1024 - }, - "000033.png": { - "x": 256, - "y": 1024 + "x": 1024, + "y": 1536 }, "000034.png": { - "x": 512, - "y": 1024 + "x": 1536, + "y": 1536 }, "000035.png": { - "x": 768, - "y": 1024 + "x": 2048, + "y": 1536 } }, "80": { @@ -2185,112 +1905,112 @@ "y": 0 }, "000001.png": { - "x": 256, - "y": 0 - }, - "000002.png": { "x": 512, "y": 0 }, - "000003.png": { - "x": 768, - "y": 0 - }, - "000004.png": { + "000002.png": { "x": 1024, "y": 0 }, - "000005.png": { - "x": 1280, - "y": 0 - }, - "000006.png": { + "000003.png": { "x": 1536, "y": 0 }, + "000004.png": { + "x": 2048, + "y": 0 + }, + "000005.png": { + "x": 2560, + "y": 0 + }, + "000006.png": { + "x": 3072, + "y": 0 + }, "000007.png": { - "x": 1792, + "x": 3584, "y": 0 }, "000008.png": { "x": 0, - "y": 256 + "y": 512 }, "000009.png": { - "x": 256, - "y": 256 + "x": 512, + "y": 512 }, "000010.png": { - "x": 512, - "y": 256 + "x": 1024, + "y": 512 }, "000011.png": { - "x": 768, - "y": 256 + "x": 1536, + "y": 512 }, "000012.png": { - "x": 1024, - "y": 256 + "x": 2048, + "y": 512 }, "000013.png": { - "x": 1280, - "y": 256 + "x": 2560, + "y": 512 }, "000014.png": { - "x": 1536, - "y": 256 + "x": 3072, + "y": 512 }, "000015.png": { - "x": 1792, - "y": 256 + "x": 3584, + "y": 512 }, "000016.png": { "x": 0, - "y": 512 + "y": 1024 }, "000017.png": { - "x": 256, - "y": 512 + "x": 512, + "y": 1024 }, "000018.png": { - "x": 512, - "y": 512 + "x": 1024, + "y": 1024 }, "000019.png": { - "x": 768, - "y": 512 + "x": 1536, + "y": 1024 }, "000020.png": { - "x": 1024, - "y": 512 + "x": 2048, + "y": 1024 }, "000021.png": { - "x": 1280, - "y": 512 + "x": 2560, + "y": 1024 }, "000022.png": { - "x": 1536, - "y": 512 + "x": 3072, + "y": 1024 }, "000023.png": { - "x": 1792, - "y": 512 + "x": 3584, + "y": 1024 }, "000024.png": { "x": 0, - "y": 768 + "y": 1536 }, "000025.png": { - "x": 256, - "y": 768 + "x": 512, + "y": 1536 }, "000026.png": { - "x": 512, - "y": 768 + "x": 1024, + "y": 1536 }, "000027.png": { - "x": 768, - "y": 768 + "x": 1536, + "y": 1536 } } } \ No newline at end of file diff --git a/python/combin_png.py b/python/combin_png.py index 6423a5c..5dbb236 100644 --- a/python/combin_png.py +++ b/python/combin_png.py @@ -3,9 +3,9 @@ from PIL import Image import os # 全局变量定义分辨率 -RESIZE_TO = (256, 256) -LARGE_IMAGE_SIZE = (2048, 2048) -IMAGE_COUNT = 64 +RESIZE_TO = (512, 512) +LARGE_IMAGE_SIZE = (4096, 2048) +IMAGE_COUNT = 32 ROOT_DIR = '../example/src/main/assets/pic' @@ -54,7 +54,8 @@ def remove_white_border(image): def resize_image(image_path): image = Image.open(image_path).convert('RGBA') image = remove_white_border(image) - return image.resize(RESIZE_TO) + #return image.resize(RESIZE_TO) + return image def main(json_file_path): # 确保使用完整路径 diff --git a/vulkan/FaceApp.h b/vulkan/FaceApp.h index 0968f1b..364274d 100644 --- a/vulkan/FaceApp.h +++ b/vulkan/FaceApp.h @@ -130,7 +130,7 @@ private: //vector* _cur_texs; vector m_texs_thick; std::vector dummy_data; - unsigned dummy_w = 2048; + unsigned dummy_w = 4096; unsigned dummy_h = 2048; std::vector obj_vertices; diff --git a/vulkan/main.cpp b/vulkan/main.cpp index 84a3c86..a92dba1 100644 --- a/vulkan/main.cpp +++ b/vulkan/main.cpp @@ -102,7 +102,7 @@ void threadFunction() { startTime += 100; if (startTime == 10 * 1000) { - vector motions = { "5" }; + vector motions = { "5", "13"}; g_app->changeMotionList(motions, CppAnimationFinishedCallback, true); } std::this_thread::sleep_for(std::chrono::milliseconds(100)); // 暂停200ms @@ -165,7 +165,7 @@ int main() { MotionList s_motions; s_motions.motions.push_back(motions["4"]); s_motions.motions.push_back(motions["5"]); - //s_motions.motions.push_back(motions["13"]); + s_motions.motions.push_back(motions["13"]); json j = s_motions; auto s = j.dump();