3.2.0: Fit to AaC v1.1.0

kb10uy · Aug 21, 2024 · 3cebd3c · 3cebd3c
1 parent be2bbb5
commit 3cebd3c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/Packages/org.kb10uy.declavatar/Editor/Arbittach/ArbittachProcessor.cs b/Packages/org.kb10uy.declavatar/Editor/Arbittach/ArbittachProcessor.cs
@@ -1,5 +1,3 @@
-using nadena.dev.ndmf;
-
 namespace KusakaFactory.Declavatar.Arbittach
 {
     /// <summary>

diff --git a/Packages/org.kb10uy.declavatar/Editor/Processor/GenerateControllerPass.cs b/Packages/org.kb10uy.declavatar/Editor/Processor/GenerateControllerPass.cs
@@ -101,7 +101,7 @@ private void GeneratePuppetLayer(DeclavatarContext context, AacFlController cont
             var layer = controller.NewLayer(name);
             var layerParameter = layer.FloatParameter(puppet.Parameter);
 
-            var state = layer.NewState(name).MotionTime(layerParameter);
+            var state = layer.NewState(name).WithMotionTime(layerParameter);
             WriteStateAnimation(context, layer, state, puppet.Animation);
         }
 
@@ -141,7 +141,7 @@ private void GenerateRawLayer(DeclavatarContext context, AacFlController control
                         if (clip.TimeBy != null)
                         {
                             var timeParameter = layer.FloatParameter(clip.TimeBy);
-                            state.MotionTime(timeParameter);
+                            state.WithMotionTime(timeParameter);
                         }
                         break;
                     case RawAnimation.BlendTree blendTree:
@@ -414,7 +414,7 @@ private AacFlClip CreateKeyedInlineClip(DeclavatarContext context, LayerAnimatio
                                         var castValue = (p.Target.Value as MaterialValue.Color).Value;
                                         return (p.Time, Value: new Color(castValue[0], castValue[1], castValue[2], castValue[3]));
                                     });
-                                    e.AnimatesColor(mr, qualifiedName).WithKeyframes(AacFlUnit.Frames, (kfs) =>
+                                    e.AnimatesColor(mr, qualifiedName).WithUnit(AacFlUnit.Frames, (kfs) =>
                                     {
                                         foreach (var point in rgbaPoints) kfs.Linear(point.Time * 100.0f, point.Value);
                                     });
@@ -425,7 +425,7 @@ private AacFlClip CreateKeyedInlineClip(DeclavatarContext context, LayerAnimatio
                                         var castValue = (p.Target.Value as MaterialValue.ColorHdr).Value;
                                         return (p.Time, Value: new Color(castValue[0], castValue[1], castValue[2], castValue[3]));
                                     });
-                                    e.AnimatesColor(mr, qualifiedName).WithKeyframes(AacFlUnit.Frames, (kfs) =>
+                                    e.AnimatesColor(mr, qualifiedName).WithUnit(AacFlUnit.Frames, (kfs) =>
                                     {
                                         foreach (var point in rgbaHdrPoints) kfs.Linear(point.Time * 100.0f, point.Value);
                                     });

diff --git a/Packages/org.kb10uy.declavatar/package.json b/Packages/org.kb10uy.declavatar/package.json
@@ -1,7 +1,7 @@
 {
   "name": "org.kb10uy.declavatar",
   "displayName": "Declavatar",
-  "version": "3.1.2",
+  "version": "3.2.0",
   "unity": "2022.3",
   "description": "Declarative Avatar Asset Composing Tool",
   "documentationUrl": "https://declavatar.kb10uy.dev",
@@ -14,10 +14,11 @@
     "url": "https://kb10uy.org"
   },
   "vpmDependencies": {
+    "com.vrchat.avatars" : ">=3.7.0",
     "nadena.dev.ndmf": ">=1.4.0",
     "nadena.dev.modular-avatar": ">=1.9.10",
-    "dev.hai-vr.animator-as-code.v1": ">=1.0.9920",
-    "dev.hai-vr.animator-as-code.v1.vrchat": ">=1.0.9920"
+    "dev.hai-vr.animator-as-code.v1": ">=1.1.0",
+    "dev.hai-vr.animator-as-code.v1.vrchat": ">=1.1.0"
   },
   "dependencies": {
     "com.unity.nuget.newtonsoft-json": "2.0.0"