Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo (public class members) #274

Merged
merged 2 commits into from
Jun 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Assets/VRM/DepthFirstScheduler/IEnumeratorExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections;
using System;
using System.Collections;
using System.Collections.Generic;


Expand All @@ -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<IEnumerator>();
stack.Push(coroutine);
Expand Down
2 changes: 1 addition & 1 deletion Assets/VRM/UniGLTF/Editor/gltfAssetPostprocessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
6 changes: 6 additions & 0 deletions Assets/VRM/UniGLTF/Scripts/Extensions/UnityExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,13 @@ public static IEnumerable<Transform> 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);
}
Expand Down
8 changes: 7 additions & 1 deletion Assets/VRM/UniGLTF/Scripts/Format/BytesBuffer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Assets/VRM/UniGLTF/Scripts/IO/IStorage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public ArraySegment<byte> Get(string url)
{
var bytes =
(url.StartsWith("data:"))
? UriByteBuffer.ReadEmbeded(url)
? UriByteBuffer.ReadEmbedded(url)
: File.ReadAllBytes(Path.Combine(m_root, url))
;
return new ArraySegment<byte>(bytes);
Expand Down
10 changes: 8 additions & 2 deletions Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ public virtual void Parse(string path, Byte[] bytes)
/// <param name="bytes"></param>
public void ParseGlb(Byte[] bytes)
{
var chunks = glbImporter.ParseGlbChanks(bytes);
var chunks = glbImporter.ParseGlbChunks(bytes);

if (chunks.Count != 2)
{
Expand Down Expand Up @@ -905,11 +905,17 @@ public void SaveAsAsset(UnityPath prefabPath)
}
}

[Obsolete("Use ExtractImages(prefabPath)")]
public void ExtranctImages(UnityPath prefabPath)
{
ExtractImages(prefabPath);
}

/// <summary>
/// Extract images from glb or gltf out of Assets folder.
/// </summary>
/// <param name="prefabPath"></param>
public void ExtranctImages(UnityPath prefabPath)
public void ExtractImages(UnityPath prefabPath)
{
var prefabParentDir = prefabPath.Parent;

Expand Down
8 changes: 5 additions & 3 deletions Assets/VRM/UniGLTF/Scripts/IO/MeshExporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Assets/VRM/UniGLTF/Scripts/IO/TextureItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 7 additions & 1 deletion Assets/VRM/UniGLTF/Scripts/IO/UnityPath.cs
Original file line number Diff line number Diff line change
Expand Up @@ -286,15 +286,21 @@ public static bool IsUnderAssetFolder(string fullPath)
}
#endregion

[Obsolete("Use TraverseDir()")]
public IEnumerable<UnityPath> TravserseDir()
{
return TraverseDir();
}

public IEnumerable<UnityPath> TraverseDir()
{
if (IsDirectoryExists)
{
yield return this;

foreach(var child in ChildDirs)
{
foreach(var x in child.TravserseDir())
foreach(var x in child.TraverseDir())
{
yield return x;
}
Expand Down
6 changes: 6 additions & 0 deletions Assets/VRM/UniGLTF/Scripts/IO/glbImporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@ public static GlbChunkType ToChunkType(string src)
}
}

[Obsolete("Use ParseGlbChunks(bytes)")]
public static List<GlbChunk> ParseGlbChanks(Byte[] bytes)
{
return ParseGlbChunks(bytes);
}

public static List<GlbChunk> ParseGlbChunks(Byte[] bytes)
{
if (bytes.Length == 0)
{
Expand Down
8 changes: 4 additions & 4 deletions Assets/VRM/UniGLTF/Scripts/IO/gltfExporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -223,16 +223,16 @@ void FromGameObject(glTF gltf, GameObject go, bool useSparseAccessorForMorphTarg
.Select(x => new MeshWithRenderer
{
Mesh = x.GetSharedMesh(),
Rendererer = x.GetComponent<Renderer>(),
Renderer = x.GetComponent<Renderer>(),
})
.Where(x =>
{
if (x.Mesh == null)
{
return false;
}
if (x.Rendererer.sharedMaterials == null
|| x.Rendererer.sharedMaterials.Length == 0)
if (x.Renderer.sharedMaterials == null
|| x.Renderer.sharedMaterials.Length == 0)
{
return false;
}
Expand All @@ -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<gltfScene>
{
new gltfScene
Expand Down
80 changes: 45 additions & 35 deletions Assets/VRM/UniHumanoid/PoseModifier/HandPose.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,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
Expand Down Expand Up @@ -125,21 +135,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;
Expand All @@ -149,21 +159,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;
Expand Down
27 changes: 15 additions & 12 deletions Assets/VRM/UniHumanoid/PoseModifier/HandRig.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using UnityEngine;
using UnityEngine.Serialization;


namespace UniHumanoid
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Assets/VRM/UniJSON/Scripts/ListTreeNode/ListTreeNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ public ListTreeNode<T> this[int index]
{
get
{
return this.GetArrrayItem(index);
return this.GetArrayItem(index);
}
}
#endregion
Expand Down
Loading