Update to Cubism 4 SDK for Native R5 beta5

Live2D · Aug 4, 2022 · 98abe81 · 98abe81
1 parent d6cdcd1
commit 98abe81
Show file tree

Hide file tree

Showing 45 changed files with 528 additions and 167 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
+## [4-r.5-beta.5] - 2022-08-04
+
+### Changed
+
+* Update `Mao` model.
+* Change the Signing setting of the Debugging building in the samples for Android to use the `debug.keystore` in the `app` directory.
+
+### Fixed
+
+* Fix the GLEW version for Visual Studio 2013.
+* Fix crash with exception when reading .moc3 files of unsupported versions.
+
+
 ## [4-r.5-beta.4.1] - 2022-07-08
 
 ### Fixed
@@ -217,6 +230,7 @@ See [Core Changelog] for details.
 * What was `Package.json` is currently being changed to`cubism-info.yml`.
 
 
+[4-r.5-beta.5]: https://github.com/Live2D/CubismNativeSamples/compare/4-r.5-beta.4.1...4-r.5-beta.5
 [4-r.5-beta.4.1]: https://github.com/Live2D/CubismNativeSamples/compare/4-r.5-beta.4...4-r.5-beta.4.1
 [4-r.5-beta.4]: https://github.com/Live2D/CubismNativeSamples/compare/4-r.5-beta.3...4-r.5-beta.4
 [4-r.5-beta.3]: https://github.com/Live2D/CubismNativeSamples/compare/4-r.5-beta.2...4-r.5-beta.3

diff --git a/Framework b/Framework
diff --git a/README.md b/README.md
@@ -98,7 +98,7 @@ Demo
 | Visual Studio 2013 | Update 5 |
 | Visual Studio 2015 | Update 3 |
 | Visual Studio 2017 | 15.9.49 |
-| Visual Studio 2019 | 16.11.16 |
+| Visual Studio 2019 | 16.11.17 |
 | XCode | 13.4.1 |
 
 ### Android
@@ -136,7 +136,7 @@ Demo
 | プラットフォーム | バージョン |
 | --- | --- |
 | iOS / iPadOS | 15.5 |
-| macOS | 12.4 |
+| macOS | 12.5 |
 | Windows 10 | 21H2 |
 | Windows 11 | 21H2 |
 

diff --git a/Samples/Cocos2d-x/Demo/Classes/LAppLive2DManager.cpp b/Samples/Cocos2d-x/Demo/Classes/LAppLive2DManager.cpp
@@ -199,6 +199,13 @@ void LAppLive2DManager::OnUpdate(Csm::Rendering::CubismCommandBuffer_Cocos2dx* c
     {
         CubismMatrix44 projection;
         LAppModel* model = GetModel(i);
+
+        if (model->GetModel() == NULL)
+        {
+          LAppPal::PrintLog("Failed to model->GetModel().");
+          continue;
+        }
+
         if (model->GetModel()->GetCanvasWidth() > 1.0f && window.width < window.height)
         {
             // 横に長いモデルを縦長ウィンドウに表示する際モデルの横サイズでscaleを算出する

diff --git a/Samples/Cocos2d-x/Demo/Classes/LAppModel.cpp b/Samples/Cocos2d-x/Demo/Classes/LAppModel.cpp
@@ -130,6 +130,12 @@ void LAppModel::LoadAssets(const csmChar* dir, const csmChar* fileName)
 
     SetupModel(setting);
 
+    if (_model == NULL)
+    {
+      LAppPal::PrintLog("Failed to LoadAssets().");
+      return;
+    }
+
     CreateRenderer();
 
     SetupTextures();
@@ -255,6 +261,12 @@ void LAppModel::SetupModel(ICubismModelSetting* setting)
         }
     }
 
+    if (_modelSetting == NULL || _modelMatrix == NULL)
+    {
+      LAppPal::PrintLog("Failed to SetupModel().");
+      return;
+    }
+
     //Layout
     csmMap<csmString, csmFloat32> layout;
     _modelSetting->GetLayoutMap(layout);

diff --git a/Samples/Cocos2d-x/Demo/proj.android/app/build.gradle b/Samples/Cocos2d-x/Demo/proj.android/app/build.gradle
@@ -48,6 +48,13 @@ android {
                 keyPassword RELEASE_KEY_PASSWORD
             }
         }
