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.

Sign up for GitHub

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 warning #489

Merged
merged 4 commits into from
Jul 27, 2020
Merged

Fix warning #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f7299b
use BlendShapeKey.CreateFromPreset
ousttrue Jul 27, 2020
44749e9
warning CS0649
ousttrue Jul 27, 2020
9019b2d
warning CS0618
ousttrue Jul 27, 2020
066e357
fix obsolete
ousttrue Jul 27, 2020
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
8 changes: 4 additions & 4 deletions Assets/VRM.Samples/Scripts/AIUEO.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ IEnumerator RoutineNest(BlendShapePreset preset, float velocity, float wait)
{
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);
}

Expand Down
4 changes: 2 additions & 2 deletions Assets/VRM.Samples/Scripts/VRMRuntimeExporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions Assets/VRM.Samples/Scripts/VRMRuntimeLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
58 changes: 29 additions & 29 deletions Assets/VRM.Samples/Scripts/ViewerUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,58 +12,58 @@ public class ViewerUI : MonoBehaviour
{
#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()
{
Expand Down Expand Up @@ -106,21 +106,21 @@ public void UpdateMeta(VRMImporterContext context)
}
}
[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)
{
Expand All @@ -144,10 +144,10 @@ public void UpdateToggle(Action onBvh, Action onTPose)
}
}
[SerializeField]
UIFields m_ui;
UIFields m_ui = default;

[SerializeField]
HumanPoseClip m_pose;
HumanPoseClip m_pose = default;

private void Reset()
{
Expand Down
2 changes: 1 addition & 1 deletion Assets/VRM/UniGLTF/Editor/Tests/UniGLTFTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ public CantConstruct(bool value)
[Serializable]
class Dummy
{
public CantConstruct Value;
public CantConstruct Value = default;
}

[Test]
Expand Down
4 changes: 2 additions & 2 deletions Assets/VRM/UniHumanoid/Scenes/RuntimeBvhLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
13 changes: 2 additions & 11 deletions Assets/VRM/UniHumanoid/Scripts/IO/BvhImporterContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,17 +210,8 @@ public void SaveAsAsset()
}

// Create or update Main Asset
if (File.Exists(path))
{
Debug.LogFormat("replace prefab: {0}", path);
var prefab = AssetDatabase.LoadAssetAtPath<GameObject>(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);
}
Expand Down
8 changes: 4 additions & 4 deletions Assets/VRM/UniVRM/Scripts/BlendShape/Blinker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ protected IEnumerator BlinkRoutine()
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);
Expand All @@ -90,10 +90,10 @@ protected IEnumerator BlinkRoutine()
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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion Assets/VRM/UniVRM/Scripts/Format/VRMVersionPartial.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public static bool ParseVersion(string version, out Version v)

return true;
}
catch (Exception e)
catch (Exception)
{
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion Assets/VRM/UniVRM/Scripts/SpringBone/VRMSpringBone.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class VRMSpringBone : MonoBehaviour
public string m_comment;

[SerializeField, Header("Gizmo")]
bool m_drawGizmo;
bool m_drawGizmo = default;

[SerializeField]
Color m_gizmoColor = Color.yellow;
Expand Down