Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-19 17:27:56 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #151 from dwango/fix/suppress_warnings

Browse Source 
Fix/suppress warnings
This commit is contained in:
yutopp 2019-01-29 16:31:30 +09:00 committed by GitHub
commit 9f71ebc115
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/VRM.Samples/Editor/Tests/VRMImportExportTests.cs
View File

@ -83,9 +83,11 @@ namespace VRM.Samples
var vrm = VRMExporter.Export(context.Root);
var exportJson = JsonParser.Parse(vrm.ToJson());
// TODO: Check contents in JSON
/*var exportJson = */JsonParser.Parse(vrm.ToJson());
var newExportedJson = JsonParser.Parse(JsonSchema.FromType<glTF>().Serialize(vrm));
// TODO: Check contents in JSON
/*var newExportedJson = */JsonParser.Parse(JsonSchema.FromType<glTF>().Serialize(vrm));
/*
foreach (var kv in importJson.Diff(exportJson))

2
Assets/VRM.Samples/Scripts/VRMRuntimeExporter.cs
View File

@ -54,7 +54,7 @@ namespace VRM.Samples
Debug.LogFormat("meta: title:{0}", meta.Title);
// ParseしたJSONをシーンオブジェクトに変換していく
context.LoadAsync(_ => OnLoaded(context));
context.LoadAsync(() => OnLoaded(context));
}
void OnLoaded(VRMImporterContext context)

2
Assets/VRM.Samples/Scripts/VRMRuntimeLoader.cs
View File

@ -163,7 +163,7 @@ namespace VRM.Samples
{
#if true
var now = Time.time;
context.LoadAsync(_ =>
context.LoadAsync(() =>
{
var delta = Time.time - now;
Debug.LogFormat("LoadAsync {0:0.0} seconds", delta);

4
Assets/VRM/UniJSON/Scripts/ListTreeNode/ListTreeNode.cs
View File

@ -68,9 +68,9 @@ namespace UniJSON
if (this.IsArray())
{
var sb = new StringBuilder();
bool isFirst = true;
sb.Append("[");
/*
bool isFirst = true;
foreach (var x in this.ArrayItems())
{
if (isFirst)
@ -90,9 +90,9 @@ namespace UniJSON
else if (this.IsMap())
{
var sb = new StringBuilder();
bool isFirst = true;
sb.Append("{");
/*
bool isFirst = true;
foreach (var kv in this.ObjectItems())
{
if (isFirst)

2
Assets/VRM/UniVRM/Scripts/BlendShape/Editor/BlendShapeClipDrawer.cs
View File

@ -26,7 +26,7 @@ namespace VRM
position.height = EditorGUIUtility.singleLineHeight;
var halfWidth = position.width * 0.5f;
//var halfWidth = position.width * 0.5f;
var rect = new Rect(position.x + ThumbnailSize, position.y, position.width - ThumbnailSize, position.height);
EditorGUI.PropertyField(rect, property);

3
Assets/VRM/UniVRM/Scripts/BlendShape/Editor/BlendShapeClipEditor.cs
View File

@ -95,9 +95,10 @@ namespace VRM
m_isBinaryProp = serializedObject.FindProperty("IsBinary");
}
int thumbnailSize = 96;
EditorGUILayout.BeginHorizontal();
/*
int thumbnailSize = 96;
var objectReferenceValue = EditorGUILayout.ObjectField(m_thumbnailProp.objectReferenceValue, typeof(Texture), false,
GUILayout.Width(thumbnailSize), GUILayout.Height(thumbnailSize));
if (m_thumbnailProp.objectReferenceValue != objectReferenceValue)

2
Assets/VRM/UniVRM/Scripts/BlendShape/Editor/SerializedBlendShapeClipEditor.cs
View File

@ -36,7 +36,7 @@ namespace VRM
#endregion
#region Editor values
float m_previewSlider = 1.0f;
//float m_previewSlider = 1.0f;
bool m_changed;