+
+        debug {
+            storeFile file("debug.keystore")
+            storePassword "android"
+            keyAlias "androiddebugkey"
+            keyPassword "android"
+        }
     }
 
     buildTypes {

diff --git a/Samples/Cocos2d-x/Demo/proj.android/app/debug.keystore b/Samples/Cocos2d-x/Demo/proj.android/app/debug.keystore
diff --git a/Samples/D3D11/Demo/proj.d3d11.cmake/src/LAppLive2DManager.cpp b/Samples/D3D11/Demo/proj.d3d11.cmake/src/LAppLive2DManager.cpp
@@ -156,6 +156,12 @@ void LAppLive2DManager::OnUpdate() const
         CubismMatrix44 projection;
         LAppModel* model = GetModel(i);
 
+        if (model->GetModel() == NULL)
+        {
+            LAppPal::PrintLog("Failed to model->GetModel().");
+            continue;
+        }
+
         if (model->GetModel()->GetCanvasWidth() > 1.0f && windowWidth < windowHeight)
         {
             // 横に長いモデルを縦長ウィンドウに表示する際モデルの横サイズでscaleを算出する

diff --git a/Samples/D3D11/Demo/proj.d3d11.cmake/src/LAppModel.cpp b/Samples/D3D11/Demo/proj.d3d11.cmake/src/LAppModel.cpp
@@ -105,6 +105,12 @@ void LAppModel::LoadAssets(const csmChar* dir, const csmChar* fileName)
 
     SetupModel(setting);
 
+    if (_model == NULL)
+    {
+        LAppPal::PrintLog("Failed to LoadAssets().");
+        return;
+    }
+
     CreateRenderer();
 
     SetupTextures();
@@ -232,6 +238,12 @@ void LAppModel::SetupModel(ICubismModelSetting* setting)
         }
     }
 
+    if (_modelSetting == NULL || _modelMatrix == NULL)
+    {
+        LAppPal::PrintLog("Failed to SetupModel().");
+        return;
+    }
+
     //Layout
     csmMap<csmString, csmFloat32> layout;
     _modelSetting->GetLayoutMap(layout);

diff --git a/Samples/D3D9/Demo/proj.d3d9.cmake/src/LAppLive2DManager.cpp b/Samples/D3D9/Demo/proj.d3d9.cmake/src/LAppLive2DManager.cpp
@@ -154,6 +154,13 @@ void LAppLive2DManager::OnUpdate() const
     {
         CubismMatrix44 projection;
         LAppModel* model = GetModel(i);
+
+        if (model->GetModel() == NULL)
+        {
+            LAppPal::PrintLog("Failed to model->GetModel().");
+            continue;
+        }
+
         if (model->GetModel()->GetCanvasWidth() > 1.0f && width < height)
         {
             // 横に長いモデルを縦長ウィンドウに表示する際モデルの横サイズでscaleを算出する
@@ -287,6 +294,12 @@ void LAppLive2DManager::RestoreDeviceLost(LPDIRECT3DDEVICE9 device)
     // レンダラー再作成
     for (csmUint32 i = 0; i < _models.GetSize(); i++)
     {
+        if (_models[i]->GetModel() == NULL)
+        {
+            LAppPal::PrintLog("Failed to model->GetModel().");
+            continue;
+        }
+
         _models[i]->ReloadRenderer();
     }
 }

diff --git a/Samples/D3D9/Demo/proj.d3d9.cmake/src/LAppModel.cpp b/Samples/D3D9/Demo/proj.d3d9.cmake/src/LAppModel.cpp
@@ -105,6 +105,12 @@ void LAppModel::LoadAssets(const csmChar* dir, const csmChar* fileName)
 
     SetupModel(setting);
 
+    if (_model == NULL)
+    {
+        LAppPal::PrintLog("Failed to LoadAssets().");
+        return;
+    }
+
     CreateRenderer();
 
     SetupTextures();
@@ -232,6 +238,12 @@ void LAppModel::SetupModel(ICubismModelSetting* setting)
         }
     }
 
+    if (_modelSetting == NULL || _modelMatrix == NULL)
+    {
+        LAppPal::PrintLog("Failed to SetupModel().");
+        return;
+    }
+
     //Layout
     csmMap<csmString, csmFloat32> layout;
     _modelSetting->GetLayoutMap(layout);

