py api - utility function for vectors.
authorCampbell Barton <ideasman42@gmail.com>
Wed, 27 Jan 2010 15:29:21 +0000 (15:29 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 27 Jan 2010 15:29:21 +0000 (15:29 +0000)
 quat = vec.difference(other)

also pedantic change with enum names.

source/blender/makesrna/intern/rna_object.c
source/blender/python/generic/vector.c

index a1109e01d50efd12ab539b41cdc2accc4a64d39f..ff94b2eddbdc5267fedbb3c8e962c7d75dba00f6 100644 (file)
@@ -1378,12 +1378,12 @@ static void rna_def_object(BlenderRNA *brna)
                {0, NULL, 0, NULL, NULL}};
        
        static EnumPropertyItem track_items[] = {
-               {OB_POSX, "POSX", 0, "+X", ""},
-               {OB_POSY, "POSY", 0, "+Y", ""},
-               {OB_POSZ, "POSZ", 0, "+Z", ""},
-               {OB_NEGX, "NEGX", 0, "-X", ""},
-               {OB_NEGY, "NEGY", 0, "-Y", ""},
-               {OB_NEGZ, "NEGZ", 0, "-Z", ""},
+               {OB_POSX, "POS_X", 0, "+X", ""},
+               {OB_POSY, "POS_Y", 0, "+Y", ""},
+               {OB_POSZ, "POS_Z", 0, "+Z", ""},
+               {OB_NEGX, "NEG_X", 0, "-X", ""},
+               {OB_NEGY, "NEG_Y", 0, "-Y", ""},
+               {OB_NEGZ, "NEG_Z", 0, "-Z", ""},
                {0, NULL, 0, NULL, NULL}};
 
        static EnumPropertyItem up_items[] = {
index 558e4aac9c967c15aed3830142824fc4eae91090..aa5b518ffaba8a76616f856ebd9c6c5445ce2311 100644 (file)
@@ -560,6 +560,38 @@ static PyObject *Vector_Angle(VectorObject * self, VectorObject * value)
 #endif
 }
 
+static char Vector_Difference_doc[] =
+".. function:: difference(other)\n"
+"\n"
+"   Returns a quaternion representing the rotational difference between this vector and another.\n"
+"\n"
+"   :arg other: second vector.\n"
+"   :type other: Vector\n"
+"   :return: the rotational difference between the two vectors.\n"
+"   :rtype: Quaternion\n";
+
+static PyObject *Vector_Difference( VectorObject * self, VectorObject * value )
+{
+       float quat[4];
+
+       if (!VectorObject_Check(value)) {
+               PyErr_SetString( PyExc_TypeError, "vec.difference(value): expected a vector argument" );
+               return NULL;
+       }
+
+       if(self->size < 3 || value->size < 3) {
+               PyErr_SetString(PyExc_AttributeError, "vec.difference(value): expects both vectors to be size 3 or 4\n");
+               return NULL;
+       }
+
+       if(!BaseMath_ReadCallback(self) || !BaseMath_ReadCallback(value))
+               return NULL;
+
+       rotation_between_vecs_to_quat(quat, self->vec, value->vec);
+
+       return newQuaternionObject(quat, Py_NEW, NULL);
+}
+
 static char Vector_Project_doc[] =
 ".. function:: project(other)\n"
 "\n"
@@ -2076,6 +2108,7 @@ static struct PyMethodDef Vector_methods[] = {
        {"cross", ( PyCFunction ) Vector_Cross, METH_O, Vector_Cross_doc},
        {"dot", ( PyCFunction ) Vector_Dot, METH_O, Vector_Dot_doc},
        {"angle", ( PyCFunction ) Vector_Angle, METH_O, Vector_Angle_doc},
+       {"difference", ( PyCFunction ) Vector_Difference, METH_O, Vector_Difference_doc},
        {"project", ( PyCFunction ) Vector_Project, METH_O, Vector_Project_doc},
        {"lerp", ( PyCFunction ) Vector_Lerp, METH_VARARGS, Vector_Lerp_doc},
        {"copy", (PyCFunction) Vector_copy, METH_NOARGS, Vector_copy_doc},