diff --git a/app/src/main/cpp/main.cpp b/app/src/main/cpp/main.cpp index 79955b9..41f45fc 100644 --- a/app/src/main/cpp/main.cpp +++ b/app/src/main/cpp/main.cpp @@ -39,9 +39,12 @@ void android_main(struct android_app *pApp) { aout << "Welcome to android_main" << std::endl; g_android_app = pApp; g_assetManager = pApp->activity->assetManager; - FaceApp application; - g_Application = &application; - application.SetInitArg(g_InitArgString); + //FaceApp application; + //g_Application = &application; + if(g_Application == nullptr) { + g_Application = new FaceApp(); + } + g_Application->SetInitArg(g_InitArgString); pApp->onAppCmd = handle_cmd; long long last_update_time = 0; android_app_set_motion_event_filter(pApp, nullptr); @@ -73,11 +76,11 @@ void android_main(struct android_app *pApp) { } } } - if(application.isInited()) + if(g_Application->isInited()) { auto frameTime = (start_time - _lastDrawFrameTime); _lastDrawFrameTime = chrono::duration_cast(chrono::system_clock::now().time_since_epoch()).count(); - application.drawFrame(frameTime); + g_Application->drawFrame(frameTime); } auto end_time = chrono::duration_cast(chrono::system_clock::now().time_since_epoch()).count(); auto frameTime = end_time - last_update_time; @@ -89,7 +92,7 @@ void android_main(struct android_app *pApp) { this_thread::sleep_for(chrono::milliseconds((35-function_time))); } } while (!pApp->destroyRequested); - application.cleanup(); + //application.cleanup(); } } @@ -154,7 +157,7 @@ Java_com_hmwl_face_1sdk_FaceActivity_SetCppInitArg(JNIEnv *env, jobject thiz, js extern "C" JNIEXPORT void JNICALL Java_com_hmwl_face_1sdk_FaceActivity_StopRunning(JNIEnv *env, jobject thiz) { - g_Application->_running = false; + g_Application->Stop(); } JavaVM* g_jvm = nullptr; diff --git a/example/src/main/assets/pic/14/000000.png b/example/src/main/assets/pic/14/000000.png index 460a856..1f3629b 100644 Binary files a/example/src/main/assets/pic/14/000000.png and b/example/src/main/assets/pic/14/000000.png differ diff --git a/example/src/main/assets/pic/14/000001.png b/example/src/main/assets/pic/14/000001.png index 1f3629b..cce0199 100644 Binary files a/example/src/main/assets/pic/14/000001.png and b/example/src/main/assets/pic/14/000001.png differ diff --git a/example/src/main/assets/pic/14/000002.png b/example/src/main/assets/pic/14/000002.png index cce0199..d90e21c 100644 Binary files a/example/src/main/assets/pic/14/000002.png and b/example/src/main/assets/pic/14/000002.png differ diff --git a/example/src/main/assets/pic/14/000003.png b/example/src/main/assets/pic/14/000003.png index d90e21c..f92c967 100644 Binary files a/example/src/main/assets/pic/14/000003.png and b/example/src/main/assets/pic/14/000003.png differ diff --git a/example/src/main/assets/pic/14/000004.png b/example/src/main/assets/pic/14/000004.png index f92c967..aa5282a 100644 Binary files a/example/src/main/assets/pic/14/000004.png and b/example/src/main/assets/pic/14/000004.png differ diff --git a/example/src/main/assets/pic/14/000005.png b/example/src/main/assets/pic/14/000005.png index aa5282a..352df1e 100644 Binary files a/example/src/main/assets/pic/14/000005.png and b/example/src/main/assets/pic/14/000005.png differ diff --git a/example/src/main/assets/pic/14/000006.png b/example/src/main/assets/pic/14/000006.png index 352df1e..85c4e55 100644 Binary files a/example/src/main/assets/pic/14/000006.png and b/example/src/main/assets/pic/14/000006.png differ diff --git a/example/src/main/assets/pic/14/000007.png b/example/src/main/assets/pic/14/000007.png new file mode 100644 index 0000000..4d6e8e8 Binary files /dev/null and b/example/src/main/assets/pic/14/000007.png differ diff --git a/example/src/main/assets/pic/14/000008.png b/example/src/main/assets/pic/14/000008.png index 4d6e8e8..589d4f2 100644 Binary files a/example/src/main/assets/pic/14/000008.png and b/example/src/main/assets/pic/14/000008.png differ diff --git a/example/src/main/assets/pic/14/000009.png b/example/src/main/assets/pic/14/000009.png index 589d4f2..36ab863 100644 Binary files a/example/src/main/assets/pic/14/000009.png and b/example/src/main/assets/pic/14/000009.png differ diff --git a/example/src/main/assets/pic/14/000010.png b/example/src/main/assets/pic/14/000010.png index 36ab863..965049f 100644 Binary files a/example/src/main/assets/pic/14/000010.png and b/example/src/main/assets/pic/14/000010.png differ diff --git a/example/src/main/assets/pic/14/000011.png b/example/src/main/assets/pic/14/000011.png index 965049f..2b497fd 100644 Binary files a/example/src/main/assets/pic/14/000011.png and b/example/src/main/assets/pic/14/000011.png differ diff --git a/example/src/main/assets/pic/14/000012.png b/example/src/main/assets/pic/14/000012.png index 2b497fd..55df32b 100644 Binary files a/example/src/main/assets/pic/14/000012.png and b/example/src/main/assets/pic/14/000012.png differ diff --git a/example/src/main/assets/pic/14/000013.png b/example/src/main/assets/pic/14/000013.png index 55df32b..a96c54b 100644 Binary files a/example/src/main/assets/pic/14/000013.png and b/example/src/main/assets/pic/14/000013.png differ diff --git a/example/src/main/assets/pic/14/000014.png b/example/src/main/assets/pic/14/000014.png index a96c54b..c2f417d 100644 Binary files a/example/src/main/assets/pic/14/000014.png and b/example/src/main/assets/pic/14/000014.png differ diff --git a/example/src/main/assets/pic/14/000035.png b/example/src/main/assets/pic/14/000015.png similarity index 100% rename from example/src/main/assets/pic/14/000035.png rename to example/src/main/assets/pic/14/000015.png diff --git a/example/src/main/assets/pic/14/000016.png b/example/src/main/assets/pic/14/000016.png index c0c7b2b..e6939bd 100644 Binary files a/example/src/main/assets/pic/14/000016.png and b/example/src/main/assets/pic/14/000016.png differ diff --git a/example/src/main/assets/pic/14/000017.png b/example/src/main/assets/pic/14/000017.png index 1f26815..2917a8c 100644 Binary files a/example/src/main/assets/pic/14/000017.png and b/example/src/main/assets/pic/14/000017.png differ diff --git a/example/src/main/assets/pic/14/000018.png b/example/src/main/assets/pic/14/000018.png index bcb53a4..3267815 100644 Binary files a/example/src/main/assets/pic/14/000018.png and b/example/src/main/assets/pic/14/000018.png differ diff --git a/example/src/main/assets/pic/2/000000.png b/example/src/main/assets/pic/14/000019.png similarity index 50% rename from example/src/main/assets/pic/2/000000.png rename to example/src/main/assets/pic/14/000019.png index 928a9ba..decbd59 100644 Binary files a/example/src/main/assets/pic/2/000000.png and b/example/src/main/assets/pic/14/000019.png differ diff --git a/example/src/main/assets/pic/14/000020.png b/example/src/main/assets/pic/14/000020.png index 2917a8c..8ac7474 100644 Binary files a/example/src/main/assets/pic/14/000020.png and b/example/src/main/assets/pic/14/000020.png differ diff --git a/example/src/main/assets/pic/14/000021.png b/example/src/main/assets/pic/14/000021.png index 3267815..a0c54f9 100644 Binary files a/example/src/main/assets/pic/14/000021.png and b/example/src/main/assets/pic/14/000021.png differ diff --git a/example/src/main/assets/pic/14/000022.png b/example/src/main/assets/pic/14/000022.png index decbd59..24bbde5 100644 Binary files a/example/src/main/assets/pic/14/000022.png and b/example/src/main/assets/pic/14/000022.png differ diff --git a/example/src/main/assets/pic/14/000023.png b/example/src/main/assets/pic/14/000023.png index 8ac7474..36db1b2 100644 Binary files a/example/src/main/assets/pic/14/000023.png and b/example/src/main/assets/pic/14/000023.png differ diff --git a/example/src/main/assets/pic/14/000024.png b/example/src/main/assets/pic/14/000024.png index a0c54f9..61c42ee 100644 Binary files a/example/src/main/assets/pic/14/000024.png and b/example/src/main/assets/pic/14/000024.png differ diff --git a/example/src/main/assets/pic/14/000025.png b/example/src/main/assets/pic/14/000025.png index 24bbde5..9abcd31 100644 Binary files a/example/src/main/assets/pic/14/000025.png and b/example/src/main/assets/pic/14/000025.png differ diff --git a/example/src/main/assets/pic/14/000026.png b/example/src/main/assets/pic/14/000026.png new file mode 100644 index 0000000..0ed7129 Binary files /dev/null and b/example/src/main/assets/pic/14/000026.png differ diff --git a/example/src/main/assets/pic/14/000027.png b/example/src/main/assets/pic/14/000027.png index 61c42ee..7131260 100644 Binary files a/example/src/main/assets/pic/14/000027.png and b/example/src/main/assets/pic/14/000027.png differ diff --git a/example/src/main/assets/pic/14/000028.png b/example/src/main/assets/pic/14/000028.png new file mode 100644 index 0000000..e217028 Binary files /dev/null and b/example/src/main/assets/pic/14/000028.png differ diff --git a/example/src/main/assets/pic/14/000029.png b/example/src/main/assets/pic/14/000029.png index 0ed7129..39ce00f 100644 Binary files a/example/src/main/assets/pic/14/000029.png and b/example/src/main/assets/pic/14/000029.png differ diff --git a/example/src/main/assets/pic/14/000030.png b/example/src/main/assets/pic/14/000030.png index 7131260..0706bc3 100644 Binary files a/example/src/main/assets/pic/14/000030.png and b/example/src/main/assets/pic/14/000030.png differ diff --git a/example/src/main/assets/pic/1/000000.png b/example/src/main/assets/pic/14/000031.png similarity index 51% rename from example/src/main/assets/pic/1/000000.png rename to example/src/main/assets/pic/14/000031.png index 928a9ba..1f26815 100644 Binary files a/example/src/main/assets/pic/1/000000.png and b/example/src/main/assets/pic/14/000031.png differ diff --git a/example/src/main/assets/pic/14/000032.png b/example/src/main/assets/pic/14/000032.png deleted file mode 100644 index 39ce00f..0000000 Binary files a/example/src/main/assets/pic/14/000032.png and /dev/null differ diff --git a/example/src/main/assets/pic/14/000033.png b/example/src/main/assets/pic/14/000033.png deleted file mode 100644 index 0706bc3..0000000 Binary files a/example/src/main/assets/pic/14/000033.png and /dev/null differ diff --git a/example/src/main/assets/pic/14/000034.png b/example/src/main/assets/pic/14/000034.png deleted file mode 100644 index e410d3f..0000000 Binary files a/example/src/main/assets/pic/14/000034.png and /dev/null differ diff --git a/example/src/main/assets/pic/14ex.png b/example/src/main/assets/pic/14ex.png index d84aa8e..5afea4c 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 deleted file mode 100644 index edb6fb5..0000000 Binary files a/example/src/main/assets/pic/1ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/21/000000.png b/example/src/main/assets/pic/21/000000.png index d167b18..90edc5e 100644 Binary files a/example/src/main/assets/pic/21/000000.png and b/example/src/main/assets/pic/21/000000.png differ diff --git a/example/src/main/assets/pic/21/000001.png b/example/src/main/assets/pic/21/000001.png index 90edc5e..a5c60e5 100644 Binary files a/example/src/main/assets/pic/21/000001.png and b/example/src/main/assets/pic/21/000001.png differ diff --git a/example/src/main/assets/pic/21/000002.png b/example/src/main/assets/pic/21/000002.png index a5c60e5..2b9c248 100644 Binary files a/example/src/main/assets/pic/21/000002.png and b/example/src/main/assets/pic/21/000002.png differ diff --git a/example/src/main/assets/pic/21/000003.png b/example/src/main/assets/pic/21/000003.png index 2b9c248..6b48be1 100644 Binary files a/example/src/main/assets/pic/21/000003.png and b/example/src/main/assets/pic/21/000003.png differ diff --git a/example/src/main/assets/pic/21/000004.png b/example/src/main/assets/pic/21/000004.png index 6b48be1..41408f2 100644 Binary files a/example/src/main/assets/pic/21/000004.png and b/example/src/main/assets/pic/21/000004.png differ diff --git a/example/src/main/assets/pic/21/000005.png b/example/src/main/assets/pic/21/000005.png index 41408f2..2a01769 100644 Binary files a/example/src/main/assets/pic/21/000005.png and b/example/src/main/assets/pic/21/000005.png differ diff --git a/example/src/main/assets/pic/21/000006.png b/example/src/main/assets/pic/21/000006.png index 2a01769..3f4e974 100644 Binary files a/example/src/main/assets/pic/21/000006.png and b/example/src/main/assets/pic/21/000006.png differ diff --git a/example/src/main/assets/pic/21/000007.png b/example/src/main/assets/pic/21/000007.png index 3f4e974..25a67a3 100644 Binary files a/example/src/main/assets/pic/21/000007.png and b/example/src/main/assets/pic/21/000007.png differ diff --git a/example/src/main/assets/pic/21/000008.png b/example/src/main/assets/pic/21/000008.png new file mode 100644 index 0000000..d43919d Binary files /dev/null and b/example/src/main/assets/pic/21/000008.png differ diff --git a/example/src/main/assets/pic/21/000009.png b/example/src/main/assets/pic/21/000009.png index d43919d..dfe1afa 100644 Binary files a/example/src/main/assets/pic/21/000009.png and b/example/src/main/assets/pic/21/000009.png differ diff --git a/example/src/main/assets/pic/21/000010.png b/example/src/main/assets/pic/21/000010.png index dfe1afa..a41e2d2 100644 Binary files a/example/src/main/assets/pic/21/000010.png and b/example/src/main/assets/pic/21/000010.png differ diff --git a/example/src/main/assets/pic/21/000011.png b/example/src/main/assets/pic/21/000011.png index a41e2d2..4e1a472 100644 Binary files a/example/src/main/assets/pic/21/000011.png and b/example/src/main/assets/pic/21/000011.png differ diff --git a/example/src/main/assets/pic/21/000012.png b/example/src/main/assets/pic/21/000012.png index 4e1a472..0c0fd08 100644 Binary files a/example/src/main/assets/pic/21/000012.png and b/example/src/main/assets/pic/21/000012.png differ diff --git a/example/src/main/assets/pic/21/000013.png b/example/src/main/assets/pic/21/000013.png index 0c0fd08..c9243f4 100644 Binary files a/example/src/main/assets/pic/21/000013.png and b/example/src/main/assets/pic/21/000013.png differ diff --git a/example/src/main/assets/pic/21/000014.png b/example/src/main/assets/pic/21/000014.png index c9243f4..dce127f 100644 Binary files a/example/src/main/assets/pic/21/000014.png and b/example/src/main/assets/pic/21/000014.png differ diff --git a/example/src/main/assets/pic/21/000015.png b/example/src/main/assets/pic/21/000015.png index dce127f..62116b4 100644 Binary files a/example/src/main/assets/pic/21/000015.png and b/example/src/main/assets/pic/21/000015.png differ diff --git a/example/src/main/assets/pic/21/000016.png b/example/src/main/assets/pic/21/000016.png index 1f59e4c..eb34f23 100644 Binary files a/example/src/main/assets/pic/21/000016.png and b/example/src/main/assets/pic/21/000016.png differ diff --git a/example/src/main/assets/pic/21/000017.png b/example/src/main/assets/pic/21/000017.png index 62116b4..afd394b 100644 Binary files a/example/src/main/assets/pic/21/000017.png and b/example/src/main/assets/pic/21/000017.png differ diff --git a/example/src/main/assets/pic/21/000018.png b/example/src/main/assets/pic/21/000018.png index 3c2a32f..8950558 100644 Binary files a/example/src/main/assets/pic/21/000018.png and b/example/src/main/assets/pic/21/000018.png differ diff --git a/example/src/main/assets/pic/21/000019.png b/example/src/main/assets/pic/21/000019.png new file mode 100644 index 0000000..d9a02b7 Binary files /dev/null and b/example/src/main/assets/pic/21/000019.png differ diff --git a/example/src/main/assets/pic/21/000020.png b/example/src/main/assets/pic/21/000020.png index afd394b..6c80dec 100644 Binary files a/example/src/main/assets/pic/21/000020.png and b/example/src/main/assets/pic/21/000020.png differ diff --git a/example/src/main/assets/pic/21/000021.png b/example/src/main/assets/pic/21/000021.png index 8950558..833093c 100644 Binary files a/example/src/main/assets/pic/21/000021.png and b/example/src/main/assets/pic/21/000021.png differ diff --git a/example/src/main/assets/pic/21/000022.png b/example/src/main/assets/pic/21/000022.png new file mode 100644 index 0000000..aa7297c Binary files /dev/null and b/example/src/main/assets/pic/21/000022.png differ diff --git a/example/src/main/assets/pic/21/000023.png b/example/src/main/assets/pic/21/000023.png index 6c80dec..9d68253 100644 Binary files a/example/src/main/assets/pic/21/000023.png and b/example/src/main/assets/pic/21/000023.png differ diff --git a/example/src/main/assets/pic/21/000024.png b/example/src/main/assets/pic/21/000024.png index 833093c..535e069 100644 Binary files a/example/src/main/assets/pic/21/000024.png and b/example/src/main/assets/pic/21/000024.png differ diff --git a/example/src/main/assets/pic/21/000025.png b/example/src/main/assets/pic/21/000025.png index aa7297c..2b5cfc2 100644 Binary files a/example/src/main/assets/pic/21/000025.png and b/example/src/main/assets/pic/21/000025.png differ diff --git a/example/src/main/assets/pic/21/000026.png b/example/src/main/assets/pic/21/000026.png index 9d68253..fa65c9e 100644 Binary files a/example/src/main/assets/pic/21/000026.png and b/example/src/main/assets/pic/21/000026.png differ diff --git a/example/src/main/assets/pic/21/000027.png b/example/src/main/assets/pic/21/000027.png new file mode 100644 index 0000000..776b5c0 Binary files /dev/null and b/example/src/main/assets/pic/21/000027.png differ diff --git a/example/src/main/assets/pic/21/000028.png b/example/src/main/assets/pic/21/000028.png index 2b5cfc2..126896d 100644 Binary files a/example/src/main/assets/pic/21/000028.png and b/example/src/main/assets/pic/21/000028.png differ diff --git a/example/src/main/assets/pic/21/000029.png b/example/src/main/assets/pic/21/000029.png index fa65c9e..0e5b9f5 100644 Binary files a/example/src/main/assets/pic/21/000029.png and b/example/src/main/assets/pic/21/000029.png differ diff --git a/example/src/main/assets/pic/21/000030.png b/example/src/main/assets/pic/21/000030.png index 776b5c0..0841a81 100644 Binary files a/example/src/main/assets/pic/21/000030.png and b/example/src/main/assets/pic/21/000030.png differ diff --git a/example/src/main/assets/pic/21/000035.png b/example/src/main/assets/pic/21/000031.png similarity index 100% rename from example/src/main/assets/pic/21/000035.png rename to example/src/main/assets/pic/21/000031.png diff --git a/example/src/main/assets/pic/21/000032.png b/example/src/main/assets/pic/21/000032.png deleted file mode 100644 index 0e5b9f5..0000000 Binary files a/example/src/main/assets/pic/21/000032.png and /dev/null differ diff --git a/example/src/main/assets/pic/21/000033.png b/example/src/main/assets/pic/21/000033.png deleted file mode 100644 index 0841a81..0000000 Binary files a/example/src/main/assets/pic/21/000033.png and /dev/null differ diff --git a/example/src/main/assets/pic/21ex.png b/example/src/main/assets/pic/21ex.png index 509b93a..d55f143 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 deleted file mode 100644 index edb6fb5..0000000 Binary files a/example/src/main/assets/pic/2ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/54/000000.png b/example/src/main/assets/pic/54/000000.png deleted file mode 100644 index 928a9ba..0000000 Binary files a/example/src/main/assets/pic/54/000000.png and /dev/null differ diff --git a/example/src/main/assets/pic/54ex.png b/example/src/main/assets/pic/54ex.png deleted file mode 100644 index edb6fb5..0000000 Binary files a/example/src/main/assets/pic/54ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/55/000000.png b/example/src/main/assets/pic/55/000000.png deleted file mode 100644 index 928a9ba..0000000 Binary files a/example/src/main/assets/pic/55/000000.png and /dev/null differ diff --git a/example/src/main/assets/pic/55ex.png b/example/src/main/assets/pic/55ex.png deleted file mode 100644 index edb6fb5..0000000 Binary files a/example/src/main/assets/pic/55ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/56/000000.png b/example/src/main/assets/pic/56/000000.png index e25a407..dc203d7 100644 Binary files a/example/src/main/assets/pic/56/000000.png and b/example/src/main/assets/pic/56/000000.png differ diff --git a/example/src/main/assets/pic/56/000001.png b/example/src/main/assets/pic/56/000001.png index dc203d7..559acb2 100644 Binary files a/example/src/main/assets/pic/56/000001.png and b/example/src/main/assets/pic/56/000001.png differ diff --git a/example/src/main/assets/pic/56/000002.png b/example/src/main/assets/pic/56/000002.png index 559acb2..492d454 100644 Binary files a/example/src/main/assets/pic/56/000002.png and b/example/src/main/assets/pic/56/000002.png differ diff --git a/example/src/main/assets/pic/56/000003.png b/example/src/main/assets/pic/56/000003.png index 492d454..8c322a0 100644 Binary files a/example/src/main/assets/pic/56/000003.png and b/example/src/main/assets/pic/56/000003.png differ diff --git a/example/src/main/assets/pic/56/000004.png b/example/src/main/assets/pic/56/000004.png index 8c322a0..667b853 100644 Binary files a/example/src/main/assets/pic/56/000004.png and b/example/src/main/assets/pic/56/000004.png differ diff --git a/example/src/main/assets/pic/56/000005.png b/example/src/main/assets/pic/56/000005.png index 667b853..b25f188 100644 Binary files a/example/src/main/assets/pic/56/000005.png and b/example/src/main/assets/pic/56/000005.png differ diff --git a/example/src/main/assets/pic/56/000006.png b/example/src/main/assets/pic/56/000006.png index b25f188..1844de1 100644 Binary files a/example/src/main/assets/pic/56/000006.png and b/example/src/main/assets/pic/56/000006.png differ diff --git a/example/src/main/assets/pic/56/000007.png b/example/src/main/assets/pic/56/000007.png index 1844de1..90bfae8 100644 Binary files a/example/src/main/assets/pic/56/000007.png and b/example/src/main/assets/pic/56/000007.png differ diff --git a/example/src/main/assets/pic/56/000008.png b/example/src/main/assets/pic/56/000008.png new file mode 100644 index 0000000..441b108 Binary files /dev/null and b/example/src/main/assets/pic/56/000008.png differ diff --git a/example/src/main/assets/pic/56/000009.png b/example/src/main/assets/pic/56/000009.png index 441b108..4445e76 100644 Binary files a/example/src/main/assets/pic/56/000009.png and b/example/src/main/assets/pic/56/000009.png differ diff --git a/example/src/main/assets/pic/56/000010.png b/example/src/main/assets/pic/56/000010.png new file mode 100644 index 0000000..774adeb Binary files /dev/null and b/example/src/main/assets/pic/56/000010.png differ diff --git a/example/src/main/assets/pic/56/000011.png b/example/src/main/assets/pic/56/000011.png index 774adeb..7227ef6 100644 Binary files a/example/src/main/assets/pic/56/000011.png and b/example/src/main/assets/pic/56/000011.png differ diff --git a/example/src/main/assets/pic/56/000012.png b/example/src/main/assets/pic/56/000012.png index 7227ef6..5451354 100644 Binary files a/example/src/main/assets/pic/56/000012.png and b/example/src/main/assets/pic/56/000012.png differ diff --git a/example/src/main/assets/pic/56/000013.png b/example/src/main/assets/pic/56/000013.png new file mode 100644 index 0000000..07ef17e Binary files /dev/null and b/example/src/main/assets/pic/56/000013.png differ diff --git a/example/src/main/assets/pic/56/000014.png b/example/src/main/assets/pic/56/000014.png index 07ef17e..ec2ea0f 100644 Binary files a/example/src/main/assets/pic/56/000014.png and b/example/src/main/assets/pic/56/000014.png differ diff --git a/example/src/main/assets/pic/56/000015.png b/example/src/main/assets/pic/56/000015.png index ec2ea0f..509274e 100644 Binary files a/example/src/main/assets/pic/56/000015.png and b/example/src/main/assets/pic/56/000015.png differ diff --git a/example/src/main/assets/pic/56/000016.png b/example/src/main/assets/pic/56/000016.png index 6c57360..8c37626 100644 Binary files a/example/src/main/assets/pic/56/000016.png and b/example/src/main/assets/pic/56/000016.png differ diff --git a/example/src/main/assets/pic/56/000017.png b/example/src/main/assets/pic/56/000017.png index 509274e..c059e79 100644 Binary files a/example/src/main/assets/pic/56/000017.png and b/example/src/main/assets/pic/56/000017.png differ diff --git a/example/src/main/assets/pic/56/000018.png b/example/src/main/assets/pic/56/000018.png index a6ecf89..85fd249 100644 Binary files a/example/src/main/assets/pic/56/000018.png and b/example/src/main/assets/pic/56/000018.png differ diff --git a/example/src/main/assets/pic/56/000019.png b/example/src/main/assets/pic/56/000019.png index 8c37626..7250c80 100644 Binary files a/example/src/main/assets/pic/56/000019.png and b/example/src/main/assets/pic/56/000019.png differ diff --git a/example/src/main/assets/pic/56/000020.png b/example/src/main/assets/pic/56/000020.png index c059e79..2c9b6d6 100644 Binary files a/example/src/main/assets/pic/56/000020.png and b/example/src/main/assets/pic/56/000020.png differ diff --git a/example/src/main/assets/pic/56/000021.png b/example/src/main/assets/pic/56/000021.png new file mode 100644 index 0000000..5c7d9ae Binary files /dev/null and b/example/src/main/assets/pic/56/000021.png differ diff --git a/example/src/main/assets/pic/56/000022.png b/example/src/main/assets/pic/56/000022.png index 7250c80..af125d6 100644 Binary files a/example/src/main/assets/pic/56/000022.png and b/example/src/main/assets/pic/56/000022.png differ diff --git a/example/src/main/assets/pic/56/000023.png b/example/src/main/assets/pic/56/000023.png index 2c9b6d6..9f2eeea 100644 Binary files a/example/src/main/assets/pic/56/000023.png and b/example/src/main/assets/pic/56/000023.png differ diff --git a/example/src/main/assets/pic/56/000024.png b/example/src/main/assets/pic/56/000024.png index 5c7d9ae..e18ae0c 100644 Binary files a/example/src/main/assets/pic/56/000024.png and b/example/src/main/assets/pic/56/000024.png differ diff --git a/example/src/main/assets/pic/56/000025.png b/example/src/main/assets/pic/56/000025.png index af125d6..6cd5a05 100644 Binary files a/example/src/main/assets/pic/56/000025.png and b/example/src/main/assets/pic/56/000025.png differ diff --git a/example/src/main/assets/pic/56/000026.png b/example/src/main/assets/pic/56/000026.png new file mode 100644 index 0000000..6836e62 Binary files /dev/null and b/example/src/main/assets/pic/56/000026.png differ diff --git a/example/src/main/assets/pic/56/000027.png b/example/src/main/assets/pic/56/000027.png index e18ae0c..3ac26cc 100644 Binary files a/example/src/main/assets/pic/56/000027.png and b/example/src/main/assets/pic/56/000027.png differ diff --git a/example/src/main/assets/pic/56/000028.png b/example/src/main/assets/pic/56/000028.png new file mode 100644 index 0000000..42f8017 Binary files /dev/null and b/example/src/main/assets/pic/56/000028.png differ diff --git a/example/src/main/assets/pic/56/000029.png b/example/src/main/assets/pic/56/000029.png index 6836e62..c524dbc 100644 Binary files a/example/src/main/assets/pic/56/000029.png and b/example/src/main/assets/pic/56/000029.png differ diff --git a/example/src/main/assets/pic/56/000030.png b/example/src/main/assets/pic/56/000030.png index 3ac26cc..4504b98 100644 Binary files a/example/src/main/assets/pic/56/000030.png and b/example/src/main/assets/pic/56/000030.png differ diff --git a/example/src/main/assets/pic/56/000035.png b/example/src/main/assets/pic/56/000031.png similarity index 100% rename from example/src/main/assets/pic/56/000035.png rename to example/src/main/assets/pic/56/000031.png diff --git a/example/src/main/assets/pic/56/000032.png b/example/src/main/assets/pic/56/000032.png deleted file mode 100644 index c524dbc..0000000 Binary files a/example/src/main/assets/pic/56/000032.png and /dev/null differ diff --git a/example/src/main/assets/pic/56/000033.png b/example/src/main/assets/pic/56/000033.png deleted file mode 100644 index 4504b98..0000000 Binary files a/example/src/main/assets/pic/56/000033.png and /dev/null differ diff --git a/example/src/main/assets/pic/56/000034.png b/example/src/main/assets/pic/56/000034.png deleted file mode 100644 index 26b2a85..0000000 Binary files a/example/src/main/assets/pic/56/000034.png and /dev/null differ diff --git a/example/src/main/assets/pic/56ex.png b/example/src/main/assets/pic/56ex.png index 66aeba0..30e9959 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/6/000000.png b/example/src/main/assets/pic/6/000000.png index 643dcb7..d2679c2 100644 Binary files a/example/src/main/assets/pic/6/000000.png and b/example/src/main/assets/pic/6/000000.png differ diff --git a/example/src/main/assets/pic/6/000001.png b/example/src/main/assets/pic/6/000001.png new file mode 100644 index 0000000..2fba049 Binary files /dev/null and b/example/src/main/assets/pic/6/000001.png differ diff --git a/example/src/main/assets/pic/6/000002.png b/example/src/main/assets/pic/6/000002.png index c630ba2..6fd82ab 100644 Binary files a/example/src/main/assets/pic/6/000002.png and b/example/src/main/assets/pic/6/000002.png differ diff --git a/example/src/main/assets/pic/6/000003.png b/example/src/main/assets/pic/6/000003.png new file mode 100644 index 0000000..231b173 Binary files /dev/null and b/example/src/main/assets/pic/6/000003.png differ diff --git a/example/src/main/assets/pic/6/000004.png b/example/src/main/assets/pic/6/000004.png index c6c4540..80eb567 100644 Binary files a/example/src/main/assets/pic/6/000004.png and b/example/src/main/assets/pic/6/000004.png differ diff --git a/example/src/main/assets/pic/6/000005.png b/example/src/main/assets/pic/6/000005.png new file mode 100644 index 0000000..5c3d456 Binary files /dev/null and b/example/src/main/assets/pic/6/000005.png differ diff --git a/example/src/main/assets/pic/6/000006.png b/example/src/main/assets/pic/6/000006.png index 68e8993..8f5eeeb 100644 Binary files a/example/src/main/assets/pic/6/000006.png and b/example/src/main/assets/pic/6/000006.png differ diff --git a/example/src/main/assets/pic/6/000007.png b/example/src/main/assets/pic/6/000007.png new file mode 100644 index 0000000..9e93f28 Binary files /dev/null and b/example/src/main/assets/pic/6/000007.png differ diff --git a/example/src/main/assets/pic/6/000008.png b/example/src/main/assets/pic/6/000008.png index f25b67d..2d0a76c 100644 Binary files a/example/src/main/assets/pic/6/000008.png and b/example/src/main/assets/pic/6/000008.png differ diff --git a/example/src/main/assets/pic/6/000009.png b/example/src/main/assets/pic/6/000009.png new file mode 100644 index 0000000..05aa3cb Binary files /dev/null and b/example/src/main/assets/pic/6/000009.png differ diff --git a/example/src/main/assets/pic/6/000010.png b/example/src/main/assets/pic/6/000010.png index f91ef7a..2db444e 100644 Binary files a/example/src/main/assets/pic/6/000010.png and b/example/src/main/assets/pic/6/000010.png differ diff --git a/example/src/main/assets/pic/6/000011.png b/example/src/main/assets/pic/6/000011.png new file mode 100644 index 0000000..7709f73 Binary files /dev/null and b/example/src/main/assets/pic/6/000011.png differ diff --git a/example/src/main/assets/pic/6/000012.png b/example/src/main/assets/pic/6/000012.png index e4cde13..7bee292 100644 Binary files a/example/src/main/assets/pic/6/000012.png and b/example/src/main/assets/pic/6/000012.png differ diff --git a/example/src/main/assets/pic/6/000013.png b/example/src/main/assets/pic/6/000013.png new file mode 100644 index 0000000..079c2bd Binary files /dev/null and b/example/src/main/assets/pic/6/000013.png differ diff --git a/example/src/main/assets/pic/6/000014.png b/example/src/main/assets/pic/6/000014.png index 582e95a..9dcebb5 100644 Binary files a/example/src/main/assets/pic/6/000014.png and b/example/src/main/assets/pic/6/000014.png differ diff --git a/example/src/main/assets/pic/6/000015.png b/example/src/main/assets/pic/6/000015.png new file mode 100644 index 0000000..89d8f85 Binary files /dev/null and b/example/src/main/assets/pic/6/000015.png differ diff --git a/example/src/main/assets/pic/6/000016.png b/example/src/main/assets/pic/6/000016.png index d0c4d70..e6e76ae 100644 Binary files a/example/src/main/assets/pic/6/000016.png and b/example/src/main/assets/pic/6/000016.png differ diff --git a/example/src/main/assets/pic/6/000017.png b/example/src/main/assets/pic/6/000017.png new file mode 100644 index 0000000..61388c3 Binary files /dev/null and b/example/src/main/assets/pic/6/000017.png differ diff --git a/example/src/main/assets/pic/6/000018.png b/example/src/main/assets/pic/6/000018.png index 706d4e8..119bd46 100644 Binary files a/example/src/main/assets/pic/6/000018.png and b/example/src/main/assets/pic/6/000018.png differ diff --git a/example/src/main/assets/pic/6/000019.png b/example/src/main/assets/pic/6/000019.png new file mode 100644 index 0000000..f65e3da Binary files /dev/null and b/example/src/main/assets/pic/6/000019.png differ diff --git a/example/src/main/assets/pic/6/000020.png b/example/src/main/assets/pic/6/000020.png index 71b1e74..17f7e79 100644 Binary files a/example/src/main/assets/pic/6/000020.png and b/example/src/main/assets/pic/6/000020.png differ diff --git a/example/src/main/assets/pic/6/000021.png b/example/src/main/assets/pic/6/000021.png new file mode 100644 index 0000000..2db444e Binary files /dev/null and b/example/src/main/assets/pic/6/000021.png differ diff --git a/example/src/main/assets/pic/6/000022.png b/example/src/main/assets/pic/6/000022.png index 135fe48..fc0c094 100644 Binary files a/example/src/main/assets/pic/6/000022.png and b/example/src/main/assets/pic/6/000022.png differ diff --git a/example/src/main/assets/pic/6/000023.png b/example/src/main/assets/pic/6/000023.png new file mode 100644 index 0000000..c751b4a Binary files /dev/null and b/example/src/main/assets/pic/6/000023.png differ diff --git a/example/src/main/assets/pic/6/000024.png b/example/src/main/assets/pic/6/000024.png index 3411eca..07d16db 100644 Binary files a/example/src/main/assets/pic/6/000024.png and b/example/src/main/assets/pic/6/000024.png differ diff --git a/example/src/main/assets/pic/6/000032.png b/example/src/main/assets/pic/6/000025.png similarity index 79% rename from example/src/main/assets/pic/6/000032.png rename to example/src/main/assets/pic/6/000025.png index f25bbd9..04f5ca2 100644 Binary files a/example/src/main/assets/pic/6/000032.png and b/example/src/main/assets/pic/6/000025.png differ diff --git a/example/src/main/assets/pic/6/000026.png b/example/src/main/assets/pic/6/000026.png index d708cf6..a24cc44 100644 Binary files a/example/src/main/assets/pic/6/000026.png and b/example/src/main/assets/pic/6/000026.png differ diff --git a/example/src/main/assets/pic/6/000027.png b/example/src/main/assets/pic/6/000027.png new file mode 100644 index 0000000..97b0130 Binary files /dev/null and b/example/src/main/assets/pic/6/000027.png differ diff --git a/example/src/main/assets/pic/6/000028.png b/example/src/main/assets/pic/6/000028.png index e326770..89e3185 100644 Binary files a/example/src/main/assets/pic/6/000028.png and b/example/src/main/assets/pic/6/000028.png differ diff --git a/example/src/main/assets/pic/6/000038.png b/example/src/main/assets/pic/6/000029.png similarity index 85% rename from example/src/main/assets/pic/6/000038.png rename to example/src/main/assets/pic/6/000029.png index 1ce522f..de6fdd4 100644 Binary files a/example/src/main/assets/pic/6/000038.png and b/example/src/main/assets/pic/6/000029.png differ diff --git a/example/src/main/assets/pic/6/000030.png b/example/src/main/assets/pic/6/000030.png index 9049eaf..9e0bf25 100644 Binary files a/example/src/main/assets/pic/6/000030.png and b/example/src/main/assets/pic/6/000030.png differ diff --git a/example/src/main/assets/pic/6/000031.png b/example/src/main/assets/pic/6/000031.png new file mode 100644 index 0000000..2db444e Binary files /dev/null and b/example/src/main/assets/pic/6/000031.png differ diff --git a/example/src/main/assets/pic/6/000034.png b/example/src/main/assets/pic/6/000034.png deleted file mode 100644 index 7697fd8..0000000 Binary files a/example/src/main/assets/pic/6/000034.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000036.png b/example/src/main/assets/pic/6/000036.png deleted file mode 100644 index 250b3ce..0000000 Binary files a/example/src/main/assets/pic/6/000036.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000040.png b/example/src/main/assets/pic/6/000040.png deleted file mode 100644 index 6645368..0000000 Binary files a/example/src/main/assets/pic/6/000040.png and /dev/null differ diff --git a/example/src/main/assets/pic/65/000000.png b/example/src/main/assets/pic/65/000000.png index 88f2d75..9374b02 100644 Binary files a/example/src/main/assets/pic/65/000000.png and b/example/src/main/assets/pic/65/000000.png differ diff --git a/example/src/main/assets/pic/65/000001.png b/example/src/main/assets/pic/65/000001.png index 9374b02..dd5b7a9 100644 Binary files a/example/src/main/assets/pic/65/000001.png and b/example/src/main/assets/pic/65/000001.png differ diff --git a/example/src/main/assets/pic/65/000002.png b/example/src/main/assets/pic/65/000002.png index dd5b7a9..e64a19c 100644 Binary files a/example/src/main/assets/pic/65/000002.png and b/example/src/main/assets/pic/65/000002.png differ diff --git a/example/src/main/assets/pic/65/000003.png b/example/src/main/assets/pic/65/000003.png index e64a19c..6f22ffd 100644 Binary files a/example/src/main/assets/pic/65/000003.png and b/example/src/main/assets/pic/65/000003.png differ diff --git a/example/src/main/assets/pic/65/000004.png b/example/src/main/assets/pic/65/000004.png index 6f22ffd..2216fe1 100644 Binary files a/example/src/main/assets/pic/65/000004.png and b/example/src/main/assets/pic/65/000004.png differ diff --git a/example/src/main/assets/pic/65/000005.png b/example/src/main/assets/pic/65/000005.png index 2216fe1..4383f38 100644 Binary files a/example/src/main/assets/pic/65/000005.png and b/example/src/main/assets/pic/65/000005.png differ diff --git a/example/src/main/assets/pic/65/000006.png b/example/src/main/assets/pic/65/000006.png index 4383f38..85c3aa0 100644 Binary files a/example/src/main/assets/pic/65/000006.png and b/example/src/main/assets/pic/65/000006.png differ diff --git a/example/src/main/assets/pic/65/000007.png b/example/src/main/assets/pic/65/000007.png index 85c3aa0..e292b9e 100644 Binary files a/example/src/main/assets/pic/65/000007.png and b/example/src/main/assets/pic/65/000007.png differ diff --git a/example/src/main/assets/pic/65/000008.png b/example/src/main/assets/pic/65/000008.png new file mode 100644 index 0000000..ca0f9f5 Binary files /dev/null and b/example/src/main/assets/pic/65/000008.png differ diff --git a/example/src/main/assets/pic/65/000009.png b/example/src/main/assets/pic/65/000009.png index ca0f9f5..86c7676 100644 Binary files a/example/src/main/assets/pic/65/000009.png and b/example/src/main/assets/pic/65/000009.png differ diff --git a/example/src/main/assets/pic/65/000010.png b/example/src/main/assets/pic/65/000010.png new file mode 100644 index 0000000..5c1ccf4 Binary files /dev/null and b/example/src/main/assets/pic/65/000010.png differ diff --git a/example/src/main/assets/pic/65/000011.png b/example/src/main/assets/pic/65/000011.png index 5c1ccf4..14121be 100644 Binary files a/example/src/main/assets/pic/65/000011.png and b/example/src/main/assets/pic/65/000011.png differ diff --git a/example/src/main/assets/pic/65/000012.png b/example/src/main/assets/pic/65/000012.png index 14121be..2c25e6a 100644 Binary files a/example/src/main/assets/pic/65/000012.png and b/example/src/main/assets/pic/65/000012.png differ diff --git a/example/src/main/assets/pic/65/000013.png b/example/src/main/assets/pic/65/000013.png new file mode 100644 index 0000000..8b99ee0 Binary files /dev/null and b/example/src/main/assets/pic/65/000013.png differ diff --git a/example/src/main/assets/pic/65/000014.png b/example/src/main/assets/pic/65/000014.png index 8b99ee0..0a0aab6 100644 Binary files a/example/src/main/assets/pic/65/000014.png and b/example/src/main/assets/pic/65/000014.png differ diff --git a/example/src/main/assets/pic/65/000015.png b/example/src/main/assets/pic/65/000015.png index 0a0aab6..5db2bb8 100644 Binary files a/example/src/main/assets/pic/65/000015.png and b/example/src/main/assets/pic/65/000015.png differ diff --git a/example/src/main/assets/pic/65/000016.png b/example/src/main/assets/pic/65/000016.png index d53c246..6ae411a 100644 Binary files a/example/src/main/assets/pic/65/000016.png and b/example/src/main/assets/pic/65/000016.png differ diff --git a/example/src/main/assets/pic/65/000017.png b/example/src/main/assets/pic/65/000017.png index 5db2bb8..8226bd3 100644 Binary files a/example/src/main/assets/pic/65/000017.png and b/example/src/main/assets/pic/65/000017.png differ diff --git a/example/src/main/assets/pic/65/000018.png b/example/src/main/assets/pic/65/000018.png index 48f1d86..605d075 100644 Binary files a/example/src/main/assets/pic/65/000018.png and b/example/src/main/assets/pic/65/000018.png differ diff --git a/example/src/main/assets/pic/65/000019.png b/example/src/main/assets/pic/65/000019.png index 6ae411a..44c92ac 100644 Binary files a/example/src/main/assets/pic/65/000019.png and b/example/src/main/assets/pic/65/000019.png differ diff --git a/example/src/main/assets/pic/65/000020.png b/example/src/main/assets/pic/65/000020.png new file mode 100644 index 0000000..fdccfba Binary files /dev/null and b/example/src/main/assets/pic/65/000020.png differ diff --git a/example/src/main/assets/pic/65/000021.png b/example/src/main/assets/pic/65/000021.png index 605d075..13d52a5 100644 Binary files a/example/src/main/assets/pic/65/000021.png and b/example/src/main/assets/pic/65/000021.png differ diff --git a/example/src/main/assets/pic/65/000022.png b/example/src/main/assets/pic/65/000022.png index 44c92ac..c310eea 100644 Binary files a/example/src/main/assets/pic/65/000022.png and b/example/src/main/assets/pic/65/000022.png differ diff --git a/example/src/main/assets/pic/65/000023.png b/example/src/main/assets/pic/65/000023.png index fdccfba..d0dff1b 100644 Binary files a/example/src/main/assets/pic/65/000023.png and b/example/src/main/assets/pic/65/000023.png differ diff --git a/example/src/main/assets/pic/65/000024.png b/example/src/main/assets/pic/65/000024.png index 13d52a5..cb1687b 100644 Binary files a/example/src/main/assets/pic/65/000024.png and b/example/src/main/assets/pic/65/000024.png differ diff --git a/example/src/main/assets/pic/65/000025.png b/example/src/main/assets/pic/65/000025.png index c310eea..84da3a6 100644 Binary files a/example/src/main/assets/pic/65/000025.png and b/example/src/main/assets/pic/65/000025.png differ diff --git a/example/src/main/assets/pic/65/000026.png b/example/src/main/assets/pic/65/000026.png index d0dff1b..b2121f9 100644 Binary files a/example/src/main/assets/pic/65/000026.png and b/example/src/main/assets/pic/65/000026.png differ diff --git a/example/src/main/assets/pic/65/000027.png b/example/src/main/assets/pic/65/000027.png index cb1687b..80d8060 100644 Binary files a/example/src/main/assets/pic/65/000027.png and b/example/src/main/assets/pic/65/000027.png differ diff --git a/example/src/main/assets/pic/65/000028.png b/example/src/main/assets/pic/65/000028.png new file mode 100644 index 0000000..381fe82 Binary files /dev/null and b/example/src/main/assets/pic/65/000028.png differ diff --git a/example/src/main/assets/pic/65/000029.png b/example/src/main/assets/pic/65/000029.png index b2121f9..cd20770 100644 Binary files a/example/src/main/assets/pic/65/000029.png and b/example/src/main/assets/pic/65/000029.png differ diff --git a/example/src/main/assets/pic/65/000030.png b/example/src/main/assets/pic/65/000030.png index 80d8060..bd9116b 100644 Binary files a/example/src/main/assets/pic/65/000030.png and b/example/src/main/assets/pic/65/000030.png differ diff --git a/example/src/main/assets/pic/65/000035.png b/example/src/main/assets/pic/65/000031.png similarity index 100% rename from example/src/main/assets/pic/65/000035.png rename to example/src/main/assets/pic/65/000031.png diff --git a/example/src/main/assets/pic/65/000032.png b/example/src/main/assets/pic/65/000032.png deleted file mode 100644 index cd20770..0000000 Binary files a/example/src/main/assets/pic/65/000032.png and /dev/null differ diff --git a/example/src/main/assets/pic/65/000033.png b/example/src/main/assets/pic/65/000033.png deleted file mode 100644 index bd9116b..0000000 Binary files a/example/src/main/assets/pic/65/000033.png and /dev/null differ diff --git a/example/src/main/assets/pic/65/000034.png b/example/src/main/assets/pic/65/000034.png deleted file mode 100644 index c454172..0000000 Binary files a/example/src/main/assets/pic/65/000034.png and /dev/null differ diff --git a/example/src/main/assets/pic/65ex.png b/example/src/main/assets/pic/65ex.png index 453568b..7ac1f6c 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/69/000000.png b/example/src/main/assets/pic/69/000000.png deleted file mode 100644 index 928a9ba..0000000 Binary files a/example/src/main/assets/pic/69/000000.png and /dev/null differ diff --git a/example/src/main/assets/pic/69ex.png b/example/src/main/assets/pic/69ex.png deleted file mode 100644 index edb6fb5..0000000 Binary files a/example/src/main/assets/pic/69ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/6ex.png b/example/src/main/assets/pic/6ex.png index 261b49c..a9ae812 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/000000.png b/example/src/main/assets/pic/7/000000.png index 365fd6f..3f5f4f9 100644 Binary files a/example/src/main/assets/pic/7/000000.png and b/example/src/main/assets/pic/7/000000.png differ diff --git a/example/src/main/assets/pic/7/000001.png b/example/src/main/assets/pic/7/000001.png new file mode 100644 index 0000000..cdbdf8d Binary files /dev/null and b/example/src/main/assets/pic/7/000001.png differ diff --git a/example/src/main/assets/pic/7/000002.png b/example/src/main/assets/pic/7/000002.png index cdbdf8d..e32cea1 100644 Binary files a/example/src/main/assets/pic/7/000002.png and b/example/src/main/assets/pic/7/000002.png differ diff --git a/example/src/main/assets/pic/7/000003.png b/example/src/main/assets/pic/7/000003.png new file mode 100644 index 0000000..44bdc5a Binary files /dev/null and b/example/src/main/assets/pic/7/000003.png differ diff --git a/example/src/main/assets/pic/7/000004.png b/example/src/main/assets/pic/7/000004.png index 44bdc5a..299144d 100644 Binary files a/example/src/main/assets/pic/7/000004.png and b/example/src/main/assets/pic/7/000004.png differ diff --git a/example/src/main/assets/pic/7/000005.png b/example/src/main/assets/pic/7/000005.png new file mode 100644 index 0000000..925947d Binary files /dev/null and b/example/src/main/assets/pic/7/000005.png differ diff --git a/example/src/main/assets/pic/7/000006.png b/example/src/main/assets/pic/7/000006.png index 925947d..0206539 100644 Binary files a/example/src/main/assets/pic/7/000006.png and b/example/src/main/assets/pic/7/000006.png differ diff --git a/example/src/main/assets/pic/7/000007.png b/example/src/main/assets/pic/7/000007.png new file mode 100644 index 0000000..5ff29b9 Binary files /dev/null and b/example/src/main/assets/pic/7/000007.png differ diff --git a/example/src/main/assets/pic/7/000008.png b/example/src/main/assets/pic/7/000008.png index 5ff29b9..9de5f00 100644 Binary files a/example/src/main/assets/pic/7/000008.png and b/example/src/main/assets/pic/7/000008.png differ diff --git a/example/src/main/assets/pic/7/000009.png b/example/src/main/assets/pic/7/000009.png new file mode 100644 index 0000000..616e1a9 Binary files /dev/null and b/example/src/main/assets/pic/7/000009.png differ diff --git a/example/src/main/assets/pic/7/000010.png b/example/src/main/assets/pic/7/000010.png index 616e1a9..838c033 100644 Binary files a/example/src/main/assets/pic/7/000010.png and b/example/src/main/assets/pic/7/000010.png differ diff --git a/example/src/main/assets/pic/7/000011.png b/example/src/main/assets/pic/7/000011.png new file mode 100644 index 0000000..d5e4a35 Binary files /dev/null and b/example/src/main/assets/pic/7/000011.png differ diff --git a/example/src/main/assets/pic/7/000012.png b/example/src/main/assets/pic/7/000012.png index d5e4a35..5960d85 100644 Binary files a/example/src/main/assets/pic/7/000012.png and b/example/src/main/assets/pic/7/000012.png differ diff --git a/example/src/main/assets/pic/7/000013.png b/example/src/main/assets/pic/7/000013.png new file mode 100644 index 0000000..05f7f27 Binary files /dev/null and b/example/src/main/assets/pic/7/000013.png differ diff --git a/example/src/main/assets/pic/7/000014.png b/example/src/main/assets/pic/7/000014.png index 05f7f27..4d73872 100644 Binary files a/example/src/main/assets/pic/7/000014.png and b/example/src/main/assets/pic/7/000014.png differ diff --git a/example/src/main/assets/pic/7/000035.png b/example/src/main/assets/pic/7/000015.png similarity index 100% rename from example/src/main/assets/pic/7/000035.png rename to example/src/main/assets/pic/7/000015.png diff --git a/example/src/main/assets/pic/7/000016.png b/example/src/main/assets/pic/7/000016.png index b31b2bd..5ee30cf 100644 Binary files a/example/src/main/assets/pic/7/000016.png and b/example/src/main/assets/pic/7/000016.png differ diff --git a/example/src/main/assets/pic/7/000017.png b/example/src/main/assets/pic/7/000017.png new file mode 100644 index 0000000..505179f Binary files /dev/null and b/example/src/main/assets/pic/7/000017.png differ diff --git a/example/src/main/assets/pic/7/000018.png b/example/src/main/assets/pic/7/000018.png index d543351..f8915bd 100644 Binary files a/example/src/main/assets/pic/7/000018.png and b/example/src/main/assets/pic/7/000018.png differ diff --git a/example/src/main/assets/pic/7/000019.png b/example/src/main/assets/pic/7/000019.png new file mode 100644 index 0000000..51d88c6 Binary files /dev/null and b/example/src/main/assets/pic/7/000019.png differ diff --git a/example/src/main/assets/pic/7/000020.png b/example/src/main/assets/pic/7/000020.png index 505179f..eebbc71 100644 Binary files a/example/src/main/assets/pic/7/000020.png and b/example/src/main/assets/pic/7/000020.png differ diff --git a/example/src/main/assets/pic/7/000021.png b/example/src/main/assets/pic/7/000021.png new file mode 100644 index 0000000..f5fb813 Binary files /dev/null and b/example/src/main/assets/pic/7/000021.png differ diff --git a/example/src/main/assets/pic/7/000022.png b/example/src/main/assets/pic/7/000022.png index 51d88c6..ed435cb 100644 Binary files a/example/src/main/assets/pic/7/000022.png and b/example/src/main/assets/pic/7/000022.png differ diff --git a/example/src/main/assets/pic/7/000023.png b/example/src/main/assets/pic/7/000023.png new file mode 100644 index 0000000..d1aec8d Binary files /dev/null and b/example/src/main/assets/pic/7/000023.png differ diff --git a/example/src/main/assets/pic/7/000024.png b/example/src/main/assets/pic/7/000024.png index f5fb813..06d8b99 100644 Binary files a/example/src/main/assets/pic/7/000024.png and b/example/src/main/assets/pic/7/000024.png differ diff --git a/example/src/main/assets/pic/7/000025.png b/example/src/main/assets/pic/7/000025.png new file mode 100644 index 0000000..286e969 Binary files /dev/null and b/example/src/main/assets/pic/7/000025.png differ diff --git a/example/src/main/assets/pic/7/000026.png b/example/src/main/assets/pic/7/000026.png index d1aec8d..3367939 100644 Binary files a/example/src/main/assets/pic/7/000026.png and b/example/src/main/assets/pic/7/000026.png differ diff --git a/example/src/main/assets/pic/7/000027.png b/example/src/main/assets/pic/7/000027.png new file mode 100644 index 0000000..ead3d79 Binary files /dev/null and b/example/src/main/assets/pic/7/000027.png differ diff --git a/example/src/main/assets/pic/7/000028.png b/example/src/main/assets/pic/7/000028.png index 286e969..f42c808 100644 Binary files a/example/src/main/assets/pic/7/000028.png and b/example/src/main/assets/pic/7/000028.png differ diff --git a/example/src/main/assets/pic/7/000032.png b/example/src/main/assets/pic/7/000029.png similarity index 100% rename from example/src/main/assets/pic/7/000032.png rename to example/src/main/assets/pic/7/000029.png diff --git a/example/src/main/assets/pic/7/000030.png b/example/src/main/assets/pic/7/000030.png index ead3d79..4489b61 100644 Binary files a/example/src/main/assets/pic/7/000030.png and b/example/src/main/assets/pic/7/000030.png differ diff --git a/example/src/main/assets/pic/7/000031.png b/example/src/main/assets/pic/7/000031.png new file mode 100644 index 0000000..980d610 Binary files /dev/null and b/example/src/main/assets/pic/7/000031.png differ diff --git a/example/src/main/assets/pic/7/000034.png b/example/src/main/assets/pic/7/000034.png deleted file mode 100644 index 06d6f07..0000000 Binary files a/example/src/main/assets/pic/7/000034.png and /dev/null differ diff --git a/example/src/main/assets/pic/70/000000.png b/example/src/main/assets/pic/70/000000.png deleted file mode 100644 index 928a9ba..0000000 Binary files a/example/src/main/assets/pic/70/000000.png and /dev/null differ diff --git a/example/src/main/assets/pic/70ex.png b/example/src/main/assets/pic/70ex.png deleted file mode 100644 index edb6fb5..0000000 Binary files a/example/src/main/assets/pic/70ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/78/000000.png b/example/src/main/assets/pic/78/000000.png index 9e551c2..a77e931 100644 Binary files a/example/src/main/assets/pic/78/000000.png and b/example/src/main/assets/pic/78/000000.png differ diff --git a/example/src/main/assets/pic/78/000001.png b/example/src/main/assets/pic/78/000001.png index a77e931..4d82a6e 100644 Binary files a/example/src/main/assets/pic/78/000001.png and b/example/src/main/assets/pic/78/000001.png differ diff --git a/example/src/main/assets/pic/78/000002.png b/example/src/main/assets/pic/78/000002.png index 4d82a6e..01de382 100644 Binary files a/example/src/main/assets/pic/78/000002.png and b/example/src/main/assets/pic/78/000002.png differ diff --git a/example/src/main/assets/pic/78/000003.png b/example/src/main/assets/pic/78/000003.png index 01de382..4e3e520 100644 Binary files a/example/src/main/assets/pic/78/000003.png and b/example/src/main/assets/pic/78/000003.png differ diff --git a/example/src/main/assets/pic/78/000004.png b/example/src/main/assets/pic/78/000004.png index 4e3e520..b5587e8 100644 Binary files a/example/src/main/assets/pic/78/000004.png and b/example/src/main/assets/pic/78/000004.png differ diff --git a/example/src/main/assets/pic/78/000005.png b/example/src/main/assets/pic/78/000005.png index b5587e8..5478267 100644 Binary files a/example/src/main/assets/pic/78/000005.png and b/example/src/main/assets/pic/78/000005.png differ diff --git a/example/src/main/assets/pic/78/000006.png b/example/src/main/assets/pic/78/000006.png index 5478267..8735aeb 100644 Binary files a/example/src/main/assets/pic/78/000006.png and b/example/src/main/assets/pic/78/000006.png differ diff --git a/example/src/main/assets/pic/78/000007.png b/example/src/main/assets/pic/78/000007.png index 8735aeb..588313a 100644 Binary files a/example/src/main/assets/pic/78/000007.png and b/example/src/main/assets/pic/78/000007.png differ diff --git a/example/src/main/assets/pic/78/000008.png b/example/src/main/assets/pic/78/000008.png new file mode 100644 index 0000000..e0f0330 Binary files /dev/null and b/example/src/main/assets/pic/78/000008.png differ diff --git a/example/src/main/assets/pic/78/000009.png b/example/src/main/assets/pic/78/000009.png index e0f0330..b562a56 100644 Binary files a/example/src/main/assets/pic/78/000009.png and b/example/src/main/assets/pic/78/000009.png differ diff --git a/example/src/main/assets/pic/78/000010.png b/example/src/main/assets/pic/78/000010.png index b562a56..9860bea 100644 Binary files a/example/src/main/assets/pic/78/000010.png and b/example/src/main/assets/pic/78/000010.png differ diff --git a/example/src/main/assets/pic/78/000011.png b/example/src/main/assets/pic/78/000011.png index 9860bea..3ece334 100644 Binary files a/example/src/main/assets/pic/78/000011.png and b/example/src/main/assets/pic/78/000011.png differ diff --git a/example/src/main/assets/pic/78/000012.png b/example/src/main/assets/pic/78/000012.png index 3ece334..f1c7e43 100644 Binary files a/example/src/main/assets/pic/78/000012.png and b/example/src/main/assets/pic/78/000012.png differ diff --git a/example/src/main/assets/pic/78/000013.png b/example/src/main/assets/pic/78/000013.png new file mode 100644 index 0000000..370934d Binary files /dev/null and b/example/src/main/assets/pic/78/000013.png differ diff --git a/example/src/main/assets/pic/78/000014.png b/example/src/main/assets/pic/78/000014.png index 370934d..1ddbdcc 100644 Binary files a/example/src/main/assets/pic/78/000014.png and b/example/src/main/assets/pic/78/000014.png differ diff --git a/example/src/main/assets/pic/78/000035.png b/example/src/main/assets/pic/78/000015.png similarity index 100% rename from example/src/main/assets/pic/78/000035.png rename to example/src/main/assets/pic/78/000015.png diff --git a/example/src/main/assets/pic/78/000016.png b/example/src/main/assets/pic/78/000016.png index 9598875..96c19fc 100644 Binary files a/example/src/main/assets/pic/78/000016.png and b/example/src/main/assets/pic/78/000016.png differ diff --git a/example/src/main/assets/pic/78/000017.png b/example/src/main/assets/pic/78/000017.png index 8a40de6..54416c7 100644 Binary files a/example/src/main/assets/pic/78/000017.png and b/example/src/main/assets/pic/78/000017.png differ diff --git a/example/src/main/assets/pic/78/000018.png b/example/src/main/assets/pic/78/000018.png index 0a86fa5..ae808db 100644 Binary files a/example/src/main/assets/pic/78/000018.png and b/example/src/main/assets/pic/78/000018.png differ diff --git a/example/src/main/assets/pic/78/000019.png b/example/src/main/assets/pic/78/000019.png index 96c19fc..0b6eecf 100644 Binary files a/example/src/main/assets/pic/78/000019.png and b/example/src/main/assets/pic/78/000019.png differ diff --git a/example/src/main/assets/pic/78/000020.png b/example/src/main/assets/pic/78/000020.png new file mode 100644 index 0000000..4f0995e Binary files /dev/null and b/example/src/main/assets/pic/78/000020.png differ diff --git a/example/src/main/assets/pic/78/000021.png b/example/src/main/assets/pic/78/000021.png index ae808db..48edbb5 100644 Binary files a/example/src/main/assets/pic/78/000021.png and b/example/src/main/assets/pic/78/000021.png differ diff --git a/example/src/main/assets/pic/78/000022.png b/example/src/main/assets/pic/78/000022.png index 0b6eecf..6f24551 100644 Binary files a/example/src/main/assets/pic/78/000022.png and b/example/src/main/assets/pic/78/000022.png differ diff --git a/example/src/main/assets/pic/78/000023.png b/example/src/main/assets/pic/78/000023.png index 4f0995e..f188031 100644 Binary files a/example/src/main/assets/pic/78/000023.png and b/example/src/main/assets/pic/78/000023.png differ diff --git a/example/src/main/assets/pic/78/000024.png b/example/src/main/assets/pic/78/000024.png index 48edbb5..a591a19 100644 Binary files a/example/src/main/assets/pic/78/000024.png and b/example/src/main/assets/pic/78/000024.png differ diff --git a/example/src/main/assets/pic/78/000025.png b/example/src/main/assets/pic/78/000025.png new file mode 100644 index 0000000..afe5e25 Binary files /dev/null and b/example/src/main/assets/pic/78/000025.png differ diff --git a/example/src/main/assets/pic/78/000026.png b/example/src/main/assets/pic/78/000026.png index f188031..02dc9f4 100644 Binary files a/example/src/main/assets/pic/78/000026.png and b/example/src/main/assets/pic/78/000026.png differ diff --git a/example/src/main/assets/pic/78/000027.png b/example/src/main/assets/pic/78/000027.png index a591a19..e934b53 100644 Binary files a/example/src/main/assets/pic/78/000027.png and b/example/src/main/assets/pic/78/000027.png differ diff --git a/example/src/main/assets/pic/78/000028.png b/example/src/main/assets/pic/78/000028.png new file mode 100644 index 0000000..8f4c388 Binary files /dev/null and b/example/src/main/assets/pic/78/000028.png differ diff --git a/example/src/main/assets/pic/78/000029.png b/example/src/main/assets/pic/78/000029.png index 02dc9f4..59523cd 100644 Binary files a/example/src/main/assets/pic/78/000029.png and b/example/src/main/assets/pic/78/000029.png differ diff --git a/example/src/main/assets/pic/78/000030.png b/example/src/main/assets/pic/78/000030.png index e934b53..ff8f328 100644 Binary files a/example/src/main/assets/pic/78/000030.png and b/example/src/main/assets/pic/78/000030.png differ diff --git a/example/src/main/assets/pic/78/000031.png b/example/src/main/assets/pic/78/000031.png index 8f4c388..8a40de6 100644 Binary files a/example/src/main/assets/pic/78/000031.png and b/example/src/main/assets/pic/78/000031.png differ diff --git a/example/src/main/assets/pic/78/000032.png b/example/src/main/assets/pic/78/000032.png deleted file mode 100644 index 59523cd..0000000 Binary files a/example/src/main/assets/pic/78/000032.png and /dev/null differ diff --git a/example/src/main/assets/pic/78/000034.png b/example/src/main/assets/pic/78/000034.png deleted file mode 100644 index 624aa83..0000000 Binary files a/example/src/main/assets/pic/78/000034.png and /dev/null differ diff --git a/example/src/main/assets/pic/78ex.png b/example/src/main/assets/pic/78ex.png index 2d0ca06..cbe7d4d 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 622a9c7..fae0d56 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/motion_data.json b/example/src/main/assets/pic/motion_data.json index 6c910cb..e838501 100644 --- a/example/src/main/assets/pic/motion_data.json +++ b/example/src/main/assets/pic/motion_data.json @@ -1,10 +1,4 @@ { - "1": [ - "000000.png" - ], - "2": [ - "000000.png" - ], "3": [ "000000.png" ], @@ -78,47 +72,71 @@ ], "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", - "000032.png", - "000034.png", - "000036.png", - "000038.png", - "000040.png" + "000031.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", - "000032.png", - "000034.png", - "000035.png" + "000031.png" ], "11": [ "000000.png", @@ -214,6 +232,7 @@ "000004.png", "000005.png", "000006.png", + "000007.png", "000008.png", "000009.png", "000010.png", @@ -221,22 +240,23 @@ "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", - "000032.png", - "000033.png", - "000034.png", - "000035.png" + "000031.png" ], "21": [ "000000.png", @@ -247,6 +267,7 @@ "000005.png", "000006.png", "000007.png", + "000008.png", "000009.png", "000010.png", "000011.png", @@ -257,24 +278,19 @@ "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", - "000032.png", - "000033.png", - "000035.png" - ], - "54": [ - "000000.png" - ], - "55": [ - "000000.png" + "000031.png" ], "56": [ "000000.png", @@ -285,9 +301,12 @@ "000005.png", "000006.png", "000007.png", + "000008.png", "000009.png", + "000010.png", "000011.png", "000012.png", + "000013.png", "000014.png", "000015.png", "000016.png", @@ -295,17 +314,17 @@ "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", - "000032.png", - "000033.png", - "000034.png", - "000035.png" + "000031.png" ], "59": [ "000000.png", @@ -376,15 +395,19 @@ "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", @@ -392,12 +415,10 @@ "000025.png", "000026.png", "000027.png", + "000028.png", "000029.png", "000030.png", - "000032.png", - "000033.png", - "000034.png", - "000035.png" + "000031.png" ], "68": [ "000000.png", @@ -433,12 +454,6 @@ "000030.png", "000031.png" ], - "69": [ - "000000.png" - ], - "70": [ - "000000.png" - ], "71": [ "000000.png", "000001.png", @@ -488,27 +503,30 @@ "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", - "000034.png", - "000035.png" + "000031.png" ], "80": [ "80.png" diff --git a/example/src/main/assets/pic/motion_data_ex.json b/example/src/main/assets/pic/motion_data_ex.json index d511ceb..06713ff 100644 --- a/example/src/main/assets/pic/motion_data_ex.json +++ b/example/src/main/assets/pic/motion_data_ex.json @@ -1,16 +1,4 @@ { - "1": { - "000000.png": { - "x": 0, - "y": 0 - } - }, - "2": { - "000000.png": { - "x": 0, - "y": 0 - } - }, "3": { "000000.png": { "x": 0, @@ -282,85 +270,129 @@ "x": 0, "y": 0 }, - "000002.png": { + "000001.png": { "x": 512, "y": 0 }, + "000002.png": { + "x": 1024, + "y": 0 + }, + "000003.png": { + "x": 1536, + "y": 0 + }, "000004.png": { - "x": 1024, + "x": 2048, + "y": 0 + }, + "000005.png": { + "x": 2560, "y": 0 }, "000006.png": { - "x": 1536, + "x": 3072, + "y": 0 + }, + "000007.png": { + "x": 3584, "y": 0 }, "000008.png": { - "x": 2048, - "y": 0 + "x": 0, + "y": 512 + }, + "000009.png": { + "x": 512, + "y": 512 }, "000010.png": { - "x": 2560, - "y": 0 + "x": 1024, + "y": 512 + }, + "000011.png": { + "x": 1536, + "y": 512 }, "000012.png": { - "x": 3072, - "y": 0 + "x": 2048, + "y": 512 + }, + "000013.png": { + "x": 2560, + "y": 512 }, "000014.png": { + "x": 3072, + "y": 512 + }, + "000015.png": { "x": 3584, - "y": 0 + "y": 512 }, "000016.png": { "x": 0, - "y": 512 + "y": 1024 + }, + "000017.png": { + "x": 512, + "y": 1024 }, "000018.png": { - "x": 512, - "y": 512 + "x": 1024, + "y": 1024 + }, + "000019.png": { + "x": 1536, + "y": 1024 }, "000020.png": { - "x": 1024, - "y": 512 + "x": 2048, + "y": 1024 + }, + "000021.png": { + "x": 2560, + "y": 1024 }, "000022.png": { - "x": 1536, - "y": 512 + "x": 3072, + "y": 1024 + }, + "000023.png": { + "x": 3584, + "y": 1024 }, "000024.png": { - "x": 2048, - "y": 512 + "x": 0, + "y": 1536 + }, + "000025.png": { + "x": 512, + "y": 1536 }, "000026.png": { - "x": 2560, - "y": 512 + "x": 1024, + "y": 1536 + }, + "000027.png": { + "x": 1536, + "y": 1536 }, "000028.png": { - "x": 3072, - "y": 512 + "x": 2048, + "y": 1536 + }, + "000029.png": { + "x": 2560, + "y": 1536 }, "000030.png": { + "x": 3072, + "y": 1536 + }, + "000031.png": { "x": 3584, - "y": 512 - }, - "000032.png": { - "x": 0, - "y": 1024 - }, - "000034.png": { - "x": 512, - "y": 1024 - }, - "000036.png": { - "x": 1024, - "y": 1024 - }, - "000038.png": { - "x": 1536, - "y": 1024 - }, - "000040.png": { - "x": 2048, - "y": 1024 + "y": 1536 } }, "7": { @@ -368,77 +400,129 @@ "x": 0, "y": 0 }, - "000002.png": { + "000001.png": { "x": 512, "y": 0 }, + "000002.png": { + "x": 1024, + "y": 0 + }, + "000003.png": { + "x": 1536, + "y": 0 + }, "000004.png": { - "x": 1024, + "x": 2048, + "y": 0 + }, + "000005.png": { + "x": 2560, "y": 0 }, "000006.png": { - "x": 1536, + "x": 3072, + "y": 0 + }, + "000007.png": { + "x": 3584, "y": 0 }, "000008.png": { - "x": 2048, - "y": 0 - }, - "000010.png": { - "x": 2560, - "y": 0 - }, - "000012.png": { - "x": 3072, - "y": 0 - }, - "000014.png": { - "x": 3584, - "y": 0 - }, - "000016.png": { "x": 0, "y": 512 }, - "000018.png": { + "000009.png": { "x": 512, "y": 512 }, - "000020.png": { + "000010.png": { "x": 1024, "y": 512 }, - "000022.png": { + "000011.png": { "x": 1536, "y": 512 }, - "000024.png": { + "000012.png": { "x": 2048, "y": 512 }, - "000026.png": { + "000013.png": { "x": 2560, "y": 512 }, - "000028.png": { + "000014.png": { "x": 3072, "y": 512 }, - "000030.png": { + "000015.png": { "x": 3584, "y": 512 }, - "000032.png": { + "000016.png": { "x": 0, "y": 1024 }, - "000034.png": { + "000017.png": { "x": 512, "y": 1024 }, - "000035.png": { + "000018.png": { "x": 1024, "y": 1024 + }, + "000019.png": { + "x": 1536, + "y": 1024 + }, + "000020.png": { + "x": 2048, + "y": 1024 + }, + "000021.png": { + "x": 2560, + "y": 1024 + }, + "000022.png": { + "x": 3072, + "y": 1024 + }, + "000023.png": { + "x": 3584, + "y": 1024 + }, + "000024.png": { + "x": 0, + "y": 1536 + }, + "000025.png": { + "x": 512, + "y": 1536 + }, + "000026.png": { + "x": 1024, + "y": 1536 + }, + "000027.png": { + "x": 1536, + "y": 1536 + }, + "000028.png": { + "x": 2048, + "y": 1536 + }, + "000029.png": { + "x": 2560, + "y": 1536 + }, + "000030.png": { + "x": 3072, + "y": 1536 + }, + "000031.png": { + "x": 3584, + "y": 1536 } }, "11": { @@ -796,97 +880,105 @@ "x": 3072, "y": 0 }, - "000008.png": { + "000007.png": { "x": 3584, "y": 0 }, - "000009.png": { + "000008.png": { "x": 0, "y": 512 }, + "000009.png": { + "x": 512, + "y": 512 + }, "000010.png": { - "x": 512, + "x": 1024, "y": 512 }, "000011.png": { - "x": 1024, + "x": 1536, "y": 512 }, "000012.png": { - "x": 1536, + "x": 2048, "y": 512 }, "000013.png": { - "x": 2048, + "x": 2560, "y": 512 }, "000014.png": { - "x": 2560, + "x": 3072, + "y": 512 + }, + "000015.png": { + "x": 3584, "y": 512 }, "000016.png": { - "x": 3072, - "y": 512 + "x": 0, + "y": 1024 }, "000017.png": { - "x": 3584, - "y": 512 + "x": 512, + "y": 1024 }, "000018.png": { - "x": 0, + "x": 1024, + "y": 1024 + }, + "000019.png": { + "x": 1536, "y": 1024 }, "000020.png": { - "x": 512, + "x": 2048, "y": 1024 }, "000021.png": { - "x": 1024, + "x": 2560, "y": 1024 }, "000022.png": { - "x": 1536, - "y": 1024 - }, - "000023.png": { - "x": 2048, - "y": 1024 - }, - "000024.png": { - "x": 2560, - "y": 1024 - }, - "000025.png": { "x": 3072, "y": 1024 }, - "000027.png": { + "000023.png": { "x": 3584, "y": 1024 }, - "000029.png": { + "000024.png": { "x": 0, "y": 1536 }, - "000030.png": { + "000025.png": { "x": 512, "y": 1536 }, - "000032.png": { + "000026.png": { "x": 1024, "y": 1536 }, - "000033.png": { + "000027.png": { "x": 1536, "y": 1536 }, - "000034.png": { + "000028.png": { "x": 2048, "y": 1536 }, - "000035.png": { + "000029.png": { "x": 2560, "y": 1536 + }, + "000030.png": { + "x": 3072, + "y": 1536 + }, + "000031.png": { + "x": 3584, + "y": 1536 } }, "21": { @@ -922,105 +1014,101 @@ "x": 3584, "y": 0 }, - "000009.png": { + "000008.png": { "x": 0, "y": 512 }, + "000009.png": { + "x": 512, + "y": 512 + }, "000010.png": { - "x": 512, + "x": 1024, "y": 512 }, "000011.png": { - "x": 1024, + "x": 1536, "y": 512 }, "000012.png": { - "x": 1536, + "x": 2048, "y": 512 }, "000013.png": { - "x": 2048, + "x": 2560, "y": 512 }, "000014.png": { - "x": 2560, + "x": 3072, "y": 512 }, "000015.png": { - "x": 3072, + "x": 3584, "y": 512 }, "000016.png": { - "x": 3584, - "y": 512 + "x": 0, + "y": 1024 }, "000017.png": { - "x": 0, + "x": 512, "y": 1024 }, "000018.png": { - "x": 512, + "x": 1024, + "y": 1024 + }, + "000019.png": { + "x": 1536, "y": 1024 }, "000020.png": { - "x": 1024, + "x": 2048, "y": 1024 }, "000021.png": { - "x": 1536, - "y": 1024 - }, - "000023.png": { - "x": 2048, - "y": 1024 - }, - "000024.png": { "x": 2560, "y": 1024 }, - "000025.png": { + "000022.png": { "x": 3072, "y": 1024 }, - "000026.png": { + "000023.png": { "x": 3584, "y": 1024 }, - "000028.png": { + "000024.png": { "x": 0, "y": 1536 }, - "000029.png": { + "000025.png": { "x": 512, "y": 1536 }, - "000030.png": { + "000026.png": { "x": 1024, "y": 1536 }, - "000032.png": { + "000027.png": { "x": 1536, "y": 1536 }, - "000033.png": { + "000028.png": { "x": 2048, "y": 1536 }, - "000035.png": { + "000029.png": { "x": 2560, "y": 1536 - } - }, - "54": { - "000000.png": { - "x": 0, - "y": 0 - } - }, - "55": { - "000000.png": { - "x": 0, - "y": 0 + }, + "000030.png": { + "x": 3072, + "y": 1536 + }, + "000031.png": { + "x": 3584, + "y": 1536 } }, "56": { @@ -1056,89 +1144,101 @@ "x": 3584, "y": 0 }, - "000009.png": { + "000008.png": { "x": 0, "y": 512 }, + "000009.png": { + "x": 512, + "y": 512 + }, + "000010.png": { + "x": 1024, + "y": 512 + }, "000011.png": { - "x": 512, + "x": 1536, "y": 512 }, "000012.png": { - "x": 1024, + "x": 2048, + "y": 512 + }, + "000013.png": { + "x": 2560, "y": 512 }, "000014.png": { - "x": 1536, + "x": 3072, "y": 512 }, "000015.png": { - "x": 2048, + "x": 3584, "y": 512 }, "000016.png": { - "x": 2560, - "y": 512 + "x": 0, + "y": 1024 }, "000017.png": { - "x": 3072, - "y": 512 + "x": 512, + "y": 1024 }, "000018.png": { - "x": 3584, - "y": 512 + "x": 1024, + "y": 1024 }, "000019.png": { - "x": 0, + "x": 1536, "y": 1024 }, "000020.png": { - "x": 512, - "y": 1024 - }, - "000022.png": { - "x": 1024, - "y": 1024 - }, - "000023.png": { - "x": 1536, - "y": 1024 - }, - "000024.png": { "x": 2048, "y": 1024 }, - "000025.png": { + "000021.png": { "x": 2560, "y": 1024 }, - "000027.png": { + "000022.png": { "x": 3072, "y": 1024 }, - "000029.png": { + "000023.png": { "x": 3584, "y": 1024 }, - "000030.png": { + "000024.png": { "x": 0, "y": 1536 }, - "000032.png": { + "000025.png": { "x": 512, "y": 1536 }, - "000033.png": { + "000026.png": { "x": 1024, "y": 1536 }, - "000034.png": { + "000027.png": { "x": 1536, "y": 1536 }, - "000035.png": { + "000028.png": { "x": 2048, "y": 1536 + }, + "000029.png": { + "x": 2560, + "y": 1536 + }, + "000030.png": { + "x": 3072, + "y": 1536 + }, + "000031.png": { + "x": 3584, + "y": 1536 } }, "59": { @@ -1402,93 +1502,101 @@ "x": 3584, "y": 0 }, - "000009.png": { + "000008.png": { "x": 0, "y": 512 }, + "000009.png": { + "x": 512, + "y": 512 + }, + "000010.png": { + "x": 1024, + "y": 512 + }, "000011.png": { - "x": 512, + "x": 1536, "y": 512 }, "000012.png": { - "x": 1024, + "x": 2048, + "y": 512 + }, + "000013.png": { + "x": 2560, "y": 512 }, "000014.png": { - "x": 1536, + "x": 3072, "y": 512 }, "000015.png": { - "x": 2048, + "x": 3584, "y": 512 }, "000016.png": { - "x": 2560, - "y": 512 + "x": 0, + "y": 1024 }, "000017.png": { - "x": 3072, - "y": 512 + "x": 512, + "y": 1024 }, "000018.png": { - "x": 3584, - "y": 512 + "x": 1024, + "y": 1024 }, "000019.png": { - "x": 0, + "x": 1536, + "y": 1024 + }, + "000020.png": { + "x": 2048, "y": 1024 }, "000021.png": { - "x": 512, + "x": 2560, "y": 1024 }, "000022.png": { - "x": 1024, - "y": 1024 - }, - "000023.png": { - "x": 1536, - "y": 1024 - }, - "000024.png": { - "x": 2048, - "y": 1024 - }, - "000025.png": { - "x": 2560, - "y": 1024 - }, - "000026.png": { "x": 3072, "y": 1024 }, - "000027.png": { + "000023.png": { "x": 3584, "y": 1024 }, - "000029.png": { + "000024.png": { "x": 0, "y": 1536 }, - "000030.png": { + "000025.png": { "x": 512, "y": 1536 }, - "000032.png": { + "000026.png": { "x": 1024, "y": 1536 }, - "000033.png": { + "000027.png": { "x": 1536, "y": 1536 }, - "000034.png": { + "000028.png": { "x": 2048, "y": 1536 }, - "000035.png": { + "000029.png": { "x": 2560, "y": 1536 + }, + "000030.png": { + "x": 3072, + "y": 1536 + }, + "000031.png": { + "x": 3584, + "y": 1536 } }, "68": { @@ -1621,18 +1729,6 @@ "y": 1536 } }, - "69": { - "000000.png": { - "x": 0, - "y": 0 - } - }, - "70": { - "000000.png": { - "x": 0, - "y": 0 - } - }, "71": { "000000.png": { "x": 0, @@ -1808,89 +1904,101 @@ "x": 3584, "y": 0 }, - "000009.png": { + "000008.png": { "x": 0, "y": 512 }, + "000009.png": { + "x": 512, + "y": 512 + }, "000010.png": { - "x": 512, + "x": 1024, "y": 512 }, "000011.png": { - "x": 1024, + "x": 1536, "y": 512 }, "000012.png": { - "x": 1536, + "x": 2048, + "y": 512 + }, + "000013.png": { + "x": 2560, "y": 512 }, "000014.png": { - "x": 2048, + "x": 3072, + "y": 512 + }, + "000015.png": { + "x": 3584, "y": 512 }, "000016.png": { - "x": 2560, - "y": 512 + "x": 0, + "y": 1024 }, "000017.png": { - "x": 3072, - "y": 512 + "x": 512, + "y": 1024 }, "000018.png": { - "x": 3584, - "y": 512 + "x": 1024, + "y": 1024 }, "000019.png": { - "x": 0, + "x": 1536, + "y": 1024 + }, + "000020.png": { + "x": 2048, "y": 1024 }, "000021.png": { - "x": 512, - "y": 1024 - }, - "000022.png": { - "x": 1024, - "y": 1024 - }, - "000023.png": { - "x": 1536, - "y": 1024 - }, - "000024.png": { - "x": 2048, - "y": 1024 - }, - "000026.png": { "x": 2560, "y": 1024 }, - "000027.png": { + "000022.png": { "x": 3072, "y": 1024 }, - "000029.png": { + "000023.png": { "x": 3584, "y": 1024 }, - "000030.png": { + "000024.png": { "x": 0, "y": 1536 }, - "000031.png": { + "000025.png": { "x": 512, "y": 1536 }, - "000032.png": { + "000026.png": { "x": 1024, "y": 1536 }, - "000034.png": { + "000027.png": { "x": 1536, "y": 1536 }, - "000035.png": { + "000028.png": { "x": 2048, "y": 1536 + }, + "000029.png": { + "x": 2560, + "y": 1536 + }, + "000030.png": { + "x": 3072, + "y": 1536 + }, + "000031.png": { + "x": 3584, + "y": 1536 } }, "80": { diff --git a/example/src/main/java/com/inewme/uvmirror/MakeupActivity.kt b/example/src/main/java/com/inewme/uvmirror/MakeupActivity.kt index f19215b..d73b2e3 100644 --- a/example/src/main/java/com/inewme/uvmirror/MakeupActivity.kt +++ b/example/src/main/java/com/inewme/uvmirror/MakeupActivity.kt @@ -49,9 +49,9 @@ class MakeupActivity : FaceActivity() // 然后 又播放了8秒钟,这个时候要却换到 (11, 13, 21 动画序列了), 同时设置序列播放完成回调函数 // 然后 播放完这个序列又要切换为原来的序列播放,通过序列播放完成回调函数实现 private var elapsedTime = 0 // 总经过时间(ms) - private val sequenceA = listOf("4", "5", "6", "7", "55", "59", "76", "77", "78") - private val sequenceB = listOf("55", "59", "76") - private val sequenceAll = listOf("4", "5", "6", "7", "55", "59", "76", "77", "78") + private val sequenceA = listOf("4") + private val sequenceB = listOf("56") + private val sequenceAll = listOf("4", "56") private fun update() { diff --git a/vulkan/Application.cpp b/vulkan/Application.cpp index 16aaa31..3285609 100644 --- a/vulkan/Application.cpp +++ b/vulkan/Application.cpp @@ -125,6 +125,7 @@ void Application::createFramebuffers() { void Application::mainLoop() { #ifdef _WIN32 + static int testFrame = 0; while (!glfwWindowShouldClose(window)) { auto cur_time = getCurrentTimeMillis(); @@ -132,6 +133,9 @@ void Application::mainLoop() auto functionTime = (cur_time - _lastDrawFrameTime); _lastDrawFrameTime = getCurrentTimeMillis(); drawFrame(functionTime); // 在这里调用 + if (testFrame++ == 300) { + break; + } } #else diff --git a/vulkan/FaceApp.cpp b/vulkan/FaceApp.cpp index f6e6387..dfae732 100644 --- a/vulkan/FaceApp.cpp +++ b/vulkan/FaceApp.cpp @@ -17,7 +17,17 @@ FaceApp::FaceApp(/* args */) FaceApp::~FaceApp() { - if (worker_.joinable()) { + if(worker_.joinable()) + { + worker_.join(); + } +} + +void FaceApp::Stop() +{ + _running = false; + if(worker_.joinable()) + { worker_.join(); } } @@ -595,7 +605,7 @@ void FaceApp::setup_descriptor_set() void FaceApp::update_descriptor_set(vector& texs, vector& descriptSet) { - for (int i = 0; i < kTextureMax; ++i) + for (int i = 0; i < texs.size(); ++i) { if (texs[i].image == VK_NULL_HANDLE) { @@ -731,7 +741,7 @@ void FaceApp::render(VkCommandBuffer commandBuffer, long long frameTime) #ifdef _WIN32 vkCmdDrawIndexed(commandBuffer, obj_indices.size(), 1, 0, 0, 0); #else - if (getCurrentTimeMillis() - last_update_time < 2000) + //if (getCurrentTimeMillis() - last_update_time < 2000) { vkCmdDrawIndexed(commandBuffer, obj_indices.size(), 1, 0, 0, 0); } @@ -767,9 +777,10 @@ void FaceApp::createVmaAllocator() void FaceApp::initVulkan() { Application::initVulkan(); + createVmaAllocator(); LoadOBJ("face_picture_3dmax.obj", obj_vertices, obj_indices); - m_texs_left.resize(kTextureMax); + //m_texs_left.resize(kTextureMax); //m_texs_right.resize(kTextureMax); if (kThick) { @@ -807,8 +818,8 @@ void FaceApp::initVulkan() last_update_time = getCurrentTimeMillis(); //changeMotion(_initArg.motion); - _running = true; - faceAppInited = true; + Start(); + #if _WIN32 std::vector floatArray; std::string& str = HardCodeData::Get().face_result_point_str; @@ -823,6 +834,11 @@ void FaceApp::initVulkan() #endif } +void FaceApp::Start() +{ + _running = true; +} + void FaceApp::update_uniform_buffers() { uint32_t width = 480; @@ -892,6 +908,9 @@ void FaceApp::uploadVertexData() { void FaceApp::update_face_vertex_buffer(float* pos, int pointCount) { + if (pointCount == 0x33435342) { + return; + } if(!isInited()) { return; @@ -1437,10 +1456,14 @@ string FaceApp::preLoadMotionList(string motion_list_str, Callback callback) } _isLoadMotion = true; _callback_loadfinish = callback; - _loadMotions.clear(); + _curLoadMotionList.clear(); json j = json::parse(motion_list_str); MotionList motion_list = j.get(); - _loadMotions = motion_list.motions; + _curLoadMotionList = motion_list.motions; + if (worker_.joinable()) + { + worker_.join(); + } worker_ = std::thread(&FaceApp::loadMotionThread, this); return "ok"; } @@ -1452,37 +1475,59 @@ void FaceApp::loadMotionThread() std::this_thread::sleep_for(std::chrono::milliseconds(50)); } - vector* load_text = nullptr; + //vector* load_text = nullptr; //if (cur_left) //{ // load_text = &m_texs_right; //} //else //{ - load_text = &m_texs_left; + // load_text = &m_texs_left; //} - vector& pre_texs = *load_text; - for (int i = 0; i < _loadMotions.size(); ++i) - { - if (pre_texs[i].image == VK_NULL_HANDLE) + //vector& pre_texs = *load_text; + for (auto m : _curLoadMotionList) { + string name = m.name; + if (motion_list_map.find(name) != motion_list_map.end()) { - loadTexture(dummy_data, dummy_data.size(), dummy_w, dummy_h, pre_texs[i], true, commandPool, ""); + continue; } - - + m_texs_left.push_back(Texture()); + Texture& newTex = m_texs_left[m_texs_left.size() - 1]; + loadTexture(dummy_data, dummy_data.size(), dummy_w, dummy_h, newTex, true, commandPool, ""); #ifdef _WIN32 string path = "pic"; - string path_name = path + "/" + _loadMotions[i].name + "ex.png"; - loadTextureExample(UTF8ToWideString(path_name), pre_texs[i], true, commandPool_ex); + string path_name = path + "/" + name + "ex.png"; + loadTextureExample(UTF8ToWideString(path_name), newTex, true, commandPool_ex); #else string path = "pic"; - string path_name = path + "/" + _loadMotions[i].name + "ex.png"; - loadTexture(path_name, pre_texs[i], true, commandPool_ex); + string path_name = path + "/" + name + "ex.png"; + loadTexture(path_name, newTex, true, commandPool_ex); #endif // _WIN32 - - motion_list_map[_loadMotions[i].name] = i; + motion_list_map[name] = m_texs_left.size() - 1; + _loadMotionMap[name] = m; } + +// for (int i = 0; i < _loadMotions.size(); ++i) +// { +// if (pre_texs[i].image == VK_NULL_HANDLE) +// { +// loadTexture(dummy_data, dummy_data.size(), dummy_w, dummy_h, pre_texs[i], true, commandPool, ""); +// } +// +// +//#ifdef _WIN32 +// string path = "pic"; +// string path_name = path + "/" + _loadMotions[i].name + "ex.png"; +// loadTextureExample(UTF8ToWideString(path_name), pre_texs[i], true, commandPool_ex); +//#else +// string path = "pic"; +// string path_name = path + "/" + _loadMotions[i].name + "ex.png"; +// loadTexture(path_name, pre_texs[i], true, commandPool_ex); +//#endif // _WIN32 +// +// motion_list_map[_loadMotions[i].name] = i; +// } update_descriptor_set(m_texs_left, m_descriptor_sets_left); _isLoadMotion = false; _callback_loadfinish(); @@ -1491,14 +1536,7 @@ void FaceApp::loadMotionThread() Motion FaceApp::getMotionByName(string name) { - for (auto m : _loadMotions) - { - if (m.name == name) - { - return m; - } - } - return Motion(); + return _loadMotionMap[name]; } void FaceApp::changeMotionList(vector motions, AnimationFinishedCallback callback, bool loop) diff --git a/vulkan/FaceApp.h b/vulkan/FaceApp.h index 364274d..78b9da1 100644 --- a/vulkan/FaceApp.h +++ b/vulkan/FaceApp.h @@ -71,7 +71,7 @@ public: static FaceApp* Get() { return faceIns; } void update_face_vertex_buffer(float* pos, int pointCount); - virtual bool isInited() override { return inited && faceAppInited; } + virtual bool isInited() override { return inited; } virtual void cleanup() override; Texture tex_bg = {}; @@ -147,7 +147,7 @@ private: void createUniformBuffer(); - bool faceAppInited = false; + float myFloatValue = 1.5f; @@ -163,6 +163,8 @@ private: public: + void Start(); + void Stop(); void loadMotionThread(); std::thread worker_; bool _isLoadMotion = false; @@ -172,7 +174,8 @@ public: bool _animationLoop = true; string preLoadMotionList(string motion_list_str, Callback callback); Motion getMotionByName(string name); - vector_loadMotions; + map_loadMotionMap; + vector _curLoadMotionList; vector_curMotions; void changeMotionList(vector motions, AnimationFinishedCallback callback, bool loop); diff --git a/vulkan/main.cpp b/vulkan/main.cpp index a92dba1..a0f7517 100644 --- a/vulkan/main.cpp +++ b/vulkan/main.cpp @@ -53,6 +53,12 @@ void CppCallback() g_app->changeMotionList(motions, CppAnimationFinishedCallback, true); } +void CppCallback2() +{ + vector motions = { "11" }; + g_app->changeMotionList(motions, CppAnimationFinishedCallback, true); +} + // 读取JSON文件并填充到motions容器中 void loadMotions(const std::string& filePath, std::map& motions) { // 读取json文件 @@ -118,8 +124,8 @@ int main() { //std::wstring content = ReadFileWithChinesePath(chinese_path); InitArg init_arg; - Motion motion; - motion.name = "4"; + //Motion motion; + //motion.name = "4"; //motion.png_names.push_back("4.png"); //for (int i = 1; i < 61; ++i) //{ @@ -152,15 +158,15 @@ int main() { app.SetInitArg(json_str.c_str()); app.initVulkan(); app._running = true; - auto motion_json = json(motion); - if (!motion_json.is_object()) { - std::cout << "Invalid JSON structure" << std::endl; - } - std::string motion_str = motion_json.dump(); - // 添加完整性检查 - if (motion_str.empty()) { - std::cout << "Warning: Empty motion string" << std::endl; - } + //auto motion_json = json(motion); + //if (!motion_json.is_object()) { + // std::cout << "Invalid JSON structure" << std::endl; + //} + //std::string motion_str = motion_json.dump(); + //// 添加完整性检查 + //if (motion_str.empty()) { + // std::cout << "Warning: Empty motion string" << std::endl; + //} MotionList s_motions; s_motions.motions.push_back(motions["4"]); @@ -170,17 +176,28 @@ int main() { auto s = j.dump(); app.preLoadMotionList(s, CppCallback); - threadRun = true; - std::thread t(threadFunction); + //threadRun = true; + //std::thread t(threadFunction); app.mainLoop(); - threadRun = false; - t.join(); + //threadRun = false; + //t.join(); //try { // app.mainLoop(); //} catch (const std::exception& e) { // std::cerr << e.what() << std::endl; // return EXIT_FAILURE; //} + + 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["11"]); + j = s_motions; + s = j.dump(); + + app.preLoadMotionList(s, CppCallback2); + app.mainLoop(); + app.cleanup(); return EXIT_SUCCESS; } \ No newline at end of file