From 9d1da26ff8e3f2cf9532c2dac3b8b510f1ae83eb Mon Sep 17 00:00:00 2001 From: Isamu Mogi Date: Sat, 8 Jun 2019 22:55:33 +0900 Subject: [PATCH 1/2] Fix typo (public class members) --- .../IEnumeratorExtensions.cs | 9 ++- .../UniGLTF/Editor/gltfAssetPostprocessor.cs | 2 +- .../Scripts/Extensions/UnityExtensions.cs | 6 ++ .../VRM/UniGLTF/Scripts/Format/BytesBuffer.cs | 8 +- Assets/VRM/UniGLTF/Scripts/IO/IStorage.cs | 2 +- .../VRM/UniGLTF/Scripts/IO/ImporterContext.cs | 10 ++- Assets/VRM/UniGLTF/Scripts/IO/MeshExporter.cs | 8 +- Assets/VRM/UniGLTF/Scripts/IO/TextureItem.cs | 2 +- Assets/VRM/UniGLTF/Scripts/IO/UnityPath.cs | 8 +- Assets/VRM/UniGLTF/Scripts/IO/glbImporter.cs | 6 ++ Assets/VRM/UniGLTF/Scripts/IO/gltfExporter.cs | 8 +- .../VRM/UniHumanoid/PoseModifier/HandPose.cs | 81 +++++++++++-------- .../VRM/UniHumanoid/PoseModifier/HandRig.cs | 27 ++++--- .../Scripts/ListTreeNode/ListTreeNode.cs | 2 +- .../ListTreeNodeArrayExtensions.cs | 12 ++- Assets/VRM/UniUnlit/Editor/UniUnlitEditor.cs | 2 +- Assets/VRM/UniUnlit/Scripts/Utils.cs | 9 ++- .../UniVRM/Editor/Format/VRMImporterMenu.cs | 2 +- .../Editor/Format/vrmAssetPostprocessor.cs | 2 +- .../BlendShape/BlendShapeClipHandler.cs | 5 ++ .../Scripts/Format/glTF_VRMExtensions.cs | 11 ++- 21 files changed, 149 insertions(+), 73 deletions(-) diff --git a/Assets/VRM/DepthFirstScheduler/IEnumeratorExtensions.cs b/Assets/VRM/DepthFirstScheduler/IEnumeratorExtensions.cs index c7b4b3cfff..30bd9f66d0 100644 --- a/Assets/VRM/DepthFirstScheduler/IEnumeratorExtensions.cs +++ b/Assets/VRM/DepthFirstScheduler/IEnumeratorExtensions.cs @@ -1,4 +1,5 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; @@ -7,7 +8,13 @@ { public static class IEnumeratorExtensions { + [Obsolete("Use CoroutineToEnd")] public static void CoroutinetoEnd(this IEnumerator coroutine) + { + CoroutineToEnd(coroutine); + } + + public static void CoroutineToEnd(this IEnumerator coroutine) { var stack = new Stack(); stack.Push(coroutine); diff --git a/Assets/VRM/UniGLTF/Editor/gltfAssetPostprocessor.cs b/Assets/VRM/UniGLTF/Editor/gltfAssetPostprocessor.cs index 9b23704ef4..c1e884c088 100644 --- a/Assets/VRM/UniGLTF/Editor/gltfAssetPostprocessor.cs +++ b/Assets/VRM/UniGLTF/Editor/gltfAssetPostprocessor.cs @@ -48,7 +48,7 @@ public static void ImportAsset(string src, string ext, UnityPath prefabPath) context.Parse(src); // Extract textures to assets folder - context.ExtranctImages(prefabPath); + context.ExtractImages(prefabPath); ImportDelayed(src, prefabPath, context); } diff --git a/Assets/VRM/UniGLTF/Scripts/Extensions/UnityExtensions.cs b/Assets/VRM/UniGLTF/Scripts/Extensions/UnityExtensions.cs index c3e2f5883a..b9e10e49eb 100644 --- a/Assets/VRM/UniGLTF/Scripts/Extensions/UnityExtensions.cs +++ b/Assets/VRM/UniGLTF/Scripts/Extensions/UnityExtensions.cs @@ -219,7 +219,13 @@ public static IEnumerable Traverse(this Transform t) } } + [Obsolete("Use FindDescendant(name)")] public static Transform FindDescenedant(this Transform t, string name) + { + return FindDescendant(t, name); + } + + public static Transform FindDescendant(this Transform t, string name) { return t.Traverse().First(x => x.name == name); } diff --git a/Assets/VRM/UniGLTF/Scripts/Format/BytesBuffer.cs b/Assets/VRM/UniGLTF/Scripts/Format/BytesBuffer.cs index 1c50307a7c..11c805fe42 100644 --- a/Assets/VRM/UniGLTF/Scripts/Format/BytesBuffer.cs +++ b/Assets/VRM/UniGLTF/Scripts/Format/BytesBuffer.cs @@ -49,7 +49,13 @@ public UriByteBuffer(string baseDir, string uri) const string DataPrefix3 = "data:image/jpeg;base64,"; + [Obsolete("Use ReadEmbedded(uri)")] public static Byte[] ReadEmbeded(string uri) + { + return ReadEmbedded(uri); + } + + public static Byte[] ReadEmbedded(string uri) { var pos = uri.IndexOf(";base64,"); if (pos < 0) @@ -64,7 +70,7 @@ public static Byte[] ReadEmbeded(string uri) Byte[] ReadFromUri(string baseDir, string uri) { - var bytes = ReadEmbeded(uri); + var bytes = ReadEmbedded(uri); if (bytes != null) { return bytes; diff --git a/Assets/VRM/UniGLTF/Scripts/IO/IStorage.cs b/Assets/VRM/UniGLTF/Scripts/IO/IStorage.cs index 42cbc4fae8..5854393223 100644 --- a/Assets/VRM/UniGLTF/Scripts/IO/IStorage.cs +++ b/Assets/VRM/UniGLTF/Scripts/IO/IStorage.cs @@ -53,7 +53,7 @@ public ArraySegment Get(string url) { var bytes = (url.StartsWith("data:")) - ? UriByteBuffer.ReadEmbeded(url) + ? UriByteBuffer.ReadEmbedded(url) : File.ReadAllBytes(Path.Combine(m_root, url)) ; return new ArraySegment(bytes); diff --git a/Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs b/Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs index a973cbc411..e132d1c874 100644 --- a/Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs +++ b/Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs @@ -238,7 +238,7 @@ public virtual void Parse(string path, Byte[] bytes) /// public void ParseGlb(Byte[] bytes) { - var chunks = glbImporter.ParseGlbChanks(bytes); + var chunks = glbImporter.ParseGlbChunks(bytes); if (chunks.Count != 2) { @@ -905,11 +905,17 @@ public void SaveAsAsset(UnityPath prefabPath) } } + [Obsolete("Use ExtractImages(prefabPath)")] + public void ExtranctImages(UnityPath prefabPath) + { + ExtractImages(prefabPath); + } + /// /// Extract images from glb or gltf out of Assets folder. /// /// - public void ExtranctImages(UnityPath prefabPath) + public void ExtractImages(UnityPath prefabPath) { var prefabParentDir = prefabPath.Parent; diff --git a/Assets/VRM/UniGLTF/Scripts/IO/MeshExporter.cs b/Assets/VRM/UniGLTF/Scripts/IO/MeshExporter.cs index 56d9a326c5..18add40bf4 100644 --- a/Assets/VRM/UniGLTF/Scripts/IO/MeshExporter.cs +++ b/Assets/VRM/UniGLTF/Scripts/IO/MeshExporter.cs @@ -8,7 +8,9 @@ namespace UniGLTF public struct MeshWithRenderer { public Mesh Mesh; - public Renderer Rendererer; + [Obsolete("Use Renderer")] + public Renderer Rendererer { get { return Renderer; } set { Renderer = value; } } + public Renderer Renderer; } public static class MeshExporter @@ -232,10 +234,10 @@ public static void ExportMeshes(glTF gltf, int bufferIndex, { var x = unityMeshes[i]; var mesh = x.Mesh; - var materials = x.Rendererer.sharedMaterials; + var materials = x.Renderer.sharedMaterials; var gltfMesh = ExportPrimitives(gltf, bufferIndex, - x.Rendererer.name, + x.Renderer.name, mesh, materials, unityMaterials); for (int j = 0; j < mesh.blendShapeCount; ++j) diff --git a/Assets/VRM/UniGLTF/Scripts/IO/TextureItem.cs b/Assets/VRM/UniGLTF/Scripts/IO/TextureItem.cs index 87f7fb26af..07c6a3d725 100644 --- a/Assets/VRM/UniGLTF/Scripts/IO/TextureItem.cs +++ b/Assets/VRM/UniGLTF/Scripts/IO/TextureItem.cs @@ -141,7 +141,7 @@ public TextureItem(int index, UnityPath assetPath, string textureName) public void Process(glTF gltf, IStorage storage) { ProcessOnAnyThread(gltf, storage); - ProcessOnMainThreadCoroutine(gltf).CoroutinetoEnd(); + ProcessOnMainThreadCoroutine(gltf).CoroutineToEnd(); } public IEnumerator ProcessCoroutine(glTF gltf, IStorage storage) diff --git a/Assets/VRM/UniGLTF/Scripts/IO/UnityPath.cs b/Assets/VRM/UniGLTF/Scripts/IO/UnityPath.cs index ed7be4fed4..0a19f33af3 100644 --- a/Assets/VRM/UniGLTF/Scripts/IO/UnityPath.cs +++ b/Assets/VRM/UniGLTF/Scripts/IO/UnityPath.cs @@ -286,7 +286,13 @@ public static bool IsUnderAssetFolder(string fullPath) } #endregion + [Obsolete("Use TraverseDir()")] public IEnumerable TravserseDir() + { + return TraverseDir(); + } + + public IEnumerable TraverseDir() { if (IsDirectoryExists) { @@ -294,7 +300,7 @@ public IEnumerable TravserseDir() foreach(var child in ChildDirs) { - foreach(var x in child.TravserseDir()) + foreach(var x in child.TraverseDir()) { yield return x; } diff --git a/Assets/VRM/UniGLTF/Scripts/IO/glbImporter.cs b/Assets/VRM/UniGLTF/Scripts/IO/glbImporter.cs index 2eef5e1db6..93417ea84f 100644 --- a/Assets/VRM/UniGLTF/Scripts/IO/glbImporter.cs +++ b/Assets/VRM/UniGLTF/Scripts/IO/glbImporter.cs @@ -27,7 +27,13 @@ public static GlbChunkType ToChunkType(string src) } } + [Obsolete("Use ParseGlbChunks(bytes)")] public static List ParseGlbChanks(Byte[] bytes) + { + return ParseGlbChunks(bytes); + } + + public static List ParseGlbChunks(Byte[] bytes) { if (bytes.Length == 0) { diff --git a/Assets/VRM/UniGLTF/Scripts/IO/gltfExporter.cs b/Assets/VRM/UniGLTF/Scripts/IO/gltfExporter.cs index 9a955dd819..bd0bae3dcf 100644 --- a/Assets/VRM/UniGLTF/Scripts/IO/gltfExporter.cs +++ b/Assets/VRM/UniGLTF/Scripts/IO/gltfExporter.cs @@ -223,7 +223,7 @@ void FromGameObject(glTF gltf, GameObject go, bool useSparseAccessorForMorphTarg .Select(x => new MeshWithRenderer { Mesh = x.GetSharedMesh(), - Rendererer = x.GetComponent(), + Renderer = x.GetComponent(), }) .Where(x => { @@ -231,8 +231,8 @@ void FromGameObject(glTF gltf, GameObject go, bool useSparseAccessorForMorphTarg { return false; } - if (x.Rendererer.sharedMaterials == null - || x.Rendererer.sharedMaterials.Length == 0) + if (x.Renderer.sharedMaterials == null + || x.Renderer.sharedMaterials.Length == 0) { return false; } @@ -251,7 +251,7 @@ void FromGameObject(glTF gltf, GameObject go, bool useSparseAccessorForMorphTarg && x.bones != null && x.bones.Length > 0) .ToList(); - gltf.nodes = Nodes.Select(x => ExportNode(x, Nodes, unityMeshes.Select(y => y.Rendererer).ToList(), unitySkins)).ToList(); + gltf.nodes = Nodes.Select(x => ExportNode(x, Nodes, unityMeshes.Select(y => y.Renderer).ToList(), unitySkins)).ToList(); gltf.scenes = new List { new gltfScene diff --git a/Assets/VRM/UniHumanoid/PoseModifier/HandPose.cs b/Assets/VRM/UniHumanoid/PoseModifier/HandPose.cs index e832ca55e4..c96c4cdf9a 100644 --- a/Assets/VRM/UniHumanoid/PoseModifier/HandPose.cs +++ b/Assets/VRM/UniHumanoid/PoseModifier/HandPose.cs @@ -1,5 +1,6 @@ using System; using UnityEngine; +using UnityEngine.Serialization; namespace UniHumanoid @@ -8,19 +9,29 @@ public class HandPoseModifier : IPoseModifier { public class HandPose { - public float ThumbStrech; + [Obsolete("Use ThumbStretch")] + public float ThumbStrech { get { return ThumbStretch; } set { ThumbStretch = value; } } + public float ThumbStretch; public float ThumbSpread; - public float IndexStrech; + [Obsolete("Use IndexStretch")] + public float IndexStrech { get { return IndexStretch; } set { IndexStretch = value; } } + public float IndexStretch; public float IndexSpread; - public float MiddleStrech; + [Obsolete("Use MiddleStretch")] + public float MiddleStrech { get { return MiddleStretch; } set { MiddleStretch = value; } } + public float MiddleStretch; public float MiddleSpread; - public float RingStrech; + [Obsolete("Use RingStretch")] + public float RingStrech { get { return RingStretch; } set { RingStretch = value; } } + public float RingStretch; public float RingSpread; - public float LittleStrech; + [Obsolete("Use LittleStretch")] + public float LittleStrech { get { return LittleStretch; } set { LittleStretch = value; } } + public float LittleStretch; public float LittleSpread; } public HandPose LeftHandPose @@ -125,21 +136,21 @@ public void Modify(ref HumanPose pose) { if (LeftHandPose != null) { - pose.muscles[this.LeftThumb1Stretched] = LeftHandPose.ThumbStrech; - pose.muscles[this.LeftThumb2Stretched] = LeftHandPose.ThumbStrech; - pose.muscles[this.LeftThumb3Stretched] = LeftHandPose.ThumbStrech; - pose.muscles[this.LeftIndex1Stretched] = LeftHandPose.IndexStrech; - pose.muscles[this.LeftIndex2Stretched] = LeftHandPose.IndexStrech; - pose.muscles[this.LeftIndex3Stretched] = LeftHandPose.IndexStrech; - pose.muscles[this.LeftMiddle1Stretched] = LeftHandPose.MiddleStrech; - pose.muscles[this.LeftMiddle2Stretched] = LeftHandPose.MiddleStrech; - pose.muscles[this.LeftMiddle3Stretched] = LeftHandPose.MiddleStrech; - pose.muscles[this.LeftRing1Stretched] = LeftHandPose.RingStrech; - pose.muscles[this.LeftRing2Stretched] = LeftHandPose.RingStrech; - pose.muscles[this.LeftRing3Stretched] = LeftHandPose.RingStrech; - pose.muscles[this.LeftLittle1Stretched] = LeftHandPose.LittleStrech; - pose.muscles[this.LeftLittle2Stretched] = LeftHandPose.LittleStrech; - pose.muscles[this.LeftLittle3Stretched] = LeftHandPose.LittleStrech; + pose.muscles[this.LeftThumb1Stretched] = LeftHandPose.ThumbStretch; + pose.muscles[this.LeftThumb2Stretched] = LeftHandPose.ThumbStretch; + pose.muscles[this.LeftThumb3Stretched] = LeftHandPose.ThumbStretch; + pose.muscles[this.LeftIndex1Stretched] = LeftHandPose.IndexStretch; + pose.muscles[this.LeftIndex2Stretched] = LeftHandPose.IndexStretch; + pose.muscles[this.LeftIndex3Stretched] = LeftHandPose.IndexStretch; + pose.muscles[this.LeftMiddle1Stretched] = LeftHandPose.MiddleStretch; + pose.muscles[this.LeftMiddle2Stretched] = LeftHandPose.MiddleStretch; + pose.muscles[this.LeftMiddle3Stretched] = LeftHandPose.MiddleStretch; + pose.muscles[this.LeftRing1Stretched] = LeftHandPose.RingStretch; + pose.muscles[this.LeftRing2Stretched] = LeftHandPose.RingStretch; + pose.muscles[this.LeftRing3Stretched] = LeftHandPose.RingStretch; + pose.muscles[this.LeftLittle1Stretched] = LeftHandPose.LittleStretch; + pose.muscles[this.LeftLittle2Stretched] = LeftHandPose.LittleStretch; + pose.muscles[this.LeftLittle3Stretched] = LeftHandPose.LittleStretch; pose.muscles[this.LeftThumbSpread] = LeftHandPose.ThumbSpread; pose.muscles[this.LeftIndexSpread] = LeftHandPose.IndexSpread; pose.muscles[this.LeftMiddleSpread] = LeftHandPose.MiddleSpread; @@ -149,21 +160,21 @@ public void Modify(ref HumanPose pose) if (RightHandPose != null) { - pose.muscles[this.RightThumb1Stretched] = RightHandPose.ThumbStrech; - pose.muscles[this.RightThumb2Stretched] = RightHandPose.ThumbStrech; - pose.muscles[this.RightThumb3Stretched] = RightHandPose.ThumbStrech; - pose.muscles[this.RightIndex1Stretched] = RightHandPose.IndexStrech; - pose.muscles[this.RightIndex2Stretched] = RightHandPose.IndexStrech; - pose.muscles[this.RightIndex3Stretched] = RightHandPose.IndexStrech; - pose.muscles[this.RightMiddle1Stretched] = RightHandPose.MiddleStrech; - pose.muscles[this.RightMiddle2Stretched] = RightHandPose.MiddleStrech; - pose.muscles[this.RightMiddle3Stretched] = RightHandPose.MiddleStrech; - pose.muscles[this.RightRing1Stretched] = RightHandPose.RingStrech; - pose.muscles[this.RightRing2Stretched] = RightHandPose.RingStrech; - pose.muscles[this.RightRing3Stretched] = RightHandPose.RingStrech; - pose.muscles[this.RightLittle1Stretched] = RightHandPose.LittleStrech; - pose.muscles[this.RightLittle2Stretched] = RightHandPose.LittleStrech; - pose.muscles[this.RightLittle3Stretched] = RightHandPose.LittleStrech; + pose.muscles[this.RightThumb1Stretched] = RightHandPose.ThumbStretch; + pose.muscles[this.RightThumb2Stretched] = RightHandPose.ThumbStretch; + pose.muscles[this.RightThumb3Stretched] = RightHandPose.ThumbStretch; + pose.muscles[this.RightIndex1Stretched] = RightHandPose.IndexStretch; + pose.muscles[this.RightIndex2Stretched] = RightHandPose.IndexStretch; + pose.muscles[this.RightIndex3Stretched] = RightHandPose.IndexStretch; + pose.muscles[this.RightMiddle1Stretched] = RightHandPose.MiddleStretch; + pose.muscles[this.RightMiddle2Stretched] = RightHandPose.MiddleStretch; + pose.muscles[this.RightMiddle3Stretched] = RightHandPose.MiddleStretch; + pose.muscles[this.RightRing1Stretched] = RightHandPose.RingStretch; + pose.muscles[this.RightRing2Stretched] = RightHandPose.RingStretch; + pose.muscles[this.RightRing3Stretched] = RightHandPose.RingStretch; + pose.muscles[this.RightLittle1Stretched] = RightHandPose.LittleStretch; + pose.muscles[this.RightLittle2Stretched] = RightHandPose.LittleStretch; + pose.muscles[this.RightLittle3Stretched] = RightHandPose.LittleStretch; pose.muscles[this.RightThumbSpread] = RightHandPose.ThumbSpread; pose.muscles[this.RightIndexSpread] = RightHandPose.IndexSpread; pose.muscles[this.RightMiddleSpread] = RightHandPose.MiddleSpread; diff --git a/Assets/VRM/UniHumanoid/PoseModifier/HandRig.cs b/Assets/VRM/UniHumanoid/PoseModifier/HandRig.cs index 28f273625f..aa3a65fa46 100644 --- a/Assets/VRM/UniHumanoid/PoseModifier/HandRig.cs +++ b/Assets/VRM/UniHumanoid/PoseModifier/HandRig.cs @@ -1,4 +1,5 @@ using UnityEngine; +using UnityEngine.Serialization; namespace UniHumanoid @@ -12,14 +13,16 @@ public Animator Animator get { return m_animator; } } + [FormerlySerializedAs("LeftStrech")] [SerializeField, Range(-1, 1)] - public float LeftStrech; + public float LeftStretch; [SerializeField, Range(-1, 1)] public float LeftSpread; + [FormerlySerializedAs("RightStrech")] [SerializeField, Range(-1, 1)] - public float RightStrech; + public float RightStretch; [SerializeField, Range(-1, 1)] public float RightSpread; @@ -67,26 +70,26 @@ private void Awake() private void Update() { - m_leftHand.ThumbStrech = LeftStrech; + m_leftHand.ThumbStretch = LeftStretch; m_leftHand.ThumbSpread = LeftSpread; - m_leftHand.IndexStrech = LeftStrech; + m_leftHand.IndexStretch = LeftStretch; m_leftHand.IndexSpread = LeftSpread; - m_leftHand.MiddleStrech = LeftStrech; + m_leftHand.MiddleStretch = LeftStretch; m_leftHand.MiddleSpread = LeftSpread; - m_leftHand.RingStrech = LeftStrech; + m_leftHand.RingStretch = LeftStretch; m_leftHand.RingSpread = LeftSpread; - m_leftHand.LittleStrech = LeftStrech; + m_leftHand.LittleStretch = LeftStretch; m_leftHand.LittleSpread = LeftSpread; - m_rightHand.ThumbStrech = RightStrech; + m_rightHand.ThumbStretch = RightStretch; m_rightHand.ThumbSpread = RightSpread; - m_rightHand.IndexStrech = RightStrech; + m_rightHand.IndexStretch = RightStretch; m_rightHand.IndexSpread = RightSpread; - m_rightHand.MiddleStrech = RightStrech; + m_rightHand.MiddleStretch = RightStretch; m_rightHand.MiddleSpread = RightSpread; - m_rightHand.RingStrech = RightStrech; + m_rightHand.RingStretch = RightStretch; m_rightHand.RingSpread = RightSpread; - m_rightHand.LittleStrech = RightStrech; + m_rightHand.LittleStretch = RightStretch; m_rightHand.LittleSpread = RightSpread; m_updater.LeftHandPose = m_leftHand; diff --git a/Assets/VRM/UniJSON/Scripts/ListTreeNode/ListTreeNode.cs b/Assets/VRM/UniJSON/Scripts/ListTreeNode/ListTreeNode.cs index c3cc147ab3..9e8eb1b597 100644 --- a/Assets/VRM/UniJSON/Scripts/ListTreeNode/ListTreeNode.cs +++ b/Assets/VRM/UniJSON/Scripts/ListTreeNode/ListTreeNode.cs @@ -379,7 +379,7 @@ public ListTreeNode this[int index] { get { - return this.GetArrrayItem(index); + return this.GetArrayItem(index); } } #endregion diff --git a/Assets/VRM/UniJSON/Scripts/ListTreeNode/ListTreeNodeArrayExtensions.cs b/Assets/VRM/UniJSON/Scripts/ListTreeNode/ListTreeNodeArrayExtensions.cs index 7275a09e2c..7a68d2ac35 100644 --- a/Assets/VRM/UniJSON/Scripts/ListTreeNode/ListTreeNodeArrayExtensions.cs +++ b/Assets/VRM/UniJSON/Scripts/ListTreeNode/ListTreeNodeArrayExtensions.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; @@ -12,7 +13,14 @@ public static IEnumerable> ArrayItems(this ListTreeNode se return self.Children; } - public static ListTreeNode GetArrrayItem(this ListTreeNode self, int index) + [Obsolete("Use GetArrayItem(index)")] + public static ListTreeNode GetArrrayItem(this ListTreeNode self, int index) + where T : IListTreeItem, IValue + { + return GetArrayItem(self, index); + } + + public static ListTreeNode GetArrayItem(this ListTreeNode self, int index) where T : IListTreeItem, IValue { int i = 0; diff --git a/Assets/VRM/UniUnlit/Editor/UniUnlitEditor.cs b/Assets/VRM/UniUnlit/Editor/UniUnlitEditor.cs index 544b18b80c..326f129a31 100644 --- a/Assets/VRM/UniUnlit/Editor/UniUnlitEditor.cs +++ b/Assets/VRM/UniUnlit/Editor/UniUnlitEditor.cs @@ -27,7 +27,7 @@ public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] pro _cutoff = FindProperty(Utils.PropNameCutoff, properties); _blendMode = FindProperty(Utils.PropNameBlendMode, properties); _cullMode = FindProperty(Utils.PropNameCullMode, properties); - _vColBlendMode = FindProperty(Utils.PropeNameVColBlendMode, properties); + _vColBlendMode = FindProperty(Utils.PropNameVColBlendMode, properties); // _srcBlend = FindProperty(PropNameSrcBlend, properties); // _dstBlend = FindProperty(PropNameDstBlend, properties); // _zWrite = FindProperty(PropNameZWrite, properties); diff --git a/Assets/VRM/UniUnlit/Scripts/Utils.cs b/Assets/VRM/UniUnlit/Scripts/Utils.cs index 3c5bc843a4..f9a458ce89 100644 --- a/Assets/VRM/UniUnlit/Scripts/Utils.cs +++ b/Assets/VRM/UniUnlit/Scripts/Utils.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using System; +using UnityEngine; using UnityEngine.Rendering; namespace UniGLTF.UniUnlit @@ -30,7 +31,9 @@ public static class Utils public const string PropNameCutoff = "_Cutoff"; public const string PropNameBlendMode = "_BlendMode"; public const string PropNameCullMode = "_CullMode"; - public const string PropeNameVColBlendMode = "_VColBlendMode"; + [Obsolete("Use PropNameVColBlendMode")] + public const string PropeNameVColBlendMode = PropNameVColBlendMode; + public const string PropNameVColBlendMode = "_VColBlendMode"; public const string PropNameSrcBlend = "_SrcBlend"; public const string PropNameDstBlend = "_DstBlend"; public const string PropNameZWrite = "_ZWrite"; @@ -77,7 +80,7 @@ public static void ValidateProperties(Material material, bool isRenderModeChange { SetupBlendMode(material, (UniUnlitRenderMode)material.GetFloat(PropNameBlendMode), isRenderModeChangedByUser); - SetupVertexColorBlendOp(material, (UniUnlitVertexColorBlendOp)material.GetFloat(PropeNameVColBlendMode)); + SetupVertexColorBlendOp(material, (UniUnlitVertexColorBlendOp)material.GetFloat(PropNameVColBlendMode)); } private static void SetupBlendMode(Material material, UniUnlitRenderMode renderMode, diff --git a/Assets/VRM/UniVRM/Editor/Format/VRMImporterMenu.cs b/Assets/VRM/UniVRM/Editor/Format/VRMImporterMenu.cs index a65e35fe94..59d4430a64 100644 --- a/Assets/VRM/UniVRM/Editor/Format/VRMImporterMenu.cs +++ b/Assets/VRM/UniVRM/Editor/Format/VRMImporterMenu.cs @@ -50,7 +50,7 @@ static void ImportMenu() var prefabPath = UnityPath.FromUnityPath(assetPath); var context = new VRMImporterContext(); context.ParseGlb(File.ReadAllBytes(path)); - context.ExtranctImages(prefabPath); + context.ExtractImages(prefabPath); EditorApplication.delayCall += () => { diff --git a/Assets/VRM/UniVRM/Editor/Format/vrmAssetPostprocessor.cs b/Assets/VRM/UniVRM/Editor/Format/vrmAssetPostprocessor.cs index 7f47ea5203..0bb5d09789 100644 --- a/Assets/VRM/UniVRM/Editor/Format/vrmAssetPostprocessor.cs +++ b/Assets/VRM/UniVRM/Editor/Format/vrmAssetPostprocessor.cs @@ -41,7 +41,7 @@ static void ImportVrm(UnityPath path) var prefabPath = path.Parent.Child(path.FileNameWithoutExtension + ".prefab"); // save texture assets ! - context.ExtranctImages(prefabPath); + context.ExtractImages(prefabPath); EditorApplication.delayCall += () => { diff --git a/Assets/VRM/UniVRM/Scripts/BlendShape/BlendShapeClipHandler.cs b/Assets/VRM/UniVRM/Scripts/BlendShape/BlendShapeClipHandler.cs index 46494aef7d..2021df4af6 100644 --- a/Assets/VRM/UniVRM/Scripts/BlendShape/BlendShapeClipHandler.cs +++ b/Assets/VRM/UniVRM/Scripts/BlendShape/BlendShapeClipHandler.cs @@ -8,7 +8,12 @@ namespace VRM public class BlendShapeClipHandler { BlendShapeClip m_clip; + [Obsolete("Use Clip")] public BlendShapeClip Cilp + { + get { return Clip; } + } + public BlendShapeClip Clip { get { return m_clip; } } diff --git a/Assets/VRM/UniVRM/Scripts/Format/glTF_VRMExtensions.cs b/Assets/VRM/UniVRM/Scripts/Format/glTF_VRMExtensions.cs index d88e5adc92..da96c1ca33 100644 --- a/Assets/VRM/UniVRM/Scripts/Format/glTF_VRMExtensions.cs +++ b/Assets/VRM/UniVRM/Scripts/Format/glTF_VRMExtensions.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System; +using System.Linq; using System.Collections.Generic; using UniGLTF; using UnityEngine; @@ -8,7 +9,13 @@ namespace VRM { public static class glTF_VRMExtensions { + [Obsolete("Use Create(root, meshes, binding)")] public static glTF_VRM_BlendShapeBind Cerate(Transform root, List meshes, BlendShapeBinding binding) + { + return Create(root, meshes, binding); + } + + public static glTF_VRM_BlendShapeBind Create(Transform root, List meshes, BlendShapeBinding binding) { var transform = UniGLTF.UnityExtensions.GetFromPath(root.transform, binding.RelativePath); var renderer = transform.GetComponent(); @@ -29,7 +36,7 @@ public static void Add(this glTF_VRM_BlendShapeMaster master, var list = new List(); if (clip.Values != null) { - list.AddRange(clip.Values.Select(y => Cerate(transform, meshes.ToList(), y))); + list.AddRange(clip.Values.Select(y => Create(transform, meshes.ToList(), y))); } var materialList = new List(); From 407700bb5d1a4dac6b841f6cfc0502b50867db47 Mon Sep 17 00:00:00 2001 From: Isamu Mogi Date: Sun, 9 Jun 2019 01:50:01 +0900 Subject: [PATCH 2/2] Remove unnecessary import --- Assets/VRM/UniHumanoid/PoseModifier/HandPose.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Assets/VRM/UniHumanoid/PoseModifier/HandPose.cs b/Assets/VRM/UniHumanoid/PoseModifier/HandPose.cs index c96c4cdf9a..5c94664e27 100644 --- a/Assets/VRM/UniHumanoid/PoseModifier/HandPose.cs +++ b/Assets/VRM/UniHumanoid/PoseModifier/HandPose.cs @@ -1,6 +1,5 @@ using System; using UnityEngine; -using UnityEngine.Serialization; namespace UniHumanoid