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

parameter provider #14

Merged
merged 6 commits into from Mar 30, 2024
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Components/AvatarMenuCreatorBase.cs
Expand Up @@ -33,6 +33,6 @@ public IEnumerable<VRCExpressionParameters.Parameter> GetParameterNameAndTypes()

public abstract IEnumerable<VRCExpressionParameters.Parameter> GetEffectiveParameterNameAndTypes();

protected string ParameterName => string.IsNullOrEmpty(AvatarMenu.ParameterName) ? name : AvatarMenu.ParameterName;
public string ParameterName => string.IsNullOrEmpty(AvatarMenu.ParameterName) ? name : AvatarMenu.ParameterName;
}
}
8 changes: 8 additions & 0 deletions Components/Editor/ParameterProviders.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

@@ -0,0 +1,39 @@
using nadena.dev.ndmf;
using net.narazaka.avatarmenucreator.components;
using net.narazaka.avatarmenucreator.components.editor;
using net.narazaka.avatarmenucreator.editor.util;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Diagnostics.CodeAnalysis;
using System.Linq;

namespace net.narazaka.avatarmenucreator.editor
{
[ParameterProviderFor(typeof(AvatarMenuCreatorBase))]
internal class AvatarMenuCreatorBaseParameterProvider : IParameterProvider
{
readonly AvatarMenuCreatorBase Menu;

public AvatarMenuCreatorBaseParameterProvider(AvatarMenuCreatorBase c)
{
Menu = c;
}

public IEnumerable<ProvidedParameter> GetSuppliedParameters([AllowNull] BuildContext context = null)
{
return Menu.GetParameterNameAndTypes().Select(p =>
new ProvidedParameter(p.name, ParameterNamespace.Animator, Menu, AvatarMenuCreatorPlugin.Instance, p.valueType.ToAnimatorControllerParameterType())
{
WantSynced = true,
IsHidden = Menu.AvatarMenu.InternalParameter,
}
);
}

public void RemapParameters(ref ImmutableDictionary<(ParameterNamespace, string), ParameterMapping> nameMap,
BuildContext context)
{
// no-op
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

@@ -0,0 +1,31 @@
{
"name": "AvatarMenuCreatorForMA.Components.Editor.ParameterProviders",
"rootNamespace": "",
"references": [
"nadena.dev.ndmf",
"nadena.dev.ndmf.vrchat",
"AvatarMenuCreatorForMA.Components",
"AvatarMenuCreatorForMA.Core",
"AvatarMenuCreatorForMA.Editor.Util",
"AvatarMenuCreatorForMA.Components.Editor"
],
"includePlatforms": [
"Editor"
],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": false,
"defineConstraints": [
"HAS_NDMF_ParameterProvider"
],
"versionDefines": [
{
"name": "nadena.dev.ndmf",
"expression": "[1.4.0-rc.2,2)",
"define": "HAS_NDMF_ParameterProvider"
}
],
"noEngineReferences": false
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions Editor/Util/Util.cs
@@ -1,6 +1,7 @@
using System.Linq;
using System.Collections.Generic;
using UnityEngine;
using VRC.SDK3.Avatars.ScriptableObjects;

namespace net.narazaka.avatarmenucreator.editor.util
{
Expand Down Expand Up @@ -244,5 +245,21 @@ public static IEnumerable<ShaderParameter> GetShaderParameters(Shader shader)
descriptions
.SelectMany(desc => desc.ShaderParameters)
.Distinct(new ShaderParameterComparator());


public static AnimatorControllerParameterType ToAnimatorControllerParameterType(this VRCExpressionParameters.ValueType valueType)
{
switch (valueType)
{
case VRCExpressionParameters.ValueType.Bool:
return AnimatorControllerParameterType.Bool;
case VRCExpressionParameters.ValueType.Float:
return AnimatorControllerParameterType.Float;
case VRCExpressionParameters.ValueType.Int:
return AnimatorControllerParameterType.Int;
default:
throw new System.ArgumentOutOfRangeException(nameof(valueType));
}
}
}
}
6 changes: 6 additions & 0 deletions README.md
Expand Up @@ -43,6 +43,12 @@ NDMF(Modular Avatar 1.8.0以降)のコンポーネントによる非破壊

## 更新履歴

- 1.17.0
- NDMF 1.4.0 Parameter Providerに対応
- 1.17.0-rc.1
- NDMF 1.4.0-rc.x Parameter Provider対応2
- 1.17.0-rc.0
- NDMF 1.4.0-rc.x Parameter Provider対応
- 1.16.1
- fix typo
- 1.16.0
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "net.narazaka.vrchat.avatar-menu-creater-for-ma",
"version": "1.16.1",
"version": "1.17.0",
"displayName": "AvatarMenuCreatorForMA",
"description": "AvatarMenuCreator for Modular Avatar",
"author": {
Expand Down