添加多表情设置#84; 添加画布大小获取#85

Author: Arkueid

Main/src/LAppModel.cpp

@@ -1066,3 +1066,21 @@ const char* LAppModel::GetSoundPath(const char *group, int index)
 {
     return _modelSetting->GetMotionSoundFileName(group, index);
 }
+
+void LAppModel::GetCanvasSize(float &w, float &h)
+{
+    w = _model->GetCanvasWidth();
+    h = _model->GetCanvasHeight();
+}
+
+void LAppModel::GetCanvasSizePixel(float &w, float &h)
+{
+    w = _model->GetCanvasWidthPixel();
+    h = _model->GetCanvasHeightPixel();
+}
+
+float LAppModel::GetPixelsPerUnit()
+{
+    return _model->GetPixelsPerUnit();
+}
+

Main/src/LAppModel.hpp

@@ -206,6 +206,12 @@ class LAppModel : public Csm::CubismUserModel
 
     const char* GetSoundPath(const char* group, int index);
 
+    void GetCanvasSize(float& w, float& h);
+
+    void GetCanvasSizePixel(float& w, float& h);
+
+    float GetPixelsPerUnit();
+
 protected:
     /**
      *  @brief  モデルを描画する処理。モデルを描画する空間のView-Projection行列を渡す。

Main/src/fine-grained/Model.cpp

@@ -55,7 +55,7 @@ namespace
 
 Model::Model() : CubismUserModel(), _modelSetting(nullptr), _matrixManager(),
                  _parameterCount(0), _parameterDefaultValues(nullptr), _parameterValues(nullptr),
-                 _tmpOrderedDrawIndice(nullptr), _expFadeOutTimeMillis(0), _defaultExpressionId("")
+                 _tmpOrderedDrawIndice(nullptr)
 {
     _mocConsistency = true;
 
@@ -110,7 +110,7 @@ void Model::Update(float deltaSecs)
     _model->LoadParameters();
     if (!_motionManager->IsFinished())
     {
-        motionUpdated = _motionManager->UpdateMotion(_model, deltaSecs); 
+        motionUpdated = _motionManager->UpdateMotion(_model, deltaSecs);
     }
     _model->SaveParameters();
 
@@ -191,12 +191,19 @@ void Model::SetupModel()
                            ACubismMotion *motion = LoadExpression(buffer, size, name.GetRawString());
                            if (motion)
                            {
+                               std::string key = name.GetRawString();
                                if (_expressions[name] != nullptr)
                                {
                                    ACubismMotion::Delete(_expressions[name]);
                                    _expressions[name] = nullptr;
                                }
+                               if (_expManagers[key] != nullptr)
+                               {
+                                   CSM_DELETE(_expManagers[key]);
+                                   _expManagers.erase(key);
+                               }
                                _expressions[name] = motion;
+                               _expManagers[key] = CSM_NEW CubismExpressionMotionManager();
                            }
                        });
         }
@@ -326,8 +333,8 @@ bool Model::IsHit(CubismIdHandle drawableId, csmFloat32 pointX, csmFloat32 point
         return false; // 存在しない場合はfalse
     }
 
-    const csmInt32    count = _model->GetDrawableVertexCount(drawIndex);
-    const csmFloat32* vertices = _model->GetDrawableVertices(drawIndex);
+    const csmInt32 count = _model->GetDrawableVertexCount(drawIndex);
+    const csmFloat32 *vertices = _model->GetDrawableVertices(drawIndex);
 
     csmFloat32 left = vertices[0];
     csmFloat32 right = vertices[0];
@@ -405,26 +412,17 @@ void Model::UpdateBlink(float deltaSecs)
 
 void Model::UpdateExpression(float deltaSecs)
 {
-    if (_expFadeOutTimeMillis > 0)
+    if (_expressionManager->IsFinished())
     {
-        _expFadeOutTimeMillis -= deltaSecs * 1000;
-        if (_expFadeOutTimeMillis <= 0)
+        for (auto &pair : _expManagers)
         {
-            if (_defaultExpressionId.empty())
-            {
-                _expressionManager->StopAllMotions();
-                Info("reset expression");
-            }
-            else
-            {
-                SetExpression(_defaultExpressionId.c_str());
-                Info("reset expression: %s", _defaultExpressionId.c_str());
-            }
-            _expFadeOutTimeMillis = 0;
+            pair.second->UpdateMotion(_model, deltaSecs);
         }
     }
-
-    _expressionManager->UpdateMotion(_model, deltaSecs);
+    else 
+    {
+        _expressionManager->UpdateMotion(_model, deltaSecs);
+    }
 }
 
 void Model::UpdatePhysics(float deltaSecs)
@@ -730,7 +728,7 @@ int Model::GetMotionCount(const char *group)
     return _modelSetting->GetMotionCount(group);
 }
 
-void Model::GetMotions(void *collector, void (*collect)(void *collector, const char *group, int no, const char *file, const char* sound))
+void Model::GetMotions(void *collector, void (*collect)(void *collector, const char *group, int no, const char *file, const char *sound))
 {
     const int count = _modelSetting->GetMotionGroupCount();
     for (int i = 0; i < count; i++)
@@ -1107,39 +1105,50 @@ const unsigned short *Model::GetDrawableIndices(int index)
     return _model->GetDrawableVertexIndices(index);
 }
 
-void Model::SetExpression(const char *expressionId)
+void Model::AddExpression(const char *expressionId)
 {
     ACubismMotion *motion = _expressions[expressionId];
 
     Info("expression: [%s]", expressionId);
 
     if (motion != nullptr)
     {
-        _expressionManager->StartMotion(motion, false);
+        _expManagers[expressionId]->StartMotion(motion, false);
     }
     else
     {
         Info("expression[%s] is null ", expressionId);
     }
 }
 
-int Model::GetExpressionCount()
+void Model::RemoveExpression(const char *expressionId)
 {
-    return _modelSetting->GetExpressionCount();
+    if (_expManagers.find(expressionId) == _expManagers.end())
+    {
+        return;
+    }
+    _expManagers[expressionId]->StopAllMotions();
+
+    Info("reset expression: [%s]", expressionId);
 }
 
-void Model::GetExpressions(void *collector, void (*collect)(void *collector, const char *id, const char *file))
+void Model::SetExpression(const char *expressionId)
 {
-    const int count = _modelSetting->GetExpressionCount();
-    for (int i = 0; i < count; i++)
+    ACubismMotion *motion = _expressions[expressionId];
+
+    Info("expression: [%s]", expressionId);
+
+    if (motion != nullptr)
     {
-        const char *file = _modelSetting->GetExpressionFileName(i);
-        const char *id = _modelSetting->GetExpressionName(i);
-        collect(collector, id, file);
+        _expressionManager->StartMotion(motion, false);
+    }
+    else
+    {
+        Info("expression[%s] is null ", expressionId);
     }
 }
 
-const char *Model::SetRandomExpression()
+const char* Model::SetRandomExpression()
 {
     const int size = _expressions.GetSize();
     if (size == 0)
@@ -1162,34 +1171,36 @@ const char *Model::SetRandomExpression()
     return nullptr;
 }
 
-void Model::ResetExpression()
+void Model::ResetExpressions()
 {
+    for (auto& [id, expMgr] : _expManagers)
+    {
+        expMgr->StopAllMotions();
+    }
     _expressionManager->StopAllMotions();
+
+    Info("reset expressions");
 }
 
-void Model::SetDefaultExpression(const char *expressionId)
+void Model::ResetExpression()
 {
-    if (expressionId != nullptr || _expressions.IsExist(expressionId))
-    {
-        _defaultExpressionId = expressionId;
-        Info("set default expression: [%s]", expressionId);
-    }
-    else
-    {
-        Info("expression[%s] does not exist", expressionId);
-    }
+   _expressionManager->StopAllMotions();
+}
+
+int Model::GetExpressionCount()
+{
+    return _modelSetting->GetExpressionCount();
 }
 
-void Model::SetFadeOutExpression(const char *expressionId, double fadeOutTime)
+void Model::GetExpressions(void *collector, void (*collect)(void *collector, const char *id, const char *file))
 {
-    if (fadeOutTime < 0)
+    const int count = _modelSetting->GetExpressionCount();
+    for (int i = 0; i < count; i++)
     {
-        Info("fadeOutTime[%f] is invalid", fadeOutTime);
-        return;
+        const char *file = _modelSetting->GetExpressionFileName(i);
+        const char *id = _modelSetting->GetExpressionName(i);
+        collect(collector, id, file);
     }
-
-    SetExpression(expressionId);
-    _expFadeOutTimeMillis = fadeOutTime;
 }
 
 void Model::StopAllMotions()
@@ -1214,6 +1225,23 @@ void Model::ResetPose()
     }
 }
 
+void Model::GetCanvasSize(float &w, float &h)
+{
+    w = _model->GetCanvasWidth();
+    h = _model->GetCanvasHeight();
+}
+
+void Model::GetCanvasSizePixel(float &w, float &h)
+{
+    w = _model->GetCanvasWidthPixel();
+    h = _model->GetCanvasHeightPixel();
+}
+
+float Model::GetPixelsPerUnit()
+{
+    return _model->GetPixelsPerUnit();
+}
+
 void Model::ReleaseMotions()
 {
     for (csmMap<csmString, ACubismMotion *>::const_iterator iter = _motions.Begin(); iter != _motions.End(); ++iter)

Main/src/fine-grained/Model.hpp

@@ -9,6 +9,7 @@
 
 #include <vector>
 #include <string>
+#include <unordered_map>
 
 #include <Model/CubismUserModel.hpp>
 #include <Motion/ACubismMotion.hpp>
@@ -149,18 +150,21 @@ class Model : public Csm::CubismUserModel
     const unsigned short* GetDrawableIndices(int index);
 
     // expression
+    void AddExpression(const char *expressionId);
+
+    void RemoveExpression(const char *expressionId);
+
     void SetExpression(const char *expressionId);
 
-    int GetExpressionCount();
-    void GetExpressions(void *collector, void(*collect)(void* collector, const char* id, const char* file));
-    
     const char* SetRandomExpression();
 
+    void ResetExpressions();
+
     void ResetExpression();
 
-    void SetDefaultExpression(const char *expressionId);
+    int GetExpressionCount();
 
-    void SetFadeOutExpression(const char *expressionId, double fadeOutTime);
+    void GetExpressions(void *collector, void(*collect)(void* collector, const char* id, const char* file));
 
     // reset
     void StopAllMotions();
@@ -169,6 +173,13 @@ class Model : public Csm::CubismUserModel
 
     void ResetPose();
 
+    // sizes
+    void GetCanvasSize(float& w, float& h);
+
+    void GetCanvasSizePixel(float& w, float& h);
+
+    float GetPixelsPerUnit();
+
 private:
     void ReleaseMotions();
     void ReleaseExpressions();
@@ -184,6 +195,8 @@ class Model : public Csm::CubismUserModel
     csmString _modelHomeDir;
     csmMap<Csm::csmString, ACubismMotion*> _motions;
     csmMap<Csm::csmString, ACubismMotion*> _expressions;
+    std::unordered_map<std::string, CubismExpressionMotionManager*> _expManagers;
+    
 
     const Csm::CubismId* _idParamAngleX;
     const Csm::CubismId* _idParamAngleY;
@@ -213,7 +226,4 @@ class Model : public Csm::CubismUserModel
 
     std::vector<csmString> _motionGroupNames;
     std::vector<int> _motionCounts;
-
-    std::string _defaultExpressionId;
-    double _expFadeOutTimeMillis;
 };

Wrapper/PyLAppModel.cpp

@@ -728,6 +728,25 @@ static PyObject* PyLAppModel_GetSoundPath(PyLAppModelObject* self, PyObject* arg
     return Py_BuildValue("s", self->model->GetSoundPath(group, index));
 }
 
+static PyObject* PyLAppModel_GetCanvasSize(PyLAppModelObject* self, PyObject* args, PyObject* kwargs)
+{
+    float w, h;
+    self->model->GetCanvasSize(w, h);
+    return Py_BuildValue("ff", w, h);
+}
+
+static PyObject* PyLAppModel_GetCanvasSizePixel(PyLAppModelObject* self, PyObject* args, PyObject* kwargs)
+{
+    float w, h;
+    self->model->GetCanvasSizePixel(w, h);
+    return Py_BuildValue("ff", w, h);
+}
+
+static PyObject* PyLAppModel_GetPixelsPerUnit(PyLAppModelObject* self, PyObject* args, PyObject* kwargs)
+{
+    return Py_BuildValue("f", self->model->GetPixelsPerUnit());
+}
+
 // 包装模块方法的方法列表
 static PyMethodDef PyLAppModel_methods[] = {
     {"LoadModelJson", (PyCFunction)PyLAppModel_LoadModelJson, METH_VARARGS, ""},
@@ -783,6 +802,10 @@ static PyMethodDef PyLAppModel_methods[] = {
 
     {"GetSoundPath", (PyCFunction)PyLAppModel_GetSoundPath, METH_VARARGS | METH_KEYWORDS, ""},
 
+    {"GetCanvasSize", (PyCFunction)PyLAppModel_GetCanvasSize, METH_VARARGS, ""},
+    {"GetCanvasSizePixel", (PyCFunction)PyLAppModel_GetCanvasSizePixel, METH_VARARGS, ""},
+    {"GetPixelsPerUnit", (PyCFunction)PyLAppModel_GetPixelsPerUnit, METH_VARARGS, ""},
+
     {NULL} // 方法列表结束的标志
 };