Interactivity: fixed quat math nodes (wrong return value type, deg/rad conversion)

Author: robertdorn83

Editor/Scripts/Interactivity/VisualScriptingExport/UnitExporters/Math/GenericMathInvokeUnitExports.cs

@@ -67,7 +67,6 @@ public static void Register()
             InvokeUnitExport.RegisterInvokeExporter(typeof(Matrix4x4), nameof(Matrix4x4.Inverse), new GenericInvokeMathInvokeUnitExporters<Math_InverseNode>());
 
             InvokeUnitExport.RegisterInvokeExporter(typeof(Quaternion), nameof(Quaternion.Inverse), new GenericInvokeMathInvokeUnitExporters<Math_QuatConjugateNode>());
-            InvokeUnitExport.RegisterInvokeExporter(typeof(Quaternion), nameof(Quaternion.Angle), new GenericInvokeMathInvokeUnitExporters<Math_QuatAngleBetweenNode>());
         }   
     }
     public class GenericInvokeMathInvokeUnitExporters<TSchema> : GenericInvokeUnitExport<TSchema> where TSchema : GltfInteractivityNodeSchema, new()

Editor/Scripts/Interactivity/VisualScriptingExport/UnitExporters/Math/QuaternionAngleAxisUnitExporter.cs

@@ -21,10 +21,13 @@ public bool InitializeInteractivityNodes(UnitExporter unitExporter)
             var unit = unitExporter.unit as InvokeMember;
 
             var node = unitExporter.CreateNode<Math_QuatFromAxisAngleNode>();
-            node.ValueIn(Math_QuatFromAxisAngleNode.IdAngle).MapToInputPort(unit.valueInputs[0]);
             node.ValueIn(Math_QuatFromAxisAngleNode.IdAxis).MapToInputPort(unit.valueInputs[1]);
             node.ValueOut(Math_QuatFromAxisAngleNode.IdOutValue).MapToPort(unit.result);
-
+            
+            var degToRadNode = unitExporter.CreateNode<Math_RadNode>();
+            degToRadNode.ValueIn(Math_RadNode.IdInputA).MapToInputPort(unit.valueInputs[0]);
+            node.ValueIn(Math_QuatFromAxisAngleNode.IdAngle).ConnectToSource(degToRadNode.FirstValueOut());
+            
             return true;
         }
     }

Editor/Scripts/Interactivity/VisualScriptingExport/UnitExporters/Math/QuaternionAngleUnitExporter.cs

@@ -0,0 +1,34 @@
+using System;
+using Unity.VisualScripting;
+using UnityEditor;
+using UnityEngine;
+using UnityGLTF.Interactivity.Schema;
+
+namespace UnityGLTF.Interactivity.VisualScripting.Export
+{
+    public class QuaternionAngleUnitExporter : IUnitExporter
+    {
+        public Type unitType { get; }
+        
+        [InitializeOnLoadMethod]
+        private static void Register()
+        {
+            InvokeUnitExport.RegisterInvokeExporter(typeof(Quaternion), nameof(Quaternion.Angle), new QuaternionToAxisAngleUnitExporter());
+        }
+        
+        public bool InitializeInteractivityNodes(UnitExporter unitExporter)
+        {
+            var unit = unitExporter.unit as InvokeMember;
+
+            var node = unitExporter.CreateNode<Math_QuatAngleBetweenNode>();
+            node.ValueIn(Math_QuatToAxisAngleNode.IdValueA).MapToInputPort(unit.valueInputs[0]);
+            node.ValueIn(Math_QuatToAxisAngleNode.IdValueA).MapToInputPort(unit.valueInputs[1]);
+
+            var degToRadNode = unitExporter.CreateNode<Math_RadNode>();
+            degToRadNode.ValueIn(Math_RadNode.IdInputA).ConnectToSource(node.FirstValueOut());
+            degToRadNode.FirstValueOut().MapToPort(unit.result);
+            
+            return true;
+        }
+    }
+}

Editor/Scripts/Interactivity/VisualScriptingExport/UnitExporters/Math/QuaternionAngleUnitExporter.cs.meta

@@ -22,9 +22,11 @@ public bool InitializeInteractivityNodes(UnitExporter unitExporter)
 
             var node = unitExporter.CreateNode<Math_QuatToAxisAngleNode>();
             node.ValueIn(Math_QuatToAxisAngleNode.IdValueA).MapToInputPort(unit.valueInputs[0]);
-            
             node.ValueOut(Math_QuatToAxisAngleNode.IdOutAxis).MapToPort(unit.valueOutputs["&axis"]);
-            node.ValueOut(Math_QuatToAxisAngleNode.IdOutAngle).MapToPort(unit.valueOutputs["&angle"]);
+            
+            var degToRadNode = unitExporter.CreateNode<Math_RadNode>();
+            degToRadNode.ValueIn(Math_RadNode.IdInputA).ConnectToSource(node.ValueOut(Math_QuatToAxisAngleNode.IdOutAngle));
+            degToRadNode.FirstValueOut().MapToPort(unit.valueOutputs["&angle"]);
 
             return true;
         }

Editor/Scripts/Interactivity/VisualScriptingExport/UnitExporters/Math/QuaternionToAxisAngleUnitExporter.cs

@@ -1057,7 +1057,7 @@ public class Math_QuatFromAxisAngleNode : GltfInteractivityNodeSchema
         [InputSocketDescription(GltfTypes.Float3)]
         public const string IdAxis = "axis";
 
-        [OutputSocketDescription(GltfTypes.Float)]
+        [OutputSocketDescription(GltfTypes.Float4)]
         public const string IdOutValue = "value";
     }