Skip to content

Commit 5c2792e

Browse files
Update to Cubism 4 SDK for Unity beta2
1 parent f88a715 commit 5c2792e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+518
-222
lines changed

.editorconfig

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
root = true
22

33
[*]
4-
indent_style = space
5-
end_of_line = lf
64
charset = utf-8
5+
end_of_line = lf
6+
indent_size = 2
7+
indent_style = space
78
insert_final_newline = true
89
trim_trailing_whitespace = true
910

1011
[*.cs]
1112
indent_size = 4
1213
charset = utf-8-bom
1314

14-
[*.yml]
15-
indent_size = 2
16-
1715
[*.{csproj,sln}]
1816
end_of_line = crlf

.gitattributes

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1 @@
1-
# Auto detect text files and perform LF normalization
2-
* text=auto
3-
4-
# Explicitly declare files as LF
5-
*.txt text eol=lf
6-
*.md text eol=lf
7-
.editorconfig text eol=lf
8-
.gitattributes text eol=lf
9-
*.gitignore text eol=lf
10-
*.rsp text eol=lf
11-
*.cs text eol=lf diff=csharp
12-
*.cginc text eol=lf
13-
*.shader text eol=lf
14-
*.mat merge=unityyamlmerge eol=lf
15-
*.anim merge=unityyamlmerge eol=lf
16-
*.unity merge=unityyamlmerge eol=lf
17-
*.prefab merge=unityyamlmerge eol=lf
18-
*.asset merge=unityyamlmerge eol=lf
19-
*.meta merge=unityyamlmerge eol=lf
20-
*.controller merge=unityyamlmerge eol=lf
21-
22-
# Library and media files as binary
23-
*.moc3 binary
24-
*.jpg binary
25-
*.png binary
26-
*.a binary
27-
*.bc binary
28-
*.bundle binary
29-
*.dll binary
30-
*.so binary
1+
* text=auto eol=lf

