AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2024-12-29 18:55:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix warnings

Browse Source
This commit is contained in:
bd_ 2023-07-30 01:15:16 +09:00
parent 05ed734438
commit 21373e13bc
12 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Packages/nadena.dev.modular-avatar/Editor/AvatarProcessor.cs
View File

@ -183,7 +183,10 @@ namespace nadena.dev.modular_avatar.core.editor
Object.DestroyImmediate(component);
}
// Disable deprecation warning for reference to PipelineSaver
#pragma warning disable CS0618
foreach (var component in directChild.GetComponentsInChildren<PipelineSaver>(true))
#pragma warning restore CS0618
{
Object.DestroyImmediate(component);
}
@ -242,7 +245,7 @@ namespace nadena.dev.modular_avatar.core.editor
madeProgress = true;
}
}
catch (Exception e)
catch (Exception)
{
retryDestroy.Add(component);
}

4
Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ErrorLog.cs
View File

@ -201,7 +201,7 @@ namespace nadena.dev.modular_avatar.editor.ErrorReporting
stacktrace = e.ToString() + additionalStackTrace;
}
public string ToString()
public override string ToString()
{
return "[" + reportLevel + "] " + messageCode + " " + "subst: " + string.Join(", ", substitutions);
}
@ -248,7 +248,7 @@ namespace nadena.dev.modular_avatar.editor.ErrorReporting
var data = File.ReadAllText(Path);
return JsonConvert.DeserializeObject<BuildReport>(data);
}
catch (Exception e)
catch (Exception)
{
return null;
}

1
Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ErrorReportUI.cs
View File

@ -230,7 +230,6 @@ namespace nadena.dev.modular_avatar.editor.ErrorReporting
{
var report = BuildReport.CurrentReport;
AvatarReport selected = null;
EditorGUILayout.BeginVertical(GUILayout.MaxHeight(150), GUILayout.Width(position.width));
if (report.Avatars.Count == 0)
{

3
Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/AvMenuTreeView.cs
View File

@ -191,7 +191,8 @@ namespace nadena.dev.modular_avatar.core.editor
// available. See if we can find one.
foreach (var installer in _avatar.GetComponentsInChildren<ModularAvatarMenuInstaller>(true))
{
if (installer.installTargetMenu != null && installer.installTargetMenu != menuTree.RootMenuKey)
if (installer.installTargetMenu != null &&
!ReferenceEquals(installer.installTargetMenu, menuTree.RootMenuKey))
{
continue;
}

4
Packages/nadena.dev.modular-avatar/Editor/MergeArmatureHook.cs
View File

@ -29,7 +29,6 @@ using nadena.dev.modular_avatar.editor.ErrorReporting;
using UnityEditor;
using UnityEngine;
using UnityEngine.Animations;
using VRC.Core;
using VRC.Dynamics;
using VRC.SDK3.Avatars.Components;
using VRC.SDK3.Dynamics.PhysBone.Components;
@ -125,9 +124,6 @@ namespace nadena.dev.modular_avatar.core.editor
private bool HasAdditionalComponents(GameObject go)
{
bool hasComponents = false;
bool needsConstraint = false;
bool hasPositionConstraint = false;
bool hasRotationConstraint = false;
foreach (Component c in go.GetComponents<Component>())
{

5
Packages/nadena.dev.modular-avatar/Editor/nadena.dev.modular-avatar.core.editor.asmdef
View File

@ -1,8 +1,9 @@
{
"name": "nadena.dev.modular-avatar.core.editor",
"references": [
"GUID:fc900867c0f47cd49b6e2ae4ef907300",
"GUID:5718fb738711cd34ea54e9553040911d"
"GUID:fc900867c0f47cd49b6e2ae4ef907300",
"GUID:5718fb738711cd34ea54e9553040911d",
"GUID:3456780c4fb2d324ab9c633d6f1b0ddb"
],
"includePlatforms": [
"Editor"

2
Packages/nadena.dev.modular-avatar/Runtime/AvatarTagComponent.cs
View File

@ -63,7 +63,7 @@ namespace nadena.dev.modular_avatar.core
OnChangeAction?.Invoke();
}
protected void OnDestroy()
protected virtual void OnDestroy()
{
OnChangeAction?.Invoke();
}

2
Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuGroup.cs
View File

@ -9,8 +9,6 @@ namespace nadena.dev.modular_avatar.core
[AddComponentMenu("Modular Avatar/MA Menu Group")]
public class ModularAvatarMenuGroup : MenuSourceComponent
{
private bool recursing = false;
public GameObject targetObject;
public override void Visit(NodeContext context)

3
Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBlendshapeSync.cs
View File

@ -58,8 +58,9 @@ namespace nadena.dev.modular_avatar.core
RuntimeUtil.OnHierarchyChanged += Rebind;
}
private void OnDestroy()
protected override void OnDestroy()
{
base.OnDestroy();
RuntimeUtil.OnHierarchyChanged -= Rebind;
}

6
Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBoneProxy.cs
View File

@ -95,8 +95,9 @@ namespace nadena.dev.modular_avatar.core
public string subPath;
public BoneProxyAttachmentMode attachmentMode = BoneProxyAttachmentMode.Unset;
void OnValidate()
protected override void OnValidate()
{
base.OnValidate();
ClearCache();
}
@ -128,8 +129,9 @@ namespace nadena.dev.modular_avatar.core
}
}
private void OnDestroy()
protected override void OnDestroy()
{
base.OnDestroy();
RuntimeUtil.OnHierarchyChanged -= ClearCache;
}

4
Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeArmature.cs
View File

@ -24,6 +24,7 @@
using System;
using System.Collections.Generic;
using NUnit.Framework.Constraints;
using UnityEngine;
#if UNITY_EDITOR
using UnityEditor;
@ -80,8 +81,9 @@ namespace nadena.dev.modular_avatar.core
RuntimeUtil.delayCall(CheckLock);
}
private void OnDestroy()
protected override void OnDestroy()
{
base.OnDestroy();
#if UNITY_EDITOR
EditorApplication.update -= EditorUpdate;
#endif

14
Packages/nadena.dev.modular-avatar/Runtime/RuntimeUtil.cs
View File

@ -56,6 +56,20 @@ namespace nadena.dev.modular_avatar.core
public static OnDemandProcessAvatarDelegate OnDemandProcessAvatar = (_m, _c) => { };
internal static T GetOrAddComponent<T>(this Component self) where T : Component
{
var component = self.GetComponent<T>();
if (component == null) component = self.gameObject.AddComponent<T>();
return component;
}
internal static T GetOrAddComponent<T>(this GameObject self) where T : Component
{
var component = self.GetComponent<T>();
if (component == null) component = self.AddComponent<T>();
return component;
}
[CanBeNull]
public static string RelativePath(GameObject root, GameObject child)
{