diff --git a/Samples/Metal/Demo/proj.ios.cmake/src/LAppLive2DManager.mm b/Samples/Metal/Demo/proj.ios.cmake/src/LAppLive2DManager.mm
@@ -203,6 +203,13 @@ - (void)onUpdate:(id <MTLCommandBuffer>)commandBuffer currentDrawable:(id<CAMeta
     for (Csm::csmUint32 i = 0; i < modelCount; ++i)
     {
         LAppModel* model = [self getModel:i];
+
+        if (model->GetModel() == NULL)
+        {
+            LAppPal::PrintLog("Failed to model->GetModel().");
+            continue;
+        }
+
         if (model->GetModel()->GetCanvasWidth() > 1.0f && width < height)
         {
             // 横に長いモデルを縦長ウィンドウに表示する際モデルの横サイズでscaleを算出する

diff --git a/Samples/Metal/Demo/proj.ios.cmake/src/LAppModel.mm b/Samples/Metal/Demo/proj.ios.cmake/src/LAppModel.mm
@@ -115,6 +115,12 @@ void DeleteBuffer(csmByte* buffer, const csmChar* path = "")
 
     SetupModel(setting);
 
+    if (_model == NULL)
+    {
+        LAppPal::PrintLog("Failed to LoadAssets().");
+        return;
+    }
+
     CreateRenderer();
 
     SetupTextures();
@@ -242,6 +248,12 @@ void DeleteBuffer(csmByte* buffer, const csmChar* path = "")
         }
     }
 
+    if (_modelSetting == NULL || _modelMatrix == NULL)
+    {
+        LAppPal::PrintLog("Failed to SetupModel().");
+        return;
+    }
+
     //Layout
     csmMap<csmString, csmFloat32> layout;
     _modelSetting->GetLayoutMap(layout);

diff --git a/Samples/OpenGL/Demo/proj.android.cmake/Full/app/build.gradle b/Samples/OpenGL/Demo/proj.android.cmake/Full/app/build.gradle
@@ -16,6 +16,14 @@ android {
             }
         }
     }
+    signingConfigs {
+        debug {
+            storeFile file("debug.keystore")
+            storePassword "android"
+            keyAlias "androiddebugkey"
+            keyPassword "android"
+        }
+    }
     buildTypes {
         release {
             minifyEnabled false

diff --git a/Samples/OpenGL/Demo/proj.android.cmake/Full/app/debug.keystore b/Samples/OpenGL/Demo/proj.android.cmake/Full/app/debug.keystore
diff --git a/Samples/OpenGL/Demo/proj.android.cmake/Full/app/src/main/cpp/LAppLive2DManager.cpp b/Samples/OpenGL/Demo/proj.android.cmake/Full/app/src/main/cpp/LAppLive2DManager.cpp
@@ -130,6 +130,13 @@ void LAppLive2DManager::OnUpdate() const
     {
         CubismMatrix44 projection;
         LAppModel* model = GetModel(i);
+
+        if (model->GetModel() == NULL)
+        {
+            LAppPal::PrintLog("Failed to model->GetModel().");
+            continue;
+        }
+
         if (model->GetModel()->GetCanvasWidth() > 1.0f && width < height)
         {
             // 横に長いモデルを縦長ウィンドウに表示する際モデルの横サイズでscaleを算出する

diff --git a/Samples/OpenGL/Demo/proj.android.cmake/Full/app/src/main/cpp/LAppModel.cpp b/Samples/OpenGL/Demo/proj.android.cmake/Full/app/src/main/cpp/LAppModel.cpp
@@ -96,6 +96,12 @@ void LAppModel::LoadAssets(const csmChar* dir, const csmChar* fileName)
 
     SetupModel(setting);
 
+    if (_model == NULL)
+    {
+        LAppPal::PrintLog("Failed to LoadAssets().");
+        return;
+    }
+
     CreateRenderer();
 
     SetupTextures();
@@ -223,6 +229,12 @@ void LAppModel::SetupModel(ICubismModelSetting* setting)
         }
     }
 
+    if (_modelSetting == NULL || _modelMatrix == NULL)
+    {
+        LAppPal::PrintLog("Failed to SetupModel().");
+        return;
+    }
+
     //Layout
     csmMap<csmString, csmFloat32> layout;
     _modelSetting->GetLayoutMap(layout);

diff --git a/Samples/OpenGL/Demo/proj.android.cmake/Minimum/app/build.gradle b/Samples/OpenGL/Demo/proj.android.cmake/Minimum/app/build.gradle
@@ -16,6 +16,14 @@ android {
             }
         }
     }
