From 0f7299bb2c09d5ea2678a6b803ab48fa8d5b2e4d Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 27 Jul 2020 15:33:09 +0900 Subject: [PATCH 1/4] use BlendShapeKey.CreateFromPreset --- Assets/VRM.Samples/Scripts/AIUEO.cs | 8 ++++---- Assets/VRM/UniVRM/Scripts/BlendShape/Blinker.cs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/VRM.Samples/Scripts/AIUEO.cs b/Assets/VRM.Samples/Scripts/AIUEO.cs index 9e2175207..a7a7e61b8 100644 --- a/Assets/VRM.Samples/Scripts/AIUEO.cs +++ b/Assets/VRM.Samples/Scripts/AIUEO.cs @@ -30,17 +30,17 @@ namespace VRM.Samples { for (var value = 0.0f; value <= 1.0f; value += velocity) { - BlendShapes.ImmediatelySetValue(preset, value); + BlendShapes.ImmediatelySetValue(BlendShapeKey.CreateFromPreset(preset), value); yield return null; } - BlendShapes.ImmediatelySetValue(preset, 1.0f); + BlendShapes.ImmediatelySetValue(BlendShapeKey.CreateFromPreset(preset), 1.0f); yield return new WaitForSeconds(wait); for (var value = 1.0f; value >= 0; value -= velocity) { - BlendShapes.ImmediatelySetValue(preset, value); + BlendShapes.ImmediatelySetValue(BlendShapeKey.CreateFromPreset(preset), value); yield return null; } - BlendShapes.ImmediatelySetValue(preset, 0); + BlendShapes.ImmediatelySetValue(BlendShapeKey.CreateFromPreset(preset), 0); yield return new WaitForSeconds(wait * 2); } diff --git a/Assets/VRM/UniVRM/Scripts/BlendShape/Blinker.cs b/Assets/VRM/UniVRM/Scripts/BlendShape/Blinker.cs index 45dd32f58..40e31fd1b 100644 --- a/Assets/VRM/UniVRM/Scripts/BlendShape/Blinker.cs +++ b/Assets/VRM/UniVRM/Scripts/BlendShape/Blinker.cs @@ -71,10 +71,10 @@ namespace VRM break; } - BlendShapes.ImmediatelySetValue(BlendShapePreset.Blink, value); + BlendShapes.ImmediatelySetValue(BlendShapeKey.CreateFromPreset(BlendShapePreset.Blink), value); yield return null; } - BlendShapes.ImmediatelySetValue(BlendShapePreset.Blink, 1.0f); + BlendShapes.ImmediatelySetValue(BlendShapeKey.CreateFromPreset(BlendShapePreset.Blink), 1.0f); // wait... yield return new WaitForSeconds(m_closingTime); @@ -90,10 +90,10 @@ namespace VRM break; } - BlendShapes.ImmediatelySetValue(BlendShapePreset.Blink, value); + BlendShapes.ImmediatelySetValue(BlendShapeKey.CreateFromPreset(BlendShapePreset.Blink), value); yield return null; } - BlendShapes.ImmediatelySetValue(BlendShapePreset.Blink, 0); + BlendShapes.ImmediatelySetValue(BlendShapeKey.CreateFromPreset(BlendShapePreset.Blink), 0); } } From 44749e915ddeebf53447bd041d0d040176fe164d Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 27 Jul 2020 15:41:49 +0900 Subject: [PATCH 2/4] warning CS0649 --- .../VRM.Samples/Scripts/VRMRuntimeExporter.cs | 4 +- .../VRM.Samples/Scripts/VRMRuntimeLoader.cs | 6 +- Assets/VRM.Samples/Scripts/ViewerUI.cs | 58 +++++++++---------- .../VRM/UniGLTF/Editor/Tests/UniGLTFTests.cs | 2 +- .../UniHumanoid/Scenes/RuntimeBvhLoader.cs | 4 +- .../Scripts/SpringBone/VRMSpringBone.cs | 2 +- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Assets/VRM.Samples/Scripts/VRMRuntimeExporter.cs b/Assets/VRM.Samples/Scripts/VRMRuntimeExporter.cs index 7da329032..63a64740d 100644 --- a/Assets/VRM.Samples/Scripts/VRMRuntimeExporter.cs +++ b/Assets/VRM.Samples/Scripts/VRMRuntimeExporter.cs @@ -8,9 +8,9 @@ namespace VRM.Samples public class VRMRuntimeExporter : MonoBehaviour { - [SerializeField] Button m_loadButton; + [SerializeField] Button m_loadButton = default; - [SerializeField] Button m_exportButton; + [SerializeField] Button m_exportButton = default; GameObject m_model; diff --git a/Assets/VRM.Samples/Scripts/VRMRuntimeLoader.cs b/Assets/VRM.Samples/Scripts/VRMRuntimeLoader.cs index 95c4f0006..c9d20608a 100644 --- a/Assets/VRM.Samples/Scripts/VRMRuntimeLoader.cs +++ b/Assets/VRM.Samples/Scripts/VRMRuntimeLoader.cs @@ -10,13 +10,13 @@ namespace VRM.Samples public class VRMRuntimeLoader : MonoBehaviour { [SerializeField] - bool m_loadAsync; + bool m_loadAsync = default; [SerializeField, Header("GUI")] - CanvasManager m_canvas; + CanvasManager m_canvas = default; [SerializeField] - LookTarget m_faceCamera; + LookTarget m_faceCamera = default; [SerializeField, Header("loader")] UniHumanoid.HumanPoseTransfer m_source; diff --git a/Assets/VRM.Samples/Scripts/ViewerUI.cs b/Assets/VRM.Samples/Scripts/ViewerUI.cs index 5a1b21c06..bb640dbe4 100644 --- a/Assets/VRM.Samples/Scripts/ViewerUI.cs +++ b/Assets/VRM.Samples/Scripts/ViewerUI.cs @@ -12,58 +12,58 @@ namespace VRM.Samples { #region UI [SerializeField] - Text m_version; + Text m_version = default; [SerializeField] - Button m_open; + Button m_open = default; [SerializeField] - Toggle m_enableLipSync; + Toggle m_enableLipSync = default; [SerializeField] - Toggle m_enableAutoBlink; + Toggle m_enableAutoBlink = default; #endregion [SerializeField] - HumanPoseTransfer m_src; + HumanPoseTransfer m_src = default; [SerializeField] - GameObject m_target; + GameObject m_target = default; [SerializeField] - GameObject Root; + GameObject Root = default; [Serializable] - struct TextFields + class TextFields { [SerializeField, Header("Info")] - Text m_textModelTitle; + Text m_textModelTitle = default; [SerializeField] - Text m_textModelVersion; + Text m_textModelVersion = default; [SerializeField] - Text m_textModelAuthor; + Text m_textModelAuthor = default; [SerializeField] - Text m_textModelContact; + Text m_textModelContact = default; [SerializeField] - Text m_textModelReference; + Text m_textModelReference = default; [SerializeField] - RawImage m_thumbnail; + RawImage m_thumbnail = default; [SerializeField, Header("CharacterPermission")] - Text m_textPermissionAllowed; + Text m_textPermissionAllowed = default; [SerializeField] - Text m_textPermissionViolent; + Text m_textPermissionViolent = default; [SerializeField] - Text m_textPermissionSexual; + Text m_textPermissionSexual = default; [SerializeField] - Text m_textPermissionCommercial; + Text m_textPermissionCommercial = default; [SerializeField] - Text m_textPermissionOther; + Text m_textPermissionOther = default; [SerializeField, Header("DistributionLicense")] - Text m_textDistributionLicense; + Text m_textDistributionLicense = default; [SerializeField] - Text m_textDistributionOther; + Text m_textDistributionOther = default; public void Start() { @@ -106,21 +106,21 @@ namespace VRM.Samples } } [SerializeField] - TextFields m_texts; + TextFields m_texts = default; [Serializable] - struct UIFields + class UIFields { [SerializeField] - Toggle ToggleMotionTPose; + Toggle ToggleMotionTPose = default; [SerializeField] - Toggle ToggleMotionBVH; + Toggle ToggleMotionBVH = default; [SerializeField] - ToggleGroup ToggleMotion; + ToggleGroup ToggleMotion = default; - Toggle m_activeToggleMotion; + Toggle m_activeToggleMotion = default; public void UpdateToggle(Action onBvh, Action onTPose) { @@ -144,10 +144,10 @@ namespace VRM.Samples } } [SerializeField] - UIFields m_ui; + UIFields m_ui = default; [SerializeField] - HumanPoseClip m_pose; + HumanPoseClip m_pose = default; private void Reset() { diff --git a/Assets/VRM/UniGLTF/Editor/Tests/UniGLTFTests.cs b/Assets/VRM/UniGLTF/Editor/Tests/UniGLTFTests.cs index 6eb3b37a7..067cdb83f 100644 --- a/Assets/VRM/UniGLTF/Editor/Tests/UniGLTFTests.cs +++ b/Assets/VRM/UniGLTF/Editor/Tests/UniGLTFTests.cs @@ -705,7 +705,7 @@ namespace UniGLTF [Serializable] class Dummy { - public CantConstruct Value; + public CantConstruct Value = default; } [Test] diff --git a/Assets/VRM/UniHumanoid/Scenes/RuntimeBvhLoader.cs b/Assets/VRM/UniHumanoid/Scenes/RuntimeBvhLoader.cs index 73ac4c4cc..afc3727c0 100644 --- a/Assets/VRM/UniHumanoid/Scenes/RuntimeBvhLoader.cs +++ b/Assets/VRM/UniHumanoid/Scenes/RuntimeBvhLoader.cs @@ -14,10 +14,10 @@ namespace UniHumanoid public class RuntimeBvhLoader : MonoBehaviour { [SerializeField] - Button m_openButton; + Button m_openButton = default; [SerializeField] - HumanPoseTransfer m_dst; + HumanPoseTransfer m_dst = default; UnityAction m_onClick; diff --git a/Assets/VRM/UniVRM/Scripts/SpringBone/VRMSpringBone.cs b/Assets/VRM/UniVRM/Scripts/SpringBone/VRMSpringBone.cs index 0f40bcb26..99ac2da4c 100644 --- a/Assets/VRM/UniVRM/Scripts/SpringBone/VRMSpringBone.cs +++ b/Assets/VRM/UniVRM/Scripts/SpringBone/VRMSpringBone.cs @@ -18,7 +18,7 @@ namespace VRM public string m_comment; [SerializeField, Header("Gizmo")] - bool m_drawGizmo; + bool m_drawGizmo = default; [SerializeField] Color m_gizmoColor = Color.yellow; From 9019b2dd52272eb6e2f0596572f6a187e38e9f02 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 27 Jul 2020 15:46:56 +0900 Subject: [PATCH 3/4] warning CS0618 --- Assets/VRM/UniVRM/Scripts/Format/VRMVersionPartial.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/VRM/UniVRM/Scripts/Format/VRMVersionPartial.cs b/Assets/VRM/UniVRM/Scripts/Format/VRMVersionPartial.cs index 2c2820a5d..ebaaa3df1 100644 --- a/Assets/VRM/UniVRM/Scripts/Format/VRMVersionPartial.cs +++ b/Assets/VRM/UniVRM/Scripts/Format/VRMVersionPartial.cs @@ -85,7 +85,7 @@ namespace VRM return true; } - catch (Exception e) + catch (Exception) { return false; } From 066e357ca578b2b34158b4ef595920dc5916960e Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 27 Jul 2020 15:48:54 +0900 Subject: [PATCH 4/4] fix obsolete --- .../UniHumanoid/Scripts/IO/BvhImporterContext.cs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Assets/VRM/UniHumanoid/Scripts/IO/BvhImporterContext.cs b/Assets/VRM/UniHumanoid/Scripts/IO/BvhImporterContext.cs index 12d87d9a8..f7acb3a12 100644 --- a/Assets/VRM/UniHumanoid/Scripts/IO/BvhImporterContext.cs +++ b/Assets/VRM/UniHumanoid/Scripts/IO/BvhImporterContext.cs @@ -210,17 +210,8 @@ namespace UniHumanoid } // Create or update Main Asset - if (File.Exists(path)) - { - Debug.LogFormat("replace prefab: {0}", path); - var prefab = AssetDatabase.LoadAssetAtPath(path); - PrefabUtility.ReplacePrefab(Root, prefab, ReplacePrefabOptions.ReplaceNameBased); - } - else - { - Debug.LogFormat("create prefab: {0}", path); - PrefabUtility.CreatePrefab(path, Root); - } + Debug.LogFormat("create prefab: {0}", path); + PrefabUtility.SaveAsPrefabAssetAndConnect(Root, path, InteractionMode.AutomatedAction); AssetDatabase.ImportAsset(path); }