diff --git a/example/src/main/assets/pic/4/0010.png b/example/src/main/assets/pic/4/010.png similarity index 100% rename from example/src/main/assets/pic/4/0010.png rename to example/src/main/assets/pic/4/010.png diff --git a/example/src/main/assets/pic/4/052.png b/example/src/main/assets/pic/4/052.png new file mode 100644 index 0000000..618cc96 Binary files /dev/null and b/example/src/main/assets/pic/4/052.png differ diff --git a/example/src/main/assets/pic/4/053.png b/example/src/main/assets/pic/4/053.png new file mode 100644 index 0000000..1956de0 Binary files /dev/null and b/example/src/main/assets/pic/4/053.png differ diff --git a/example/src/main/assets/pic/4/054.png b/example/src/main/assets/pic/4/054.png new file mode 100644 index 0000000..3f84102 Binary files /dev/null and b/example/src/main/assets/pic/4/054.png differ diff --git a/example/src/main/assets/pic/4/055.png b/example/src/main/assets/pic/4/055.png new file mode 100644 index 0000000..2bb105c Binary files /dev/null and b/example/src/main/assets/pic/4/055.png differ diff --git a/example/src/main/assets/pic/4/056.png b/example/src/main/assets/pic/4/056.png new file mode 100644 index 0000000..6a892c3 Binary files /dev/null and b/example/src/main/assets/pic/4/056.png differ diff --git a/example/src/main/assets/pic/4/057.png b/example/src/main/assets/pic/4/057.png new file mode 100644 index 0000000..2061ceb Binary files /dev/null and b/example/src/main/assets/pic/4/057.png differ diff --git a/example/src/main/assets/pic/4/058.png b/example/src/main/assets/pic/4/058.png new file mode 100644 index 0000000..b76c13e Binary files /dev/null and b/example/src/main/assets/pic/4/058.png differ diff --git a/example/src/main/assets/pic/4/059.png b/example/src/main/assets/pic/4/059.png new file mode 100644 index 0000000..8349ade Binary files /dev/null and b/example/src/main/assets/pic/4/059.png differ diff --git a/example/src/main/assets/pic/4/060.png b/example/src/main/assets/pic/4/060.png new file mode 100644 index 0000000..fbe5e4f Binary files /dev/null and b/example/src/main/assets/pic/4/060.png differ diff --git a/example/src/main/assets/pic/motion_data.json b/example/src/main/assets/pic/motion_data.json index b1f5d44..56aab1d 100644 --- a/example/src/main/assets/pic/motion_data.json +++ b/example/src/main/assets/pic/motion_data.json @@ -1,30 +1,65 @@ { "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" + "001.png", + "002.png", + "003.png", + "004.png", + "005.png", + "006.png", + "007.png", + "008.png", + "009.png", + "010.png", + "011.png", + "012.png", + "013.png", + "014.png", + "015.png", + "016.png", + "017.png", + "018.png", + "019.png", + "020.png", + "021.png", + "022.png", + "023.png", + "024.png", + "025.png", + "026.png", + "027.png", + "028.png", + "029.png", + "030.png", + "031.png", + "032.png", + "033.png", + "034.png", + "035.png", + "036.png", + "037.png", + "038.png", + "039.png", + "040.png", + "041.png", + "042.png", + "043.png", + "044.png", + "045.png", + "046.png", + "047.png", + "048.png", + "049.png", + "050.png", + "051.png", + "052.png", + "053.png", + "054.png", + "055.png", + "056.png", + "057.png", + "058.png", + "059.png", + "060.png" ], "5": [ "5.png" diff --git a/vulkan/main.cpp b/vulkan/main.cpp index 65d7ca7..831e6dd 100644 --- a/vulkan/main.cpp +++ b/vulkan/main.cpp @@ -56,16 +56,16 @@ int main() { InitArg init_arg; Motion motion; motion.type = "4"; - motion.png_names.push_back("4.png"); - for (int i = 0; i < 25; ++i) + //motion.png_names.push_back("4.png"); + for (int i = 1; i < 61; ++i) { if (i < 10) { - motion.png_names.push_back("00000" + std::to_string(i) + ".png"); + motion.png_names.push_back("00" + std::to_string(i) + ".png"); } else { - motion.png_names.push_back("0000" + std::to_string(i) + ".png"); + motion.png_names.push_back("0" + std::to_string(i) + ".png"); } @@ -76,7 +76,7 @@ int main() { //init_arg.motion = motion; - init_arg.action_fps = 10; + init_arg.action_fps = 20; init_arg.zoom = 1.5f; string json_str = json(init_arg).dump();