.gitignore

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
1-
# We only have a few file extensions we're interested in (and we know the folder structure),
2-
# so we taking a brute force approach here...
3-
Library/
4-
ProjectSettings/
5-
Temp/
6-
*.*
7-
8-
9-
!README.md
10-
11-
!Assets/*.rsp
12-
13-
!Assets/Live2D/Cubism/**/*.cs
14-
!Assets/Live2D/Cubism/**/*.md
15-
16-
!Assets/Live2D/Cubism/Rendering/Resources/**/*.cginc
17-
!Assets/Live2D/Cubism/Rendering/Resources/**/*.shader
18-
19-
!Assets/Live2D/Cubism/Samples/**/*.cs
20-
!Assets/Live2D/Cubism/Samples/**/*.txt
21-
22-
!ChangeLogs/**/*.md
23-
24-
!.gitattributes
25-
!.editorconfig
1+
*
2+
!*/
3+
!/[Aa]ssets/*.rsp
4+
!/[Aa]ssets/Live2D/Cubism/**/*.cginc
5+
!/[Aa]ssets/Live2D/Cubism/**/*.cs
6+
!/[Aa]ssets/Live2D/Cubism/**/*.md
7+
!/[Aa]ssets/Live2D/Cubism/**/*.shader
8+
!/[Aa]ssets/Live2D/Cubism/**/*.txt
9+
/[Aa]ssets/Live2D/Cubism/Plugins/
10+
!/.gitattributes
11+
!/.editorconfig
12+
!/.gitignore
13+
!/*.md

Assets/Live2D/Cubism/CHANGELOG.md

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,43 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88

9+
## [4-beta.2] - 2019-11-14
10+
11+
### Fixed
12+
13+
* Fix sample scene sourcecode: `CubismSampleController.cs`
14+
* Fix a bug when switching multiple motions in the same layer of `Motion` component.
15+
* Fix priority not being set when playing idle motion.
16+
* Fix importing process of `.pose3.json` on `Original Workflow`.
17+
18+
919
## [4-beta.1] - 2019-09-04
1020

1121
### Added
1222

13-
- Support new Inverted Masking features.
14-
- Add `.editorconfig` and `.gitattributes` to manage file formats.
15-
- Add `UWP/ARM64` Core binary file for experimental use.
16-
- Add method to know playing motion or not [#35](https://github.com/Live2D/CubismUnityComponents/pull/35).
17-
- Add sample model and sample scene.(`./Assets/Live2D/Cubism/Samples/OriginalWorkflow/DemoCubism4`)
23+
* Support new Inverted Masking features.
24+
* Add `.editorconfig` and `.gitattributes` to manage file formats.
25+
* Add `UWP/ARM64` Core binary file for experimental use.
26+
* Add method to know playing motion or not [#35](https://github.com/Live2D/CubismUnityComponents/pull/35).
27+
* Add sample model and sample scene.(`./Assets/Live2D/Cubism/Samples/OriginalWorkflow/DemoCubism4`)
1828

1929

2030
### Changed
2131

22-
- Upgrade Core version to 04.00.0000 (67108864).
23-
- Move to `Plugin/Experimental/UWP` from `Plugin/Experimental/uwp/Windows`.
24-
- Convert all file formats according to `.editorconfig`.
25-
- `LICENSE.txt` file has been integrated into `README.md`
26-
- Remove changelog and regenerate `CHANGELOG.md`.
27-
- What was `Package.json` is currently being changed to`cubism-info.yml`.
28-
- Improve CubismUpdateController [#34](https://github.com/Live2D/CubismUnityComponents/pull/34).
32+
* Upgrade Core version to 04.00.0000 (67108864).
33+
* Move to `Plugin/Experimental/UWP` from `Plugin/Experimental/uwp/Windows`.
34+
* Convert all file formats according to `.editorconfig`.
35+
* `LICENSE.txt` file has been integrated into `README.md`
36+
* Remove changelog and regenerate `CHANGELOG.md`.
37+
* What was `Package.json` is currently being changed to`cubism-info.yml`.
38+
* Improve CubismUpdateController [#34](https://github.com/Live2D/CubismUnityComponents/pull/34).
2939

3040
### Fixed
3141

32-
- Fix issue of `Demo` and `Motion` sample in `OriginalWorkflow`.
33-
- Fix issue that mesh remain when deleting model.
34-
- Fix issue where Priority value was not reset after playing motion with CubismMotionController.
42+
* Fix issue of `Demo` and `Motion` sample in `OriginalWorkflow`.
43+
* Fix issue that mesh remain when deleting model.
44+
* Fix issue where Priority value was not reset after playing motion with CubismMotionController.
45+
3546

47+
[4-beta.2]: https://github.com/Live2D/CubismUnityComponents/compare/4-beta.1...4-beta.2
3648
[4-beta.1]: https://github.com/Live2D/CubismUnityComponents/compare/86e5b07702f74d00b4ab52b7d6c15ba3464b8b85...4-beta.1

Assets/Live2D/Cubism/Core/CubismModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public sealed class CubismModel : MonoBehaviour
4848
/// <returns>Instance.</returns>
4949
public static CubismModel InstantiateFrom(CubismMoc moc)
5050
{
51-
// Return if argument is invailed.
51+
// Return if argument is invalid.
5252
if (moc == null)
5353
{
5454
return null;
@@ -300,7 +300,7 @@ public void ForceUpdateNow()
300300
#region Unity Event Handling
301301

302302
/// <summary>
303-
/// Ttrue on the frame the instance was enabled.
303+
/// True on the frame the instance was enabled.
304304
/// </summary>
305305
private bool WasJustEnabled { get; set; }
306306

Assets/Live2D/Cubism/Core/CubismTaskableModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ public bool TryWriteParametersAndParts(CubismParameter[] parameters, CubismPart[
216216

217217

218218
/// <summary>
219-
/// Disptaches the task for (maybe async) execution.
219+
/// Dispatches the task for (maybe async) execution.
220220
/// </summary>
221221
public void Update()
222222
{

Assets/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedCanvasInformation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Live2D.Cubism.Core.Unmanaged
1515
{
1616
/// <summary>
1717
/// Unmanaged canvas information.
18-
/// </sumamry>
18+
/// </summary>
1919
public sealed class CubismUnmanagedCanvasInformation
2020
{
2121
/// <summary>

Assets/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedDrawables.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace Live2D.Cubism.Core.Unmanaged
1616
{
1717
/// <summary>
1818
/// Unmanaged drawables interface.
19-
/// </sumamry>
19+
/// </summary>
2020
public sealed class CubismUnmanagedDrawables
2121
{
2222
/// <summary>

Assets/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedParameters.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace Live2D.Cubism.Core.Unmanaged
1616
{
1717
/// <summary>
1818
/// Unmanaged parameters interface.
19-
/// </sumamry>
19+
/// </summary>
2020
public sealed class CubismUnmanagedParameters
2121
{
2222
/// <summary>

Assets/Live2D/Cubism/Editor/CubismOriginalWorkflowSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
namespace Live2D.Cubism.Editor.OriginalWorkflow
1515
{
1616
/// <summary>
17-
/// Scriptableobject to save cubism original workflow setting.
17+
/// ScriptableObject to save cubism original workflow setting.
1818
/// </summary>
1919
public class CubismOriginalWorkflowSettings: ScriptableObject
2020
{

0 commit comments

Comments
 (0)