Add Quadrance to Quaternion Math node, fix bug in QIN node and add normalize to QOUT

4a6e77b2 · DolphinDream · 256d61a8 · 4a6e77b2 · 4a6e77b2 · 4a6e77b2
--- a/docs/nodes/quaternion/quaternion_math.rst
+++ b/docs/nodes/quaternion/quaternion_math.rst
@@ -20,6 +20,7 @@ The available arithmetic operations and their corresponding inputs/outputs are:
 | INVERT     |   Q    |   Q    | Invert a quaternion                 |
 | NORMALIZE  |   Q    |   Q    | Normalize a quaternion              |
 | SCALE      |   QS   |   Q    | Scale a quaternion by given factor  |
+| QUADRANCE  |   Q    |   S    | Quadrance of a quaternion           |
 | MAGNITUDE  |   Q    |   S    | Magnitude of a quaternion           |
 +============+========+========+=====================================+

@@ -144,12 +145,22 @@ S = (s if sw else 1, s if sx else 1, s if sy else 1, s if sz else 1)
 scale(q, S) = (w * Sw, x * Sx, y * Sy, z * Sz)


+* QUADRANCE : the quadreance of a quaternion
+
+q = (w, x, y, z)
+
+Quadrance(q) = w * w + x * x + y * y + z * z
+
+Note: essentially this is the dot product of the quaternion with itself, and also equal to square of the magnitude.
+
 * MAGNITUDE : the magnitude of a quaternion

 q = (w, x, y, z)

 Magnitude(q) = sqrt(w * w + x * x + y * y + z * z)

+Note: this is essentially the square root of the quadrance (the length of the quaternion).
+

 Output
 ======

--- a/nodes/quaternion/quaternion_in.py
+++ b/nodes/quaternion/quaternion_in.py
@@ -187,7 +187,7 @@ class SvQuaternionInNode(bpy.types.Node, SverchCustomTreeNode):
                quaternionList.append(q)

        elif self.mode == "AXISANGLE":
-            I = [inputs[n].sv_get()[0] for n in {"Axis", "Angle"}]
+            I = [inputs[n].sv_get()[0] for n in ["Axis", "Angle"]]
            params = match_long_repeat(I)
            au = angleConversion[self.angleUnits]
            for axis, angle in zip(*params):

--- a/nodes/quaternion/quaternion_math.py
+++ b/nodes/quaternion/quaternion_math.py
@@ -48,7 +48,8 @@ operations = {
    # one quaternion + scalar => quaternion (QS => Q)
    "SCALE":     (40, "QS", "Q", "Scale a quaternion by given factor"),
    # one quaternion => scalar value (Q => S)
-    "MAGNITUDE": (50, "Q", "S", "Magnitude of a quaternion"),
+    "QUADRANCE": (50, "Q", "S", "Quadrance of a quaternion"),
+    "MAGNITUDE": (51, "Q", "S", "Magnitude of a quaternion"),
 }

 operationItems = [(k, k.title(), s[3], "", s[0]) for k, s in sorted(operations.items(), key=lambda k: k[1][0])]
@@ -211,6 +212,8 @@ class SvQuaternionMathNode(bpy.types.Node, SverchCustomTreeNode):
            return lambda q: q.normalized()
        elif self.operation == "SCALE":
            return lambda q, s: Quaternion([q[i] * s[i] for i in range(4)])
+        elif self.operation == "QUADRANCE":
+            return lambda q: q.dot(q)
        elif self.operation == "MAGNITUDE":
            return lambda q: q.magnitude

@@ -249,11 +252,11 @@ class SvQuaternionMathNode(bpy.types.Node, SverchCustomTreeNode):

        operation = self.get_operation()

-        if self.operation in NQ_operations:  # multiple input operations
+        if self.operation in NQ_operations:
            parameters = match_long_repeat(I)
            quaternionList = [operation(params) for params in zip(*parameters)]

-        elif self.operation in QQ_operations:  # multiple input operations
+        elif self.operation in QQ_operations:
            parameters = match_long_repeat(I)
            quaternionList = [operation(*params) for params in zip(*parameters)]


--- a/nodes/quaternion/quaternion_out.py
+++ b/nodes/quaternion/quaternion_out.py
@@ -138,6 +138,8 @@ class SvQuaternionOutNode(bpy.types.Node, SverchCustomTreeNode):
        quaternionList = [Quaternion(q) for q in input_Q]

        if self.mode == "WXYZ":
+            if self.normalize:
+                quaternionList = [q.normalized() for q in quaternionList]
            for i, name in enumerate("WXYZ"):
                if outputs[name].is_linked:
                    outputs[name].sv_set([[q[i] for q in quaternionList]])