+    signingConfigs {
+        debug {
+            storeFile file("debug.keystore")
+            storePassword "android"
+            keyAlias "androiddebugkey"
+            keyPassword "android"
+        }
+    }
     buildTypes {
         release {
             minifyEnabled false

diff --git a/Samples/OpenGL/Demo/proj.android.cmake/Minimum/app/debug.keystore b/Samples/OpenGL/Demo/proj.android.cmake/Minimum/app/debug.keystore
diff --git a/Samples/OpenGL/Demo/proj.ios.cmake/src/LAppLive2DManager.mm b/Samples/OpenGL/Demo/proj.ios.cmake/src/LAppLive2DManager.mm
@@ -139,6 +139,13 @@ - (void)onUpdate;
     {
         Csm::CubismMatrix44 projection;
         LAppModel* model = [self getModel:i];
+
+        if (model->GetModel() == NULL)
+        {
+            LAppPal::PrintLog("Failed to model->GetModel().");
+            continue;
+        }
+
         if (model->GetModel()->GetCanvasWidth() > 1.0f && width < height)
         {
           // 横に長いモデルを縦長ウィンドウに表示する際モデルの横サイズでscaleを算出する

diff --git a/Samples/OpenGL/Demo/proj.ios.cmake/src/LAppModel.mm b/Samples/OpenGL/Demo/proj.ios.cmake/src/LAppModel.mm
@@ -97,12 +97,17 @@ void DeleteBuffer(csmByte* buffer, const csmChar* path = "")
 
     SetupModel(setting);
 
+    if (_model == NULL)
+    {
+        LAppPal::PrintLog("Failed to LoadAssets().");
+        return;
+    }
+
     CreateRenderer();
 
     SetupTextures();
 }
 
-
 void LAppModel::SetupModel(ICubismModelSetting* setting)
 {
     _updating = true;
@@ -224,6 +229,12 @@ void DeleteBuffer(csmByte* buffer, const csmChar* path = "")
         }
     }
 
+    if (_modelSetting == NULL || _modelMatrix == NULL)
+    {
+        LAppPal::PrintLog("Failed to SetupModel().");
+        return;
+    }
+
     //Layout
     csmMap<csmString, csmFloat32> layout;
     _modelSetting->GetLayoutMap(layout);

diff --git a/Samples/OpenGL/Demo/proj.linux.cmake/src/LAppLive2DManager.cpp b/Samples/OpenGL/Demo/proj.linux.cmake/src/LAppLive2DManager.cpp
@@ -132,6 +132,13 @@ void LAppLive2DManager::OnUpdate() const
     {
         CubismMatrix44 projection;
         LAppModel* model = GetModel(i);
+
+        if (model->GetModel() == NULL)
+        {
+            LAppPal::PrintLog("Failed to model->GetModel().");
+            continue;
+        }
+
         if (model->GetModel()->GetCanvasWidth() > 1.0f && width < height)
         {
             // 横に長いモデルを縦長ウィンドウに表示する際モデルの横サイズでscaleを算出する

diff --git a/Samples/OpenGL/Demo/proj.linux.cmake/src/LAppModel.cpp b/Samples/OpenGL/Demo/proj.linux.cmake/src/LAppModel.cpp
@@ -96,6 +96,12 @@ void LAppModel::LoadAssets(const csmChar* dir, const csmChar* fileName)
 
     SetupModel(setting);
 
+    if (_model == NULL)
+    {
+        LAppPal::PrintLog("Failed to LoadAssets().");
+        return;
+    }
+
     CreateRenderer();
 
     SetupTextures();
@@ -223,6 +229,12 @@ void LAppModel::SetupModel(ICubismModelSetting* setting)
         }
     }
 
+    if (_modelSetting == NULL || _modelMatrix == NULL)
+    {
+        LAppPal::PrintLog("Failed to SetupModel().");
+        return;
+    }
+
     //Layout
     csmMap<csmString, csmFloat32> layout;
     _modelSetting->GetLayoutMap(layout);