1 diff -pruN --exclude build ./demo_clean/CMakeLists.txt ./demo_dev/CMakeLists.txt
2 --- ./demo_clean/CMakeLists.txt 2020-09-27 17:43:12.069477246 +0100
3 +++ ./demo_dev/CMakeLists.txt 2020-07-11 22:52:49.099117981 +0100
4 @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16)
8 -set(SDK_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
9 +set(SDK_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../CubismSdkForNative-4-r.1)
10 set(CORE_PATH ${SDK_ROOT_PATH}/Core)
11 set(FRAMEWORK_PATH ${SDK_ROOT_PATH}/Framework)
12 set(THIRD_PARTY_PATH ${SDK_ROOT_PATH}/Samples/OpenGL/thirdParty)
13 @@ -32,7 +32,7 @@ set(GLFW_INSTALL OFF CACHE BOOL "" FORCE
14 set(BUILD_UTILS OFF CACHE BOOL "" FORCE)
16 # Specify version of compiler.
17 -set(CMAKE_CXX_STANDARD 14)
18 +set(CMAKE_CXX_STANDARD 17)
19 set(CMAKE_CXX_STANDARD_REQUIRED ON)
20 set(CMAKE_CXX_EXTENSIONS OFF)
22 @@ -64,6 +64,9 @@ target_link_libraries(Framework Live2DCu
23 # Find opengl libraries.
24 find_package(OpenGL REQUIRED)
26 +# Add FacialLandmarksForCubism
27 +add_subdirectory(../.. FacialLandmarksForCubism_build)
29 # Make executable app.
30 add_executable(${APP_NAME})
32 @@ -73,9 +76,11 @@ target_link_libraries(${APP_NAME}
36 + FacialLandmarksForCubism
39 # Specify include directories.
40 -target_include_directories(${APP_NAME} PRIVATE ${STB_PATH})
41 +target_include_directories(${APP_NAME} PRIVATE ${STB_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
43 # Copy resource directory to build directory.
45 @@ -86,6 +91,17 @@ add_custom_command(
46 copy_directory ${RES_PATH} $<TARGET_FILE_DIR:${APP_NAME}>/Resources
49 +# Copy shape predictor trained dataset to build directory
50 +set(DLIB_SHAPE_PREDICTOR_DATA ${CMAKE_CURRENT_SOURCE_DIR}/../shape_predictor_68_face_landmarks.dat
51 + CACHE FILEPATH "Path to dlib shape predictor trained dataset")
57 + copy ${DLIB_SHAPE_PREDICTOR_DATA} $<TARGET_FILE_DIR:${APP_NAME}>/
60 # You can change target that renderer draws by enabling following definition.
63 diff -pruN --exclude build ./demo_clean/scripts/make_gcc ./demo_dev/scripts/make_gcc
64 --- ./demo_clean/scripts/make_gcc 2020-09-27 17:43:12.069477246 +0100
65 +++ ./demo_dev/scripts/make_gcc 2020-07-14 15:33:09.865020790 +0100
66 @@ -9,5 +9,6 @@ BUILD_PATH=$SCRIPT_PATH/../build/make_gc
68 cmake -S "$CMAKE_PATH" \
70 - -D CMAKE_BUILD_TYPE=Release
71 -cd "$BUILD_PATH" && make
72 + -D CMAKE_BUILD_TYPE=Release \
73 + -D USE_AVX_INSTRUCTIONS=1
74 +cd "$BUILD_PATH" && make -j4
75 diff -pruN --exclude build ./demo_clean/src/CMakeLists.txt ./demo_dev/src/CMakeLists.txt
76 --- ./demo_clean/src/CMakeLists.txt 2020-09-27 17:43:12.081477263 +0100
77 +++ ./demo_dev/src/CMakeLists.txt 2020-07-11 17:39:18.358435702 +0100
78 @@ -19,6 +19,4 @@ target_sources(${APP_NAME}
79 ${CMAKE_CURRENT_SOURCE_DIR}/LAppView.cpp
80 ${CMAKE_CURRENT_SOURCE_DIR}/LAppView.hpp
81 ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
82 - ${CMAKE_CURRENT_SOURCE_DIR}/TouchManager.cpp
83 - ${CMAKE_CURRENT_SOURCE_DIR}/TouchManager.hpp
85 diff -pruN --exclude build ./demo_clean/src/LAppDelegate.cpp ./demo_dev/src/LAppDelegate.cpp
86 --- ./demo_clean/src/LAppDelegate.cpp 2020-09-27 17:43:12.081477263 +0100
87 +++ ./demo_dev/src/LAppDelegate.cpp 2020-07-11 17:35:02.414902548 +0100
88 @@ -45,7 +45,8 @@ void LAppDelegate::ReleaseInstance()
92 -bool LAppDelegate::Initialize()
93 +bool LAppDelegate::Initialize(int initWindowWidth, int initWindowHeight,
94 + const char *windowTitle)
98 @@ -63,7 +64,13 @@ bool LAppDelegate::Initialize()
102 - _window = glfwCreateWindow(RenderTargetWidth, RenderTargetHeight, "SAMPLE", NULL, NULL);
103 + _window = glfwCreateWindow(
104 + initWindowWidth ? initWindowWidth : RenderTargetWidth,
105 + initWindowHeight ? initWindowHeight : RenderTargetHeight,
106 + windowTitle ? windowTitle : "SAMPLE",
113 @@ -95,10 +102,6 @@ bool LAppDelegate::Initialize()
115 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
118 - glfwSetMouseButtonCallback(_window, EventHandler::OnMouseCallBack);
119 - glfwSetCursorPosCallback(_window, EventHandler::OnMouseCallBack);
123 glfwGetWindowSize(LAppDelegate::GetInstance()->GetWindow(), &width, &height);
124 @@ -111,8 +114,6 @@ bool LAppDelegate::Initialize()
128 - SetRootDirectory();
131 LAppLive2DManager::GetInstance();
133 @@ -214,49 +215,6 @@ void LAppDelegate::InitializeCubism()
134 LAppPal::UpdateTime();
137 -void LAppDelegate::OnMouseCallBack(GLFWwindow* window, int button, int action, int modify)
143 - if (GLFW_MOUSE_BUTTON_LEFT != button)
148 - if (GLFW_PRESS == action)
151 - _view->OnTouchesBegan(_mouseX, _mouseY);
153 - else if (GLFW_RELEASE == action)
158 - _view->OnTouchesEnded(_mouseX, _mouseY);
163 -void LAppDelegate::OnMouseCallBack(GLFWwindow* window, double x, double y)
165 - _mouseX = static_cast<float>(x);
166 - _mouseY = static_cast<float>(y);
177 - _view->OnTouchesMoved(_mouseX, _mouseY);
180 GLuint LAppDelegate::CreateShader()
183 @@ -299,29 +257,9 @@ GLuint LAppDelegate::CreateShader()
187 -void LAppDelegate::SetRootDirectory()
188 +void LAppDelegate::SetRootDirectory(std::string rootDir)
191 - ssize_t len = readlink("/proc/self/exe", path, 1024 - 1);
198 - std::string pathString(path);
200 - pathString = pathString.substr(0, pathString.rfind("Demo"));
201 - Csm::csmVector<string> splitStrings = this->Split(pathString, '/');
203 - this->_rootDirectory = "";
205 - for(int i = 0; i < splitStrings.GetSize(); i++)
207 - this->_rootDirectory = this->_rootDirectory + "/" +splitStrings[i];
210 - this->_rootDirectory += "/";
211 + this->_rootDirectory = rootDir + "/";
214 Csm::csmVector<string> LAppDelegate::Split(const std::string& baseString, char delimiter)
215 diff -pruN --exclude build ./demo_clean/src/LAppDelegate.hpp ./demo_dev/src/LAppDelegate.hpp
216 --- ./demo_clean/src/LAppDelegate.hpp 2020-09-27 17:43:12.081477263 +0100
217 +++ ./demo_dev/src/LAppDelegate.hpp 2020-07-11 17:34:40.778602504 +0100
218 @@ -40,7 +40,8 @@ public:
220 * @brief APPに必要なものを初期化する。
223 + bool Initialize(int initWindowWidth = 0, int initWindowHeight = 0,
224 + const char *windowTitle = "SAMPLE");
228 @@ -53,25 +54,6 @@ public:
232 - * @brief OpenGL用 glfwSetMouseButtonCallback用関数。
234 - * @param[in] window コールバックを呼んだWindow情報
235 - * @param[in] button ボタン種類
236 - * @param[in] action 実行結果
237 - * @param[in] modify
239 - void OnMouseCallBack(GLFWwindow* window, int button, int action, int modify);
242 - * @brief OpenGL用 glfwSetCursorPosCallback用関数。
244 - * @param[in] window コールバックを呼んだWindow情報
248 - void OnMouseCallBack(GLFWwindow* window, double x, double y);
253 GLuint CreateShader();
254 @@ -98,8 +80,10 @@ public:
257 * @brief ルートディレクトリを設定する。
259 + * @param[in] rootDir : The root directory to set to.
261 - void SetRootDirectory();
262 + void SetRootDirectory(std::string rootDir);
265 * @brief ルートディレクトリを取得する。
266 @@ -146,24 +130,3 @@ private:
267 int _windowWidth; ///< Initialize関数で設定したウィンドウ幅
268 int _windowHeight; ///< Initialize関数で設定したウィンドウ高さ
275 - * @brief glfwSetMouseButtonCallback用コールバック関数。
277 - static void OnMouseCallBack(GLFWwindow* window, int button, int action, int modify)
279 - LAppDelegate::GetInstance()->OnMouseCallBack(window, button, action, modify);
283 - * @brief glfwSetCursorPosCallback用コールバック関数。
285 - static void OnMouseCallBack(GLFWwindow* window, double x, double y)
287 - LAppDelegate::GetInstance()->OnMouseCallBack(window, x, y);
291 diff -pruN --exclude build ./demo_clean/src/LAppLive2DManager.cpp ./demo_dev/src/LAppLive2DManager.cpp
292 --- ./demo_clean/src/LAppLive2DManager.cpp 2020-09-27 17:43:12.081477263 +0100
293 +++ ./demo_dev/src/LAppLive2DManager.cpp 2020-07-11 23:20:11.548419176 +0100
294 @@ -52,9 +52,10 @@ void LAppLive2DManager::ReleaseInstance(
296 LAppLive2DManager::LAppLive2DManager()
299 + , _projScaleFactor(1.0f)
300 + , _translateX(0.0f)
301 + , _translateY(0.0f)
303 - ChangeScene(_sceneIndex);
306 LAppLive2DManager::~LAppLive2DManager()
307 @@ -98,26 +99,6 @@ void LAppLive2DManager::OnTap(csmFloat32
309 LAppPal::PrintLog("[APP]tap point: {x:%.2f y:%.2f}", x, y);
312 - for (csmUint32 i = 0; i < _models.GetSize(); i++)
314 - if (_models[i]->HitTest(HitAreaNameHead, x, y))
316 - if (DebugLogEnable)
318 - LAppPal::PrintLog("[APP]hit area: [%s]", HitAreaNameHead);
320 - _models[i]->SetRandomExpression();
322 - else if (_models[i]->HitTest(HitAreaNameBody, x, y))
324 - if (DebugLogEnable)
326 - LAppPal::PrintLog("[APP]hit area: [%s]", HitAreaNameBody);
328 - _models[i]->StartRandomMotion(MotionGroupTapBody, PriorityNormal, FinishedMotion);
333 void LAppLive2DManager::OnUpdate() const
334 @@ -125,7 +106,9 @@ void LAppLive2DManager::OnUpdate() const
335 CubismMatrix44 projection;
337 glfwGetWindowSize(LAppDelegate::GetInstance()->GetWindow(), &width, &height);
338 - projection.Scale(1.0f, static_cast<float>(width) / static_cast<float>(height));
339 + projection.Scale(_projScaleFactor,
340 + _projScaleFactor * static_cast<float>(width) / static_cast<float>(height));
341 + projection.Translate(_translateX, _translateY);
343 if (_viewMatrix != NULL)
345 @@ -148,26 +131,10 @@ void LAppLive2DManager::OnUpdate() const
349 -void LAppLive2DManager::NextScene()
351 - csmInt32 no = (_sceneIndex + 1) % ModelDirSize;
355 -void LAppLive2DManager::ChangeScene(Csm::csmInt32 index)
356 +void LAppLive2DManager::SetModel(std::string modelName)
358 - _sceneIndex = index;
359 - if (DebugLogEnable)
361 - LAppPal::PrintLog("[APP]model index: %d", _sceneIndex);
364 - // ModelDir[]に保持したディレクトリ名から
365 - // model3.jsonのパスを決定する.
366 - // ディレクトリ名とmodel3.jsonの名前を一致させておくこと.
367 - std::string model = ModelDir[index];
368 - std::string modelPath = LAppDelegate::GetInstance()->GetRootDirectory() + ResourcesPath + model + "/";
369 - std::string modelJsonName = ModelDir[index];
370 + std::string modelPath = LAppDelegate::GetInstance()->GetRootDirectory() + ResourcesPath + modelName + "/";
371 + std::string modelJsonName = modelName;
372 modelJsonName += ".model3.json";
375 @@ -215,3 +182,20 @@ csmUint32 LAppLive2DManager::GetModelNum
377 return _models.GetSize();
380 +void LAppLive2DManager::SetFacialLandmarkDetector(FacialLandmarkDetector *detector)
382 + for (auto it = _models.Begin(); it != _models.End(); ++it)
384 + (*it)->SetFacialLandmarkDetector(detector);
388 +void LAppLive2DManager::SetProjectionScaleTranslate(float scaleFactor,
392 + _projScaleFactor = scaleFactor;
393 + _translateX = translateX;
394 + _translateY = translateY;
396 diff -pruN --exclude build ./demo_clean/src/LAppLive2DManager.hpp ./demo_dev/src/LAppLive2DManager.hpp
397 --- ./demo_clean/src/LAppLive2DManager.hpp 2020-09-27 17:43:12.069477246 +0100
398 +++ ./demo_dev/src/LAppLive2DManager.hpp 2020-07-11 23:21:17.969484538 +0100
404 #include <CubismFramework.hpp>
405 #include <Math/CubismMatrix44.hpp>
406 #include <Type/csmVector.hpp>
410 +class FacialLandmarkDetector;
413 * @brief サンプルアプリケーションにおいてCubismModelを管理するクラス<br>
414 * モデル生成と破棄、タップイベントの処理、モデル切り替えを行う。
415 @@ -72,16 +75,12 @@ public:
416 void OnUpdate() const;
419 - * @brief 次のシーンに切り替える<br>
420 - * サンプルアプリケーションではモデルセットの切り替えを行う。
425 - * @brief シーンを切り替える<br>
426 - * サンプルアプリケーションではモデルセットの切り替えを行う。
428 - void ChangeScene(Csm::csmInt32 index);
429 + * @brief Set model data
431 + * @param[in] modelName : Name of model, should be the same for both
432 + * the directory and the model3.json file
434 + void SetModel(std::string modelName);
438 @@ -89,6 +88,24 @@ public:
440 Csm::csmUint32 GetModelNum() const;
443 + * @brief Set the pointer to the FacialLandmarkDetector instance
445 + * @param[in] detector : Pointer to FacialLandmarkDetector instance
447 + void SetFacialLandmarkDetector(FacialLandmarkDetector *detector);
450 + * @brief Set projection scale factor and translation parameters
452 + * @param[in] scaleFactor : Scale factor applied in both X and Y directions
453 + * @param[in] translateX : Translation in X direction
454 + * @param[in] translateY : Translation in Y direction
456 + void SetProjectionScaleTranslate(float scaleFactor,
463 @@ -102,5 +119,8 @@ private:
465 Csm::CubismMatrix44* _viewMatrix; ///< モデル描画に用いるView行列
466 Csm::csmVector<LAppModel*> _models; ///< モデルインスタンスのコンテナ
467 - Csm::csmInt32 _sceneIndex; ///< 表示するシーンのインデックス値
469 + float _projScaleFactor;
473 diff -pruN --exclude build ./demo_clean/src/LAppModel.cpp ./demo_dev/src/LAppModel.cpp
474 --- ./demo_clean/src/LAppModel.cpp 2020-09-27 17:43:12.069477246 +0100
475 +++ ./demo_dev/src/LAppModel.cpp 2020-09-27 17:40:16.401166244 +0100
477 #include "LAppTextureManager.hpp"
478 #include "LAppDelegate.hpp"
480 +#include "facial_landmark_detector.h"
482 using namespace Live2D::Cubism::Framework;
483 using namespace Live2D::Cubism::Framework::DefaultParameterId;
484 using namespace LAppDefine;
485 @@ -128,30 +130,6 @@ void LAppModel::SetupModel(ICubismModelS
486 DeleteBuffer(buffer, path.GetRawString());
490 - if (_modelSetting->GetExpressionCount() > 0)
492 - const csmInt32 count = _modelSetting->GetExpressionCount();
493 - for (csmInt32 i = 0; i < count; i++)
495 - csmString name = _modelSetting->GetExpressionName(i);
496 - csmString path = _modelSetting->GetExpressionFileName(i);
497 - path = _modelHomeDir + path;
499 - buffer = CreateBuffer(path.GetRawString(), &size);
500 - ACubismMotion* motion = LoadExpression(buffer, size, name.GetRawString());
502 - if (_expressions[name] != NULL)
504 - ACubismMotion::Delete(_expressions[name]);
505 - _expressions[name] = NULL;
507 - _expressions[name] = motion;
509 - DeleteBuffer(buffer, path.GetRawString());
514 if (strcmp(_modelSetting->GetPhysicsFileName(), "") != 0)
516 @@ -214,15 +192,6 @@ void LAppModel::SetupModel(ICubismModelS
522 - csmInt32 lipSyncIdCount = _modelSetting->GetLipSyncParameterCount();
523 - for (csmInt32 i = 0; i < lipSyncIdCount; ++i)
525 - _lipSyncIds.PushBack(_modelSetting->GetLipSyncParameterId(i));
530 csmMap<csmString, csmFloat32> layout;
531 _modelSetting->GetLayoutMap(layout);
532 @@ -335,59 +304,57 @@ void LAppModel::Update()
533 const csmFloat32 deltaTimeSeconds = LAppPal::GetDeltaTime();
534 _userTimeSeconds += deltaTimeSeconds;
536 - _dragManager->Update(deltaTimeSeconds);
537 - _dragX = _dragManager->GetX();
538 - _dragY = _dragManager->GetY();
540 - // モーションによるパラメータ更新の有無
541 - csmBool motionUpdated = false;
543 - //-----------------------------------------------------------------
544 - _model->LoadParameters(); // 前回セーブされた状態をロード
545 - if (_motionManager->IsFinished())
547 - // モーションの再生がない場合、待機モーションの中からランダムで再生する
548 - StartRandomMotion(MotionGroupIdle, PriorityIdle);
553 - motionUpdated = _motionManager->UpdateMotion(_model, deltaTimeSeconds); // モーションを更新
555 - _model->SaveParameters(); // 状態を保存
556 - //-----------------------------------------------------------------
557 + auto idMan = CubismFramework::GetIdManager();
558 + auto params = _detector->getParams();
561 - if (!motionUpdated)
563 - if (_eyeBlink != NULL)
564 + // NOTE: Apparently, this LoadParameters/SaveParameters pair
565 + // is needed for auto breath to work.
566 + _model->LoadParameters(); // 前回セーブされた状態をロード
567 + if (_motionManager->IsFinished() && params.randomMotion)
569 - // メインモーションの更新がないとき
570 - _eyeBlink->UpdateParameters(_model, deltaTimeSeconds); // 目パチ
571 + // モーションの再生がない場合、待機モーションの中からランダムで再生する
572 + StartRandomMotion(MotionGroupIdle, PriorityIdle);
576 - if (_expressionManager != NULL)
578 - _expressionManager->UpdateMotion(_model, deltaTimeSeconds); // 表情でパラメータ更新(相対変化)
583 - _model->AddParameterValue(_idParamAngleX, _dragX * 30); // -30から30の値を加える
584 - _model->AddParameterValue(_idParamAngleY, _dragY * 30);
585 - _model->AddParameterValue(_idParamAngleZ, _dragX * _dragY * -30);
588 - _model->AddParameterValue(_idParamBodyAngleX, _dragX * 10); // -10から10の値を加える
591 + _motionManager->UpdateMotion(_model, deltaTimeSeconds); // モーションを更新
593 + _model->SaveParameters(); // 状態を保存
596 - _model->AddParameterValue(_idParamEyeBallX, _dragX); // -1から1の値を加える
597 - _model->AddParameterValue(_idParamEyeBallY, _dragY);
600 - if (_breath != NULL)
602 - _breath->UpdateParameters(_model, deltaTimeSeconds);
603 + if (params.autoBlink && _eyeBlink)
605 + _eyeBlink->UpdateParameters(_model, deltaTimeSeconds);
609 + _model->SetParameterValue(idMan->GetId("ParamEyeLOpen"),
610 + params.leftEyeOpenness);
611 + _model->SetParameterValue(idMan->GetId("ParamEyeROpen"),
612 + params.rightEyeOpenness);
614 + _model->SetParameterValue(idMan->GetId("ParamMouthForm"),
616 + _model->SetParameterValue(idMan->GetId("ParamMouthOpenY"),
617 + params.mouthOpenness);
618 + _model->SetParameterValue(idMan->GetId("ParamEyeLSmile"),
619 + params.leftEyeSmile);
620 + _model->SetParameterValue(idMan->GetId("ParamEyeRSmile"),
621 + params.rightEyeSmile);
622 + _model->SetParameterValue(idMan->GetId("ParamAngleX"),
623 + params.faceXAngle);
624 + _model->SetParameterValue(idMan->GetId("ParamAngleY"),
625 + params.faceYAngle);
626 + _model->SetParameterValue(idMan->GetId("ParamAngleZ"),
627 + params.faceZAngle);
628 + if (params.autoBreath && _breath)
630 + // Note: _model->LoadParameters and SaveParameters is needed
631 + // before - see above.
632 + _breath->UpdateParameters(_model, deltaTimeSeconds);
637 @@ -396,17 +363,6 @@ void LAppModel::Update()
638 _physics->Evaluate(_model, deltaTimeSeconds);
644 - csmFloat32 value = 0; // リアルタイムでリップシンクを行う場合、システムから音量を取得して0〜1の範囲で値を入力します。
646 - for (csmUint32 i = 0; i < _lipSyncIds.GetSize(); ++i)
648 - _model->AddParameterValue(_lipSyncIds[i], value, 0.8f);
655 @@ -626,3 +582,9 @@ Csm::Rendering::CubismOffscreenFrame_Ope
657 return _renderBuffer;
660 +void LAppModel::SetFacialLandmarkDetector(FacialLandmarkDetector *detector)
662 + _detector = detector;
665 diff -pruN --exclude build ./demo_clean/src/LAppModel.hpp ./demo_dev/src/LAppModel.hpp
666 --- ./demo_clean/src/LAppModel.hpp 2020-09-27 17:43:12.081477263 +0100
667 +++ ./demo_dev/src/LAppModel.hpp 2020-07-11 15:40:18.977286166 +0100
669 #include <Type/csmRectF.hpp>
670 #include <Rendering/OpenGL/CubismOffscreenSurface_OpenGLES2.hpp>
672 +#include "facial_landmark_detector.h"
675 * @brief ユーザーが実際に使用するモデルの実装クラス<br>
676 @@ -113,6 +114,13 @@ public:
678 Csm::Rendering::CubismOffscreenFrame_OpenGLES2& GetRenderBuffer();
681 + * @brief Set the pointer to the FacialLandmarkDetector instance
683 + * @param[in] detector : Pointer to FacialLandmarkDetector instance
685 + void SetFacialLandmarkDetector(FacialLandmarkDetector *detector);
689 * @brief モデルを描画する処理。モデルを描画する空間のView-Projection行列を渡す。
690 @@ -183,6 +191,8 @@ private:
691 const Csm::CubismId* _idParamEyeBallY; ///< パラメータID: ParamEyeBallXY
693 Csm::Rendering::CubismOffscreenFrame_OpenGLES2 _renderBuffer; ///< フレームバッファ以外の描画先
695 + FacialLandmarkDetector *_detector;
699 diff -pruN --exclude build ./demo_clean/src/LAppPal.cpp ./demo_dev/src/LAppPal.cpp
700 --- ./demo_clean/src/LAppPal.cpp 2020-09-27 17:43:12.081477263 +0100
701 +++ ./demo_dev/src/LAppPal.cpp 2020-07-11 23:29:09.084910139 +0100
705 #include "LAppPal.hpp"
706 +#include <stdexcept>
710 @@ -45,10 +46,7 @@ csmByte* LAppPal::LoadFileAsBytes(const
711 file.open(path, std::ios::in | std::ios::binary);
714 - if (DebugLogEnable)
716 - PrintLog("file open error");
718 + throw std::runtime_error("Failed to open file " + filePath);
721 file.read(buf, size);
722 diff -pruN --exclude build ./demo_clean/src/LAppTextureManager.cpp ./demo_dev/src/LAppTextureManager.cpp
723 --- ./demo_clean/src/LAppTextureManager.cpp 2020-09-27 17:43:12.085477268 +0100
724 +++ ./demo_dev/src/LAppTextureManager.cpp 2020-07-11 22:22:18.004965003 +0100
725 @@ -96,6 +96,46 @@ LAppTextureManager::TextureInfo* LAppTex
729 +LAppTextureManager::TextureInfo* LAppTextureManager::CreateTextureFromColor(
730 + uint8_t red, uint8_t green, uint8_t blue, uint8_t alpha
733 + int width = 8, height = 8;
735 + uint8_t pixels[height][width][4];
736 + for (std::size_t h = 0; h < height; h++)
738 + for (std::size_t w = 0; w < width; w++)
740 + pixels[h][w][0] = red;
741 + pixels[h][w][1] = green;
742 + pixels[h][w][2] = blue;
743 + pixels[h][w][3] = alpha;
748 + glGenTextures(1, &textureId);
749 + glBindTexture(GL_TEXTURE_2D, textureId);
750 + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
752 + glGenerateMipmap(GL_TEXTURE_2D);
753 + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
754 + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
755 + glBindTexture(GL_TEXTURE_2D, 0);
758 + LAppTextureManager::TextureInfo* textureInfo = new LAppTextureManager::TextureInfo();
759 + textureInfo->fileName = "";
760 + textureInfo->width = width;
761 + textureInfo->height = height;
762 + textureInfo->id = textureId;
764 + _textures.PushBack(textureInfo);
766 + return textureInfo;
769 void LAppTextureManager::ReleaseTextures()
771 for (Csm::csmUint32 i = 0; i < _textures.GetSize(); i++)
772 diff -pruN --exclude build ./demo_clean/src/LAppTextureManager.hpp ./demo_dev/src/LAppTextureManager.hpp
773 --- ./demo_clean/src/LAppTextureManager.hpp 2020-09-27 17:43:12.069477246 +0100
774 +++ ./demo_dev/src/LAppTextureManager.hpp 2020-07-11 17:36:31.180131039 +0100
775 @@ -72,6 +72,8 @@ public:
777 TextureInfo* CreateTextureFromPngFile(std::string fileName);
779 + TextureInfo *CreateTextureFromColor(uint8_t red, uint8_t green, uint8_t blue, uint8_t alpha = 255);
784 diff -pruN --exclude build ./demo_clean/src/LAppView.cpp ./demo_dev/src/LAppView.cpp
785 --- ./demo_clean/src/LAppView.cpp 2020-09-27 17:43:12.085477268 +0100
786 +++ ./demo_dev/src/LAppView.cpp 2020-07-11 17:38:06.905451955 +0100
788 #include "LAppLive2DManager.hpp"
789 #include "LAppTextureManager.hpp"
790 #include "LAppDefine.hpp"
791 -#include "TouchManager.hpp"
792 #include "LAppSprite.hpp"
793 #include "LAppModel.hpp"
795 @@ -26,8 +25,6 @@ using namespace LAppDefine;
796 LAppView::LAppView():
802 _renderTarget(SelectTarget_None)
804 @@ -35,8 +32,6 @@ LAppView::LAppView():
805 _clearColor[1] = 1.0f;
806 _clearColor[2] = 1.0f;
807 _clearColor[3] = 0.0f;
809 - _touchManager = new TouchManager();
811 // デバイス座標からスクリーン座標に変換するための
812 _deviceToScreen = new CubismMatrix44();
813 @@ -52,10 +47,7 @@ LAppView::~LAppView()
816 delete _deviceToScreen;
817 - delete _touchManager;
823 void LAppView::Initialize()
824 @@ -97,9 +89,6 @@ void LAppView::Initialize()
825 void LAppView::Render()
832 LAppLive2DManager* Live2DManager = LAppLive2DManager::GetInstance();
834 @@ -139,35 +128,17 @@ void LAppView::InitializeSprite()
835 glfwGetWindowSize(LAppDelegate::GetInstance()->GetWindow(), &width, &height);
837 LAppTextureManager* textureManager = LAppDelegate::GetInstance()->GetTextureManager();
838 - const string resourcesPath = LAppDelegate::GetInstance()->GetRootDirectory() + ResourcesPath;
840 - string imageName = BackImageName;
841 - LAppTextureManager::TextureInfo* backgroundTexture = textureManager->CreateTextureFromPngFile(resourcesPath + imageName);
843 + LAppTextureManager::TextureInfo* backgroundTexture =
844 + textureManager->CreateTextureFromColor(0, 255, 0);
846 float x = width * 0.5f;
847 float y = height * 0.5f;
848 - float fWidth = static_cast<float>(backgroundTexture->width * 2.0f);
849 - float fHeight = static_cast<float>(height) * 0.95f;
850 + float fWidth = static_cast<float>(width);
851 + float fHeight = static_cast<float>(height);
852 _back = new LAppSprite(x, y, fWidth, fHeight, backgroundTexture->id, _programId);
854 - imageName = GearImageName;
855 - LAppTextureManager::TextureInfo* gearTexture = textureManager->CreateTextureFromPngFile(resourcesPath + imageName);
857 - x = static_cast<float>(width - gearTexture->width * 0.5f);
858 - y = static_cast<float>(height - gearTexture->height * 0.5f);
859 - fWidth = static_cast<float>(gearTexture->width);
860 - fHeight = static_cast<float>(gearTexture->height);
861 - _gear = new LAppSprite(x, y, fWidth, fHeight, gearTexture->id, _programId);
863 - imageName = PowerImageName;
864 - LAppTextureManager::TextureInfo* powerTexture = textureManager->CreateTextureFromPngFile(resourcesPath + imageName);
866 - x = static_cast<float>(width - powerTexture->width * 0.5f);
867 - y = static_cast<float>(powerTexture->height * 0.5f);
868 - fWidth = static_cast<float>(powerTexture->width);
869 - fHeight = static_cast<float>(powerTexture->height);
870 - _power = new LAppSprite(x, y, fWidth, fHeight, powerTexture->id, _programId);
875 @@ -175,52 +146,6 @@ void LAppView::InitializeSprite()
879 -void LAppView::OnTouchesBegan(float px, float py) const
881 - _touchManager->TouchesBegan(px, py);
884 -void LAppView::OnTouchesMoved(float px, float py) const
886 - float viewX = this->TransformViewX(_touchManager->GetX());
887 - float viewY = this->TransformViewY(_touchManager->GetY());
889 - _touchManager->TouchesMoved(px, py);
891 - LAppLive2DManager* Live2DManager = LAppLive2DManager::GetInstance();
892 - Live2DManager->OnDrag(viewX, viewY);
895 -void LAppView::OnTouchesEnded(float px, float py) const
898 - LAppLive2DManager* live2DManager = LAppLive2DManager::GetInstance();
899 - live2DManager->OnDrag(0.0f, 0.0f);
903 - float x = _deviceToScreen->TransformX(_touchManager->GetX()); // 論理座標変換した座標を取得。
904 - float y = _deviceToScreen->TransformY(_touchManager->GetY()); // 論理座標変換した座標を取得。
905 - if (DebugTouchLogEnable)
907 - LAppPal::PrintLog("[APP]touchesEnded x:%.2f y:%.2f", x, y);
909 - live2DManager->OnTap(x, y);
912 - if (_gear->IsHit(px, py))
914 - live2DManager->NextScene();
918 - if (_power->IsHit(px, py))
920 - LAppDelegate::GetInstance()->AppEnd();
925 float LAppView::TransformViewX(float deviceX) const
927 float screenX = _deviceToScreen->TransformX(deviceX); // 論理座標変換した座標を取得。
928 @@ -362,32 +287,4 @@ void LAppView::ResizeSprite()
929 _back->ResetRect(x, y, fWidth, fHeight);
935 - GLuint id = _power->GetTextureId();
936 - LAppTextureManager::TextureInfo* texInfo = textureManager->GetTextureInfoById(id);
939 - x = static_cast<float>(width - texInfo->width * 0.5f);
940 - y = static_cast<float>(texInfo->height * 0.5f);
941 - fWidth = static_cast<float>(texInfo->width);
942 - fHeight = static_cast<float>(texInfo->height);
943 - _power->ResetRect(x, y, fWidth, fHeight);
949 - GLuint id = _gear->GetTextureId();
950 - LAppTextureManager::TextureInfo* texInfo = textureManager->GetTextureInfoById(id);
953 - x = static_cast<float>(width - texInfo->width * 0.5f);
954 - y = static_cast<float>(height - texInfo->height * 0.5f);
955 - fWidth = static_cast<float>(texInfo->width);
956 - fHeight = static_cast<float>(texInfo->height);
957 - _gear->ResetRect(x, y, fWidth, fHeight);
961 diff -pruN --exclude build ./demo_clean/src/LAppView.hpp ./demo_dev/src/LAppView.hpp
962 --- ./demo_clean/src/LAppView.hpp 2020-09-27 17:43:12.069477246 +0100
963 +++ ./demo_dev/src/LAppView.hpp 2020-07-11 17:38:25.541708705 +0100
965 #include "CubismFramework.hpp"
966 #include <Rendering/OpenGL/CubismOffscreenSurface_OpenGLES2.hpp>
972 @@ -66,30 +65,6 @@ public:
976 - * @brief タッチされたときに呼ばれる。
978 - * @param[in] pointX スクリーンX座標
979 - * @param[in] pointY スクリーンY座標
981 - void OnTouchesBegan(float pointX, float pointY) const;
984 - * @brief タッチしているときにポインタが動いたら呼ばれる。
986 - * @param[in] pointX スクリーンX座標
987 - * @param[in] pointY スクリーンY座標
989 - void OnTouchesMoved(float pointX, float pointY) const;
992 - * @brief タッチが終了したら呼ばれる。
994 - * @param[in] pointX スクリーンX座標
995 - * @param[in] pointY スクリーンY座標
997 - void OnTouchesEnded(float pointX, float pointY) const;
1000 * @brief X座標をView座標に変換する。
1002 * @param[in] deviceX デバイスX座標
1003 @@ -147,13 +122,10 @@ public:
1004 void SetRenderTargetClearColor(float r, float g, float b);
1007 - TouchManager* _touchManager; ///< タッチマネージャー
1008 Csm::CubismMatrix44* _deviceToScreen; ///< デバイスからスクリーンへの行列
1009 Csm::CubismViewMatrix* _viewMatrix; ///< viewMatrix
1010 GLuint _programId; ///< シェーダID
1011 LAppSprite* _back; ///< 背景画像
1012 - LAppSprite* _gear; ///< ギア画像
1013 - LAppSprite* _power; ///< 電源画像
1015 // レンダリング先を別ターゲットにする方式の場合に使用
1016 LAppSprite* _renderSprite; ///< モードによっては_renderBufferのテクスチャを描画
1017 diff -pruN --exclude build ./demo_clean/src/main.cpp ./demo_dev/src/main.cpp
1018 --- ./demo_clean/src/main.cpp 2020-09-27 17:43:12.069477246 +0100
1019 +++ ./demo_dev/src/main.cpp 2020-07-12 15:06:29.194034887 +0100
1021 * that can be found at https://www.live2d.com/eula/live2d-open-software-license-agreement_en.html.
1025 +#include <stdexcept>
1028 +#ifdef __cpp_lib_filesystem
1029 +#include <filesystem>
1030 +namespace fs = std::filesystem;
1032 +#include <experimental/filesystem>
1033 +namespace fs = std::experimental::filesystem;
1037 #include "LAppDelegate.hpp"
1038 +#include "LAppLive2DManager.hpp"
1039 +#include "facial_landmark_detector.h"
1045 + std::string windowTitle;
1046 + std::string rootDir;
1047 + float scaleFactor;
1050 + std::string modelName;
1051 + std::string cfgPath; // Path to config file for FacialLandmarkDetector
1054 +CmdArgs parseArgv(int argc, char *argv[])
1056 + // I think the command-line args are simple enough to not justify using a library...
1058 + // Set default values
1059 + cmdArgs.windowWidth = 600;
1060 + cmdArgs.windowHeight = 600;
1061 + cmdArgs.windowTitle = "FacialLandmarksForCubism example";
1062 + cmdArgs.rootDir = fs::current_path();
1063 + cmdArgs.scaleFactor = 8.0f;
1064 + cmdArgs.translateX = 0.0f;
1065 + cmdArgs.translateY = -2.8f;
1066 + cmdArgs.modelName = "Haru";
1067 + cmdArgs.cfgPath = "";
1072 + std::string arg = argv[i];
1073 + std::stringstream ss;
1075 + if (arg == "--window-width" || arg == "-W") // capital W for consistency with height
1077 + ss << argv[i + 1];
1078 + if (!(ss >> cmdArgs.windowWidth))
1080 + throw std::runtime_error("Invalid argument for window width");
1083 + else if (arg == "--window-height" || arg == "-H") // avoiding "-h", typically for help
1085 + ss << argv[i + 1];
1086 + if (!(ss >> cmdArgs.windowHeight))
1088 + throw std::runtime_error("Invalid argument for window height");
1091 + else if (arg == "--window-title" || arg == "-t")
1093 + cmdArgs.windowTitle = argv[i + 1];
1095 + else if (arg == "--root-dir" || arg == "-d")
1097 + cmdArgs.rootDir = argv[i + 1];
1099 + else if (arg == "--scale-factor" || arg == "-f")
1101 + ss << argv[i + 1];
1102 + if (!(ss >> cmdArgs.scaleFactor))
1104 + throw std::runtime_error("Invalid argument for scale factor");
1107 + else if (arg == "--translate-x" || arg == "-x")
1109 + ss << argv[i + 1];
1110 + if (!(ss >> cmdArgs.translateX))
1112 + throw std::runtime_error("Invalid argument for translate X");
1115 + else if (arg == "--translate-y" || arg == "-y")
1117 + ss << argv[i + 1];
1118 + if (!(ss >> cmdArgs.translateY))
1120 + throw std::runtime_error("Invalid argument for translate Y");
1123 + else if (arg == "--model" || arg == "-m")
1125 + cmdArgs.modelName = argv[i + 1];
1127 + else if (arg == "--config" || arg == "-c")
1129 + cmdArgs.cfgPath = argv[i + 1];
1133 + throw std::runtime_error("Unrecognized argument: " + arg);
1142 int main(int argc, char* argv[])
1144 - // create the application instance
1145 - if (LAppDelegate::GetInstance()->Initialize() == GL_FALSE)
1146 + auto cmdArgs = parseArgv(argc, argv);
1148 + LAppDelegate *delegate = LAppDelegate::GetInstance();
1150 + if (!delegate->Initialize(cmdArgs.windowWidth,
1151 + cmdArgs.windowHeight,
1152 + cmdArgs.windowTitle.c_str()))
1155 + throw std::runtime_error("Unable to initialize LAppDelegate");
1158 - LAppDelegate::GetInstance()->Run();
1159 + delegate->SetRootDirectory(cmdArgs.rootDir);
1161 + FacialLandmarkDetector detector(cmdArgs.cfgPath);
1163 + std::thread detectorThread(&FacialLandmarkDetector::mainLoop,
1166 + LAppLive2DManager *manager = LAppLive2DManager::GetInstance();
1167 + manager->SetModel(cmdArgs.modelName);
1169 + manager->SetProjectionScaleTranslate(cmdArgs.scaleFactor,
1170 + cmdArgs.translateX,
1171 + cmdArgs.translateY);
1172 + manager->SetFacialLandmarkDetector(&detector);
1177 + detectorThread.join();